diff --git a/.gitignore b/.gitignore
index 7b4e676..7bc1db5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -47,5 +47,6 @@ src/test/resources/font
 src/main/resources/WEB-INF/vm/outFile
 target/
 *.back
-src/main/youhong_ai_old_src/
-src/main/youhong_ai_jitu_src/
\ No newline at end of file
+# 老项目代码
+#src/main/youhong_ai_old_src/
+#src/main/youhong_ai_jitu_src/
\ No newline at end of file
diff --git a/src/main/java/com/api/youhong/ai/yashilandai/openbill/controller/OpenThenBillController.java b/src/main/java/com/api/youhong/ai/yashilandai/openbill/controller/OpenThenBillController.java
new file mode 100644
index 0000000..746cc72
--- /dev/null
+++ b/src/main/java/com/api/youhong/ai/yashilandai/openbill/controller/OpenThenBillController.java
@@ -0,0 +1,38 @@
+package com.api.youhong.ai.yashilandai.openbill.controller;
+
+import aiyh.utils.ApiResult;
+import aiyh.utils.Util;
+import com.api.youhong.ai.yashilandai.openbill.service.OpenThenBillService;
+import org.apache.log4j.Logger;
+
+import javax.ws.rs.Consumes;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+/**
+ * <h1>拆单api接口</h1>
+ *
+ * <p>create: 2023/4/25 10:09</p>
+ *
+ * @author youHong.ai
+ */
+
+@Path("/ayh/estee-Lauder/open-bill")
+public class OpenThenBillController {
+	
+	private final OpenThenBillService service = new OpenThenBillService();
+	private final Logger log = Util.getLogger();
+	
+	@Path("/data/get")
+	@Produces(MediaType.APPLICATION_JSON)
+	@Consumes(MediaType.APPLICATION_JSON)
+	public String dataGet() {
+		try {
+		return ApiResult.success(service.getOpenBillListData());
+		} catch (Exception e) {
+			log.error("get open the bill data error!" + Util.getErrString(e));
+			return ApiResult.error("system error!");
+		}
+	}
+}
diff --git a/src/main/java/com/api/youhong/ai/yashilandai/openbill/mapper/OpenThenBillMapper.java b/src/main/java/com/api/youhong/ai/yashilandai/openbill/mapper/OpenThenBillMapper.java
new file mode 100644
index 0000000..600faf6
--- /dev/null
+++ b/src/main/java/com/api/youhong/ai/yashilandai/openbill/mapper/OpenThenBillMapper.java
@@ -0,0 +1,26 @@
+package com.api.youhong.ai.yashilandai.openbill.mapper;
+
+import aiyh.utils.annotation.recordset.Select;
+import aiyh.utils.annotation.recordset.SqlMapper;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <h1></h1>
+ *
+ * <p>create: 2023/4/25 10:15</p>
+ *
+ * @author youHong.ai
+ */
+@SqlMapper
+public interface OpenThenBillMapper {
+	
+	/**
+	 * <h2>查询数据列表</h2>
+	 *
+	 * @return 数据列表
+	 */
+	@Select("select * from v_online")
+	List<Map<String, Object>> selectList();
+}
diff --git a/src/main/java/com/api/youhong/ai/yashilandai/openbill/service/OpenThenBillService.java b/src/main/java/com/api/youhong/ai/yashilandai/openbill/service/OpenThenBillService.java
new file mode 100644
index 0000000..0c3ae99
--- /dev/null
+++ b/src/main/java/com/api/youhong/ai/yashilandai/openbill/service/OpenThenBillService.java
@@ -0,0 +1,30 @@
+package com.api.youhong.ai.yashilandai.openbill.service;
+
+import aiyh.utils.Util;
+import com.api.youhong.ai.yashilandai.openbill.mapper.OpenThenBillMapper;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <h1></h1>
+ *
+ * <p>create: 2023/4/25 10:12</p>
+ *
+ * @author youHong.ai
+ */
+public class OpenThenBillService {
+	
+	
+	private final OpenThenBillMapper mapper = Util.getMapper(OpenThenBillMapper.class);
+	
+	public Object getOpenBillListData() {
+		return null;
+	}
+	
+	public List<Map<String, Object>> getData() {
+		List<Map<String, Object>> dataList = mapper.selectList();
+		return null;
+	}
+	
+}
diff --git a/src/main/youhong_ai_jitu_src/com/api/company/CompanyInfo.java b/src/main/youhong_ai_jitu_src/com/api/company/CompanyInfo.java
new file mode 100644
index 0000000..2578a17
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/com/api/company/CompanyInfo.java
@@ -0,0 +1,48 @@
+package com.api.company;
+
+import com.alibaba.fastjson.JSONObject;
+import com.engine.common.util.ParamUtil;
+import jntchina.service.oa.util.ModifyDetailInfo;
+import weaver.general.Util;
+
+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;
+import java.util.HashMap;
+import java.util.Map;
+@Path("/jnt/company")
+public class CompanyInfo {
+    @GET
+    @Path("/test")
+    @Produces({"text/plain"})
+    public String test(@Context HttpServletRequest request, @Context HttpServletResponse response){
+        Map<String, Object> apidatas = new HashMap<String, Object>();
+        System.out.println("de");
+        String mess="";
+        String path="";
+        boolean api_status=true;
+        try {
+            //String field,String fromtableName,String totableName,int modeid,int billid,String qyid 608	9175
+            /** /api/jnt/company/test?field=djgd,cgbl,cgfs,gfzl&fromtableName=uf_jnqyxxbgb_dt1&totableName=uf_jnqyxxbgb_dt2&modeid=35001&billid=608&qyid=9175& **/
+            Map<String, Object> param= ParamUtil.request2Map(request);
+            String field=(String)param.get("field");
+            String fromtableName=(String)param.get("fromtableName");
+            String totableName=(String)param.get("totableName");
+            int modeid= Util.getIntValue((String)param.get("modeid"),0);
+            int billid=Util.getIntValue((String)param.get("billid"),0);;
+            String qyid=(String)param.get("qyid");
+            ModifyDetailInfo modifyDetailInfo=new ModifyDetailInfo(field, fromtableName, totableName, modeid, billid, qyid);
+            modifyDetailInfo.setDtailJson();
+        } catch (Exception e) {
+            mess="异常"+e.getMessage();
+            e.printStackTrace();
+            apidatas.put("status", false);
+            apidatas.put("msg", "catch exception : " + e.getMessage());
+        }
+        return JSONObject.toJSONString(apidatas);
+    }
+}
diff --git a/src/main/youhong_ai_jitu_src/com/api/dys/wdzxys/controller/WdzxysWorkflowController.java b/src/main/youhong_ai_jitu_src/com/api/dys/wdzxys/controller/WdzxysWorkflowController.java
new file mode 100644
index 0000000..936b333
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/com/api/dys/wdzxys/controller/WdzxysWorkflowController.java
@@ -0,0 +1,56 @@
+package com.api.dys.wdzxys.controller;
+
+import aiyh.utils.Util;
+import com.alibaba.fastjson.JSON;
+import com.api.dys.wdzxys.service.WdzxysWorkflowService;
+import io.swagger.v3.oas.annotations.parameters.RequestBody;
+import org.apache.log4j.Logger;
+
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @Author DYS
+ * @Date 2023/3/21 23:15
+ * @description 网点装修验收流程的controller
+ * create at weaver
+ */
+@Path("/dys")
+public class WdzxysWorkflowController {
+    private final Logger log = Util.getLogger();
+    private final WdzxysWorkflowService wdzxysWorkflowService = new WdzxysWorkflowService();
+
+    /**
+     * 获取网点装修验收流程的所属代理商
+     *
+     * @param map
+     * @return
+     */
+    @Path("/getSsdlq")
+    @POST
+    @Produces(MediaType.APPLICATION_JSON)
+    public String getSsdlq(@RequestBody Map<String, Object> map) {
+        log.info("网点装修验收流程的controller:" + map.toString());
+        String ssdlqId = (String) map.get("ssdlqId");//所属代理区id
+        String ssdlqName = (String) map.get("ssdlqName");//所属代理区name
+        log.info("所属代理区id:[" + ssdlqId + "], 所属代理区name:[" + ssdlqName + "]");
+        //根据代理区name查询代理区的网点编码，然后根据网点编码查所属代理区的个数
+        int ssdlqNum = wdzxysWorkflowService.getssdlqName(ssdlqName);
+        Map<String, Object> result = new HashMap<>();
+        result.put("code", "200");
+        result.put("msg", "查询成功");
+        //查询验收数量 验收数量需要单独设置一个建模表，从建模表里面查询 如果是第一次的话就给一个默认值0
+        int dlqyssl = wdzxysWorkflowService.getdlqysNum(ssdlqName);
+        Map<String, Integer> dataMap = new HashMap<>();
+        dataMap.put("ssdlqNum", ssdlqNum);
+        dataMap.put("dlqyssl", dlqyssl);
+        result.put("data", dataMap);
+        log.info("代理区个数以及代理区验收数量:[" + dataMap.toString() + "]");
+        log.info("返回结果:[" + result.toString() + "]");
+        return JSON.toJSONString(result);
+    }
+}
diff --git a/src/main/youhong_ai_jitu_src/com/api/dys/wdzxys/mapper/WdzxysWorkflowMapper.java b/src/main/youhong_ai_jitu_src/com/api/dys/wdzxys/mapper/WdzxysWorkflowMapper.java
new file mode 100644
index 0000000..0db163e
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/com/api/dys/wdzxys/mapper/WdzxysWorkflowMapper.java
@@ -0,0 +1,26 @@
+package com.api.dys.wdzxys.mapper;
+
+import aiyh.utils.annotation.recordset.ParamMapper;
+import aiyh.utils.annotation.recordset.Select;
+import aiyh.utils.annotation.recordset.SqlMapper;
+
+/**
+ * @Author DYS
+ * @Date 2023/3/21 23:21
+ * @description 网点装修验收流程mapper
+ * create at weaver
+ */
+@SqlMapper
+public interface WdzxysWorkflowMapper {
+
+    @Select("select count(1) from uf_netsiteinfo " +
+            "group by belong_area having belong_area = " +
+            "(select net_code from uf_netsiteinfo u where u.net_name = #{ssdlqName})")
+    int getssdlqName(@ParamMapper("ssdlqName") String ssdlqName);
+
+    @Select("select dlqyssl from uf_dlqyssl where dlqmc = #{ssdlqName}")
+    int getdlqysNum(@ParamMapper("ssdlqName") String ssdlqName);
+
+    @Select("select count(1) from uf_dlqyssl where dlqmc = #{ssdlqName}")
+    int getIfHasdlqmc(@ParamMapper("ssdlqName") String ssdlqName);
+}
diff --git a/src/main/youhong_ai_jitu_src/com/api/dys/wdzxys/service/WdzxysWorkflowService.java b/src/main/youhong_ai_jitu_src/com/api/dys/wdzxys/service/WdzxysWorkflowService.java
new file mode 100644
index 0000000..ab260fe
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/com/api/dys/wdzxys/service/WdzxysWorkflowService.java
@@ -0,0 +1,39 @@
+package com.api.dys.wdzxys.service;
+
+import aiyh.utils.Util;
+import com.api.dys.wdzxys.mapper.WdzxysWorkflowMapper;
+import weaver.conn.RecordSet;
+
+/**
+ * @Author DYS
+ * @Date 2023/3/21 23:22
+ * @description 网点装修验收流程业务实现类
+ * create at weaver
+ */
+public class WdzxysWorkflowService {
+    private final WdzxysWorkflowMapper wdzxysWorkflowMapper = Util.getMapper(WdzxysWorkflowMapper.class);
+
+    /**
+     * 根据所属代理区
+     *
+     * @param ssdlqName
+     * @return
+     */
+    public int getssdlqName(String ssdlqName) {
+        return wdzxysWorkflowMapper.getssdlqName(ssdlqName);
+    }
+
+    /**
+     * 流程归档时 代理区验收数量
+     *
+     * @param ssdlqName
+     * @return
+     */
+    public int getdlqysNum(String ssdlqName) {
+        int ifHasdlq = wdzxysWorkflowMapper.getIfHasdlqmc(ssdlqName);
+        if (ifHasdlq == 0) {
+            return 0;
+        }
+        return wdzxysWorkflowMapper.getdlqysNum(ssdlqName);
+    }
+}
diff --git a/src/main/youhong_ai_jitu_src/com/api/lh/action/CreateSubprocessAction.java b/src/main/youhong_ai_jitu_src/com/api/lh/action/CreateSubprocessAction.java
new file mode 100644
index 0000000..8705000
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/com/api/lh/action/CreateSubprocessAction.java
@@ -0,0 +1,323 @@
+package com.api.lh.action;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.api.lh.config.DemoConfig;
+import com.api.lh.util.CreateProcessUtil;
+import selfdev.util.base.BaseUtil;
+import selfdev.util.log.LogTool;
+import weaver.conn.RecordSet;
+import weaver.file.Prop;
+import weaver.general.Util;
+import weaver.interfaces.workflow.action.Action;
+import weaver.soa.workflow.request.*;
+import weaver.workflow.workflow.WorkflowVersion;
+
+import java.util.Arrays;
+
+/**
+ * @ClassName CreateSubprocessAction
+ * @Description 创建 01-付款申请-J&T中国(不对接NCC)流程
+ * @Author louh
+ * @Date 2022/4/6 13:53
+ * @Version 1.0
+ */
+public class CreateSubprocessAction implements Action, DemoConfig {
+    LogTool log = new LogTool("/log/lh/CreateSubprocessAction", false);
+    //当前环境
+    String mode = Prop.getPropValue("DevToProcess_jntchina", "mode");
+    //付款申请流程id
+    String fk_workflowid = Prop.getPropValue("DevToProcess_jntchina", mode + "_fk_workflowid");
+
+
+    @Override
+    public String execute(RequestInfo ri) {
+        RecordSet rs = new RecordSet();
+        RecordSet rs1 = new RecordSet();
+
+        String requestid = ri.getRequestid();
+        String workflowid = ri.getWorkflowid();
+        try {
+            WorkflowVersion workflowVersion = new WorkflowVersion(fk_workflowid);
+            String newFid = workflowVersion.getActiveVersionWFID();
+
+            //获取表名
+            String tablename = BaseUtil.getBaseInfoByParm("tablename", "workflow_bill", "1", "1", " and id in (select formid from workflow_base where id=" + workflowid + ")");
+            log.writeLog("requestid---> " + requestid + "对应表名tablename---> " + tablename);
+            //主表数据id
+            String id = BaseUtil.getBaseInfoByParm("id", tablename, "requestid", requestid, "");
+
+            //主表申请日期
+            String sqrq = BaseUtil.getBaseInfoByParm("sqrq", tablename, "requestid", requestid, "");
+            //获取明细表不同批次号数据
+            String sql = "select distinct pch,sfsczlccg from " + tablename + "_dt1 where mainid = " + id;
+            log.writeLog("获取明细表数据sql----> " + sql);
+            rs.execute(sql);
+            while (rs.next()) {
+                //实际付款金额
+                double sum = 0.00;
+                //批次号
+                String pch = Util.null2String(rs.getString("pch")).trim();
+                if ("".equals(pch)) {
+                    ri.getRequestManager().setMessagecontent("批次号不允许为空!");
+                    return FAILURE_AND_CONTINUE;
+                }
+                //是否生成子流程成功
+                String sfsczlccg = Util.null2String(rs.getString("sfsczlccg"));
+                //成功生成子流程则不再生成
+                if ("0".equals(sfsczlccg)) {
+                    continue;
+                }
+                //生成子流程
+                RequestService requestService = new RequestService();
+                RequestInfo requestInfo = new RequestInfo();
+
+                //流程workflowid
+                requestInfo.setWorkflowid(newFid);
+                //提醒
+                requestInfo.setRemindtype("0");
+                //紧急程度
+                requestInfo.setRequestlevel("0");
+                //是否自动流转
+                requestInfo.setIsNextFlow("0");
+
+                /* 根据批次号查询该批次号有多少条数据 */
+                String pchSql = "select * from " + tablename + "_dt1 where mainid = " + id + " and pch = " + pch;
+                log.writeLog("根据批次号查询该批次号有多少条数据---> " + pchSql);
+
+                rs1.execute(pchSql);
+
+                //流程创建人id
+                String peopleId = "";
+                //流程标题
+                String bt = "";
+                //公司名称
+                String gsmc = "";
+                //申请人部门id
+                String departmentid = "";
+                //申请人分部id
+                String subcompanyid1 = "";
+                //是否有合同
+                String sfyht = "";
+                //预计付款日期
+                String yjfkrq = "";
+                //供应商名称
+                String gysmc = "";
+                //账户名称
+                String khmc = "";
+                //银行账号
+                String yxzh = "";
+                //开户行
+                String khx = "";
+                //发票号码
+                String fphm = "";
+                //发票类型
+                String fplx = "";
+                //发票日期
+                String fprq = "";
+                //付款说明
+                String fksm = "";
+                //付款类型
+                String fklx = "";
+
+                //拼接明细表数据
+                DetailTableInfo dti = new DetailTableInfo();
+                DetailTable[] dt = new DetailTable[0];
+                int i = 0;
+                while (rs1.next()) {
+                    String sqrgh = Util.null2String(rs1.getString("sqrgh"));  /* 申请人工号 */
+                    /* 根据人员工号获取人员id  */
+                    peopleId = BaseUtil.getBaseInfoByParm("id", "hrmresource", "workcode", sqrgh, "");
+                    if ("".equals(peopleId)) {
+                        ri.getRequestManager().setMessagecontent("当前明细表申请人工号【" + sqrgh + "】未找到对应人员,请确认工号是否正确！");
+                        return FAILURE_AND_CONTINUE;
+                    }
+                    //标题
+                    bt = Util.null2String(rs1.getString("bt"));
+                    //公司名称
+                    gsmc = Util.null2String(rs1.getString("gsmc"));
+                    //申请人部门id
+                    departmentid = BaseUtil.getBaseInfoByParm("departmentid", "hrmresource", "workcode", sqrgh, "");
+                    //申请人分部id
+                    subcompanyid1 = BaseUtil.getBaseInfoByParm("subcompanyid1", "hrmresource", "workcode", sqrgh, "");
+                    //是否有合同
+                    sfyht = Util.null2String(rs1.getString("sfyht")).trim();
+                    //预计付款日期
+                    yjfkrq = Util.null2String(rs1.getString("yjfkrq"));
+                    //供应商名称
+                    gysmc = Util.null2String(rs1.getString("gysmc"));
+                    //账户名称
+                    khmc = Util.null2String(rs1.getString("khmc"));
+                    //银行账号
+                    yxzh = Util.null2String(rs1.getString("yxzh"));
+                    //开户行
+                    khx = Util.null2String(rs1.getString("khx"));
+                    //发票号码
+                    fphm = Util.null2String(rs1.getString("fphm"));
+                    //发票类型
+                    fplx = Util.null2String(rs1.getString("fplx"));
+                    //发票日期
+                    fprq = Util.null2String(rs1.getString("fprq"));
+                    //付款说明
+                    fksm = Util.null2String(rs1.getString("fksm"));
+                    //付款类型
+                    fklx = Util.null2String(rs1.getString("fklx"));
+                    //行数据
+                    Row[] row = new Row[0];
+                    //添加单元格到行
+                    Cell[] c = new Cell[0];
+                    //添加子表数据
+                    row = Arrays.copyOf(row, (row.length + 1));
+                    row[row.length - 1] = new Row();
+                    row[row.length - 1].setId((i + 1) + "");
+                    //费用承担部门
+                    String fycdbmbm = Util.null2String(rs1.getString("fycdbmbm"));  /* 费用承担部门编码 */
+                    String bmid = BaseUtil.getBaseInfoByParm("id", "hrmdepartment", "departmentcode", fycdbmbm, "");
+
+                    c = CreateProcessUtil.setCell(c, "fycdbm", bmid);
+                    //不含税金额
+                    String bhsje = Util.null2String(rs1.getString("bhsje"));
+                    if (!"".equals(bhsje)) {
+                        bhsje = bhsje.replaceAll(",", "");
+                    } else {
+                        bhsje = "0.00";
+                    }
+                    c = CreateProcessUtil.setCell(c, "bhsje", bhsje);
+                    //税率
+                    c = CreateProcessUtil.setCell(c, "sl", Util.null2String(rs1.getString("sl")));
+                    //税额
+                    String se = Util.null2String(rs1.getString("se"));
+                    if (!"".equals(se)) {
+                        se = se.replaceAll(",", "");
+                    } else {
+                        se = "0.00";
+                    }
+                    c = CreateProcessUtil.setCell(c, "se", se);
+                    //价税合计
+                    String jshj = Util.null2String(rs1.getString("jshj"));
+                    if (!"".equals(jshj)) {
+                        jshj = jshj.replaceAll(",", "");
+                    } else {
+                        jshj = "0.00";
+                    }
+                    sum += Double.parseDouble(jshj);
+                    c = CreateProcessUtil.setCell(c, "jshj", jshj);
+                    //添加一行
+                    row[row.length - 1].setCell(c);
+
+                    dt = Arrays.copyOf(dt, (dt.length + 1));
+                    dt[dt.length - 1] = new DetailTable();
+                    dt[dt.length - 1].setId("1");//明细表  dt1  后面的1
+                    dt[dt.length - 1].setRow(row);
+
+                    ++i;
+                }
+                dti.setDetailTable(dt);
+                log.writeLog("明细表数据: " + JSON.toJSONString(dti));
+                requestInfo.setDetailTableInfo(dti);
+
+
+                /* 流程创建人id */
+                requestInfo.setCreatorid(peopleId);
+                //流程标题
+                requestInfo.setDescription(bt);
+                //设置主表字段
+                Property[] p = new Property[0];
+                //公司名称
+                p = CreateProcessUtil.setProperty(p, "gsmc", gsmc);
+                //创建日期
+                p = CreateProcessUtil.setProperty(p, "cjrq", sqrq);
+                //申请人部门id
+                p = CreateProcessUtil.setProperty(p, "fygsbm", departmentid);
+                p = CreateProcessUtil.setProperty(p, "zz", subcompanyid1);
+                //姓名
+                p = CreateProcessUtil.setProperty(p, "xm", peopleId);
+                //是否有合同
+                sfyht = getSelectValue(sfyht, requestInfo.getWorkflowid(), "sfyht", "");
+                //sfyht = getSelectValue(sfyht_fieldid, sfyht);
+                p = CreateProcessUtil.setProperty(p, "sfyht", sfyht);
+                //预计付款日期
+                p = CreateProcessUtil.setProperty(p, "yjfkrq", yjfkrq);
+                //供应商名称
+                p = CreateProcessUtil.setProperty(p, "gysmc", gysmc);
+                //账户名称
+                p = CreateProcessUtil.setProperty(p, "yzhm", khmc);
+                //银行账号
+                p = CreateProcessUtil.setProperty(p, "yxhm", yxzh);
+                //开户行
+                p = CreateProcessUtil.setProperty(p, "yxmz", khx);
+                //发票号码
+                p = CreateProcessUtil.setProperty(p, "fphm", fphm);
+                //发票类型
+                fplx = getSelectValue(fplx, requestInfo.getWorkflowid(), "fplx", "");
+                //fplx = getSelectValue(fplx_fieldid, fplx);
+                p = CreateProcessUtil.setProperty(p, "fplx", fplx);
+                //发票日期
+                p = CreateProcessUtil.setProperty(p, "fprq", fprq);
+                //付款说明
+                p = CreateProcessUtil.setProperty(p, "fksm", fksm);
+
+                //实际付款金额大写
+                p = CreateProcessUtil.setProperty(p, "sjfkje2", sum + "");
+
+                //付款方式 默认 银行汇款
+                p = CreateProcessUtil.setProperty(p, "fkfs", "0");
+                //币种 默认RMB
+                p = CreateProcessUtil.setProperty(p, "bz", "1");
+                //付款类型 默认航空费
+                p = CreateProcessUtil.setProperty(p, "fklx1", fklx);
+                //区域
+                String fbid = BaseUtil.getBaseInfoByParm("subcompanyid1", "hrmresource", "id", peopleId, "");
+                p = CreateProcessUtil.setProperty(p, "qy", fbid);
+                /**********************************新加字段*****************************************/
+                //是否杭百费用 0:是 1:否 为否则显示付款类型值
+                p = CreateProcessUtil.setProperty(p, "sfhbfy", "1");
+
+                //添加主表数据
+                MainTableInfo mti = new MainTableInfo();
+                mti.setProperty(p);
+                log.writeLog("主表数据: " + JSON.toJSONString(mti));
+                requestInfo.setMainTableInfo(mti);
+                //创建流程
+                String request = requestService.createRequest(requestInfo);
+                JSONObject judge = CreateProcessUtil.judge(request);
+                if ("1".equals(judge.getString("status"))) {
+                    ri.getRequestManager().setMessagecontent("流程创建失败!");
+                    //修改明细表数据
+                    String updSql = "update " + tablename + "_dt1 set sfsczlccg = '" + judge.getString("status") + "', cfzlcxx = '" + judge.getString("msg") + "', cfrequestid = '" + judge.getString("requestid") + "' where mainid = " + id + " and pch = '" + pch + "'";
+                    log.writeLog("修改明细表数据sql----> " + updSql);
+                    rs.execute(updSql);
+                    return FAILURE_AND_CONTINUE;
+                }
+                //修改明细表数据
+                String updSql = "update " + tablename + "_dt1 set sfsczlccg = '" + judge.getString("status") + "', cfzlcxx = '" + judge.getString("msg") + "', cfrequestid = '" + judge.getString("requestid") + "' where mainid = " + id + " and pch = '" + pch + "'";
+                log.writeLog("修改明细表数据sql----> " + updSql);
+                rs.execute(updSql);
+            }
+        } catch (Exception e) {
+            log.writeLog("出现异常---> " + e);
+            ri.getRequestManager().setMessagecontent("内部出错,联系管理员查看问题!");
+            return FAILURE_AND_CONTINUE;
+        }
+        return SUCCESS;
+    }
+
+
+    /**
+     * 根据字段id和选中名称获取
+     *
+     * @param fieldid
+     * @param selectname
+     * @return
+     */
+    public String getSelectValue(String fieldid, String selectname) {
+        RecordSet rs = new RecordSet();
+        String selectValue = "";
+        String sql = "select selectvalue from workflow_selectitem where fieldid = " + fieldid + " and convtomultilang(selectname,7) = '" + selectname + "'";
+        rs.execute(sql);
+        if (rs.next()) {
+            selectValue = Util.null2String(rs.getString("selectvalue"));
+        }
+        return selectValue;
+    }
+}
diff --git a/src/main/youhong_ai_jitu_src/com/api/lh/action/CurrencyModifyAccountAction.java b/src/main/youhong_ai_jitu_src/com/api/lh/action/CurrencyModifyAccountAction.java
new file mode 100644
index 0000000..21b0a74
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/com/api/lh/action/CurrencyModifyAccountAction.java
@@ -0,0 +1,125 @@
+package com.api.lh.action;
+
+import com.api.lh.config.DemoConfig;
+
+import selfdev.util.log.LogTool;
+import weaver.conn.RecordSet;
+import weaver.conn.RecordSetTrans;
+import weaver.general.Util;
+import weaver.interfaces.workflow.action.Action;
+import weaver.soa.workflow.request.RequestInfo;
+
+/**
+ * @ClassName CurrencyModifyAccountAction
+ * @Description 同步冲抵明细信息数据到 --- 供应商预付欠票台账中
+ * @Author louh
+ * @Date 2022/4/27 16:04
+ * @Version 1.0
+ */
+public class CurrencyModifyAccountAction implements Action, DemoConfig {
+    @Override
+    public String execute(RequestInfo ri) {
+        String requestid = ri.getRequestid();
+        String workflowid = ri.getWorkflowid();
+        RecordSet rs = new RecordSet();
+        RecordSet rs1 = new RecordSet();
+        RecordSet rs2 = new RecordSet();
+        RecordSet rs3 = new RecordSet();
+        RecordSetTrans rst = new RecordSetTrans();
+        rst.setAutoCommit(false);
+        try{
+            String tableName = getTableName(workflowid);
+            log.writeLog("requestid---> " + requestid + "对应表名tablename---> " + tableName);
+            String id = getId(tableName, requestid);
+            String sql = "select  yfkqptzmxid, count(yfkqptzmxid) as sum from " + tableName + "_dt1 where mainid = " + id + " group by yfkqptzmxid having count(yfkqptzmxid) > 1";
+            log.writeLog("根据主表数据id查询当前明细表数据是否有多次选择同一个预付款欠票台账明细id【yfkqptzmxid】sql---->" + sql);
+            rs.execute(sql);
+            if(rs.next()){
+                ri.getRequestManager().setMessagecontent("同一张单据不允许多次选择相同的【预付款欠票台账明细id】,请重新选择抵扣明细表不同的【预付款欠票台账明细id】数据。");
+                return FAILURE_AND_CONTINUE;
+            }
+            sql = "select * from "+ tableName + "_dt1 where mainid = "+ id;
+            log.writeLog("查询当前单据抵扣明细详细信息sql------> " + sql);
+            rs.execute(sql);
+            while(rs.next()){
+                String yfkqptzmxid = Util.null2String(rs.getString("yfkqptzmxid"));  /* 预付款欠票台账明细id */
+//                double yfje = Double.parseDouble(Util.null2String(rs.getString("yfje")) == "" ? "0.00" : Util.null2String(rs.getString("yfje")));  /* 预付金额 */
+                double bcdjje = Double.parseDouble(Util.null2String(rs.getString("bcdjje")) == "" ? "0.00" : Util.null2String(rs.getString("bcdjje")));  /* 本次抵扣金额 */
+                String bz = Util.null2String(rs.getString("bz"));/* 备注 */
+                String nccdh = Util.null2String(rs.getString("nccdh"));  /* ncc单号 */
+                String xgyflc = Util.null2String(rs.getString("xgyflc"));  //相关预付流程
+                String sql1 = "select * from uf_fksqyfb_dt1 where id = " + yfkqptzmxid;
+                log.writeLog("查询台账本次抵扣流程信息sql----> " + sql1);
+                rs1.execute(sql1);
+                //已核销金额
+                double yhxje = 0.00;
+                //剩余未核销金额
+                double sywhxje = 0.00;
+                //预付款金额
+                double fkje = 0.00;
+                //相关核销流程
+                String xghxlc = "";
+                if(rs1.next()){
+                    xghxlc = Util.null2String(rs1.getString("xghxlc"));
+                    yhxje = Double.parseDouble(Util.null2String(rs1.getString("yhxje")) == "" ? "0.00" : Util.null2String(rs1.getString("yhxje")));
+                    sywhxje = Double.parseDouble(Util.null2String(rs1.getString("sywhxje")) == "" ? "0.00" : Util.null2String(rs1.getString("sywhxje")));
+                    fkje = Double.parseDouble(Util.null2String(rs1.getString("fkje")) == "" ? "0.00" : Util.null2String(rs1.getString("fkje")));
+                }
+                if(bcdjje > sywhxje){
+                    ri.getRequestManager().setMessagecontent("当前抵扣明细本次抵扣金额【" + bcdjje + "】大于剩余未核销金额【" + sywhxje + "】,请确认金额是否正确。");
+                    return FAILURE_AND_CONTINUE;
+                }
+                yhxje = bcdjje + yhxje;
+                if(yhxje > fkje){
+                    ri.getRequestManager().setMessagecontent("当前抵扣明细本次抵扣金额与历史抵扣金额共【" + yhxje + "】大于借款总金额【" + fkje + "】,请确认金额是否正确。");
+                    return FAILURE_AND_CONTINUE;
+                }
+                sywhxje = fkje - yhxje;
+                if(sywhxje < 0.00){
+                    ri.getRequestManager().setMessagecontent("当前抵扣明细单据总金额【"+ fkje + "】,核销总金额【" + yhxje + "】相减,则剩余未核销金额小于0.00元,请确认金额是否正确。");
+                    return FAILURE_AND_CONTINUE;
+                }
+
+                if("".equals(xghxlc)){
+                    xghxlc = requestid;
+                }else {
+                    xghxlc += "," + requestid;
+                }
+
+
+                String updSql = "update uf_fksqyfb_dt1 set " +
+                        "yhxje = '" + yhxje + "', " +
+                        "sywhxje = '" + sywhxje + "'," +
+                        " xghxlc ='" + xghxlc + "' where id = '" + yfkqptzmxid + "'";
+                log.writeLog("修改台账信息sql-----> " + updSql);
+                rst.executeSql(updSql);
+
+                sql1 = "select * from uf_fksqyfb where qqid = '" + xgyflc + "'" ;
+                log.writeLog("查询主表总预付金额及核销金额sql----> " + sql1);
+                rs2.execute(sql1);
+                double fkje1 = 0.00;
+                double yhxje1 = 0.00;
+                double sywhxje1 = 0.00;
+                if (rs2.next()){
+                    fkje1 = Double.parseDouble(Util.null2String(rs2.getString("fkje"))==""?"0.00":Util.null2String(rs2.getString("fkje")));//付款金额
+                    yhxje1 = Double.parseDouble(Util.null2String(rs2.getString("yhxje"))==""?"0.00":Util.null2String(rs2.getString("yhxje")));//已核销金额
+                    sywhxje1 = Double.parseDouble(Util.null2String(rs2.getString("sywhxje"))==""?"0.00":Util.null2String(rs2.getString("sywhxje")));//剩余金额
+                }
+                double bchxje = bcdjje + yhxje1;
+                sywhxje1 = fkje1 - bchxje;
+                updSql = "update uf_fksqyfb set yhxje = '" + bchxje + "'," +
+                        " sywhxje ='" + sywhxje1 + "' where ncclcdh = '" + nccdh + "' and qqid = '" + xgyflc + "'"  ;
+                log.writeLog("修改本次台账主表信息sql-----> " + updSql);
+                //rst.executeSql(updSql);
+                rs3.execute(updSql);
+            }
+            rst.commit();
+        }catch (Exception e){
+            rst.rollback();
+            log.writeLog("出现异常-----> " + e);
+            ri.getRequestManager().setMessagecontent("系统内部出错----> " + e);
+            return FAILURE_AND_CONTINUE;
+        }
+        return SUCCESS;
+    }
+}
diff --git a/src/main/youhong_ai_jitu_src/com/api/lh/action/CurrencyModifyAccountActionYY.java b/src/main/youhong_ai_jitu_src/com/api/lh/action/CurrencyModifyAccountActionYY.java
new file mode 100644
index 0000000..f0c92c4
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/com/api/lh/action/CurrencyModifyAccountActionYY.java
@@ -0,0 +1,123 @@
+package com.api.lh.action;
+
+import com.api.lh.config.DemoConfig;
+import weaver.conn.RecordSet;
+import weaver.conn.RecordSetTrans;
+import weaver.general.Util;
+import weaver.interfaces.workflow.action.Action;
+import weaver.soa.workflow.request.RequestInfo;
+
+/**
+ * @ClassName CurrencyModifyAccountAction
+ * @Description 同步冲抵明细信息数据到 --- 供应商预付欠票台账中
+ * @Author ycf
+ * @Date 2022/4/27 16:04
+ * @Version 1.0
+ */
+public class CurrencyModifyAccountActionYY implements Action, DemoConfig {
+    @Override
+    public String execute(RequestInfo ri) {
+        String requestid = ri.getRequestid();
+        String workflowid = ri.getWorkflowid();
+        RecordSet rs = new RecordSet();
+        RecordSet rs1 = new RecordSet();
+        RecordSet rs2 = new RecordSet();
+        RecordSet rs3 = new RecordSet();
+        RecordSetTrans rst = new RecordSetTrans();
+        rst.setAutoCommit(false);
+        try{
+            String tableName = getTableName(workflowid);
+            log.writeLog("requestid---> " + requestid + "对应表名tablename---> " + tableName);
+            String id = getId(tableName, requestid);
+            String sql = "select  yfkqptzmxid, count(yfkqptzmxid) as sum from " + tableName + "_dt1 where mainid = " + id + " group by yfkqptzmxid having count(yfkqptzmxid) > 1";
+            log.writeLog("根据主表数据id查询当前明细表数据是否有多次选择同一个预付款欠票台账明细id【yfkqptzmxid】sql---->" + sql);
+            rs.execute(sql);
+            if(rs.next()){
+                ri.getRequestManager().setMessagecontent("同一张单据不允许多次选择相同的【预付款欠票台账明细id】,请重新选择抵扣明细表不同的【预付款欠票台账明细id】数据。");
+                return FAILURE_AND_CONTINUE;
+            }
+            sql = "select * from "+ tableName + "_dt1 where mainid = "+ id;
+            log.writeLog("查询当前单据抵扣明细详细信息sql------> " + sql);
+            rs.execute(sql);
+            while(rs.next()){
+                String yfkqptzmxid = Util.null2String(rs.getString("yfkqptzmxid"));  /* 预付款欠票台账明细id */
+//                double yfje = Double.parseDouble(Util.null2String(rs.getString("yfje")) == "" ? "0.00" : Util.null2String(rs.getString("yfje")));  /* 预付金额 */
+                double bcdjje = Double.parseDouble(Util.null2String(rs.getString("bcdjje")) == "" ? "0.00" : Util.null2String(rs.getString("bcdjje")));  /* 本次抵扣金额 */
+                String bz = Util.null2String(rs.getString("bz"));/* 备注 */
+                String nccdh = Util.null2String(rs.getString("nccdh"));  /* ncc单号 */
+                String xgyflc = Util.null2String(rs.getString("xgyflc"));  //相关预付流程
+                String sql1 = "select * from uf_gysqktzyy_dt1 where id = " + yfkqptzmxid;
+                log.writeLog("查询台账本次抵扣流程信息sql----> " + sql1);
+                rs1.execute(sql1);
+                //已核销金额
+                double yhxje = 0.00;
+                //剩余未核销金额
+                double sywhxje = 0.00;
+                //预付款金额
+                double fkje = 0.00;
+                //相关核销流程
+                String xghxlc = "";
+                if(rs1.next()){
+                    xghxlc = Util.null2String(rs1.getString("xghxlc"));
+                    yhxje = Double.parseDouble(Util.null2String(rs1.getString("yhxje")) == "" ? "0.00" : Util.null2String(rs1.getString("yhxje")));
+                    sywhxje = Double.parseDouble(Util.null2String(rs1.getString("sywhxje")) == "" ? "0.00" : Util.null2String(rs1.getString("sywhxje")));
+                    fkje = Double.parseDouble(Util.null2String(rs1.getString("fkje")) == "" ? "0.00" : Util.null2String(rs1.getString("fkje")));
+                }
+                if(bcdjje > sywhxje){
+                    ri.getRequestManager().setMessagecontent("当前抵扣明细本次抵扣金额【" + bcdjje + "】大于剩余未核销金额【" + sywhxje + "】,请确认金额是否正确。");
+                    return FAILURE_AND_CONTINUE;
+                }
+                yhxje = bcdjje + yhxje;
+                if(yhxje > fkje){
+                    ri.getRequestManager().setMessagecontent("当前抵扣明细本次抵扣金额与历史抵扣金额共【" + yhxje + "】大于借款总金额【" + fkje + "】,请确认金额是否正确。");
+                    return FAILURE_AND_CONTINUE;
+                }
+                sywhxje = fkje - yhxje;
+                if(sywhxje < 0.00){
+                    ri.getRequestManager().setMessagecontent("当前抵扣明细单据总金额【"+ fkje + "】,核销总金额【" + yhxje + "】相减,则剩余未核销金额小于0.00元,请确认金额是否正确。");
+                    return FAILURE_AND_CONTINUE;
+                }
+
+                if("".equals(xghxlc)){
+                    xghxlc = requestid;
+                }else {
+                    xghxlc += "," + requestid;
+                }
+
+
+                String updSql = "update uf_gysqktzyy_dt1 set " +
+                        "yhxje = '" + yhxje + "', " +
+                        "sywhxje = '" + sywhxje + "'," +
+                        " xghxlc ='" + xghxlc + "' where id = '" + yfkqptzmxid + "'";
+                log.writeLog("修改台账信息sql-----> " + updSql);
+                rst.executeSql(updSql);
+
+                sql1 = "select * from uf_gysqktzyy where qqid = '" + xgyflc + "'" ;
+                rs2.execute(sql1);
+                double fkje1 = 0.00;
+                double yhxje1 = 0.00;
+                double sywhxje1 = 0.00;
+                if (rs2.next()){
+                    fkje1 = Double.parseDouble(Util.null2String(rs2.getString("fkje"))==""?"0.00":Util.null2String(rs2.getString("fkje")));//付款金额
+                    yhxje1 = Double.parseDouble(Util.null2String(rs2.getString("yhxje"))==""?"0.00":Util.null2String(rs2.getString("yhxje")));//已核销金额
+                    sywhxje1 = Double.parseDouble(Util.null2String(rs2.getString("sywhxje"))==""?"0.00":Util.null2String(rs2.getString("sywhxje")));//剩余金额
+                }
+                double bchxje = bcdjje + yhxje1;
+                sywhxje1 = fkje1 - bchxje;
+                updSql = "update uf_gysqktzyy set yhxje = '" + bchxje + "'," +
+                        " sywhxje ='" + sywhxje1 + "' where ncclcdh = '" + nccdh + "' and qqid = '" + xgyflc + "'"  ;
+                log.writeLog("修改本次台账主表信息sql-----> " + updSql);
+                //rst.executeSql(updSql);
+                rs3.execute(updSql);
+
+            }
+            rst.commit();
+        }catch (Exception e){
+            rst.rollback();
+            log.writeLog("出现异常-----> " + e);
+            ri.getRequestManager().setMessagecontent("系统内部出错----> " + e);
+            return FAILURE_AND_CONTINUE;
+        }
+        return SUCCESS;
+    }
+}
diff --git a/src/main/youhong_ai_jitu_src/com/api/lh/action/NCCAdvanceTossAction.java b/src/main/youhong_ai_jitu_src/com/api/lh/action/NCCAdvanceTossAction.java
new file mode 100644
index 0000000..dbcd315
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/com/api/lh/action/NCCAdvanceTossAction.java
@@ -0,0 +1,191 @@
+package com.api.lh.action;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.api.lh.port.AddJournal;
+import com.api.lh.port.Items;
+import com.api.lh.port.StuData;
+import com.api.lh.util.DUtil;
+import jntchina.util.HttpClientToDC;
+import selfdev.util.base.BaseUtil;
+import selfdev.util.log.LogTool;
+import weaver.conn.RecordSet;
+import weaver.file.Prop;
+import weaver.general.Util;
+import weaver.interfaces.workflow.action.Action;
+import weaver.soa.workflow.request.RequestInfo;
+
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @ClassName NCCAdvanceTossAction
+ * @Description 抛转预付单数据给NCC
+ * @Author louh
+ * @Date 2022/3/9 11:06
+ * @Version 1.0
+ */
+public class NCCAdvanceTossAction implements Action {
+
+    LogTool log = new LogTool("/log/lh/action/NCCAdvanceTossAction", false);
+    static final String  mode = Prop.getPropValue("DevToDC_jntchina","mode");
+    static final String baseUrl = Prop.getPropValue("DevToDC_jntchina", mode + "_baseUrl");
+
+    @Override
+    public String execute(RequestInfo ri) {
+        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        String date = dateFormat.format(new Date());
+        String startDate = date.substring(0, 10);
+        String endDate = date.substring(11);
+        date = getNewDate(startDate, endDate);
+        JSONObject json = new JSONObject();
+        RecordSet rs = new RecordSet();
+        String xrnccsbcsfts = "";
+        String s= "";
+        //单据属性
+        String djsx = "";
+        String requestid = ri.getRequestid();
+        String workflowid = ri.getWorkflowid();
+        try{
+            //获取表名
+            String tablename = BaseUtil.getBaseInfoByParm("tablename", "workflow_bill", "1", "1", " and id in (select formid from workflow_base where id=" + workflowid + ")");
+            log.writeLog("requestid---> " + requestid + "对应表名tablename---> " + tablename);
+            /* 主表数据id */
+            String id = BaseUtil.getBaseInfoByParm("id", tablename, "requestid", requestid, "");
+            /* 流程编号 */
+            String lcbh = BaseUtil.getBaseInfoByParm("lcbh", tablename, "requestid", requestid, "");
+            /* 供应商名称 */
+            String gysmc = BaseUtil.getBaseInfoByParm("gysmc", tablename, "requestid", requestid, "");
+            /* 付款金额 */
+            String fkje = BaseUtil.getBaseInfoByParm("jshjje", tablename, "requestid", requestid, "");
+            /* 公司名称(NCC财务组织编码) */
+            String gsmc = BaseUtil.getBaseInfoByParm("gsmc", tablename, "requestid", requestid, "");
+            /* 制单人 */
+            String zdr = BaseUtil.getBaseInfoByParm("zdr", tablename, "requestid", requestid, "");
+            /* 制单人编码 */
+            String workcode = BaseUtil.getBaseInfoByParm("workcode", "hrmresource", "id", zdr, "");
+            /* 部门 */
+            String bm = BaseUtil.getBaseInfoByParm("fygsbm", tablename, "requestid", requestid, "");
+            /* 部门编码 */
+            String departmentcode = BaseUtil.getBaseInfoByParm("departmentcode", "hrmdepartment", "id", bm, "");
+            /* 银行账号 */
+            String yxhm = BaseUtil.getBaseInfoByParm("yxhm", tablename, "requestid", requestid, "");
+            //是否提示报错信息
+            xrnccsbcsfts = BaseUtil.getBaseInfoByParm("xrnccsbcsfts", tablename, "requestid", requestid, "");
+            //银行付款备注
+            String yxfkbz = BaseUtil.getBaseInfoByParm("yxfkbz", tablename, "requestid", requestid, "");
+
+            double je = Double.parseDouble(fkje.replaceAll(",", ""));
+            String sql = "select * from " + tablename + "_dt2 where mainid = " + id;
+            log.writeLog("查询应付单明细数据sql-----> " + sql);
+            rs.execute(sql);
+            List<Items> list = new ArrayList<>();
+            while(rs.next()){
+                /* 本次付款金额 */
+                String je1 = Util.null2String(rs.getString("bcfkje"));
+                double v = Double.parseDouble(je1.replaceAll(",", ""));
+                /* 付款计划唯一id */
+                String fkjhwyid = Util.null2String(rs.getString("fkjhwyid"));
+                /* 采购订单明细id */
+                String cgddmxid = Util.null2String(rs.getString("cgddmxid"));
+                /* 采购订单号 */
+                String cgddh = Util.null2String(rs.getString("cgddh"));
+                /* 摘要 */
+                String zy = Util.null2String(rs.getString("zy"));
+                /* 成本中心 */
+                String wd = Util.null2String(rs.getString("wd"));
+
+                djsx = Util.null2String(rs.getString("fkdbm"));
+                s = djsx == "F3-Cxx-06" ? "" : djsx;
+                Items items = new Items("1", gysmc,departmentcode, "", "1","CNY",v + "",
+                        "1",v + "","1",v + "","1",
+                        v + "","1",v + "",cgddmxid,cgddh,fkjhwyid,"",
+                        zy, s, "", departmentcode, yxhm, "", wd);
+
+                list.add(items);
+            }
+            StuData stuData = new StuData(gsmc,s,date,"1","CNY",yxhm,je + "",
+                    "1",je + "","1",je + "","1",je + "",
+                    workcode,requestid,lcbh,gysmc,list,departmentcode, "", yxfkbz);
+            json = (JSONObject) JSONObject.toJSON(stuData);
+            log.writeLog("json-----> " + json);
+            /* 调用NCC付款单接口 */
+
+            //获取token
+            String token = HttpClientToDC.getToken();
+            log.writeLog("获取中台的数据token----》 " + token);
+            if ("".equals(weaver.general.Util.null2String(token))) {
+                ri.getRequestManager().setMessagecontent("未获取到中台token，请联系管理员查看问题！");
+                return FAILURE_AND_CONTINUE;
+            }
+            String result = HttpClientToDC.sendPostApi(baseUrl + "/dcoaapi/ncc/sendPreBill", token, json.toJSONString());
+
+            //String result = NCCUtils.sendApi(baseUrl + "/dcoaapi/ncc/sendPreBill", json.toJSONString());
+            log.writeLog("result----> " + result);
+
+            JSONObject parse = (JSONObject) JSONObject.parse(result);
+            String success = parse.getString("succ");
+            String msg = parse.getString("msg");
+            if(success.equals("true")) {
+                JSONObject data = parse.getJSONObject("data");
+                String billno = data.getString("billno");  /* ncc单据号 */
+                String pk_bill = data.getString("pk_bill");/* ncc单据主键 */
+                String billmaker = data.getString("billmaker");  /* 制单人 */
+                String pk_org = data.getString("pk_org");  /* 财务组织编码 */
+                String updSql = "update " + tablename + " set nccdjzj = '" + pk_bill + "', ncczdr = '" + billmaker + "', nccfkdh ='" + billno + "',ncccwzzbm = '" + pk_org + "',nccfhxx = '" + msg + "',sfcgscnccfkd  = 0 where requestid = " + requestid;
+                log.writeLog("修改当前单据NCC回传信息sql----> " + updSql);
+                rs.execute(updSql);
+                //获取回传的明细表付款单id
+                JSONArray items = data.getJSONArray("items");
+                for (int i = 0; i < items.size(); i++) {
+                    JSONObject resultData = items.getJSONObject(i);
+                    String itemid = resultData.getString("itemid");/* 采购订单明细id */
+                    String pk_payitem = resultData.getString("pk_payitem");  /* 付款单id */
+                    String payplanid = resultData.getString("payplanid");/* 付款计划id */
+                    String upddelSql = "update " + tablename + "_dt2 set fkdid = '" + pk_payitem + "' where cgddmxid = '" + itemid + "' and fkjhwyid = '" + payplanid + "' and  mainid = " + id ;
+                    log.writeLog("修改明细表的明细数据sql---->" + upddelSql);
+                    rs.execute(upddelSql);
+                }
+            }else{
+                String updSql = "update " + tablename + " set sfcgscnccfkd  = 1,nccfhxx = '" + msg + "' where requestid = " + requestid;
+                rs.execute(updSql);
+                AddJournal.addInfo("抛转预付单数据到NCC", json, result, "1", requestid);
+                if("yes".equals(xrnccsbcsfts)) {
+                    ri.getRequestManager().setMessagecontent(msg);
+                    return FAILURE_AND_CONTINUE;
+                }else{
+                    return SUCCESS;
+                }
+            }
+            AddJournal.addInfo("抛转预付单数据到NCC", json, result, "0", requestid);
+        }catch (Exception e){
+            AddJournal.addInfo("抛转预付单数据到NCC", json, "出现异常---> " + e, "1", requestid);
+            if("yes".equals(xrnccsbcsfts)) {
+                ri.getRequestManager().setMessagecontent("数据传递出错-----> " + e.getMessage());
+                return FAILURE_AND_CONTINUE;
+            }else{
+                return SUCCESS;
+            }
+        }
+
+        return SUCCESS;
+    }
+
+    public static void main(String[] args) {
+        System.out.println(getNewDate("2022-06-30", "18:00:00"));
+    }
+
+    public static String getNewDate(String startDate, String endDate){
+        if(DUtil.getLastDayOfMonth(startDate).equals(startDate)){
+            int i = endDate.compareTo("18:00:00");
+            if (i >= 0){
+                startDate = DUtil.getFirstDayOfNextMonth(startDate);
+                endDate = "00:30:00";
+            }
+        }
+
+        return startDate + " " + endDate;
+    }
+}
diff --git a/src/main/youhong_ai_jitu_src/com/api/lh/action/NCCAdvanceValidationAction.java b/src/main/youhong_ai_jitu_src/com/api/lh/action/NCCAdvanceValidationAction.java
new file mode 100644
index 0000000..ff59efa
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/com/api/lh/action/NCCAdvanceValidationAction.java
@@ -0,0 +1,114 @@
+package com.api.lh.action;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.api.lh.port.AddJournal;
+import com.wbi.util.Util;
+import jntchina.util.HttpClientToDC;
+import jntchina.util.NCCUtils;
+import selfdev.util.base.BaseUtil;
+import selfdev.util.log.LogTool;
+import weaver.conn.RecordSet;
+import weaver.file.Prop;
+import weaver.interfaces.workflow.action.Action;
+import weaver.soa.workflow.request.RequestInfo;
+
+/**
+ * @ClassName NCCPayableValidationAction
+ * @Description 提交预付单数据到NCC进行效验,判断数据是否一致
+ * @Author louh
+ * @Date 2022/3/1 14:01
+ * @Version 1.0
+ */
+public class NCCAdvanceValidationAction implements Action {
+    static final String  mode = Prop.getPropValue("DevToDC_jntchina","mode");
+    static final String baseUrl = Prop.getPropValue("DevToDC_jntchina", mode + "_baseUrl");
+    LogTool log = new LogTool("/log/lh/NCCAdvanceValidationAction", false);
+    @Override
+    public String execute(RequestInfo ri) {
+        JSONObject json = new JSONObject();
+        JSONArray jsonArray = new JSONArray();
+        RecordSet rs = new RecordSet();
+        /* 流程requestid */
+        String requestid = ri.getRequestid();
+        /* 流程id */
+        String workflowid = ri.getWorkflowid();
+        try {
+            //获取表名
+            String tablename = BaseUtil.getBaseInfoByParm("tablename", "workflow_bill", "1", "1", " and id in (select formid from workflow_base where id=" + workflowid + ")");
+
+            log.writeLog("requestid---> " + requestid + "对应表名tablename---> " + tablename);
+
+            /* 主表数据id */
+            String id = BaseUtil.getBaseInfoByParm("id", tablename, "requestid", requestid, "");
+
+            String sql = "select * from " + tablename + "_dt2 where mainid = " + id;
+            log.writeLog("查询明细表预付单数据sql-----> " + sql);
+            rs.execute(sql);
+
+            while (rs.next()) {
+                JSONObject jsonObject = new JSONObject();
+                /* 预付单付款计划唯一id */
+                jsonObject.put("pk_item", Util.null2String(rs.getString("fkjhwyid")));
+                /* 本次付款金额 */
+                jsonObject.put("mny", Util.null2String(rs.getString("bcfkje")));
+                jsonArray.add(jsonObject);
+            }
+            json.put("request", jsonArray);
+            log.writeLog("request: " + json);
+
+            //获取token
+            String token = HttpClientToDC.getToken();
+            log.writeLog("获取中台的数据token----》 " + token);
+            if ("".equals(weaver.general.Util.null2String(token))) {
+                ri.getRequestManager().setMessagecontent("未获取到中台token，请联系管理员查看问题！");
+                return FAILURE_AND_CONTINUE;
+            }
+            String result = HttpClientToDC.sendPostApi(baseUrl + "/dcoaapi/ncc/payApplication", token, json.toJSONString());
+
+
+            //result = NCCUtils.sendApi(baseUrl + "/nccloud/api/jitu/arap/busi/mnycheck", json.toJSONString());
+            /* 解析返回的数据 */
+            JSONObject result_json = (JSONObject) JSONObject.parse(result);
+            String allmsg = "";
+            String success = result_json.getString("succ");
+            String msg = result_json.getString("msg");
+
+            if("true".equals(success)) {
+                JSONArray data = result_json.getJSONArray("data");
+                for (int i = 0; i < data.size(); i++) {
+                    JSONObject item = data.getJSONObject(i);
+                    String flag = item.getString("flag"); /* 是否正确 */
+                    if (!"Y".equals(flag)) { //数据不一致
+                        String pk_item = item.getString("pk_item");
+                        /* 根据预付单付款计划唯一id去查询表单对应数据 */
+                        String podb_sql = "select * from " + tablename + "_dt2 where fkjhwyid = '" + pk_item +"' and mainid = " + id;
+                        log.writeLog("根据预付单明细行唯一id去查询表单对应数据sql-----> " + podb_sql);
+                        rs.execute(podb_sql);
+                        if(rs.next()){
+                            /* 采购订单号 */
+                            String cgddh = Util.null2String(rs.getString("cgddh"));
+                            allmsg += cgddh + ",";
+                        }
+                    }
+                }
+            }else{
+                ri.getRequestManager().setMessagecontent(msg);
+                AddJournal.addInfo("效验预付单据数据是否正确", json, result, "1", requestid);
+                return FAILURE_AND_CONTINUE;
+            }
+            if(!"".equals(allmsg)){
+                allmsg += "数据效验不通过！请删除当前单据，重新获取NCC数据并选择！";
+                ri.getRequestManager().setMessagecontent(allmsg);
+                AddJournal.addInfo("效验预付单据数据是否正确", json, result, "1", requestid);
+                return FAILURE_AND_CONTINUE;
+            }
+            AddJournal.addInfo("效验预付单据数据是否正确", json, result, "0", requestid);
+        }catch (Exception e) {
+            AddJournal.addInfo("效验预付单据数据是否正确", json, "出现异常" + e, "1", requestid);
+            ri.getRequestManager().setMessagecontent("数据传递出错----> " + e.getMessage());
+            return FAILURE_AND_CONTINUE;
+        }
+        return SUCCESS;
+    }
+}
diff --git a/src/main/youhong_ai_jitu_src/com/api/lh/action/NCCAdvanceWriteOffAction.java b/src/main/youhong_ai_jitu_src/com/api/lh/action/NCCAdvanceWriteOffAction.java
new file mode 100644
index 0000000..31d0db0
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/com/api/lh/action/NCCAdvanceWriteOffAction.java
@@ -0,0 +1,166 @@
+package com.api.lh.action;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.serializer.SerializerFeature;
+import com.api.lh.config.DemoConfig;
+import com.api.lh.port.AddJournal;
+import com.api.lh.port.Billdata;
+import com.api.lh.port.ErBxcontrast;
+import jntchina.util.HttpClientToDC;
+import selfdev.util.base.BaseUtil;
+import selfdev.util.log.LogTool;
+import weaver.conn.RecordSet;
+import weaver.general.Util;
+import weaver.interfaces.workflow.action.Action;
+import weaver.soa.workflow.request.RequestInfo;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @ClassName NCCAdvanceWriteOffAction
+ * @Description 供应商预付核销流程核销数据写入NCC
+ * @Author louh
+ * @Date 2022/4/13 14:06
+ * @Version 1.0
+ */
+public class NCCAdvanceWriteOffAction implements Action, DemoConfig {
+    LogTool log = new LogTool("/log/lh/NCCAdvanceWriteOffAction", false);
+
+    @Override
+    public String execute(RequestInfo ri) {
+        String requestid = ri.getRequestid();   //requestid
+        String workflowid = ri.getWorkflowid();   //workflowid
+        RecordSet rs = new RecordSet();
+        Billdata billdata = null;  //存储主表数据
+        List<ErBxcontrast> bxcontrasts = new ArrayList<>();  //存储明细数据
+
+        JSONObject json = null;  //传递数据
+
+        try {
+            //获取表名
+            String tablename = BaseUtil.getBaseInfoByParm("tablename", "workflow_bill", "1", "1", " and id in (select formid from workflow_base where id=" + workflowid + ")");
+            log.writeLog("requestid---> " + requestid + "对应表名tablename---> " + tablename);
+            //主表数据id
+            String id = BaseUtil.getBaseInfoByParm("id", tablename, "requestid", requestid, "");
+            String sql = "select  xgyflc, count(xgyflc) as sum from " + tablename + "_dt1 where mainid = " + id + " group by xgyflc having count(xgyflc) > 1";
+            log.writeLog("根据主表数据id查询当前明细表数据是否有多次选择同一个相关预付流程【requestid】sql---->" + sql);
+            rs.execute(sql);
+            if(rs.next()){
+                ri.getRequestManager().setMessagecontent("同一张单据不允许多次选择相同的【相关预付流程】,请重新选择明细表不同的【相关预付流程】数据。");
+                return FAILURE_AND_CONTINUE;
+            }
+            sql = "select * from " + tablename + "_dt1 where mainid = " + id;
+            log.writeLog("根据主表数据id查询当前明细数据sql----> " + sql);
+            rs.execute(sql);
+            while(rs.next()){
+                //已核销金额
+                double yhxje = Double.parseDouble(Util.null2String(rs.getString("yhxje")) == "" ? "0.00": Util.null2String(rs.getString("yhxje")));
+                //剩余未核销金额
+                double sywhxje = Double.parseDouble(Util.null2String(rs.getString("sywhxje")));
+                //预付金额
+                double yfje = Double.parseDouble(Util.null2String(rs.getString("yfje")));
+                //本次核销金额
+                double bchxje = Double.parseDouble(Util.null2String(rs.getString("bchxje")) == "" ? "0.00" : Util.null2String(rs.getString("bchxje")));
+                //相关预付流程
+                String xgyflc = Util.null2String(rs.getString("xgyflc"));
+                //本次核销金额大于剩余未核销金额
+                if(bchxje > sywhxje){
+                    ri.getRequestManager().setMessagecontent("【相关预付流程 " + xgyflc + "】 剩余未核销金额【" + sywhxje + "】元、本次核销金额【" + bchxje + "】、大于【剩余未核销金额】，请重新填写【本次核销金额】");
+                    return FAILURE_AND_CONTINUE;
+                }
+                //当前条数共计合计金额
+                double money = yhxje + bchxje;
+                if(money > yfje){
+                    ri.getRequestManager().setMessagecontent("【相关预付流程 " + xgyflc + "】 已核销金额【" + yhxje + "】元、本次核销金额【" + bchxje + "】、合计【" + money + "】元！大于预付金额，请重新填写【本次核销金额】");
+                    return FAILURE_AND_CONTINUE;
+                }
+
+                //ncc借款单号
+                String nccdh = Util.null2String(rs.getString("nccdh"));
+                ErBxcontrast bxcontrast = new ErBxcontrast(nccdh,"",bchxje + "");
+                bxcontrasts.add(bxcontrast);
+
+            }
+            sql = "select * from " + tablename + " where requestid = "  + requestid;
+            log.writeLog("查询当前主表数据sql------> " + sql);
+            rs.execute(sql);
+            if(rs.next()){
+                String sqr = Util.null2String(rs.getString("sqr"));//申请人
+                //申请人工号
+                String workcode = BaseUtil.getBaseInfoByParm("workcode", "hrmresource", "id", sqr, "");
+                String sqbm = Util.null2String(rs.getString("sqbm"));  //申请部门
+                //申请部门编码
+                String departmentcode = BaseUtil.getBaseInfoByParm("departmentcode", "hrmdepartment", "id", sqbm, "");
+                String gsmc = Util.null2String(rs.getString("gsmc"));
+                billdata = new Billdata(gsmc, //公司名称
+                        "",
+                        "",
+                        "",
+                        Util.null2String(rs.getString("sqrq")), //申请日期
+                        Util.null2String(rs.getString("hxje")), //核销金额
+                        gsmc,
+                        "",
+                        workcode,
+                        "",
+                        "",
+                        requestid,
+                        Util.null2String(rs.getString("lcbh")), //流程编号
+                        "",
+                        departmentcode,  //申请部门
+                        Util.null2String(rs.getString("sm")), //说明
+                        bxcontrasts
+                );
+            }
+
+            String result = JSON.toJSONString(billdata, SerializerFeature.DisableCircularReferenceDetect);
+            json = (JSONObject) JSONObject.toJSON(billdata);
+            //获取token
+            String token = HttpClientToDC.getToken();
+            log.writeLog("获取中台的数据token----》 " + token);
+            if ("".equals(Util.null2String(token))) {
+                ri.getRequestManager().setMessagecontent("为获取到中台token,请联系管理员查看问题!");
+                AddJournal.addInfo("还款单接口", json, "未获取到中台token，请联系管理员查看问题！", "1", requestid);
+                return FAILURE_AND_CONTINUE;
+            }
+
+            //调用中台还款单接口
+            log.writeLog("开始调用中台还款单接口--------");
+            result = HttpClientToDC.sendPostApi( baseUrl + "/dcoaapi/ncc/repaymentBill", token, result);
+            JSONObject parse = (JSONObject) JSONObject.parse(result);
+            log.writeLog("返回数据----- " + parse.toJSONString());
+            String success = parse.getString("succ");
+            String msg = parse.getString("msg");
+            if(success.equals("true")) {
+                JSONObject data = parse.getJSONObject("data");
+                String pk_bill = data.getString("pk_bill");/* ncc单据id */
+                String billno = data.getString("billno");  /* ncc单据号 */
+                String updSql = "update " + tablename + " set nccdjzj = '" + pk_bill + "', nccfkdh ='" + billno + "', nccfhxx = '" + msg + "',sfcgscnccfkd  = 0  where requestid = " + requestid;
+                log.writeLog("修改当前单据NCC回传信息sql----> " + updSql);
+                rs.execute(updSql);
+
+            }else{
+                String updSql = "update " + tablename + " set sfcgscnccfkd  = 1,nccfhxx = '" + msg + "' where requestid = " + requestid;
+                rs.execute(updSql);
+                AddJournal.addInfo("还款单接口", json, result, "1", requestid);
+                ri.getRequestManager().setMessagecontent(msg);
+                return FAILURE_AND_CONTINUE;
+            }
+            AddJournal.addInfo("还款单接口", json, result, "0", requestid);
+        }catch (Exception e){
+            ri.getRequestManager().setMessagecontent("数据传递NCC出错----->" + e);
+            AddJournal.addInfo("还款单接口",json, "出现异常+++" + e, "1", requestid);
+            return FAILURE_AND_CONTINUE;
+        }
+        return SUCCESS;
+    }
+
+    public static void main(String[] args) {
+        double yhxje = Double.parseDouble("" == "" ? "0.00": "");
+        System.out.println(yhxje);
+
+    }
+}
diff --git a/src/main/youhong_ai_jitu_src/com/api/lh/action/NCCPayableDataAction.java b/src/main/youhong_ai_jitu_src/com/api/lh/action/NCCPayableDataAction.java
new file mode 100644
index 0000000..555a680
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/com/api/lh/action/NCCPayableDataAction.java
@@ -0,0 +1,180 @@
+package com.api.lh.action;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.serializer.SerializerFeature;
+import com.api.lh.port.AddJournal;
+import jntchina.util.HttpClientToDC;
+import jntchina.util.NCCUtils;
+import selfdev.util.log.LogTool;
+import weaver.file.Prop;
+import weaver.general.Util;
+import weaver.interfaces.workflow.action.Action;
+
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @ClassName NCCPayableDataAction
+ * @Description 获取ncc应付单数据
+ * @Author louh
+ * @Date 2022/2/24 10:17
+ * @Version 1.0
+ */
+@Path("/Data")
+public class NCCPayableDataAction {
+    LogTool log = new LogTool("/log/lh/action/NCCPayableDataAction", false);
+    static final String  mode = Prop.getPropValue("DevToDC_jntchina","mode");
+    static final String baseUrl = Prop.getPropValue("DevToDC_jntchina", mode + "_baseUrl");
+
+    /* 应付单查询接口 */
+    @POST
+    @Path("/getNCCPayableData")
+    @Produces({"application/json"})
+    public String getNCCPayableData(String data){
+        JSONObject json = null;
+        log.writeLog("应付单data: " + data);
+        String result = "";
+        Map<String, Object> return_map = new HashMap<>();
+        try {
+            json = (JSONObject) JSONObject.parse(data);
+
+            //获取token
+            String token = HttpClientToDC.getToken();
+            log.writeLog("获取中台的数据应付接口token----》 " + token);
+            if ("".equals(Util.null2String(token))) {
+                return_map.put("code", 500);
+                return_map.put("msg", "未获取到中台token，请联系管理员查看问题！");
+                return return_map.toString();
+            }
+            result = HttpClientToDC.sendPostApi(baseUrl + "/dcoaapi/ncc/payableBillSearch", token, data);
+            JSONObject parse = (JSONObject) JSONObject.parse(result);
+            String succ = parse.getString("succ");
+            JSONArray jsonArray = new JSONArray();
+            if ("true".equals(succ)){
+                JSONArray datas = parse.getJSONArray("data");
+                for (int i = 0; i < datas.size(); i++) {
+                    JSONObject item = datas.getJSONObject(i);
+                    String money = item.getString("money");  //剩余未付金额
+                    double v = Double.parseDouble(money);
+                    if(v > 0){
+                        //获取原对象到账日期
+                        String denddate = item.getString("denddate");
+                        if(!"".equals(denddate)) {
+                            item.remove("denddate");
+                            //生成新的到账日期
+                            denddate = denddate.substring(0, 10);
+                            item.put("denddate", denddate);
+                        }
+                        jsonArray.add(item);
+                    }
+                }
+                //删除原有数据
+                parse.remove("data");
+                parse.put("data", jsonArray);
+            }else{
+                return_map.put("code", 500);
+                return_map.put("msg", "获取信息失败");
+                AddJournal.addInfo("应付单查询接口", json, result, "1", "");
+                return JSON.toJSONString(return_map,  SerializerFeature.DisableCircularReferenceDetect);
+            }
+            result = parse.toJSONString();
+            //result = NCCUtils.sendApi(baseUrl + "/nccloud/api/jitu/arap/busi/payablebillquery", data);
+            log.writeLog("result: " + result);
+            AddJournal.addInfo("应付单查询接口", json, result, "0", "");
+        }catch (Exception e){
+            log.writeLog("出现异常: " + e);
+            return_map.put("code", 500);
+            return_map.put("msg", "出现异常 " + e);
+            AddJournal.addInfo("应付单查询接口", json, "出现异常---> " + e, "1", "");
+            return JSON.toJSONString(return_map,  SerializerFeature.DisableCircularReferenceDetect);
+        }
+        return result;
+    }
+
+
+    /* 预付单付款计划查询接口 */
+    @POST
+    @Path("/getNCCAdvanceData")
+    @Produces({"application/json"})
+    public String getNCCAdvanceData(String data){
+
+        JSONObject json = null;
+        log.writeLog("预付单data: " + data);
+        String result = "";
+        Map<String, Object> return_map = new HashMap<>();
+        try {
+            json = (JSONObject) JSONObject.parse(data);
+            //获取token
+            String token = HttpClientToDC.getToken();
+            log.writeLog("获取中台预付单的数据token----》 " + token);
+            if ("".equals(Util.null2String(token))) {
+                return_map.put("code", 500);
+                return_map.put("msg", "未获取到中台token，请联系管理员查看问题！");
+                return return_map.toString();
+            }
+
+            result = HttpClientToDC.sendPostApi(baseUrl + "/dcoaapi/ncc/purchasePaymentBillSearch", token, data);
+
+            //result = NCCUtils.sendApi(baseUrl + "/nccloud/api/jitu/arap/busi/orderquery", data);
+            JSONObject parse = (JSONObject) JSONObject.parse(result);
+            String succ = parse.getString("succ");
+            JSONArray jsonArray = new JSONArray();
+            if ("true".equals(succ)){
+                JSONArray datas = parse.getJSONArray("data");
+                for (int i = 0; i < datas.size(); i++) {
+                    JSONObject item = datas.getJSONObject(i);
+                    String money = item.getString("money");  //剩余未付金额
+                    double v = Double.parseDouble(money);
+                    if(v > 0){
+                        //获取原对象到账日期
+                        String denddate = item.getString("denddate");
+                        if(!"".equals(denddate)) {
+                            item.remove("denddate");
+                            //生成新的到账日期
+                            denddate = denddate.substring(0, 10);
+                            item.put("denddate", denddate);
+                        }
+                        jsonArray.add(item);
+                    }
+                }
+                //删除原有数据
+                parse.remove("data");
+                parse.put("data", jsonArray);
+            }else{
+                return_map.put("code", 500);
+                return_map.put("msg", "获取信息失败");
+                AddJournal.addInfo("预付单计划查询接口", json, result, "1", "");
+                return JSON.toJSONString(return_map,  SerializerFeature.DisableCircularReferenceDetect);
+            }
+            result = parse.toJSONString();
+            log.writeLog("result: " + result);
+            AddJournal.addInfo("预付单计划查询接口", json, result, "0", "");
+        }catch (Exception e){
+            log.writeLog("出现异常: " + e);
+            return_map.put("code", 500);
+            return_map.put("msg", "出现异常 " + e);
+            AddJournal.addInfo("预付单计划查询接口", json, "出现异常---> " + e, "1", "");
+            return JSON.toJSONString(return_map,  SerializerFeature.DisableCircularReferenceDetect);
+        }
+
+        return result;
+    }
+
+    public static void main(String[] args) {
+        //NCCPayableDataAction nccPayableDataAction = new NCCPayableDataAction();
+        //String nccPayableData = nccPayableDataAction.getNCCPayableData("{\"pk_org\":\"JTSDCN0001\",\"begindate\":\"2020-03-17\",\"enddate\":\"2022-03-17\",\"pk_supplier\":\"JTSDCN0030\"}");
+        //System.out.println(nccPayableData);
+        //String token = HttpClientToDC.getToken();
+        //System.out.println(token);
+        // 密码
+        //final String password = Prop.getPropValue("DevToDC_jntchina", mode+"_password");
+        //System.out.println("密码:" + password);
+        String time = "2021-01-01 00:00:00";
+        System.out.println(time.substring(0,10));
+    }
+}
diff --git a/src/main/youhong_ai_jitu_src/com/api/lh/action/NCCPayableTossAction.java b/src/main/youhong_ai_jitu_src/com/api/lh/action/NCCPayableTossAction.java
new file mode 100644
index 0000000..2072d8e
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/com/api/lh/action/NCCPayableTossAction.java
@@ -0,0 +1,182 @@
+package com.api.lh.action;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.api.lh.port.AddJournal;
+import com.api.lh.port.Items;
+import com.api.lh.port.StuData;
+import jntchina.util.HttpClientToDC;
+import selfdev.util.base.BaseUtil;
+import selfdev.util.log.LogTool;
+import weaver.conn.RecordSet;
+import weaver.file.Prop;
+import weaver.general.Util;
+import weaver.interfaces.workflow.action.Action;
+import weaver.soa.workflow.request.RequestInfo;
+
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @ClassName NCCPayableTossAction
+ * @Description 抛转应付单数据到NCC
+ * @Author louh
+ * @Date 2022/3/1 14:35
+ * @Version 1.0
+ */
+public class NCCPayableTossAction implements Action {
+    LogTool log = new LogTool("/log/lh/action/NCCPayableTossAction", false);
+    static final String  mode = Prop.getPropValue("DevToDC_jntchina","mode");
+    static final String baseUrl = Prop.getPropValue("DevToDC_jntchina", mode + "_baseUrl");
+
+    @Override
+    public String execute(RequestInfo ri) {
+        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        String date = dateFormat.format(new Date());
+
+        String startDate = date.substring(0, 10);
+        String endDate = date.substring(11);
+        date = NCCAdvanceTossAction.getNewDate(startDate, endDate);
+        JSONObject json = new JSONObject();
+        RecordSet rs = new RecordSet();
+        String xrnccsbcsfts = "";
+        String requestid = ri.getRequestid();
+        String workflowid = ri.getWorkflowid();
+        /* 单据属性 */
+        String djsx = "";
+        try{
+            //获取表名
+            String tablename = BaseUtil.getBaseInfoByParm("tablename", "workflow_bill", "1", "1", " and id in (select formid from workflow_base where id=" + workflowid + ")");
+            log.writeLog("requestid---> " + requestid + "对应表名tablename---> " + tablename);
+            /* 主表数据id */
+            String id = BaseUtil.getBaseInfoByParm("id", tablename, "requestid", requestid, "");
+            /* 流程编号 */
+            String lcbh = BaseUtil.getBaseInfoByParm("lcbh", tablename, "requestid", requestid, "");
+            /* 供应商名称 */
+            String gysmc = BaseUtil.getBaseInfoByParm("gysmc", tablename, "requestid", requestid, "");
+            /* 付款金额 */
+            String fkje = BaseUtil.getBaseInfoByParm("jshjje", tablename, "requestid", requestid, "");
+            /* 公司名称(NCC财务组织编码) */
+            String gsmc = BaseUtil.getBaseInfoByParm("gsmc", tablename, "requestid", requestid, "");
+            /* 制单人 */
+            String zdr = BaseUtil.getBaseInfoByParm("zdr", tablename, "requestid", requestid, "");
+            /* 制单人编码 */
+            String workcode = BaseUtil.getBaseInfoByParm("workcode", "hrmresource", "id", zdr, "");
+            /* 部门 */
+            String bm = BaseUtil.getBaseInfoByParm("fygsbm", tablename, "requestid", requestid, "");
+            /* 部门编码 */
+            String departmentcode = BaseUtil.getBaseInfoByParm("departmentcode", "hrmdepartment", "id", bm, "");
+            /* 银行账号 */
+            String yxhm = BaseUtil.getBaseInfoByParm("yxhm", tablename, "requestid", requestid, "");
+            //是否提示报错信息
+            xrnccsbcsfts = BaseUtil.getBaseInfoByParm("xrnccsbcsfts", tablename, "requestid", requestid, "");
+            //银行付款备注
+            String yxfkbz = BaseUtil.getBaseInfoByParm("yxfkbz", tablename, "requestid", requestid, "");
+            double je = Double.parseDouble(fkje.replaceAll(",", ""));
+            String sql = "select * from " + tablename + "_dt2 where mainid = " + id;
+            log.writeLog("查询应付单明细数据sql-----> " + sql);
+            rs.execute(sql);
+            List<Items> list = new ArrayList<>();
+            while(rs.next()){
+                /* 本次付款金额 */
+                String je1 = Util.null2String(rs.getString("je"));
+                double v = Double.parseDouble(je1.replaceAll(",", ""));
+                /* 应付单明细行唯一id */
+                String yfdmxxwyid = Util.null2String(rs.getString("yfdmxxwyid"));
+                /* 应付单据号 */
+                String yfdh = Util.null2String(rs.getString("yfdh"));
+                /* 摘要 */
+                String zy = Util.null2String(rs.getString("zy"));
+                /* 单据属性 */
+                djsx = Util.null2String(rs.getString("djsx"));
+                /* 物料 */
+                String wl = Util.null2String(rs.getString("wl"));
+
+                /* 成本中心 */
+                String wd = Util.null2String(rs.getString("wd"));
+                //部门编码
+                String bmbm = Util.null2String(rs.getString("bmbm"));
+                Items items = new Items("1", gysmc,departmentcode, "", "0",
+                        "CNY",v + "","1",v + "",
+                        "1",v + "","1",v + "","1",
+                        v + "",yfdmxxwyid,"","",yfdh, zy, djsx,
+                        wl, bmbm, yxhm, "", wd);
+                list.add(items);
+            }
+            StuData stuData = new StuData(gsmc,djsx,date,"1","CNY",
+                    yxhm,je + "","1",je + "","1",
+                    je + "","1",je + "",workcode,requestid,lcbh,
+                    gysmc,list,departmentcode, "", yxfkbz);
+            json = (JSONObject) JSONObject.toJSON(stuData);
+            log.writeLog("json-----> " + json);
+
+            //获取token
+            String token = HttpClientToDC.getToken();
+            log.writeLog("获取中台的数据token----》 " + token);
+            if ("".equals(weaver.general.Util.null2String(token))) {
+                ri.getRequestManager().setMessagecontent("未获取到中台token，请联系管理员查看问题！");
+                return FAILURE_AND_CONTINUE;
+            }
+                String result = HttpClientToDC.sendPostApi(baseUrl + "/dcoaapi/ncc/sendPaymentBill", token, json.toJSONString());
+
+            /* 调用NCC付款单接口 */
+            //String result = NCCUtils.sendApi(baseUrl + "/nccloud/api/jitu/arap/fkbill/insert", json.toJSONString());
+            log.writeLog("result----> " + result);
+
+            JSONObject parse = (JSONObject) JSONObject.parse(result);
+            String success = parse.getString("succ");
+            String msg = parse.getString("msg");
+            if(success.equals("true")) {
+                JSONObject data = parse.getJSONObject("data");
+                String billno = data.getString("billno");  /* ncc单据号 */
+                String pk_bill = data.getString("pk_bill");/* ncc单据主键 */
+                String billmaker = data.getString("billmaker");  /* 制单人 */
+                String pk_org = data.getString("pk_org");  /* 财务组织编码 */
+                String updSql = "update " + tablename + " set nccdjzj = '" + pk_bill + "', ncczdr = '" + billmaker + "', nccfkdh ='" + billno + "',ncccwzzbm = '" + pk_org + "', nccfhxx = '" + msg + "',sfcgscnccfkd  = 0  where requestid = " + requestid;
+                log.writeLog("修改当前单据NCC回传信息sql----> " + updSql);
+                rs.execute(updSql);
+                //获取回传的明细表付款单id
+                JSONArray items = data.getJSONArray("items");
+                for (int i = 0; i < items.size(); i++) {
+                    JSONObject resultData = items.getJSONObject(i);
+                    String itemid = resultData.getString("itemid");/* 应付单明细id */
+                    String pk_payitem = resultData.getString("pk_payitem");  /* 付款单id */
+                    String upddelSql = "update " + tablename + "_dt2 set fkdid = '" + pk_payitem + "' where yfdmxxwyid = '" + itemid + "' and mainid = " + id ;
+                    log.writeLog("修改明细表的明细数据sql---->" + upddelSql);
+                    rs.execute(upddelSql);
+                }
+            }else{
+                String updSql = "update " + tablename + " set sfcgscnccfkd  = 1,nccfhxx = '" + msg + "' where requestid = " + requestid;
+                rs.execute(updSql);
+                AddJournal.addInfo("抛转应付单数据到NCC", json, result, "1", requestid);
+                if("yes".equals(xrnccsbcsfts)) {
+                    ri.getRequestManager().setMessagecontent(msg);
+                    return FAILURE_AND_CONTINUE;
+                }else{
+                    return SUCCESS;
+                }
+            }
+            AddJournal.addInfo("抛转应付单数据到NCC", json, result, "0", requestid);
+
+        }catch (Exception e){
+
+            AddJournal.addInfo("抛转应付单数据到NCC", json, "出现异常---> " + e, "1", requestid);
+            if("yes".equals(xrnccsbcsfts)) {
+                ri.getRequestManager().setMessagecontent("数据传递出错-----> " + e.getMessage());
+                return FAILURE_AND_CONTINUE;
+            }else{
+                return SUCCESS;
+            }
+        }
+
+        return SUCCESS;
+    }
+
+
+    public static void main(String[] args) {
+
+        System.out.println(NCCAdvanceTossAction.getNewDate("2022-06-29", "18:00:00"));
+    }
+}
diff --git a/src/main/youhong_ai_jitu_src/com/api/lh/action/NCCPayableValidationAction.java b/src/main/youhong_ai_jitu_src/com/api/lh/action/NCCPayableValidationAction.java
new file mode 100644
index 0000000..838561f
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/com/api/lh/action/NCCPayableValidationAction.java
@@ -0,0 +1,113 @@
+package com.api.lh.action;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.api.lh.port.AddJournal;
+import com.wbi.util.Util;
+import jntchina.util.HttpClientToDC;
+import jntchina.util.NCCUtils;
+import selfdev.util.base.BaseUtil;
+import selfdev.util.log.LogTool;
+import weaver.conn.RecordSet;
+import weaver.file.Prop;
+import weaver.interfaces.workflow.action.Action;
+import weaver.soa.workflow.request.RequestInfo;
+
+/**
+ * @ClassName NCCPayableValidationAction
+ * @Description 提交应付单数据到NCC进行效验,判断数据是否一致
+ * @Author louh
+ * @Date 2022/3/1 14:01
+ * @Version 1.0
+ */
+public class NCCPayableValidationAction implements Action {
+    static final String  mode = Prop.getPropValue("DevToDC_jntchina","mode");
+    static final String baseUrl = Prop.getPropValue("DevToDC_jntchina", mode + "_baseUrl");
+
+    LogTool log = new LogTool("/log/lh/NCCPayableValidationAction", false);
+    @Override
+    public String execute(RequestInfo ri) {
+        JSONObject json = new JSONObject();
+        JSONArray jsonArray = new JSONArray();
+        RecordSet rs = new RecordSet();
+        /* 流程requestid */
+        String requestid = ri.getRequestid();
+        /* 流程id */
+        String workflowid = ri.getWorkflowid();
+        try {
+            //获取表名
+            String tablename = BaseUtil.getBaseInfoByParm("tablename", "workflow_bill", "1", "1", " and id in (select formid from workflow_base where id=" + workflowid + ")");
+
+            log.writeLog("requestid---> " + requestid + "对应表名tablename---> " + tablename);
+
+            /* 主表数据id */
+            String id = BaseUtil.getBaseInfoByParm("id", tablename, "requestid", requestid, "");
+
+            String sql = "select * from " + tablename + "_dt2 where mainid = " + id;
+            log.writeLog("查询明细表应付单数据sql-----> " + sql);
+            rs.execute(sql);
+
+            while (rs.next()) {
+                JSONObject jsonObject = new JSONObject();
+                /* 应付单明细行唯一id */
+                jsonObject.put("pk_item", Util.null2String(rs.getString("yfdmxxwyid")));
+                /* 本次付款金额 */
+                jsonObject.put("mny", Util.null2String(rs.getString("je")));
+                jsonArray.add(jsonObject);
+            }
+            json.put("request", jsonArray);
+            log.writeLog("request: " + json);
+
+            //获取token
+            String token = HttpClientToDC.getToken();
+            log.writeLog("获取中台的数据token----》 " + token);
+            if ("".equals(weaver.general.Util.null2String(token))) {
+                ri.getRequestManager().setMessagecontent("未获取到中台token，请联系管理员查看问题！");
+                return FAILURE_AND_CONTINUE;
+            }
+            String result = HttpClientToDC.sendPostApi(baseUrl + "/dcoaapi/ncc/payApplication", token, json.toJSONString());
+
+            //result = NCCUtils.sendApi(baseUrl + "nccloud/api/jitu/arap/busi/mnycheck", json.toJSONString());
+            /* 解析返回的数据 */
+            JSONObject result_json = (JSONObject) JSONObject.parse(result);
+            String allmsg = "";
+            String success = result_json.getString("succ");
+            String msg = result_json.getString("msg");
+            if("true".equals(success)){
+                JSONArray data = result_json.getJSONArray("data");
+                for (int i = 0; i < data.size(); i++) {
+                    JSONObject item = data.getJSONObject(i);
+                    String flag = item.getString("flag"); /* 是否正确 */
+                    if(!"Y".equals(flag)) { //数据不一致
+                        String pk_item = item.getString("pk_item"); /* 应付款单号 */
+                        /* 根据应付单明细行唯一id去查询表单对应数据 */
+                        String podb_sql = "select * from " + tablename + "_dt2 where yfdmxxwyid = '" + pk_item +"' and mainid = " + id;
+                        log.writeLog("根据应付单明细行唯一id去查询表单对应数据sql-----> " + podb_sql);
+                        rs.execute(podb_sql);
+                        if(rs.next()){
+                            /* 采购订单号 */
+                            String cgddh = Util.null2String(rs.getString("cgddh"));
+                            allmsg += cgddh + ",";
+                        }
+                    }
+                }
+            }else{
+                ri.getRequestManager().setMessagecontent(msg);
+                AddJournal.addInfo("效验应付单据数据是否正确", json, result, "1", requestid);
+                return FAILURE_AND_CONTINUE;
+            }
+            if(!"".equals(allmsg)){
+                allmsg += "数据效验不通过！请删除当前单据，重新获取NCC数据并选择！";
+                ri.getRequestManager().setMessagecontent(allmsg);
+                AddJournal.addInfo("效验应付单据数据是否正确", json, result, "1", requestid);
+                return FAILURE_AND_CONTINUE;
+            }
+            AddJournal.addInfo("效验应付单据数据是否正确", json, result, "0", requestid);
+        }catch (Exception e) {
+            AddJournal.addInfo("效验应付单据数据是否正确", json, "出现异常" + e, "1", requestid);
+            ri.getRequestManager().setMessagecontent("数据传递出错----> " + e.getMessage());
+            return FAILURE_AND_CONTINUE;
+        }
+        return SUCCESS;
+    }
+}
diff --git a/src/main/youhong_ai_jitu_src/com/api/lh/action/UpdPaymentAccountAction.java b/src/main/youhong_ai_jitu_src/com/api/lh/action/UpdPaymentAccountAction.java
new file mode 100644
index 0000000..ebb05d0
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/com/api/lh/action/UpdPaymentAccountAction.java
@@ -0,0 +1,111 @@
+package com.api.lh.action;
+
+import com.api.lh.config.DemoConfig;
+import selfdev.util.log.LogTool;
+import weaver.conn.RecordSet;
+import weaver.conn.RecordSetTrans;
+import weaver.general.Util;
+import weaver.interfaces.workflow.action.Action;
+import weaver.soa.workflow.request.RequestInfo;
+
+/**
+ * @ClassName UpdPaymentAccountData
+ * @Description 修改 付款申请(NCC集成)预付台账  数据
+ * @Author louh
+ * @Date 2022/4/21 17:38
+ * @Version 1.0
+ */
+public class UpdPaymentAccountAction implements Action, DemoConfig {
+    @Override
+    public String execute(RequestInfo ri) {
+        RecordSet rs = new RecordSet();
+        RecordSet rs1 = new RecordSet();
+        RecordSet rs2 = new RecordSet();
+        RecordSetTrans rst = new RecordSetTrans();
+        rst.setAutoCommit(false);
+        String requestid = ri.getRequestid();
+        String workflowid = ri.getWorkflowid();
+        try {
+            //获取表名
+            String tablename = getTableName(workflowid);
+            log.writeLog("requestid---> " + requestid + "对应表名tablename---> " + tablename);
+            //获取当前表单数据id
+            String id = getId(tablename, requestid);
+            String sql = "select yfkqptzmxid, " +
+                    "sum(bchxje) as hxje," +
+                    " avg(yfje) as zje," +
+                    " avg(sywhxje) as whxje," +
+                    " avg(xgyflc) as req, avg(yhxje) as yhxje1 " +
+                    "from " + tablename + "_dt1 " +
+                    "where mainid = '" + id + "'" +
+                    "group by yfkqptzmxid having count(yfkqptzmxid) > 0";
+            log.writeLog("查询明细表1sql-----> " + sql);
+            rs.execute(sql);
+            while(rs.next()){
+                String yfkqptzmxid = Util.null2String(rs.getString("yfkqptzmxid"));  //预付款欠票台账明细id
+                double bchxje = Double.parseDouble(Util.null2String(rs.getString("hxje")) == "" ? "0.00" : Util.null2String(rs.getString("hxje")));  //核销金额
+                double yfje = Double.parseDouble(Util.null2String(rs.getString("zje"))==""?"0.00":Util.null2String(rs.getString("zje")));//预付金额
+                double sywhxje = Double.parseDouble(Util.null2String(rs.getString("whxje")) == "" ? "0.00":Util.null2String(rs.getString("whxje")));  //未核销金额
+                String req = Util.null2String(rs.getString("req"));  //相关预付流程requestid
+                double yhxje = Double.parseDouble(Util.null2String(rs.getString("yhxje1")) == "" ? "0.00" : Util.null2String(rs.getString("yhxje1")));  //核销金额
+
+                if (bchxje > yfje){
+                    ri.getRequestManager().setMessagecontent("预付欠票台账明细id【" + yfkqptzmxid + "】本次核销金额【" + bchxje + "】大于预付总金额【" + yfje + "】");
+                    return FAILURE_AND_CONTINUE;
+                }
+
+                //根据供应商预付欠票台账明细id查询该数据为还款金额
+                String sql1 = "select * from uf_fksqyfb_dt1 where id = '" + yfkqptzmxid + "'";
+                log.writeLog("获取剩余未核销金额明细sql-----> " + sql1);
+                rs1.execute(sql1);
+                String xghxlc = "";
+                double sywhxje2 = 0.00;
+                if(rs1.next()){
+                    xghxlc = Util.null2String(rs1.getString("xghxlc"));  //相关核销流程
+                    sywhxje2 = Double.parseDouble(Util.null2String(rs1.getString("sywhxje")) == "" ? "0.00":Util.null2String(rs1.getString("sywhxje")));  //剩余未核销金额
+                }
+                if ("".equals(xghxlc)){
+                    xghxlc = requestid;
+                }else{
+                    xghxlc += "," + requestid;
+                }
+                yhxje = yhxje + bchxje;
+                if(sywhxje2 < bchxje){
+                    ri.getRequestManager().setMessagecontent("预付欠票台账明细id【" + yfkqptzmxid + "】本次核销金额【" + bchxje + "】大于剩余未核销金额【" + sywhxje2 + "】,请重新选取抵扣明细数据,获取最新的台账数据!");
+                    return FAILURE_AND_CONTINUE;
+                }
+                sywhxje2 = sywhxje2 - bchxje;
+
+                String updSql = "update uf_fksqyfb_dt1 set yhxje = '" + yhxje + "', sywhxje = '" + sywhxje2 + "', xghxlc = '" + xghxlc + "'  where id = " + yfkqptzmxid;
+                log.writeLog("修改供应商预付欠票台账明细sql-----> " + updSql);
+                rst.executeSql(updSql);
+                //查询主表总预付金额及核销金额
+                sql1 = "select * from uf_fksqyfb where qqid = '" + req + "'";
+                log.writeLog("查询主表总预付金额及核销金额sql----> " + sql1);
+                rs1.execute(sql1);
+                if(rs1.next()){
+                    double fkje = Double.parseDouble(Util.null2String(rs1.getString("fkje"))==""?"0.00":Util.null2String(rs1.getString("fkje")));//付款金额
+                    double yhxje1 = Double.parseDouble(Util.null2String(rs1.getString("yhxje"))==""?"0.00":Util.null2String(rs1.getString("yhxje")));//已核销金额
+                    double sywhxje1 = Double.parseDouble(Util.null2String(rs1.getString("sywhxje"))==""?"0.00":Util.null2String(rs1.getString("sywhxje")));//剩余金额
+
+                    if(bchxje > sywhxje1){
+                        ri.getRequestManager().setMessagecontent("本次核销金额【" + bchxje + "】大于剩余为核销金额【"  + sywhxje1 +  "】");
+                        return FAILURE_AND_CONTINUE;
+                    }
+                    bchxje = bchxje + yhxje1;
+                    sywhxje1 = fkje - bchxje;
+                    updSql = "update uf_fksqyfb set sywhxje = '" + sywhxje1 + "', yhxje = '" + bchxje + "'  where qqid = '" + req + "'";
+                    log.writeLog("修改供应商预付欠票台账主数据sql-----> " + updSql);
+                    //rst.executeSql(updSql);
+                    rs2.execute(updSql);
+                }
+            }
+            rst.commit();
+        } catch (Exception e) {
+            rst.rollback();
+            ri.getRequestManager().setMessagecontent("修改台账出现异常-----" + e);
+            return FAILURE_AND_CONTINUE;
+        }
+        return SUCCESS;
+    }
+}
diff --git a/src/main/youhong_ai_jitu_src/com/api/lh/action/UpdPaymentAccountActionYY.java b/src/main/youhong_ai_jitu_src/com/api/lh/action/UpdPaymentAccountActionYY.java
new file mode 100644
index 0000000..423b58f
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/com/api/lh/action/UpdPaymentAccountActionYY.java
@@ -0,0 +1,109 @@
+package com.api.lh.action;
+
+import com.api.lh.config.DemoConfig;
+import weaver.conn.RecordSet;
+import weaver.conn.RecordSetTrans;
+import weaver.general.Util;
+import weaver.interfaces.workflow.action.Action;
+import weaver.soa.workflow.request.RequestInfo;
+
+/**
+ * @ClassName UpdPaymentAccountData
+ * @Description 修改 付款申请(NCC集成)预付台账  数据
+ * @Author ycf
+ * @Date 2022/4/21 17:38
+ * @Version 1.0
+ */
+public class UpdPaymentAccountActionYY implements Action, DemoConfig {
+    @Override
+    public String execute(RequestInfo ri) {
+        RecordSet rs = new RecordSet();
+        RecordSet rs1 = new RecordSet();
+        RecordSet rs2 = new RecordSet();
+        RecordSetTrans rst = new RecordSetTrans();
+        rst.setAutoCommit(false);
+        String requestid = ri.getRequestid();
+        String workflowid = ri.getWorkflowid();
+        try {
+            //获取表名
+            String tablename = getTableName(workflowid);
+            log.writeLog("requestid---> " + requestid + "对应表名tablename---> " + tablename);
+            //获取当前表单数据id
+            String id = getId(tablename, requestid);
+            String sql = "select yfkqptzmxid, " +
+                    "sum(bchxje) as hxje," +
+                    " avg(yfje) as zje," +
+                    " avg(sywhxje) as whxje," +
+                    " avg(xgyflc) as req, avg(yhxje) as yhxje1 " +
+                    "from " + tablename + "_dt1 " +
+                    "where mainid = '" + id + "'" +
+                    "group by yfkqptzmxid having count(yfkqptzmxid) > 0";
+            log.writeLog("查询明细表1sql-----> " + sql);
+            rs.execute(sql);
+            while(rs.next()){
+                String yfkqptzmxid = Util.null2String(rs.getString("yfkqptzmxid"));  //预付款欠票台账明细id
+                double bchxje = Double.parseDouble(Util.null2String(rs.getString("hxje")) == "" ? "0.00" : Util.null2String(rs.getString("hxje")));  //核销金额
+                double yfje = Double.parseDouble(Util.null2String(rs.getString("zje"))==""?"0.00":Util.null2String(rs.getString("zje")));//预付金额
+                double sywhxje = Double.parseDouble(Util.null2String(rs.getString("whxje")) == "" ? "0.00":Util.null2String(rs.getString("whxje")));  //未核销金额
+                String req = Util.null2String(rs.getString("req"));  //相关预付流程requestid
+                double yhxje = Double.parseDouble(Util.null2String(rs.getString("yhxje1")) == "" ? "0.00" : Util.null2String(rs.getString("yhxje1")));  //核销金额
+
+                if (bchxje > yfje){
+                    ri.getRequestManager().setMessagecontent("预付欠票台账明细id【" + yfkqptzmxid + "】本次核销金额【" + bchxje + "】大于预付总金额【" + yfje + "】");
+                    return FAILURE_AND_CONTINUE;
+                }
+
+                //根据供应商预付欠票台账明细id查询该数据为还款金额
+                String sql1 = "select * from uf_gysqktzyy_dt1 where id = '" + yfkqptzmxid + "'";
+
+                rs1.execute(sql1);
+                String xghxlc = "";
+                double sywhxje2 = 0.00;
+                if(rs1.next()){
+                    xghxlc = Util.null2String(rs1.getString("xghxlc"));  //相关核销流程
+                    sywhxje2 = Double.parseDouble(Util.null2String(rs1.getString("sywhxje")) == "" ? "0.00":Util.null2String(rs1.getString("sywhxje")));  //剩余未核销金额
+                }
+                if ("".equals(xghxlc)){
+                    xghxlc = requestid;
+                }else{
+                    xghxlc += "," + requestid;
+                }
+                yhxje = yhxje + bchxje;
+                if(sywhxje2 < bchxje){
+                    ri.getRequestManager().setMessagecontent("预付欠票台账明细id【" + yfkqptzmxid + "】本次核销金额【" + bchxje + "】大于剩余未核销金额【" + sywhxje2 + "】,请重新选取抵扣明细数据,获取最新的台账数据!");
+                    return FAILURE_AND_CONTINUE;
+                }
+                sywhxje2 = sywhxje2 - bchxje;
+                String updSql = "update uf_gysqktzyy_dt1 set yhxje = '" + yhxje + "', sywhxje = '" + sywhxje2 + "', xghxlc = '" + xghxlc + "'  where id = " + yfkqptzmxid;
+                log.writeLog("修改供应商预付欠票台账明细sql-----> " + updSql);
+                rst.executeSql(updSql);
+                //查询主表总预付金额及核销金额
+                sql1 = "select * from uf_gysqktzyy where qqid = '" + req + "'";
+                log.writeLog("查询主表总预付金额及核销金额sql----> " + sql1);
+                rs1.execute(sql1);
+                if(rs1.next()){
+                    double fkje = Double.parseDouble(Util.null2String(rs1.getString("fkje"))==""?"0.00":Util.null2String(rs1.getString("fkje")));//付款金额
+                    double yhxje1 = Double.parseDouble(Util.null2String(rs1.getString("yhxje"))==""?"0.00":Util.null2String(rs1.getString("yhxje")));//已核销金额
+                    double sywhxje1 = Double.parseDouble(Util.null2String(rs1.getString("sywhxje"))==""?"0.00":Util.null2String(rs1.getString("sywhxje")));//剩余金额
+
+                    if(bchxje > sywhxje1){
+                        ri.getRequestManager().setMessagecontent("本次核销金额【" + bchxje + "】大于剩余未核销金额【"  + sywhxje1 +  "】");
+                        return FAILURE_AND_CONTINUE;
+                    }
+                    bchxje = bchxje + yhxje1;
+                    sywhxje1 = fkje - bchxje;
+                    updSql = "update uf_gysqktzyy set sywhxje = '" + sywhxje1 + "', yhxje = '" + bchxje + "'  where qqid = '" + req + "'";
+                    log.writeLog("修改供应商预付欠票台账主数据sql-----> " + updSql);
+                    //rst.executeSql(updSql);
+                    rs2.execute(updSql);
+                }
+            }
+            rst.commit();
+        } catch (Exception e) {
+            rst.rollback();
+            ri.getRequestManager().setMessagecontent("修改台账出现异常-----" + e);
+            return FAILURE_AND_CONTINUE;
+        }
+        return SUCCESS;
+    }
+}
diff --git a/src/main/youhong_ai_jitu_src/com/api/lh/action/VaildateDocumentTypeAction.java b/src/main/youhong_ai_jitu_src/com/api/lh/action/VaildateDocumentTypeAction.java
new file mode 100644
index 0000000..4bc2526
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/com/api/lh/action/VaildateDocumentTypeAction.java
@@ -0,0 +1,45 @@
+package com.api.lh.action;
+
+import selfdev.util.base.BaseUtil;
+import selfdev.util.log.LogTool;
+import weaver.conn.RecordSet;
+import weaver.interfaces.workflow.action.Action;
+import weaver.soa.workflow.request.RequestInfo;
+
+/**
+ * @ClassName VaildatePayableDocumentTypeAction
+ * @Description 效验明细选取单据类型是否一致
+ * @Author louh
+ * @Date 2022/3/29 11:40
+ * @Version 1.0
+ */
+public class VaildateDocumentTypeAction implements Action {
+    @Override
+    public String execute(RequestInfo ri) {
+        LogTool log = new LogTool("/log/lh/VaildateDocumentTypeAction",false);
+        String requestid = ri.getRequestid();
+        RecordSet rs = new RecordSet();
+        String workflowid = ri.getWorkflowid();
+        try{
+            //获取表名
+            String tablename = BaseUtil.getBaseInfoByParm("tablename", "workflow_bill", "1", "1", " and id in (select formid from workflow_base where id=" + workflowid + ")");
+            log.writeLog("requestid---> " + requestid + "对应表名tablename---> " + tablename);
+            //主表id
+            String id = BaseUtil.getBaseInfoByParm("id", tablename, "requestid", requestid, "");
+            //根据主表数据id获取明细数据sql
+            String sql = "select distinct cgddlx from " + tablename + "_dt2 where mainid = " + id;
+            log.writeLog("根据主表数据id获取明细数据sql---> " + sql);
+            rs.execute(sql);
+            int counts = rs.getCounts();
+            log.writeLog("总行数: " + counts);
+            if(counts > 1){
+                ri.getRequestManager().setMessagecontent("同一张付款单,采购类型必须相同,请重新选择要付款的单据!");
+                return FAILURE_AND_CONTINUE;
+            }
+        }catch (Exception e){
+            ri.getRequestManager().setMessagecontent("内部错误---- > " + e);
+            return FAILURE_AND_CONTINUE;
+        }
+        return SUCCESS;
+    }
+}
diff --git a/src/main/youhong_ai_jitu_src/com/api/lh/action/ValidateAdvanceMultiplePodhAction.java b/src/main/youhong_ai_jitu_src/com/api/lh/action/ValidateAdvanceMultiplePodhAction.java
new file mode 100644
index 0000000..6d416a5
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/com/api/lh/action/ValidateAdvanceMultiplePodhAction.java
@@ -0,0 +1,43 @@
+package com.api.lh.action;
+
+import selfdev.util.base.BaseUtil;
+import selfdev.util.log.LogTool;
+import weaver.conn.RecordSet;
+import weaver.interfaces.workflow.action.Action;
+import weaver.soa.workflow.request.RequestInfo;
+
+/**
+ * @ClassName ValidateAdvanceMultiplePodhAction
+ * @Description 预付单禁止一张单据选取不同的采购订单号
+ * @Author louh
+ * @Date 2022/3/30 17:29
+ * @Version 1.0
+ */
+public class ValidateAdvanceMultiplePodhAction implements Action {
+    LogTool log = new LogTool("/log/lh/ValidateAdvanceMultiplePodhAction", false);
+    @Override
+    public String execute(RequestInfo ri) {
+        RecordSet rs = new RecordSet();
+        String requestid = ri.getRequestid();
+        String workflowid = ri.getWorkflowid();
+        try {
+            //获取表名
+            String tablename = BaseUtil.getBaseInfoByParm("tablename", "workflow_bill", "1", "1", " and id in (select formid from workflow_base where id=" + workflowid + ")");
+            log.writeLog("requestid---> " + requestid + "对应表名tablename---> " + tablename);
+            String id = BaseUtil.getBaseInfoByParm("id", tablename, "requestid", requestid, "");
+            String sql = "select distinct cgddh from " + tablename + "_dt2 where mainid = " + id;
+            log.writeLog("查询当前单据明细sql---->" + sql);
+            rs.execute(sql);
+            int counts = rs.getCounts();
+            if(counts > 1){
+                ri.getRequestManager().setMessagecontent("一张预付单据不允许选择不同的采购订单号!请重新获取ncc数据,并进行选择!");
+                return FAILURE_AND_CONTINUE;
+            }
+        }catch (Exception e){
+            ri.getRequestManager().setMessagecontent("内部错误--->" + e);
+            log.writeLog("出现异常: " + e);
+            return FAILURE_AND_CONTINUE;
+        }
+            return SUCCESS;
+    }
+}
diff --git a/src/main/youhong_ai_jitu_src/com/api/lh/action/ValidateAdvancePodhAction.java b/src/main/youhong_ai_jitu_src/com/api/lh/action/ValidateAdvancePodhAction.java
new file mode 100644
index 0000000..b71d436
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/com/api/lh/action/ValidateAdvancePodhAction.java
@@ -0,0 +1,74 @@
+package com.api.lh.action;
+
+import selfdev.util.base.BaseUtil;
+import selfdev.util.log.LogTool;
+import weaver.conn.RecordSet;
+import weaver.general.Util;
+import weaver.interfaces.workflow.action.Action;
+import weaver.soa.workflow.request.RequestInfo;
+
+/**
+ * @ClassName ValidateAdvancePodhAction
+ * @Description 效验NCC单号预付单是否有历史流程在审批中
+ * @Author louh
+ * @Date 2022/3/7 15:26
+ * @Version 1.0
+ */
+public class ValidateAdvancePodhAction implements Action {
+
+    LogTool log = new LogTool("/log/lh/action/ValidateAdvancePodhAction", false);
+    @Override
+    public String execute(RequestInfo ri) {
+        RecordSet rs = new RecordSet();
+        RecordSet rs1 = new RecordSet();
+        String requestid = ri.getRequestid();
+
+        String workflowid = ri.getWorkflowid();
+        try{
+            //获取表名
+            String tablename = BaseUtil.getBaseInfoByParm("tablename", "workflow_bill", "1", "1", " and id in (select formid from workflow_base where id=" + workflowid + ")");
+            log.writeLog("requestid---> " + requestid + "对应表名tablename---> " + tablename);
+            /* 公司名称 */
+            String gsmc = BaseUtil.getBaseInfoByParm("gsmc", tablename, "requestid", requestid, "");
+            /* 供应商名称 */
+            String gysmc = BaseUtil.getBaseInfoByParm("gysmc", tablename, "requestid", requestid, "");
+            /* 当前主表数据id */
+            String id = BaseUtil.getBaseInfoByParm("id", tablename, "requestid", requestid, "");
+
+
+            String sql = "select * from " + tablename + "_dt2 where mainid = " + id;
+            log.writeLog("查讯当前流程明细表数据sql-----> " + sql);
+            rs.execute(sql);
+            while(rs.next()){
+                /* 采购订单号 */
+                String cgddh = Util.null2String(rs.getString("cgddh"));
+                String sql1 = "select * from cgddcx20220429 where gsmc = '" + gsmc + "' and gysmc ='" + gysmc +"'  and cgddh = '" + cgddh + "' and podhName = 0 and stutas not in (0,3)";
+                log.writeLog("获取当前采购订单号是否有在审批中的流程sql----> " + sql1);
+                rs1.execute(sql1);
+                if(rs1.next()){  //如果有值说明有在审批中的流程
+                    /* 流程编号 */
+                    String lcbh = Util.null2String(rs1.getString("lcbh"));
+                    String requestid1 = Util.null2String(rs1.getString("requestid"));
+                    ri.getRequestManager().setMessagecontent("当前采购订单号【" + cgddh + "】有在审批中的流程,对应的流程编号【" + lcbh +"】和requestid为【" + requestid1 + "】,请先审批完此流程再次提交该流程！");
+                    return FAILURE_AND_CONTINUE;
+                }
+                //没有在审批中的流程则判断本次付款金额是否大于剩余未付金额
+                /* 本次付款金额 */
+                String je = Util.null2String(rs.getString("bcfkje"));
+                /* 剩余未付金额 */
+                String sywfje = Util.null2String(rs.getString("sywfje"));
+                double v = Double.parseDouble(je.replaceAll(",", ""));
+                double v1 = Double.parseDouble(sywfje.replaceAll(",", ""));
+                if(v > v1){
+                    ri.getRequestManager().setMessagecontent("当前采购订单号【" + cgddh + "】本次付款金额【" +v + "】元,大于剩余未付金额【" + v1 + "】元！");
+                    return FAILURE_AND_CONTINUE;
+                }
+            }
+        }catch (Exception e){
+            ri.getRequestManager().setMessagecontent("提交失败,请联系管理员查看问题----> " + e);
+            log.writeLog("requestid----> " + requestid + " 出现异常： " + e);
+            return FAILURE_AND_CONTINUE;
+        }
+        return SUCCESS;
+    }
+}
diff --git a/src/main/youhong_ai_jitu_src/com/api/lh/action/ValidatePayablePodhAction.java b/src/main/youhong_ai_jitu_src/com/api/lh/action/ValidatePayablePodhAction.java
new file mode 100644
index 0000000..b5a7413
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/com/api/lh/action/ValidatePayablePodhAction.java
@@ -0,0 +1,73 @@
+package com.api.lh.action;
+
+import selfdev.util.base.BaseUtil;
+import selfdev.util.log.LogTool;
+import weaver.conn.RecordSet;
+import weaver.general.Util;
+import weaver.interfaces.workflow.action.Action;
+import weaver.soa.workflow.request.RequestInfo;
+
+/**
+ * @ClassName NCCValidatePayablePodh
+ * @Description 效验NCC单号应付单是否有历史流程在审批中
+ * @Author louh
+ * @Date 2022/3/7 14:32
+ * @Version 1.0
+ */
+public class ValidatePayablePodhAction implements Action {
+    LogTool log = new LogTool("/log/lh/action/ValidatePayablePodhAction", false);
+    @Override
+    public String execute(RequestInfo ri) {
+        RecordSet rs = new RecordSet();
+        RecordSet rs1 = new RecordSet();
+        String requestid = ri.getRequestid();
+
+        String workflowid = ri.getWorkflowid();
+        try{
+            //获取表名
+            String tablename = BaseUtil.getBaseInfoByParm("tablename", "workflow_bill", "1", "1", " and id in (select formid from workflow_base where id=" + workflowid + ")");
+            log.writeLog("requestid---> " + requestid + "对应表名tablename---> " + tablename);
+            /* 公司名称 */
+            String gsmc = BaseUtil.getBaseInfoByParm("gsmc", tablename, "requestid", requestid, "");
+            /* 供应商名称 */
+            String gysmc = BaseUtil.getBaseInfoByParm("gysmc", tablename, "requestid", requestid, "");
+            /* 当前主表数据id */
+            String id = BaseUtil.getBaseInfoByParm("id", tablename, "requestid", requestid, "");
+
+
+            String sql = "select * from " + tablename + "_dt2 where mainid = " + id;
+            log.writeLog("查讯当前流程明细表数据sql-----> " + sql);
+            rs.execute(sql);
+            while(rs.next()){
+                /* 采购订单号 */
+                String cgddh = Util.null2String(rs.getString("cgddh"));
+                String sql1 = "select * from cgddcx20220429 where gsmc = '" + gsmc + "' and gysmc ='" + gysmc +"'  and cgddh = '" + cgddh + "'  and stutas not in (0,3)";
+                log.writeLog("获取当前采购订单号是否有在审批中的流程sql----> " + sql1);
+                rs1.execute(sql1);
+                if(rs1.next()){  //如果有值说明有在审批中的流程
+                    /* 流程编号 */
+                    String lcbh = Util.null2String(rs1.getString("lcbh"));
+                    String requestid1 = Util.null2String(rs1.getString("requestid"));
+                    ri.getRequestManager().setMessagecontent("当前采购订单号【" + cgddh + "】有在审批中的流程,对应的流程编号【" + lcbh +"】和requestid为【" + requestid1 + "】,请先审批完此流程再次提交该流程！");
+                    return FAILURE_AND_CONTINUE;
+                }
+                //没有在审批中的流程则判断本次付款金额是否大于剩余未付金额
+                /* 本次付款金额 */
+                String je = Util.null2String(rs.getString("je"));
+                /* 剩余未付金额 */
+                String sywfje = Util.null2String(rs.getString("sywfje"));
+                double v = Double.parseDouble(je.replaceAll(",", ""));
+                double v1 = Double.parseDouble(sywfje.replaceAll(",", ""));
+                if(v > v1){
+                    ri.getRequestManager().setMessagecontent("当前采购订单号【" + cgddh + "】本次付款金额【" +v + "】元,大于剩余未付金额【" + v1 + "】元！");
+                    return FAILURE_AND_CONTINUE;
+                }
+            }
+        }catch (Exception e){
+            ri.getRequestManager().setMessagecontent("提交失败,请联系管理员查看问题----> " + e);
+            log.writeLog("requestid----> " + requestid + " 出现异常： " + e);
+            return FAILURE_AND_CONTINUE;
+        }
+        return SUCCESS;
+    }
+}
diff --git a/src/main/youhong_ai_jitu_src/com/api/lh/action/two/NCCPaymentValidityAction.java b/src/main/youhong_ai_jitu_src/com/api/lh/action/two/NCCPaymentValidityAction.java
new file mode 100644
index 0000000..9884938
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/com/api/lh/action/two/NCCPaymentValidityAction.java
@@ -0,0 +1,102 @@
+package com.api.lh.action.two;
+
+import com.api.lh.config.DemoConfig;
+import selfdev.util.base.BaseUtil;
+import selfdev.util.log.LogTool;
+import weaver.conn.RecordSet;
+import weaver.general.Util;
+import weaver.interfaces.workflow.action.Action;
+import weaver.soa.workflow.request.RequestInfo;
+
+/**
+ * @ClassName NCCPaymentValidityAction
+ * @Description 付款申请(NCC集成) 提交效验
+ * @Author louh
+ * @Date 2022/5/9 14:42
+ * @Version 1.0
+ */
+public class NCCPaymentValidityAction implements Action, DemoConfig {
+
+    @Override
+    public String execute(RequestInfo ri) {
+        RecordSet rs = new RecordSet();
+        String requestid = ri.getRequestid();
+        String workflowid = ri.getWorkflowid();
+        String tableName = getTableName(workflowid);
+        log.writeLog("当前requestid========> " + requestid + " 对应表名为=======> " + tableName);
+        String id = getId(tableName, requestid);
+
+        //1.效验同一张单据是否选择了两条相同的抵扣明细
+        String sql = "select  yfkqptzmxid, count(yfkqptzmxid) as sum from " + tableName + "_dt1 where mainid = " + id + " group by yfkqptzmxid having count(yfkqptzmxid) > 1";
+        log.writeLog("根据主表数据id查询当前明细表数据是否有多次选择同一个预付款欠票台账明细id【yfkqptzmxid】sql---->" + sql);
+        rs.execute(sql);
+        if(rs.next()){
+            ri.getRequestManager().setMessagecontent("同一张单据不允许多次选择相同的【预付款欠票台账明细id】,请重新选择抵扣明细表不同的【预付款欠票台账明细id】数据。");
+            return FAILURE_AND_CONTINUE;
+        }
+
+        //供应商名称
+        String gysmc = BaseUtil.getBaseInfoByParm("gysmc", tableName, "requestid", requestid, "");
+        //公司名称
+        String gsmc = BaseUtil.getBaseInfoByParm("gsmc", tableName, "requestid", requestid, "");
+
+
+        //2.效验明细表本次扣减金额是否大于剩余未付金额
+        sql = "select * from " + tableName + "_dt1 where mainid = " + id;
+        rs.execute(sql);
+        while(rs.next()){
+            //剩余未付金额
+            double sywfje = Double.parseDouble(Util.null2String(rs.getString("sywfje")) == "" ? "0.00" : Util.null2String(rs.getString("sywfje")));
+            //本次抵减金额
+            double bcdjje = Double.parseDouble(Util.null2String(rs.getString("bcdjje")) == "" ? "0.00" : Util.null2String(rs.getString("bcdjje")));
+            //预付流程编号
+            String yflcbh = Util.null2String(rs.getString("yflcbh"));
+
+            //效验是否有历史单据再审批中
+            sql = "select b.requestid," +
+                    " b.lcbh," +
+                    " b.gsmc," +
+                    "b.gysmc," +
+                    "a.id," +
+                    "(select lcbh from uf_fksqyfb where qqid =  a.xgyflc) as bh," +
+                    "(select currentnodetype from workflow_requestbase where requestid = b.requestid) as stutas" +
+                    " from " + tableName + "_dt1 a left join " + tableName + " b on a.mainid = b.id " +
+                    " where b.gysmc = '" + gysmc + "' and b.gsmc = '" + gsmc + "' and a.yflcbh = '" + yflcbh + "'";
+            log.writeLog("效验是否有历史单据再审批中sql-----> "  + sql);
+            rs.execute(sql);
+            while(rs.next()){
+                String stutas = Util.null2String(rs.getString("stutas"));  /* 流程状态 */
+                if(!"0".equals(stutas) && !"3".equals(stutas)){
+                    String bh = Util.null2String(rs.getString("bh"));  /* 预付流程编号 */
+                    String lcbh = Util.null2String(rs.getString("lcbh"));  /* 审批中流程编号 */
+                    ri.getRequestManager().setMessagecontent("当前抵扣明细中【" + bh + "】正在审批中,审批的流程编号为【" + lcbh + "】,请先走完审批中的流程后继续提交该流程！");
+                    return FAILURE_AND_CONTINUE;
+                }
+            }
+
+            if(bcdjje > sywfje){
+                ri.getRequestManager().setMessagecontent("抵扣明细预付流程编号【" + yflcbh + "】中本次抵减金额【" + bcdjje + "】不允许大于剩余未付金额【" + sywfje + "】");
+                return FAILURE_AND_CONTINUE;
+            }
+        }
+
+
+
+
+        //4.效验主表抵扣金额是否大于申请金额
+        sql = "select * from " + tableName + " where requestid = " + requestid;
+        log.writeLog("效验主表抵扣金额是否大于申请金额sql-----> " + sql);
+        rs.execute(sql);
+        if(rs.next()){
+            //抵扣金额
+            double dkje = Double.parseDouble(Util.null2String(rs.getString("dkje")) == "" ? "0.00" : Util.null2String(rs.getString("dkje")));
+            //申请金额
+            double jshjje = Double.parseDouble(Util.null2String(rs.getString("jshjje")) == "" ? "0.00" : Util.null2String(rs.getString("jshjje")));
+            if(dkje > jshjje){
+                ri.getRequestManager().setMessagecontent("抵扣总金额【" + dkje + "】不能大于申请总金额【" + jshjje + "】");
+                return FAILURE_AND_CONTINUE;
+            }
+        }
+        return SUCCESS;
+    }
+}
diff --git a/src/main/youhong_ai_jitu_src/com/api/lh/action/two/NCCPaymentValidityActionYY.java b/src/main/youhong_ai_jitu_src/com/api/lh/action/two/NCCPaymentValidityActionYY.java
new file mode 100644
index 0000000..8e65234
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/com/api/lh/action/two/NCCPaymentValidityActionYY.java
@@ -0,0 +1,100 @@
+package com.api.lh.action.two;
+
+import com.api.lh.config.DemoConfig;
+import selfdev.util.base.BaseUtil;
+import weaver.conn.RecordSet;
+import weaver.general.Util;
+import weaver.interfaces.workflow.action.Action;
+import weaver.soa.workflow.request.RequestInfo;
+
+/**
+ * @ClassName NCCPaymentValidityAction
+ * @Description 付款申请(NCC集成) 提交效验
+ * @Author ycf
+ * @Date 2022/5/9 14:42
+ * @Version 1.0
+ */
+public class NCCPaymentValidityActionYY implements Action, DemoConfig {
+    @Override
+    public String execute(RequestInfo ri) {
+        RecordSet rs = new RecordSet();
+        String requestid = ri.getRequestid();
+        String workflowid = ri.getWorkflowid();
+        String tableName = getTableName(workflowid);
+        log.writeLog("当前requestid========> " + requestid + " 对应表名为=======> " + tableName);
+        String id = getId(tableName, requestid);
+
+        //1.效验同一张单据是否选择了两条相同的抵扣明细
+        String sql = "select  yfkqptzmxid, count(yfkqptzmxid) as sum from " + tableName + "_dt1 where mainid = " + id + " group by yfkqptzmxid having count(yfkqptzmxid) > 1";
+        log.writeLog("根据主表数据id查询当前明细表数据是否有多次选择同一个预付款欠票台账明细id【yfkqptzmxid】sql---->" + sql);
+        rs.execute(sql);
+        if(rs.next()){
+            ri.getRequestManager().setMessagecontent("同一张单据不允许多次选择相同的【预付款欠票台账明细id】,请重新选择抵扣明细表不同的【预付款欠票台账明细id】数据。");
+            return FAILURE_AND_CONTINUE;
+        }
+
+        //供应商名称
+        String gysmc = BaseUtil.getBaseInfoByParm("gysmc", tableName, "requestid", requestid, "");
+        //公司名称
+        String gsmc = BaseUtil.getBaseInfoByParm("gsmc", tableName, "requestid", requestid, "");
+
+
+        //2.效验明细表本次扣减金额是否大于剩余未付金额
+        sql = "select * from " + tableName + "_dt1 where mainid = " + id;
+        rs.execute(sql);
+        while(rs.next()){
+            //剩余未付金额
+            double sywfje = Double.parseDouble(Util.null2String(rs.getString("sywfje")) == "" ? "0.00" : Util.null2String(rs.getString("sywfje")));
+            //本次抵减金额
+            double bcdjje = Double.parseDouble(Util.null2String(rs.getString("bcdjje")) == "" ? "0.00" : Util.null2String(rs.getString("bcdjje")));
+            //预付流程编号
+            String yflcbh = Util.null2String(rs.getString("yflcbh"));
+
+            //效验是否有历史单据再审批中
+            sql = "select b.requestid," +
+                    " b.lcbh," +
+                    " b.gsmc," +
+                    "b.gysmc," +
+                    "a.id," +
+                    "(select lcbh from uf_gysqktzyy where qqid =  a.xgyflc) as bh," +
+                    "(select currentnodetype from workflow_requestbase where requestid = b.requestid) as stutas" +
+                    " from " + tableName + "_dt1 a left join " + tableName + " b on a.mainid = b.id " +
+                    " where b.gysmc = '" + gysmc + "' and b.gsmc = '" + gsmc + "' and a.yflcbh = '" + yflcbh + "'";
+            log.writeLog("效验是否有历史单据再审批中sql-----> "  + sql);
+            rs.execute(sql);
+            while(rs.next()){
+                String stutas = Util.null2String(rs.getString("stutas"));  /* 流程状态 */
+                if(!"0".equals(stutas) && !"3".equals(stutas)){
+                    String bh = Util.null2String(rs.getString("bh"));  /* 预付流程编号 */
+                    String lcbh = Util.null2String(rs.getString("lcbh"));  /* 审批中流程编号 */
+                    ri.getRequestManager().setMessagecontent("当前抵扣明细中【" + bh + "】正在审批中,审批的流程编号为【" + lcbh + "】,请先走完审批中的流程后继续提交该流程！");
+                    return FAILURE_AND_CONTINUE;
+                }
+            }
+
+            if(bcdjje > sywfje){
+                ri.getRequestManager().setMessagecontent("抵扣明细预付流程编号【" + yflcbh + "】中本次抵减金额【" + bcdjje + "】不允许大于剩余未付金额【" + sywfje + "】");
+                return FAILURE_AND_CONTINUE;
+            }
+        }
+
+
+
+
+        //4.效验主表抵扣金额是否大于申请金额
+        sql = "select * from " + tableName + " where requestid = " + requestid;
+        log.writeLog("效验主表抵扣金额是否大于申请金额sql-----> " + sql);
+        rs.execute(sql);
+        if(rs.next()){
+            //抵扣金额
+            double dkje = Double.parseDouble(Util.null2String(rs.getString("dkje")) == "" ? "0.00" : Util.null2String(rs.getString("dkje")));
+            //申请金额
+            double jshjje = Double.parseDouble(Util.null2String(rs.getString("jshjje")) == "" ? "0.00" : Util.null2String(rs.getString("jshjje")));
+            if(dkje > jshjje){
+                ri.getRequestManager().setMessagecontent("抵扣总金额【" + dkje + "】不能大于申请总金额【" + jshjje + "】");
+                return FAILURE_AND_CONTINUE;
+            }
+        }
+        return SUCCESS;
+    }
+}
diff --git a/src/main/youhong_ai_jitu_src/com/api/lh/action/two/NCCSupplierCWOAction.java b/src/main/youhong_ai_jitu_src/com/api/lh/action/two/NCCSupplierCWOAction.java
new file mode 100644
index 0000000..25eb204
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/com/api/lh/action/two/NCCSupplierCWOAction.java
@@ -0,0 +1,357 @@
+package com.api.lh.action.two;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.serializer.SerializerFeature;
+import com.api.lh.config.DemoConfig;
+import com.api.lh.port.AddJournal;
+import jntchina.entity.ErBxcontrast;
+import jntchina.entity.ReimbursementOrder;
+import jntchina.entity.ReimbursementOrderBody;
+import jntchina.util.HttpClientToDC;
+import selfdev.util.base.BaseUtil;
+import weaver.conn.RecordSet;
+import weaver.general.Util;
+import weaver.hrm.resource.ResourceComInfo;
+import weaver.interfaces.workflow.action.Action;
+import weaver.soa.workflow.request.RequestInfo;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+
+/**
+ * @ClassName NCCSupplierCWOAction
+ * @Description 供应商预付核销流程生成NCC对公报销单
+ * @Author louh
+ * @Date 2022/5/16 17:10
+ * @Version 1.0
+ */
+public class NCCSupplierCWOAction implements Action, DemoConfig {
+
+    @Override
+    public String execute(RequestInfo ri) {
+        String requestid = ri.getRequestid();
+        String workflowid = ri.getWorkflowid();
+
+        //获取当前用户的登录账号（即工号）
+        String loginid=ri.getRequestManager().getUser().getLoginid();
+
+        ReimbursementOrder reimbursementOrder = new ReimbursementOrder();
+        String tableName = getTableName(workflowid);
+        log.writeLog("当前requestid========> " + requestid + " 对应表名为=======> " + tableName);
+        String id = getId(tableName, requestid);
+        JSONObject json = null;
+        String mainId = "";
+        String isShowErrorMsg = "";//写入NCC失败时是否显示报错信息
+        String pk_org = ""; // 报销单位 JTSDCN0001
+        String fygsbm = ""; // 申请部门
+        String total = ""; // 报销金额   金额由表体相应字段汇总得出
+        String deptid = ""; // 部门   传输编码
+        String djlxbm = "264X-Cxx-YFKHXD"; // 单据类型编码   对私报销单:264X-Cxx-DSBXD  对公报销单:264X-Cxx-DGBXD
+        String djlxmc = "预付核销"; // 单据类型名称  默认 对公报销单
+        String djrq = ""; // 单据日期   yyyy-mm-dd hh:mm:ss
+        String payflag = ""; // 支付状态
+        String paytarget = "1"; // 收款对象   0=员工，1=供应商，2=客户，默认为供应商
+        String receiver = ""; // 收款人
+        String skyhzh = ""; // 收款人银行账号
+        String hbbm = ""; // yonyou88", //收款人（供应商）
+        String custaccount= ""; //收款银行账户（供应商）
+        String jkbxr = ""; // 借款报销人   传输编码
+        String operator = ""; // 录入人
+        String xm= ""; // 申请人
+        String jsfs = "3"; // 结算方式 3 网银
+        String fkyhzh = ""; // 单位银行账户 传输编码
+        String jobid = ""; // 项目
+        String zy = ""; // 报销事由
+        String kjqj = ""; // 会计期间
+        String kjnd = ""; // 会计年度
+        String fjzs = ""; // 附件张数   需业务人员在OA上传附件同时填写附件张数后传数据到NCC
+        String zyx1 = ""; // OA单据号   OA传过来，用于联查单据
+        String zyx2 = ""; // 提交人    提交人姓名
+        String zyx3 = ""; // OA核销单号
+        String zyx5 = ""; // OARequestID
+        String zyx8="";//银行付款备注
+        String zyx9=ri.getRequestManager().getRequestname();//标题
+        String tablecode = "arap_bxbusitem";
+        RecordSet rs = new RecordSet();
+
+        try{
+            String sql = " select *  from " + tableName + " where requestid='" + requestid + "'";
+            rs.execute(sql);
+            if(rs.next()) {
+                mainId = id;
+                isShowErrorMsg = Util.null2String(rs.getString("xrnccsbcsfts"));
+                xm = Util.null2String(rs.getString("sqr")); // 借款报销人（取流程申请人）
+                pk_org = Util.null2String(rs.getString("gsmc")); // 公司名称
+                total = Util.null2String(rs.getString("hxje")); // 报销金额   金额由表体相应字段汇总得出
+                fygsbm = Util.null2String(rs.getString("sqbm")); // 申请部门
+                hbbm = Util.null2String(rs.getString("gysmc")); // 收款人，供应商编码
+                custaccount = Util.null2String(rs.getString("yxzh")); // 收款人银行账号
+                zyx8 = Util.null2String(rs.getString("yxfkbz")); //银行付款备注
+                zy = Util.null2String(rs.getString("sm")); // 付款说明
+                zyx1 = Util.null2String(rs.getString("lcbh")); // OA单据号   OA传过来，用于联查单据
+                zyx2 = Util.null2String(rs.getString("sqr")); // 提交人    提交人姓名
+                djrq = Util.null2String(rs.getString("sqrq")); //申请日期
+                zyx5 = requestid; // OARequestID
+            }
+            kjqj = djrq.substring(5,7); //  会计期间
+            kjnd = djrq.substring(0,4); // 会计年度
+
+            //根据部门ID查询部门编码
+            deptid= BaseUtil.getBaseInfoByParm("departmentcode", "hrmdepartment", "id", fygsbm, "");
+            //获取员工默认的组织对应的类型
+            String userDefaultCompanyType=BaseUtil.getBaseInfoByParm("company_type", "v_oa_user_org_nsrsbh", "userid", xm, "");
+            //获取付款单选择的组织对应的类型
+            String selectCompanyType=BaseUtil.getBaseInfoByParm("company_type", "uf_businessunit", "code", pk_org, "");
+            log.writeLog("userDefaultCompanyType------>" + userDefaultCompanyType);
+            log.writeLog("selectCompanyType------>" + selectCompanyType);
+
+            //跨组织，则说明代理区向总部申请付款
+            if(!userDefaultCompanyType.equals(selectCompanyType)){
+                //查询建模维护的对应关系
+                String defaultDeptNo=BaseUtil.getBaseInfoByParm("mroabmbm", "uf_kzzfkdybmsz", "sqgslx", userDefaultCompanyType, " and fkgslx='"+selectCompanyType+"'");
+                log.writeLog("defaultDeptNo------>" + defaultDeptNo);
+                if(!"".equals(defaultDeptNo)){
+                    deptid=defaultDeptNo;
+                }
+            }
+
+            //截取前120位
+            if(zy.length()>120){
+                zy=zy.substring(0,120);
+            }
+            //标题截取前150位
+            if (zyx9.length() > 150){
+                zyx9 = zyx9.substring(0, 150);
+            }
+
+            jkbxr = new ResourceComInfo().getWorkcode(xm); //借款报销人工号(即申请人工号)
+            operator = loginid;//
+
+            //获取UUID
+            String uuid= UUID.randomUUID().toString().replace("-", "").toUpperCase();
+            log.writeLog("receiver------>"+receiver);
+
+            //查询抵扣明细
+            sql = " select *  from " + tableName + "_dt1 where mainid='" + mainId + "'";
+            rs.execute(sql);
+//            while (rs.next()) {
+//                zyx3+=Util.null2String(rs.getString("yflcbh"))+",";
+//            }
+//
+//            //将预付流程编号赋值到zyx3字段中
+//            if(!"".equals(zyx3)){
+//                zyx3=zyx3.substring(0,zyx3.length()-1);
+//            }
+
+            reimbursementOrder.setUuid(uuid);
+            reimbursementOrder.setPk_org(pk_org);
+            reimbursementOrder.setTotal(total);
+            reimbursementOrder.setDeptid(deptid);
+            reimbursementOrder.setDjlxbm(djlxbm);
+            reimbursementOrder.setDjrq(djrq);
+            reimbursementOrder.setPayflag(payflag);
+            reimbursementOrder.setPaytarget(paytarget);
+            reimbursementOrder.setReceiver(receiver);
+            reimbursementOrder.setHbbm(hbbm);
+            reimbursementOrder.setSkyhzh(skyhzh);
+            reimbursementOrder.setCustaccount(custaccount);
+            reimbursementOrder.setJkbxr(jkbxr);
+            reimbursementOrder.setOperator(operator);
+            reimbursementOrder.setJsfs(jsfs);
+            reimbursementOrder.setFkyhzh(fkyhzh);
+            reimbursementOrder.setJobid(jobid);
+            reimbursementOrder.setZy(zy);
+            reimbursementOrder.setKjqj(kjqj);
+            reimbursementOrder.setKjnd(kjnd);
+            reimbursementOrder.setFjzs(fjzs);
+            reimbursementOrder.setZyx1(zyx1);
+            reimbursementOrder.setZyx2(zyx2);
+            reimbursementOrder.setZyx3(zyx3);
+            reimbursementOrder.setZyx5(zyx5);
+            reimbursementOrder.setZyx8(zyx8);
+            reimbursementOrder.setZyx9(zyx9);
+
+            log.writeLog("【header数据准备完毕...】");
+
+            //获取OA-NCC发票映射关系表
+            Map<String,String> map_oafplx_nccfplcx=BaseUtil.getMapKeyValueInfoByParm("uf_oafplx_nccfplx", "", "oafplxid", "nccfplxbm");
+            //对公报销
+            List<ReimbursementOrderBody> reimbursementOrderBodyList = new ArrayList<ReimbursementOrderBody>();
+            List<ErBxcontrast> erBxcontrasts = new ArrayList<>();
+
+            int rowno = 0;
+            String sql1 = " select c.INVOICECODE,c.INVOICENUMBER,c.invoicetype,a.* from " + tableName + "_dt1 a "
+                    + " left join fnainvoiceledger c on a.fphm=c.id "
+                    + " where a.mainid = " + mainId;
+            log.writeLog("SQL1-----> " + sql1);
+            rs.execute(sql1);
+            while (rs.next()){
+                String jobid1 = ""; // 项目
+
+                String fycdbm = BaseUtil.getBaseInfoByParm("fycdbm", "uf_fksqyfb_dt1", "id", Util.null2String(rs.getString("yfkqptzmxid")), ""); //费用承担部门
+                String amount = Util.null2String(rs.getString("bchxje")); // 付款
+                String defitem36 = Util.null2o(rs.getString("fpje")); // 发票金额
+                String tax_rate = Util.null2String(rs.getString("sl")); // 税率 3%
+                String tax_amount = Util.null2String(rs.getString("se")); // 税额
+                String tni_amount = Util.null2String(rs.getString("bhsje")); // 无税金额
+                String szxmid = BaseUtil.getBaseInfoByParm("fylx", "uf_fksqyfb_dt1", "id", Util.null2String(rs.getString("yfkqptzmxid")), ""); // 收支项目  0101 汽车费用
+                String fpdm = Util.null2String(rs.getString("INVOICECODE")); // 发票代码
+                String fphm = Util.null2String(rs.getString("INVOICENUMBER")); // 发票号码
+                String invoicetype = Util.null2String(rs.getString("invoicetype")); // OA发票类型
+                //NCC发票类型
+                String fplxpk=Util.null2String(map_oafplx_nccfplcx.get(invoicetype));
+
+//                String fphmId = Util.null2String(rs.getString("fphm")); // 发票号码
+//                if(!"".equals(fphmId)){
+//                	// 得到浏览按钮中发票号码的id,再去数据库中把发票号码和发票代码查出来
+//                	rsFna.execute(" select * from fnainvoiceledger where id = " + fphmId);
+//                    while (rsFna.next()) {
+//                        fpdm = Util.null2String(rsFna.getString("INVOICECODE")); // 发票代码
+//                        fphm = Util.null2String(rsFna.getString("INVOICENUMBER")); // 发票号码
+//                        fplxpk = Util.null2String(map_oafplx_nccfplcx.get(Util.null2String(rsFna.getString("invoicetype")))); // OA发票类型
+//                    }
+//                }
+                //发票金额为空时，默认等于付款金额
+                if(Double.parseDouble(defitem36)==0){
+                    defitem36=amount;
+                }
+
+                String defitem46 = BaseUtil.getBaseInfoByParm("cbzx", "uf_fksqyfb_dt1", "id", Util.null2String(rs.getString("yfkqptzmxid")), ""); // 网点（成本中心）
+                String defitem45 = BaseUtil.getBaseInfoByParm("gj", "uf_fksqyfb_dt1", "id", Util.null2String(rs.getString("yfkqptzmxid")), ""); // 国家
+                String defitem44 = BaseUtil.getBaseInfoByParm("ck", "uf_fksqyfb_dt1", "id", Util.null2String(rs.getString("yfkqptzmxid")), ""); // 仓库
+                String defitem43 = BaseUtil.getBaseInfoByParm("cph", "uf_fksqyfb_dt1", "id", Util.null2String(rs.getString("yfkqptzmxid")), ""); //车牌号
+                String defitem42 = BaseUtil.getBaseInfoByParm("oamxxid", "uf_fksqyfb_dt1", "id", Util.null2String(rs.getString("yfkqptzmxid")), ""); // OA明细行ID
+                //根据部门ID查询部门编码(传NCC)
+                String fycdbm_NCC=BaseUtil.getBaseInfoByParm("departmentcode", "hrmdepartment", "id", fycdbm, "");
+
+                rowno++;
+
+                log.writeLog("----fycdbm_NCC:" + fycdbm_NCC);
+                log.writeLog("----amount:" + amount);
+                log.writeLog("----tax_rate:" + tax_rate);
+                log.writeLog("----tax_amount:" + tax_amount);
+                log.writeLog("----tni_amount:" + tni_amount);
+
+
+                ReimbursementOrderBody body = new ReimbursementOrderBody();
+                body.setJobid(jobid1);
+                body.setDeptid(fycdbm_NCC);
+                body.setAmount(amount);
+                body.setTax_rate(tax_rate);
+                body.setTax_amount(tax_amount);
+                body.setTni_amount(tni_amount);
+                body.setTablecode(tablecode);
+                body.setRowno(rowno+"");
+                body.setSzxmid(BaseUtil.getBaseInfoByParm("bm", "uf_fylx", "id", szxmid, ""));
+                body.setFpdm(fpdm);
+                body.setFphm(fphm);
+                body.setFplxpk(fplxpk);
+                body.setDefitem36(defitem36);
+                body.setDefitem46(defitem46);
+                body.setDefitem45(defitem45);
+                body.setDefitem44(defitem44);
+                body.setDefitem43(defitem43);
+                body.setDefitem42(defitem42);
+                //body.setDefitem48(fycdbm_NCC);
+                reimbursementOrderBodyList.add(body);
+            }
+            reimbursementOrder.setEr_busitem(reimbursementOrderBodyList);
+            sql = "select yfkqptzmxid, sum(bchxje) as hxje, avg(yfje) as zje, avg(xgyflc) as req from " + tableName + "_dt1" +
+                    " where mainid = '" + id  + "' group by yfkqptzmxid having count(yfkqptzmxid) > 0";
+            log.writeLog("获取预付核销数据明细sql-----> " +sql);
+            rs.execute(sql);
+            while(rs.next()){
+                String szxmid = BaseUtil.getBaseInfoByParm("fylx", "uf_fksqyfb_dt1", "id", Util.null2String(rs.getString("yfkqptzmxid")), "");
+                ErBxcontrast erBxcontrast = new ErBxcontrast(
+                        BaseUtil.getBaseInfoByParm("ncclcdh", "uf_fksqyfb","qqid", Util.null2String(rs.getString("req")), ""),
+                        BaseUtil.getBaseInfoByParm("bm", "uf_fylx", "id", szxmid, ""),
+                        Util.null2String(rs.getString("hxje")),
+                        BaseUtil.getBaseInfoByParm("oamxxid", "uf_fksqyfb_dt1", "id", Util.null2String(rs.getString("yfkqptzmxid")), ""),
+                        Util.null2String(rs.getString("yfkqptzmxid")));
+                erBxcontrasts.add(erBxcontrast);
+            }
+            reimbursementOrder.setEr_bxcontrast(erBxcontrasts);
+            String parm=JSONObject.toJSONString(reimbursementOrder, SerializerFeature.DisableCircularReferenceDetect);
+            log.writeLog(djlxmc+"准备传入中台的数据为------>" + parm);
+            //获取TOKEN
+            String token = HttpClientToDC.getToken();
+            log.writeLog("获取数据中台的token------>" + token);
+            if ("".equals(Util.null2String(token))) {
+                String tokenMsg="流程提交失败，未获取到数据中台接口TOKEN，请联系管理员处理！";
+                //将NCC返回结果回写至OA流程表单
+                rs.execute(" update " + tableName + " set sfcgscnccfkd = 1 ,nccfhxx='" + tokenMsg.replace("'", "''") + "'  where requestid = " + requestid);
+                AddJournal.addInfo("费用报销接口", JSON.parseObject(parm), tokenMsg, "1", requestid);
+                //是否需要显示报错信息
+                if("yes".equals(isShowErrorMsg)){
+                    ri.getRequestManager().setMessagecontent(tokenMsg);
+                    return Action.FAILURE_AND_CONTINUE;
+                }else{
+                    return SUCCESS;
+                }
+            }
+
+            //调用NCC接口，将数据传给NCC
+            String returndata = HttpClientToDC.sendPostApi(baseUrl+"/dcnccapi/claimForm/receiveData",token, parm);
+            log.writeLog("【调用数据中台报销接口返回结果result:】" + returndata);
+            if (!"".equals(returndata) && returndata != null) {
+                JSONObject jsonObject = JSONObject.parseObject(returndata);
+                String success = Util.null2String(jsonObject.get("succ"));
+                log.writeLog("--------发送请求返回的success值为：" + success);
+                if ("true".equals(success)) {
+                    JSONObject data = jsonObject.getJSONObject("data");
+                    String billno = Util.null2String(data.get("billno"));//NCC单号
+                    log.writeLog("--------发送请求返回的billno值为：" + billno);
+                    //将NCC返回结果回写至OA流程表单
+                    rs.execute(" update " + tableName + " set sfcgscnccfkd = 0 , nccfkdh = '" + billno + "',nccfhxx=''  where requestid = " + requestid);
+                    AddJournal.addInfo("费用报销接口", JSON.parseObject(parm), returndata, "0", requestid);
+                } else {
+                    String message = Util.null2String(jsonObject.get("msg"));
+                    String message2=message.replace("'", "''");
+                    //超出1333个字符，则只截取前面这部分
+                    if(message2.length()>1334){
+                        message2=message2.substring(0,1333);
+                    }
+                    //将NCC返回结果回写至OA流程表单
+                    rs.execute(" update " + tableName + " set sfcgscnccfkd = 1 ,nccfhxx='" + message2 + "'  where requestid = " + requestid);
+                    AddJournal.addInfo("费用报销接口", JSON.parseObject(parm), returndata, "1", requestid);
+                    //是否需要显示报错信息
+                    if("yes".equals(isShowErrorMsg)){
+                        ri.getRequestManager().setMessagecontent("流程数据写入NCC生成"+djlxmc+"失败,失败信息：<br/>"+message);
+                        return Action.FAILURE_AND_CONTINUE;
+                    }else{
+                        return SUCCESS;
+                    }
+                }
+            } else {
+                String ermsg="流程数据写入NCC生成"+djlxmc+"失败,未获取到接口返回结果，请联系系统管理员处理！";
+                AddJournal.addInfo("费用报销接口", JSON.parseObject(parm), ermsg, "1", requestid);
+                //将NCC返回结果回写至OA流程表单
+                rs.execute(" update " + tableName + " set sfcgscnccfkd = 1 ,nccfhxx='" + ermsg.replace("'", "''") + "'  where requestid = " + requestid);
+                //是否需要显示报错信息
+                if("yes".equals(isShowErrorMsg)){
+                    ri.getRequestManager().setMessagecontent(ermsg);
+                    return Action.FAILURE_AND_CONTINUE;
+                }else{
+                    return SUCCESS;
+                }
+            }
+
+        }catch (Exception e){
+            String ermsg="流程数据生成预付核销单失败！" + e.toString();
+            //将NCC返回结果回写至OA流程表单
+            AddJournal.addInfo("费用报销接口", json, ermsg, "1", requestid);
+            rs.execute(" update " + tableName + " set sfcgscnccfkd = 1 ,nccfhxx='" + ermsg.replace("'", "''") + "'  where requestid = " + requestid);
+            //是否需要显示报错信息
+            if("yes".equals(isShowErrorMsg)){
+                ri.getRequestManager().setMessagecontent(ermsg);
+                return Action.FAILURE_AND_CONTINUE;
+            }else{
+                return SUCCESS;
+            }
+        }
+        return SUCCESS;
+    }
+}
diff --git a/src/main/youhong_ai_jitu_src/com/api/lh/action/two/NCCSupplierCWOActionYY.java b/src/main/youhong_ai_jitu_src/com/api/lh/action/two/NCCSupplierCWOActionYY.java
new file mode 100644
index 0000000..383a2cb
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/com/api/lh/action/two/NCCSupplierCWOActionYY.java
@@ -0,0 +1,360 @@
+package com.api.lh.action.two;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.serializer.SerializerFeature;
+import com.api.lh.config.DemoConfig;
+import com.api.lh.port.AddJournal;
+import jntchina.entity.*;
+import jntchina.util.DataBaseUtils;
+import jntchina.util.HttpClientToDC;
+import selfdev.util.base.BaseUtil;
+import weaver.conn.RecordSet;
+import weaver.general.Util;
+import weaver.hrm.resource.ResourceComInfo;
+import weaver.interfaces.workflow.action.Action;
+import weaver.soa.workflow.request.RequestInfo;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+
+/**
+ * @ClassName NCCSupplierCWOAction
+ * @Description 供应商预付核销流程生成NCC对公报销单
+ * @Author ycf
+ * @Date 2022/5/16 17:10
+ * @Version 1.0
+ */
+    public class NCCSupplierCWOActionYY implements Action, DemoConfig {
+
+    @Override
+    public String execute(RequestInfo ri) {
+        //
+        String requestid = ri.getRequestid();
+        String workflowid = ri.getWorkflowid();
+
+        //获取当前用户的登录账号（即工号）
+        String loginid=ri.getRequestManager().getUser().getLoginid();
+
+        ReimbursementOrderYY reimbursementOrder = new ReimbursementOrderYY();
+        String tableName = getTableName(workflowid);
+        log.writeLog("当前requestid========> " + requestid + " 对应表名为=======> " + tableName);
+        String id = getId(tableName, requestid);
+        JSONObject json = null;
+        String mainId = "";
+        String isShowErrorMsg = "";//写入NCC失败时是否显示报错信息
+        String pk_org = ""; // 报销单位 JTSDCN0001
+        String fygsbm = ""; // 申请部门
+        String total = ""; // 报销金额   金额由表体相应字段汇总得出
+        String deptid = ""; // 部门   传输编码
+        String djlxbm = "264X-Cxx-YFKHXD"; // 单据类型编码   对私报销单:264X-Cxx-DSBXD  对公报销单:264X-Cxx-DGBXD
+        String djlxmc = "预付核销"; // 单据类型名称  默认 对公报销单
+        String djrq = ""; // 单据日期   yyyy-mm-dd hh:mm:ss
+        String payflag = ""; // 支付状态
+        String paytarget = "1"; // 收款对象   0=员工，1=供应商，2=客户，默认为供应商
+        String receiver = ""; // 收款人
+        String skyhzh = ""; // 收款人银行账号
+        String hbbm = ""; // yonyou88", //收款人（供应商）
+        String custaccount= ""; //收款银行账户（供应商）
+        String jkbxr = ""; // 借款报销人   传输编码
+        String operator = ""; // 录入人
+        String xm= ""; // 申请人
+        String jsfs = "3"; // 结算方式 3 网银
+        String fkyhzh = ""; // 单位银行账户 传输编码
+        String jobid = ""; // 项目
+        String zy = ""; // 报销事由
+        String kjqj = ""; // 会计期间
+        String kjnd = ""; // 会计年度
+        String fjzs = ""; // 附件张数   需业务人员在OA上传附件同时填写附件张数后传数据到NCC
+        String zyx1 = ""; // OA单据号   OA传过来，用于联查单据
+        String zyx2 = ""; // 提交人    提交人姓名
+        String zyx3 = ""; // OA核销单号
+        String zyx5 = ""; // OARequestID
+        String zyx8="";//银行付款备注
+        String zyx9=ri.getRequestManager().getRequestname().length()>140?ri.getRequestManager().getRequestname().substring(0,140):ri.getRequestManager().getRequestname();//标题
+        String tablecode = "arap_bxbusitem";
+        RecordSet rs = new RecordSet();
+
+        try{
+            String sql = " select *  from " + tableName + " where requestid='" + requestid + "'";
+            rs.execute(sql);
+            if(rs.next()) {
+                mainId = id;
+                isShowErrorMsg = Util.null2String(rs.getString("xrnccsbcsfts"));
+                xm = Util.null2String(rs.getString("sqr")); // 借款报销人（取流程申请人）
+                pk_org = Util.null2String(rs.getString("gsmc")); // 公司名称
+                total = Util.null2String(rs.getString("hxje")); // 报销金额   金额由表体相应字段汇总得出
+                fygsbm = Util.null2String(rs.getString("sqbm")); // 申请部门
+                hbbm = Util.null2String(rs.getString("gysmc")); // 收款人，供应商编码
+                custaccount = Util.null2String(rs.getString("yxzh")); // 收款人银行账号
+                zyx8 = Util.null2String(rs.getString("yxfkbz")); //银行付款备注
+                zy = Util.null2String(rs.getString("sm")); // 付款说明
+                zyx1 = Util.null2String(rs.getString("lcbh")); // OA单据号   OA传过来，用于联查单据
+                zyx2 = Util.null2String(rs.getString("sqr")); // 提交人    提交人姓名
+                djrq = Util.null2String(rs.getString("sqrq")); //申请日期
+                zyx5 = requestid; // OARequestID
+            }
+            kjqj = djrq.substring(5,7); //  会计期间
+            kjnd = djrq.substring(0,4); // 会计年度
+
+            //根据部门ID查询部门编码
+            deptid= BaseUtil.getBaseInfoByParm("departmentcode", "hrmdepartment", "id", fygsbm, "");
+            //获取员工默认的组织对应的类型
+            String userDefaultCompanyType=BaseUtil.getBaseInfoByParm("company_type", "v_oa_user_org_nsrsbh", "userid", xm, "");
+            //获取付款单选择的组织对应的类型
+            String selectCompanyType=BaseUtil.getBaseInfoByParm("company_type", "uf_businessunit", "code", pk_org, "");
+            log.writeLog("userDefaultCompanyType------>" + userDefaultCompanyType);
+            log.writeLog("selectCompanyType------>" + selectCompanyType);
+
+            //跨组织，则说明代理区向总部申请付款
+            if(!userDefaultCompanyType.equals(selectCompanyType)){
+                //查询建模维护的对应关系
+                String defaultDeptNo=BaseUtil.getBaseInfoByParm("mroabmbm", "uf_kzzfkdybmsz", "sqgslx", userDefaultCompanyType, " and fkgslx='"+selectCompanyType+"'");
+                log.writeLog("defaultDeptNo------>" + defaultDeptNo);
+                if(!"".equals(defaultDeptNo)){
+                    deptid=defaultDeptNo;
+                }
+            }
+
+            //截取前120位
+            if(zy.length()>120){
+                zy=zy.substring(0,120);
+            }
+
+            jkbxr = new ResourceComInfo().getWorkcode(xm); //借款报销人工号(即申请人工号)
+            operator = loginid;//
+
+            //获取UUID
+            String uuid= UUID.randomUUID().toString().replace("-", "").toUpperCase();
+            log.writeLog("receiver------>"+receiver);
+
+            //查询抵扣明细
+            sql = " select *  from " + tableName + "_dt1 where mainid='" + mainId + "'";
+            rs.execute(sql);
+//            while (rs.next()) {
+//                zyx3+=Util.null2String(rs.getString("yflcbh"))+",";
+//            }
+//
+//            //将预付流程编号赋值到zyx3字段中
+//            if(!"".equals(zyx3)){
+//                zyx3=zyx3.substring(0,zyx3.length()-1);
+//            }
+
+            reimbursementOrder.setUuid(uuid);
+            reimbursementOrder.setPk_org(pk_org);
+            reimbursementOrder.setTotal(total);
+            reimbursementOrder.setDeptid(deptid);
+            reimbursementOrder.setDjlxbm(djlxbm);
+            reimbursementOrder.setDjrq(djrq);
+            reimbursementOrder.setPayflag(payflag);
+            reimbursementOrder.setPaytarget(paytarget);
+            reimbursementOrder.setReceiver(receiver);
+            reimbursementOrder.setHbbm(hbbm);
+            reimbursementOrder.setSkyhzh(skyhzh);
+            reimbursementOrder.setCustaccount(custaccount);
+            reimbursementOrder.setJkbxr(jkbxr);
+            reimbursementOrder.setOperator(operator);
+            reimbursementOrder.setJsfs(jsfs);
+            reimbursementOrder.setFkyhzh(fkyhzh);
+            reimbursementOrder.setJobid(jobid);
+            reimbursementOrder.setZy(zy);
+            reimbursementOrder.setKjqj(kjqj);
+            reimbursementOrder.setKjnd(kjnd);
+            reimbursementOrder.setFjzs(fjzs);
+            reimbursementOrder.setZyx1(zyx1);
+            reimbursementOrder.setZyx2(zyx2);
+            reimbursementOrder.setZyx3(zyx3);
+            reimbursementOrder.setZyx5(zyx5);
+            reimbursementOrder.setZyx8(zyx8);
+            reimbursementOrder.setZyx9(zyx9);
+
+            log.writeLog("【header数据准备完毕...】");
+
+            //获取OA-NCC发票映射关系表
+            Map<String,String> map_oafplx_nccfplcx=BaseUtil.getMapKeyValueInfoByParm("uf_oafplx_nccfplx", "", "oafplxid", "nccfplxbm");
+            //对公报销
+            List<ReimbursementOrderBodyYY> reimbursementOrderBodyList = new ArrayList<ReimbursementOrderBodyYY>();
+            List<ErBxcontrast> erBxcontrasts = new ArrayList<>();
+
+            int rowno = 0;
+            String sql1 = " select c.INVOICECODE,c.INVOICENUMBER,c.invoicetype,a.* from " + tableName + "_dt1 a "
+                    + " left join fnainvoiceledger c on a.fphm=c.id "
+                    + " where a.mainid = " + mainId;
+            log.writeLog("SQL1-----> " + sql1);
+            rs.execute(sql1);
+            while (rs.next()){
+                String jobid1 = ""; // 项目
+
+                String fycdbm = BaseUtil.getBaseInfoByParm("fycdbm", "uf_gysqktzyy_dt1", "id", Util.null2String(rs.getString("yfkqptzmxid")), ""); //费用承担部门
+                String amount = Util.null2String(rs.getString("bchxje")); // 付款
+                String defitem36 = Util.null2o(rs.getString("fpje")); // 发票金额
+                String tax_rate = Util.null2String(rs.getString("sl")); // 税率 3%
+                String tax_amount = Util.null2String(rs.getString("se")); // 税额
+                String tni_amount = Util.null2String(rs.getString("bhsje")); // 无税金额
+                String szxmid = BaseUtil.getBaseInfoByParm("fylx", "uf_gysqktzyy_dt1", "id", Util.null2String(rs.getString("yfkqptzmxid")), ""); // 收支项目  0101 汽车费用
+                String fpdm = Util.null2String(rs.getString("INVOICECODE")); // 发票代码
+                String fphm = Util.null2String(rs.getString("INVOICENUMBER")); // 发票号码
+                String invoicetype = Util.null2String(rs.getString("invoicetype")); // OA发票类型
+                //NCC发票类型
+                String fplxpk=Util.null2String(map_oafplx_nccfplcx.get(invoicetype));
+
+//                String fphmId = Util.null2String(rs.getString("fphm")); // 发票号码
+//                if(!"".equals(fphmId)){
+//                	// 得到浏览按钮中发票号码的id,再去数据库中把发票号码和发票代码查出来
+//                	rsFna.execute(" select * from fnainvoiceledger where id = " + fphmId);
+//                    while (rsFna.next()) {
+//                        fpdm = Util.null2String(rsFna.getString("INVOICECODE")); // 发票代码
+//                        fphm = Util.null2String(rsFna.getString("INVOICENUMBER")); // 发票号码
+//                        fplxpk = Util.null2String(map_oafplx_nccfplcx.get(Util.null2String(rsFna.getString("invoicetype")))); // OA发票类型
+//                    }
+//                }
+                //发票金额为空时，默认等于付款金额
+                if(Double.parseDouble(defitem36)==0){
+                    defitem36=amount;
+                }
+
+                sql = "select * from uf_gysqktzyy_dt1 where id = " + Util.null2String(rs.getString("yfkqptzmxid"));
+                log.writeLog("获取明细数据:"+sql);
+
+
+                Map<String, String> dataMap = DataBaseUtils.getDataMap(sql);
+                String defitem46 = dataMap.get("CBZX"); // 网点（成本中心）
+                String defitem45 = dataMap.get("GJ"); // 国家
+                String defitem44 = dataMap.get("CK"); // 仓库
+                String defitem43 = dataMap.get("CPH"); //车牌号
+                String defitem42 = dataMap.get("OAMXXID"); // OA明细行ID
+                //根据部门ID查询部门编码(传NCC)
+//                String fycdbm_NCC=BaseUtil.getBaseInfoByParm("departmentcode", "hrmdepartment", "id", fycdbm, "");
+//                fycdbm_NCC = fycdbm;//直接取NCC的费用承担部门
+
+                rowno++;
+
+                log.writeLog("----fycdbm_NCC:" + fycdbm);
+                log.writeLog("----amount:" + amount);
+                log.writeLog("----tax_rate:" + tax_rate);
+                log.writeLog("----tax_amount:" + tax_amount);
+                log.writeLog("----tni_amount:" + tni_amount);
+
+
+                ReimbursementOrderBodyYY body = new ReimbursementOrderBodyYY();
+                body.setJobid(jobid1);
+                body.setDeptid(fycdbm);
+                body.setAmount(amount);
+                body.setTax_rate(tax_rate);
+                body.setTax_amount(tax_amount);
+                body.setTni_amount(tni_amount);
+                body.setTablecode(tablecode);
+                body.setRowno(rowno+"");
+                body.setSzxmid(BaseUtil.getBaseInfoByParm("bm", "uf_fylx", "id", szxmid, ""));
+                body.setFpdm(fpdm);
+                body.setFphm(fphm);
+                body.setFplxpk(fplxpk);
+                body.setDefitem36(defitem36);
+                body.setDefitem46(defitem46);
+                body.setDefitem45(defitem45);
+                body.setDefitem44(defitem44);
+                body.setDefitem43(defitem43);
+                body.setDefitem42(defitem42);
+                body.setDeptidIsNeedConvert("no");
+                //body.setDefitem48(fycdbm_NCC);
+                reimbursementOrderBodyList.add(body);
+            }
+            reimbursementOrder.setEr_busitem(reimbursementOrderBodyList);
+            sql = "select yfkqptzmxid, sum(bchxje) as hxje, avg(yfje) as zje, avg(xgyflc) as req from " + tableName + "_dt1" +
+                    " where mainid = '" + id  + "' group by yfkqptzmxid having count(yfkqptzmxid) > 0";
+            log.writeLog("获取预付核销数据明细sql-----> " +sql);
+            rs.execute(sql);
+            while(rs.next()){
+                String szxmid = BaseUtil.getBaseInfoByParm("fylx", "uf_gysqktzyy_dt1", "id", Util.null2String(rs.getString("yfkqptzmxid")), "");
+                ErBxcontrast erBxcontrast = new ErBxcontrast(
+                        BaseUtil.getBaseInfoByParm("ncclcdh", "uf_gysqktzyy","qqid", Util.null2String(rs.getString("req")), ""),
+                        BaseUtil.getBaseInfoByParm("bm", "uf_fylx", "id", szxmid, ""),
+                        Util.null2String(rs.getString("hxje")),
+                        BaseUtil.getBaseInfoByParm("oamxxid", "uf_gysqktzyy_dt1", "id", Util.null2String(rs.getString("yfkqptzmxid")), ""),
+                        Util.null2String(rs.getString("yfkqptzmxid")));
+                erBxcontrasts.add(erBxcontrast);
+            }
+            reimbursementOrder.setEr_bxcontrast(erBxcontrasts);
+            String parm=JSONObject.toJSONString(reimbursementOrder, SerializerFeature.DisableCircularReferenceDetect);
+            log.writeLog(djlxmc+"准备传入中台的数据为------>" + parm);
+            //获取TOKEN
+            String token = HttpClientToDC.getToken();
+            log.writeLog("获取数据中台的token------>" + token);
+            if ("".equals(Util.null2String(token))) {
+                String tokenMsg="流程提交失败，未获取到数据中台接口TOKEN，请联系管理员处理！";
+                //将NCC返回结果回写至OA流程表单
+                rs.execute(" update " + tableName + " set sfcgscnccfkd = 1 ,nccfhxx='" + tokenMsg.replace("'", "''") + "'  where requestid = " + requestid);
+                AddJournal.addInfo("费用报销接口", JSON.parseObject(parm), tokenMsg, "1", requestid);
+                //是否需要显示报错信息
+                if("yes".equals(isShowErrorMsg)){
+                    ri.getRequestManager().setMessagecontent(tokenMsg);
+                    return Action.FAILURE_AND_CONTINUE;
+                }else{
+                    return SUCCESS;
+                }
+            }
+
+            //调用NCC接口，将数据传给NCC
+            String returndata = HttpClientToDC.sendPostApi(baseUrl+"/dcnccapi/claimForm/receiveData",token, parm);
+            log.writeLog("【调用数据中台报销接口返回结果result:】" + returndata);
+            if (!"".equals(returndata) && returndata != null) {
+                JSONObject jsonObject = JSONObject.parseObject(returndata);
+                String success = Util.null2String(jsonObject.get("succ"));
+                log.writeLog("--------发送请求返回的success值为：" + success);
+                if ("true".equals(success)) {
+                    JSONObject data = jsonObject.getJSONObject("data");
+                    String billno = Util.null2String(data.get("billno"));//NCC单号
+                    log.writeLog("--------发送请求返回的billno值为：" + billno);
+                    //将NCC返回结果回写至OA流程表单
+                    rs.execute(" update " + tableName + " set sfcgscnccfkd = 0 , nccfkdh = '" + billno + "',nccfhxx=''  where requestid = " + requestid);
+                    AddJournal.addInfo("费用报销接口", JSON.parseObject(parm), returndata, "0", requestid);
+                } else {
+                    String message = Util.null2String(jsonObject.get("msg"));
+                    String message2=message.replace("'", "''");
+                    //超出1333个字符，则只截取前面这部分
+                    if(message2.length()>1334){
+                        message2=message2.substring(0,1333);
+                    }
+                    //将NCC返回结果回写至OA流程表单
+                    rs.execute(" update " + tableName + " set sfcgscnccfkd = 1 ,nccfhxx='" + message2 + "'  where requestid = " + requestid);
+                    AddJournal.addInfo("费用报销接口", JSON.parseObject(parm), returndata, "1", requestid);
+                    //是否需要显示报错信息
+                    if("yes".equals(isShowErrorMsg)){
+                        ri.getRequestManager().setMessagecontent("流程数据写入NCC生成"+djlxmc+"失败,失败信息：<br/>"+message);
+                        return Action.FAILURE_AND_CONTINUE;
+                    }else{
+                        return SUCCESS;
+                    }
+                }
+            } else {
+                String ermsg="流程数据写入NCC生成"+djlxmc+"失败,未获取到接口返回结果，请联系系统管理员处理！";
+                AddJournal.addInfo("费用报销接口", JSON.parseObject(parm), ermsg, "1", requestid);
+                //将NCC返回结果回写至OA流程表单
+                rs.execute(" update " + tableName + " set sfcgscnccfkd = 1 ,nccfhxx='" + ermsg.replace("'", "''") + "'  where requestid = " + requestid);
+                //是否需要显示报错信息
+                if("yes".equals(isShowErrorMsg)){
+                    ri.getRequestManager().setMessagecontent(ermsg);
+                    return Action.FAILURE_AND_CONTINUE;
+                }else{
+                    return SUCCESS;
+                }
+            }
+
+        }catch (Exception e){
+            String ermsg="流程数据生成预付核销单失败！" + e.toString();
+            //将NCC返回结果回写至OA流程表单
+            AddJournal.addInfo("费用报销接口", json, ermsg, "1", requestid);
+            rs.execute(" update " + tableName + " set sfcgscnccfkd = 1 ,nccfhxx='" + ermsg.replace("'", "''") + "'  where requestid = " + requestid);
+            //是否需要显示报错信息
+            if("yes".equals(isShowErrorMsg)){
+                ri.getRequestManager().setMessagecontent(ermsg);
+                return Action.FAILURE_AND_CONTINUE;
+            }else{
+                return SUCCESS;
+            }
+        }
+        return SUCCESS;
+    }
+}
diff --git a/src/main/youhong_ai_jitu_src/com/api/lh/action/two/SupplierVerificationAction.java b/src/main/youhong_ai_jitu_src/com/api/lh/action/two/SupplierVerificationAction.java
new file mode 100644
index 0000000..414f1d4
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/com/api/lh/action/two/SupplierVerificationAction.java
@@ -0,0 +1,95 @@
+package com.api.lh.action.two;
+
+import com.api.lh.config.DemoConfig;
+
+import selfdev.util.base.BaseUtil;
+import selfdev.util.log.LogTool;
+import weaver.conn.RecordSet;
+import weaver.general.Util;
+import weaver.interfaces.workflow.action.Action;
+import weaver.soa.workflow.request.RequestInfo;
+
+/**
+ * @ClassName SupplierVerificationAction
+ * @Description 供应商预付核销提交效验action
+ * @Author louh
+ * @Date 2022/5/16 16:04
+ * @Version 1.0
+ */
+public class SupplierVerificationAction implements Action, DemoConfig {
+    LogTool log = new LogTool("/log/lh/SupplierVerificationAction", false);
+    @Override
+    public String execute(RequestInfo ri) {
+        RecordSet rs = new RecordSet();
+        RecordSet rs1 = new RecordSet();
+        String requestid = ri.getRequestid();
+        String workflowid = ri.getWorkflowid();
+        String tableName = getTableName(workflowid);
+        log.writeLog("当前requestid========> " + requestid + " 对应表名为=======> " + tableName);
+        String id = getId(tableName, requestid);
+        //供应商名称
+        String gysmc = BaseUtil.getBaseInfoByParm("gysmc", tableName, "requestid", requestid, "");
+        //公司名称
+        String gsmc = BaseUtil.getBaseInfoByParm("gsmc", tableName, "requestid", requestid, "");
+
+
+        //1.效验每张单据的抵扣金额是否超过预付金额
+        String sql = "select yfkqptzmxid, sum(bchxje) as hxje, avg(yfje) as zje from " + tableName + "_dt1 " +
+                " where mainid = '" + id + "'" +
+                "group by yfkqptzmxid having count(yfkqptzmxid) > 0";
+        log.writeLog("效验每张单据的抵扣金额是否超过预付金额sql-----> " + sql);
+        rs.execute(sql);
+        while(rs.next()){
+            String yfkqptzmxid = Util.null2String(rs.getString("yfkqptzmxid"));  //预付款欠票台账明细id
+            double hxje = Double.parseDouble(Util.null2String(rs.getString("hxje"))==""?"0.00":Util.null2String(rs.getString("hxje")));  //本次核销金额
+            double zje = Double.parseDouble(Util.null2String(rs.getString("zje"))==""?"0.00":Util.null2String(rs.getString("zje")));  //预付金额
+            if(hxje > zje){
+                ri.getRequestManager().setMessagecontent("当前单据预付核销明细中预付款欠票台账明细id【" + yfkqptzmxid + "】抵扣总金额【" + hxje + "】合计大于预付金额【" + zje + "】,请重新选取要核销的数据！");
+                return FAILURE_AND_CONTINUE;
+            }
+
+
+
+            //预付流程编号
+            String yflcbh = weaver.general.Util.null2String(rs.getString("yflcbh"));
+
+            //效验是否有历史单据再审批中
+            sql = "select b.requestid," +
+                    " b.lcbh," +
+                    " b.gsmc," +
+                    "b.gysmc," +
+                    "a.id," +
+                    "(select lcbh from uf_fksqyfb where qqid =  a.xgyflc) as bh," +
+                    "(select currentnodetype from workflow_requestbase where requestid = b.requestid) as stutas" +
+                    " from " + tableName + "_dt1 a left join " + tableName + " b on a.mainid = b.id " +
+                    " where b.gysmc = '" + gysmc + "' and b.gsmc = '" + gsmc + "' and a.yflcbh = '" + yflcbh + "'";
+            log.writeLog("效验是否有历史单据再审批中sql-----> "  + sql);
+            rs1.execute(sql);
+            while(rs1.next()){
+                String stutas = Util.null2String(rs1.getString("stutas"));  /* 流程状态 */
+                if(!"0".equals(stutas) && !"3".equals(stutas)){
+                    String bh = Util.null2String(rs1.getString("bh"));  /* 预付流程编号 */
+                    String lcbh = Util.null2String(rs1.getString("lcbh"));  /* 审批中流程编号 */
+                    ri.getRequestManager().setMessagecontent("当前抵扣明细中【" + bh + "】正在审批中,审批的流程编号为【" + lcbh + "】,请先走完审批中的流程后继续提交该流程！");
+                    return FAILURE_AND_CONTINUE;
+                }
+            }
+        }
+
+        //2.效验明细表每行抵扣金额不得大于发票金额
+        sql = "select yfkqptzmxid, bchxje, fpje from " + tableName + "_dt1 where mainid = " + id;
+        rs.execute(sql);
+        while(rs.next()){
+            double bchxje = Double.parseDouble(Util.null2o(rs.getString("bchxje")));
+            double fpje = Double.parseDouble(Util.null2o(rs.getString("fpje")));
+            if (bchxje > fpje){
+                String yfkqptzmxid = Util.null2String(rs.getString("yfkqptzmxid"));
+                ri.getRequestManager().setMessagecontent("当前单据预付核销明细中预付款欠票台账明细id【" + yfkqptzmxid + "】抵扣金额【" + bchxje + "】发票金额【" + fpje + "】,请重新选取要核销的数据！");
+                return FAILURE_AND_CONTINUE;
+            }
+        }
+
+
+        return SUCCESS;
+    }
+}
diff --git a/src/main/youhong_ai_jitu_src/com/api/lh/action/two/SupplierVerificationActionYY.java b/src/main/youhong_ai_jitu_src/com/api/lh/action/two/SupplierVerificationActionYY.java
new file mode 100644
index 0000000..ab3e7f5
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/com/api/lh/action/two/SupplierVerificationActionYY.java
@@ -0,0 +1,79 @@
+package com.api.lh.action.two;
+
+import com.api.lh.config.DemoConfig;
+import com.wbi.util.Util;
+import selfdev.util.base.BaseUtil;
+import selfdev.util.log.LogTool;
+import weaver.conn.RecordSet;
+import weaver.interfaces.workflow.action.Action;
+import weaver.soa.workflow.request.RequestInfo;
+
+/**
+ * @ClassName SupplierVerificationAction
+ * @Description 供应商预付核销提交效验action
+ * @Author ycf
+ * @Date 2022/5/16 16:04
+ * @Version 1.0
+ */
+public class SupplierVerificationActionYY implements Action, DemoConfig {
+    LogTool log = new LogTool("/log/lh/SupplierVerificationAction", false);
+    @Override
+    public String execute(RequestInfo ri) {
+        RecordSet rs = new RecordSet();
+        String requestid = ri.getRequestid();
+        String workflowid = ri.getWorkflowid();
+        String tableName = getTableName(workflowid);
+        log.writeLog("当前requestid========> " + requestid + " 对应表名为=======> " + tableName);
+        String id = getId(tableName, requestid);
+        //供应商名称
+        String gysmc = BaseUtil.getBaseInfoByParm("gysmc", tableName, "requestid", requestid, "");
+        //公司名称
+        String gsmc = BaseUtil.getBaseInfoByParm("gsmc", tableName, "requestid", requestid, "");
+
+
+        //1.效验每张单据的抵扣金额是否超过预付金额
+        String sql = "select yfkqptzmxid, sum(bchxje) as hxje, avg(yfje) as zje from " + tableName + "_dt1 " +
+                " where mainid = '" + id + "'" +
+                "group by yfkqptzmxid having count(yfkqptzmxid) > 0";
+        log.writeLog("效验每张单据的抵扣金额是否超过预付金额sql-----> " + sql);
+        rs.execute(sql);
+        while(rs.next()){
+            String yfkqptzmxid = Util.null2String(rs.getString("yfkqptzmxid"));  //预付款欠票台账明细id
+            double hxje = Double.parseDouble(Util.null2String(rs.getString("hxje"))==""?"0.00":Util.null2String(rs.getString("hxje")));  //本次核销金额
+            double zje = Double.parseDouble(Util.null2String(rs.getString("zje"))==""?"0.00":Util.null2String(rs.getString("zje")));  //预付金额
+            if(hxje > zje){
+                ri.getRequestManager().setMessagecontent("当前单据预付核销明细中预付款欠票台账明细id【" + yfkqptzmxid + "】抵扣总金额【" + hxje + "】合计大于预付金额【" + zje + "】,请重新选取要核销的数据！");
+                return FAILURE_AND_CONTINUE;
+            }
+
+            //预付流程编号
+            String yflcbh = weaver.general.Util.null2String(rs.getString("yflcbh"));
+
+            //效验是否有历史单据再审批中
+            sql = "select b.requestid," +
+                    " b.lcbh," +
+                    " b.gsmc," +
+                    "b.gysmc," +
+                    "a.id," +
+                    "(select lcbh from uf_gysqktzyy where qqid =  a.xgyflc) as bh," +
+                    "(select currentnodetype from workflow_requestbase where requestid = b.requestid) as stutas" +
+                    " from " + tableName + "_dt1 a left join " + tableName + " b on a.mainid = b.id " +
+                    " where b.gysmc = '" + gysmc + "' and b.gsmc = '" + gsmc + "' and a.yflcbh = '" + yflcbh + "'";
+            log.writeLog("效验是否有历史单据再审批中sql-----> "  + sql);
+            rs.execute(sql);
+            while(rs.next()){
+                String stutas = weaver.general.Util.null2String(rs.getString("stutas"));  /* 流程状态 */
+                if(!"0".equals(stutas) && !"3".equals(stutas)){
+                    String bh = weaver.general.Util.null2String(rs.getString("bh"));  /* 预付流程编号 */
+                    String lcbh = weaver.general.Util.null2String(rs.getString("lcbh"));  /* 审批中流程编号 */
+                    ri.getRequestManager().setMessagecontent("当前抵扣明细中【" + bh + "】正在审批中,审批的流程编号为【" + lcbh + "】,请先走完审批中的流程后继续提交该流程！");
+                    return FAILURE_AND_CONTINUE;
+                }
+            }
+        }
+
+
+
+        return SUCCESS;
+    }
+}
diff --git a/src/main/youhong_ai_jitu_src/com/api/lh/config/DemoConfig.java b/src/main/youhong_ai_jitu_src/com/api/lh/config/DemoConfig.java
new file mode 100644
index 0000000..58bbca0
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/com/api/lh/config/DemoConfig.java
@@ -0,0 +1,57 @@
+package com.api.lh.config;
+
+import selfdev.util.base.BaseUtil;
+import selfdev.util.log.LogTool;
+import weaver.file.Prop;
+
+/**
+ * @Description TODO
+ * @Author louh
+ * @Date 2022/4/15 10:46
+ * @Version 1.0
+ */
+public interface DemoConfig {
+
+    LogTool log = new LogTool("/log/lh/action", false);
+    //当前环境
+    String  mode = Prop.getPropValue("DevToDC_jntchina","mode");
+    //当前路径地址
+    String baseUrl = Prop.getPropValue("DevToDC_jntchina", mode + "_baseUrl");
+
+    //根据流程id或取主表表名
+    default  String getTableName(String workflowid){
+            String tableName = BaseUtil.getBaseInfoByParm("tablename", "workflow_bill", "1", "1", " and id in (select formid from workflow_base where id=" + workflowid + ")");
+            return tableName;
+    }
+
+    //根据主表表名和requestid获取当前数据id
+    default String getId(String tablename, String requestid){
+        String id = BaseUtil.getBaseInfoByParm("id", tablename, "requestid", requestid, "");;
+        return id;
+    }
+
+    //根据表名查询建模模块ID
+    default String getModeid(String tablename){
+        String modeid_select=BaseUtil.getBaseInfoByParm("id","modeinfo","1","1"," and formid in (select id from workflow_bill where tablename='uf_triggerwf_log') ");
+        return modeid_select;
+    }
+
+    /**
+     * 根据下拉框的描述获取对应的值
+     * @param selectname 下拉框描述
+     * @param workflowid 流程id
+     * @param fieldname  字段名称
+     * @param viewtype  默认0 表示主表字段
+     * @return
+     */
+    default String getSelectValue(String selectname, String workflowid, String fieldname, String viewtype){
+        viewtype = viewtype == "" ? "0":viewtype;
+        selectname = selectname.trim();
+        fieldname = fieldname.trim();
+        String selectValue=BaseUtil.getBaseInfoByParm("selectvalue", "workflow_selectitem", "convtomultilang(selectname,7)", selectname,
+                " and fieldid in (select id from workflow_billfield where billid in (select formid from workflow_base where id="+ workflowid+") and fieldname='" + fieldname + "' and viewtype= " + viewtype + ")");
+        return selectValue;
+    }
+
+
+}
diff --git a/src/main/youhong_ai_jitu_src/com/api/lh/port/AddJournal.java b/src/main/youhong_ai_jitu_src/com/api/lh/port/AddJournal.java
new file mode 100644
index 0000000..20e1c45
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/com/api/lh/port/AddJournal.java
@@ -0,0 +1,81 @@
+package com.api.lh.port;
+
+import com.alibaba.fastjson.JSONObject;
+
+import com.api.lh.config.DemoConfig;
+import selfdev.util.base.BaseUtil;
+import weaver.conn.RecordSet;
+import weaver.file.Prop;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+/**
+ * @ClassName AddJournal
+ * @Description 调用NCC接口日志
+ * @Author louh
+ * @Date 2022/3/1 14:19
+ * @Version 1.0
+ */
+public class AddJournal {
+
+    /**
+     * 添加调用日志
+     * @param dyjk  调用接口
+     * @param cdcs  传递参数
+     * @param fhcs  返回参数
+     * @param sfcg  是否成功
+     * @param lcid 流程id
+     */
+    public static void addInfo(String dyjk, JSONObject cdcs, String fhcs, String sfcg, String lcid){
+        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        String format = dateFormat.format(new Date());
+        RecordSet rs = new RecordSet();
+        String select_modeid = getModeId("uf_dynccjkrzb");
+        String sql = "insert into uf_dynccjkrzb (formmodeid,modedatacreater,modedatacreatertype,modedatacreatedate,modedatacreatetime, dyjk, cdcs, fhcs, sfcg, lcid)" +
+                " values (" + "'" + select_modeid + "'," +
+                "'" + 1 + "'," +
+                "'" + 0 + "'," +
+                "'" + format.substring(0, 10) + "'," +
+                "'" + format.substring(11) + "'," +
+                "'" + dyjk + "'," +
+                "'" + cdcs + "'," +
+                "'" + fhcs + "'," +
+                "'" + sfcg + "'," +
+                "'" + lcid + "')";
+        rs.execute(sql);
+    }
+
+    /**
+     * ncc调用我方接口日志
+     * @param dyjk  调用接口
+     * @param cdcs  传递参数
+     * @param fhcs  返回参数
+     * @param sfcg 是否成功
+     * @param url 接口路径
+     */
+    public static void addInfo(String dyjk, Object cdcs, Object fhcs, String sfcg, String url, Object obj){
+        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        String format = dateFormat.format(new Date());
+        RecordSet rs = new RecordSet();
+        String select_modeid = getModeId("uf_nccdywfjkrzb");
+        String sql = "insert into uf_nccdywfjkrzb (formmodeid,modedatacreater,modedatacreatertype,modedatacreatedate,modedatacreatetime, dyjk,cdcs,fhcs,sfcg,jklj) " +
+                " values (" + "'" + select_modeid + "'," +
+                "'" + 1 + "'," +
+                "'" + 0 + "'," +
+                "'" + format.substring(0, 10) + "'," +
+                "'" + format.substring(11) + "'," +
+                "'" + dyjk + "'," +
+                "'" + cdcs + "'," +
+                "'" + fhcs + "'," +
+                "'" + sfcg + "'," +
+                "'" + url + "')";
+        rs.execute(sql);
+    }
+
+    //根据表名查询建模模块ID
+    public static  String getModeId(String tablename){
+        String modeid_select= BaseUtil.getBaseInfoByParm("id","modeinfo","1","1"," and formid in (select id from workflow_bill where tablename='" + tablename + "') ");
+        return modeid_select;
+    }
+}
diff --git a/src/main/youhong_ai_jitu_src/com/api/lh/port/Billdata.java b/src/main/youhong_ai_jitu_src/com/api/lh/port/Billdata.java
new file mode 100644
index 0000000..dc0e897
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/com/api/lh/port/Billdata.java
@@ -0,0 +1,216 @@
+package com.api.lh.port;
+
+import java.util.List;
+
+/**
+ * @ClassName Billdata
+ * @Description 还款单请求----表头参数
+ * @Author louh
+ * @Date 2022/4/14 13:48
+ * @Version 1.0
+ */
+public class Billdata {
+
+    private String pk_org; /* 财务组织 */
+    private String billtypecode; /* 单据类型 */
+    private String bzbm; /* 默认 CNY */
+    private String paytarget; /* 默认 0 */
+    private String dbilldate; /* 单据日期 */
+    private String totalmny; /* 还款金额 */
+    private String payorg; /* 收款单位 */
+    private String payment; /* 结算方式 默认银行转账 17 */
+    private String pk_psndoc; /* 还款人 */
+    private String psnaccnum; /* 还款人银行账户 */
+    private String orgaccnum; /* 收款单位银行账户 */
+    private String oarequestid; /* OA requestid */
+    private String oavbillcode; /* 来源单据号 */
+    private String fydwbm; /* 费用承担单位编码 */
+    private String fydeptid; /* 费用承担部门编码 */
+    private String zy; /* 备注 */
+    private List<ErBxcontrast> er_bxcontrast; /* 冲借款信息 */
+
+    public Billdata(String pk_org, String billtypecode, String bzbm, String paytarget, String dbilldate, String totalmny, String payorg, String payment, String pk_psndoc, String psnaccnum, String orgaccnum, String oarequestid, String oavbillcode, String fydwbm, String fydeptid, String zy, List<ErBxcontrast> er_bxcontrast) {
+        this.pk_org = pk_org;
+        this.billtypecode = billtypecode == "" ? "2647" : billtypecode;
+        this.bzbm = bzbm =="" ? "CNY":bzbm;
+        this.paytarget = paytarget == ""? "0":paytarget;
+        this.dbilldate = dbilldate;
+        this.totalmny = totalmny == "" ? "0.00" : totalmny;
+        this.payorg = payorg;
+        this.payment = payment == "" ? "17": payment;
+        this.pk_psndoc = pk_psndoc;
+        this.psnaccnum = psnaccnum;
+        this.orgaccnum = orgaccnum;
+        this.oarequestid = oarequestid;
+        this.oavbillcode = oavbillcode;
+        this.fydwbm = fydwbm;
+        this.fydeptid = fydeptid;
+        this.zy = zy;
+        this.er_bxcontrast = er_bxcontrast;
+    }
+
+    public String getPk_org() {
+        return pk_org;
+    }
+
+    public void setPk_org(String pk_org) {
+        this.pk_org = pk_org;
+    }
+
+    public String getBilltypecode() {
+        return billtypecode;
+    }
+
+    public void setBilltypecode(String billtypecode) {
+        this.billtypecode = billtypecode == "" ? "263X-Cxx-01" : billtypecode;
+    }
+
+    public String getBzbm() {
+        return bzbm;
+    }
+
+    public void setBzbm(String bzbm) {
+        this.bzbm = bzbm == "" ? "CNY":bzbm;
+    }
+
+    public String getPaytarget() {
+        return paytarget;
+    }
+
+    public void setPaytarget(String paytarget) {
+        this.paytarget = paytarget == ""? "0":paytarget;
+    }
+
+    public String getDbilldate() {
+        return dbilldate;
+    }
+
+    public void setDbilldate(String dbilldate) {
+        this.dbilldate = dbilldate;
+    }
+
+    public String getTotalmny() {
+        return totalmny;
+    }
+
+    public void setTotalmny(String totalmny) {
+        this.totalmny = totalmny == "" ? "0.00" : totalmny;
+    }
+
+    public String getPayorg() {
+        return payorg;
+    }
+
+    public void setPayorg(String payorg) {
+        this.payorg = payorg;
+    }
+
+    public String getPayment() {
+        return payment;
+    }
+
+    public void setPayment(String payment) {
+        this.payment = payment == "" ? "17": payment;
+    }
+
+    public String getPk_psndoc() {
+        return pk_psndoc;
+    }
+
+    public void setPk_psndoc(String pk_psndoc) {
+        this.pk_psndoc = pk_psndoc;
+    }
+
+    public String getPsnaccnum() {
+        return psnaccnum;
+    }
+
+    public void setPsnaccnum(String psnaccnum) {
+        this.psnaccnum = psnaccnum;
+    }
+
+    public String getOrgaccnum() {
+        return orgaccnum;
+    }
+
+    public void setOrgaccnum(String orgaccnum) {
+        this.orgaccnum = orgaccnum;
+    }
+
+    public String getOarequestid() {
+        return oarequestid;
+    }
+
+    public void setOarequestid(String oarequestid) {
+        this.oarequestid = oarequestid;
+    }
+
+    public String getOavbillcode() {
+        return oavbillcode;
+    }
+
+    public void setOavbillcode(String oavbillcode) {
+        this.oavbillcode = oavbillcode;
+    }
+
+    public String getFydwbm() {
+        return fydwbm;
+    }
+
+    public void setFydwbm(String fydwbm) {
+        this.fydwbm = fydwbm;
+    }
+
+    public String getFydeptid() {
+        return fydeptid;
+    }
+
+    public void setFydeptid(String fydeptid) {
+        this.fydeptid = fydeptid;
+    }
+
+    public String getZy() {
+        return zy;
+    }
+
+    public void setZy(String zy) {
+        this.zy = zy;
+    }
+
+    public List<ErBxcontrast> getEr_bxcontrast() {
+        return er_bxcontrast;
+    }
+
+    public void setEr_bxcontrast(List<ErBxcontrast> er_bxcontrast) {
+        this.er_bxcontrast = er_bxcontrast;
+    }
+
+    @Override
+    public String toString() {
+        return "Billdata{" +
+                "pk_org='" + pk_org + '\'' +
+                ", billtypecode='" + billtypecode + '\'' +
+                ", bzbm='" + bzbm + '\'' +
+                ", paytarget='" + paytarget + '\'' +
+                ", dbilldate='" + dbilldate + '\'' +
+                ", totalmny='" + totalmny + '\'' +
+                ", payorg='" + payorg + '\'' +
+                ", payment='" + payment + '\'' +
+                ", pk_psndoc='" + pk_psndoc + '\'' +
+                ", psnaccnum='" + psnaccnum + '\'' +
+                ", orgaccnum='" + orgaccnum + '\'' +
+                ", oarequestid='" + oarequestid + '\'' +
+                ", oavbillcode='" + oavbillcode + '\'' +
+                ", fydwbm='" + fydwbm + '\'' +
+                ", fydeptid='" + fydeptid + '\'' +
+                ", zy='" + zy + '\'' +
+                ", er_bxcontrast=" + er_bxcontrast +
+                '}';
+    }
+
+    public static void main(String[] args) {
+        Billdata billdata = new Billdata("","","","","","","","","","","","","","","","",null);
+        System.out.println(billdata);
+    }
+
+}
diff --git a/src/main/youhong_ai_jitu_src/com/api/lh/port/ErBxcontrast.java b/src/main/youhong_ai_jitu_src/com/api/lh/port/ErBxcontrast.java
new file mode 100644
index 0000000..438b7a2
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/com/api/lh/port/ErBxcontrast.java
@@ -0,0 +1,45 @@
+package com.api.lh.port;
+
+/**
+ * @ClassName ErBxcontrast
+ * @Description 还款单请求----表体数据
+ * @Author louh
+ * @Date 2022/4/14 13:55
+ * @Version 1.0
+ */
+public class ErBxcontrast {
+
+    private String jkbillcode; /* ncc借款单号 */
+    private String inoutbusiclass; /* 收支项目 */
+    private String hkmny; /* 还款金额 */
+
+    public ErBxcontrast(String jkbillcode, String inoutbusiclass, String hkmny) {
+        this.jkbillcode = jkbillcode;
+        this.inoutbusiclass = inoutbusiclass == "" ? "901038" : inoutbusiclass;
+        this.hkmny = hkmny == "" ? "0.00" : hkmny;
+    }
+
+    public String getJkbillcode() {
+        return jkbillcode;
+    }
+
+    public void setJkbillcode(String jkbillcode) {
+        this.jkbillcode = jkbillcode;
+    }
+
+    public String getInoutbusiclass() {
+        return inoutbusiclass;
+    }
+
+    public void setInoutbusiclass(String inoutbusiclass) {
+        this.inoutbusiclass = inoutbusiclass == "" ? "901038" : "";
+    }
+
+    public String getHkmny() {
+        return hkmny;
+    }
+
+    public void setHkmny(String hkmny) {
+        this.hkmny = hkmny == "" ? "0.00" : hkmny;
+    }
+}
diff --git a/src/main/youhong_ai_jitu_src/com/api/lh/port/Items.java b/src/main/youhong_ai_jitu_src/com/api/lh/port/Items.java
new file mode 100644
index 0000000..1fd49a8
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/com/api/lh/port/Items.java
@@ -0,0 +1,279 @@
+package com.api.lh.port;
+
+/**
+ * @ClassName Items
+ * @Description 需要抛转的,付款应付单.预付付款单-----明细表字段
+ * @Author louh
+ * @Date 2022/3/1 14:49
+ * @Version 1.0
+ */
+public class Items {
+    private String objtype; /* 往来对象 1:供应商 2:部门 3:业务员*/
+    private String supplier; /* 供应商编码,往来对象为供应商时必填 */
+    private String pu_deptid; /* 业务部门编码 */
+    private String pk_psndoc; /* 业务员编码, 往来对象为业务员时必填 */
+    private String prepay; /* 付款性质 3:应付款 4:预付款 */
+    private String pk_currtype; /* 币种编码 默认CNY */
+    private String money_de; /* 贷方原币金额 */
+    private String rate; /* 组织本币汇率, 默认1 */
+    private String local_money_de; /* 组织本币金额 */
+    private String grouprate; /* 组织本币汇率. 默认1 */
+    private String groupdebit; /* 集团本币金额 */
+    private String globalrate; /* 全局本币汇率, 默认1 */
+    private String globaldebit; /* 全局本币金额 */
+    private String quantity_de; /* 贷方数量 */
+    private String price; /* 单价 */
+    private String itemid; /* 采购订单/应付订单明细id*/
+    private String ordervbillcode; /* 采购单据号 */
+    private String payplanid; /* 付款计划id */
+    private String paybillcode; /* 应付单据号 */
+    private String scomment; /* 摘要 */
+    private String pk_tradetype; /* 单据类型 */
+    private String material; /* 物料 */
+    private String pk_dept; /* 部门编码 */
+    private String ap_recaccount; /* 收款银行账户编码 */
+    private String ap_payaccount;  /* 付款银行账号编码 默认为空*/
+    private String def2; /*   网点编码  */
+    public Items(String objtype, String supplier, String pu_deptid, String pk_psndoc,
+                 String prepay, String pk_currtype, String money_de, String rate,
+                 String local_money_de, String grouprate, String groupdebit,
+                 String globalrate, String globaldebit, String quantity_de,
+                 String price, String itemid, String ordervbillcode, String payplanid,
+                 String paybillcode, String scomment, String  pk_tradetype, String material,
+                 String pk_dept, String ap_recaccount, String ap_payaccount, String def2) {
+        this.objtype = objtype;
+        this.supplier = supplier;
+        this.pu_deptid = pu_deptid;
+        this.pk_psndoc = pk_psndoc;
+        this.prepay = prepay;
+        this.pk_currtype = pk_currtype;
+        this.money_de = money_de;
+        this.rate = rate;
+        this.local_money_de = local_money_de;
+        this.grouprate = grouprate;
+        this.groupdebit = groupdebit;
+        this.globalrate = globalrate;
+        this.globaldebit = globaldebit;
+        this.quantity_de = quantity_de;
+        this.price = price;
+        this.itemid = itemid;
+        this.ordervbillcode = ordervbillcode;
+        this.payplanid = payplanid;
+        this.paybillcode = paybillcode;
+        this.scomment = scomment;
+        this.pk_tradetype =  pk_tradetype;
+        this.material = material;
+        this.pk_dept = pk_dept;
+        this.ap_recaccount = ap_recaccount;
+        this.ap_payaccount = ap_payaccount;
+        this.def2 = def2;
+    }
+
+    public String getObjtype() {
+        return objtype;
+    }
+
+    public void setObjtype(String objtype) {
+        this.objtype = objtype;
+    }
+
+    public String getSupplier() {
+        return supplier;
+    }
+
+    public void setSupplier(String supplier) {
+        this.supplier = supplier;
+    }
+
+    public String getPu_deptid() {
+        return pu_deptid;
+    }
+
+    public void setPu_deptid(String pu_deptid) {
+        this.pu_deptid = pu_deptid;
+    }
+
+    public String getPk_psndoc() {
+        return pk_psndoc;
+    }
+
+    public void setPk_psndoc(String pk_psndoc) {
+        this.pk_psndoc = pk_psndoc;
+    }
+
+    public String getPrepay() {
+        return prepay;
+    }
+
+    public void setPrepay(String prepay) {
+        this.prepay = prepay;
+    }
+
+    public String getPk_currtype() {
+        return pk_currtype;
+    }
+
+    public void setPk_currtype(String pk_currtype) {
+        this.pk_currtype = pk_currtype;
+    }
+
+    public String getMoney_de() {
+        return money_de;
+    }
+
+    public void setMoney_de(String money_de) {
+        this.money_de = money_de;
+    }
+
+    public String getRate() {
+        return rate;
+    }
+
+    public void setRate(String rate) {
+        this.rate = rate;
+    }
+
+    public String getLocal_money_de() {
+        return local_money_de;
+    }
+
+    public void setLocal_money_de(String local_money_de) {
+        this.local_money_de = local_money_de;
+    }
+
+    public String getGrouprate() {
+        return grouprate;
+    }
+
+    public void setGrouprate(String grouprate) {
+        this.grouprate = grouprate;
+    }
+
+    public String getGroupdebit() {
+        return groupdebit;
+    }
+
+    public void setGroupdebit(String groupdebit) {
+        this.groupdebit = groupdebit;
+    }
+
+    public String getGlobalrate() {
+        return globalrate;
+    }
+
+    public void setGlobalrate(String globalrate) {
+        this.globalrate = globalrate;
+    }
+
+    public String getGlobaldebit() {
+        return globaldebit;
+    }
+
+    public void setGlobaldebit(String globaldebit) {
+        this.globaldebit = globaldebit;
+    }
+
+    public String getQuantity_de() {
+        return quantity_de;
+    }
+
+    public void setQuantity_de(String quantity_de) {
+        this.quantity_de = quantity_de;
+    }
+
+    public String getPrice() {
+        return price;
+    }
+
+    public void setPrice(String price) {
+        this.price = price;
+    }
+
+    public String getItemid() {
+        return itemid;
+    }
+
+    public void setItemid(String itemid) {
+        this.itemid = itemid;
+    }
+
+    public String getOrdervbillcode() {
+        return ordervbillcode;
+    }
+
+    public void setOrdervbillcode(String ordervbillcode) {
+        this.ordervbillcode = ordervbillcode;
+    }
+
+    public String getPayplanid() {
+        return payplanid;
+    }
+
+    public void setPayplanid(String payplanid) {
+        this.payplanid = payplanid;
+    }
+
+    public String getPaybillcode() {
+        return paybillcode;
+    }
+
+    public void setPaybillcode(String paybillcode) {
+        this.paybillcode = paybillcode;
+    }
+
+    public String getScomment() {
+        return scomment;
+    }
+
+    public void setScomment(String scomment) {
+        this.scomment = scomment;
+    }
+
+    public String getPk_tradetype() {
+        return pk_tradetype;
+    }
+
+    public void setPk_tradetype(String pk_tradetype) {
+        this.pk_tradetype = pk_tradetype;
+    }
+
+    public String getMaterial() {
+        return material;
+    }
+
+    public void setMaterial(String material) {
+        this.material = material;
+    }
+
+    public String getPk_dept() {
+        return pk_dept;
+    }
+
+    public void setPk_dept(String pk_dept) {
+        this.pk_dept = pk_dept;
+    }
+
+    public String getAp_recaccount() {
+        return ap_recaccount;
+    }
+
+    public void setAp_recaccount(String ap_recaccount) {
+        this.ap_recaccount = ap_recaccount;
+    }
+
+    public String getAp_payaccount() {
+        return ap_payaccount;
+    }
+
+    public void setAp_payaccount(String ap_payaccount) {
+        this.ap_payaccount = ap_payaccount;
+    }
+
+    public String getDef2() {
+        return def2;
+    }
+
+    public void setDef2(String def2) {
+        this.def2 = def2;
+    }
+}
diff --git a/src/main/youhong_ai_jitu_src/com/api/lh/port/StuData.java b/src/main/youhong_ai_jitu_src/com/api/lh/port/StuData.java
new file mode 100644
index 0000000..c152dd5
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/com/api/lh/port/StuData.java
@@ -0,0 +1,234 @@
+package com.api.lh.port;
+
+import weaver.soa.workflow.request.RequestService;
+
+import java.util.List;
+
+/**
+ * @ClassName StuData
+ * @Description 需要抛转的,付款应付单.预付付款单-----主表字段
+ * @Author louh
+ * @Date 2022/3/1 14:48
+ * @Version 1.0
+ */
+public class StuData {
+    private String local_money; /* 组织本币金额 */
+    private String globallocal; /* 全局本币金额 */
+    private String pk_tradetype; /* 交易类型编码: D3*/
+    private String pk_currtype; /* 币种编码 默认CNY */
+    private String grouplocal; /* 集团本币对象*/
+    private String objtype; /* 往来对象 1:供应商编码,2:部门编码 3:业务员编码 */
+    private String pk_org; /* 财务组织编码 */
+    private String pu_deptid; /* 业务部门编码 */
+    private String money; /* 原币金额 */
+    private String rate; /* 组织本币汇率 默认1*/
+    private String billmaker; /* 制单人编码 */
+    private String supplier; /* 供应商编码 */
+    private String grouprate; /* 集团本币汇率 默认1 */
+    private String billdate; /* 制单日期 yyyy-MM-dd */
+    private String ap_payaccount; /* 付款银行账户 */
+    private String globalrate; /* 全局本币汇率 默认1*/
+    private String oarequestid; /* Oarequestid*/
+    private String oabillcode; /* oa单据编号 */
+    private String ap_recaccount; /* 付款银行账户 */
+    private String def80; /* 付款银行备注 */
+    private List<Items> items;
+
+    public StuData(String pk_org, String pk_tradetype, String billdate,
+                   String objtype, String pk_currtype, String ap_recaccount,
+                   String money, String rate, String local_money, String grouprate,
+                   String grouplocal, String globalrate, String globallocal,
+                   String billmaker, String oarequestid, String oabillcode, String supplier,
+                   List<Items> items,String pu_deptid, String ap_payaccount, String def80) {
+        this.pk_org = pk_org;
+        this.pk_tradetype = pk_tradetype;
+        this.billdate = billdate;
+        this.objtype = objtype;
+        this.pk_currtype = pk_currtype;
+        this.ap_recaccount = ap_recaccount;
+        this.money = money;
+        this.rate = rate;
+        this.local_money = local_money;
+        this.grouprate = grouprate;
+        this.grouplocal = grouplocal;
+        this.globalrate = globalrate;
+        this.globallocal = globallocal;
+        this.billmaker = billmaker;
+        this.oarequestid = oarequestid;
+        this.oabillcode = oabillcode;
+        this.supplier = supplier;
+        this.items = items;
+        this.pu_deptid = pu_deptid;
+        this.ap_payaccount = ap_payaccount;
+        this.def80 = def80;
+    }
+
+    public String getPk_org() {
+        return pk_org;
+    }
+
+    public void setPk_org(String pk_org) {
+        this.pk_org = pk_org;
+    }
+
+    public String getPk_tradetype() {
+        return pk_tradetype;
+    }
+
+    public void setPk_tradetype(String pk_tradetype) {
+        this.pk_tradetype = pk_tradetype;
+    }
+
+    public String getBilldate() {
+        return billdate;
+    }
+
+    public void setBilldate(String billdate) {
+        this.billdate = billdate;
+    }
+
+    public String getObjtype() {
+        return objtype;
+    }
+
+    public void setObjtype(String objtype) {
+        this.objtype = objtype;
+    }
+
+    public String getPk_currtype() {
+        return pk_currtype;
+    }
+
+    public void setPk_currtype(String pk_currtype) {
+        this.pk_currtype = pk_currtype;
+    }
+
+    public String getAp_recaccount() {
+        return ap_recaccount;
+    }
+
+    public void setAp_recaccount(String ap_recaccount) {
+        this.ap_recaccount = ap_recaccount;
+    }
+
+    public String getMoney() {
+        return money;
+    }
+
+    public void setMoney(String money) {
+        this.money = money;
+    }
+
+    public String getRate() {
+        return rate;
+    }
+
+    public void setRate(String rate) {
+        this.rate = rate;
+    }
+
+    public String getLocal_money() {
+        return local_money;
+    }
+
+    public void setLocal_money(String local_money) {
+        this.local_money = local_money;
+    }
+
+    public String getGrouprate() {
+        return grouprate;
+    }
+
+    public void setGrouprate(String grouprate) {
+        this.grouprate = grouprate;
+    }
+
+    public String getGrouplocal() {
+        return grouplocal;
+    }
+
+    public void setGrouplocal(String grouplocal) {
+        this.grouplocal = grouplocal;
+    }
+
+    public String getGlobalrate() {
+        return globalrate;
+    }
+
+    public void setGlobalrate(String globalrate) {
+        this.globalrate = globalrate;
+    }
+
+    public String getGloballocal() {
+        return globallocal;
+    }
+
+    public void setGloballocal(String globallocal) {
+        this.globallocal = globallocal;
+    }
+
+    public String getBillmaker() {
+        return billmaker;
+    }
+
+    public void setBillmaker(String billmaker) {
+        this.billmaker = billmaker;
+    }
+
+    public String getOarequestid() {
+        return oarequestid;
+    }
+
+    public void setOarequestid(String oarequestid) {
+        this.oarequestid = oarequestid;
+    }
+
+    public String getOabillcode() {
+        return oabillcode;
+    }
+
+    public void setOabillcode(String oabillcode) {
+        this.oabillcode = oabillcode;
+    }
+
+    public String getSupplier() {
+        return supplier;
+    }
+
+    public void setSupplier(String supplier) {
+        this.supplier = supplier;
+    }
+
+    public List<Items> getItems() {
+        return items;
+    }
+
+    public void setItems(List<Items> items) {
+        this.items = items;
+    }
+
+    public String getPu_deptid() {
+        return pu_deptid;
+    }
+
+    public void setPu_deptid(String pu_deptid) {
+        this.pu_deptid = pu_deptid;
+    }
+
+    public String getAp_payaccount() {
+        return ap_payaccount;
+    }
+
+    public void setAp_payaccount(String ap_payaccount) {
+        this.ap_payaccount = ap_payaccount;
+    }
+
+    public String getDef80() {
+        return def80;
+    }
+
+    public void setDef80(String def80) {
+        this.def80 = def80;
+    }
+
+}
diff --git a/src/main/youhong_ai_jitu_src/com/api/lh/util/CreateProcessUtil.java b/src/main/youhong_ai_jitu_src/com/api/lh/util/CreateProcessUtil.java
new file mode 100644
index 0000000..baa5cc6
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/com/api/lh/util/CreateProcessUtil.java
@@ -0,0 +1,93 @@
+package com.api.lh.util;
+
+import com.alibaba.fastjson.JSONObject;
+import weaver.general.Util;
+import weaver.soa.workflow.request.Cell;
+import weaver.soa.workflow.request.Property;
+
+import java.util.Arrays;
+
+/**
+ * @ClassName CreateProcessUtil
+ * @Description 创建流程
+ * @Author louh
+ * @Date 2022/4/6 13:35
+ * @Version 1.0
+ */
+public class CreateProcessUtil {
+
+    /**
+     * 拼接流程主表字段
+     * @param p
+     * @param name  字段名
+     * @param value 字段值
+     * @return
+     */
+    public static Property[] setProperty(Property[] p, String name, String value){
+        if("".equals(Util.null2String(value).trim())){
+            return p;
+        }
+        p = Arrays.copyOf(p, (p.length + 1));
+        p[p.length - 1] = new Property();
+        p[p.length - 1].setName(name);
+        p[p.length - 1].setValue(value);
+        return p;
+    }
+
+    /**
+     * 拼接流程明细表字段
+     * @param c
+     * @param name 字段名
+     * @param value 字段值
+     * @return
+     */
+    public static Cell[] setCell(Cell[] c, String name, String value){
+        if("".equals(Util.null2String(value).trim())){
+            return c;
+        }
+        c = Arrays.copyOf(c, (c.length+1));
+        c[c.length-1] = new Cell();
+        c[c.length-1].setName(name);
+        c[c.length-1].setValue(value);
+        return c;
+    }
+
+
+    /**
+     * 判断流程是否成功
+     * @param requestid
+     * @param
+     * @return
+     */
+    public static JSONObject judge(String requestid){
+        JSONObject jsonObject=new JSONObject();
+        jsonObject.put("requestid",requestid);
+        String MSG="";
+        String status = "1";  // 0.成功  1.失败
+        if (requestid.equals("-1")) {
+            MSG="创建流程失败！";
+        }else if (requestid.equals("-2")){
+            MSG="用户没有流程创建权限！";
+        }else if (requestid.equals("-3")) {
+            MSG="流程基本信息失败！";
+        }else if (requestid.equals("-4")) {
+            MSG="流程表单主表信息失败！";
+        }else if (requestid.equals("-5")) {
+            MSG="流程紧急程度失败！";
+        }else if (requestid.equals("-6")) {
+            MSG="流程操作者失效！";
+        }else if (requestid.equals("-7")) {
+            MSG="流转至下一节点失败！";
+        }else if (requestid.equals("-8")) {
+            MSG="流程节点附加操作失败！";
+        }else if (Integer.parseInt(requestid)>0) {
+            status = "0";
+            MSG="流程创建成功！";
+        }
+        jsonObject.put("status", status);
+        jsonObject.put("msg",MSG);
+        return jsonObject;
+    }
+
+
+}
diff --git a/src/main/youhong_ai_jitu_src/com/api/lh/util/DUtil.java b/src/main/youhong_ai_jitu_src/com/api/lh/util/DUtil.java
new file mode 100644
index 0000000..5ebbb09
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/com/api/lh/util/DUtil.java
@@ -0,0 +1,60 @@
+package com.api.lh.util;
+
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+
+/**
+ * @ClassName DateUtil
+ * @Description TODO
+ * @Author louh
+ * @Date 2022/6/7 14:30
+ * @Version 1.0
+ */
+public class DUtil {
+
+    /**
+     * 获取指定月份的最后一天
+     * @param yearMonth   格式yyyy-MM
+     * @return
+     */
+    public static String getLastDayOfMonth(String yearMonth){
+        int year = Integer.parseInt(yearMonth.split("-")[0]);  //年
+        int month = Integer.parseInt(yearMonth.split("-")[1]);  //月
+        Calendar cal = Calendar.getInstance();
+        //设置年份
+        cal.set(Calendar.YEAR, year);
+        //设置月份
+        cal.set(Calendar.MONTH, month);
+        //获取某月的最小天数
+        int lastDay = cal.getActualMinimum(Calendar.DAY_OF_MONTH);
+        cal.set(Calendar.DAY_OF_MONTH, lastDay - 1);
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        return sdf.format(cal.getTime());
+    }
+
+
+    /**
+     * 获取指定月份的下个月第一天
+     * @param yearMonth 格式yyyy-MM
+     * @return
+     */
+    public static String getFirstDayOfNextMonth(String yearMonth){
+        int year = Integer.parseInt(yearMonth.split("-")[0]);  //年
+        int month = Integer.parseInt(yearMonth.split("-")[1]);  //月
+        Calendar cal = Calendar.getInstance();
+        //设置年份
+        cal.set(Calendar.YEAR, year);
+        //设置月份
+        cal.set(Calendar.MONTH, month - 1);
+        //获取某月的最大天数
+        int lastDay = cal.getActualMaximum(Calendar.DAY_OF_MONTH);
+        cal.set(Calendar.DAY_OF_MONTH, lastDay + 1);
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        return sdf.format(cal.getTime());
+    }
+
+    public static void main(String[] args) {
+        System.out.println(getLastDayOfMonth("2022-06-11"));
+        System.out.println(getFirstDayOfNextMonth("2022-05-17"));
+    }
+}
diff --git a/src/main/youhong_ai_jitu_src/com/engine/demo/impl/BaseUtil.java b/src/main/youhong_ai_jitu_src/com/engine/demo/impl/BaseUtil.java
new file mode 100644
index 0000000..9a7ab42
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/com/engine/demo/impl/BaseUtil.java
@@ -0,0 +1,1719 @@
+package com.engine.demo.impl;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import selfdev.util.log.LogTool;
+import weaver.conn.ConnStatement;
+import weaver.conn.RecordSet;
+import weaver.conn.RecordSetTrans;
+import weaver.general.BaseBean;
+import weaver.general.StaticObj;
+import weaver.general.Util;
+import weaver.interfaces.datasource.DataSource;
+import weaver.sm.SM4Utils;
+import javax.crypto.Cipher;
+import javax.crypto.SecretKey;
+import javax.crypto.SecretKeyFactory;
+import javax.crypto.spec.DESKeySpec;
+import javax.crypto.spec.IvParameterSpec;
+import java.io.UnsupportedEncodingException;
+import java.math.BigDecimal;
+import java.net.URLEncoder;
+import java.nio.charset.Charset;
+import java.sql.Date;
+import java.sql.*;
+import java.text.DecimalFormat;
+import java.text.SimpleDateFormat;
+import java.util.*;
+import java.util.regex.Pattern;
+
+public class BaseUtil {
+
+    private final static LogTool loghr = new LogTool("/log/duban/",false);
+    private final static LogTool log1 = new LogTool("/log/duban/",false);
+    public static String getUserPasswordByRom(String password){
+        String newpassword="";
+        password= Util.null2String(password).trim();
+        newpassword=password;
+        if (password.endsWith("_random_")) {
+            SM4Utils var50 = new SM4Utils();
+            BaseBean var11 = new BaseBean();
+            String var12 = Util.null2String(var11.getPropValue("weaver_client_pwd", "key"));
+            if (!"".equals(var12)) {
+                password = password.substring(0, password.lastIndexOf("_random_"));
+                newpassword = var50.decrypt(password, var12);
+            }
+        }
+        return newpassword;
+    }
+
+    public static String encrypt(String srcStr, Charset charset, String sKey) {
+        byte[] src = srcStr.getBytes(charset);
+        byte[] buf = encrypt(src, sKey);
+        return parseByte2HexStr(buf);
+    }
+
+    public static String decrypt(String hexStr, Charset charset, String sKey) throws Exception {
+        byte[] src = parseHexStr2Byte(hexStr);
+        byte[] buf = decrypt(src, sKey);
+        return new String(buf, charset);
+    }
+
+    private static byte[] encrypt(byte[] data, String sKey) {
+        try {
+            byte[] key = sKey.getBytes();
+            IvParameterSpec iv = new IvParameterSpec(key);
+            DESKeySpec desKey = new DESKeySpec(key);
+            SecretKeyFactory keyFactory = SecretKeyFactory.getInstance("DES");
+            SecretKey securekey = keyFactory.generateSecret(desKey);
+            Cipher cipher = Cipher.getInstance("DES/CBC/PKCS5Padding");
+            cipher.init(Cipher.ENCRYPT_MODE, securekey, iv);
+            return cipher.doFinal(data);
+        } catch (Throwable e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    private static byte[] decrypt(byte[] src, String sKey) throws Exception {
+        byte[] key = sKey.getBytes();
+        IvParameterSpec iv = new IvParameterSpec(key);
+        DESKeySpec desKey = new DESKeySpec(key);
+        SecretKeyFactory keyFactory = SecretKeyFactory.getInstance("DES");
+        SecretKey securekey = keyFactory.generateSecret(desKey);
+        Cipher cipher = Cipher.getInstance("DES/CBC/PKCS5Padding");
+        cipher.init(Cipher.DECRYPT_MODE, securekey, iv);
+        return cipher.doFinal(src);
+    }
+
+    private static String parseByte2HexStr(byte buf[]) {
+        StringBuffer sb = new StringBuffer();
+        for (int i = 0; i < buf.length; i++) {
+            String hex = Integer.toHexString(buf[i] & 0xFF);
+            if (hex.length() == 1) {
+                hex = '0' + hex;
+            }
+            sb.append(hex.toUpperCase());
+        }
+        return sb.toString();
+    }
+
+    private static byte[] parseHexStr2Byte(String hexStr) {
+        if (hexStr.length() < 1) return null;
+        byte[] result = new byte[hexStr.length() / 2];
+        for (int i = 0; i < hexStr.length() / 2; i++) {
+            int high = Integer.parseInt(hexStr.substring(i * 2, i * 2 + 1), 16);
+            int low = Integer.parseInt(hexStr.substring(i * 2 + 1, i * 2 + 2), 16);
+            result[i] = (byte) (high * 16 + low);
+        }
+        return result;
+    }
+    public static void main1(String[] args) {
+
+        String encryptUserName=encrypt("xiaoh", Charset.forName("UTF-8"), "sloginfr");
+        System.out.println("encryptUserName------>"+encryptUserName);
+    }
+    public static String getFormidId(String workflowid){
+        StringBuffer lSQL = new StringBuffer();
+        lSQL.append(" SELECT formid FROM workflow_base WHERE id='"+workflowid+"' ");
+        RecordSet rs = new RecordSet();
+        rs.execute(lSQL.toString());
+        String formid="";
+        if(rs.next()){
+            formid= Util.null2String(rs.getString("formid"));
+            formid=Math.abs(Integer.parseInt(formid))+"";
+        }
+        return formid;
+    }
+    public static String getFormidIdByrequestid(String requestid){
+        StringBuffer lSQL = new StringBuffer();
+        lSQL.append(" SELECT a.formid FROM workflow_base a,workflow_requestbase b WHERE b.requestid='"+requestid+"' and a.id=b.workflowid ");
+        RecordSet rs = new RecordSet();
+        rs.execute(lSQL.toString());
+        String formid="";
+        if(rs.next()){
+            formid= Util.null2String(rs.getString("formid"));
+            formid=Math.abs(Integer.parseInt(formid))+"";
+        }
+        return formid;
+    }
+
+    /**
+     * 获取流程节点状态ID
+     * @param workflowid 流程ID
+     * @param type	流程节点类型 0：申请人 1：归档
+     * @return  节点ID
+     */
+    public String getworkflowNode(String workflowid,String type){
+        String workflownodeid="";
+        if("".equals(Util.null2String(type).trim())){
+            type="0";
+        }
+        RecordSet re=new RecordSet();
+        String sql="";
+        if("0".equals(Util.null2String(type).trim())){
+            sql="select top 100 a.id from workflow_nodebase a,workflow_flownode b where a.id=b.nodeid and  isstart='1' and workflowid='"+workflowid+"'  ";
+        }
+        if("1".equals(Util.null2String(type).trim())){
+            sql="select top 100 a.id from workflow_nodebase a,workflow_flownode b where a.id=b.nodeid and  isend='1' and workflowid='"+workflowid+"'  ";
+        }
+
+        re.execute(sql);
+        while(re.next()){
+            workflownodeid= Util.null2String(re.getString("id")).trim() ;
+        }
+        return workflownodeid;
+    }
+    /**
+     * 通过映射表定位流程字段对应的取值字段
+     *
+     * @return  流程取值字段的集合
+     */
+    public Map<String,String> setFieldMap(){
+        Map<String,String> map=new HashMap<String,String>();
+        //if("".equals(Util.null2String(field).trim())){
+        //return map;
+        //}
+        String sql="select * from uf_wfmfield";
+        RecordSet re=new RecordSet();
+        re.execute(sql);
+        while(re.next()){
+            String workflowfield= Util.null2String(re.getString("wffield")).trim().toLowerCase();
+            String modelfield= Util.null2String(re.getString("mfield")).trim().toLowerCase();
+            if("".equals(workflowfield)||"".equals(modelfield)){
+                continue;
+            }
+            map.put(workflowfield, modelfield);
+        }
+        return map;
+    }
+
+
+    public String getWorkflowFieldid(String workflowid,String fieldname){
+        if("".equals(Util.null2String(fieldname).trim())){
+            return "";
+        }
+        RecordSet re=new RecordSet();
+        String fieldid="";
+        String sql="select b.* from  workflow_base a,workflow_billfield b where  "+
+                " a.formid=b.billid and a.id='"+workflowid+"' and lower(fieldname)='"+(Util.null2String(fieldname).trim().toLowerCase())+"' ";
+
+        re.execute(sql) ;
+        while(re.next()){
+            fieldid= Util.null2String(re.getString("id")).trim();
+        }
+        return fieldid;
+    }
+    /*
+     * 获取字段名称
+     */
+    public String getWorkflowFieldName(String feildid){
+        if("".equals(Util.null2String(feildid).trim())){
+            return "";
+        }
+        RecordSet re=new RecordSet();
+        String fieldid="";
+        String sql="select   a.*,b.labelname from workflow_billfield a,HtmlLabelInfo b,uf_mwfl c where a.id=c.wffield and a.fieldlabel=b.indexid and b.languageid=7 and c.mfield='"+feildid+"'";
+
+        re.execute(sql) ;
+        while(re.next()){
+            fieldid= Util.null2String(re.getString("labelname")).trim()+",";
+        }
+        return fieldid;
+    }
+    /*
+     * 获取下拉框的值
+     */
+    public String getSelectItemVakName(String feildid,String selectval){
+        if("".equals(Util.null2String(feildid).trim())||"".equals(Util.null2String(selectval).trim())){
+            return "";
+        }
+        String selectname="";
+        RecordSet re=new RecordSet();
+        String sql="select  * from  workflow_SelectItem_model_v where mfield='"+ Util.null2String(feildid).trim()+"' and zsselectvalue in ("+ Util.null2String(selectval).trim()+")   order by listorder";
+
+        re.execute(sql) ;
+        while(re.next()){
+            selectname= Util.null2String(re.getString("selectname")).trim()+",";
+        }
+        if(selectname.endsWith(",")){
+            selectname=selectname.substring(0,selectname.length()-1);
+        }
+        return selectname;
+    }
+
+    public static boolean executeUpdateTran(String datesource,String sql,Object... params){
+        boolean flag=true;
+        DataSource ds =null;
+        Connection conn = null;
+        PreparedStatement stmt =null;
+        //获取HR数据源
+        try {
+            ds = (DataSource) StaticObj.getServiceByFullname(("datasource."+datesource), DataSource.class);
+            conn = ds.getConnection();
+            stmt = conn.prepareStatement(sql);
+            //设置手工提交
+            conn.setAutoCommit(false);
+            if(params != null && params.length>0) {
+                int i = 1;
+                for(Object para:params) {
+                    if (((para instanceof Integer)) || ((para instanceof Long))){
+                        stmt.setInt(i, Util.getIntValue(""+para));
+                    }else if ((para instanceof Float)){
+                        stmt.setFloat(i, Util.getFloatValue(""+para));
+                    }else if (((para instanceof BigDecimal)) || ((para instanceof Double))){
+                        if((para instanceof BigDecimal)){
+                            stmt.setBigDecimal(i,(BigDecimal)para);
+                        }else{
+                            double tBig= Util.getDoubleValue(""+para);
+                            // BigDecimal temp=new BigDecimal(tBig);
+                            stmt.setString(i,doubleToStr(tBig));
+                        }
+                    }else if ((para instanceof Date)){
+                        stmt.setDate(i, (Date)para);
+                    }else if (((para instanceof String)) || ((para instanceof Character))){
+                        stmt.setString(i, ""+para);
+                    }else if (para == null){
+                        stmt.setNull(i, 0);
+                    }else if ((para instanceof Clob)){
+                        stmt.setClob(i, (Clob)para);
+                    }else if ((para instanceof Blob)){
+                        stmt.setBlob(i, (Blob)para);
+                    }else {
+                        stmt.setObject(i, para);
+                    }
+                    i++;
+                }
+            }
+            int len=stmt.executeUpdate();
+            if(len>0){
+                flag=true;
+                conn.commit();
+            }else{
+                flag=false;
+            }
+            stmt.close();
+        }catch (Exception e){
+            try {
+                stmt.close();
+                conn.close();
+            }catch(Exception e1){
+                e1.printStackTrace();
+            }
+            flag=false;
+        }
+        return flag;
+    }
+    public static boolean executeUpdateListTran(String datesource, List<Map<String,Object>> list){
+        boolean flag=true;
+        DataSource ds =null;
+        Connection conn = null;
+        PreparedStatement stmt =null;
+        //获取HR数据源
+        try {
+            ds = (DataSource) StaticObj.getServiceByFullname(("datasource."+datesource), DataSource.class);
+            conn = ds.getConnection();
+            conn.setAutoCommit(false);
+            for(Map<String,Object> sqls:list) {
+                if(sqls==null||sqls.size()<=0){
+                    continue;
+                }
+                String sql=(String)sqls.get("sql");
+                log1.writeLog("executeUpdateListTran--->"+sql);
+                Object[] params=(Object[])sqls.get("params");
+                log1.writeLog("executeUpdateListTran--->"+params.length);
+                if(params!=null&&params.length>0){
+                    Arrays.toString(params);
+                }
+                stmt = conn.prepareStatement(sql);
+                //设置手工提交
+
+                if (params != null && params.length > 0) {
+                    int i = 1;
+                    for (Object para : params) {
+                        if (((para instanceof Integer)) || ((para instanceof Long))) {
+                            stmt.setInt(i, Util.getIntValue("" + para));
+                        } else if ((para instanceof Float)) {
+                            stmt.setFloat(i, Util.getFloatValue("" + para));
+                        } else if (((para instanceof BigDecimal)) || ((para instanceof Double))) {
+                            if ((para instanceof BigDecimal)) {
+                                stmt.setBigDecimal(i, (BigDecimal) para);
+                            } else {
+                                double tBig = Util.getDoubleValue("" + para);
+                                // BigDecimal temp=new BigDecimal(tBig);
+                                if(tBig==0){
+                                    stmt.setString(i, null);
+                                }else {
+                                    stmt.setString(i, doubleToStr(tBig));
+                                }
+                            }
+                        } else if ((para instanceof Date)) {
+                            stmt.setDate(i, (Date) para);
+                        } else if (((para instanceof String)) || ((para instanceof Character))) {
+                            stmt.setString(i, "" + para);
+                        } else if (para == null) {
+                            stmt.setNull(i, 0);
+                        } else if ((para instanceof Clob)) {
+                            stmt.setClob(i, (Clob) para);
+                        } else if ((para instanceof Blob)) {
+                            stmt.setBlob(i, (Blob) para);
+                        } else {
+                            stmt.setObject(i, para);
+                        }
+                        i++;
+                    }
+                }
+                int len = stmt.executeUpdate();
+                log1.writeLog("len--->"+len);
+//                if (len > 0) {
+//                    flag = true;
+//                }
+//                } else {
+//                    flag = false;
+//                    stmt.close();
+//                    conn.rollback();
+//                    break;
+//                }
+            }
+            conn.commit();
+            conn.close();
+        }catch (Exception e){
+            log1.writeLog("executeUpdateListTranException"+e.getMessage());
+            try {
+                conn.rollback();
+                conn.close();
+            }catch(Exception e1){
+                e1.printStackTrace();
+            }
+            flag=false;
+        }
+        return flag;
+    }
+    /**
+     * 采用缓存的 形式
+     * @param list
+     * @return
+     */
+    public static boolean executeUpdateListTran(List<Map<String,Object>> list){
+        boolean flag=true;
+
+        //获取HR数据源
+        try {
+            RecordSetTrans rest=new RecordSetTrans();
+            rest.setAutoCommit(false);
+            for(Map<String,Object> sqls:list) {
+                if(sqls==null||sqls.size()<=0){
+                    continue;
+                }
+                String sql=(String)sqls.get("sql");
+                log1.writeLog("executeUpdateListTran--->"+sql);
+                Object[] params=(Object[])sqls.get("params");
+                Object[] newparams=null;
+                log1.writeLog("executeUpdateListTran--->"+params.length);
+                if(params!=null&&params.length>0){
+                    Arrays.toString(params);
+                }
+                //设置手工提交
+
+                if (params != null && params.length > 0) {
+                    newparams=new Object[params.length ];
+                    int i = 0;
+                    for (Object para : params) {
+                        if (((para instanceof Integer)) || ((para instanceof Long))) {
+                            //stmt.setInt(i, Util.getIntValue("" + para));
+                            //20210120 福福大帝  用于为空的时候设置为  null
+                            if(para!=null){
+                                newparams[i]=Util.getIntValue("" + para);
+                            }
+                        } else if ((para instanceof Float)) {
+                            //stmt.setFloat(i, Util.getFloatValue("" + para));
+                            newparams[i]=Util.getFloatValue("" + para);
+                        } else if (((para instanceof BigDecimal)) || ((para instanceof Double))) {
+                            if ((para instanceof BigDecimal)) {
+                                //stmt.setBigDecimal(i, (BigDecimal) para);
+                                newparams[i]=(BigDecimal) para;
+                            } else {
+                                double tBig = Util.getDoubleValue("" + para);
+                                // BigDecimal temp=new BigDecimal(tBig);
+                                if(tBig==0){
+                                    //stmt.setString(i, null);
+                                    newparams[i]=null;
+                                }else {
+                                    //stmt.setString(i, doubleToStr(tBig));
+                                    newparams[i]=doubleToStr(tBig);
+                                }
+                            }
+                        } else if ((para instanceof Date)) {
+                            //stmt.setDate(i, (Date) para);
+                            newparams[i]="";
+                        } else if (((para instanceof String)) || ((para instanceof Character))) {
+                            //stmt.setString(i, "" + para);
+                            newparams[i]="" + para;
+                        } else if (para == null) {
+                            //stmt.setNull(i, 0);
+                            newparams[i]=null;
+                        } else if ((para instanceof Clob)) {
+                            //stmt.setClob(i, (Clob) para);
+                            newparams[i]=null;
+                        } else if ((para instanceof Blob)) {
+                            //stmt.setBlob(i, (Blob) para);
+                            newparams[i]=null;
+                        } else {
+                            //stmt.setObject(i, para);
+                            newparams[i]=para;
+                        }
+                        i++;
+                    }
+                }else{
+                    newparams=new Object[]{null};
+                }
+                flag=rest.executeUpdate(sql,newparams);
+                if(!flag){
+                    rest.rollback();
+                    throw new Exception("执行异常");
+
+                }
+            }
+            rest.commit();
+
+        }catch (Exception e){
+            log1.writeLog("executeUpdateListTranException"+e.getMessage());
+
+            flag=false;
+        }
+        return flag;
+    }
+    public static  boolean executeUpdate(String sql,Object... params) throws Exception {
+        ConnStatement conn = new ConnStatement();
+
+        try {
+            conn.setStatementSql(sql);
+            if(params != null && params.length>0) {
+                int i = 1;
+                for(Object para:params) {
+                    if (((para instanceof Integer)) || ((para instanceof Long))){
+                        conn.setInt(i, Util.getIntValue(""+para));
+                    }else if ((para instanceof Float)){
+                        conn.setFloat(i, Util.getFloatValue(""+para));
+                    }else if (((para instanceof BigDecimal)) || ((para instanceof Double))){
+                        if((para instanceof BigDecimal)){
+                            conn.setBigDecimal(i,(BigDecimal)para);
+                        }else{
+                            double tBig= Util.getDoubleValue(""+para);
+                            // BigDecimal temp=new BigDecimal(tBig);
+                            conn.setString(i,doubleToStr(tBig));
+                        }
+                    }else if ((para instanceof Date)){
+                        conn.setDate(i, (Date)para);
+                    }else if (((para instanceof String)) || ((para instanceof Character))){
+                        conn.setString(i, ""+para);
+                    }else if (para == null){
+                        conn.setNull(i, 0);
+                    }else if ((para instanceof Clob)){
+                        conn.setClob(i, (Clob)para);
+                    }else if ((para instanceof Blob)){
+                        conn.setBlob(i, (Blob)para);
+                    }else {
+                        conn.setObject(i, para);
+                    }
+                    i++;
+                }
+            }
+            conn.executeUpdate();
+
+        }catch(Exception e){
+            //printLog(sql,params);
+            throw e;
+        }finally {
+            conn.close();
+        }
+        return true;
+    }
+    /**
+     * 转换URL的中文
+     * @param url
+     * @return
+     * @throws UnsupportedEncodingException
+     */
+    private String convertURL(String url,String code) throws UnsupportedEncodingException {
+        String urlStr = "";
+        //将中文分割出来 以UTF8编码
+        String strs[] = url.split("/");
+        if(strs.length==0) urlStr = url;
+        int i = 0;
+        for(String s : strs){
+            if(i == (strs.length-1)){
+                if(isChinese(s)){
+                    urlStr += URLEncoder.encode(s, code)+"";
+                }else{
+                    urlStr += s+"";
+                }
+            }else{
+                if(isChinese(s)){
+                    urlStr += URLEncoder.encode(s, code)+"/";
+                }else{
+                    urlStr += s+"/";
+                }
+            }
+            i++;
+        }
+        return urlStr;
+    }
+    /**
+     * 判断是否包含中文字符
+     * @param strName
+     * @return
+     */
+    boolean isChinese(String strName) {
+        char[] ch = strName.toCharArray();
+        for (int i = 0; i < ch.length; i++) {
+            char c = ch[i];
+            if (isChinese(c) == true) {
+                return isChinese(c);
+            } else {
+                if(i == (ch.length-1)){
+                    return isChinese(c);
+                }else{
+                    continue;
+                }
+            }
+        }
+        return false;
+    }
+    boolean isChinese(char c) {
+        Character.UnicodeBlock ub = Character.UnicodeBlock.of(c);
+        if (ub == Character.UnicodeBlock.CJK_UNIFIED_IDEOGRAPHS
+                || ub == Character.UnicodeBlock.CJK_COMPATIBILITY_IDEOGRAPHS
+                || ub == Character.UnicodeBlock.CJK_UNIFIED_IDEOGRAPHS_EXTENSION_A
+                || ub == Character.UnicodeBlock.GENERAL_PUNCTUATION
+                || ub == Character.UnicodeBlock.CJK_SYMBOLS_AND_PUNCTUATION
+                || ub == Character.UnicodeBlock.HALFWIDTH_AND_FULLWIDTH_FORMS) {
+            return true;
+        }
+        return false;
+    }
+    public static String getTempFilename(String str){
+        String tempName="";
+        try{
+            if(str==null||"".equals(str)){
+                return "";
+            }
+            if(str.indexOf("?")>1){
+                str=str.substring(0,str.indexOf("?"));
+            }
+            tempName=str.substring(str.lastIndexOf("/")+1);
+        }catch(Exception e){
+
+        }
+        return tempName;
+    }
+    /**
+     * java dobule数据转字符串输出
+     * @param tempX 需要被转换的数据
+     * @return 默认保留4位小数输出
+     */
+    public static String doubleToStr(double tempX) {
+        double newStemp=round(tempX, 4);
+        DecimalFormat df = new DecimalFormat("0.0000");
+        String newff = df.format(newStemp);
+        return newff;
+    }
+    /**
+     * 四舍五入
+     * @param v
+     * @param scale 精确位数
+     */
+    public static double round(double v, int scale) {
+        if (scale < 0) {
+            throw new IllegalArgumentException(
+                    "The scale must be a positive integer or zero");
+        }
+        BigDecimal b = new BigDecimal(Double.toString(v));
+        BigDecimal one = new BigDecimal("1");
+        return b.divide(one, scale, BigDecimal.ROUND_HALF_UP).doubleValue();
+    }
+    /**
+     * 四舍五入
+     * @param v
+     * @param scale 精确位数
+     */
+    public static float roundF(double v, int scale) {
+        if (scale < 0) {
+            throw new IllegalArgumentException(
+                    "The scale must be a positive integer or zero");
+        }
+        BigDecimal b = new BigDecimal(Double.toString(v));
+        BigDecimal one = new BigDecimal("1");
+        return b.divide(one, scale, BigDecimal.ROUND_HALF_UP).floatValue();
+    }
+    /*
+    拼接文号
+     */
+    public static String getWh(int len){
+        if(len<=0){
+            return "";
+        }
+        String str="";
+        for(int i=0;i<len;i++){
+            str=str+"?,";
+        }
+        if(str.endsWith(",")){
+            str=str.substring(0,str.length()-1);
+        }
+        return str;
+    }
+    //过滤HTML
+    public static String Html2Text(String inputString) {
+        String htmlStr = inputString; // 含html标签的字符串
+        String textStr = "";
+        Pattern p_script;
+        java.util.regex.Matcher m_script;
+        Pattern p_style;
+        java.util.regex.Matcher m_style;
+        Pattern p_html;
+        java.util.regex.Matcher m_html;
+
+        Pattern p_html1;
+        java.util.regex.Matcher m_html1;
+
+        try {
+            String regEx_script = "<[\\s]*?script[^>]*?>[\\s\\S]*?<[\\s]*?\\/[\\s]*?script[\\s]*?>"; // 定义script的正则表达式{或<script[^>]*?>[\\s\\S]*?<\\/script>
+            // }
+            String regEx_style = "<[\\s]*?style[^>]*?>[\\s\\S]*?<[\\s]*?\\/[\\s]*?style[\\s]*?>"; // 定义style的正则表达式{或<style[^>]*?>[\\s\\S]*?<\\/style>
+            // }
+            String regEx_html = "<[^>]+>"; // 定义HTML标签的正则表达式
+            String regEx_html1 = "<[^>]+";
+            p_script = Pattern.compile(regEx_script, Pattern.CASE_INSENSITIVE);
+            m_script = p_script.matcher(htmlStr);
+            htmlStr = m_script.replaceAll(""); // 过滤script标签
+
+            p_style = Pattern.compile(regEx_style, Pattern.CASE_INSENSITIVE);
+            m_style = p_style.matcher(htmlStr);
+            htmlStr = m_style.replaceAll(""); // 过滤style标签
+
+            p_html = Pattern.compile(regEx_html, Pattern.CASE_INSENSITIVE);
+            m_html = p_html.matcher(htmlStr);
+            htmlStr = m_html.replaceAll(""); // 过滤html标签
+
+            p_html1 = Pattern.compile(regEx_html1, Pattern.CASE_INSENSITIVE);
+            m_html1 = p_html1.matcher(htmlStr);
+            htmlStr = m_html1.replaceAll(""); // 过滤html标签
+
+            textStr = htmlStr;
+
+        } catch (Exception e) {
+            //System.err.println("Html2Text: " + e.getMessage());
+            textStr="";
+        }
+
+        return textStr;// 返回文本字符串
+    }
+    /*
+    获取字段ID
+     */
+    public static String getFilebillid(String feildname,int bilid,int dettail){
+        String fieldid="";
+        RecordSet re=new RecordSet();
+        String sql="";
+        if(dettail<=0){//主表
+            sql="select * from workflow_billfield where upper(fieldname)=upper('"+feildname+"') and billid=-"+bilid;
+        }else{//明细
+            sql="select * from workflow_billfield where upper(fieldname)=upper('"+feildname+"') and detailtable='formtable_main_"+bilid+"_dt"+dettail+"' and billid=-"+bilid;
+        }
+        loghr.writeLog("getFilebillid---"+sql);
+        re.execute(sql);
+        while(re.next()){
+            fieldid= Util.null2String(re.getString("id")).trim();
+        }
+        return fieldid;
+    }
+    /*
+    获取主流程的 requestid  以及requestmark
+     */
+    public static Map<String,String> getMainRequestbaseByreq(String requestid){
+        Map<String,String> main=new HashMap<>();
+        RecordSet re=new RecordSet();
+        String mainrequestid="";
+        String mainrequestmark="";
+        String sql="select b.requestid,b.requestmark from workflow_requestbase a left join workflow_requestbase b on a.mainrequestid=b.requestid where a.requestid='"+requestid+"' ";
+        log1.writeLog("getMainRequestbaseByreq--"+sql);
+        re.execute(sql);
+        while(re.next()){
+              mainrequestid= Util.null2String(re.getString("requestid")).trim() ;
+              mainrequestmark= Util.null2String(re.getString("requestmark")).trim() ;
+        }
+        main.put("mainrequestid",mainrequestid);
+        main.put("mainrequestmark",mainrequestmark);
+        log1.writeLog("getMainRequestbaseByreq--"+main.toString());
+        return main;
+    }
+    public static double getfloats(String demo,int len){
+        //Logger log = Logger.getLogger(BigDecimal.class);
+        if(len==0){
+            len=2;
+        }
+        String str= Util.null2String(demo);
+        if("".equals(str)||"".equals(str.trim())||"null".equalsIgnoreCase(str.trim())){
+            return 0;
+        }
+        double fl=0.0f;
+        //String str=Util.null2String(demo);
+        try{
+            if(str.trim().length()>0){
+                BigDecimal b1 = new BigDecimal(str.trim());
+                //System.out.println(b1.setScale(2,BigDecimal.ROUND_HALF_UP));
+                fl=b1.setScale(len,BigDecimal.ROUND_HALF_UP).doubleValue();
+            }
+            //log.error("getfloats"+fl);
+        }catch(Exception e){
+            loghr.writeLog(demo+"getfloats异常"+e.getMessage());
+        }
+
+        return fl;
+    }
+    /*
+    设置跟新的 数据的 标准的   数据  只是更新 一二级 分解  其他的不动
+     */
+    public static List<Map<String, Object>> BaseUpdDate(String requestid){
+        RecordSet re=new RecordSet();
+        List<Map<String, Object>> listMap=new ArrayList<Map<String, Object>>();
+        Map<String, Object> map = null;//new HashMap<String, Object>();
+        String sql="select * from  uf_zjljlhzbb where mainrequestid='"+requestid+"' and  isnull(jb,-1) in (1,2) and isnull(sfyx,-1) in (0,-1)";
+        re.execute(sql);
+        while(re.next()){
+            String id= Util.null2String( re.getString("id")).trim();
+            if(!"".equals(id)){
+                //设置更新数据  建模
+                Object[] objval = new Object[1];//存储值
+                objval[0]=id;
+                map=new HashMap<String, Object>();
+                map.put("sql","update uf_zjljlhzbb set sfyx='1' where id=?");
+                map.put("params",objval);
+                listMap.add(map);
+            }
+        }
+        return listMap;
+    }
+    // 通过 主流程 获取 以及分解 流程requestid  以及 requestmark
+    public static Map<String,String> getReqMarkByMainreq(String mainrequestid){
+        RecordSet re=new RecordSet();
+        Map<String,String> map=new HashMap<String,String>();
+        //取一级分解
+        String sql="select * from uf_zjljlhzbb where tragwfreq='"+mainrequestid+"' and isnull(jb,-1)=1 and isnull(sfyx,-1) in (0,-1)";
+        re.execute(sql);
+        if(re.next()){
+            String requestid= Util.null2String(re.getString("wfrequestid"));
+            String requestmark= Util.null2String(re.getString("wfrequestmark"));
+            map.put("requestid",requestid);
+            map.put("requestmark",requestmark);
+        }
+        return map;
+    }
+    //获取分部矩阵信息
+    public static String getMax_1(String userid,String subid){
+        String subidStr="";
+        RecordSet re=new RecordSet();
+        String sql="select * from matrixtable_1 where ','+CAST(jxsjxgy as varchar(800))+','  like ',"+userid+",' and id in ("+subid+")";
+        log1.writeLog("getMax_1--->"+sql);
+        re.execute(sql);
+        while(re.next()){
+            String id= Util.null2String(re.getString("id")).trim() ;
+            if("".equals(id)){
+                continue;
+            }
+            subidStr=subidStr+id+",";
+        }
+        if(subidStr.endsWith(",")){
+            subidStr=subidStr.substring(0,subidStr.length()-1);
+        }
+        return subidStr;
+    }
+    //通过部门以及人员获取分部矩阵信息
+    public static String getMax_1ByDep(String userid,String depid){
+        String subidStr="";
+        RecordSet re=new RecordSet();
+        String sql="select * from matrixtable_1 where ','+CAST(jxsjxgy as varchar(800))+','  like ',"+userid+",' and id in (select subcompanyid1 from hrmdepartment where id in ("+depid+"))";
+        log1.writeLog("getMax_1ByDep--->"+sql);
+        re.execute(sql);
+        while(re.next()){
+            String id= Util.null2String(re.getString("id")).trim() ;
+            if("".equals(id)){
+                continue;
+            }
+            subidStr=subidStr+id+",";
+        }
+        if(subidStr.endsWith(",")){
+            subidStr=subidStr.substring(0,subidStr.length()-1);
+        }
+        return subidStr;
+    }
+    //通过部门以及人员获取分部矩阵信息
+    public static JSONObject getMax_2ByUser(String userid, String depid){
+        JSONObject json=new JSONObject();
+        String subidStr="";
+        String depidStr="";
+        RecordSet re=new RecordSet();
+        String sql="select a.id,b.subcompanyid1 from matrixtable_2 a , HrmDepartment b   where a.id=b.id and  ','+CAST(a.bc as varchar(800))+','  like ',"+userid+",' and a.id in ("+depid+") ";
+        log1.writeLog("getMax_2ByUser--->"+sql);
+        re.execute(sql);
+        while(re.next()){
+            String id= Util.null2String(re.getString("id")).trim() ;
+            String subcompanyid1= Util.null2String(re.getString("subcompanyid1")).trim() ;
+            if("".equals(id)){
+                continue;
+            }
+            subidStr=subidStr+subcompanyid1+",";
+            depidStr=depidStr+id+",";
+        }
+        if(depidStr.endsWith(",")){
+            depidStr=depidStr.substring(0,depidStr.length()-1);
+        }
+        if(subidStr.endsWith(",")){
+            subidStr=subidStr.substring(0,subidStr.length()-1);
+        }
+        json.put("dep",depidStr);
+        json.put("sub",subidStr);
+        return json;
+    }
+    /*
+        获取单位分部数据
+        添加判断还未设置完成的 不允许变更  或者有变更数据没有归档
+
+        校验是否存在 分部 没分解  部门分解数据等
+
+        sudid  分部id
+        mainRequestid 主数据ID
+        0:总经理分解
+        1:一级分解
+        2:二级分解
+     */
+    public static JSONObject getSubData(String sudid, String mainRequestid, String requestid){
+        RecordSet re=new RecordSet();
+        JSONObject resultjson=new JSONObject();
+        JSONObject json=new JSONObject();
+        JSONArray jsons=new JSONArray();
+
+        JSONObject levezjl=new JSONObject();//总经理
+
+        JSONObject leve1_dw=new JSONObject();//一级 单位
+        JSONObject leve1_gr=new JSONObject();//一级  个人
+        JSONObject leve1_dp=new JSONObject();//一级  大盘
+
+
+        JSONObject leve2=new JSONObject();//二级
+
+        JSONObject fblxje=new JSONObject();//单位分解大盘金额
+        JSONObject fblx=new JSONObject();//单位分解类型
+        JSONObject bmlxje=new JSONObject();//单位分解大盘金额
+        //不可存在在途变更流程 会造成数据混轮乱
+        if(checkChangeWf(mainRequestid,requestid)){
+            return resultjson;
+        }
+        String sql="select a.*,b.subcompanyname,c.departmentname,d.lastname from uf_zjljlhzbb a left join HrmSubCompany b on a.bjldwfb=b.id " +
+                   " left join hrmdepartment c on a.jldwbm=c.id  " +
+                   " left join hrmresource d on  a.xm=d.id " +
+                   " where mainrequestid='"+mainRequestid+"' and isnull(sfyx,-1) in (0,-1) and a.bjldwfb in ("+sudid+")";
+        log1.writeLog("getSubDatanew--->"+sql);
+
+        re.execute(sql);
+        while(re.next()){
+            json=new JSONObject();
+            String id= Util.null2String(re.getString("id")).trim();//建模ID
+            String jb= Util.null2String(re.getString("jb")).trim();//级别
+            if("".equals(jb)){
+                continue;
+            }
+
+            String sqjlje= Util.null2String(re.getString("sqjlje")).trim();//申请奖励金额
+            String hrfbdpje= Util.null2String(re.getString("hrfbdpje")).trim();//划入分部大盘金额
+            String fjlx= Util.null2String(re.getString("fjlx")).trim();//分解类型
+            String bjldwfb= Util.null2String(re.getString("bjldwfb")).trim();//被奖励单位（分部）
+            String jljefb= Util.null2String(re.getString("jljefb")).trim();//奖励金额（分部）
+            String qzzcldjlje= Util.null2String(re.getString("qzzcldjlje")).trim();//其中中层领导奖励金额
+            String qzjldwje= Util.null2String(re.getString("qzjldwje")).trim();//其中奖励单位金额
+            String jlfpbz= Util.null2String(re.getString("jlfpbz")).trim();//奖励分配备注
+            String zcld= Util.null2String(re.getString("zcld")).trim();//中层领导
+            String zcldjlje= Util.null2String(re.getString("zcldjlje")).trim();//中层领导奖励金额
+            String zcldfpbz= Util.null2String(re.getString("zcldfpbz")).trim();//中层领导分配备注
+            String jldwbm= Util.null2String(re.getString("jldwbm")).trim();//奖励单位（部门）
+            String dwjljebm= Util.null2String(re.getString("dwjljebm")).trim();//单位奖励金额（部门）
+            String dwjlbz= Util.null2String(re.getString("dwjlbz")).trim();//单位奖励备注
+            String xm= Util.null2String(re.getString("xm")).trim();//姓名
+            String grjlje= Util.null2String(re.getString("grjlje")).trim();//个人奖励金额
+            String grjlbz= Util.null2String(re.getString("grjlbz")).trim();//个人奖励备注
+            String hrdpjebm= Util.null2String(re.getString("hrdpjebm")).trim();//划入大盘金额（部门）
+            String subcompanyname= Util.null2String(re.getString("subcompanyname")).trim();//分部名称
+            String departmentname= Util.null2String(re.getString("departmentname")).trim();//部门名称
+            String lastname= Util.null2String(re.getString("lastname")).trim();//姓名
+            String mainrequestid= Util.null2String(re.getString("mainrequestid")).trim();//mainrequestid
+            String wfrequestid= Util.null2String(re.getString("wfrequestid")).trim();//mainrequestid
+            if("0".equals(jb)){
+
+                if("1".equals(levezjl.getString(bjldwfb))){
+                        continue;
+                }
+                levezjl.put(bjldwfb,"1");
+            }
+            if("1".equals(jb)){
+                fblxje.put(bjldwfb,hrfbdpje);
+                fblx.put(bjldwfb,fjlx);
+                if("0".equals(fjlx)){//单位
+                    //leve1_dw.put(bjldwfb,jldwbm);
+                    if("".equals(Util.null2String(leve1_dw.getString(bjldwfb)).trim())){
+                        leve1_dw.put(bjldwfb,jldwbm+",");
+                    }else{
+                        String bmstr= Util.null2String(leve1_dw.getString(bjldwfb)).trim();
+                        bmstr=bmstr+jldwbm+",";
+                        leve1_dw.put(bjldwfb,bmstr);
+                    }
+                }
+                if("1".equals(fjlx)){//个人
+                    leve1_gr.put(bjldwfb,"1");
+                }
+                if("2".equals(fjlx)){//大盘
+                    leve1_dp.put(bjldwfb,"1");
+                }
+            }
+            if("2".equals(jb)){
+                leve2.put(jldwbm,"1");
+                bmlxje.put(jldwbm,hrdpjebm );
+            }
+            JSONArray demoJsons=resultjson.getJSONArray(jb);
+            if(demoJsons==null||demoJsons.size()<=0){
+                demoJsons=new JSONArray();
+                resultjson.put(jb,demoJsons);
+            }
+            json.put("jb",jb);
+            json.put("id",id);
+            json.put("sqjlje",sqjlje);
+            json.put("hrfbdpje",hrfbdpje);
+            json.put("fjlx",fjlx);
+            json.put("bjldwfb",bjldwfb);
+            json.put("jljefb",jljefb);
+            json.put("qzzcldjlje",qzzcldjlje);
+            json.put("qzjldwje",qzjldwje);
+            json.put("jlfpbz",jlfpbz);
+            json.put("zcld",zcld);
+            json.put("zcldjlje",zcldjlje);
+            json.put("zcldfpbz",zcldfpbz);
+            json.put("jldwbm",jldwbm);
+            json.put("dwjljebm",dwjljebm);
+            json.put("dwjlbz",dwjlbz);
+            json.put("xm",xm);
+            json.put("grjlje",grjlje);
+            json.put("grjlbz",grjlbz);
+            json.put("hrdpjebm",hrdpjebm);
+            json.put("subcompanyname",subcompanyname);
+            json.put("departmentname",departmentname);
+            json.put("lastname",lastname);
+            json.put("mainrequestid",mainrequestid);
+            json.put("wfrequestid",wfrequestid);
+            demoJsons.add(json);
+
+        }
+        log1.writeLog(resultjson.toJSONString());
+        log1.writeLog(levezjl.toJSONString());
+        log1.writeLog(leve1_dw.toJSONString());
+        log1.writeLog(leve1_gr.toJSONString());
+        log1.writeLog(leve1_dp.toJSONString());
+        log1.writeLog(leve2.toJSONString());
+        log1.writeLog(fblxje.toJSONString());
+        log1.writeLog(fblx.toJSONString());
+        //检验数据
+        if(levezjl.size()>0){
+            Set<String> fbkey= levezjl.keySet();
+            for(String key:fbkey){
+                String str1= Util.null2String(leve1_dw.getString(key)).trim() ;
+                String str2= Util.null2String(leve1_gr.getString(key)).trim() ;
+                String str3= Util.null2String(leve1_dp.getString(key)).trim() ;
+                if("".equals(str1)&&"".equals(str2)&&"".equals(str3)){
+
+                    log1.writeLog("not sub data"+key);
+                    return new JSONObject();
+                }
+                if(!"".equals(str1)){
+                   String[] bmAll= str1.split(",");
+                   for(String str:bmAll){
+
+                        if(!"".equals(str)){
+                            if(!"1".equals(Util.null2String(leve2.getString(str)).trim())){
+                                log1.writeLog("not dep data"+str);
+                                return new JSONObject();
+                            }
+                        }
+                   }
+                }
+            }
+
+        }else{
+            return new JSONObject();
+        }
+        if(resultjson.size()>0){
+            resultjson.put("fbje",fblxje);
+            resultjson.put("fblx",fblx);
+            resultjson.put("bmje",bmlxje);
+        }
+        return resultjson;
+    }
+    /*
+        获取单位部门数据(用于只是修改二级分解个人数据)
+        sudid  分部id
+        mainRequestid 主数据ID
+        0:总经理分解
+        1:一级分解
+        2:二级分解
+     */
+    public static JSONObject getDepData(String depid, String sudid, String mainRequestid){
+        RecordSet re=new RecordSet();
+        JSONObject resultjson=new JSONObject();
+        JSONObject json=new JSONObject();
+        JSONObject bmdpJson=new JSONObject();
+
+        JSONObject bmTofb=new JSONObject();//部门所属分部
+        JSONObject userTobm=new JSONObject();//人员所属部门
+
+        JSONArray jsons=new JSONArray();
+        JSONObject levezjl=new JSONObject();
+        String sql="select a.*,b.subcompanyname,c.departmentname,d.lastname from uf_zjljlhzbb a left join HrmSubCompany b on a.bjldwfb=b.id " +
+                " left join hrmdepartment c on a.jldwbm=c.id  " +
+                " left join hrmresource d on  a.xm=d.id " +
+                " where mainrequestid='"+mainRequestid+"' and isnull(sfyx,-1) in (0,-1) and a.bjldwfb in ("+sudid+") and isnull(jb,-1)=0"+
+                " union all "+
+                "select a.*,b.subcompanyname,c.departmentname,d.lastname from uf_zjljlhzbb a left join HrmSubCompany b on a.bjldwfb=b.id " +
+                " left join hrmdepartment c on a.jldwbm=c.id  " +
+                " left join hrmresource d on  a.xm=d.id " +
+                " where mainrequestid='"+mainRequestid+"' and isnull(sfyx,-1) in (0,-1) and a.bjldwfb in ("+sudid+") and a.jldwbm in ("+depid+") and isnull(jb,-1)=1 and fjlx='0' "+
+                " union all "+
+                " select a.*,b.subcompanyname,c.departmentname,d.lastname from uf_zjljlhzbb a left join HrmSubCompany b on a.bjldwfb=b.id " +
+                " left join hrmdepartment c on a.jldwbm=c.id  " +
+                " left join hrmresource d on  a.xm=d.id " +
+                " where mainrequestid='"+mainRequestid+"' and isnull(sfyx,-1) in (0,-1) and a.bjldwfb in ("+sudid+") and a.jldwbm in ("+depid+") and isnull(jb,-1)=2";
+        log1.writeLog("getDepData--->"+sql);
+        re.execute(sql);
+        while(re.next()){
+            json=new JSONObject();
+            String id= Util.null2String(re.getString("id")).trim();//建模ID
+            String jb= Util.null2String(re.getString("jb")).trim();//级别
+            if("".equals(jb)){
+                continue;
+            }
+            String sqjlje= Util.null2String(re.getString("sqjlje")).trim();//申请奖励金额
+            String hrfbdpje= Util.null2String(re.getString("hrfbdpje")).trim();//划入分部大盘金额
+            String fjlx= Util.null2String(re.getString("fjlx")).trim();//分解类型
+            String bjldwfb= Util.null2String(re.getString("bjldwfb")).trim();//被奖励单位（分部）
+            String jljefb= Util.null2String(re.getString("jljefb")).trim();//奖励金额（分部）
+            String qzzcldjlje= Util.null2String(re.getString("qzzcldjlje")).trim();//其中中层领导奖励金额
+            String qzjldwje= Util.null2String(re.getString("qzjldwje")).trim();//其中奖励单位金额
+            String jlfpbz= Util.null2String(re.getString("jlfpbz")).trim();//奖励分配备注
+            String zcld= Util.null2String(re.getString("zcld")).trim();//中层领导
+            String zcldjlje= Util.null2String(re.getString("zcldjlje")).trim();//中层领导奖励金额
+            String zcldfpbz= Util.null2String(re.getString("zcldfpbz")).trim();//中层领导分配备注
+            String jldwbm= Util.null2String(re.getString("jldwbm")).trim();//奖励单位（部门）
+            String dwjljebm= Util.null2String(re.getString("dwjljebm")).trim();//单位奖励金额（部门）
+            String dwjlbz= Util.null2String(re.getString("dwjlbz")).trim();//单位奖励备注
+            String xm= Util.null2String(re.getString("xm")).trim();//姓名
+            String grjlje= Util.null2String(re.getString("grjlje")).trim();//个人奖励金额
+            String grjlbz= Util.null2String(re.getString("grjlbz")).trim();//个人奖励备注
+            String hrdpjebm= Util.null2String(re.getString("hrdpjebm")).trim();//划入大盘金额（部门）
+            String subcompanyname= Util.null2String(re.getString("subcompanyname")).trim();//分部名称
+            String departmentname= Util.null2String(re.getString("departmentname")).trim();//部门名称
+            String lastname= Util.null2String(re.getString("lastname")).trim();//姓名
+            String mainrequestid= Util.null2String(re.getString("mainrequestid")).trim();//mainrequestid
+            if("".equals(bjldwfb)||"".equals(jldwbm)){
+                continue;
+            }
+            if("0".equals(jb)){
+                if("1".equals(levezjl.getString(bjldwfb))){
+                    continue;
+                }
+                levezjl.put(bjldwfb,"1");
+            }
+            if("1".equals(jb)){//一级分解
+                bmTofb.put(jldwbm,bjldwfb);
+            }
+
+            JSONArray demoJsons=resultjson.getJSONArray(jb);
+            if(demoJsons==null||demoJsons.size()<=0){
+                demoJsons=new JSONArray();
+                resultjson.put(jb,demoJsons);
+            }
+            if("2".equals(jb)){
+                bmdpJson.put(jldwbm,hrdpjebm);
+                userTobm.put(jldwbm,"1");
+            }
+            json.put("jb",jb);
+            json.put("id",id);
+            json.put("sqjlje",sqjlje);
+            json.put("hrfbdpje",hrfbdpje);
+            json.put("fjlx",fjlx);
+            json.put("bjldwfb",bjldwfb);
+            json.put("jljefb",jljefb);
+            json.put("qzzcldjlje",qzzcldjlje);
+            json.put("qzjldwje",qzjldwje);
+            json.put("jlfpbz",jlfpbz);
+            json.put("zcld",zcld);
+            json.put("zcldjlje",zcldjlje);
+            json.put("zcldfpbz",zcldfpbz);
+            json.put("jldwbm",jldwbm);
+            json.put("dwjljebm",dwjljebm);
+            json.put("dwjlbz",dwjlbz);
+            json.put("xm",xm);
+            json.put("grjlje",grjlje);
+            json.put("grjlbz",grjlbz);
+            json.put("hrdpjebm",hrdpjebm);
+            json.put("subcompanyname",subcompanyname);
+            json.put("departmentname",departmentname);
+            json.put("lastname",lastname);
+            json.put("mainrequestid",mainrequestid);
+            demoJsons.add(json);
+
+        }
+        //校验数据是否分解完毕
+        //int fblen=0;//分部计数
+        log1.writeLog(" levezjl-->"+levezjl.toJSONString());
+        log1.writeLog(" bmTofb-->"+bmTofb.toJSONString());
+        log1.writeLog(" userTobm-->"+userTobm.toJSONString());
+        JSONObject fblen=new JSONObject();//分部计数
+        if(levezjl.size()>0){
+            //Set<String> levezjlkey=levezjl.keySet();
+            //for(String key:levezjlkey){
+
+            //}
+
+            if(bmTofb.size()>0){
+                Set<String> bmTofbkey=bmTofb.keySet();
+                for(String key:bmTofbkey){//key 代表分部
+                    String fbkey=bmTofb.getString(key);
+                    String userTobmStr= Util.null2String(userTobm.getString(key)).trim() ;
+                    if(!"1".equals(userTobmStr)){
+                        return new JSONObject();
+                    }else{
+                        fblen.put(fbkey,"-1");
+                    }
+                }
+                if(fblen.size()!=levezjl.size()){
+                    return new JSONObject();
+                }
+            }else{
+                return new JSONObject();
+            }
+
+        }else{
+            return new JSONObject();
+        }
+        if(resultjson.size()>0){
+            resultjson.put("bmdp",bmdpJson);
+        }
+
+        log1.writeLog(resultjson.toJSONString());
+
+        return resultjson;
+    }
+    /*
+       获取单位部门数据(用于只是修改二级分解个人数据)
+       sudid  分部id
+       mainRequestid 主数据ID
+       0:总经理分解
+       1:一级分解
+       2:二级分解
+    */
+    public static JSONObject getDepDataDetail(String depid, String sudid, String mainRequestid){
+        RecordSet re=new RecordSet();
+        boolean leve2l=false;//是否存在二级分部
+        JSONObject resultjson=new JSONObject();
+        JSONObject DetailJson=new JSONObject();
+        JSONObject json=new JSONObject();
+        JSONArray jsons=new JSONArray();
+        String sql="select a.*,b.subcompanyname,c.departmentname,d.lastname from uf_zjljlhzbb a left join HrmSubCompany b on a.bjldwfb=b.id " +
+                " left join hrmdepartment c on a.jldwbm=c.id  " +
+                " left join hrmresource d on  a.xm=d.id " +
+                " where mainrequestid='"+mainRequestid+"' and isnull(sfyx,-1) in (0,-1) and a.bjldwfb in ("+sudid+") and isnull(jb,-1)=0"+
+                " union all "+
+                "select a.*,b.subcompanyname,c.departmentname,d.lastname from uf_zjljlhzbb a left join HrmSubCompany b on a.bjldwfb=b.id " +
+                " left join hrmdepartment c on a.jldwbm=c.id  " +
+                " left join hrmresource d on  a.xm=d.id " +
+                " where mainrequestid='"+mainRequestid+"' and isnull(sfyx,-1) in (0,-1) and a.bjldwfb in ("+sudid+") and a.jldwbm in ("+depid+") and isnull(jb,-1)=1 and fjlx='0' "+
+                " union all "+
+                " select a.*,b.subcompanyname,c.departmentname,d.lastname from uf_zjljlhzbb a left join HrmSubCompany b on a.bjldwfb=b.id " +
+                " left join hrmdepartment c on a.jldwbm=c.id  " +
+                " left join hrmresource d on  a.xm=d.id " +
+                " where mainrequestid='"+mainRequestid+"' and isnull(sfyx,-1) in (0,-1) and a.bjldwfb in ("+sudid+") and a.jldwbm in ("+depid+") and isnull(jb,-1)=2";
+        log1.writeLog("getDepDataDetail--->"+sql);
+        re.execute(sql);
+        while(re.next()){
+            json=new JSONObject();
+            String id= Util.null2String(re.getString("id")).trim();//建模ID
+            String jb= Util.null2String(re.getString("jb")).trim();//级别
+            if("".equals(jb)){
+                continue;
+            }
+            if("2".equals(jb)){//存在部门分解
+                leve2l=true;
+            }
+            if("0".equals(jb)||"2".equals(jb)){
+                continue;
+            }
+
+            String nf= Util.null2String(re.getString("nf")).trim();//年份
+            String yf= Util.null2String(re.getString("yf")).trim();//月份
+            String sqr= Util.null2String(re.getString("sqr")).trim();//申请人
+            String jlxmmc= Util.null2String(re.getString("jlxmmc")).trim();//奖励项目名称
+
+            String sqjlje= Util.null2String(re.getString("sqjlje")).trim();//申请奖励金额
+            String hrfbdpje= Util.null2String(re.getString("hrfbdpje")).trim();//划入分部大盘金额
+            String fjlx= Util.null2String(re.getString("fjlx")).trim();//分解类型
+            String bjldwfb= Util.null2String(re.getString("bjldwfb")).trim();//被奖励单位（分部）
+            String jljefb= Util.null2String(re.getString("jljefb")).trim();//奖励金额（分部）
+            String qzzcldjlje= Util.null2String(re.getString("qzzcldjlje")).trim();//其中中层领导奖励金额
+            String qzjldwje= Util.null2String(re.getString("qzjldwje")).trim();//其中奖励单位金额
+            String jlfpbz= Util.null2String(re.getString("jlfpbz")).trim();//奖励分配备注
+            String zcld= Util.null2String(re.getString("zcld")).trim();//中层领导
+            String zcldjlje= Util.null2String(re.getString("zcldjlje")).trim();//中层领导奖励金额
+            String zcldfpbz= Util.null2String(re.getString("zcldfpbz")).trim();//中层领导分配备注
+            String jldwbm= Util.null2String(re.getString("jldwbm")).trim();//奖励单位（部门）
+            String dwjljebm= Util.null2String(re.getString("dwjljebm")).trim();//单位奖励金额（部门）
+            String dwjlbz= Util.null2String(re.getString("dwjlbz")).trim();//单位奖励备注
+            String xm= Util.null2String(re.getString("xm")).trim();//姓名
+            String grjlje= Util.null2String(re.getString("grjlje")).trim();//个人奖励金额
+            String grjlbz= Util.null2String(re.getString("grjlbz")).trim();//个人奖励备注
+            String hrdpjebm= Util.null2String(re.getString("hrdpjebm")).trim();//划入大盘金额（部门）
+            String subcompanyname= Util.null2String(re.getString("subcompanyname")).trim();//分部名称
+            String departmentname= Util.null2String(re.getString("departmentname")).trim();//部门名称
+            String lastname= Util.null2String(re.getString("lastname")).trim();//姓名
+            String mainrequestid= Util.null2String(re.getString("mainrequestid")).trim();//mainrequestid
+
+            String ndjhxm= Util.null2String(re.getString("ndjhxm")).trim();//年度计划-项目
+            String ndjhys= Util.null2String(re.getString("ndjhys")).trim();//年度计划-预算
+            String ndjhsyed= Util.null2String(re.getString("ndjhsyed")).trim();//年度计划-剩余额度
+            String qzjldwjezj= Util.null2String(re.getString("qzjldwjezj")).trim();//其中奖励单位金额总计
+            String zcldjljehj= Util.null2String(re.getString("zcldjljehj")).trim();//中层领导奖励金额合计
+            String wfrequestid= Util.null2String(re.getString("wfrequestid")).trim();//mainrequestid
+            json.put("jlxmmc",jlxmmc);
+            json.put("nf",nf);
+            json.put("yf",yf);
+            json.put("sqr",sqr);
+            json.put("jb",jb);
+            json.put("id",id);
+            json.put("sqjlje",sqjlje);
+            json.put("hrfbdpje",hrfbdpje);
+            json.put("fjlx",fjlx);
+            json.put("bjldwfb",bjldwfb);
+            json.put("jljefb",jljefb);
+            json.put("qzzcldjlje",qzzcldjlje);
+            json.put("qzjldwje",qzjldwje);
+            json.put("jlfpbz",jlfpbz);
+            json.put("zcld",zcld);
+            json.put("zcldjlje",zcldjlje);
+            json.put("zcldfpbz",zcldfpbz);
+            json.put("jldwbm",jldwbm);
+            json.put("dwjljebm",dwjljebm);
+            json.put("dwjlbz",dwjlbz);
+            json.put("xm",xm);
+            json.put("grjlje",grjlje);
+            json.put("grjlbz",grjlbz);
+            json.put("hrdpjebm",hrdpjebm);
+            json.put("subcompanyname",subcompanyname);
+            json.put("departmentname",departmentname);
+            json.put("lastname",lastname);
+            json.put("mainrequestid",mainrequestid);
+
+            json.put("ndjhxm",ndjhxm);
+            json.put("ndjhys",ndjhys);
+            json.put("ndjhsyed",ndjhsyed);
+            json.put("qzjldwjezj",qzjldwjezj);
+            json.put("zcldjljehj",zcldjljehj);
+            json.put("wfrequestid",wfrequestid);
+            if("1".equals(jb)){
+
+                if(DetailJson.get(jldwbm)!=null){
+                    log1.writeLog("dep must only!");
+                    return new JSONObject();
+                }
+                DetailJson.put(jldwbm,json);
+            }
+            //demoJsons.add(json);
+
+        }
+        log1.writeLog(DetailJson.toJSONString());
+        //resultjson.put("DetailJson",DetailJson);
+        return DetailJson;
+    }
+    /*
+       获取单位分部数据  按部门区分
+       sudid  分部id
+       mainRequestid 主数据ID
+       0:总经理分解
+       1:一级分解
+       2:二级分解
+       返回  数据集合 以及  ID集合
+    */
+    public static JSONObject getSubDataDetail(String sudid, String mainRequestid){
+        RecordSet re=new RecordSet();
+        JSONObject DetailJson=new JSONObject();
+        JSONObject Depjson=new JSONObject();
+        JSONObject resultjson=null;//new JSONObject();
+        JSONObject json=new JSONObject();
+        JSONArray jsons=new JSONArray();
+        String sql="select a.*,b.subcompanyname,c.departmentname,d.lastname from uf_zjljlhzbb a left join HrmSubCompany b on a.bjldwfb=b.id " +
+                " left join hrmdepartment c on a.jldwbm=c.id  " +
+                " left join hrmresource d on  a.xm=d.id " +
+                " where mainrequestid='"+mainRequestid+"' and isnull(sfyx,-1) in (0,-1) and a.bjldwfb in ("+sudid+")";
+        log1.writeLog("getSubData--->"+sql);
+        re.execute(sql);
+        while(re.next()){
+            json=new JSONObject();
+            String jlxmmc= Util.null2String(re.getString("jlxmmc")).trim();//名称
+            String sqr= Util.null2String(re.getString("sqr")).trim();//申请人
+            String id= Util.null2String(re.getString("id")).trim();//建模ID
+            String jb= Util.null2String(re.getString("jb")).trim();//级别
+            String nf= Util.null2String(re.getString("nf")).trim();//年份
+            String yf= Util.null2String(re.getString("yf")).trim();//月份
+            String sqjlje= Util.null2String(re.getString("sqjlje")).trim();//申请奖励金额
+            String hrfbdpje= Util.null2String(re.getString("hrfbdpje")).trim();//划入分部大盘金额
+            String fjlx= Util.null2String(re.getString("fjlx")).trim();//分解类型
+            String bjldwfb= Util.null2String(re.getString("bjldwfb")).trim();//被奖励单位（分部）
+            String jljefb= Util.null2String(re.getString("jljefb")).trim();//奖励金额（分部）
+            String qzzcldjlje= Util.null2String(re.getString("qzzcldjlje")).trim();//其中中层领导奖励金额
+            String qzjldwje= Util.null2String(re.getString("qzjldwje")).trim();//其中奖励单位金额
+            String jlfpbz= Util.null2String(re.getString("jlfpbz")).trim();//奖励分配备注
+            String zcld= Util.null2String(re.getString("zcld")).trim();//中层领导
+            String zcldjlje= Util.null2String(re.getString("zcldjlje")).trim();//中层领导奖励金额
+            String zcldfpbz= Util.null2String(re.getString("zcldfpbz")).trim();//中层领导分配备注
+            String jldwbm= Util.null2String(re.getString("jldwbm")).trim();//奖励单位（部门）
+            String dwjljebm= Util.null2String(re.getString("dwjljebm")).trim();//单位奖励金额（部门）
+            String dwjlbz= Util.null2String(re.getString("dwjlbz")).trim();//单位奖励备注
+            String xm= Util.null2String(re.getString("xm")).trim();//姓名
+            String grjlje= Util.null2String(re.getString("grjlje")).trim();//个人奖励金额
+            String grjlbz= Util.null2String(re.getString("grjlbz")).trim();//个人奖励备注
+            String hrdpjebm= Util.null2String(re.getString("hrdpjebm")).trim();//划入大盘金额（部门）
+            String subcompanyname= Util.null2String(re.getString("subcompanyname")).trim();//分部名称
+            String departmentname= Util.null2String(re.getString("departmentname")).trim();//部门名称
+            String lastname= Util.null2String(re.getString("lastname")).trim();//姓名
+            String mainrequestid= Util.null2String(re.getString("mainrequestid")).trim();//mainrequestid
+            String wfrequestid= Util.null2String(re.getString("wfrequestid")).trim();//wfrequestid
+
+            String ndjhxm= Util.null2String(re.getString("ndjhxm")).trim();//年度计划-项目
+            String ndjhys= Util.null2String(re.getString("ndjhys")).trim();//年度计划-预算
+            String ndjhsyed= Util.null2String(re.getString("ndjhsyed")).trim();//年度计划-剩余额度
+            String qzjldwjezj= Util.null2String(re.getString("qzjldwjezj")).trim();//其中奖励单位金额总计
+            String zcldjljehj= Util.null2String(re.getString("zcldjljehj")).trim();//中层领导奖励金额合计
+
+
+            if("".equals(jb)||"".equals(bjldwfb)){
+                continue;
+            }
+            //DetailJson
+            resultjson= Depjson.getJSONObject(bjldwfb);
+            if(resultjson==null||resultjson.size()<=0){
+                resultjson=new JSONObject();
+                Depjson.put(bjldwfb,resultjson);
+            }
+
+            JSONArray ModelJson=resultjson.getJSONArray(jb);
+            if(ModelJson==null||ModelJson.size()<=0){
+                ModelJson=new JSONArray();
+                resultjson.put(jb,ModelJson);
+            }
+            json.put("jlxmmc",jlxmmc);
+            json.put("sqr",sqr);
+            json.put("jb",jb);
+            json.put("id",id);
+            json.put("nf",nf);
+            json.put("yf",yf);
+            json.put("sqjlje",sqjlje);
+            json.put("hrfbdpje",hrfbdpje);
+            json.put("fjlx",fjlx);
+            json.put("bjldwfb",bjldwfb);
+            json.put("jljefb",jljefb);
+            json.put("qzzcldjlje",qzzcldjlje);
+            json.put("qzjldwje",qzjldwje);
+            json.put("jlfpbz",jlfpbz);
+            json.put("zcld",zcld);
+            json.put("zcldjlje",zcldjlje);
+            json.put("zcldfpbz",zcldfpbz);
+            json.put("jldwbm",jldwbm);
+            json.put("dwjljebm",dwjljebm);
+            json.put("dwjlbz",dwjlbz);
+            json.put("xm",xm);
+            json.put("grjlje",grjlje);
+            json.put("grjlbz",grjlbz);
+            json.put("hrdpjebm",hrdpjebm);
+            json.put("subcompanyname",subcompanyname);
+            json.put("departmentname",departmentname);
+            json.put("lastname",lastname);
+            json.put("mainrequestid",mainrequestid);
+            json.put("wfrequestid",wfrequestid);
+
+            json.put("ndjhxm",ndjhxm);
+            json.put("ndjhys",ndjhys);
+            json.put("ndjhsyed",ndjhsyed);
+            json.put("qzjldwjezj",qzjldwjezj);
+            json.put("zcldjljehj",zcldjljehj);
+            ModelJson.add(json);
+            DetailJson.put(id,copyJson(json));
+
+        }
+        log1.writeLog(Depjson.toJSONString());
+        Depjson.put("DetailJson",DetailJson);
+        return Depjson;
+    }
+    /*
+        获取单位分部数据  按部门区分
+        sudid  分部id
+        mainRequestid 主数据ID
+        0:总经理分解
+        1:一级分解
+        2:二级分解
+        返回  数据集合 以及  ID集合
+     */
+    public static JSONObject getSubDataDetailJson(String sudid, String mainRequestid){
+        RecordSet re=new RecordSet();
+        JSONObject DetailJson=new JSONObject();
+        JSONObject Depjson=new JSONObject();
+        JSONObject resultjson=null;//new JSONObject();
+        JSONObject json=new JSONObject();
+        JSONArray jsons=new JSONArray();
+        String sql="select a.*,b.subcompanyname,c.departmentname,d.lastname from uf_zjljlhzbb a left join HrmSubCompany b on a.bjldwfb=b.id " +
+                " left join hrmdepartment c on a.jldwbm=c.id  " +
+                " left join hrmresource d on  a.xm=d.id " +
+                " where mainrequestid='"+mainRequestid+"' and isnull(sfyx,-1) in (0,-1) and a.bjldwfb in ("+sudid+")";
+        log1.writeLog("getSubData--->"+sql);
+        re.execute(sql);
+        while(re.next()){
+            json=new JSONObject();
+            String sqr= Util.null2String(re.getString("sqr")).trim();//申请人
+            String id= Util.null2String(re.getString("id")).trim();//建模ID
+            String jb= Util.null2String(re.getString("jb")).trim();//级别
+            String nf= Util.null2String(re.getString("nf")).trim();//年份
+            String yf= Util.null2String(re.getString("yf")).trim();//月份
+            String sqjlje= Util.null2String(re.getString("sqjlje")).trim();//申请奖励金额
+            String hrfbdpje= Util.null2String(re.getString("hrfbdpje")).trim();//划入分部大盘金额
+            String fjlx= Util.null2String(re.getString("fjlx")).trim();//分解类型
+            String bjldwfb= Util.null2String(re.getString("bjldwfb")).trim();//被奖励单位（分部）
+            String jljefb= Util.null2String(re.getString("jljefb")).trim();//奖励金额（分部）
+            String qzzcldjlje= Util.null2String(re.getString("qzzcldjlje")).trim();//其中中层领导奖励金额
+            String qzjldwje= Util.null2String(re.getString("qzjldwje")).trim();//其中奖励单位金额
+            String jlfpbz= Util.null2String(re.getString("jlfpbz")).trim();//奖励分配备注
+            String zcld= Util.null2String(re.getString("zcld")).trim();//中层领导
+            String zcldjlje= Util.null2String(re.getString("zcldjlje")).trim();//中层领导奖励金额
+            String zcldfpbz= Util.null2String(re.getString("zcldfpbz")).trim();//中层领导分配备注
+            String jldwbm= Util.null2String(re.getString("jldwbm")).trim();//奖励单位（部门）
+            String dwjljebm= Util.null2String(re.getString("dwjljebm")).trim();//单位奖励金额（部门）
+            String dwjlbz= Util.null2String(re.getString("dwjlbz")).trim();//单位奖励备注
+            String xm= Util.null2String(re.getString("xm")).trim();//姓名
+            String grjlje= Util.null2String(re.getString("grjlje")).trim();//个人奖励金额
+            String grjlbz= Util.null2String(re.getString("grjlbz")).trim();//个人奖励备注
+            String hrdpjebm= Util.null2String(re.getString("hrdpjebm")).trim();//划入大盘金额（部门）
+            String subcompanyname= Util.null2String(re.getString("subcompanyname")).trim();//分部名称
+            String departmentname= Util.null2String(re.getString("departmentname")).trim();//部门名称
+            String lastname= Util.null2String(re.getString("lastname")).trim();//姓名
+            String mainrequestid= Util.null2String(re.getString("mainrequestid")).trim();//mainrequestid
+            String wfrequestid= Util.null2String(re.getString("wfrequestid")).trim();//wfrequestid
+
+            String ndjhxm= Util.null2String(re.getString("ndjhxm")).trim();//年度计划-项目
+            String ndjhys= Util.null2String(re.getString("ndjhys")).trim();//年度计划-预算
+            String ndjhsyed= Util.null2String(re.getString("ndjhsyed")).trim();//年度计划-剩余额度
+            String qzjldwjezj= Util.null2String(re.getString("qzjldwjezj")).trim();//其中奖励单位金额总计
+            String zcldjljehj= Util.null2String(re.getString("zcldjljehj")).trim();//中层领导奖励金额合计
+
+            if("".equals(jb)||"".equals(bjldwfb)){
+                continue;
+            }
+            //DetailJson
+            resultjson= Depjson.getJSONObject(bjldwfb);
+            if(resultjson==null||resultjson.size()<=0){
+                resultjson=new JSONObject();
+                Depjson.put(bjldwfb,resultjson);
+            }
+
+            JSONObject ModelJson=resultjson.getJSONObject(jb);
+
+            if(ModelJson==null||ModelJson.size()<=0){
+                ModelJson=new JSONObject();
+                resultjson.put(jb,ModelJson);
+            }
+            json.put("sqr",sqr);
+            json.put("jb",jb);
+            json.put("id",id);
+            json.put("nf",nf);
+            json.put("yf",yf);
+            json.put("sqjlje",sqjlje);
+            json.put("hrfbdpje",hrfbdpje);
+            json.put("fjlx",fjlx);
+            json.put("bjldwfb",bjldwfb);
+            json.put("jljefb",jljefb);
+            json.put("qzzcldjlje",qzzcldjlje);
+            json.put("qzjldwje",qzjldwje);
+            json.put("jlfpbz",jlfpbz);
+            json.put("zcld",zcld);
+            json.put("zcldjlje",zcldjlje);
+            json.put("zcldfpbz",zcldfpbz);
+            json.put("jldwbm",jldwbm);
+            json.put("dwjljebm",dwjljebm);
+            json.put("dwjlbz",dwjlbz);
+            json.put("xm",xm);
+            json.put("grjlje",grjlje);
+            json.put("grjlbz",grjlbz);
+            json.put("hrdpjebm",hrdpjebm);
+            json.put("subcompanyname",subcompanyname);
+            json.put("departmentname",departmentname);
+            json.put("lastname",lastname);
+            json.put("mainrequestid",mainrequestid);
+            json.put("wfrequestid",wfrequestid);
+
+            json.put("ndjhxm",ndjhxm);
+            json.put("ndjhys",ndjhys);
+            json.put("ndjhsyed",ndjhsyed);
+            json.put("qzjldwjezj",qzjldwjezj);
+            json.put("zcldjljehj",zcldjljehj);
+            ModelJson.put(id,json);
+            DetailJson.put(id,copyJson(json));
+
+        }
+        log1.writeLog(Depjson.toJSONString());
+        Depjson.put("DetailJson",DetailJson);
+        return Depjson;
+    }
+    public static String getAdd(String d,String x,int len){
+        String wsdj="0";
+        if(d==null|| Util.null2String(d).trim().equals("")){
+            d="0";
+        }
+        if(x==null|| Util.null2String(x).trim().equals("")){
+            x="0";
+        }
+        try{
+            BigDecimal allBig=new BigDecimal(d);
+            BigDecimal newslBig=new BigDecimal( x);
+            wsdj=allBig.add(newslBig).setScale(len,BigDecimal.ROUND_HALF_UP).toString();
+        }catch(Exception e){
+
+        }
+        return wsdj;
+    }
+    /*
+        获取部门所在的分部
+     */
+    public static String getSubByDep(String bm){
+        RecordSet re=new RecordSet();
+        String subcompanyid1="";
+        String sql="select subcompanyid1 from hrmdepartment where id='"+bm+"'";
+        re.execute(sql);
+        while(re.next()){
+            subcompanyid1= Util.null2String( re.getString("subcompanyid1")).trim();
+        }
+        return subcompanyid1;
+    }
+    public static JSONObject copyJson(JSONObject json){
+        JSONObject newJson=new JSONObject();
+        if(json==null||json.size()<=0){
+            return newJson;
+        }
+        String str= JSONObject.toJSONString(json);
+        if(str!=null){
+            try{
+                newJson= JSONObject.parseObject(str);
+            }catch(Exception e){
+
+            }
+        }
+        return newJson;
+    }
+    /*
+    同步分部ID获取分部 名称
+     */
+    public static String getSubNameBySubid(String id){
+        RecordSet re=new RecordSet();
+        String subcompanyname="";
+        String sql="SELECT subcompanyname FROM HrmSubCompany where id='"+id+"'";
+        re.execute(sql);
+        while(re.next()){
+            subcompanyname= Util.null2String(re.getString("subcompanyname")).trim();
+        }
+        return subcompanyname;
+    }
+    /*
+    check 判断是否存在 未变更数据
+     */
+    public  static boolean checkChangeWf(String requestid,String bgrequestid){
+        bgrequestid= Util.null2String(bgrequestid).trim();
+        if("".equals(Util.null2String(requestid).trim())){
+            return false;
+        }
+        RecordSet re=new RecordSet();
+        String sql=" select a.requestid from formtable_main_107 a,workflow_requestbase b where a.requestid=b.requestid and b.currentnodetype in (1,2) and a.yzjljllc='"+requestid+"'" +
+                   " union all " +
+                   " select a.requestid from formtable_main_108 a,workflow_requestbase b where a.requestid=b.requestid and b.currentnodetype in (1,2) and a.yzjljllc='"+requestid+"'";
+        re.execute(sql);
+        while(re.next()){
+            String wfrequestid= Util.null2String("requestid").trim();
+            if(wfrequestid.equals(bgrequestid)){
+                continue;
+            }
+            return true;
+        }
+        return false;
+    }
+    /*
+    获取部门名称
+     */
+    public static String getDepNameByid(String id){
+        RecordSet re=new RecordSet();
+        String departmentname="";
+        String sql="select departmentname from HrmDepartment where id='"+id+"' ";
+        re.execute(sql);
+        while(re.next()){
+            departmentname= Util.null2String(departmentname).trim();
+        }
+        return departmentname;
+    }
+    /*
+        获取当前部门的顶级部门
+     */
+    public static String getTopDepBydepid(String depid){
+        String topdepid="";
+        RecordSet re=new RecordSet();
+        String sql="select * from hrmdepartment  where id='"+depid+"'";
+        re.execute(sql);
+        if(re.next()){
+            int supdepid= Util.getIntValue(re.getString("supdepid"),0);
+            if(supdepid>0){
+                topdepid=getTopDepBydepid(supdepid+"");
+            }else{
+                topdepid=depid+"";
+            }
+        }
+        return topdepid;
+    }
+    public static String getUUid(){
+        UUID uuid = UUID.randomUUID();
+        String id = UUID.randomUUID().toString();
+        return id;
+    }
+    /*
+        获取制表日期
+     */
+    public static String getCreateDate(){
+        String date="";
+        try{
+            SimpleDateFormat sim=new SimpleDateFormat("yyyy年MM月dd日");
+            date=sim.format(new java.util.Date());
+
+        }catch(Exception e){
+
+        }
+        return date;
+    }
+    public void printParams(Object[] obj){
+        if(obj!=null&& obj.length>0){
+            for(Object single:obj){
+
+            }
+        }
+
+    }
+    public static void main(String[] arg){
+            System.out.println(Arrays.toString(new Object[0]));
+    }
+}
diff --git a/src/main/youhong_ai_jitu_src/com/engine/demo/impl/CubeSaveInterccept.java b/src/main/youhong_ai_jitu_src/com/engine/demo/impl/CubeSaveInterccept.java
new file mode 100644
index 0000000..aa3b107
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/com/engine/demo/impl/CubeSaveInterccept.java
@@ -0,0 +1,316 @@
+package com.engine.demo.impl;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.weaverboot.frame.ioc.anno.classAnno.WeaIocReplaceComponent;
+import com.weaverboot.frame.ioc.anno.methodAnno.WeaReplaceAfter;
+import com.weaverboot.frame.ioc.handler.replace.weaReplaceParam.impl.WeaAfterReplaceParam;
+import selfdev.util.log.LogTool;
+import weaver.conn.RecordSet;
+import weaver.dateformat.DateTransformer;
+import weaver.general.Util;
+import weaver.hrm.HrmUserVarify;
+import weaver.hrm.User;
+import weaver.systeminfo.SystemEnv;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ *  拦截   建模数据保存  日志
+ */
+@WeaIocReplaceComponent
+public class CubeSaveInterccept {
+    private final static LogTool log = new LogTool("/log/TransField/",false);
+
+//    private static final String qyidField="field7267";//企业ID
+//    private static final String modiflyField="field7267";//修改的uuid  值  用于定位 修改 log
+//    private static final String bbrqField="field7267";//版本日期
+//    private static final String modeId="84";//拦截 模块
+//    public static final int CompanyMaintableFormid=-102;//企业主表 表ID
+    /** 生产 **/
+    private static final String modiflyField="field893767";//""field7267";//修改的uuid  值  用于定位 修改 log uat field677323
+    //private static final String qyidField="field7267";//企业ID
+    private static final String qyidField="field893807";//企业ID  uat field659381
+    //private static final String bbrqField="field7267";//版本日期
+    private static final String bbrqField="field893806";//版本日期 uat field659380
+    private static final String modeId="46040";//""84";//拦截 模块 uat 38501
+    public static final String CompanyMaintable="uf_jingneiqiyexinxi";//企业主表
+    public static final int CompanyMaintableFormid=-3055;//-102;//企业主表 表ID uat -1824
+    public static final String CompanyVersionMaintable="formtable_main_3055";//企业版本主表 uat formtable_main_1824
+    public static final String filterField=",operateType,detaildataid,fieldid,fieldvalue,detailtable,";
+
+
+    /** 生产 **/
+
+//    /** 测试 **/
+//    private static final String modiflyField="field677323";//""field7267";//修改的uuid  值  用于定位 修改 log uat field677323
+//    //private static final String qyidField="field7267";//企业ID
+//    private static final String qyidField="field659381";//企业ID  uat field659381
+//    //private static final String bbrqField="field7267";//版本日期
+//    private static final String bbrqField="field659380";//版本日期 uat field659380
+//    private static final String modeId="38501";//""84";//拦截 模块 uat 38501
+//    public static final String CompanyMaintable="uf_jingneiqiyexinxi";//企业主表
+//    public static final int CompanyMaintableFormid=-1824;//-102;//企业主表 表ID uat -1824
+//    public static final String CompanyVersionMaintable="formtable_main_1824";//企业版本主表 uat formtable_main_1824
+//    public static final String filterField=",operateType,detaildataid,fieldid,fieldvalue,detailtable,";
+//    /** 测试 **/
+
+    @WeaReplaceAfter(value = "/api/cube/new/card/doSubmit", order = 10010, description = "拦截   建模数据保存  日志")
+    public String cubeSaveInterccept(WeaAfterReplaceParam param){
+        /** 常规获取参数  **/
+        Map<String,Object> params= param.getParamMap();
+        HttpServletRequest req =param.getRequest();
+        HttpServletResponse resp =param.getResponse();
+        String demo =param.getData();
+        /** 只是拦截  type=2(编辑) 以及   modiflyField 字段不为空的 操作 **/
+        String type=(String)params.get("type");
+        String modeIdstr=(String)params.get("modeId");
+        String formId=(String)params.get("formId");
+        String billid=(String)params.get("billid");
+        if("2".equals(type)&&modeId.equals(modeIdstr)){
+            try{
+                //解析表单参数
+                log.writeLog("开始拦截!");
+                JSONObject FormJson= JSONObject.parseObject((String)params.get("JSONStr"));// ;
+                if(FormJson!=null&&FormJson.size()>0){
+                    log.writeLog(FormJson.toJSONString());
+                    String modiflyFieldValue= Util.null2String(FormJson.getString(modiflyField)).trim() ;
+                    if("".equals(modiflyFieldValue)){//为空不取日志数据
+                        return demo;
+                    }
+                    User user = HrmUserVarify.getUser(req, resp);
+                    TransField transField=new TransField(Util.getIntValue(formId,0),billid,user);
+                    transField.setQyid(Util.null2String(FormJson.getString(qyidField)).trim());//企业ID
+                    transField.setBbrq(Util.null2String(FormJson.getString(bbrqField)).trim());//版本日期
+                    getMainLog(modiflyFieldValue,transField);
+                }
+            }catch(Exception e){
+                log.writeLog("cubeSaveInterccept-->"+e.getMessage());
+            }
+        }
+        return demo;
+    }
+
+    public void getMainLog(String modiflyFieldValue,TransField transField){
+
+        RecordSet re=new RecordSet();
+        JSONObject valJSon=new JSONObject();
+        JSONObject detailValJSon=new JSONObject();//明细
+        String viewlogid="";
+        String sql="select * from ModeLogFieldDetail where viewlogid in (select viewlogid from ModeLogFieldDetail where modeid="+modeId+" and fieldid='"+(modiflyField.replaceAll("field",""))+"' and fieldvalue=?) and modeid="+modeId;
+        log.writeLog(modiflyFieldValue+""+sql);
+        re.executeQuery(sql,modiflyFieldValue);
+        while(re.next()){
+
+           viewlogid=Util.null2String(re.getString("viewlogid")).trim() ;
+           String fieldid=Util.null2String(re.getString("fieldid")).trim() ;
+           String fieldvalue= Util.null2String(re.getString("fieldvalue")).trim();
+           String PREFIELDVALUE=Util.null2String(re.getString("PREFIELDVALUE")).trim();
+           String detaildataid= Util.null2String(re.getString("detaildataid")).trim();
+           String operateType= Util.null2String(re.getString("operateType")).trim();//  operateType  EDIT，ADD
+           String detailtable= Util.null2String(re.getString("detailtable")).trim();
+
+           if(fieldid.equals(modiflyField.replaceAll("field",""))){
+                continue;
+           }
+           if("".equals(detaildataid)){
+               valJSon.put(fieldid,fieldvalue);//主表
+           }else{
+               if(!"EDIT".equals(operateType)&&!"ADD".equals(operateType)&&!"DEL".equals(operateType)){//目前只是处理编辑以及  新增  不处理删除
+                   continue;
+               }
+               /** 明细表 **/
+               String detailtableindex=detailtable.substring(detailtable.lastIndexOf("_")+1);//明细行的下标
+
+               JSONArray details= detailValJSon.getJSONArray(detailtableindex);
+               if(details==null||details.size()<=0){
+                   JSONArray demos=new JSONArray();
+                   JSONObject demo=new JSONObject();
+                   demo.put("operateType",operateType);
+                   demo.put("detailtable",detailtable);
+                   demo.put("detaildataid",detaildataid);
+                   demo.put(fieldid,fieldvalue);
+                   if("EDIT".equals(operateType)){
+                        /** 获取mainbillid **/
+                       demo.put("mainid",getMainbillid( detaildataid, detailtable))   ;
+                   }else if("DEL".equals(operateType)){
+                       if(detailtable.indexOf("dt2")>-1&&"893946".equals(fieldid)){
+                           demo.put("mainid",PREFIELDVALUE)   ;
+                       }else if(detailtable.indexOf("dt3")>-1&&"893947".equals(fieldid)){
+                           demo.put("mainid",PREFIELDVALUE)   ;
+                       }
+
+                   }
+                   demos.add(demo);
+                   detailValJSon.put(detailtableindex,demos);
+               }else{
+                   JSONObject demo=new JSONObject();
+                   demo.put("operateType",operateType);
+                   demo.put("detaildataid",detaildataid);
+                   demo.put("fieldid",fieldid);
+                   demo.put("fieldvalue",fieldvalue);
+                   demo.put("PREFIELDVALUE",PREFIELDVALUE);
+                   demo.put("detailtable",detailtable);
+                   setJSONArraySingle(details, demo);
+               }
+           }
+
+        }
+        transField.setViewlogid(viewlogid);
+        if(valJSon!=null&&valJSon.size()>0){
+            //获取 value 对应的值
+            JSONArray transFieldJSONs=new JSONArray();
+            Set<String> key=valJSon.keySet();
+            for(String str:key){
+                try {
+                   //JSONObject transFieldJSON=  ModeLogMainfield( viewlogid,Util.getIntValue(modeId,0),transField.getBillid(),str,valJSon.getString(str), transField);
+                   JSONObject transFieldJSON=  ModeLogMainfield( viewlogid,Util.getIntValue(modeId,0),str, transField);
+                   if(transFieldJSON!=null&&transFieldJSON.size()>0){
+                       transFieldJSONs.add(transFieldJSON);
+                   }
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+            if(transFieldJSONs.size()>0){
+                transField.setTransFieldJSONs(transFieldJSONs);
+            }
+        }
+        transField.updateCompanyInfo(valJSon,detailValJSon);//生产 sql
+        transField.updateallmodflyuuid();//更新明细
+    }
+    public JSONObject ModeLogMainfield(String viewlogid,int modeId,String fieldid,TransField transField) throws Exception {
+        return ModeLogMainfield(viewlogid,modeId,fieldid,transField,"","","");
+    }
+    //public JSONObject ModeLogMainfield(String viewlogid,int modeId,String billid,String fieldid,String value,TransField transField) throws Exception {
+    public JSONObject ModeLogMainfield(String viewlogid,int modeId,String fieldid,TransField transField,String detaildataid,String operateType,String detailtable) throws Exception {
+        RecordSet var3=new RecordSet();
+        String var4 = "select a.id,a.fieldid,a.fieldvalue,a.prefieldvalue,c.fieldlabel,c.fieldname,c.fieldhtmltype,c.type,c.fielddbtype,c.viewtype from ModeLogFieldDetail a left join workflow_billfield c on a.fieldid=c.id where a.viewlogid = " + viewlogid + " and a.modeid = " + modeId + " and (a.detailtable='' or a.detailtable is null) and fieldid="+fieldid;
+        if(!"".equals(detaildataid)){
+            var4=var4+" and detaildataid='"+detaildataid+"' and operateType='"+operateType+"' and  detailtable='"+detailtable+"'";
+        }
+        JSONObject var6 = new JSONObject();
+        var3.execute(var4);
+        while(var3.next()) {
+
+            String var7 = Util.null2String(var3.getString("fieldhtmltype"));
+            var6.put("htmltype", var7);
+            int var8 = Util.getIntValue(Util.null2String(var3.getString("type")));
+            var6.put("type", var8);
+            String var9 = Util.null2String(var3.getString("fielddbtype"));
+            var6.put("dbtype", var9);
+            String var10 = Util.null2String(var3.getString("fieldid"));
+            var6.put("fieldid", var10);
+            String var11 = Util.null2String(var3.getString("viewtype"));
+            var6.put("viewtype", var11);
+            String var12 = Util.null2String(var3.getString("fieldvalue"));
+            String var13 = Util.null2String(var3.getString("prefieldvalue"));
+            if (var8 == 290) {
+                var12 = (new DateTransformer()).getLocaleDateTime(var12);
+                var13 = (new DateTransformer()).getLocaleDateTime(var13);
+            }
+
+            var6.put("fieldvalue", var12);
+            var6.put("oldfieldvalue", var12);
+            var6.put("prefieldvalue", var13);
+            var6.put("oldprefieldvalue", var13);
+            String var14 = Util.null2String(SystemEnv.getHtmlLabelName(var3.getInt("fieldlabel"), 7));// 默认   中文
+            var6.put("labelname", var14);
+            String var15 = Util.null2String(var3.getString("fieldname"));
+            var6.put("fieldname", var15);
+            var6.put("fieldlabelname", var14 + "(" + var15 + ")");
+            //此处需要用到 反设置机制
+            //transField.transFieldValue(fieldvalue, fieldhtmltype, fieldid, fielddbtype, viewtype, type)
+            String var16 = BaseUtil.Html2Text(Util.null2String(transField.transFieldValue(var12, var7, var10, var9, var11, var8))).replaceAll("&nbsp;","") ;
+            String var17 = BaseUtil.Html2Text(Util.null2String(transField.transFieldValue(var13, var7, var10, var9, var11, var8))).replaceAll("&nbsp;","") ;
+            if (!var16.equals(var17)) {
+                var6.put("fieldvalue", var16);
+                var6.put("prefieldvalue", var17);
+            }
+        }
+
+
+        return var6;
+    }
+
+    public void updateFormLog(JSONObject json,TransField transField){
+        if(json==null||json.size()<=0){
+            return;
+        }
+        /** 开始跟新 **/
+        String fieldname=Util.null2String(json.getString("fieldname")) ;
+        String fieldvalue=Util.null2String(json.getString("fieldvalue"));
+
+    }
+
+    /**
+     * 将 一个json字段信息 拆入到已有的明细表行 根据 detaildataid 来判断
+     * @param jsons
+     * @param demo
+     */
+    public void setJSONArraySingle(JSONArray jsons,JSONObject demo){
+        if(jsons==null||jsons.size()<=0||demo==null||demo.size()<=0){
+            return;
+        }
+        String detaildataid=Util.null2String(demo.getString("detaildataid")).trim() ;
+        if("".equals(detaildataid)){
+            return;
+        }
+        boolean isvali=false;
+        for(int  i=0;i<jsons.size();i++){
+            JSONObject demo1= jsons.getJSONObject(i);
+            if(demo1==null||demo1.size()<=0){
+                continue;
+            }
+            String demo1detaildataid=Util.null2String(demo1.getString("detaildataid")) ;
+            if(demo1detaildataid.equals(detaildataid)){
+                //fieldid,fieldvalue
+                demo1.put(demo.getString("fieldid"),demo.getString("fieldvalue"));
+                if("DEL".equals(demo.getString("operateType"))){
+                    if(demo.getString("detailtable").indexOf("dt2")>-1&&"893946".equals(demo.getString("fieldid"))){
+                        demo.put("mainid",demo.getString("PREFIELDVALUE"))   ;
+                    }else if(demo.getString("detailtable").indexOf("dt3")>-1&&"893947".equals(demo.getString("fieldid"))){
+                        demo.put("mainid",demo.getString("PREFIELDVALUE"))   ;
+                    }
+
+                }
+                isvali=true;
+                break;
+            }
+        }
+        if(!isvali){
+            //不存在 则新能数据
+            JSONObject demo2=new JSONObject();
+            demo2.put("operateType",demo.getString("operateType"));
+            demo2.put("detailtable",demo.getString("detailtable"));
+            demo2.put("detaildataid",demo.getString("detaildataid"));
+            demo2.put(demo.getString("fieldid"),demo.getString("fieldvalue"));
+            if("EDIT".equals(demo.getString("operateType"))){
+                /** 获取mainbillid **/
+                demo2.put("mainid",getMainbillid( detaildataid,demo.getString("detailtable") ))   ;
+            }else if("DEL".equals(demo.getString("operateType"))){
+                if(demo.getString("detailtable").indexOf("dt2")>-1&&"893946".equals(demo.getString("fieldid"))){
+                    demo.put("mainid",demo.getString("PREFIELDVALUE"))   ;
+                }else if(demo.getString("detailtable").indexOf("dt3")>-1&&"893947".equals(demo.getString("fieldid"))){
+                    demo.put("mainid",demo.getString("PREFIELDVALUE"))   ;
+                }
+
+            }
+            jsons.add(demo2);
+        }
+    }
+
+    public String getMainbillid(String detaildataid,String table){
+        String mainbillid="";
+        RecordSet re=new RecordSet();
+        re.executeQuery("select mainbillid from  "+table+" where id="+detaildataid);
+        if(re.next()){
+            mainbillid=Util.null2String(re.getString("mainbillid"))   ;
+        }
+        return mainbillid;
+    }
+
+}
diff --git a/src/main/youhong_ai_jitu_src/com/engine/demo/impl/HistoryDetail.java b/src/main/youhong_ai_jitu_src/com/engine/demo/impl/HistoryDetail.java
new file mode 100644
index 0000000..df58b3b
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/com/engine/demo/impl/HistoryDetail.java
@@ -0,0 +1,456 @@
+package com.engine.demo.impl;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import selfdev.util.log.LogTool;
+import weaver.conn.RecordSet;
+import weaver.general.Util;
+
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+/**
+ * 历史数据拆分表
+ *
+ */
+public class HistoryDetail {
+    private final static LogTool log = new LogTool("/log/TransField/",false);
+    private TransField transField=null;
+    private JSONObject detailValJSon=null;
+
+    public HistoryDetail(TransField transField,JSONObject detailValJSon){
+        this.transField=transField;
+        this.detailValJSon=detailValJSon;
+    }
+    //明细变更
+    /**
+     * 如果存在明细表的变更的话 则需要对 版本的历史沿革以及 版本的 明细数据 以及  企业信息表的数据 做变更
+     * 1).当前版本是最新的(跟新历史最新的数据只是跟新最新的一条数据  跟新主表数据)
+     * 2).当前版本是中间的版本(1不存在修改则更新所有之后的明细数据 以及跟新当前版本以及之后的所有新历史沿革最新的变更后数据   更新主表数据，2存在版本)
+     *如果 当前版本是之后的版本 只要跟新  历史沿革
+     * **/
+    public void DetailSplit(){
+        SimpleDateFormat sim=new SimpleDateFormat("yyyy-MM-dd");
+        String currentDate=sim.format(new Date());
+        String AllVersionid= transField.getAllVersionid();//当前版本之后的所有版本
+        String getOldAllVersion=transField.getOldAllVersion();//当前版本的 前版本
+        log.writeLog("AllVersionid-->"+AllVersionid);
+        log.writeLog("getOldAllVersion-->"+getOldAllVersion);
+        List<Map<String,Object>> sqlmaps=transField.getSqlmaps();
+        String allmodflyuuid="";//所有的 新增明细的uuid
+        if(detailValJSon!=null&&detailValJSon.size()>0){
+            log.writeLog(detailValJSon.toJSONString());
+            Set<String> detailKey= detailValJSon.keySet();
+            for(String table:detailKey){
+                JSONArray tableDatas=detailValJSon.getJSONArray(table);
+                String detailtabledesc="";//明细列描述
+                String detailtableValue="";//所有的明细值
+                String changeID="";//当前版本最后一次变更的ID
+                String oldchangeID="";//当前版本之前最后一次变更的ID
+                String currentVersionChange="";
+                if(tableDatas!=null&&tableDatas.size()>0){
+
+                    //此处插入的是 正式的数据   版本以及  企业信息
+
+                    for(int k=0;k<tableDatas.size();k++){
+                        JSONObject K=tableDatas.getJSONObject(k);
+                        if(K!=null&&K.size()>0){
+                            //开始遍历sql
+                            String detaildataid= Util.null2String(K.getString("detaildataid")).trim() ;
+                            String operateType=Util.null2String(K.getString("operateType")).trim() ;
+                            log.writeLog("operateType--->"+operateType);
+                            String mainid=Util.null2String(K.getString("mainid")).trim() ;
+                            String detailtable=Util.null2String(K.getString("detailtable")).trim() ;
+                            String betoowID="";//中间数据
+                            String betoowOldID="";//前面版本的中间数据
+                            //if("".equals(detailtabledesc)){
+                                detailtabledesc= transField.getFeildnameByNames(TransField.detailField.getString(detailtable+"desc"),CubeSaveInterccept.CompanyMaintableFormid);//获取字段的描述
+                                detailtableValue=transField.getDetailAllValue(detailtable,TransField.detailField.getString(detailtable+"desc"),transField.getBillid());
+                                changeID=transField.checkDetailFieldCheck(AllVersionid,detailtabledesc,1);//checkFieldCheck(AllVersionid, detailtabledesc);//变更版本
+                                oldchangeID=transField.checkDetailFieldCheck(getOldAllVersion,detailtabledesc,0);
+                                currentVersionChange=transField.checkDetailFieldCheck(transField.getBillid(),detailtabledesc,1);//获取中间版本
+                                betoowID=transField.getBetoowVersion(transField.getBillid(),changeID, AllVersionid);// currentVersionChange
+                                betoowOldID=transField.getBetoowVersion(oldchangeID,transField.getBillid(), getOldAllVersion);
+                                if(!"".equals(betoowOldID)){
+                                    //需要添加 之前的数据  betoowOldID
+                                    betoowOldID=oldchangeID+","+betoowOldID;
+                                }
+                                log.writeLog("detailtabledesc"+detailtabledesc);
+                                log.writeLog("detailtableValue"+detailtableValue);
+                                log.writeLog("changeID"+changeID);
+                                log.writeLog("oldchangeID"+oldchangeID);
+                                log.writeLog("currentVersionChange"+currentVersionChange);
+                                log.writeLog("betoowID"+betoowID);
+                                log.writeLog("betoowOldID"+betoowOldID);
+
+                            //}
+                            Set<String> kkey= K.keySet();
+                            if("EDIT".equals(operateType)){//编辑  &&!"".equals(mainid)  暂时去掉 mainid
+                                Map<String,Object> map=new HashMap<>();
+                                String fieldsql="";
+                                String insertsql="";
+                                String insertsqlsplit="";
+                                Object[] kparams=new Object[0];
+                                for(String mykey:kkey){
+                                    String fieldname=transField.getFieldNameByid(mykey);
+                                    if(CubeSaveInterccept.filterField.indexOf(","+fieldname+",")>-1||CubeSaveInterccept.filterField.indexOf(","+mykey+",")>-1||"".equals(fieldname)){
+                                        continue;
+                                    }
+                                    //log.writeLog(fieldname);
+                                    fieldsql=fieldsql+fieldname+"=?,";
+                                    insertsql=insertsql+fieldname+",";
+                                    insertsqlsplit=insertsqlsplit+"?,";
+                                    kparams = Arrays.copyOf(kparams, (kparams.length+1));
+                                    kparams[kparams.length-1] = K.get(mykey);
+                                }
+                                if(fieldsql.endsWith(",")){
+                                    fieldsql=fieldsql.substring(0,fieldsql.length()-1);
+                                }
+                                if(insertsql.endsWith(",")){
+                                    insertsql=insertsql.substring(0,insertsql.length()-1);
+                                }
+                                log.writeLog("Edit   fieldsql-->"+fieldsql);
+                                if(insertsqlsplit.endsWith(",")){
+                                    insertsqlsplit=insertsqlsplit.substring(0,insertsqlsplit.length()-1);
+                                }
+                                if("".equals(AllVersionid)||"".equals(changeID)){//当前的最新版本
+                                    //插入企业信息主表
+                                    Map<String,Object> map1=new HashMap<>();
+                                    map1.put("sql","update "+CubeSaveInterccept.CompanyMaintable+"_"+table+" set "+fieldsql+" where id="+mainid);
+                                    map1.put("params",kparams);
+                                    sqlmaps.add(map1);
+                                }
+                                if("".equals(currentVersionChange)&&"".equals(oldchangeID)){
+
+                                }
+                                if(!"".equals(betoowID)||("".equals(betoowID)&&"".equals(changeID)&&!"".equals(AllVersionid))){//存在之后的中间版本
+                                    if("".equals(betoowID)&&"".equals(changeID)&&!"".equals(AllVersionid)){
+                                        betoowID=   AllVersionid;
+                                    }
+                                    String[] betoowIDs=betoowID.split(",");
+                                    for(String be:betoowIDs){
+                                        if("".equals(Util.null2String(be).trim())){
+                                            continue;
+                                        }
+                                        Map<String,Object> map1=new HashMap<>();
+                                        //map1.put("sql","update "+CubeSaveInterccept.CompanyMaintable+"_"+table+" set "+fieldsql+" where id="+be+" and mainbillid="+mainid);
+                                        map1.put("sql","update "+CubeSaveInterccept.CompanyVersionMaintable+"_"+table+" set "+fieldsql+" where mainid="+be+" and mainbillid="+mainid);
+                                        map1.put("params",kparams);
+                                        sqlmaps.add(map1);
+                                    }
+                                }
+                                //跟新之前版本的版本数据以及  历史沿革
+                                if(!"".endsWith(betoowOldID)&&"".equals(currentVersionChange)){
+                                    String[] betoowOldIDs=betoowOldID.split(",");
+                                    for(String be:betoowOldIDs){
+                                        if("".equals(Util.null2String(be).trim())){
+                                            continue;
+                                        }
+                                        String whereSql=getDeleteSqlWhere( detaildataid, table);
+                                        if("".equals(whereSql)){
+                                            continue;
+                                        }
+                                        Map<String,Object> map1=new HashMap<>();
+                                        //map1.put("sql","update "+CubeSaveInterccept.CompanyMaintable+"_"+table+" set "+fieldsql+" where id="+be+" and mainbillid="+mainid);
+                                        map1.put("sql","update "+CubeSaveInterccept.CompanyVersionMaintable+"_"+table+" set "+fieldsql+" where mainid="+be+" and "+whereSql);
+                                        map1.put("params",kparams);
+                                        sqlmaps.add(map1);
+                                    }
+                                }
+
+                            }else if("ADD".equals(operateType)){//新建
+                                Map<String,Object> map=new HashMap<>();
+                                String fieldsql="";
+                                String splitsql="";
+                                Object[] kparams=new Object[0];
+                                Object[] kinsertparams=new Object[0];
+                                String  modflyuuid= UUID.randomUUID().toString();
+                                allmodflyuuid=allmodflyuuid+table+","+modflyuuid+",";
+                                for(String mykey:TransField.detailField.getString(detailtable).split(",")){
+                                    String fieldname=mykey;//transField.getFieldNameByid(mykey);
+                                    if(CubeSaveInterccept.filterField.indexOf(","+fieldname+",")>-1||CubeSaveInterccept.filterField.indexOf(","+mykey+",")>-1){
+                                        continue;
+                                    }
+                                    fieldsql=fieldsql+fieldname+",";
+                                    splitsql=splitsql+"?,";
+                                    kparams = Arrays.copyOf(kparams, (kparams.length+1));
+                                    kparams[kparams.length-1] = K.get(this.transField.getSingleFieldIdByName(mykey,detailtable));
+
+                                }
+                                fieldsql=fieldsql+"modflyuuid,mainid";
+                                splitsql=splitsql+"?,?";
+                                kparams = Arrays.copyOf(kparams, (kparams.length+1));
+                                kparams[kparams.length-1] = modflyuuid;
+                                kparams = Arrays.copyOf(kparams, (kparams.length+1));
+                                kparams[kparams.length-1] = this.transField.getQyid();
+
+                                if(fieldsql.endsWith(",")){
+                                    fieldsql=fieldsql.substring(0,fieldsql.length()-1);
+                                }
+                                if(splitsql.endsWith(",")){
+                                    splitsql=splitsql.substring(0,splitsql.length()-1);
+                                }
+//                                map.put("sql","insert into "+CubeSaveInterccept.CompanyMaintable+"_"+table+"("+fieldsql+") values("+splitsql+") ");
+//                                map.put("params",kparams);
+//                                sqlmaps.add(map);
+//                                //新增的同时需要 修改 mainbillid
+//                                map.put("sql","update "+CubeSaveInterccept.CompanyVersionMaintable+"_"+table+"  set mainbillid=(select id from "+CubeSaveInterccept.CompanyMaintable+"_"+table+" where modflyuuid=?) where id="+mainid);
+//                                map.put("params",new Object[]{modflyuuid});
+//                                sqlmaps.add(map);
+                                if("".equals(AllVersionid)){//
+                                    //插入企业信息主表
+                                    map.put("sql","insert into "+CubeSaveInterccept.CompanyMaintable+"_"+table+"("+fieldsql+",qymc1) values("+splitsql+",?) ");
+                                    kparams = Arrays.copyOf(kparams, (kparams.length+1));
+                                    kparams[kparams.length-1] = this.transField.getQyid();
+                                    map.put("params",kparams);
+                                    sqlmaps.add(map);
+                                    //新增的同时需要 修改 mainbillid
+                                    Map<String,Object> map2=new HashMap<>();
+                                    map2.put("sql","update "+CubeSaveInterccept.CompanyVersionMaintable+"_"+table+"  set mainbillid=(select id from "+CubeSaveInterccept.CompanyMaintable+"_"+table+" where modflyuuid=?) where id="+detaildataid);
+                                    map2.put("params",new Object[]{modflyuuid});
+                                    sqlmaps.add(map2);
+                                }else{
+                                    if(!"".equals(betoowID)||("".equals(betoowID)&&"".equals(changeID)&&!"".equals(AllVersionid))){//存在之后的中间版本
+                                        String oldbetoowID=betoowID;//记住之前的 betoowID
+                                        if("".equals(betoowID)&&"".equals(changeID)&&!"".equals(AllVersionid)){
+                                            betoowID=   AllVersionid;
+                                        }
+                                        String[] betoowIDs=betoowID.split(",");
+                                        for(String be:betoowIDs){
+                                            if("".equals(Util.null2String(be).trim())){
+                                                continue;
+                                            }
+                                            Map<String,Object> map3=new HashMap<>();
+                                            map3.put("sql","insert into "+CubeSaveInterccept.CompanyVersionMaintable+"_"+table+"("+fieldsql+") values("+splitsql+") ");
+                                            Object[] kparamss=getNewObjects(kparams);
+                                            kparamss = Arrays.copyOf(kparamss, (kparamss.length+1));
+                                            kparamss[kparamss.length-1] = modflyuuid;
+                                            kparamss = Arrays.copyOf(kparamss, (kparamss.length+1));
+                                            kparamss[kparamss.length-1] = be;
+                                            map3.put("params",kparamss);
+                                            sqlmaps.add(map3);
+                                        }
+                                        //先插入主表 在删除
+                                        Map<String,Object> mainMap=new HashMap<>();
+                                        mainMap.put("sql","insert into "+CubeSaveInterccept.CompanyMaintable+"_"+table+"("+fieldsql+",qymc1) values("+splitsql+",?) ");
+                                        Object[] mainMapparams = Arrays.copyOf(kparams, (kparams.length+1));
+                                        mainMapparams[mainMapparams.length-1] = this.transField.getQyid();
+                                        mainMap.put("params",mainMapparams);
+                                        sqlmaps.add(mainMap);
+                                        //修改 关联企业信息表ID
+                                        Map<String,Object> map2=new HashMap<>();
+                                        map2.put("sql","update "+CubeSaveInterccept.CompanyVersionMaintable+"_"+table+"  set mainbillid=(select id from "+CubeSaveInterccept.CompanyMaintable+"_"+table+" where modflyuuid=?) where mainid in ("+betoowID+") and modflyuuid=?");
+                                        map2.put("params",new Object[]{modflyuuid,modflyuuid});
+                                        sqlmaps.add(map2);
+                                        //删除
+                                        if(!"".equals(oldbetoowID)){
+                                            Map<String,Object> deletemap=new HashMap<>();
+                                            deletemap.put("sql","delete from "+CubeSaveInterccept.CompanyMaintable+"_"+table+"  where  modflyuuid=? and mainid="+this.transField.getQyid());
+                                            deletemap.put("params",new Object[]{modflyuuid});
+                                            sqlmaps.add(deletemap);
+                                        }
+                                    }
+                                    if(!"".endsWith(betoowOldID)&&"".equals(currentVersionChange)){
+                                        String[] betoowOldIDs=betoowOldID.split(",");
+                                        for(String be:betoowOldIDs){
+                                            if("".equals(Util.null2String(be).trim())){
+                                                continue;
+                                            }
+                                            Map<String,Object> map3=new HashMap<>();
+                                            map3.put("sql","insert into "+CubeSaveInterccept.CompanyVersionMaintable+"_"+table+"("+fieldsql+") values("+splitsql+",?) ");
+                                            Object[] kparamss=getNewObjects(kparams);
+                                            kparamss = Arrays.copyOf(kparamss, (kparamss.length+1));
+                                            kparamss[kparamss.length-1] = modflyuuid;
+                                            kparamss = Arrays.copyOf(kparamss, (kparamss.length+1));
+                                            kparamss[kparamss.length-1] = be;
+                                            map3.put("params",kparamss);
+                                            //sqlmaps.add(map3);  之前的数据不做处理
+                                        }
+                                    }
+                                }
+                            }else if("DEL".equals(operateType)){//删除
+                                Map<String,Object> map=new HashMap<>();
+                                String fieldsql="";
+                                String splitsql="";
+                                Object[] kparams=new Object[0];
+                                Object[] kinsertparams=new Object[0];
+                                String  modflyuuid= UUID.randomUUID().toString();
+                                allmodflyuuid=allmodflyuuid+table+","+modflyuuid+",";
+                                for(String mykey:TransField.detailField.getString(detailtable).split(",")){
+                                    String fieldname=mykey;//transField.getFieldNameByid(mykey);
+                                    if(CubeSaveInterccept.filterField.indexOf(","+fieldname+",")>-1||CubeSaveInterccept.filterField.indexOf(","+mykey+",")>-1){
+                                        continue;
+                                    }
+                                    fieldsql=fieldsql+fieldname+",";
+                                    splitsql=splitsql+"?,";
+                                    kparams = Arrays.copyOf(kparams, (kparams.length+1));
+                                    kparams[kparams.length-1] = K.get(this.transField.getSingleFieldIdByName(mykey,detailtable));
+
+                                }
+                                fieldsql=fieldsql+"modflyuuid,mainid";
+                                splitsql=splitsql+"?,?";
+                                kparams = Arrays.copyOf(kparams, (kparams.length+1));
+                                kparams[kparams.length-1] = modflyuuid;
+                                kparams = Arrays.copyOf(kparams, (kparams.length+1));
+                                kparams[kparams.length-1] = this.transField.getQyid();
+
+                                if(fieldsql.endsWith(",")){
+                                    fieldsql=fieldsql.substring(0,fieldsql.length()-1);
+                                }
+                                if(splitsql.endsWith(",")){
+                                    splitsql=splitsql.substring(0,splitsql.length()-1);
+                                }
+                                if("".equals(AllVersionid)){//
+                                    //删除企业信息表数据
+                                    //map.put("sql","insert into "+CubeSaveInterccept.CompanyMaintable+"_"+table+"("+fieldsql+") values("+splitsql+") ");
+                                    map.put("sql","delete from "+CubeSaveInterccept.CompanyMaintable+"_"+table+" where id=?");
+                                    map.put("params",new Object[]{mainid});
+                                    sqlmaps.add(map);
+
+                                }else{
+                                    if(!"".equals(betoowID)||("".equals(betoowID)&&"".equals(changeID)&&!"".equals(AllVersionid))){//存在之后的中间版本
+                                        if("".equals(betoowID)&&"".equals(changeID)&&!"".equals(AllVersionid)){
+                                            betoowID=   AllVersionid;
+                                        }
+                                        String[] betoowIDs=betoowID.split(",");
+                                        for(String be:betoowIDs){
+                                            if("".equals(Util.null2String(be).trim())){
+                                                continue;
+                                            }
+                                            String whereSql=getDeleteSqlWhere( detaildataid, table);
+                                            if("".equals(whereSql)){
+                                                continue;
+                                            }
+                                            Map<String,Object> map3=new HashMap<>();
+                                            //map3.put("sql","insert into "+CubeSaveInterccept.CompanyVersionMaintable+"_"+table+"("+fieldsql+",mainid) values("+splitsql+",?) ");
+                                            map3.put("sql","delete from "+CubeSaveInterccept.CompanyVersionMaintable+"_"+table+" where mainid=? and "+whereSql);
+//                                            Object[] kparamss=getNewObjects(kparams);
+//                                            kparamss = Arrays.copyOf(kparamss, (kparamss.length+1));
+//                                            kparamss[kparamss.length-1] = modflyuuid;
+//                                            kparamss = Arrays.copyOf(kparamss, (kparamss.length+1));
+//                                            kparamss[kparamss.length-1] = be;
+                                            map3.put("params",new Object[]{be});
+                                            sqlmaps.add(map3);
+                                        }
+                                    }
+                                    if(!"".endsWith(betoowOldID)&&"".equals(currentVersionChange)){
+                                        String[] betoowOldIDs=betoowOldID.split(",");
+                                        for(String be:betoowOldIDs){
+                                            if("".equals(Util.null2String(be).trim())){
+                                                continue;
+                                            }
+                                            String whereSql=getDeleteSqlWhere( detaildataid, table);
+                                            if("".equals(whereSql)){
+                                                continue;
+                                            }
+                                            Map<String,Object> map3=new HashMap<>();
+                                            //map3.put("sql","insert into "+CubeSaveInterccept.CompanyVersionMaintable+"_"+table+"("+fieldsql+",mainid) values("+splitsql+",?) ");
+                                            map3.put("sql","delete from "+CubeSaveInterccept.CompanyVersionMaintable+"_"+table+" where mainid=? and "+whereSql);
+//                                            Object[] kparamss=getNewObjects(kparams);
+//                                            kparamss = Arrays.copyOf(kparamss, (kparamss.length+1));
+//                                            kparamss[kparamss.length-1] = modflyuuid;
+//                                            kparamss = Arrays.copyOf(kparamss, (kparamss.length+1));
+//                                            kparamss[kparamss.length-1] = be;
+                                            map3.put("params",new Object[]{be});
+                                            sqlmaps.add(map3);
+                                        }
+                                    }
+                                }
+                            }
+                            //不管是跟新和编辑 都涉及到  历史沿革数据的修改
+                            /**
+                             * 如果存在明细表的变更的话 则需要对 版本的历史沿革以及 版本的 明细数据 以及  企业信息表的数据 做变更
+                             * 1).当前版本是最新的(跟新历史最新的数据只是跟新最新的一条数据  跟新主表数据)
+                             * 2).当前版本是中间的版本(1不存在修改则更新所有之后的明细数据 以及跟新当前版本以及之后的所有新历史沿革最新的变更后数据   更新主表数据，2存在版本)
+                             *如果 当前版本是之后的版本 只要跟新  历史沿革
+                             * **/
+                            if("".equals(AllVersionid)){//为空则是最新的版本
+                                //如果存在 之前的变更 那么需要跟新  需要建立在  当前版本 没有变更过 明细的值
+//                                if(!"".equals(oldchangeID)&&"".equals(currentVersionChange)){
+//                                    Map<String,Object> map=new HashMap<>();
+//                                    map.put("sql","update "+CubeSaveInterccept.CompanyVersionMaintable+"_"+table+"  set  bgh=? where  mainid="+oldchangeID+" and bgxm=?");
+//                                    map.put("params",new Object[]{detailtableValue,detailtabledesc});
+//                                    sqlmaps.add(map);
+//                                }
+                                //当前版本的 变更后
+                                if(!"".equals(currentVersionChange)) {
+                                    Map<String, Object> map1 = new HashMap<>();
+                                    map1.put("sql", "update " + CubeSaveInterccept.CompanyVersionMaintable + "_dt1  set  bgh=? where id in (select max(id) from "+CubeSaveInterccept.CompanyVersionMaintable+"_dt1 where mainid=" + transField.getBillid() + " and bgxm=?)  ");
+                                    map1.put("params", new Object[]{detailtableValue, detailtabledesc});
+                                    sqlmaps.add(map1);
+                                }else{
+                                    //新增历史沿革  不考虑变更 前面的 数据
+                                    if(!"".equals(oldchangeID)){
+                                        Map<String, Object> map2 = new HashMap<>();
+                                        map2.put("sql", "insert into "+CubeSaveInterccept.CompanyVersionMaintable+"_dt1(rq,bgxm,bgq,bgh,mainid)values(?,?,?,?,?) ");
+                                        map2.put("params", new Object[]{currentDate, detailtabledesc,transField.getDetailAllValue(detailtable,TransField.detailField.getString(detailtable),oldchangeID),detailtabledesc,transField.getBillid()});
+                                        sqlmaps.add(map2);
+                                    }
+                                }
+
+                            }else{
+                                //中间版本
+                                if(!"".equals(oldchangeID)&&"".equals(currentVersionChange)){//更新之前的数据
+                                    Map<String,Object> map=new HashMap<>();
+                                    map.put("sql","update "+CubeSaveInterccept.CompanyVersionMaintable+"_dt1  set  bgh=? where  mainid="+oldchangeID+" and bgxm=?");
+                                    map.put("params",new Object[]{detailtableValue,detailtabledesc});
+                                    sqlmaps.add(map);
+                                }else if(!"".equals(currentVersionChange)){
+                                    Map<String, Object> map1 = new HashMap<>();
+                                    map1.put("sql", "update " + CubeSaveInterccept.CompanyVersionMaintable + "_dt1  set  bgh=? where id in (select max(id) from "+CubeSaveInterccept.CompanyVersionMaintable+"_dt1 where mainid=" + transField.getBillid() + " and bgxm=?)  ");
+                                    map1.put("params", new Object[]{detailtableValue, detailtabledesc});
+                                    sqlmaps.add(map1);
+                                }
+                                if(!"".equals(changeID)){//之后版本
+                                    Map<String,Object> map=new HashMap<>();
+                                    map.put("sql","update "+CubeSaveInterccept.CompanyVersionMaintable+"_dt1  set  bgq=? where id in (select min(id)  from "+CubeSaveInterccept.CompanyVersionMaintable+"_dt1 where mainid="+changeID+" and bgxm=?)  ");
+                                    map.put("params",new Object[]{detailtableValue,detailtabledesc});
+                                    sqlmaps.add(map);
+                                }
+                            }
+                        }
+
+                    }
+                }
+            }
+        }
+    }
+
+    public Object[] getNewObjects(Object[] objs){
+        Object[] newobjs=new Object[0];
+        if(objs!=null){
+            for(Object demo:objs){
+                newobjs = Arrays.copyOf(newobjs, (newobjs.length+1));
+                newobjs[newobjs.length-1] = demo;
+            }
+        }
+        return newobjs;
+    }
+
+    public String getDeleteSqlWhere(String detailid,String table){
+        String whereSql="";
+        RecordSet re=new RecordSet();
+        String sql="select * from "+CubeSaveInterccept.CompanyVersionMaintable+"_"+table +" where id="+detailid;
+        log.writeLog(sql);
+        re.execute(sql);
+        if(re.next()){
+           String modflyuuid=Util.null2String(re.getString("modflyuuid")).trim()  ;//mainbillid
+           String mainbillid=Util.null2String( re.getString("mainbillid")).trim();//mainbillid
+            if(!"".equals(modflyuuid)){
+                whereSql=whereSql+" modflyuuid='"+modflyuuid+"' ";
+            }
+            if(!"".equals(modflyuuid)&&!"".equals(mainbillid)){
+                whereSql=whereSql+" or mainbillid='"+mainbillid+"' ";
+            }else{
+                if(!"".equals(mainbillid)){
+                    whereSql=whereSql+" mainbillid='"+mainbillid+"' ";
+                }
+            }
+        }
+        if(!"".equals(whereSql)){
+            whereSql="("+whereSql+")";
+        }
+        return whereSql;
+    }
+
+}
diff --git a/src/main/youhong_ai_jitu_src/com/engine/demo/impl/TransField.java b/src/main/youhong_ai_jitu_src/com/engine/demo/impl/TransField.java
new file mode 100644
index 0000000..a676389
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/com/engine/demo/impl/TransField.java
@@ -0,0 +1,966 @@
+package com.engine.demo.impl;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.api.cube.util.CubeSearchTransMethod;
+import selfdev.util.log.LogTool;
+import weaver.conn.RecordSet;
+import weaver.docs.docs.DocImageManager;
+import weaver.general.ThreadVarLanguage;
+import weaver.general.Util;
+import weaver.hrm.User;
+import weaver.soa.workflow.request.Property;
+import weaver.systeminfo.SystemEnv;
+
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+public class TransField {
+    private final static LogTool log = new LogTool("/log/TransField/",false);
+    private int formId;
+    private int modeId;
+    private int type;
+    private int layoutid;
+    private User user;
+    private String billid;
+    private String qyid="";//企业ID
+    private String bbrq="";//日期
+    private String viewlogid="";
+    private String allVersionid="";//当前版本之后的所有的版本
+    //private String betoowID="";//中间版本
+    private String allmodflyuuid="";//所有新增明细的uuid
+
+    private boolean isModifyClrq=false;//判断是否是修改了成立日期
+    private String newclrq="";//新成立日期
+
+    private JSONArray transFieldJSONs=new JSONArray();
+    private List<Map<String,Object>> sqlmaps=new ArrayList<>();
+    static JSONObject detailField=new JSONObject();
+
+    static{
+//        detailField.put("uf_configField_dt1","cs1,cs2");
+//        detailField.put("uf_configField_dt1desc","cs1,cs2");
+//        detailField.put("uf_configField_dt2","cs3,cs4");
+//        detailField.put("uf_configField_dt2desc","cs3,cs4");
+
+//        uat
+//        detailField.put("formtable_main_1824_dt2","djgd,cgbl,cgfs,gfzl");
+//        detailField.put("formtable_main_1824_dt2desc","djgd,cgbl,cgfs,gfzl,bz");
+//        detailField.put("formtable_main_1824_dt3","zzzz");
+//        detailField.put("formtable_main_1824_dt3desc","zzzz");
+        //登记股东/持股比例/持股份数/股份种类  生产
+        detailField.put("formtable_main_3055_dt2","djgd,cgbl,cgfs,gfzl,bz");
+        detailField.put("formtable_main_3055_dt2desc","djgd,cgbl,cgfs,gfzl");
+        detailField.put("formtable_main_3055_dt3","zzzz,fjsc,bz");
+        detailField.put("formtable_main_3055_dt3desc","zzzz");
+    }
+    public TransField(int formId,String billid,User user){
+        this.formId=formId;
+        this.billid=billid;
+        this.user=user;
+    }
+    public TransField(){
+    }
+    public String transFieldValue(String var1, JSONObject fieldjson) throws Exception {
+        if(fieldjson==null||fieldjson.size()<=0){
+            return var1;
+        }
+        //(fieldvalue, fieldhtmltype, fieldid, fielddbtype, viewtype, type)
+        log.writeLog("begin！");
+        log.writeLog(fieldjson.getString("fieldhtmltype")+"==="+fieldjson.getString("fieldid")+"==="+fieldjson.getString("fielddbtype")+"==="+fieldjson.getString("viewtype")+"==="+Util.getIntValue(fieldjson.getString("type"),0));
+        return transFieldValue(var1,fieldjson.getString("fieldhtmltype"),fieldjson.getString("fieldid"),fieldjson.getString("fielddbtype"),fieldjson.getString("viewtype"),Util.getIntValue(fieldjson.getString("type"),0) );
+    }
+    public String transFieldValue(String var1, String var2, String var3, String var4, String var5, int var6) throws Exception {
+        CubeSearchTransMethod var7 = CubeSearchTransMethod.INSTANCE;
+        String var8 = "";
+        RecordSet var9 = new RecordSet();
+        if (var2.equals("6")) {
+            DocImageManager var10 = new DocImageManager();
+            if (!var1.equals("")) {
+                ArrayList var11 = Util.TokenizerString(var1, ",");
+                int var12 = -1;
+
+                for(int var13 = 0; var13 < var11.size(); ++var13) {
+                    ++var12;
+                    if (var12 > 0) {
+                        var8 = var8 + "<br>";
+                    }
+                    String var14 = Util.null2String(var11.get(var13));
+                    String var15 = "select id,docsubject,accessorycount from docdetail where id = " + var14 + " order by id asc";
+                    var9.executeSql(var15);
+                    if (!var9.next()) {
+                        var8 = var8 + "<a href=\"#\">ID:" + var14 + SystemEnv.getHtmlLabelName(384364, this.user.getLanguage()) + "</a>";
+                    } else {
+                        String var16 = Util.null2String(var9.getString(1));
+                        String var17 = Util.toScreen(var9.getString(2), this.user.getLanguage());
+                        int var18 = var9.getInt(3);
+                        var10.resetParameter();
+                        var10.setDocid(Integer.parseInt(var16));
+                        var10.selectDocImageInfo();
+                        String var19 = "";
+                        String var20 = "";
+                        String var21 = "";
+                        if (var10.next()) {
+                            var19 = var10.getImagefileid();
+                            var20 = var10.getImagefilename();
+                            var21 = var20.substring(var20.lastIndexOf(".") + 1).toLowerCase();
+                        }
+
+                        if (var18 != 1 || !var21.equalsIgnoreCase("xls") && !var21.equalsIgnoreCase("doc") && !var21.equalsIgnoreCase("pdf") && !var21.equalsIgnoreCase("xlsx") && !var21.equalsIgnoreCase("docx")) {
+                            var8 = var8 + "<a href=javascript:openFullWindowHaveBar(\"/spa/document/index.jsp?id=" + var16 + "\")>" + var17 + "</a> ";
+                        } else {
+                            var8 = var8 + "<a href=javascript:openFullWindowHaveBar(\"/spa/document/index2file.jsp?id=" + var16 + "&imagefileId=" + var19 + "&isFromAccessory=true\")>" + var20 + "</a> ";
+                        }
+                    }
+                }
+            }
+        } else {
+            String var22 = this.billid + "+" + var3 + "+" + var2 + "+" + var6 + "+" + this.user.getLanguage() + "+1+" + var4 + "+0+-1+" + this.formId + "+" + var5;
+            var8 = var7.getOthers(var1, var22);
+            if (var8.indexOf("class='empty-columns'") >= 0) {
+                var8 = "";
+            }
+        }
+
+        if (var2.equals("4")) {
+            if (var1.equals("1")) {
+                var8 = "" + SystemEnv.getHtmlLabelName(163, ThreadVarLanguage.getLang()) + "";
+            } else {
+                var8 = "" + SystemEnv.getHtmlLabelName(25105, ThreadVarLanguage.getLang()) + "";
+            }
+        }
+        if(var6==161){
+            //var8=var8.substring(0,var8.length()-"&nbsp;".length()); &&var8.endsWith("&nbsp;")
+            var8=var8.replaceAll("&nbsp;","");
+        }
+        //log.writeLog(var6+"-->"+var8);
+        return var8;
+    }
+
+    public String getAllmodflyuuid() {
+        return allmodflyuuid;
+    }
+
+    public void setAllmodflyuuid(String allmodflyuuid) {
+        this.allmodflyuuid = allmodflyuuid;
+    }
+
+    public String getAllVersionid() {
+        return allVersionid;
+    }
+
+    public void setAllVersionid(String allVersionid) {
+        this.allVersionid = allVersionid;
+    }
+
+    public List<Map<String, Object>> getSqlmaps() {
+        return sqlmaps;
+    }
+
+    public void setSqlmaps(List<Map<String, Object>> sqlmaps) {
+        this.sqlmaps = sqlmaps;
+    }
+
+    public String getViewlogid() {
+        return viewlogid;
+    }
+
+    public void setViewlogid(String viewlogid) {
+        this.viewlogid = viewlogid;
+    }
+
+    public static JSONObject getDetailField() {
+        return detailField;
+    }
+
+    public static void setDetailField(JSONObject detailField) {
+        TransField.detailField = detailField;
+    }
+
+    public JSONArray getTransFieldJSONs() {
+        return transFieldJSONs;
+    }
+
+    public void setTransFieldJSONs(JSONArray transFieldJSONs) {
+        this.transFieldJSONs = transFieldJSONs;
+    }
+
+    public int getFormId() {
+        return formId;
+    }
+
+    public void setFormId(int formId) {
+        this.formId = formId;
+    }
+
+    public int getModeId() {
+        return modeId;
+    }
+
+    public void setModeId(int modeId) {
+        this.modeId = modeId;
+    }
+
+    public int getType() {
+        return type;
+    }
+
+    public void setType(int type) {
+        this.type = type;
+    }
+
+    public int getLayoutid() {
+        return layoutid;
+    }
+
+    public void setLayoutid(int layoutid) {
+        this.layoutid = layoutid;
+    }
+
+    public User getUser() {
+        return user;
+    }
+
+    public void setUser(User user) {
+        this.user = user;
+    }
+
+    public String getBillid() {
+        return billid;
+    }
+
+    public void setBillid(String billid) {
+        this.billid = billid;
+    }
+
+    public String getQyid() {
+        return qyid;
+    }
+
+    public void setQyid(String qyid) {
+        this.qyid = qyid;
+    }
+
+    public String getBbrq() {
+        return bbrq;
+    }
+
+    public void setBbrq(String bbrq) {
+        this.bbrq = bbrq;
+    }
+
+    public void updateCompanyInfo(JSONObject valJSon,JSONObject detailValJSon){
+        //组装 sql
+        String detailindex="";
+
+        if(valJSon!=null||valJSon.size()>0){
+            Map<String,Object> map=new HashMap<>();
+            Set<String> mainkey=valJSon.keySet();
+            String fieldsql="";
+
+            Object[] params=new Object[valJSon.size()];
+            int i=0;
+            for(String str:mainkey){
+                fieldsql=fieldsql+str+"=?,";
+                params[i]=valJSon.get(str);
+            }
+            if(fieldsql.endsWith(",")){
+                fieldsql=fieldsql.substring(0,fieldsql.length()-1);
+            }
+            map.put("sql","update "+CubeSaveInterccept.CompanyMaintable+" set "+fieldsql+" where id='"+this.qyid+"'");
+            map.put("params",params);
+            //sqlmaps.add(map);
+        }
+        //明细表的sql  有两个 明细表
+//        if(detailValJSon!=null&&detailValJSon.size()>0){
+//           Set<String> detailKey= detailValJSon.keySet();
+//           for(String table:detailKey){
+//               JSONArray tableDatas=detailValJSon.getJSONArray(table);
+//               if(tableDatas!=null&&tableDatas.size()>0){
+//                    for(int k=0;k<tableDatas.size();k++){
+//                        JSONObject K=tableDatas.getJSONObject(k);
+//                        if(K!=null&&K.size()>0){
+//                            //开始遍历sql
+//                           String operateType=Util.null2String(K.getString("operateType")).trim() ;
+//                           String mainid=Util.null2String(K.getString("mainid")).trim() ;
+//                           String detailtable=Util.null2String(K.getString("detailtable")).trim() ;
+//                           Set<String> kkey= K.keySet();
+//                           if("EDIT".equals(operateType)&&!"".equals(mainid)){//编辑
+//                               Set<String> mainkey=valJSon.keySet();
+//                               Map<String,Object> map=new HashMap<>();
+//                               String fieldsql="";
+//                               Object[] kparams=new Object[0];
+//                                for(String mykey:kkey){
+//                                    String fieldname=getFieldNameByid(mykey);
+//                                    if(CubeSaveInterccept.filterField.indexOf(","+fieldname+",")>-1||CubeSaveInterccept.filterField.indexOf(","+mykey+",")>-1){
+//                                        continue;
+//                                    }
+//                                    fieldsql=fieldsql+fieldname+"=?,";
+//                                    kparams = Arrays.copyOf(kparams, (kparams.length+1));
+//                                    kparams[kparams.length-1] = K.get(mykey);
+//                                }
+//                                if(fieldsql.endsWith(",")){
+//                                    fieldsql=fieldsql.substring(0,fieldsql.length()-1);
+//                                }
+//                               map.put("sql","update "+CubeSaveInterccept.CompanyMaintable+"_"+table+" set "+fieldsql+" where id="+mainid);
+//                               map.put("params",kparams);
+//                               sqlmaps.add(map);
+//                           }else if("ADD".equals(operateType)){//新建
+//                               Set<String> mainkey=valJSon.keySet();
+//                               Map<String,Object> map=new HashMap<>();
+//                               String fieldsql="";
+//                               String splitsql="";
+//                               Object[] kparams=new Object[0];
+//                               for(String mykey:kkey){
+//                                   String fieldname=getFieldNameByid(mykey);
+//                                   if(CubeSaveInterccept.filterField.indexOf(","+fieldname+",")>-1||CubeSaveInterccept.filterField.indexOf(","+mykey+",")>-1){
+//                                       continue;
+//                                   }
+//                                   fieldsql=fieldsql+fieldname+",";
+//                                   splitsql=splitsql+"?,";
+//                                   kparams = Arrays.copyOf(kparams, (kparams.length+1));
+//                                   kparams[kparams.length-1] = K.get(mykey);
+//                               }
+//
+//                               if(fieldsql.endsWith(",")){
+//                                   fieldsql=fieldsql.substring(0,fieldsql.length()-1);
+//                               }
+//                               if(splitsql.endsWith(",")){
+//                                   splitsql=splitsql.substring(0,splitsql.length()-1);
+//                               }
+//                               map.put("sql","insert into "+CubeSaveInterccept.CompanyMaintable+"_"+table+"("+fieldsql+") values("+splitsql+") ");
+//                               map.put("params",kparams);
+//                               sqlmaps.add(map);
+//                           }
+//                        }
+//                    }
+//               }
+//           }
+//        }
+        //明细表
+
+
+        //跟新 历史沿革  记录  判断当期当前是什么版本  前后有没有
+        allVersionid= getAllVersion("1");//获取所有版本的ID
+        if(transFieldJSONs.size()>0){
+            for(int i=0;i<transFieldJSONs.size();i++){
+                JSONObject singlejson=transFieldJSONs.getJSONObject(i);
+                ParaSqlMap(singlejson, allVersionid,sqlmaps);
+            }
+            log.writeLog("isModifyClrq-->"+isModifyClrq+" newclrq-->"+newclrq+"this.billid-->"+this.billid);
+            if(isModifyClrq&&!"".equals(Util.null2String(newclrq).trim())){
+                //跟新所有版本的成立日期  以及 第一个版本的 版本日期
+               String oldVersion= getOldAllVersion();
+               String fristVersion="";
+               if("".equals(oldVersion)){
+                   fristVersion=this.billid;
+               }else{
+                   if(oldVersion.endsWith(",")) {
+                       oldVersion = oldVersion.substring(0, oldVersion.length() - 1);
+                       //int index = oldVersion.lastIndexOf(",");
+                   }
+                   int index = oldVersion.lastIndexOf(",");
+                   if(index>-1){
+                        fristVersion=Util.null2String(oldVersion.substring(index+1)) ;
+                   }
+               }
+               if(!"".equals(fristVersion)){
+                   Map<String,Object> map=new HashMap<>();
+                   Object[] params=new Object[1];
+                   params[0]=newclrq;
+                   map.put("sql","update "+CubeSaveInterccept.CompanyVersionMaintable+" set bbrq=? where qyid='"+this.qyid +"' and id in ("+fristVersion+")");
+                   map.put("params",params);
+                   sqlmaps.add(map);
+               }
+                Map<String,Object> map=new HashMap<>();
+                Object[] params=new Object[1];
+                params[0]=newclrq;
+                map.put("sql","update "+CubeSaveInterccept.CompanyVersionMaintable+" set clrq=? where qyid='"+this.qyid +"' ");
+                map.put("params",params);
+                sqlmaps.add(map);
+            }
+        }
+
+        //明细变更
+        /**
+         * 如果存在明细表的变更的话 则需要对 版本的历史沿革以及 版本的 明细数据 以及  企业信息表的数据 做变更
+         * 1).当前版本是最新的(跟新历史最新的数据只是跟新最新的一条数据  跟新主表数据)
+         * 2).当前版本是中间的版本(1不存在修改则更新所有之后的明细数据 以及跟新当前版本以及之后的所有新历史沿革最新的变更后数据   更新主表数据，2存在版本)
+         *如果 当前版本是之后的版本 只要跟新  历史沿革
+         * **/
+//        if(detailValJSon!=null&&detailValJSon.size()>0){
+//            Set<String> detailKey= detailValJSon.keySet();
+//            for(String table:detailKey){
+//                JSONArray tableDatas=detailValJSon.getJSONArray(table);
+//                if(tableDatas!=null&&tableDatas.size()>0){
+//                    for(int k=0;k<tableDatas.size();k++){
+//                        JSONObject K=tableDatas.getJSONObject(k);
+//                        if(K!=null&&K.size()>0){
+//                            //开始遍历sql
+//                            String detaildataid=Util.null2String(K.getString("detaildataid")).trim() ;
+//                            String operateType=Util.null2String(K.getString("operateType")).trim() ;
+//                            String mainid=Util.null2String(K.getString("mainid")).trim() ;
+//                            String detailtable=Util.null2String(K.getString("detailtable")).trim() ;
+//                            Set<String> kkey= K.keySet();
+//                            if("EDIT".equals(operateType)&&!"".equals(mainid)){//编辑
+//                                Set<String> mainkey=valJSon.keySet();
+//                                Map<String,Object> map=new HashMap<>();
+//                                String fieldsql="";
+//                                Object[] kparams=new Object[0];
+//                                for(String mykey:kkey){
+//                                    String fieldname=getFieldNameByid(mykey);
+//                                    if(CubeSaveInterccept.filterField.indexOf(","+fieldname+",")>-1||CubeSaveInterccept.filterField.indexOf(","+mykey+",")>-1){
+//                                        continue;
+//                                    }
+//                                    fieldsql=fieldsql+fieldname+"=?,";
+//                                    kparams = Arrays.copyOf(kparams, (kparams.length+1));
+//                                    kparams[kparams.length-1] = K.get(mykey);
+//                                }
+//                                if(fieldsql.endsWith(",")){
+//                                    fieldsql=fieldsql.substring(0,fieldsql.length()-1);
+//                                }
+//                                map.put("sql","update "+CubeSaveInterccept.CompanyMaintable+"_"+table+" set "+fieldsql+" where id="+mainid);
+//                                map.put("params",kparams);
+//                                sqlmaps.add(map);
+//
+//                            }else if("ADD".equals(operateType)){//新建
+//                                Set<String> mainkey=valJSon.keySet();
+//                                Map<String,Object> map=new HashMap<>();
+//                                String fieldsql="";
+//                                String splitsql="";
+//                                Object[] kparams=new Object[0];
+//                                String  modflyuuid=UUID.randomUUID().toString();
+//                                for(String mykey:kkey){
+//                                    String fieldname=getFieldNameByid(mykey);
+//                                    if(CubeSaveInterccept.filterField.indexOf(","+fieldname+",")>-1||CubeSaveInterccept.filterField.indexOf(","+mykey+",")>-1){
+//                                        continue;
+//                                    }
+//                                    fieldsql=fieldsql+fieldname+",";
+//                                    splitsql=splitsql+"?,";
+//                                    kparams = Arrays.copyOf(kparams, (kparams.length+1));
+//                                    kparams[kparams.length-1] = K.get(mykey);
+//                                }
+//                                fieldsql=fieldsql+"modflyuuid,";
+//                                kparams = Arrays.copyOf(kparams, (kparams.length+1));
+//                                kparams[kparams.length-1] = modflyuuid;
+//
+//                                if(fieldsql.endsWith(",")){
+//                                    fieldsql=fieldsql.substring(0,fieldsql.length()-1);
+//                                }
+//                                if(splitsql.endsWith(",")){
+//                                    splitsql=splitsql.substring(0,splitsql.length()-1);
+//                                }
+//                                map.put("sql","insert into "+CubeSaveInterccept.CompanyMaintable+"_"+table+"("+fieldsql+") values("+splitsql+") ");
+//                                map.put("params",kparams);
+//                                sqlmaps.add(map);
+//                                //新增的同时需要 修改 mainbillid
+//                                map.put("sql","update "+CubeSaveInterccept.CompanyVersionMaintable+"_"+table+"  set mainbillid=(select id from "+CubeSaveInterccept.CompanyMaintable+"_"+table+" where modflyuuid=?) where id="+mainid);
+//                                map.put("params",new Object[]{modflyuuid});
+//                                sqlmaps.add(map);
+//                            }
+//                        }
+//                    }
+//                }
+//            }
+//        }
+        HistoryDetail historyDetail=new HistoryDetail( this, detailValJSon);
+        historyDetail.DetailSplit();//解析明细
+        printLog();//sql
+        /** 写入SQL **/
+        if(this.sqlmaps!=null&&this.sqlmaps.size()>0){
+            boolean flag= BaseUtil.executeUpdateListTran(this.sqlmaps);
+            if(!flag){
+                log.writeLog("未写入成功");
+            }
+        }
+
+    }
+
+    public void printLog(){
+        if(this.sqlmaps!=null&&this.sqlmaps.size()>0){
+            for(Map<String,Object> sqls:sqlmaps) {
+                if (sqls == null || sqls.size() <= 0) {
+                    continue;
+                }
+                String sql = (String) sqls.get("sql");
+                log.writeLog("executeUpdateListTran--->" + sql);
+                Object[] params = (Object[]) sqls.get("params");
+                //log.writeLog("executeUpdateListTran--->" + params.length);
+                if (params != null && params.length > 0) {
+
+                    log.writeLog("executeUpdateListTran--->" + Arrays.toString(params));
+                }
+            }
+        }
+    }
+    /**
+     * 添加大于当前版本的明细
+     * @param versionids
+     */
+    public void addHistoryDetail(String versionids){
+
+    }
+    /**
+     *登记股东/持股比例/持股份数/股份种类
+     * 主数据  1.当前最新版本 修改主数据   2.中间版本
+     * 历史沿革 1.当前最新版本 修改主数据的历史沿革最新数据  2.中间版本  当前版本跟新 则更新最新 补不存在 则插入(存在历史变更)
+     *
+     *
+     *
+     * 主表字段的修改
+     * 生产sql shuju
+     * @param singlejson
+     * @return
+     */
+    public void ParaSqlMap(JSONObject singlejson,String allVersionid,List<Map<String,Object>> sqlmaps){
+        SimpleDateFormat sim=new SimpleDateFormat("yyyy-MM-dd");
+        String currentDate=sim.format(new Date());
+        Map<String,Object> sqlmap=new HashMap<>();
+        if(singlejson==null||singlejson.size()<=0){
+            return ;
+        }
+        log.writeLog(singlejson.toJSONString());
+        String fieldvalue=Util.null2String(singlejson.getString("fieldvalue")) ;//新值 oldfieldvalue
+        String oldfieldvalue=Util.null2String(singlejson.getString("oldfieldvalue")) ;//新值
+        String fieldname=Util.null2String(singlejson.getString("fieldname")) ;//数据库字段名
+        String labelname=Util.null2String(singlejson.getString("labelname")) ;//字段名称
+        String prefieldvalue=Util.null2String(singlejson.getString("prefieldvalue")) ;//旧值
+        String oldprefieldvalue=Util.null2String(singlejson.getString("oldprefieldvalue")) ;//旧值描述
+        String changeID=checkFieldCheck(allVersionid, labelname);//之后变更版本
+        String currentVersionChange=checkDetailFieldCheck(this.getBillid(),labelname,1);//获取中间版本 存在说明当前版本 有修改痕迹
+        String getOldAllVersion=getOldAllVersion();//当前版本的 前版本
+        String oldchangeID=checkDetailFieldCheck(getOldAllVersion,labelname,0);
+        if(!isModifyClrq&&"clrq".equals(fieldname)){
+            newclrq=oldfieldvalue;
+            isModifyClrq=true;
+        }
+        log.writeLog("changeID->"+changeID);
+        log.writeLog("currentVersionChange->"+currentVersionChange);
+        log.writeLog("getOldAllVersion->"+getOldAllVersion);
+        log.writeLog("oldchangeID->"+oldchangeID);
+        if("".equals(changeID)||(allVersionid.equals(this.billid+"")||allVersionid.endsWith(","+this.billid))){//说明从来没有变更过(变更主表数据 ) 或者是 最新的版本
+            Map<String,Object> map=new HashMap<>();
+            Object[] params=new Object[1];
+            params[0]=oldfieldvalue;
+            map.put("sql","update "+CubeSaveInterccept.CompanyMaintable+" set "+fieldname+"=? where id='"+this.qyid+"'");
+            map.put("params",params);
+            sqlmaps.add(map);
+
+
+            /** 跟新下属版本的所有值 **/
+            Map<String,Object> map4=new HashMap<>();
+            Object[] params4=new Object[1];
+            params4[0]=oldfieldvalue;//获取动态的值
+            map4.put("sql","update "+CubeSaveInterccept.CompanyVersionMaintable+" set "+fieldname+"=? where qyid='"+this.qyid+"' and id>"+this.billid);
+            map4.put("params",params4);
+            sqlmaps.add(map4);
+
+            /** 跟新下属版本的所有历史沿革值 **/
+            Map<String,Object> map5=new HashMap<>();
+            Object[] params5=new Object[2];
+            params5[0]=fieldvalue;//获取动态的值  qyid='"+this.qyid+"' and
+            params5[1]=labelname;
+            map5.put("sql","update "+CubeSaveInterccept.CompanyVersionMaintable+"_dt1 set  bgh=? where  mainid="+this.billid+" and bgxm=? ");
+            map5.put("params",params5);
+            sqlmaps.add(map5);
+        }else{//存在变更(跟新 changeID之前的版本字段数据  以及跟新  changeID的变更前 数据 以及 当前版本的变更后)  考虑到最新版本
+            String betoowID=getBetoowVersion(billid,changeID, allVersionid);//获取中间版本
+            if(!"".equals(betoowID)){
+                Map<String,Object> map=new HashMap<>();
+                Object[] params=new Object[1];
+                params[0]=oldfieldvalue;
+                map.put("sql","update "+CubeSaveInterccept.CompanyMaintable+" set "+fieldname+"=? where id='"+this.qyid +"' and id in ("+betoowID+")");
+                map.put("params",params);
+                sqlmaps.add(map);
+            }
+            if(!"".equals(changeID)){
+                //中间版本的数据 真实 数据
+                /** 跟新历史changeID沿革字段 **/
+                Map<String,Object> map2=new HashMap<>();
+                Object[] params2=new Object[2];
+                params2[0]=fieldvalue;//获取动态的值
+                params2[1]=labelname;
+                map2.put("sql","update "+CubeSaveInterccept.CompanyVersionMaintable+"_dt1 set bgq=? where id in (select min(id) from "+CubeSaveInterccept.CompanyVersionMaintable+"_dt1 where mainid="+changeID+" and bgxm=? )  ");
+                map2.put("params",params2);
+                sqlmaps.add(map2);
+            }
+
+        }
+
+        //跟新当前节点的  变更后  通用设置
+        if(!"".equals(currentVersionChange)){
+            Map<String,Object> map3=new HashMap<>();
+            Object[] params3=new Object[2];
+            params3[0]=fieldvalue;//获取动态的值
+            params3[1]=labelname;
+            map3.put("sql","update "+CubeSaveInterccept.CompanyVersionMaintable+"_dt1 set bgh=? where id in (select max(id) from "+CubeSaveInterccept.CompanyVersionMaintable+"_dt1 where mainid='"+billid+"' and bgxm=?) ");
+            map3.put("params",params3);
+            sqlmaps.add(map3);
+        }else{
+            if(!"".equals(oldchangeID)){
+                /** 历史沿革  更新 **/
+                Map<String, Object> map2 = new HashMap<>();
+                map2.put("sql", "insert into "+CubeSaveInterccept.CompanyVersionMaintable+"_dt1(rq,bgxm,bgq,bgh,mainid)values(?,?,?,?,?) ");
+                map2.put("params", new Object[]{currentDate, labelname,oldprefieldvalue,fieldvalue,getBillid()});
+                sqlmaps.add(map2);
+
+
+            }
+        }
+    }
+
+    /**
+     * 获取区间版本
+     * @param current
+     * @param lastversion
+     * @param allversion
+     * @return
+     */
+    public static String getBetoowVersion(String current,String lastversion,String allversion){
+        current=Util.null2String(current);
+        lastversion=Util.null2String(lastversion);
+        if("".equals(lastversion)){//如果不存在中间版本直接 返回空数据
+            return "";
+        }
+        if("".equals(current)){//如果不存在中间版本直接 返回空数据
+            return "";
+        }
+        allversion=Util.null2String(allversion);
+        String betoowID="";
+        boolean isbegin=false;
+        String[] allversions=allversion.split(",");
+        for(String str:allversions){
+            str=Util.null2String(str).trim();
+            if("".equals(str)){
+                continue;
+            }
+            if(current.equals(str)){
+                isbegin=true;
+                continue;
+            }
+            if(lastversion.equals(str)){
+                break;
+            }
+            if(isbegin){
+                betoowID=betoowID+str+",";
+            }
+        }
+        if(betoowID.endsWith(",")){
+            betoowID=betoowID.substring(0,betoowID.length()-1);
+        }
+        return betoowID;
+    }
+    /**
+     * 获取版本ID
+     * @param type 0上一个版本  1 下一个版本
+     */
+    public String getAllVersion(String type){
+        JSONObject version=new JSONObject();
+        RecordSet re=new RecordSet();
+        String ids="";
+        String sql="select * from "+CubeSaveInterccept.CompanyVersionMaintable+" where qyid='"+this.qyid+"' and bbrq>'"+this.bbrq+"' order by bbrq asc";;
+//        if("0".equals(type)){
+//            sql=sql+" and bbrq<'"+this.bbrq+"' order by desc";
+//        }
+//        if("1".equals(type)){
+//            sql=sql+" and bbrq>'"+this.bbrq+"' order by asc";
+//        }else{
+//            return version;
+//        }
+        re.executeQuery(sql);
+        log.writeLog(sql);
+        while(re.next()){
+           String id=Util.null2String(re.getString("id")) ;
+            ids=ids+id+",";
+        }
+        if(ids.endsWith(",")){
+            ids=ids.substring(0,ids.length()-1);
+        }
+        return ids;
+    }
+    public String getOldAllVersion(){
+        JSONObject version=new JSONObject();
+        RecordSet re=new RecordSet();
+        String ids="";
+        String sql="select * from "+CubeSaveInterccept.CompanyVersionMaintable+" where qyid='"+this.qyid+"' and bbrq<'"+this.bbrq+"' order by bbrq desc";;
+//        if("0".equals(type)){
+//            sql=sql+" and bbrq<'"+this.bbrq+"' order by desc";
+//        }
+//        if("1".equals(type)){
+//            sql=sql+" and bbrq>'"+this.bbrq+"' order by asc";
+//        }else{
+//            return version;
+//        }
+        re.executeQuery(sql);
+        log.writeLog(sql);
+        while(re.next()){
+            String id=Util.null2String(re.getString("id")) ;
+            ids=ids+id+",";
+        }
+        if(ids.endsWith(",")){
+            ids=ids.substring(0,ids.length()-1);
+        }
+        return ids;
+    }
+    /**
+     * 返回 字段最新的 修改版本的ID
+     * @param ids  所有版本的 iD
+     * @param fieldname 字段名称
+     * @return
+     */
+    public String checkFieldCheck(String ids,String fieldname){
+        String id="";
+        RecordSet re=new RecordSet();
+        boolean flag=false;
+        String sql="select a.id from "+CubeSaveInterccept.CompanyVersionMaintable+" a, "+CubeSaveInterccept.CompanyVersionMaintable+"_dt1 b where a.id=b.mainid and a.qyid='"+this.qyid+"' and a.id in ("+ids+") and  bgxm=? order by a.bbrq asc";
+        re.executeQuery(sql,fieldname);
+        log.writeLog(sql);
+        if(re.next()){
+            id=Util.null2String(re.getString("id")) ;
+        }
+        return id;
+    }
+
+    /**
+     * 明细表   返回 字段最新的 修改版本的ID
+     * @param ids  所有版本的 iD
+     * @param type  大于0 的版本  小于 0 之前的版本
+     * @return
+     */
+    public String checkDetailFieldCheck(String ids,String bgxm,int type){
+        String id="";
+        RecordSet re=new RecordSet();
+        boolean flag=false;
+        //String sql="select a.relatedid from  ModeViewLog_84 a,ModeLogFieldDetail b where a.id=b.viewlogid and a.operateType=2 and (a.relatedid in ("+ids+") or a.relatedid="+billid+" ) and b.detailtable='"+tablename+"' ";
+        String sql="select a.id from "+CubeSaveInterccept.CompanyVersionMaintable+" a, "+CubeSaveInterccept.CompanyVersionMaintable+"_dt1 b where a.id=b.mainid and a.qyid='"+this.qyid+"' and a.id in ("+ids+") and  bgxm=? ";
+        //改为按照版本日期 排序
+        if(type>0){
+            sql=sql+" order by a.bbrq asc";
+        }else{
+            sql=sql+" order by a.bbrq desc";
+        }
+//        if(type>0){
+//            sql=sql+" order by a.id asc";
+//        }else{
+//            sql=sql+" order by a.id desc";
+//        }
+        re.executeQuery(sql,bgxm);
+        log.writeLog(sql);
+        if(re.next()){
+            id=Util.null2String(re.getString("id")) ;
+        }
+        return id;
+    }
+
+    public String getFieldNameByid(String fieldid){
+        RecordSet re=new RecordSet();
+        String fieldname="";
+        String sql="select fieldname from workflow_billfield  where id="+fieldid;
+        re.execute(sql);
+        if(re.next()){
+            fieldname=Util.null2String(re.getString("fieldname")) ;
+        }
+        return fieldname;
+    }
+    //(fieldvalue, fieldhtmltype, fieldid, fielddbtype, viewtype, type)
+
+    public JSONObject getFieldIdByName(String fieldname,String detailtable){
+        RecordSet re=new RecordSet();
+        JSONObject json=new JSONObject();
+        String sql=" select c.id,fieldhtmltype, fielddbtype, viewtype, type from  workflow_billfield c  where c.billid="+formId+" and fieldname=?  ";
+        if(formId<=0&&!"".equals(Util.null2String(detailtable).trim())){
+            sql=" select c.id,fieldhtmltype, fielddbtype, viewtype, type from  workflow_billfield c  where  fieldname=?  ";
+        }
+        if(!"".equals(Util.null2String(detailtable) )){
+            sql=sql+" and detailtable='"+detailtable+"'";
+        }
+        log.writeLog(sql);
+        re.executeQuery(sql,fieldname);
+        if(re.next()){
+            String id=Util.null2String(re.getString("id")) ;
+            String fieldhtmltype=Util.null2String(re.getString("fieldhtmltype")) ;
+            String fielddbtype=Util.null2String(re.getString("fielddbtype")) ;
+            String viewtype=Util.null2String(re.getString("viewtype")) ;
+            String type=Util.null2String(re.getString("type")) ;
+            json.put("fieldid",id);
+            json.put("fieldhtmltype",fieldhtmltype);
+            json.put("fielddbtype",fielddbtype);
+            json.put("viewtype",viewtype);
+            json.put("type",type);
+        }
+        return json;
+    }
+    public String getSingleFieldIdByName(String fieldname,String detailtable){
+        RecordSet re=new RecordSet();
+        JSONObject json=new JSONObject();
+        String sql=" select c.id,fieldhtmltype, fielddbtype, viewtype, type from  workflow_billfield c  where c.billid="+formId+" and fieldname=?  ";
+        if(!"".equals(Util.null2String(detailtable) )){
+            sql=sql+" and detailtable='"+detailtable+"'";
+        }
+        String id="";
+        re.executeQuery(sql,fieldname);
+        if(re.next()){
+            id=Util.null2String(re.getString("id")) ;
+        }
+        return id;
+    }
+    /**
+     * 获取明细表的 所有值
+     * @param detailtable
+     * @param fields
+     * @return
+     */
+    public String getDetailAllValue(String detailtable,String fields,String billidval){
+        String result="";
+        detailtable=Util.null2String(detailtable).trim();
+        fields=Util.null2String(fields);
+        if("".equals(detailtable)||"".equals(fields)){
+            return "";
+        }
+        String[] fieldss=fields.split(",");
+        RecordSet re=new RecordSet();
+        String sql="select * from "+detailtable+" where mainid=";
+        if(!"".equals(billidval)){
+            sql=sql+""+billidval;
+        }
+        re.execute(sql);
+        while(re.next()){
+            String demostr="";
+            for(String str:fieldss){
+                str=Util.null2String(str).trim();
+                if(str.equals("")){
+                    continue;
+                }
+               String fieldvalue=Util.null2String(re.getString(str)) ;
+               String newfieldvalue="";
+                try {
+                    newfieldvalue=BaseUtil.Html2Text(transFieldValue(fieldvalue, getFieldIdByName(str,detailtable)))  ;
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+                demostr=demostr+newfieldvalue+"/";
+            }
+            if(demostr.endsWith("/")){
+                demostr=demostr.substring(0,demostr.length()-1);
+            }
+            result=result+demostr+"、\n";
+        }
+//        if(result.endsWith("|")){
+//            result=result.substring(0,result.length()-1);
+//        }
+        return result;
+    }
+    //更新历史 版本的 新增的明细表对用的  企业信息明细ID
+    public void updateallmodflyuuid(){
+        RecordSet recordSet=new RecordSet();
+        String[] allmodflyuuids=Util.null2String(this.allmodflyuuid).trim().split(",");
+        for(String str:allmodflyuuids){
+            str=Util.null2String(str).trim();
+            if("".equals(str)||str.indexOf(",")<1){
+                continue;
+            }
+            String tableindex=str.substring(0,str.indexOf(","));
+            log.writeLog(str+"update "+CubeSaveInterccept.CompanyVersionMaintable+"_"+tableindex+" set mainbillid=(select id from "+CubeSaveInterccept.CompanyMaintable+"_"+tableindex+" where modflyuuid=?) where modflyuuid=?");
+            recordSet.executeUpdate("update "+CubeSaveInterccept.CompanyVersionMaintable+"_"+tableindex+" set mainbillid=(select id from "+CubeSaveInterccept.CompanyMaintable+"_"+tableindex+" where modflyuuid=?) where modflyuuid=?",str);
+        }
+    }
+
+    public String getFeildnameByNames(String names,int formid){
+        String resultnames="";
+        String result="";
+        names=Util.null2String(names).trim();
+        if("djgd,cgbl,cgfs,gfzl".equals(names)){
+            return "登记股东/持股比例/持股份数/股份种类";
+        }
+        String namesValue=","+names+",";
+        String[] namess=names.split(",");
+        for(String str:namess){
+            str=Util.null2String(str).trim();
+            if("".equals(str)){
+                continue;
+            }
+            result=result+"'"+str+"',";
+        }
+        if(result.endsWith(",")){
+            result=result.substring(0,result.length()-1);
+        }
+        if(!"".equals(result)){
+            RecordSet re=new RecordSet();
+            log.writeLog("select fieldname,fieldlabel from  workflow_billfield where billid="+formid+" and fieldname in ("+result+")");
+            re.execute("select fieldname,fieldlabel from  workflow_billfield where billid="+formid+" and fieldname in ("+result+")");
+
+            while(re.next()){
+               String fieldnameStr=Util.null2String(re.getString("fieldname"));
+               String fieldname=SystemEnv.getHtmlLabelName(re.getInt("fieldlabel"), 7);//Util.null2String(re.getString("fieldname")) .trim();
+               if("".equals(fieldname)){
+                    continue;
+               }
+                namesValue=namesValue.replaceAll(","+fieldnameStr+",",","+fieldname+",");
+                resultnames=resultnames+fieldname+"/";
+            }
+            if(namesValue.endsWith(",")){
+                namesValue=namesValue.substring(0,namesValue.length()-1);
+            }
+            if(namesValue.startsWith(",")){
+                namesValue=namesValue.substring(1);
+            }
+            namesValue=namesValue.replaceAll(",","/");
+            if(resultnames.endsWith("/")){
+                resultnames=resultnames.substring(0,resultnames.length()-1);
+            }
+        }
+        return namesValue;
+    }
+
+    /**
+     *
+     * @param names
+     * @param tablename
+     * @param type  0主表 1明细表
+     * @return
+     */
+    public String getFeildnameByNames(String names,String tablename,int type){
+        String resultnames="";
+        String result="";
+        names=Util.null2String(names).trim();
+        String[] namess=names.split(",");
+        for(String str:namess){
+            str=Util.null2String(str).trim();
+            if("".equals(str)){
+                continue;
+            }
+            result=result+"'"+str+"',";
+        }
+        if(result.endsWith(",")){
+            result=result.substring(0,result.length()-1);
+        }
+        log.writeLog(result+"  "+tablename+" "+type);
+        if(!"".equals(result)){
+            RecordSet re=new RecordSet();
+            //log.writeLog("select fieldname,fieldlabel from  workflow_billfield where billid="+formid+" and fieldname in ("+result+")");
+            if(type==0){
+                re.executeQuery("select a.fieldname,a.fieldlabel from workflow_billfield a,workflow_bill b where a.billid=b.id and a.fieldname in ("+result+") and b.tablename=?",tablename);
+            }else{
+                log.writeLog("select a.fieldname,a.fieldlabel from workflow_billfield a,workflow_bill b where a.billid=b.id and a.fieldname in ("+result+") and a.detailtable=?"+tablename);
+                re.executeQuery("select a.fieldname,a.fieldlabel from workflow_billfield a,workflow_bill b where a.billid=b.id and a.fieldname in ("+result+") and a.detailtable=?",tablename);
+            }
+
+
+            while(re.next()){
+                String fieldname=SystemEnv.getHtmlLabelName(re.getInt("fieldlabel"), 7);//Util.null2String(re.getString("fieldname")) .trim();
+                if("".equals(fieldname)){
+                    continue;
+                }
+                resultnames=resultnames+fieldname+"/";
+            }
+            if(resultnames.endsWith("/")){
+                resultnames=resultnames.substring(0,resultnames.length()-1);
+            }
+        }
+        return resultnames;
+    }
+
+    public static void main(String[] arg){
+        System.out.println(getBetoowVersion("3","21","1,2,3,21,4,5"));
+    }
+}
diff --git a/src/main/youhong_ai_jitu_src/com/jet/action/ApplyForFee.java b/src/main/youhong_ai_jitu_src/com/jet/action/ApplyForFee.java
new file mode 100644
index 0000000..60ec5d4
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/com/jet/action/ApplyForFee.java
@@ -0,0 +1,56 @@
+package com.jet.action;
+
+import weaver.soa.workflow.request.RequestInfo;
+import weaver.workflow.action.BaseAction;
+import weaver.conn.RecordSet;
+import weaver.general.Util;
+
+import com.working.util.LogTool;
+import com.working.util.WorkflowUtil;
+
+/**
+ * 02-费用报销申请-J&T中国
+ * @author lwt
+ *
+ */
+public class ApplyForFee extends BaseAction{
+	
+	LogTool log = new LogTool("/log/feeChina/",false);
+	
+    @Override
+    public String execute(RequestInfo requestInfo) {
+    	// TODO Auto-generated method stub
+    	String requestid = requestInfo.getRequestid();
+    	RecordSet rs = new RecordSet();
+    	RecordSet rs1 = new RecordSet();
+    	String mainTable = WorkflowUtil.getMainTable(requestid);
+    	String detail8Table = mainTable + "_dt8";
+    	int mainId = requestInfo.getRequestManager().getBillid();//主表数据id
+    	rs.execute("select * from " + detail8Table + " where mainid = '" + mainId + "' order by id desc");
+    	String bxlx = "";//报销类型
+    	String tdhdVal = "0";//团队活动费
+    	String clVal = "0";//差旅费
+    	while (rs.next()) {
+    		bxlx = Util.null2String(rs.getString("BXLX"));
+    		if (bxlx!=null) {
+    			if (bxlx.equals("27")) {//团队活动费
+    				tdhdVal = "1";
+    			} else if (bxlx.equals("3")) {//差旅费
+    				clVal = "1";
+    			}
+    		}
+    	}
+    	if (tdhdVal.equals("0")&&clVal.equals("0")) {//既没有团队活动费也没有差旅费,设置主表的报销类型为其他
+    		rs1.execute("update " + mainTable + " set bxlxzb = '2' where requestid = '" + requestid +"'");
+    	} else if (tdhdVal.equals("1")&&clVal.equals("0")) {//只有团队活动费,设置主表的报销类型为团队活动费
+    		rs1.execute("update " + mainTable + " set bxlxzb = '0' where requestid = '" + requestid +"'");
+    	} else if (tdhdVal.equals("0")&&clVal.equals("1")) {//只有差旅费,设置主表的报销类型为差旅费
+    		rs1.execute("update " + mainTable + " set bxlxzb = '1' where requestid = '" + requestid +"'");
+    	} else if (tdhdVal.equals("1")&&clVal.equals("1")) {//既有团队活动费也有差旅费,设置主表的报销类型为团队活动费&差旅费
+    		rs1.execute("update " + mainTable + " set bxlxzb = '3' where requestid = '" + requestid +"'");
+    	}
+    	
+    	return SUCCESS;
+    }
+
+}
diff --git a/src/main/youhong_ai_jitu_src/com/jet/action/BusinessTripIntoHRAction.java b/src/main/youhong_ai_jitu_src/com/jet/action/BusinessTripIntoHRAction.java
new file mode 100644
index 0000000..efee31f
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/com/jet/action/BusinessTripIntoHRAction.java
@@ -0,0 +1,202 @@
+package com.jet.action;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.serializer.SerializerFeature;
+import com.working.third.JwtUtil;
+import com.working.util.HttpManager;
+import com.working.util.WorkflowUtil;
+import selfdev.util.log.LogTool;
+import weaver.conn.RecordSet;
+import weaver.file.Prop;
+import weaver.general.Util;
+import weaver.soa.workflow.request.RequestInfo;
+import weaver.workflow.action.BaseAction;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Author Administrator
+ * @Description OA出差申请数据写入东宝HR系统
+ * @Date 2020/10/20  16:26
+ * <p>
+ *     这两个值后需要写在配置文件中
+ * 正式环境
+ * https://hr.jtexpress.com.cn
+ * clientId：TPFKAGB3QGPM2LBD
+ * 测试环境
+ * http://121.36.223.187:9011
+ * clientId: P3F28BIFKGFL0ANX
+ */
+public class BusinessTripIntoHRAction extends BaseAction {
+
+    @Override
+    public String execute(RequestInfo requestInfo) {
+        LogTool log = new LogTool("/log/selfdev/action", false);
+        log.writeLog("-----------------------开始OA出差申请数据写入东宝HR系统-----------------------");
+        String requestId = requestInfo.getRequestid(); //获取requestid
+        log.writeLog("------------requestId值为：" + requestId);
+
+        String mainTable = WorkflowUtil.getMainTable(requestId);
+
+//        String clientId = Prop.getPropValue("db_work", "clientId");
+        String clientId = "P3F28BIFKGFL0ANX";
+        String secret = Prop.getPropValue("db_work", "secret");
+        int second = Integer.parseInt(Prop.getPropValue("db_work", "second"));
+
+//        String batchCardDataUrl = Prop.getPropValue("db_work", "batchCardDataUrl");
+        String batchCardDataUrl = "http://121.36.223.187:9011/third/api";
+
+        String code = "saveBusinessTripOrderToThirdNew";
+        String moduleCode = "attBusinessTripOrderService";
+        String token = JwtUtil.createThirdToken(clientId, secret, second).getToken();
+
+        HashMap<String, String> headMap = new HashMap<String, String>(); // 存放head的值
+        headMap.put("code", code);
+        headMap.put("moduleCode", moduleCode);
+        headMap.put("token", token);
+        headMap.put("clientId", clientId);
+
+        HashMap<String, Object> bodyMap = new HashMap<String, Object>(); // 存放body的值
+
+        String userId = ""; // 申请人id
+        String workCode = ""; //人员编号
+
+        String trip_category = "2"; // 出差类型(1-外出，2-出差)
+        String trip_area = ""; // 出差区域(1-市内，2-省内，3-国内，4-海外)  暂时只分3和4
+        String trip_way = "4"; // 出差方式(1-整天，2-上半天，3-下半天，4-连续时间段，5-每天固定时间)
+
+        String begin_date = ""; // 开始日期
+        String end_date = ""; // 结束日期
+        String begin_time = ""; // 开始时间
+        String end_time = ""; // 结束时间
+        String reason = ""; // 出差事由
+        String origin = ""; // 出发地
+        String destination = ""; // 目的地
+
+        String is_overtime = "1"; // 是否出差计加班（默认传入1）
+        String audit_status = "1"; // 提交状态 0-保存 1-提交
+
+        RecordSet rs = new RecordSet();
+        String sql = " select *  from " + mainTable + " where requestid='" + requestId + "'";
+        rs.execute(sql);
+        while (rs.next()) {
+            HashMap<String, Object> empOrderMap = new HashMap<String, Object>(); // 存放empOrder的值
+            HashMap<String, Object> businessTripOrderMap = new HashMap<String, Object>(); // 存放businessTripOrder的值
+
+            userId = Util.null2String(rs.getString("sqr"));// 人员转换唯一标识
+            workCode = Util.null2String(WorkflowUtil.getUserInfo(userId).get("workcode"));
+            log.writeLog("------------人员转换唯一标识值为：" + workCode);
+
+            String trip_area1 = Util.null2String(rs.getString("cclb")); // 出差类别
+            if ("0".equals(trip_area1)) {
+                trip_area = "3"; // 国内
+            }
+            if ("1".equals(trip_area1)) {
+                trip_area = "4"; // 国外
+            }
+
+            begin_date = Util.null2String(rs.getString("fsrq")); // 开始日期
+            end_date = Util.null2String(rs.getString("jsrq")); // 结束日期
+            reason = Util.null2String(rs.getString("ccsy")); // 出差事由
+            origin = Util.null2String(rs.getString("cfd")); // 出发地
+            destination = Util.null2String(rs.getString("mdd")); // 目的地
+
+            String[] s = begin_date.split(" ");
+            begin_time = s[1];
+            String[] s1 = end_date.split(" ");
+            end_time = s1[1];
+
+            List<Map<String, String>> scheduleList = new ArrayList<Map<String, String>>(); // 出差行程记录
+            Map<String, String> scheduleMap1 = new HashMap<String, String>();
+            scheduleMap1.put("name", "出发地");
+            scheduleMap1.put("place", origin);
+            scheduleMap1.put("longitude", "");
+            scheduleMap1.put("latitude", "");
+            scheduleMap1.put("id", "");
+
+            Map<String, String> scheduleMap2 = new HashMap<String, String>();
+            scheduleMap2.put("name", "目的地");
+            scheduleMap2.put("place", destination);
+            scheduleMap2.put("longitude", "");
+            scheduleMap2.put("latitude", "");
+            scheduleMap2.put("id", "");
+            scheduleList.add(scheduleMap1);
+            scheduleList.add(scheduleMap2);
+
+            log.writeLog("------------出差类型值为：" + trip_category);
+            log.writeLog("------------出差区域值为：" + trip_area);
+            log.writeLog("------------出差方式值为：" + trip_way);
+            log.writeLog("------------开始日期值为：" + begin_date);
+            log.writeLog("------------结束日期值为：" + end_date);
+            log.writeLog("------------开始时间值为：" + begin_time);
+            log.writeLog("------------结束时间值为：" + end_time);
+            log.writeLog("------------出差事由值为：" + reason);
+            log.writeLog("------------出发地值为：" + origin);
+            log.writeLog("------------目的地值为：" + destination);
+
+            empOrderMap.put("empKey", workCode);
+            empOrderMap.put("empRule", "1"); // 人员转换规则(0-无，1-工号，2-身份证，3邮箱，4-手机号码)
+
+            businessTripOrderMap.put("trip_category", trip_category);
+            businessTripOrderMap.put("trip_area", trip_area);
+            businessTripOrderMap.put("trip_way", trip_way);
+            businessTripOrderMap.put("begin_date", begin_date);
+            businessTripOrderMap.put("end_date", end_date);
+            businessTripOrderMap.put("begin_time", begin_time);
+            businessTripOrderMap.put("end_time", end_time);
+            businessTripOrderMap.put("reason", reason);
+
+            businessTripOrderMap.put("is_overtime", is_overtime);
+            businessTripOrderMap.put("audit_status", audit_status);
+            businessTripOrderMap.put("isChangeTripOrder", false); // 是否变更出差单（默认传入false）
+
+            businessTripOrderMap.put("scheduleList", scheduleList);
+
+            empOrderMap.put("businessTripOrder", businessTripOrderMap);
+            bodyMap.put("empOrder", empOrderMap);
+        }
+
+        HashMap<String, Object> paramMap = new HashMap<String, Object>();
+        paramMap.put("header", headMap);
+        paramMap.put("body", bodyMap);
+
+        try {
+            String param = JSON.toJSONString(paramMap, SerializerFeature.DisableCircularReferenceDetect);
+            log.writeLog("---------------paramMap的值为：" + param);
+            String result = HttpManager.postMap(batchCardDataUrl, headMap, param);
+            log.writeLog("-----------发送请求返回的结果值为：" + result);
+
+            JSONObject jsonObject = JSONObject.parseObject(result);
+            String returnCode = Util.null2String(jsonObject.get("code"));
+            String data = Util.null2String(jsonObject.get("data"));
+            String message = Util.null2String(jsonObject.get("message"));
+            String id = Util.null2String(jsonObject.get("id"));
+
+            log.writeLog("--------发送请求返回的code值为：" + returnCode);
+            log.writeLog("--------发送请求返回的数据值为：" + data);
+            log.writeLog("--------发送请求返回的信息为：" + message);
+            log.writeLog("--------发送请求返回的id值为：" + id);
+
+            if (!"".equals(result) && result != null) {
+                if ("200".equals(returnCode)) {
+                    return SUCCESS;
+                } else {
+                    requestInfo.getRequestManager().setMessagecontent("写入HR系统失败，失败信息为：" + message);
+                    return "0";
+                }
+            } else {
+                requestInfo.getRequestManager().setMessagecontent("写入HR系统失败，发送请求返回的结果值为" + result);
+                return "0";
+            }
+
+        } catch (IOException ioException) {
+            requestInfo.getRequestManager().setMessagecontent("发生异常了，写入HR系统失败");
+            return "0";
+        }
+    }
+}
diff --git a/src/main/youhong_ai_jitu_src/com/jet/action/CheckPayAction.java b/src/main/youhong_ai_jitu_src/com/jet/action/CheckPayAction.java
new file mode 100644
index 0000000..7ddef7a
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/com/jet/action/CheckPayAction.java
@@ -0,0 +1,124 @@
+package com.jet.action;
+
+import weaver.conn.RecordSet;
+import weaver.general.BaseBean;
+import weaver.general.Util;
+import weaver.interfaces.workflow.action.Action;
+import weaver.soa.workflow.request.RequestInfo;
+import selfdev.util.base.BaseUtil;
+import selfdev.util.log.LogTool;
+
+/**
+ * 付款申请流程申请节点提交时的校验判断
+ * 1、判断支付明细中的本次付款金额是否超出未付款金额
+ * 2、判断一个付款流程不能同时选择两行以上相同的批次
+ * @author KangMD
+ * 2019-11-04
+ */
+public class CheckPayAction extends BaseBean implements Action  {
+
+	public String  execute(RequestInfo ri) {
+		 LogTool log=new LogTool("/log/selfdev/action", false);
+		 //获取requestid
+		 String requestid=ri.getRequestid();
+		 String workflowid=ri.getWorkflowid();
+		 //获取用户语言
+		 int language=ri.getRequestManager().getUser().getLanguage();
+		 log.writeLog("language---------->"+language);
+		 String workflowname=BaseUtil.getBaseInfoByParm("workflowname", "workflow_base", "id", workflowid, "");
+		 log.writeLog("---------------"+workflowname+"开始-------------requestId:" + requestid);
+		 try {
+			RecordSet rs=new RecordSet();
+			String mainid="";//主键ID
+			String htxx="";//建模合同ID
+			//获取表名
+			String tablename=BaseUtil.getBaseInfoByParm("tablename", "workflow_bill", "1", "1", " and id in (select formid from workflow_base where id="+workflowid+")");;
+			String sql="select * from "+tablename+" where requestid="+requestid;
+			rs.execute(sql);
+			while(rs.next()){
+				mainid=Util.null2String(rs.getString("id"));
+				htxx=Util.null2String(rs.getString("htxx"));
+			}
+			String sfcc="0";//流程是否可通过  0表示可通过   1表示不可通过
+			String msg="";//提示信息
+			//查询1个流程中是否填写了2行相同付款批次
+			sql="select a.pc_num,b.* from (select fkpc,count(*) as pc_num from "+tablename+"_dt5 where mainid= "+mainid+" GROUP BY fkpc having count(*)>1) a left join V_uf_httz_dt1 b on a.fkpc=b.id";
+			log.writeLog("查询付款明细中不能有重复批次的SQL---------->"+sql);
+			rs.execute(sql);
+			while(rs.next()){
+				sfcc="1";//重复
+				if(language==0||language==7){//简体
+					msg+="明细中批次为【"+Util.null2String(rs.getString("fkpc"))+"】的付款重复选择了;<br/>";//超出提示信息
+				}else if(language==8){//英语
+					msg+="明细中批次为【"+Util.null2String(rs.getString("fkpc"))+"】的付款重复选择了;<br/>";//超出提示信息
+				}else if(language==9){//繁体
+					msg+="明细中批次为【"+Util.null2String(rs.getString("fkpc"))+"】的付款重复选择了;<br/>";//超出提示信息
+				}else if(language==22){//印尼语
+					msg+="明细中批次为【"+Util.null2String(rs.getString("fkpc"))+"】的付款重复选择了;<br/>";//超出提示信息
+				}
+			}
+			if("0".equals(sfcc)){
+				//当前明细汇总本次支付金额与批次未付金额对比，若超出未付金额，则不可提交
+				sql="select a.*,b.bcfkje from V_uf_httz_dt1 a,(select fkpc as fkpcid,sum(TO_NUMBER(replace(bcfkje,',',''))) as bcfkje  from "+tablename+"_dt5 where mainid="+mainid+" GROUP BY fkpc ) b where a.id=b.fkpcid and a.wfkje<b.bcfkje and a.mainid='"+htxx+"'";
+				log.writeLog("查询明细中本次支付金额是否超出未付金额SQL---------->"+sql);
+				rs.execute(sql);
+				while(rs.next()){
+					sfcc="1";//超出了
+					if(language==0||language==7){//简体
+						msg+="批次【"+Util.null2String(rs.getString("fkpc"))+"】未付金额【"+Util.null2String(rs.getString("wfkje"))+"】元，本次申请支付金额【"+Util.null2String(rs.getString("bcfkje"))+"】元已超出未付金额;<br/>";//超出提示信息
+					}else if(language==8){//英语
+						msg+="批次【"+Util.null2String(rs.getString("fkpc"))+"】未付金额【"+Util.null2String(rs.getString("wfkje"))+"】元，本次申请支付金额【"+Util.null2String(rs.getString("bcfkje"))+"】元已超出未付金额;<br/>";//超出提示信息
+					}else if(language==9){//繁体
+						msg+="批次【"+Util.null2String(rs.getString("fkpc"))+"】未付金额【"+Util.null2String(rs.getString("wfkje"))+"】元，本次申请支付金额【"+Util.null2String(rs.getString("bcfkje"))+"】元已超出未付金额;<br/>";//超出提示信息
+					}else if(language==22){//印尼语
+						msg+="批次【"+Util.null2String(rs.getString("fkpc"))+"】未付金额【"+Util.null2String(rs.getString("wfkje"))+"】元，本次申请支付金额【"+Util.null2String(rs.getString("bcfkje"))+"】元已超出未付金额;<br/>";//超出提示信息
+					}
+				}
+			}
+			if("0".equals(sfcc)){
+				//当前明细汇总本次支付金额+在途流程金额与批次未付金额对比，若超出未付金额，则不可提交
+				sql="select a.*,b.bcfkje,nvl(c.bcfkje_zt,0) as bcfkje_zt from V_uf_httz_dt1 a " +
+						"left join (select fkpc as fkpcid,sum(TO_NUMBER(replace(bcfkje,',',''))) as bcfkje  from "+tablename+"_dt5 where mainid="+mainid+" GROUP BY fkpc ) b  on a.id=b.fkpcid " +
+						"left join (select a.fkpc as fkpcid,sum(TO_NUMBER(replace(a.bcfkje,',',''))) as bcfkje_zt from "+tablename+"_dt5 a，"+tablename+" b,workflow_requestbase c where a.mainid=b.id and b.requestid=c.requestid and c.currentnodetype not in(0,3) and b.htxx='"+htxx+"' GROUP BY a.fkpc ) c on a.id=c.fkpcid " +
+						"where a.wfkje<b.bcfkje+nvl(c.bcfkje_zt,0) and a.mainid='"+htxx+"'";
+				log.writeLog("查询明细中本次支付金额+在途流程金额是否超出未付金额SQL---------->"+sql);
+				rs.execute(sql);
+				while(rs.next()){
+					sfcc="1";//超出了
+					if(language==0||language==7){//简体
+						msg+="批次【"+Util.null2String(rs.getString("fkpc"))+"】未付金额【"+Util.null2String(rs.getString("wfkje"))+"】元，已提交OA流程在途审批中【"+Util.null2String(rs.getString("bcfkje_zt"))+"】元，本次申请支付金额【"+Util.null2String(rs.getString("bcfkje"))+"】元已超出未付金额;<br/>";//超出提示信息
+					}else if(language==8){//英语
+						msg+="批次【"+Util.null2String(rs.getString("fkpc"))+"】未付金额【"+Util.null2String(rs.getString("wfkje"))+"】元，已提交OA流程在途审批中【"+Util.null2String(rs.getString("bcfkje_zt"))+"】元，本次申请支付金额【"+Util.null2String(rs.getString("bcfkje"))+"】元已超出未付金额;<br/>";//超出提示信息
+					}else if(language==9){//繁体
+						msg+="批次【"+Util.null2String(rs.getString("fkpc"))+"】未付金额【"+Util.null2String(rs.getString("wfkje"))+"】元，已提交OA流程在途审批中【"+Util.null2String(rs.getString("bcfkje_zt"))+"】元，本次申请支付金额【"+Util.null2String(rs.getString("bcfkje"))+"】元已超出未付金额;<br/>";//超出提示信息
+					}else if(language==22){//印尼语
+						msg+="批次【"+Util.null2String(rs.getString("fkpc"))+"】未付金额【"+Util.null2String(rs.getString("wfkje"))+"】元，已提交OA流程在途审批中【"+Util.null2String(rs.getString("bcfkje_zt"))+"】元，本次申请支付金额【"+Util.null2String(rs.getString("bcfkje"))+"】元已超出未付金额;<br/>";//超出提示信息
+					}
+				}
+			}
+			//超出未支付金额，则进行提醒，并阻止流程提交
+			if("1".equals(sfcc)){
+				ri.getRequestManager().setMessage("111100");
+				ri.getRequestManager().setMessagecontent(msg);
+				return "0";
+			}
+		 } catch (Exception e) {
+			e.printStackTrace();
+			String error_msg="付款流程提交失败，错误信息为：------>"+e.toString();
+			if(language==0||language==7){//简体
+				
+			}else if(language==8){//英语
+				error_msg="付款流程提交失败，错误信息为：------>"+e.toString();
+			}else if(language==9){//繁体
+				error_msg="付款流程提交失败，错误信息为：------>"+e.toString();
+			}else if(language==22){//印尼语
+				error_msg="付款流程提交失败，错误信息为：------>"+e.toString();
+			}
+			log.writeLog(error_msg);
+			ri.getRequestManager().setMessage("111100");
+			ri.getRequestManager().setMessagecontent(error_msg);
+			return "0";
+		 }
+		 return SUCCESS;
+	}
+}
diff --git a/src/main/youhong_ai_jitu_src/com/jet/action/CheckReimbursementAction.java b/src/main/youhong_ai_jitu_src/com/jet/action/CheckReimbursementAction.java
new file mode 100644
index 0000000..d2ea039
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/com/jet/action/CheckReimbursementAction.java
@@ -0,0 +1,122 @@
+package com.jet.action;
+
+import weaver.conn.RecordSet;
+import weaver.general.BaseBean;
+import weaver.general.Util;
+import weaver.interfaces.workflow.action.Action;
+import weaver.soa.workflow.request.RequestInfo;
+import selfdev.util.base.BaseUtil;
+import selfdev.util.log.LogTool;
+
+/**
+ * 费用报销流程申请节点提交时的校验判断
+ * 1、报销明细若存在团队招待费，则明细dt2中的合计金额需与报销明细中的团队招待费金额相等
+ * 2、报销明细若存在客户招待费，则明细dt3中的合计金额需与报销明细中的客户招待费金额相等
+ * @author KangMD
+ * 2019-11-07
+ */
+public class CheckReimbursementAction extends BaseBean implements Action  {
+
+	public String  execute(RequestInfo ri) {
+		 LogTool log=new LogTool("/log/selfdev/action", false);
+		 //获取requestid
+		 String requestid=ri.getRequestid();
+		 String workflowid=ri.getWorkflowid();
+		 //获取用户语言
+		 int language=ri.getRequestManager().getUser().getLanguage();
+		 log.writeLog("language---------->"+language);
+		 String workflowname=BaseUtil.getBaseInfoByParm("workflowname", "workflow_base", "id", workflowid, "");
+		 log.writeLog("---------------"+workflowname+"开始-------------requestId:" + requestid);
+		 try {
+			RecordSet rs=new RecordSet();
+			String mainid="";//主键ID
+			//获取表名
+			String tablename=BaseUtil.getBaseInfoByParm("tablename", "workflow_bill", "1", "1", " and id in (select formid from workflow_base where id="+workflowid+")");;
+			String sql="select * from "+tablename+" where requestid="+requestid;
+			rs.execute(sql);
+			while(rs.next()){
+				mainid=Util.null2String(rs.getString("id"));
+			}
+			double tdzdf=0;//团队招待费（报销明细）
+			double khzdf=0;//客户招待费（报销明细）
+			double tdzdf_dt2=0;//团队招待费（团队招待费明细）
+			double khzdf_dt3=0;//客户招待费（客户招待费明细）
+			//查询报销明细中是否存在团队招待费和客户招待费的类型
+			sql="select bxlx1,sum(TO_NUMBER(replace(je,',',''))) as je from "+tablename+"_dt8 where mainid="+mainid+" and bxlx1 in ('3-05.02','3-05.03') group by bxlx1 ";
+			rs.execute(sql);
+			while(rs.next()){
+				if("3-05.02".equals(rs.getString("bxlx1"))){
+					khzdf=rs.getDouble("je");//客户招待费
+				}else if("3-05.03".equals(rs.getString("bxlx1"))){
+					tdzdf=rs.getDouble("je");//团队招待费
+				}
+			}
+			//查询团队招待费明细中金额合计
+			sql="select nvl(sum(TO_NUMBER(replace(je,',',''))),0) as je from "+tablename+"_dt2 where mainid="+mainid;
+			rs.execute(sql);
+			while(rs.next()){
+				tdzdf_dt2=rs.getDouble("je");
+			}
+			//查询客户招待费明细中金额合计
+			sql="select nvl(sum(TO_NUMBER(replace(je,',',''))),0) as je from "+tablename+"_dt3 where mainid="+mainid;
+			rs.execute(sql);
+			while(rs.next()){
+				khzdf_dt3=rs.getDouble("je");
+			}
+			
+			String sftg="0";//流程是否可通过  0表示可通过   1表示不可通过
+			String msg="";//提示信息
+			
+			//团队招待费校验
+			if(tdzdf!=tdzdf_dt2){
+				sftg="1";//
+				if(language==0||language==7){//简体
+					msg+="报销明细中报销类型为【团队招待费】金额需与团队招待费明细中的金额合计相等;<br/>";//提示信息
+				}else if(language==8){//英语
+					msg+="报销明细中报销类型为【团队招待费】金额需与团队招待费明细中的金额合计相等;<br/>";//提示信息
+				}else if(language==9){//繁体
+					msg+="报销明细中报销类型为【团队招待费】金额需与团队招待费明细中的金额合计相等;<br/>";//提示信息
+				}else if(language==22){//印尼语
+					msg+="报销明细中报销类型为【团队招待费】金额需与团队招待费明细中的金额合计相等;<br/>";//提示信息
+				}
+			}
+			//客户招待费校验
+			if(khzdf!=khzdf_dt3){
+				sftg="1";//
+				if(language==0||language==7){//简体
+					msg+="报销明细中报销类型为【客户招待费】金额需与客户招待费明细中的金额合计相等;<br/>";//提示信息
+				}else if(language==8){//英语
+					msg+="报销明细中报销类型为【客户招待费】金额需与客户招待费明细中的金额合计相等;<br/>";//提示信息
+				}else if(language==9){//繁体
+					msg+="报销明细中报销类型为【客户招待费】金额需与客户招待费明细中的金额合计相等;<br/>";//提示信息
+				}else if(language==22){//印尼语
+					msg+="报销明细中报销类型为【客户招待费】金额需与客户招待费明细中的金额合计相等;<br/>";//提示信息
+				}
+			}
+			
+			//不通过则进行提醒，并阻止流程提交
+			if("1".equals(sftg)){
+				ri.getRequestManager().setMessage("111100");
+				ri.getRequestManager().setMessagecontent(msg);
+				return "0";
+			}
+		 } catch (Exception e) {
+			e.printStackTrace();
+			String error_msg="报销流程提交失败，错误信息为：------>"+e.toString();
+			if(language==0||language==7){//简体
+				
+			}else if(language==8){//英语
+				error_msg="报销流程提交失败，错误信息为：------>"+e.toString();
+			}else if(language==9){//繁体
+				error_msg="报销流程提交失败，错误信息为：------>"+e.toString();
+			}else if(language==22){//印尼语
+				error_msg="报销流程提交失败，错误信息为：------>"+e.toString();
+			}
+			log.writeLog(error_msg);
+			ri.getRequestManager().setMessage("111100");
+			ri.getRequestManager().setMessagecontent(error_msg);
+			return "0";
+		 }
+		 return SUCCESS;
+	}
+}
diff --git a/src/main/youhong_ai_jitu_src/com/jet/action/CreateBxAP.java b/src/main/youhong_ai_jitu_src/com/jet/action/CreateBxAP.java
new file mode 100644
index 0000000..95916bf
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/com/jet/action/CreateBxAP.java
@@ -0,0 +1,296 @@
+package com.jet.action;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+import org.apache.log4j.Logger;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.jet.util.InvokeHelper;
+
+import weaver.conn.RecordSet;
+import weaver.general.BaseBean;
+import weaver.general.Util;
+import weaver.interfaces.workflow.action.Action;
+import weaver.soa.workflow.request.Cell;
+import weaver.soa.workflow.request.DetailTable;
+import weaver.soa.workflow.request.DetailTableInfo;
+import weaver.soa.workflow.request.MainTableInfo;
+import weaver.soa.workflow.request.Property;
+import weaver.soa.workflow.request.RequestInfo;
+import weaver.soa.workflow.request.Row;
+
+public class CreateBxAP extends BaseBean implements Action{
+	public String execute(RequestInfo request) {
+		   Logger log = Logger.getLogger(JSONObject.class);
+		   RecordSet urlre=new RecordSet();
+		   String urlsql="select * from uf_urlinfo where 	ms='model'";
+		  
+		   urlre.execute(urlsql);
+		   String url="";
+		   String username="";
+		   String password1="";
+		   String dbid1="";
+		   String uuid1="";
+		   String password2="";
+		   while(urlre.next()){
+		   	 url=Util.null2String(urlre.getString("url"));
+		   	 username=Util.null2String(urlre.getString("username"));
+		   	 password1=Util.null2String(urlre.getString("password"));
+		   	 dbid1=Util.null2String(urlre.getString("dbid"));
+		   	 uuid1=Util.null2String(urlre.getString("uuid"));
+		   	 password2=Util.null2String(urlre.getString("password1"));
+		   }
+		   String baseis=username+":"+password1;
+	
+		// TODO Auto-generated method stub
+		SimpleDateFormat sim=new SimpleDateFormat("yyyy-MM-dd");
+		String CurretDate=sim.format(new Date());
+		String requestid=request.getRequestid();
+		String sfxr="";//是否写入标识
+		writeLog("CreateBxAP---->"+requestid);
+		MainTableInfo MainTableInfo=request.getMainTableInfo();
+		Property[] props=MainTableInfo.getProperty();
+		String zt="";//账套
+		String zz="";//组织
+		String K3depCode="";//K3部门编号
+		JSONObject MainJson=new JSONObject();
+		JSONObject FBillTypeID=new JSONObject();
+		FBillTypeID.put("FNumber",  "YFD01_SYS");
+		MainJson.put("FBillTypeID", FBillTypeID);//默认应付单
+		MainJson.put("FDATE", CurretDate);//单据日期
+		MainJson.put("FENDDATE_H", CurretDate);//到期日
+		MainJson.put("FBUSINESSTYPE", "CG");
+		MainJson.put("FMatchMethodID", "0");//核销方式
+		MainJson.put("F_RTA_InvoiceNo", CurretDate+requestid+"66");//发票
+		MainJson.put("F_RTA_BusinessType", "");
+		//相关资料 json
+		JSONObject FSUPPLIERID=new JSONObject();//供应商
+		JSONObject FCURRENCYID=new JSONObject();//币别
+		JSONObject FCURRENCYID2=new JSONObject();//币别2
+		JSONObject FSETTLEORGID=new JSONObject();//结算组织
+		JSONObject FTaxType =new JSONObject();//税务分类
+		FTaxType.put("FNumber", "PKP");
+		JSONObject FPAYORGID=new JSONObject();//付款组织
+		MainJson.put("FSUPPLIERID", FSUPPLIERID);
+		MainJson.put("FCURRENCYID", FCURRENCYID);
+		MainJson.put("FSETTLEORGID", FSETTLEORGID);
+		MainJson.put("FTaxType", FTaxType);
+		MainJson.put("FPAYORGID", FPAYORGID);
+		//初始化其他供应商信息
+		JSONArray FsubHeadSuppilers=new JSONArray();
+		JSONObject FsubHeadSuppiler=new JSONObject();
+		MainJson.put("FsubHeadSuppiler", FsubHeadSuppiler);
+		for(Property prop:props){
+			String name=prop.getName();
+			String value=prop.getValue();
+			if("bxzje".equals(name)){//FALLAMOUNTFOR：合计金额
+				MainJson.put("FALLAMOUNTFOR", value);//默认应付单
+				writeLog("bxzje---->"+value);
+			}
+			if("gys".equals(name)){//FSUPPLIERID：供应商
+				FSUPPLIERID.put("FNumber", value);
+				JSONObject FORDERID=new JSONObject();
+				FORDERID.put("FNumber", value);
+				JSONObject FTRANSFERID=new JSONObject();
+				FTRANSFERID.put("FNumber", value);
+				JSONObject FChargeId=new JSONObject();
+				FChargeId.put("FNumber", value);
+				FsubHeadSuppiler.put("FEntryId", 0);
+				FsubHeadSuppiler.put("FORDERID", FORDERID);
+				FsubHeadSuppiler.put("FTRANSFERID", FTRANSFERID);
+				FsubHeadSuppiler.put("FChargeId", FChargeId);
+				//FsubHeadSuppilers.add(FsubHeadSuppiler);
+				writeLog("gys---->"+value);
+			}
+			if("k3bmbh".equals(name)){//FPURCHASEDEPTID：采购组织
+				//MainJson.put("FPURCHASEDEPTID", value);
+				K3depCode=value;
+				writeLog("k3bmbh---->"+value);
+			}
+			if("bz".equals(name)){//FCURRENCYID：币种
+				FCURRENCYID.put("FNumber", value);//默认应付单
+				FCURRENCYID2.put("FNumber", value);//默认应付单
+				writeLog("bz---->"+value);
+			}
+			if("zz".equals(name)){//FSETTLEORGID：结算组织 FPAYORGID：付款组织
+				FSETTLEORGID.put("FNumber", value);
+				FPAYORGID.put("FNumber", value);
+				zz=value;
+				writeLog("zz---->"+value);
+			}
+			if("bxms".equals(name)){//FAP_Remark：备注
+				MainJson.put("FAP_Remark", value);
+				writeLog("bxms---->"+value);
+			}
+			if("sfxr".equals(name)){
+				sfxr=value;
+				writeLog("sfxr---->"+value);
+			}
+			if("zt".equals(name)){
+				zt=value;
+			}
+			
+		}
+		String K3bmID=getK3Departmet(K3depCode,zt,zz);//获取K3部门ID
+		if("".equals(K3depCode)){
+				request.getRequestManager().setMessageid("失败");
+				request.getRequestManager().setMessage("失败");//提醒信息id
+		    	request.getRequestManager().setMessagecontent("写入K3系统不成功:为获取采购组织");//提醒信息内容
+		    	return FAILURE_AND_CONTINUE;
+		}
+		JSONObject FPURCHASEDEPTID=new JSONObject();
+		FPURCHASEDEPTID.put("FNumber", K3depCode);
+		MainJson.put("FPURCHASEDEPTID", FPURCHASEDEPTID);
+		//初始化其他财务信息  FsubHeadFinc
+		
+		JSONObject FsubHeadFinc=new JSONObject();
+		//JSONObject FMAINBOOKSTDCURRID=new JSONObject();
+		JSONObject FEXCHANGETYPE=new JSONObject();
+		FEXCHANGETYPE.put("FNumber", "HLTX01_SYS");
+		FsubHeadFinc.put("FEntryId", 0);
+		FsubHeadFinc.put("FACCNTTIMEJUDGETIME", CurretDate);
+		FsubHeadFinc.put("FMAINBOOKSTDCURRID", FCURRENCYID2);
+		FsubHeadFinc.put("FExchangeRate", 1);
+		FsubHeadFinc.put("FTaxAmountFor", MainJson.get("FALLAMOUNTFOR"));
+		FsubHeadFinc.put("FNoTaxAmountFor", MainJson.get("FALLAMOUNTFOR"));
+		MainJson.put("FsubHeadFinc", FsubHeadFinc);
+		//拼接明细表数据
+		JSONArray FEntityDetails=new JSONArray();
+		JSONArray FEntityPlans=new JSONArray();
+		MainJson.put("FEntityDetail", FEntityDetails) ;
+		MainJson.put("FEntityPlan", FEntityPlans) ;
+		JSONObject FEntityDetail=null;//new JSONObject();
+		JSONObject FEntityPlan=null;
+		FEntityPlan=new JSONObject();
+		DetailTableInfo DetailTableInfo=request.getDetailTableInfo();
+		DetailTable DetailTable=DetailTableInfo.getDetailTable(7);
+		Row[] Rows=DetailTable.getRow();
+		for(Row r:Rows){
+			FEntityDetail=new JSONObject();
+			
+			JSONObject FMATERIALID=new JSONObject();//物料
+			JSONObject FPRICEUNITID=new JSONObject();//单位
+			JSONObject FMATERIALID1=new JSONObject();//物料
+			JSONObject FPRICEUNITID1=new JSONObject();//单位
+//			FEntityPlan.put("FPRICEUNITID", FPRICEUNITID1);
+//			FEntityPlan.put("FMATERIALID", FMATERIALID1);
+			//FEntityPlan.put("FEntityPlan", CurretDate);
+			FEntityDetail.put("FPriceQty","1");
+			FEntityDetail.put("FBASICUNITQTY","1");
+			
+			FPRICEUNITID.put("FNumber", "Pcs");
+			FPRICEUNITID1.put("FNumber", "Pcs");
+			
+			FEntityDetail.put("FPRICEUNITID", FPRICEUNITID);
+			FEntityDetail.put("FMATERIALID", FMATERIALID);
+			FEntityDetail.put("F_RTA_FakturPajakNo_d", "-");
+			FEntityDetail.put("F_RTA_AccumulatedAmount", 0);
+			Cell[] Cells=r.getCell();
+			for(Cell Cell:Cells){
+				String name=Cell.getName();
+				String value=Cell.getValue();
+				if("bxlx1".equals(name)){//物料编号
+					FMATERIALID.put("FNumber", value);
+					FMATERIALID1.put("FNumber", value);
+					writeLog("bxlx1---->"+value);
+				}
+				if("je".equals(name)){//金额
+					FEntityDetail.put("FPrice", value);
+					FEntityDetail.put("FTaxPrice", value);
+					FEntityDetail.put("FNoTaxAmountFor_D", value);
+					FEntityDetail.put("FALLAMOUNTFOR_D", value);
+					
+					writeLog("je---->"+value);
+				}
+				if("bz".equals(name)){//备注
+					FEntityDetail.put("F_RTA_EntryRemarks", value);
+					writeLog("bz---->"+value);
+				}
+			}
+			FEntityDetails.add(FEntityDetail);
+			
+		}
+		FEntityPlan.put("FPAYRATE",100);
+		FEntityPlan.put("FENDDATE", CurretDate);
+		FEntityPlan.put("FPAYAMOUNTFOR", MainJson.get("FALLAMOUNTFOR"));
+		FEntityPlan.put("FPAYAMOUNT", MainJson.get("FALLAMOUNTFOR"));
+		FEntityPlan.put("FPRICE_P", MainJson.get("FALLAMOUNTFOR"));
+		FEntityPlan.put("FQTY_P", 1);
+		FEntityPlans.add(FEntityPlan);
+		//数据提交
+		writeLog("FEntityDetails---->"+FEntityDetails.toJSONString());
+		writeLog("MainJson---->"+MainJson.toJSONString());
+		JSONObject Model=new JSONObject();
+		Model.put("NeedReturnFields", new String[]{"BillNo"});
+		Model.put("IsAutoSubmitAndAudit", true);
+		Model.put("Model", MainJson);
+		
+		//数据写入
+		writeLog("Model--->"+Model.toJSONString());
+		if(Model!=null&&Model.size()>0&&("".equals(sfxr)||"1".equals(sfxr))){
+	   	    RecordSet updRec=new RecordSet();
+	   	    com.jet.util.InvokeHelper.POST_K3CloudURL="http://k3.jet.co.id:8880/k3cloud/";
+	   		String dbid="5d48f604c8361e";//dbid1;//"5d48f604c8361e";//"5a964ecc967246";
+	   		String uuid=uuid1;
+	   		String password=password2;
+	   		org.json.JSONObject resultjson=null;
+	   		int lang=2052;
+	   		try {
+	   			boolean flag=InvokeHelper.Login(dbid, uuid, password, lang);
+	   			//out.print(flag);
+	   			if(flag){//登陆成功
+	   				resultjson=com.jet.util.InvokeHelper.Save("AP_Payable",Model.toJSONString());
+	   				boolean flag1=resultjson.getBoolean("flag");
+	   				String  resultstr=resultjson.getString("sResult");
+	   				log.error("resultstr"+resultstr);
+	   				if(flag1){
+	   					JSONObject HAHA=JSONObject.parseObject(resultstr);
+	   					JSONObject Result=HAHA.getJSONObject("Result");
+	   					JSONObject ResponseStatus=Result.getJSONObject("ResponseStatus");
+	   					boolean IsSuccess=ResponseStatus.getBoolean("IsSuccess");
+	   					if(IsSuccess){
+	   						JSONArray SuccessEntitys=ResponseStatus.getJSONArray("SuccessEntitys");
+	   						String Number=SuccessEntitys.getJSONObject(0).getString("Number");
+	   						updRec.execute("update formtable_main_22 set sfxr='0',yfdbh='"+Number+"' where requestid='"+requestid+"' ");
+	   						  						
+	   					}else{
+	   						//out.print("失败");
+	   						request.getRequestManager().setMessageid("失败");
+	   						request.getRequestManager().setMessage("失败");//提醒信息id
+	   				    	request.getRequestManager().setMessagecontent("写入K3系统不成功，系统反馈信息如下："+HAHA.toString());//提醒信息内容
+
+	   						return Action.FAILURE_AND_CONTINUE;
+	   					}
+	   				}else{
+	   					//out.print("失败"+resultstr);
+	   					request.getRequestManager().setMessageid("失败");
+	   					request.getRequestManager().setMessage("失败");//提醒信息id
+   				    	request.getRequestManager().setMessagecontent("写入K3系统不成功，系统反馈信息如下："+resultstr.toString());//提醒信息内容
+
+   						return Action.FAILURE_AND_CONTINUE;
+	   				}
+	   				
+	   			}
+	   		} catch (Exception e) {
+	   			 //TODO Auto-generated catch block
+	   			log.error("AP_Payable--Exception"+e.getMessage());
+	   			e.printStackTrace();
+	   		} 
+		}
+		return SUCCESS; 
+	}
+	//获取K3 部门ID
+	public String getK3Departmet(String k3bm,String zt,String zz){
+		String bmID="";
+		RecordSet re=new RecordSet();
+		String sql="select b.ENTRYID from uf_K3baseinfo a,uf_K3baseinfo_dt1 b where a.id=b.mainid and a.zt='"+zt+"' and a.lx='FFLEX5' and b.FORGNAME='"+zz+"' and bh='"+k3bm+"' ";
+		writeLog("getK3Departmet--->"+sql);
+		re.execute(sql);
+		while(re.next()){
+			bmID=re.getString("ENTRYID");
+		}
+		return bmID;
+	}
+}
diff --git a/src/main/youhong_ai_jitu_src/com/jet/action/CreateJD.java b/src/main/youhong_ai_jitu_src/com/jet/action/CreateJD.java
new file mode 100644
index 0000000..01c3de0
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/com/jet/action/CreateJD.java
@@ -0,0 +1,266 @@
+package com.jet.action;
+
+import java.util.*;
+import weaver.soa.workflow.request.RequestInfo;
+import weaver.workflow.action.BaseAction;
+import weaver.conn.RecordSet;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import weaver.hrm.HrmUserVarify;
+import weaver.hrm.User;
+import weaver.general.BaseBean;
+import weaver.general.Util;
+import org.apache.log4j.Logger;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import java.text.SimpleDateFormat;
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.Statement;
+import weaver.general.StaticObj;
+import weaver.interfaces.datasource.DataSource;
+import weaver.formmode.setup.ModeRightInfo;
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import weaver.general.StaticObj;
+import weaver.interfaces.datasource.DataSource;
+import weaver.interfaces.workflow.action.Action;
+
+import java.math.BigDecimal;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.PrintWriter;
+import java.net.URL;
+import java.net.URLConnection;
+import org.apache.http.Header;
+import org.apache.http.HttpResponse;
+import org.apache.http.HttpStatus;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.entity.*;
+import org.apache.http.*;
+import org.apache.http.util.*;
+import org.apache.http.impl.client.DefaultHttpClient;
+import org.apache.http.params.CoreConnectionPNames;
+import java.util.UUID;
+import java.nio.charset.Charset;
+import java.io.BufferedReader;
+import java.io.ByteArrayOutputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import weaver.conn.RecordSetTrans;
+import java.io.PrintWriter;
+
+public class CreateJD extends BaseAction{
+   @Override
+   public String execute(RequestInfo requestInfo) {
+	   // TODO Auto-generated method stub
+	   Logger log = Logger.getLogger(JSONObject.class);
+	   Map<String,String> Hswd=new HashMap<String,String>();//核算维度对照表
+	   Hswd.put("FFLEX4","gys");//供应商
+	   Hswd.put("FFLEX6","kh");//客户
+	   Hswd.put("FFLEX7","yg");//员工
+	   Hswd.put("FFLEX5","bm");//部门
+	   Hswd.put("FFLEX9","fyxm");//费用项目
+	   Hswd.put("FFLEX8","wl");//物料
+	   Hswd.put("FFLEX10","zc");//资产
+	   Hswd.put("FFLEX12","wlz");//物料组
+	   Hswd.put("FFLEX13","khz");//客户组
+	   
+	   List<String> jlist=new ArrayList<String>();//借方
+	   List<String> dlist=new ArrayList<String>();//贷方
+	   String requestid=requestInfo.getRequestid();//
+	   String mainid="";//
+	   String zt="";//账套
+	   String zz="";//组织
+	   String zb="";//账薄
+	   String zzjdhl="";//做账节点汇率
+	   String bz="";//币种
+	   RecordSet re=new RecordSet();
+	   String jsql="";
+	   String dsql=""; 
+	   float zje=0.0f;
+	   String sql="select a.zzjdhl,a.bz,a.id,a.zt,a.zz,a.zb,sum(je) je,b.bxr,b.bxlx from formtable_main_22 a,formtable_main_22_dt8 b where a.id=b.mainid and a.requestid='"+requestid+"' group by a.zzjdhl,a.bz,a.id,a.zt,a.zz,a.zb,b.bxr,b.bxlx";
+	   log.error(requestid+"CreateJD"+sql);
+	   re.execute(sql);
+	   while(re.next()){
+	  	mainid=Util.null2String(re.getString("id")).trim();
+	  	zzjdhl=Util.null2String(re.getString("zzjdhl")).trim();
+	  	if("".equals(zzjdhl.trim())){
+	  		zzjdhl="1";
+	  	}
+	  	bz=Util.null2String(re.getString("bz")).trim();
+	  	int xsw=getXsw(bz);
+	  	zt=Util.null2String(re.getString("zt")).trim();
+	  	zz=Util.null2String(re.getString("zz")).trim();  
+	  	zb=Util.null2String(re.getString("zb")).trim();
+	  	String bxlx= re.getString("bxlx");//报销科目
+	  	String je= Util.null2String(re.getString("je")).trim();//报销金额
+	  	//je=getfloats(je,zzjdhl,xsw)+"";
+	  	zje=getfloats1(je,zje+"",2);
+	  	String FDIMENSION=getFzhx(bxlx,zt,zz,zb,Hswd);
+	  	String accountname=getKmname(bxlx,zt,zz,zb);
+	  	
+	  	jsql="insert into formtable_main_22_dt4(mainid,jfkmbm,jfkmmc,hswd,yje,zy)values("+mainid+",'"+bxlx+"','"+accountname+"','"+FDIMENSION+"',"+je+",'')";
+	  	jlist.add(jsql);
+	   }
+	   if(jlist.size()>0){
+	  	//插入贷方
+	  	 jlist.add("insert into formtable_main_22_dt5(mainid,dfkmbm,dfkmmc,hswd,yje,zy)values("+mainid+",'2000.01','AccountPayableIDR','',"+zje+",'')");
+	   }
+	   if(jlist.size()>0){
+	  	 log.error(jlist.toString());
+	  	 boolean flag=SynInsert1(jlist);
+	  	if(!flag){
+		    requestInfo.getRequestManager().setMessageid("创建借贷失败");
+	    	requestInfo.getRequestManager().setMessage("创建借贷失败");//提醒信息id
+	    	requestInfo.getRequestManager().setMessagecontent("创建借贷失败");//提醒信息内容
+
+			return Action.FAILURE_AND_CONTINUE; 
+	 }
+	   }
+	   return SUCCESS;
+   }
+ //获取赋值核算类型
+   public String getFzhx(String km,String zt,String zz,String zb,Map<String,String> Hswd){
+   	String FDIMENSION="";//核算维度
+   	RecordSet re=new RecordSet();
+   	String sql="select b.FDIMENSION from uf_accountinfo a,uf_accountinfo_dt1 b where a.id=b.mainid and a.zt='"+zt+"' and b.FNUMBER='"+km+"' and b.forgnumber='"+zz+"' and FAcctBookNumber='"+zb+"' ";
+   	//out.print(sql);
+   	re.execute(sql);
+   	while(re.next()){
+   		String str=Util.null2String(re.getString("FDIMENSION")).trim() ;
+   		String[] FDIMENSIONs=str.split(",");
+   		for(String demo:FDIMENSIONs){
+   		  if(demo!=null&&!"".equals(demo)){
+   			FDIMENSION=FDIMENSION+Hswd.get(FDIMENSION)+",";
+   		  }
+   		}
+   	}
+   	return FDIMENSION;
+   }
+   //insert 事务
+   public  boolean SynInsert1(List<String> array){
+         if(array==null||array.size()<=0){
+           return false;
+         }
+         Logger log = Logger.getLogger(DataSource.class);
+         RecordSetTrans RecordSetTrans=new RecordSetTrans();
+         RecordSetTrans.setAutoCommit(false);
+   	  boolean flag=true;
+
+   	try{
+   		RecordSetTrans.setAutoCommit(false);	
+   	   // stmt = conn.createStatement();
+   	    for(String str:array){
+   	       //int index =RecordSetTrans.executeUpdate(str);
+   	    	flag=RecordSetTrans.executeSql(str);
+   	        log.error("SynInsert--"+str);
+   	       if(!flag){
+   	         //flag=false;
+   	         break;
+   	       }
+   	    }
+   	    if(!flag){//事务回滚
+   	    	RecordSetTrans.rollback();
+   	    }else{
+   	    	RecordSetTrans.commit();
+   	    }
+   	    }catch(Exception e){
+   	       log.error("SynInsert--Exception "+e.getMessage());
+   	       flag=false; 
+   	    }
+   	    
+   return 	  flag;  
+   }
+   //获取科目名称
+   public String getKmname(String km,String zt,String zz,String zb){
+   	String FNAME="";//核算维度
+   	RecordSet re=new RecordSet();
+   	String sql="select b.FNAME from uf_accountinfo a,uf_accountinfo_dt1 b where a.id=b.mainid and a.zt='"+zt+"' and b.FNUMBER='"+km+"' and b.forgnumber='"+zz+"' and FAcctBookNumber='"+zb+"' ";
+   	re.execute(sql);
+   	while(re.next()){
+   		FNAME=Util.null2String(re.getString("FNAME"));
+   	}
+   	return FNAME;
+   }
+   //获取币种的小数位
+   public int getXsw(String bz){
+   	int xsw=0;
+   	RecordSet re=new RecordSet();
+   	String sql="select * from uf_k3bz where bh='"+bz+"'";
+   	re.execute(sql);
+   	while(re.next()){
+   		xsw=Integer.parseInt(Util.null2o(re.getString("xsw")))  ;
+   	}
+      return xsw;
+   }
+
+   //浮点型转换
+   public static float getfloats(String demo,String demo1,int len){
+   	Logger log = Logger.getLogger(BigDecimal.class);
+   	if(len==0){
+   		len=0;
+   	}
+   	String str=Util.null2String(demo);
+   	String str1=Util.null2String(demo1);
+   	if("".equals(str)||"".equals(str.trim())||"null".equalsIgnoreCase(str.trim())){
+   		return 0;
+   	}
+   	if("".equals(str1)||"".equals(str.trim())||"null".equalsIgnoreCase(str1.trim())){
+   		str1="1";
+   	}
+   	float fl=0.0f;
+   	//String str=Util.null2String(demo);
+   	try{
+   	if(str.trim().length()>0){
+   		    BigDecimal b1 = new BigDecimal(str.trim());
+   		    BigDecimal b2 = new BigDecimal(str1.trim());
+   		    BigDecimal b3=b1.multiply(b2);
+   			//System.out.println(b1.setScale(2,BigDecimal.ROUND_HALF_UP));
+   		    fl=b3.setScale(len,BigDecimal.ROUND_HALF_UP).floatValue();
+   	}
+   	log.error("getfloats"+fl);
+   	}catch(Exception e){
+   		log.error(demo+"getfloats异常"+e.getMessage());	
+   	}
+   	return fl;
+   }
+
+
+   //浮点型转换
+   public static float getfloats1(String demo,String demo1,int len){
+   	Logger log = Logger.getLogger(BigDecimal.class); 
+   	if(len==0){
+   		len=0;
+   	}
+   	String str=Util.null2String(demo);
+   	String str1=Util.null2String(demo1);
+   	if("".equals(str)||"".equals(str.trim())||"null".equalsIgnoreCase(str.trim())){
+   		str="0";
+   	}
+   	if("".equals(str1)||"".equals(str.trim())||"null".equalsIgnoreCase(str1.trim())){
+   		str1="0";
+   	}
+   	float fl=0.0f;
+   	//String str=Util.null2String(demo);
+   	try{
+   	if(str.trim().length()>0){
+   		    BigDecimal b1 = new BigDecimal(str.trim());
+   		    BigDecimal b2 = new BigDecimal(str1.trim()); 
+   		    BigDecimal b3=b1.add(b2);
+   			//System.out.println(b1.setScale(2,BigDecimal.ROUND_HALF_UP));
+   		    fl=b3.setScale(len,BigDecimal.ROUND_HALF_UP).floatValue();
+   	}
+   	log.error("getfloats"+fl);
+   	}catch(Exception e){
+   		log.error(demo+"getfloats异常"+e.getMessage());	
+   	}
+   	return fl;
+   }
+}
diff --git a/src/main/youhong_ai_jitu_src/com/jet/action/CreateJkJD.java b/src/main/youhong_ai_jitu_src/com/jet/action/CreateJkJD.java
new file mode 100644
index 0000000..bda34f1
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/com/jet/action/CreateJkJD.java
@@ -0,0 +1,398 @@
+package com.jet.action;
+
+import java.util.*;
+import weaver.soa.workflow.request.RequestInfo;
+import weaver.workflow.action.BaseAction;
+import weaver.conn.RecordSet;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import weaver.general.Util;
+import org.apache.log4j.Logger;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import java.text.SimpleDateFormat;
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.Statement;
+import weaver.general.StaticObj;
+import weaver.interfaces.datasource.DataSource;
+import weaver.formmode.setup.ModeRightInfo;
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import weaver.general.StaticObj;
+import weaver.interfaces.datasource.DataSource;
+import weaver.interfaces.workflow.action.Action;
+
+import java.math.BigDecimal;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.PrintWriter;
+import java.net.URL;
+import java.net.URLConnection;
+import org.apache.http.Header;
+import org.apache.http.HttpResponse;
+import org.apache.http.HttpStatus;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.entity.*;
+import org.apache.http.*;
+import org.apache.http.util.*;
+import org.apache.http.impl.client.DefaultHttpClient;
+import org.apache.http.params.CoreConnectionPNames;
+import java.util.UUID;
+import java.nio.charset.Charset;
+import java.io.BufferedReader;
+import java.io.ByteArrayOutputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import weaver.conn.RecordSetTrans;
+import java.io.PrintWriter;
+
+public class CreateJkJD extends BaseAction{
+	@Override
+	public String execute(RequestInfo requestInfo) {
+		// TODO Auto-generated method stub
+		//创建借款的借贷方
+		//0:贷方现金　
+		//1:借方还款(职员)　
+		//2:借方借款(职员)
+		Logger log = Logger.getLogger(JSONObject.class);
+		 Map<String,String> Hswd=new HashMap<String,String>();//核算维度对照表
+		 Hswd.put("FFLEX4","gys");//供应商
+		 Hswd.put("FFLEX6","kh");//客户
+		 Hswd.put("FFLEX7","yg");//员工
+		 Hswd.put("FFLEX5","bm");//部门
+		 Hswd.put("FFLEX9","fyxm");//费用项目
+		 Hswd.put("FFLEX8","wl");//物料
+		 Hswd.put("FFLEX10","zc");//资产
+		 Hswd.put("FFLEX12","wlz");//物料组
+		 Hswd.put("FFLEX13","khz");//客户组
+		 RecordSet urlre=new RecordSet();
+		 String urlsql="select * from uf_urlinfo ";
+		 
+		 String url="";
+		 String username="";
+		 String password="";
+		 urlre.execute(urlsql);
+		 while(urlre.next()){
+			 url=Util.null2String(urlre.getString("url"));
+			 username=Util.null2String(urlre.getString("username"));
+			 password=Util.null2String(urlre.getString("password"));
+		 }
+		 List<String> jlist=new ArrayList<String>();//借方
+		 List<String> dlist=new ArrayList<String>();//贷方
+		 String requestid=requestInfo.getRequestid();//
+		 String mainid="";//
+		 String zt="";//账套
+		 String zz="";//组织
+		 String zb="";//账薄
+		 String zzjdhl="";//做账节点汇率
+		 String bz="";//币种
+		 String fkyh="";//付款银行
+		 String je="";//借款金额
+		 String jklx="";//借款类型
+		 String dls="";//代理商
+		 String emp="";//代理商
+		 RecordSet re=new RecordSet();
+		 String jsql="";
+		 String dsql=""; 
+		 String sql="select * from formtable_main_24 where requestid='"+requestid+"'";
+		 log.error(requestid+"CreateJkJD"+sql);
+		 re.execute(sql);
+		 while(re.next()){
+			emp=Util.null2String(re.getString("emp")).trim();
+			mainid=Util.null2String(re.getString("id")).trim();
+			zz=Util.null2String(re.getString("zz")).trim();//组织	
+			zt=Util.null2String(re.getString("zt")).trim();//账套
+			zb=Util.null2String(re.getString("zb")).trim();//账薄
+			
+			fkyh=Util.null2String(re.getString("fkyxzh")).trim();//付款银行
+			je=Util.null2String(re.getString("jkje")).trim();//金额
+			jklx=Util.null2String(re.getString("jklx")).trim();//借款类型
+			dls=Util.null2String(re.getString("dls")).trim();//代理商
+		 }
+		 //判定借方科目
+		 String jfkm="";//借方科目
+		 String jfkmDesc="";//借方科目
+		 String dfkm="";//贷方科目
+		 String dfkmDesc="";//贷方科目
+		 if("0".equals(jklx)){//个人
+			 jfkm=SpelKm(zt,zz,zb,"2");
+			 if("".equals(fkyh)){//现金
+				 dfkm=SpelKm(zt,zz,zb,"0");
+			 }else{//转账
+				 dfkm=fkyh;
+			 }
+		 }else{//代理商
+			 if("".equals(fkyh)){//现金
+				 dfkm=SpelKm(zt,zz,zb,"0");
+			 }else{//转账
+				 dfkm=fkyh;
+			 }
+		    //通过接口 获取贷方科目
+		    if(!"".equals(dls)){
+			   String result=sendGet(url+"CusGlbalance/"+dls,"",username+":"+password);
+			   //out.print(result);
+			   Map<String,String> map=getJSONToMap(result);
+			   jfkm=Util.null2String(map.get("FAcctNumber"));
+		    }
+		 }
+		 if(!"".equals(jfkm)){
+			 jfkmDesc=getKmname(jfkm,zt,zz,zb);
+		 }
+		 if(!"".equals(dfkm)){
+			 dfkmDesc=getKmname(dfkm,zt,zz,zb);
+		 }
+		 if("0".equals(jklx)){
+			 dls="";
+		 }
+		 jlist.add("insert into  formtable_main_24_dt1(mainid,jfkmbm,jfkmmc,jfje,kh,yg)values('"+mainid+"','"+jfkm+"','"+jfkmDesc+"','"+je+"','"+dls+"','"+emp+"')");
+		 jlist.add("insert into  formtable_main_24_dt2(mainid,dfkmbm,dfkmmc,dfje)values('"+mainid+"','"+dfkm+"','"+dfkmDesc+"','"+je+"')");
+		 if(jlist.size()>0){
+			 log.error(jlist.toString());
+			 boolean flag=SynInsert1(jlist);
+			 if(!flag){
+				    requestInfo.getRequestManager().setMessageid("创建借贷失败");
+			    	requestInfo.getRequestManager().setMessage("创建借贷失败");//提醒信息id
+			    	requestInfo.getRequestManager().setMessagecontent("创建借贷失败");//提醒信息内容
+
+					return Action.FAILURE_AND_CONTINUE; 
+			 }
+		 }
+		return super.execute(requestInfo);
+	}
+	//将JSON 解析成 Map
+	public Map<String,String> getJSONToMap(String str){
+		Map<String,String> map=new HashMap<String,String>();
+		try{
+			JSONArray jsons=JSONObject.parseArray(str);
+		    if(jsons!=null&&jsons.size()>0){
+		    	JSONObject json=(JSONObject)jsons.get(0);
+		    	Set<String> set=json.keySet();
+		    	for(String demo:set){
+		    		map.put(demo,Util.null2String(json.getString(demo)));
+		    	}
+		    }
+		}catch(Exception  e){
+			
+		}
+		return map;
+	}
+	//取特殊科目编号
+	public String SpelKm(String zt,String zz,String zb,String lx){
+		Logger log = Logger.getLogger(BigDecimal.class);
+		RecordSet re=new RecordSet();
+		String km="";//科目
+		re.execute("select * from uf_k3tskm a,uf_k3tskm_dt1 b  where a.id=b.mainid and zt='"+zt+"' and zz='"+zz+"' and zb='"+zb+"' and lx='"+lx+"'");
+		while(re.next()){
+			km=re.getString("km");
+		}
+		return km;
+	}
+	//获取赋值核算类型
+	public String getFzhx(String km,String zt,String zz,String zb,Map<String,String> Hswd){
+		String FDIMENSION="";//核算维度
+		RecordSet re=new RecordSet();
+		String sql="select b.FDIMENSION from uf_accountinfo a,uf_accountinfo_dt1 b where a.id=b.mainid and a.zt='"+zt+"' and b.FNUMBER='"+km+"' and b.forgnumber='"+zz+"' and FAcctBookNumber='"+zb+"' ";
+		//out.print(sql);
+		re.execute(sql);
+		while(re.next()){
+			String str=Util.null2String(re.getString("FDIMENSION")).trim() ;
+			String[] FDIMENSIONs=str.split(",");
+			for(String demo:FDIMENSIONs){
+			  if(demo!=null&&!"".equals(demo)){
+				FDIMENSION=FDIMENSION+Hswd.get(FDIMENSION)+",";
+			  }
+			}
+		}
+		return FDIMENSION;
+	}
+	//insert 事务
+	public  boolean SynInsert1(List<String> array){
+	      if(array==null||array.size()<=0){
+	        return false;
+	      }
+	      Logger log = Logger.getLogger(DataSource.class);
+	      RecordSetTrans RecordSetTrans=new RecordSetTrans();
+	      RecordSetTrans.setAutoCommit(false);
+		  boolean flag=true;
+
+		try{
+			RecordSetTrans.setAutoCommit(false);	
+		   // stmt = conn.createStatement();
+		    for(String str:array){
+		       //int index =RecordSetTrans.executeUpdate(str);
+		    	flag=RecordSetTrans.executeSql(str);
+		        log.error("SynInsert--"+str);
+		       if(!flag){
+		         //flag=false;
+		         break;
+		       }
+		    }
+		    if(!flag){//事务回滚
+		    	RecordSetTrans.rollback();
+		    }else{
+		    	RecordSetTrans.commit();
+		    }
+		    }catch(Exception e){
+		       log.error("SynInsert--Exception "+e.getMessage());
+		       flag=false; 
+		    }
+		    
+	return 	  flag;  
+	}
+	//获取科目名称
+	public String getKmname(String km,String zt,String zz,String zb){
+		String FNAME="";//核算维度
+		RecordSet re=new RecordSet();
+		String sql="select b.FNAME from uf_accountinfo a,uf_accountinfo_dt1 b where a.id=b.mainid and a.zt='"+zt+"' and b.FNUMBER='"+km+"' and b.forgnumber='"+zz+"' and FAcctBookNumber='"+zb+"' ";
+		re.execute(sql);
+		while(re.next()){
+			FNAME=Util.null2String(re.getString("FNAME"));
+		}
+		return FNAME;
+	}
+	//获取币种的小数位
+	public int getXsw(String bz){
+		int xsw=0;
+		RecordSet re=new RecordSet();
+		String sql="select * from uf_k3bz where bh='"+bz+"'";
+		re.execute(sql);
+		while(re.next()){
+			xsw=Integer.parseInt(Util.null2o(re.getString("xsw")))  ;
+		}
+	   return xsw;
+	}
+
+	//浮点型转换
+	public static float getfloats(String demo,String demo1,int len){
+		Logger log = Logger.getLogger(BigDecimal.class);
+		if(len==0){
+			len=0;
+		}
+		String str=Util.null2String(demo);
+		String str1=Util.null2String(demo1);
+		if("".equals(str)||"".equals(str.trim())||"null".equalsIgnoreCase(str.trim())){
+			return 0;
+		}
+		if("".equals(str1)||"".equals(str.trim())||"null".equalsIgnoreCase(str1.trim())){
+			str1="1";
+		}
+		float fl=0.0f;
+		//String str=Util.null2String(demo);
+		try{
+		if(str.trim().length()>0){
+			    BigDecimal b1 = new BigDecimal(str.trim());
+			    BigDecimal b2 = new BigDecimal(str1.trim());
+			    BigDecimal b3=b1.multiply(b2);
+				//System.out.println(b1.setScale(2,BigDecimal.ROUND_HALF_UP));
+			    fl=b3.setScale(len,BigDecimal.ROUND_HALF_UP).floatValue();
+		}
+		log.error("getfloats"+fl);
+		}catch(Exception e){
+			log.error(demo+"getfloats异常"+e.getMessage());	
+		}
+		return fl;
+	}
+
+
+	//浮点型转换
+	public static float getfloats1(String demo,String demo1,int len){
+		Logger log = Logger.getLogger(BigDecimal.class); 
+		if(len==0){
+			len=0;
+		}
+		String str=Util.null2String(demo);
+		String str1=Util.null2String(demo1);
+		if("".equals(str)||"".equals(str.trim())||"null".equalsIgnoreCase(str.trim())){
+			str="0";
+		}
+		if("".equals(str1)||"".equals(str.trim())||"null".equalsIgnoreCase(str1.trim())){
+			str1="0";
+		}
+		float fl=0.0f;
+		//String str=Util.null2String(demo);
+		try{
+		if(str.trim().length()>0){
+			    BigDecimal b1 = new BigDecimal(str.trim());
+			    BigDecimal b2 = new BigDecimal(str1.trim()); 
+			    BigDecimal b3=b1.add(b2);
+				//System.out.println(b1.setScale(2,BigDecimal.ROUND_HALF_UP));
+			    fl=b3.setScale(len,BigDecimal.ROUND_HALF_UP).floatValue();
+		}
+		log.error("getfloats"+fl);
+		}catch(Exception e){
+			log.error(demo+"getfloats异常"+e.getMessage());	
+		}
+		return fl;
+	}
+	public  static String sendGet(String url, String param,String basis) {
+		String result = "";
+		InputStream in = null;
+	try {
+		String urlNameString = url ;
+		URL realUrl = new URL(urlNameString);
+	URLConnection connection = realUrl.openConnection();
+	String auth="JNT:JNT2019";
+	String code = new sun.misc.BASE64Encoder().encode(auth.getBytes());
+	connection.setRequestProperty("Authorization", "Basic " + code);
+	connection.connect();
+	Map<String, List<String>> map = connection.getHeaderFields();
+
+
+		for (String key : map.keySet()) {
+		System.out.println(key + "--->" + map.get(key));
+		}
+		//接收核心返回过来的数据 xml  需要解析
+		in =connection.getInputStream();
+		byte[] b =getBytes(in);
+		if(b.length>0){
+			result=new String(b);
+		}
+	    System.out.println(b.length);
+		} catch (Exception e) {
+
+	     System.out.println(e.getMessage());
+		  e.printStackTrace();
+		}finally {
+		try {
+		if (in != null) {
+		  in.close();
+		}
+		} catch (Exception e2) {
+			System.out.println(e2.getMessage());
+		   e2.printStackTrace();
+		}
+		}
+		//System.out.println("de"+result);
+		return result;
+		}
+	public static byte[] getBytes(InputStream fis){  
+	    Logger log = Logger.getLogger(Logger.class);
+	     byte[] buffer = null;  
+	     try {  
+	         //File file = new File(filePath);  
+	         //FileInputStream fis = new FileInputStream(file);  
+	         ByteArrayOutputStream bos = new ByteArrayOutputStream(1000);  
+	         byte[] b = new byte[10000];  
+	         int n;  
+	         while ((n = fis.read(b)) != -1) {  
+	             bos.write(b, 0, n);  
+	         }  
+	         fis.close();  
+	         bos.close();  
+	         buffer = bos.toByteArray();  
+	     } catch (FileNotFoundException e) {  
+	         e.printStackTrace();  
+	     } catch (IOException e) {  
+	         e.printStackTrace();  
+	     }  
+	     System.out.println("buffer--->"+buffer.length);
+	     return buffer;  
+	 }
+}
diff --git a/src/main/youhong_ai_jitu_src/com/jet/action/CreateK3PayBillAction.java b/src/main/youhong_ai_jitu_src/com/jet/action/CreateK3PayBillAction.java
new file mode 100644
index 0000000..238dc49
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/com/jet/action/CreateK3PayBillAction.java
@@ -0,0 +1,319 @@
+package com.jet.action;
+
+import java.text.DecimalFormat;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import kingdee.bos.webapi.client.K3CloudApiClient;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.serializer.SerializerFeature;
+import com.jet.k3.K3Connect;
+
+import weaver.conn.RecordSet;
+import weaver.general.BaseBean;
+import weaver.general.Util;
+import weaver.interfaces.workflow.action.Action;
+import weaver.soa.workflow.request.RequestInfo;
+import selfdev.util.base.BaseUtil;
+import selfdev.util.base.TimeCommonUtil;
+import selfdev.util.log.LogTool;
+
+/**
+ * 付款申请流程在AP付款节点提交时将数据写入K3生成付款单
+ * @author KangMD
+ * 2019-11-29
+ */
+public class CreateK3PayBillAction extends BaseBean implements Action  {
+
+	public String  execute(RequestInfo ri) { 
+		 LogTool log=new LogTool("/log/selfdev/action", false);
+		 //获取requestid
+		 String requestid=ri.getRequestid();
+		 String workflowid=ri.getWorkflowid();
+		 //获取用户语言
+		 int language=ri.getRequestManager().getUser().getLanguage();
+		 log.writeLog("language---------->"+language);
+		 String workflowname=BaseUtil.getBaseInfoByParm("workflowname", "workflow_base", "id", workflowid, "");
+		 log.writeLog("---------------"+workflowname+"开始写入K3生成付款单-------------requestId:" + requestid);
+		 //获取表名
+		 String tablename=BaseUtil.getBaseInfoByParm("tablename", "workflow_bill", "1", "1", " and id in (select formid from workflow_base where id="+workflowid+")");;
+		 RecordSet rs=new RecordSet();
+		 try {
+			//获取当前系统日期
+			String nowDate=TimeCommonUtil.obtainDate(0).substring(0,10);
+			String mainid="";//主键ID
+			String fkfs="";//付款方式
+			String gysmc="";//供应商名称
+			String gysmc2="";//供应商名称（无合同）
+			String fphm="";//发票号码
+			String fksm="";//付款说明
+			String zfrq="";//支付日期
+			String sfyht="";//是否有合同
+			double bcfkje=0;//本次付款金额
+			double bcfkje2=0;//本次付款金额（无合同）
+			String bz="";//币种
+			String zz="";//组织
+			String k3yfdh="";//K3应付单号
+			String fkyxzh="";//付款银行账号
+			double fpcfkje=0;//分批次付款金额
+			String sfpcfk="";//是否批次付款
+			double pcyfkzje=0;//批次已付款总金额
+			String htxx="";//相关合同
+			String sql="select * from "+tablename+" where requestid="+requestid;
+			rs.execute(sql);
+			while(rs.next()){
+				mainid=Util.null2String(rs.getString("id"));
+				fkfs=Util.null2String(rs.getString("fkfs"));
+				gysmc=Util.null2String(rs.getString("gysmc"));
+				gysmc2=Util.null2String(rs.getString("gysmc2"));
+				fphm=Util.null2String(rs.getString("fphm"));
+				fksm=Util.null2String(rs.getString("fksm"));
+				zfrq=Util.null2String(rs.getString("zfrq"));
+				sfyht=Util.null2String(rs.getString("sfyht"));
+				bcfkje=Double.parseDouble(Util.null2o(rs.getString("bcfkje")).replaceAll(",", ""));
+				bcfkje2=Double.parseDouble(Util.null2o(rs.getString("bcfkje2")).replaceAll(",", ""));
+				bz=Util.null2String(rs.getString("bz"));
+				zz=Util.null2String(rs.getString("zz"));
+				k3yfdh=Util.null2String(rs.getString("k3yfdh"));
+				fkyxzh=Util.null2String(rs.getString("fkyxzh"));
+				fpcfkje=Double.parseDouble(Util.null2o(rs.getString("fpcfkje")).replaceAll(",", ""));
+				sfpcfk=Util.null2String(rs.getString("sfpcfk"));
+				htxx=Util.null2String(rs.getString("htxx"));
+				pcyfkzje=Double.parseDouble(Util.null2o(rs.getString("pcyfkzje")).replaceAll(",", ""));
+			}
+			//没有合同
+			if("1".equals(sfyht)){
+				gysmc=gysmc2;
+				bcfkje=bcfkje2;
+			}
+			//付款方式
+			if("0".equals(fkfs)){//银行
+				fkfs="JSFS03_SYS";
+			}else{
+				fkfs="JSFS01_SYS";//现金
+			}
+			
+			String msg="";
+			double je_k3=0;//传入K3金额
+			DecimalFormat df=new DecimalFormat( "###############0.00 ");//   16位整数位，两小数位 
+			//本流程还需要付款金额=流程中本次付款金额-批次已付款总金额
+			double blchxfkje=bcfkje-pcyfkzje;
+			if("0".equals(sfpcfk)){//批次付款，则取输入的分批次付款金额
+				if(fpcfkje>blchxfkje){
+					msg="本流程需要付款金额"+df.format(bcfkje)+",批次已付款总金额"+df.format(pcyfkzje)+",当前批次付款金额"+df.format(fpcfkje)+",已超出剩余未付款金额"+df.format(blchxfkje);
+					//将错误信息更新至表单字段中
+					rs.execute("update "+tablename+" set sfcgsck3yfd='1',k3jkfhxx='"+msg.replaceAll("'", "''")+"' where requestid="+requestid);
+					//写入K3失败则进行提醒，并阻止流程提交
+					ri.getRequestManager().setMessage("111100");
+					ri.getRequestManager().setMessagecontent(msg);
+					return "0";
+				}
+				je_k3=fpcfkje;
+			}else{//全部付款
+				je_k3=blchxfkje;
+			}
+			double pcyfkzje_new=pcyfkzje+je_k3;//批次已付款金额(本次写入K3之后)
+			
+			//***************************************拼接K3 Cloud付款单所需的JSON字符串***********************************************//
+			Map<String,Object> data=new HashMap<String,Object>();
+	    	
+	    	Map<String,Object> Model=new HashMap<String,Object>();
+	    	//单据类型(必填项)--------默认为采购业务付款单FKDLX01_SYS
+	    	Map<String,Object> FBillTypeID=new HashMap<String,Object>();
+	    	FBillTypeID.put("FNUMBER", "FKDLX01_SYS");
+	    	Model.put("FBillTypeID", FBillTypeID);
+	    	//业务日期(必填项)--------默认为当前系统日期
+	    	Model.put("FDATE", nowDate);
+	    	//往来单位类型,默认为供应商
+	    	Model.put("FCONTACTUNITTYPE", "BD_Supplier");
+	    	//往来单位(必填项)--------
+	    	Map<String,Object> FCONTACTUNIT=new HashMap<String,Object>();
+	    	FCONTACTUNIT.put("FNUMBER", gysmc);
+	    	Model.put("FCONTACTUNIT", FCONTACTUNIT);
+	    	
+	    	//收款单位类型,默认为供应商
+	    	Model.put("FRECTUNITTYPE", "BD_Supplier");
+	    	//收款单位(必填项)--------
+	    	Map<String,Object> FRECTUNIT=new HashMap<String,Object>();
+	    	FRECTUNIT.put("FNUMBER", gysmc);
+	    	Model.put("FRECTUNIT", FRECTUNIT);
+	    	
+	    	//币别(必填项)--------
+	    	Map<String,Object> FCURRENCYID=new HashMap<String,Object>();
+	    	FCURRENCYID.put("FNUMBER", bz);
+	    	Model.put("FCURRENCYID", FCURRENCYID);
+	    	Model.put("FEXCHANGERATE", 1.0);//汇率
+	    	Model.put("FSETTLERATE", 1.0);//结算汇率
+	    	
+	    	//采购部门**************
+	    	Map<String,Object> FPURCHASEDEPTID=new HashMap<String,Object>();
+	    	FPURCHASEDEPTID.put("FNUMBER", "BM000001");
+	    	Model.put("FPURCHASEDEPTID", FPURCHASEDEPTID);
+	    	
+	    	//结算组织(必填项)----
+	    	Map<String,Object> FSETTLEORGID=new HashMap<String,Object>();
+	    	FSETTLEORGID.put("FNumber", zz);
+	    	Model.put("FSETTLEORGID", FSETTLEORGID);//结算组织(必填项)----
+	    	//采购组织
+	    	Model.put("FPURCHASEORGID", FSETTLEORGID);
+	    	//备注
+	    	Model.put("FREMARK", fksm);
+	    	//期望付款日期
+	    	Model.put("FBookingDate", nowDate);
+	    	Model.put("FDOCUMENTSTATUS", "Z");//单据状态
+	    	Model.put("FCancelStatus", "A");//作废状态(必填项)----默认为A
+	    	//结算组织
+	    	Model.put("FPAYORGID", FSETTLEORGID);
+	    	//结算币别
+	    	Model.put("FSETTLECUR", FCURRENCYID);
+	    	//结算本位币
+	    	Model.put("FSETTLEMAINBOOKID", FCURRENCYID);
+	    	
+	    	//-----------------付款单明细 start-----------------//
+	    	List<Map<String,Object>> FPAYBILLENTRY=new ArrayList<Map<String,Object>>();
+	    	//定义一行明细
+	    	Map<String,Object> PAYBILLENTRY=new HashMap<String, Object>();
+			//结算方式
+	    	Map<String,Object> FSETTLETYPEID=new HashMap<String,Object>();
+	    	FSETTLETYPEID.put("FNUMBER", fkfs);
+	    	PAYBILLENTRY.put("FSETTLETYPEID", FSETTLETYPEID);
+			
+	    	//付款用途，默认为SFKYT08_SYS采购付款
+	    	Map<String,Object> FPURPOSEID=new HashMap<String,Object>();
+	    	FPURPOSEID.put("FNUMBER", "SFKYT08_SYS");
+	    	PAYBILLENTRY.put("FPURPOSEID", FPURPOSEID);
+	    	
+	    	PAYBILLENTRY.put("FPAYTOTALAMOUNTFOR", je_k3);//表体-应付金额
+	    	PAYBILLENTRY.put("FPAYAMOUNTFOR_E", je_k3);//付款金额
+	    	PAYBILLENTRY.put("FSETTLEPAYAMOUNTFOR", je_k3);//折后金额
+	    	PAYBILLENTRY.put("FREALPAYAMOUNTFOR_D", je_k3);//表体-实付金额
+	    	//我方银行账号
+	    	Map<String,Object> FACCOUNTID=new HashMap<String,Object>();
+	    	FACCOUNTID.put("FNUMBER", fkyxzh);
+	    	PAYBILLENTRY.put("FACCOUNTID", FACCOUNTID);
+	    	
+	    	PAYBILLENTRY.put("FPAYAMOUNT_E", je_k3);//付款金额本位币
+	    	PAYBILLENTRY.put("FPOSTDATE", nowDate);//登账日期
+	    	PAYBILLENTRY.put("FRuZhangType", "1");//入账类型
+	    	PAYBILLENTRY.put("FPayType", "A");//支付类型
+	    	
+			//将MAP添加至List中
+			FPAYBILLENTRY.add(PAYBILLENTRY);
+	    	
+	    	Model.put("FPAYBILLENTRY", FPAYBILLENTRY);//
+	    	//-----------------付款单明细 end-----------------//
+	    	
+	    	
+	    	//-----------------付款单源单明细 start-----------------//
+	    	List<Map<String,Object>> FPAYBILLSRCENTRY=new ArrayList<Map<String,Object>>();
+	    	//定义一行明细
+	    	Map<String,Object> PAYBILLSRCENTRY=new HashMap<String, Object>();
+			//源单类型
+	    	PAYBILLSRCENTRY.put("FSOURCETYPE", "AP_Payable");
+	    	//源单编号,取K3应付单号
+	    	PAYBILLSRCENTRY.put("FSRCBILLNO", k3yfdh);
+	    	//本次付款金额
+	    	PAYBILLSRCENTRY.put("FREALPAYAMOUNT_S", je_k3);
+	    	//应付金额
+	    	PAYBILLSRCENTRY.put("FAFTTAXTOTALAMOUNT", bcfkje);
+	    	//计划付款金额
+	    	PAYBILLSRCENTRY.put("FPLANPAYAMOUNT", bcfkje);
+	    	//源单币别
+	    	PAYBILLSRCENTRY.put("FSRCCURRENCYID", FCURRENCYID);
+	    	//到期日
+	    	PAYBILLSRCENTRY.put("FEXPIRY", nowDate);
+	    	
+			//将MAP添加至List中
+	    	FPAYBILLSRCENTRY.add(PAYBILLSRCENTRY);
+	    	Model.put("FPAYBILLSRCENTRY", FPAYBILLSRCENTRY);//
+	    	
+	    	//-----------------付款单源单明细 end-----------------//
+	    	
+	    	data.put("Model", Model);
+	    	
+	    	//将MAP转JSON，fastjson默认开启引用检测将相同的对象写成引用的形式，所以必须加上SerializerFeature.DisableCircularReferenceDetect，否则转换的字符串会出现$ref
+	    	String jsonStr = JSON.toJSONString(data, SerializerFeature.DisableCircularReferenceDetect);
+	    	log.writeLog("调用付款单保存接口传入数据jsonStr---------->"+jsonStr);
+	    	//连接K3
+			K3CloudApiClient client =K3Connect.connect();
+			if(client!=null){
+				//调用付款单保存接口
+				String sResult = client.excuteOperation("AP_PAYBILL", "save", jsonStr);
+				log.writeLog("调用付款单保存接口返回数据sResult---------->"+sResult);
+				//解析K3返回的JSO字符串
+				JSONObject jsonObject = JSONObject.parseObject(sResult);
+				JSONObject ResponseStatus=jsonObject.getJSONObject("Result").getJSONObject("ResponseStatus");
+				//是否成功写入K3
+				String IsSuccess=ResponseStatus.get("IsSuccess").toString();
+				log.writeLog("是否成功写入K3结果IsSuccess---------->"+IsSuccess);
+				//成功写入K3
+				if("true".equals(IsSuccess)){
+					JSONArray SuccessJSONArray=ResponseStatus.getJSONArray("SuccessEntitys");
+					String Id="";//单据ID
+					String Number="";//单据编号
+					for(int p=0;p<SuccessJSONArray.size();p++){
+						Id=SuccessJSONArray.getJSONObject(p).get("Id").toString();//获取返回的单据ID
+						Number=SuccessJSONArray.getJSONObject(p).get("Number").toString();//获取返回的单据编号
+					}
+					log.writeLog("Id------>"+Id+",Number------>"+Number);
+					//将付款单号更新至表单字段中
+					rs.execute("update "+tablename+" set sfcgsck3yfd='0',k3fkdh='"+Number+"',fpcfkje='',k3jkfhxx='',pcyfkzje=TO_CHAR("+pcyfkzje_new+",'FM999,999,999,999,999,999,990.00') where requestid="+requestid);
+					//将付款信息插入至付款明细中
+					rs.execute("insert into "+tablename+"_dt1 (mainid,fkyxzh,fkrq,fkje,k3fkdh) values('"+mainid+"','"+fkyxzh+"','"+nowDate+"',TO_CHAR("+je_k3+",'FM999,999,999,999,999,999,990.00'),'"+Number+"')");
+					
+					//存在合同并且是（不需要分批次付款或者分批次的最后一次付款），则将付款信息更新至至建模合同台账中
+					if("0".equals(sfyht)&&bcfkje==pcyfkzje+je_k3){
+						//更新至建模的批次明细中
+						sql="update uf_httz_dt1 a set (yfkje,fkzt)=(select TO_CHAR(to_number(replace(nvl(a.yfkje,0),',',''))+to_number(replace(nvl(b.bcfkje,0),',','')),'FM999,999,999,999,999,999,990.00'),(case when to_number(replace(nvl(a.yfkje,0),',',''))+to_number(replace(nvl(b.bcfkje,0),',',''))=to_number(replace(nvl(a.fkje,0),',','')) then 0 else 2 end) from "+tablename+"_dt5 b where a.id=b.fkpc and b.mainid='"+mainid+"') where  a.mainid='"+htxx+"'";
+						log.writeLog("流程中支付金额更新至合同建模明细中的金额SQL---------->"+sql);
+						rs.execute(sql);
+						//更新至建模的主表中
+						sql="update uf_httz a set yfkje=TO_CHAR(to_number(replace(nvl(a.yfkje,0),',',''))+"+je_k3+",'FM999,999,999,999,999,999,990.00') where id='"+htxx+"'";
+						log.writeLog("流程中支付金额更新至合同建模主表中的金额SQL---------->"+sql);
+						rs.execute(sql);
+					}
+				}else{
+					JSONArray ErrorsJSONArray=ResponseStatus.getJSONArray("Errors");
+					for(int p=0;p<ErrorsJSONArray.size();p++){
+						msg+=ErrorsJSONArray.getJSONObject(p).get("Message").toString();
+					}
+					//将错误信息更新至表单字段中
+					rs.execute("update "+tablename+" set sfcgsck3yfd='1',k3jkfhxx='"+msg.replaceAll("'", "''")+"' where requestid="+requestid);
+					//写入K3失败则进行提醒，并阻止流程提交
+					ri.getRequestManager().setMessage("111100");
+					ri.getRequestManager().setMessagecontent(msg);
+					return "0";
+				}
+			}else{
+				//连接K3超时
+				ri.getRequestManager().setMessage("111100");
+				ri.getRequestManager().setMessagecontent("OA连接K3超时，请联系管理员！");
+				return "0";
+			}
+		 } catch (Exception e) {
+			e.printStackTrace();
+			String error_msg="付款流程写入K3失败，错误信息为：------>"+e.toString();
+			if(language==0||language==7){//简体
+				
+			}else if(language==8){//英语
+				error_msg="付款流程写入K3失败，错误信息为：------>"+e.toString();
+			}else if(language==9){//繁体
+				error_msg="付款流程写入K3失败，错误信息为：------>"+e.toString();
+			}else if(language==22){//印尼语
+				error_msg="付款流程写入K3失败，错误信息为：------>"+e.toString();
+			}
+			log.writeLog(error_msg);
+			//将错误信息更新至表单字段中
+			rs.execute("update "+tablename+" set sfcgsck3yfd='1',k3jkfhxx='"+error_msg.replaceAll("'", "''")+"' where requestid="+requestid);
+			ri.getRequestManager().setMessage("111100");
+			ri.getRequestManager().setMessagecontent(error_msg);
+			return "0";
+		 }
+		 return SUCCESS;
+	}
+}
diff --git a/src/main/youhong_ai_jitu_src/com/jet/action/CreateK3PayableAction.java b/src/main/youhong_ai_jitu_src/com/jet/action/CreateK3PayableAction.java
new file mode 100644
index 0000000..fe57c14
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/com/jet/action/CreateK3PayableAction.java
@@ -0,0 +1,300 @@
+package com.jet.action;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import kingdee.bos.webapi.client.K3CloudApiClient;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.serializer.SerializerFeature;
+import com.jet.k3.K3Connect;
+
+import weaver.conn.RecordSet;
+import weaver.general.BaseBean;
+import weaver.general.Util;
+import weaver.interfaces.workflow.action.Action;
+import weaver.soa.workflow.request.RequestInfo;
+import selfdev.util.base.BaseUtil;
+import selfdev.util.base.TimeCommonUtil;
+import selfdev.util.log.LogTool;
+
+/**
+ * 付款申请流程到达财务AP节点时将数据写入K3生成应付单
+ * @author KangMD
+ * 2019-11-29
+ */
+public class CreateK3PayableAction extends BaseBean implements Action  {
+
+	public String  execute(RequestInfo ri) { 
+		LogTool log=new LogTool("/log/selfdev/action", false);
+		 //获取requestid
+		 String requestid=ri.getRequestid();
+		 String workflowid=ri.getWorkflowid();
+		 //获取用户语言
+		 int language=ri.getRequestManager().getUser().getLanguage();
+		 log.writeLog("language---------->"+language);
+		 String workflowname=BaseUtil.getBaseInfoByParm("workflowname", "workflow_base", "id", workflowid, "");
+		 log.writeLog("---------------"+workflowname+"开始写入K3生成应付单-------------requestId:" + requestid);
+		 //获取表名
+		 String tablename=BaseUtil.getBaseInfoByParm("tablename", "workflow_bill", "1", "1", " and id in (select formid from workflow_base where id="+workflowid+")");;
+		 RecordSet rs=new RecordSet();
+		 try {
+			//获取当前系统日期
+			String nowDate=TimeCommonUtil.obtainDate(0).substring(0,10);
+			String fkfs="";//付款方式
+			String fygsbm="";//财务K3所属部门
+			String gysmc="";//供应商名称
+			String gysmc2="";//供应商名称（无合同）
+			String fphm="";//发票号码
+			String fksm="";//付款说明
+			String zfrq="";//支付日期
+			String sfyht="";//是否有合同
+			String bcfkje="";//本次付款金额
+			String bcfkje2="";//本次付款金额（无合同）
+			String sqje="";//税前金额
+			String zzs="";//增值税
+			//String dks="";//代扣税
+			String bz="";//币种
+			String zz="";//组织
+			String sql="select * from "+tablename+" where requestid="+requestid;
+			rs.execute(sql);
+			while(rs.next()){
+				fkfs=Util.null2String(rs.getString("fkfs"));
+				gysmc=Util.null2String(rs.getString("gysmc"));
+				gysmc2=Util.null2String(rs.getString("gysmc2"));
+				fphm=Util.null2String(rs.getString("fphm"));
+				fksm=Util.null2String(rs.getString("fksm")).replaceAll("&nbsp;", " ");
+				zfrq=Util.null2String(rs.getString("zfrq"));
+				sfyht=Util.null2String(rs.getString("sfyht"));
+				bcfkje=Util.null2o(rs.getString("bcfkje")).replace(",", "");
+				bcfkje2=Util.null2o (rs.getString("bcfkje2")).replace(",", "");
+				bz=Util.null2String(rs.getString("bz"));
+				zz=Util.null2String(rs.getString("zz"));
+				fygsbm=Util.null2String(rs.getString("fygsbm"));
+				sqje=Util.null2o(rs.getString("sqje")).replace(",", "");
+				zzs=Util.null2o(rs.getString("zzs")).replace(",", "");
+				//dks=Util.null2o(rs.getString("dks")).replace(",", "");
+			}
+			//K3中表头备注字段最多只能存储255位,将付款说明进行截取
+			if(fksm.length()>255){
+				fksm=fksm.substring(0,255);
+			}
+			
+			//没有合同
+			if("1".equals(sfyht)){
+				gysmc=gysmc2;
+				bcfkje=bcfkje2;
+			}
+			//付款方式
+			if("0".equals(fkfs)){//银行
+				fkfs="JSFS03_SYS";
+			}else{
+				fkfs="JSFS01_SYS";//现金
+			}
+			
+			//含税单价=税前金额+增值税
+			String hsdj=new BigDecimal(sqje).add(new BigDecimal(zzs)).setScale(2, BigDecimal.ROUND_HALF_UP).toString();
+			
+			//***************************************拼接K3 Cloud应付单所需的JSON字符串***********************************************//
+			Map<String,Object> data=new LinkedHashMap<String,Object>();
+	    	
+	    	Map<String,Object> Model=new LinkedHashMap<String,Object>();
+	    	//单据类型(必填项)--------默认为标准应付单YFD01_SYS
+	    	Map<String,Object> FBillTypeID=new LinkedHashMap<String,Object>();
+	    	FBillTypeID.put("FNUMBER", "YFD01_SYS");
+	    	Model.put("FBillTypeID", FBillTypeID);
+	    	
+	    	//是否期初单据
+	    	Model.put("FISINIT", false);
+	    	//业务日期(必填项)--------默认为当前系统日期
+	    	Model.put("FDATE", nowDate);
+	    	//到期日(必填项)--------
+	    	Model.put("FENDDATE_H", nowDate);
+	    	//单据状态，默认为创建 Z
+	    	Model.put("FDOCUMENTSTATUS", "Z");
+	    	
+	    	//供应商(必填项)--------
+	    	Map<String,Object> FSUPPLIERID=new LinkedHashMap<String,Object>();
+	    	FSUPPLIERID.put("FNUMBER", gysmc);
+	    	Model.put("FSUPPLIERID", FSUPPLIERID);
+	    	
+	    	//币别(必填项)--------
+	    	Map<String,Object> FCURRENCYID=new LinkedHashMap<String,Object>();
+	    	FCURRENCYID.put("FNUMBER", bz);
+	    	Model.put("FCURRENCYID", FCURRENCYID);
+	    	
+	    	Model.put("FISPRICEEXCLUDETAX", true);//价外税
+	    	Model.put("FBUSINESSTYPE", "CG");//业务类型(必填项)----默认为CG
+	    	Model.put("FISTAX", true);//按含税单价录入----
+	    	
+	    	//结算组织(必填项)----
+	    	Map<String,Object> FSETTLEORGID=new LinkedHashMap<String,Object>();
+	    	FSETTLEORGID.put("FNumber", zz);
+	    	Model.put("FSETTLEORGID", FSETTLEORGID);//结算组织(必填项)----
+	    	
+	    	//采购部门----
+	    	Map<String,Object> FPURCHASEDEPTID=new LinkedHashMap<String,Object>();
+	    	FPURCHASEDEPTID.put("FNUMBER", fygsbm);
+	    	Model.put("FPURCHASEDEPTID", FPURCHASEDEPTID);
+	    	
+	    	//付款组织(必填项)----
+	    	Map<String,Object> FPAYORGID=new LinkedHashMap<String,Object>();
+	    	FPAYORGID.put("FNUMBER", zz);
+	    	Model.put("FPAYORGID", FPAYORGID);
+	    	
+	    	//作废状态(必填项)----默认为A
+	    	Model.put("FCancelStatus", "A");
+	    	//Invoice No(必填项)----
+	    	Model.put("F_RTA_InvoiceNo", fphm);
+	    	//business type(必填项)----默认为服务类S
+	    	Model.put("F_RTA_BusinessType", "S");
+	    	//备注
+	    	Model.put("FAP_Remark", fksm);
+	    	
+	    	//PPH By Company
+	    	Model.put("F_RTA_PPHByComp", false);
+	    	
+	    	
+	    	//-----------------表头供应商 start-----------------//
+	    	Map<String,Object> FsubHeadSuppiler=new LinkedHashMap<String,Object>();
+	    	FsubHeadSuppiler.put("FORDERID", FSUPPLIERID);//订货方
+	    	FsubHeadSuppiler.put("FTRANSFERID", FSUPPLIERID);//供货方
+	    	FsubHeadSuppiler.put("FChargeId", FSUPPLIERID);//收款方
+	    	Model.put("FsubHeadSuppiler", FsubHeadSuppiler);//将供应商信息加入至Map中
+	    	//-----------------表头供应商 end-----------------//
+	    	
+	    	//-----------------表头财务 start-----------------//
+	    	Map<String,Object> FsubHeadFinc=new LinkedHashMap<String,Object>();
+	    	FsubHeadFinc.put("FACCNTTIMEJUDGETIME", zfrq);//到期日计算日期(必填项)----
+	    	//结算方式
+	    	Map<String,Object> FSettleTypeID=new LinkedHashMap<String,Object>();
+	    	FSettleTypeID.put("FNUMBER", fkfs);
+	    	FsubHeadFinc.put("FSettleTypeID", FSettleTypeID);
+	    	//本位币
+	    	FsubHeadFinc.put("FMAINBOOKSTDCURRID", FCURRENCYID);
+	    	Model.put("FsubHeadFinc", FsubHeadFinc);//
+	    	//-----------------表头财务 end-----------------//
+	    	
+	    	//-----------------明细 start-----------------//
+	    	List<Map<String,Object>> FEntityDetail=new ArrayList<Map<String,Object>>();
+	    	//定义一行明细
+	    	Map<String,Object> EntityDetail=new LinkedHashMap<String, Object>();
+			//物料编码
+	    	Map<String,Object> FMATERIALID=new LinkedHashMap<String,Object>();
+	    	FMATERIALID.put("FNUMBER", "100013");
+			EntityDetail.put("FMATERIALID", FMATERIALID);
+			//K3中明细备注字段最多只能存储50位,将付款说明进行截取
+			if(fksm.length()>50){
+				fksm=fksm.substring(0,50);
+			}
+			EntityDetail.put("F_RTA_EntryRemarks", fksm);//备 注
+			//计价单位
+	    	Map<String,Object> FPRICEUNITID=new LinkedHashMap<String,Object>();
+	    	FPRICEUNITID.put("FNUMBER", "Pcs");
+			EntityDetail.put("FPRICEUNITID", FPRICEUNITID);
+			
+			EntityDetail.put("FPrice", sqje);//单价
+			EntityDetail.put("FPriceQty", 1.0);//计价数量
+			EntityDetail.put("FTaxPrice", hsdj);//含税单价=税前单价+增值税
+			//EntityDetail.put("F_RTA_PPHAmount", dks);//代扣税
+			EntityDetail.put("FPriceWithTax", bcfkje);//含税净价
+			//PPN Type
+	    	Map<String,Object> F_RTA_VATType_d=new LinkedHashMap<String,Object>();
+	    	F_RTA_VATType_d.put("FNUMBER", "000");
+			EntityDetail.put("F_RTA_VATType_d", F_RTA_VATType_d);
+			
+			EntityDetail.put("FNoTaxAmountFor_D", sqje);//不含税金额
+			EntityDetail.put("FTAXAMOUNTFOR_D", 0);//税额
+			EntityDetail.put("FALLAMOUNTFOR_D", bcfkje);//价税合计bcfkje
+			EntityDetail.put("F_RTA_FakturPajakNo_d", "-");//Faktur Pajak No
+			EntityDetail.put("F_RTA_SUPPLIER_D", FSUPPLIERID);//表体供应商(用于校验税票号唯一)
+			//将MAP添加至List中
+	    	FEntityDetail.add(EntityDetail);
+	    	Model.put("FEntityDetail", FEntityDetail);//
+	    	//-----------------明细 end-----------------//
+	    	
+	    	//-----------------付款计划 start-----------------//
+	    	List<Map<String,Object>> FEntityPlan=new ArrayList<Map<String,Object>>();
+	    	Map<String,Object> FPlan=new LinkedHashMap<String,Object>();
+	    	FPlan.put("FENDDATE", zfrq);//表头计划 - 到期日
+	    	FPlan.put("FPAYAMOUNTFOR", bcfkje);//应付金额
+	    	FPlan.put("FPAYRATE", 100);//应付比例(%)
+	    	FEntityPlan.add(FPlan);
+	    	Model.put("FEntityPlan", FEntityPlan);//
+	    	//-----------------付款计划 end-----------------//
+	    	data.put("Model", Model);
+	    	
+	    	
+	    	//将MAP转JSON，fastjson默认开启引用检测将相同的对象写成引用的形式，所以必须加上SerializerFeature.DisableCircularReferenceDetect，否则转换的字符串会出现$ref
+	    	String jsonStr = JSON.toJSONString(data, SerializerFeature.DisableCircularReferenceDetect);
+	    	log.writeLog("调用应付单保存接口传入数据jsonStr---------->"+jsonStr);
+	    	//连接K3
+			K3CloudApiClient client =K3Connect.connect();
+			if(client!=null){
+				//调用应付单保存接口
+				String sResult = client.excuteOperation("AP_Payable", "save", jsonStr);
+				log.writeLog("调用应付单保存接口返回数据sResult---------->"+sResult);
+				//解析K3返回的JSO字符串
+				JSONObject jsonObject = JSONObject.parseObject(sResult);
+				JSONObject ResponseStatus=jsonObject.getJSONObject("Result").getJSONObject("ResponseStatus");
+				//是否成功写入K3
+				String IsSuccess=ResponseStatus.get("IsSuccess").toString();
+				log.writeLog("是否成功写入K3结果IsSuccess---------->"+IsSuccess);
+				//成功写入K3
+				if("true".equals(IsSuccess)){
+					JSONArray SuccessJSONArray=ResponseStatus.getJSONArray("SuccessEntitys");
+					String Id="";//单据ID
+					String Number="";//单据编号
+					for(int p=0;p<SuccessJSONArray.size();p++){
+						Id=SuccessJSONArray.getJSONObject(p).get("Id").toString();//获取返回的单据ID
+						Number=SuccessJSONArray.getJSONObject(p).get("Number").toString();//获取返回的单据编号
+					}
+					log.writeLog("Id------>"+Id+",Number------>"+Number);
+					//将应付单号更新至表单字段中
+					rs.execute("update "+tablename+" set sfcgsck3yfd='0',sfpcfk='1',fpcfkje='"+bcfkje+"',pcyfkzje='0',gysmc='"+gysmc+"',bcfkje='"+bcfkje+"',k3yfdh='"+Number+"',k3jkfhxx='' where requestid="+requestid);
+				}else{
+					JSONArray ErrorsJSONArray=ResponseStatus.getJSONArray("Errors");
+					String msg="";
+					for(int p=0;p<ErrorsJSONArray.size();p++){
+						msg+=ErrorsJSONArray.getJSONObject(p).get("Message").toString();
+					}
+					//将错误信息更新至表单字段中
+					rs.execute("update "+tablename+" set sfcgsck3yfd='1',sfpcfk='1',fpcfkje='"+bcfkje+"',gysmc='"+gysmc+"',bcfkje='"+bcfkje+"',k3jkfhxx='"+msg.replaceAll("'", "''")+"' where requestid="+requestid);
+					//写入K3失败则进行提醒，并阻止流程提交
+					ri.getRequestManager().setMessage("111100");
+					ri.getRequestManager().setMessagecontent(msg);
+					return "0";
+				}
+			}else{
+				//连接K3超时
+				ri.getRequestManager().setMessage("111100");
+				ri.getRequestManager().setMessagecontent("OA连接K3超时，请联系管理员！");
+				return "0";
+			}
+		 } catch (Exception e) {
+			e.printStackTrace();
+			String error_msg="付款流程写入K3失败，错误信息为：------>"+e.toString();
+			if(language==0||language==7){//简体
+				
+			}else if(language==8){//英语
+				error_msg="付款流程写入K3失败，错误信息为：------>"+e.toString();
+			}else if(language==9){//繁体
+				error_msg="付款流程写入K3失败，错误信息为：------>"+e.toString();
+			}else if(language==22){//印尼语
+				error_msg="付款流程写入K3失败，错误信息为：------>"+e.toString();
+			}
+			log.writeLog(error_msg);
+			//将错误信息更新至表单字段中
+			rs.execute("update "+tablename+" set sfcgsck3yfd='1',k3jkfhxx='"+error_msg.replaceAll("'", "''")+"' where requestid="+requestid);
+			ri.getRequestManager().setMessage("111100");
+			ri.getRequestManager().setMessagecontent(error_msg);
+			return "0";
+		 }
+		 return SUCCESS;
+	}
+}
diff --git a/src/main/youhong_ai_jitu_src/com/jet/action/CreateK3PayableByLoanAction.java b/src/main/youhong_ai_jitu_src/com/jet/action/CreateK3PayableByLoanAction.java
new file mode 100644
index 0000000..4b5c482
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/com/jet/action/CreateK3PayableByLoanAction.java
@@ -0,0 +1,365 @@
+package com.jet.action;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import kingdee.bos.webapi.client.K3CloudApiClient;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.serializer.SerializerFeature;
+import com.jet.k3.K3Connect;
+
+import weaver.conn.RecordSet;
+import weaver.general.BaseBean;
+import weaver.general.Util;
+import weaver.interfaces.workflow.action.Action;
+import weaver.soa.workflow.request.RequestInfo;
+import selfdev.util.base.BaseUtil;
+import selfdev.util.base.TimeCommonUtil;
+import selfdev.util.log.LogTool;
+
+/**
+ * 借款申请流程到达财务AP节点时将数据写入K3生成应付单或者其他应付单
+ * @author KangMD
+ * 2019-11-29
+ */
+public class CreateK3PayableByLoanAction extends BaseBean implements Action  {
+
+	public String  execute(RequestInfo ri) { 
+		LogTool log=new LogTool("/log/selfdev/action", false);
+		 //获取requestid
+		 String requestid=ri.getRequestid();
+		 String workflowid=ri.getWorkflowid();
+		 //获取用户语言
+		 int language=ri.getRequestManager().getUser().getLanguage();
+		 log.writeLog("language---------->"+language);
+		 String workflowname=BaseUtil.getBaseInfoByParm("workflowname", "workflow_base", "id", workflowid, "");
+		 log.writeLog("---------------"+workflowname+"开始写入K3生成应付单或者其他应付单-------------requestId:" + requestid);
+		 //获取表名
+		 String tablename=BaseUtil.getBaseInfoByParm("tablename", "workflow_bill", "1", "1", " and id in (select formid from workflow_base where id="+workflowid+")");;
+		 RecordSet rs=new RecordSet();
+		 try {
+			//获取当前系统日期
+			String nowDate=TimeCommonUtil.obtainDate(0).substring(0,10);
+			String zffs="";//付款方式
+			String fygsbm="";//财务K3所属部门
+			String jklx="";//借款类型
+			String fphm="OA-"+requestid;//发票号码
+			String jkyy="";//借款原因
+			String dls="";//代理商
+			String jkrq="";//期望支付日期
+			String jkje="";//借款金额
+			String bz="";//币种
+			String zz="";//组织
+			String jkrdyk3ygbh="";//借款人对应K3员工编号
+			String sql="select * from "+tablename+" where requestid="+requestid;
+			rs.execute(sql);
+			while(rs.next()){
+				zffs=Util.null2String(rs.getString("zffs"));
+				jklx=Util.null2String(rs.getString("jklx"));
+				fygsbm=Util.null2String(rs.getString("fygsbm"));
+				jkyy=Util.null2String(rs.getString("jkyy")).replaceAll("&nbsp;", " ");
+				dls=Util.null2String(rs.getString("dls"));
+				jkrq=Util.null2String(rs.getString("jkrq"));
+				jkje=Util.null2String(rs.getString("jkje"));
+				bz=Util.null2String(rs.getString("bz"));
+				zz=Util.null2String(rs.getString("zz"));
+				jkrdyk3ygbh=Util.null2String(rs.getString("jkrdyk3ygbh"));
+			}
+			
+			//K3中表头备注字段最多只能存储255位,将付款说明进行截取
+			if(jkyy.length()>255){
+				jkyy=jkyy.substring(0,255);
+			}
+			
+			//付款方式
+			if("0".equals(zffs)){//银行
+				zffs="JSFS03_SYS";
+			}else{
+				zffs="JSFS01_SYS";//现金
+			}
+			//K3接口名
+			String interfaceName="AP_Payable";
+			//K3接口描述
+			String interfaceDesc="应付单";
+			//***************************************拼接K3 Cloud (其他)应付单所需的JSON字符串***********************************************//
+			Map<String,Object> data=new HashMap<String,Object>();
+	    	Map<String,Object> Model=new HashMap<String,Object>();
+	    	
+	    	if("0".equals(jklx)){//员工借款,生成K3的其他应付单
+	    		interfaceName="AP_OtherPayable";
+	    		interfaceDesc="其他应付单";
+	    		//单据类型(必填项)--------默认为其他应付单QTYFD01_SYS
+		    	Map<String,Object> FBillTypeID=new HashMap<String,Object>();
+		    	FBillTypeID.put("FNUMBER", "QTYFD01_SYS");
+		    	Model.put("FBillTypeID", FBillTypeID);
+		    	
+		    	Model.put("FDATE", nowDate);//业务日期(必填项)--------默认为申请日期
+		    	Model.put("FENDDATE_H", nowDate);//到期日(必填项)--------
+		    	Model.put("FCONTACTUNITTYPE", "BD_Empinfo");//往来单位类型，默认为员工BD_Empinfo
+		    	
+		    	//往来单位编码（即员工编码）
+		    	Map<String,Object> FCONTACTUNIT=new HashMap<String,Object>();
+		    	FCONTACTUNIT.put("FNUMBER", jkrdyk3ygbh);
+		    	Model.put("FCONTACTUNIT", FCONTACTUNIT);
+		    	
+		    	//币别(必填项)--------
+		    	Map<String,Object> FCURRENCYID=new HashMap<String,Object>();
+		    	FCURRENCYID.put("FNUMBER", bz);
+		    	Model.put("FCURRENCYID", FCURRENCYID);
+		    	
+		    	Model.put("FTOTALAMOUNTFOR_H", jkje);//总金额
+		    	Model.put("FNOTSETTLEAMOUNTFOR", jkje);//未结算金额
+		    	
+		    	//申请部门
+		    	Map<String,Object> FDEPARTMENTID=new HashMap<String,Object>();
+		    	FDEPARTMENTID.put("FNumber", fygsbm);
+		    	Model.put("FDEPARTMENTID", FDEPARTMENTID);
+		    	
+		    	//付款组织(必填项)----
+		    	Map<String,Object> FPAYORGID=new HashMap<String,Object>();
+		    	FPAYORGID.put("FNUMBER", zz);
+		    	Model.put("FPAYORGID", FPAYORGID);
+		    	//结算组织
+		    	Model.put("FSETTLEORGID", FPAYORGID);
+		    	//采购组织
+		    	Model.put("FPURCHASEORGID", FPAYORGID);
+		    	//采购部门
+		    	Model.put("FPURCHASEDEPTID", FDEPARTMENTID);
+		    	//本位币
+		    	Model.put("FMAINBOOKSTDCURRID", FCURRENCYID);
+		    	
+		    	//到期日计算日期(期望支付日期)
+		    	Model.put("FACCNTTIMEJUDGETIME", jkrq);
+		    	//作废状态
+		    	Model.put("FCancelStatus", "A");
+		    	//备注
+		    	Model.put("FRemarks", jkyy);
+		    	
+		    	//-----------------明细 start-----------------//
+		    	List<Map<String,Object>> FEntity=new ArrayList<Map<String,Object>>();
+		    	//定义一行明细
+		    	Map<String,Object> EntityDetail=new HashMap<String, Object>();
+				//费用项目编码,默认为CI074
+		    	Map<String,Object> FCOSTID=new HashMap<String,Object>();
+		    	FCOSTID.put("FNUMBER", "CI074");
+				EntityDetail.put("FCOSTID", FCOSTID);
+				//费用归属部门
+				EntityDetail.put("FCOSTDEPARTMENTID", FDEPARTMENTID);
+				//不含税金额
+				EntityDetail.put("FNOTAXAMOUNTFOR", jkje);
+				//总金额
+				EntityDetail.put("FTOTALAMOUNTFOR", jkje);
+				//未结算金额
+				EntityDetail.put("FNOTSETTLEAMOUNTFOR_D", jkje);
+				//不含税金额本位币
+				EntityDetail.put("FNOTAXAMOUNT_D", jkje);
+				//发票类型
+				//EntityDetail.put("FINVOICETYPE", "");
+				//K3中明细备注字段最多只能存储50位,将借款原因进行截取
+				if(jkyy.length()>50){
+					jkyy=jkyy.substring(0,50);
+				}
+				//备注
+				EntityDetail.put("FCOMMENT", jkyy);
+				//将MAP添加至List中
+				FEntity.add(EntityDetail);
+		    	Model.put("FEntity", FEntity);//
+		    	//-----------------明细 end-----------------//
+	    	}else{//代理商借款,生成K3的应付单
+
+		    	//单据类型(必填项)--------默认为标准应付单YFD01_SYS
+		    	Map<String,Object> FBillTypeID=new HashMap<String,Object>();
+		    	FBillTypeID.put("FNUMBER", "YFD01_SYS");
+		    	Model.put("FBillTypeID", FBillTypeID);
+		    	
+		    	//是否期初单据
+		    	Model.put("FISINIT", false);
+		    	//业务日期(必填项)--------默认为当前系统日期
+		    	Model.put("FDATE", nowDate);
+		    	//到期日(必填项)--------
+		    	Model.put("FENDDATE_H", nowDate);
+		    	//单据状态，默认为创建 Z
+		    	Model.put("FDOCUMENTSTATUS", "Z");
+		    	
+		    	//供应商(必填项)--------
+		    	Map<String,Object> FSUPPLIERID=new HashMap<String,Object>();
+		    	FSUPPLIERID.put("FNUMBER", dls);
+		    	Model.put("FSUPPLIERID", FSUPPLIERID);
+		    	
+		    	//币别(必填项)--------
+		    	Map<String,Object> FCURRENCYID=new HashMap<String,Object>();
+		    	FCURRENCYID.put("FNUMBER", bz);
+		    	Model.put("FCURRENCYID", FCURRENCYID);
+		    	
+		    	Model.put("FISPRICEEXCLUDETAX", true);//价外税
+		    	Model.put("FBUSINESSTYPE", "CG");//业务类型(必填项)----默认为CG
+		    	Model.put("FISTAX", true);//按含税单价录入----
+		    	
+		    	//结算组织(必填项)----
+		    	Map<String,Object> FSETTLEORGID=new HashMap<String,Object>();
+		    	FSETTLEORGID.put("FNumber", zz);
+		    	Model.put("FSETTLEORGID", FSETTLEORGID);//结算组织(必填项)----
+		    	
+		    	//采购部门----
+		    	Map<String,Object> FPURCHASEDEPTID=new HashMap<String,Object>();
+		    	FPURCHASEDEPTID.put("FNUMBER", fygsbm);
+		    	Model.put("FPURCHASEDEPTID", FPURCHASEDEPTID);
+		    	
+		    	//付款组织(必填项)----
+		    	Map<String,Object> FPAYORGID=new HashMap<String,Object>();
+		    	FPAYORGID.put("FNUMBER", zz);
+		    	Model.put("FPAYORGID", FPAYORGID);
+		    	
+		    	//作废状态(必填项)----默认为A
+		    	Model.put("FCancelStatus", "A");
+		    	//Invoice No(必填项)----
+		    	Model.put("F_RTA_InvoiceNo", fphm);
+		    	//business type(必填项)----默认为服务类S
+		    	Model.put("F_RTA_BusinessType", "S");
+		    	//备注
+		    	Model.put("FAP_Remark", jkyy);
+		    	
+		    	//-----------------表头供应商 start-----------------//
+		    	Map<String,Object> FsubHeadSuppiler=new HashMap<String,Object>();
+		    	FsubHeadSuppiler.put("FORDERID", FSUPPLIERID);//订货方
+		    	FsubHeadSuppiler.put("FTRANSFERID", FSUPPLIERID);//供货方
+		    	FsubHeadSuppiler.put("FChargeId", FSUPPLIERID);//收款方
+		    	Model.put("FsubHeadSuppiler", FsubHeadSuppiler);//将供应商信息加入至Map中
+		    	//-----------------表头供应商 end-----------------//
+		    	
+		    	//-----------------表头财务 start-----------------//
+		    	Map<String,Object> FsubHeadFinc=new HashMap<String,Object>();
+		    	FsubHeadFinc.put("FACCNTTIMEJUDGETIME", jkrq);//到期日计算日期(必填项)----
+		    	//结算方式
+		    	Map<String,Object> FSettleTypeID=new HashMap<String,Object>();
+		    	FSettleTypeID.put("FNUMBER",zffs);
+		    	FsubHeadFinc.put("FSettleTypeID", FSettleTypeID);
+		    	//本位币
+		    	FsubHeadFinc.put("FMAINBOOKSTDCURRID", FCURRENCYID);
+		    	Model.put("FsubHeadFinc", FsubHeadFinc);//
+		    	//-----------------表头财务 end-----------------//
+		    	
+		    	//-----------------明细 start-----------------//
+		    	List<Map<String,Object>> FEntityDetail=new ArrayList<Map<String,Object>>();
+		    	//定义一行明细
+		    	Map<String,Object> EntityDetail=new HashMap<String, Object>();
+				//物料编码
+		    	Map<String,Object> FMATERIALID=new HashMap<String,Object>();
+		    	FMATERIALID.put("FNUMBER", "100013");
+				EntityDetail.put("FMATERIALID", FMATERIALID);
+				
+				//K3中明细备注字段最多只能存储50位,将借款原因进行截取
+				if(jkyy.length()>50){
+					jkyy=jkyy.substring(0,50);
+				}
+				EntityDetail.put("F_RTA_EntryRemarks", jkyy);//备 注
+				//计价单位
+		    	Map<String,Object> FPRICEUNITID=new HashMap<String,Object>();
+		    	FPRICEUNITID.put("FNUMBER", "Pcs");
+				EntityDetail.put("FPRICEUNITID", FPRICEUNITID);
+				
+				EntityDetail.put("FPrice", jkje);//单价
+				EntityDetail.put("FPriceQty", 1.0);//计价数量
+				EntityDetail.put("FTaxPrice", jkje);//含税单价
+				EntityDetail.put("FPriceWithTax", jkje);//含税净价
+				//PPN Type
+		    	Map<String,Object> F_RTA_VATType_d=new HashMap<String,Object>();
+		    	F_RTA_VATType_d.put("FNUMBER", "000");
+				EntityDetail.put("F_RTA_VATType_d", F_RTA_VATType_d);
+				
+				EntityDetail.put("FNoTaxAmountFor_D", jkje);//不含税金额
+				EntityDetail.put("FTAXAMOUNTFOR_D", 0);//税额
+				EntityDetail.put("FALLAMOUNTFOR_D", jkje);//价税合计
+				EntityDetail.put("F_RTA_FakturPajakNo_d", "-");//Faktur Pajak No
+				EntityDetail.put("F_RTA_SUPPLIER_D", FSUPPLIERID);//表体供应商(用于校验税票号唯一)
+				//将MAP添加至List中
+		    	FEntityDetail.add(EntityDetail);
+		    	Model.put("FEntityDetail", FEntityDetail);//
+		    	//-----------------明细 end-----------------//
+		    	
+		    	//-----------------付款计划 start-----------------//
+		    	List<Map<String,Object>> FEntityPlan=new ArrayList<Map<String,Object>>();
+		    	Map<String,Object> FPlan=new HashMap<String,Object>();
+		    	FPlan.put("FENDDATE", jkrq);//表头计划 - 到期日
+		    	FPlan.put("FPAYAMOUNTFOR", jkje);//应付金额
+		    	FPlan.put("FPAYRATE", 100);//应付比例(%)
+		    	FEntityPlan.add(FPlan);
+		    	Model.put("FEntityPlan", FEntityPlan);//
+		    	//-----------------付款计划 end-----------------//
+	    	}
+	    	
+	    	data.put("Model", Model);
+	    	
+	    	//将MAP转JSON，fastjson默认开启引用检测将相同的对象写成引用的形式，所以必须加上SerializerFeature.DisableCircularReferenceDetect，否则转换的字符串会出现$ref
+	    	String jsonStr = JSON.toJSONString(data, SerializerFeature.DisableCircularReferenceDetect);
+	    	log.writeLog("调用"+interfaceDesc+"保存接口传入数据jsonStr---------->"+jsonStr);
+	    	//连接K3
+			K3CloudApiClient client =K3Connect.connect();
+			if(client!=null){
+				//调用应付单保存接口
+				String sResult = client.excuteOperation(interfaceName, "save", jsonStr);
+				log.writeLog("调用"+interfaceDesc+"保存接口返回数据sResult---------->"+sResult);
+				//解析K3返回的JSO字符串
+				JSONObject jsonObject = JSONObject.parseObject(sResult);
+				JSONObject ResponseStatus=jsonObject.getJSONObject("Result").getJSONObject("ResponseStatus");
+				//是否成功写入K3
+				String IsSuccess=ResponseStatus.get("IsSuccess").toString();
+				log.writeLog("是否成功写入K3结果IsSuccess---------->"+IsSuccess);
+				//成功写入K3
+				if("true".equals(IsSuccess)){
+					JSONArray SuccessJSONArray=ResponseStatus.getJSONArray("SuccessEntitys");
+					String Id="";//单据ID
+					String Number="";//单据编号
+					for(int p=0;p<SuccessJSONArray.size();p++){
+						Id=SuccessJSONArray.getJSONObject(p).get("Id").toString();//获取返回的单据ID
+						Number=SuccessJSONArray.getJSONObject(p).get("Number").toString();//获取返回的单据编号
+					}
+					log.writeLog("Id------>"+Id+",Number------>"+Number);
+					//将应付单号更新至表单字段中
+					rs.execute("update "+tablename+" set sfcgsck3yfd='0',k3yfdh='"+Number+"',k3jkfhxx='' where requestid="+requestid);
+				}else{
+					JSONArray ErrorsJSONArray=ResponseStatus.getJSONArray("Errors");
+					String msg="";
+					for(int p=0;p<ErrorsJSONArray.size();p++){
+						msg+=ErrorsJSONArray.getJSONObject(p).get("Message").toString();
+					}
+					//将错误信息更新至表单字段中
+					rs.execute("update "+tablename+" set sfcgsck3yfd='1',k3jkfhxx='"+msg.replaceAll("'", "''")+"' where requestid="+requestid);
+					//写入K3失败则进行提醒，并阻止流程提交
+					ri.getRequestManager().setMessage("111100");
+					ri.getRequestManager().setMessagecontent(msg);
+					return "0";
+				}
+			}else{
+				//连接K3超时
+				ri.getRequestManager().setMessage("111100");
+				ri.getRequestManager().setMessagecontent("OA连接K3超时，请联系管理员！");
+				return "0";
+			}
+		 } catch (Exception e) {
+			e.printStackTrace();
+			String error_msg="借款流程写入K3失败，错误信息为：------>"+e.toString();
+			if(language==0||language==7){//简体
+				
+			}else if(language==8){//英语
+				error_msg="借款流程写入K3失败，错误信息为：------>"+e.toString();
+			}else if(language==9){//繁体
+				error_msg="借款流程写入K3失败，错误信息为：------>"+e.toString();
+			}else if(language==22){//印尼语
+				error_msg="借款流程写入K3失败，错误信息为：------>"+e.toString();
+			}
+			log.writeLog(error_msg);
+			//将错误信息更新至表单字段中
+			rs.execute("update "+tablename+" set sfcgsck3yfd='1',k3jkfhxx='"+error_msg.replaceAll("'", "''")+"' where requestid="+requestid);
+			ri.getRequestManager().setMessage("111100");
+			ri.getRequestManager().setMessagecontent(error_msg);
+			return "0";
+		 }
+		 return SUCCESS;
+	}
+}
diff --git a/src/main/youhong_ai_jitu_src/com/jet/action/CreateK3PayableByReimbursementAction.java b/src/main/youhong_ai_jitu_src/com/jet/action/CreateK3PayableByReimbursementAction.java
new file mode 100644
index 0000000..bd82e5c
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/com/jet/action/CreateK3PayableByReimbursementAction.java
@@ -0,0 +1,305 @@
+package com.jet.action;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import kingdee.bos.webapi.client.K3CloudApiClient;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.serializer.SerializerFeature;
+import com.jet.k3.K3Connect;
+
+import weaver.conn.RecordSet;
+import weaver.general.BaseBean;
+import weaver.general.Util;
+import weaver.interfaces.workflow.action.Action;
+import weaver.soa.workflow.request.RequestInfo;
+import selfdev.util.base.BaseUtil;
+import selfdev.util.base.TimeCommonUtil;
+import selfdev.util.log.LogTool;
+
+/**
+ * 报销流程将数据写入K3生成应付单
+ * @author KangMD
+ * 2019-12-07
+ */
+public class CreateK3PayableByReimbursementAction extends BaseBean implements Action  {
+
+	public String  execute(RequestInfo ri) { 
+		LogTool log=new LogTool("/log/selfdev/action", false);
+		 //获取requestid
+		 String requestid=ri.getRequestid();
+		 String workflowid=ri.getWorkflowid();
+		 //获取用户语言
+		 int language=ri.getRequestManager().getUser().getLanguage();
+		 log.writeLog("language---------->"+language);
+		 String workflowname=BaseUtil.getBaseInfoByParm("workflowname", "workflow_base", "id", workflowid, "");
+		 log.writeLog("---------------"+workflowname+"开始写入K3生成应付单-------------requestId:" + requestid);
+		 //获取表名
+		 String tablename=BaseUtil.getBaseInfoByParm("tablename", "workflow_bill", "1", "1", " and id in (select formid from workflow_base where id="+workflowid+")");;
+		 RecordSet rs=new RecordSet();
+		 try {
+			//获取当前系统日期
+			String nowDate=TimeCommonUtil.obtainDate(0).substring(0,10);
+			String mainid="";//主键ID
+			String bxfs="";//报销方式
+			String fygsbm="";//财务K3所属部门
+			String gysmc="";//供应商名称
+			//String fphm="";//发票号码
+			String bxms="";//报销说明
+			String zfrq="";//支付日期
+			String bxzje="";//报销总金额
+			String bz="";//币种
+			String zz="";//组织
+			String sql="select * from "+tablename+" where requestid="+requestid;
+			rs.execute(sql);
+			while(rs.next()){
+				mainid=Util.null2String(rs.getString("id"));
+				bxfs=Util.null2String(rs.getString("bxfs"));
+				fygsbm=Util.null2String(rs.getString("fygsbm"));
+				zfrq=Util.null2String(rs.getString("zfrq"));
+				bxzje=Util.null2String(rs.getString("bxzje"));
+				bz=Util.null2String(rs.getString("bz"));
+				zz=Util.null2String(rs.getString("zz"));
+				bxms=Util.null2String(rs.getString("bxms")).replaceAll("&nbsp;", " ");
+			}
+			
+			//K3中表头备注字段最多只能存储255位,将付款说明进行截取
+			if(bxms.length()>255){
+				bxms=bxms.substring(0,255);
+			}
+			
+			//付款方式
+			if("0".equals(bxfs)){//银行
+				bxfs="JSFS03_SYS";
+			}else{
+				bxfs="JSFS01_SYS";//现金
+			}
+			//根据K3部门查询K3供应商
+			gysmc=BaseUtil.getBaseInfoByParm("k3gys", "uf_bm_gys_K3", "k3bm", fygsbm, "");
+			
+			log.writeLog("gysmc-------->"+gysmc);
+			if("".equals(gysmc)){
+				String error_msg="当前K3部门编码【"+fygsbm+"】未维护对应的供应商，请先维护对应关系！";
+				if(language==0||language==7){//简体
+					
+				}else if(language==8){//英语
+					error_msg="当前K3部门编码【"+fygsbm+"】未维护对应的供应商，请先维护对应关系！";
+				}else if(language==9){//繁体
+					error_msg="当前K3部门编码【"+fygsbm+"】未维护对应的供应商，请先维护对应关系！";
+				}else if(language==22){//印尼语
+					error_msg="当前K3部门编码【"+fygsbm+"】未维护对应的供应商，请先维护对应关系！";
+				}
+				ri.getRequestManager().setMessage("111100");
+				ri.getRequestManager().setMessagecontent(error_msg);
+				return "0";
+			}
+			
+			
+			//***************************************拼接K3 Cloud应付单所需的JSON字符串***********************************************//
+			Map<String,Object> data=new HashMap<String,Object>();
+	    	
+	    	Map<String,Object> Model=new HashMap<String,Object>();
+	    	//单据类型(必填项)--------默认为标准应付单YFD01_SYS
+	    	Map<String,Object> FBillTypeID=new HashMap<String,Object>();
+	    	FBillTypeID.put("FNUMBER", "YFD01_SYS");
+	    	Model.put("FBillTypeID", FBillTypeID);
+	    	
+	    	//是否期初单据
+	    	Model.put("FISINIT", false);
+	    	//业务日期(必填项)--------默认为当前系统日期
+	    	Model.put("FDATE", nowDate);
+	    	//到期日(必填项)--------
+	    	Model.put("FENDDATE_H", nowDate);
+	    	//单据状态，默认为创建 Z
+	    	Model.put("FDOCUMENTSTATUS", "Z");
+	    	
+	    	//供应商(必填项)--------
+	    	Map<String,Object> FSUPPLIERID=new HashMap<String,Object>();
+	    	FSUPPLIERID.put("FNUMBER", gysmc);
+	    	Model.put("FSUPPLIERID", FSUPPLIERID);
+	    	
+	    	//币别(必填项)--------
+	    	Map<String,Object> FCURRENCYID=new HashMap<String,Object>();
+	    	FCURRENCYID.put("FNUMBER", bz);
+	    	Model.put("FCURRENCYID", FCURRENCYID);
+	    	
+	    	Model.put("FISPRICEEXCLUDETAX", true);//价外税
+	    	Model.put("FBUSINESSTYPE", "CG");//业务类型(必填项)----默认为CG
+	    	Model.put("FISTAX", true);//按含税单价录入----
+	    	
+	    	//结算组织(必填项)----
+	    	Map<String,Object> FSETTLEORGID=new HashMap<String,Object>();
+	    	FSETTLEORGID.put("FNumber", zz);
+	    	Model.put("FSETTLEORGID", FSETTLEORGID);//结算组织(必填项)----
+	    	
+	    	//采购部门----
+	    	Map<String,Object> FPURCHASEDEPTID=new HashMap<String,Object>();
+	    	FPURCHASEDEPTID.put("FNUMBER", fygsbm);
+	    	Model.put("FPURCHASEDEPTID", FPURCHASEDEPTID);
+	    	
+	    	//付款组织(必填项)----
+	    	Map<String,Object> FPAYORGID=new HashMap<String,Object>();
+	    	FPAYORGID.put("FNUMBER", zz);
+	    	Model.put("FPAYORGID", FPAYORGID);
+	    	
+	    	//作废状态(必填项)----默认为A
+	    	Model.put("FCancelStatus", "A");
+	    	//Invoice No(必填项)----//requestid
+	    	Model.put("F_RTA_InvoiceNo", "OA-"+requestid);
+	    	//business type(必填项)----默认为服务类S
+	    	Model.put("F_RTA_BusinessType", "S");
+	    	//备注
+	    	Model.put("FAP_Remark", bxms);
+	    	
+	    	//-----------------表头供应商 start-----------------//
+	    	Map<String,Object> FsubHeadSuppiler=new HashMap<String,Object>();
+	    	FsubHeadSuppiler.put("FORDERID", FSUPPLIERID);//订货方
+	    	FsubHeadSuppiler.put("FTRANSFERID", FSUPPLIERID);//供货方
+	    	FsubHeadSuppiler.put("FChargeId", FSUPPLIERID);//收款方
+	    	Model.put("FsubHeadSuppiler", FsubHeadSuppiler);//将供应商信息加入至Map中
+	    	//-----------------表头供应商 end-----------------//
+	    	
+	    	//-----------------表头财务 start-----------------//
+	    	Map<String,Object> FsubHeadFinc=new HashMap<String,Object>();
+	    	FsubHeadFinc.put("FACCNTTIMEJUDGETIME", zfrq);//到期日计算日期(必填项)----
+	    	//结算方式
+	    	Map<String,Object> FSettleTypeID=new HashMap<String,Object>();
+	    	FSettleTypeID.put("FNUMBER", bxfs);
+	    	FsubHeadFinc.put("FSettleTypeID", FSettleTypeID);
+	    	//本位币
+	    	FsubHeadFinc.put("FMAINBOOKSTDCURRID", FCURRENCYID);
+	    	Model.put("FsubHeadFinc", FsubHeadFinc);//
+	    	//-----------------表头财务 end-----------------//
+	    	
+	    	
+	    	
+	    	//-----------------明细 start-----------------//
+	    	sql="select * from "+tablename+"_dt8 where mainid="+mainid;
+	    	rs.execute(sql);
+	    	List<Map<String,Object>> FEntityDetail=new ArrayList<Map<String,Object>>();
+	    	while(rs.next()){
+	    		String je=Util.null2String(rs.getString("je"));
+	    		//定义一行明细
+		    	Map<String,Object> EntityDetail=new HashMap<String, Object>();
+				//物料编码
+		    	Map<String,Object> FMATERIALID=new HashMap<String,Object>();
+		    	FMATERIALID.put("FNUMBER", Util.null2String(rs.getString("bxlx1")));
+				EntityDetail.put("FMATERIALID", FMATERIALID);
+				
+				String beizhu=Util.null2String(rs.getString("bz")).replaceAll("&nbsp;", " ");
+				//K3中明细备注字段最多只能存储50位,将付款说明进行截取
+				if(beizhu.length()>50){
+					beizhu=beizhu.substring(0,50);
+				}
+				
+				EntityDetail.put("F_RTA_EntryRemarks", beizhu);//备 注
+				//计价单位
+		    	Map<String,Object> FPRICEUNITID=new HashMap<String,Object>();
+		    	FPRICEUNITID.put("FNUMBER", "Pcs");
+				EntityDetail.put("FPRICEUNITID", FPRICEUNITID);
+				
+				EntityDetail.put("FPrice", je);//单价
+				EntityDetail.put("FPriceQty", 1.0);//计价数量
+				EntityDetail.put("FTaxPrice", je);//含税单价
+				EntityDetail.put("FPriceWithTax", je);//含税净价
+				//PPN Type
+		    	Map<String,Object> F_RTA_VATType_d=new HashMap<String,Object>();
+		    	F_RTA_VATType_d.put("FNUMBER", "000");
+				EntityDetail.put("F_RTA_VATType_d", F_RTA_VATType_d);
+				
+				EntityDetail.put("FNoTaxAmountFor_D", je);//不含税金额
+				EntityDetail.put("FTAXAMOUNTFOR_D", 0);//税额
+				EntityDetail.put("FALLAMOUNTFOR_D", je);//价税合计
+				EntityDetail.put("F_RTA_FakturPajakNo_d", "-");//Faktur Pajak No
+				EntityDetail.put("F_RTA_SUPPLIER_D", FSUPPLIERID);//表体供应商(用于校验税票号唯一)
+				//将MAP添加至List中
+		    	FEntityDetail.add(EntityDetail);
+	    	}
+	    	
+	    	Model.put("FEntityDetail", FEntityDetail);//
+	    	//-----------------明细 end-----------------//
+	    	
+	    	//-----------------付款计划 start-----------------//
+	    	List<Map<String,Object>> FEntityPlan=new ArrayList<Map<String,Object>>();
+	    	Map<String,Object> FPlan=new HashMap<String,Object>();
+	    	FPlan.put("FENDDATE", zfrq);//表头计划 - 到期日
+	    	FPlan.put("FPAYAMOUNTFOR", bxzje);//应付金额
+	    	FPlan.put("FPAYRATE", 100);//应付比例(%)
+	    	FEntityPlan.add(FPlan);
+	    	Model.put("FEntityPlan", FEntityPlan);//
+	    	//-----------------付款计划 end-----------------//
+	    	data.put("Model", Model);
+	    	
+	    	//将MAP转JSON，fastjson默认开启引用检测将相同的对象写成引用的形式，所以必须加上SerializerFeature.DisableCircularReferenceDetect，否则转换的字符串会出现$ref
+	    	String jsonStr = JSON.toJSONString(data, SerializerFeature.DisableCircularReferenceDetect);
+	    	log.writeLog("调用应付单保存接口传入数据jsonStr---------->"+jsonStr);
+	    	//连接K3
+			K3CloudApiClient client =K3Connect.connect();
+			if(client!=null){
+				//调用应付单保存接口
+				String sResult = client.excuteOperation("AP_Payable", "save", jsonStr);
+				log.writeLog("调用应付单保存接口返回数据sResult---------->"+sResult);
+				//解析K3返回的JSO字符串
+				JSONObject jsonObject = JSONObject.parseObject(sResult);
+				JSONObject ResponseStatus=jsonObject.getJSONObject("Result").getJSONObject("ResponseStatus");
+				//是否成功写入K3
+				String IsSuccess=ResponseStatus.get("IsSuccess").toString();
+				log.writeLog("是否成功写入K3结果IsSuccess---------->"+IsSuccess);
+				//成功写入K3
+				if("true".equals(IsSuccess)){
+					JSONArray SuccessJSONArray=ResponseStatus.getJSONArray("SuccessEntitys");
+					String Id="";//单据ID
+					String Number="";//单据编号
+					for(int p=0;p<SuccessJSONArray.size();p++){
+						Id=SuccessJSONArray.getJSONObject(p).get("Id").toString();//获取返回的单据ID
+						Number=SuccessJSONArray.getJSONObject(p).get("Number").toString();//获取返回的单据编号
+					}
+					log.writeLog("Id------>"+Id+",Number------>"+Number);
+					//将应付单号更新至表单字段中
+					rs.execute("update "+tablename+" set sfcgsck3yfd='0',k3yfdh='"+Number+"',k3jkfhxx='' where requestid="+requestid);
+				}else{
+					JSONArray ErrorsJSONArray=ResponseStatus.getJSONArray("Errors");
+					String msg="";
+					for(int p=0;p<ErrorsJSONArray.size();p++){
+						msg+=ErrorsJSONArray.getJSONObject(p).get("Message").toString();
+					}
+					//将错误信息更新至表单字段中
+					rs.execute("update "+tablename+" set sfcgsck3yfd='1',k3jkfhxx='"+msg.replaceAll("'", "''")+"' where requestid="+requestid);
+					//写入K3失败则进行提醒，并阻止流程提交
+					ri.getRequestManager().setMessage("111100");
+					ri.getRequestManager().setMessagecontent(msg);
+					return "0";
+				}
+			}else{
+				//连接K3超时
+				ri.getRequestManager().setMessage("111100");
+				ri.getRequestManager().setMessagecontent("OA连接K3超时，请联系管理员！");
+				return "0";
+			}
+		 } catch (Exception e) {
+			e.printStackTrace();
+			String error_msg="付款流程写入K3失败，错误信息为：------>"+e.toString();
+			if(language==0||language==7){//简体
+				
+			}else if(language==8){//英语
+				error_msg="付款流程写入K3失败，错误信息为：------>"+e.toString();
+			}else if(language==9){//繁体
+				error_msg="付款流程写入K3失败，错误信息为：------>"+e.toString();
+			}else if(language==22){//印尼语
+				error_msg="付款流程写入K3失败，错误信息为：------>"+e.toString();
+			}
+			log.writeLog(error_msg);
+			//将错误信息更新至表单字段中
+			rs.execute("update "+tablename+" set sfcgsck3yfd='1',k3jkfhxx='"+error_msg.replaceAll("'", "''")+"' where requestid="+requestid);
+			ri.getRequestManager().setMessage("111100");
+			ri.getRequestManager().setMessagecontent(error_msg);
+			return "0";
+		 }
+		 return SUCCESS;
+	}
+}
diff --git a/src/main/youhong_ai_jitu_src/com/jet/action/CreateVoucherBx.java b/src/main/youhong_ai_jitu_src/com/jet/action/CreateVoucherBx.java
new file mode 100644
index 0000000..0777f53
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/com/jet/action/CreateVoucherBx.java
@@ -0,0 +1,567 @@
+package com.jet.action;
+
+import weaver.soa.workflow.request.RequestInfo;
+import weaver.workflow.action.BaseAction;
+import weaver.conn.RecordSet;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+
+import weaver.hrm.HrmUserVarify;
+import  weaver.hrm.User;
+import weaver.general.BaseBean;
+import weaver.general.Util;
+import org.apache.log4j.Logger;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import java.text.SimpleDateFormat;
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.Statement;
+import weaver.general.StaticObj;
+import weaver.interfaces.datasource.DataSource;
+import weaver.formmode.setup.ModeRightInfo;
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import weaver.general.StaticObj;
+import weaver.interfaces.datasource.DataSource;
+import weaver.interfaces.workflow.action.Action;
+
+import java.math.BigDecimal;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.PrintWriter;
+import java.net.URL;
+import java.net.URLConnection;
+import org.apache.http.Header;
+import org.apache.http.HttpResponse;
+import org.apache.http.HttpStatus;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.entity.*;
+import org.apache.http.*;
+import org.apache.http.util.*;
+import org.apache.http.impl.client.DefaultHttpClient;
+import org.apache.http.params.CoreConnectionPNames;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import java.nio.charset.Charset;
+import java.io.BufferedReader;
+import java.io.ByteArrayOutputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import weaver.conn.RecordSetTrans;
+import java.io.PrintWriter;
+import com.jet.util.*;
+import org.json.*;
+public class CreateVoucherBx extends BaseAction{
+   @Override
+   public String execute(RequestInfo requestInfo) {
+	// TODO Auto-generated method stub
+	   Logger log = Logger.getLogger(JSONObject.class);
+	   RecordSet urlre=new RecordSet();
+	   String urlsql="select * from uf_urlinfo where 	ms='model'";
+
+	   urlre.execute(urlsql);
+	   String url="";
+	   String username="";
+	   String password1="";
+	   String dbid1="";
+	   String uuid1="";
+	   String password2="";
+	   while(urlre.next()){
+	   	 url=Util.null2String(urlre.getString("url"));
+	   	 username=Util.null2String(urlre.getString("username"));
+	   	 password1=Util.null2String(urlre.getString("password"));
+	   	 dbid1=Util.null2String(urlre.getString("dbid"));
+	   	 uuid1=Util.null2String(urlre.getString("uuid"));
+	   	 password2=Util.null2String(urlre.getString("password1"));
+	   }
+	   String baseis=username+":"+password1;
+	   String Queryurl=url+"GlVoucher/";
+	   log.error("deeded");
+	    Map<String,String> Hswd=new HashMap<String,String>();//核算维度对照表
+	    JSONObject VOUCHER=new JSONObject();//VOUCHER
+	    JSONArray Models=new JSONArray();//ModelS
+	    JSONObject Model=new JSONObject();//Model
+	    Hswd.put("FFLEX4","gys");//供应商
+	    Hswd.put("FFLEX6","kh");//客户
+	    Hswd.put("FFLEX7","yg");//员工
+	    Hswd.put("FFLEX5","bm");//部门
+	    Hswd.put("FFLEX9","fyxm");//费用项目
+	    Hswd.put("FFLEX8","wl");//物料
+	    Hswd.put("FFLEX10","zc");//资产
+	    Hswd.put("FFLEX12","wlz");//物料组
+	    Hswd.put("FFLEX13","khz");//客户组
+	    Map<String,String> fxHswd=new HashMap<String,String>();//核算维度对照表
+	    fxHswd.put("gys","FFLEX4");//供应商
+	    fxHswd.put("kh","FFLEX6");//客户
+	    fxHswd.put("yg","FFLEX7");//员工
+	    fxHswd.put("bm","FFLEX5");//部门
+	    fxHswd.put("fyxm","FFLEX9");//费用项目
+	    fxHswd.put("wl","FFLEX8");//物料
+	    fxHswd.put("zc","FFLEX10");//资产
+	    fxHswd.put("wlz","FFLEX12");//物料组
+	    fxHswd.put("khz","FFLEX13");//客户组
+	    SimpleDateFormat sim=new SimpleDateFormat("yyyy-MM-dd");
+	    List<String> jlist=new ArrayList<String>();//借方
+	    List<String> dlist=new ArrayList<String>();//贷方
+	    String requestid=requestInfo.getRequestid();//
+	    String mainid="";//
+	    String zt="";//账套
+	    String zz="";//组织
+	    String zb="";//账薄
+	    String zzjdhl="";//做账节点汇率
+	    String bz="";//币种
+	    String sfxr="";//是否写入
+	    RecordSet re=new RecordSet();
+	    String errormess="";
+	    float zje=0.0f;
+	    //1:借方  2：贷方
+	    String sql= " select a.sfxr,a.zzjdhl,a.bz,a.id,a.zt,a.zz,a.zb,b.jfkmbm kmbh,b.zy,b.jfje je,b.bm,b.yg,b.kh,b.gys,b.fyxm,b.wl,b.zc,b.wlz,b.khz,b.jfkmmc kmmc,b.hswd,b.yje,'1' entrylx from formtable_main_22 a,formtable_main_22_dt4 b where a.id=b.mainid and a.requestid='"+requestid+"'"+ 
+	                " union all "+
+	                " select a.sfxr,a.zzjdhl,a.bz,a.id,a.zt,a.zz,a.zb,b.dfkmbm kmbh,b.zy,b.dfje je,b.bm,b.yg,b.kh,b.gys,b.fyxm,b.wl,b.zc,b.wlz,b.khz,b.dfkmmc kmmc,b.hswd,b.yje,'2' entrylx from formtable_main_22 a,formtable_main_22_dt5 b where a.id=b.mainid and a.requestid='"+requestid+"' ";
+	    log.error(requestid+"CreateVoucherBx"+sql);
+	    //out.print(sql);
+	    
+	    re.execute(sql);
+	    JSONArray FEntity=new JSONArray();
+	    lable1:while(re.next()){
+	   	//拼接科目信息
+	   	sfxr=Util.null2String(re.getString("sfxr")).trim();
+	   	zt=Util.null2String(re.getString("zt")).trim();
+	   	zz=Util.null2String(re.getString("zz")).trim();
+	   	zb=Util.null2String(re.getString("zb")).trim();
+	   	JSONObject FEntityDetail=new JSONObject();
+	   	String FEXPLANATION=Util.null2String(re.getString("zy"));//摘要
+	   	FEntityDetail.put("FEXPLANATION",FEXPLANATION);
+	   	JSONObject FACCOUNTID=new JSONObject();//科目  FNumber
+	   	String demoKm=Util.null2String(re.getString("kmbh")).trim();
+	   	if("".equals(demoKm)){
+	   		errormess="科目编号不能为空";//科目编号不能为空
+	   		break;
+	   	}else{
+	   		FACCOUNTID.put("FNumber",demoKm);
+	   	}
+	   	FEntityDetail.put("FACCOUNTID",FACCOUNTID);
+	   	JSONObject FDetailID=new JSONObject();//辅助核算项   FDETAILID__FFLEX10 FNumber
+	   	//获取科目的辅助核算项
+	   	String demoHswd=getFzhx(demoKm,zt,zz,zb,Hswd);
+	   	//out.print("demoHswd--"+demoHswd);
+	   	if(demoHswd!=null&&!"".equals(demoHswd.trim())){
+	   		String[] demoHswds=demoHswd.split(",");
+	   		for(String str:demoHswds){
+	   			if(str!=null&&!"".equals(str)){
+	   				JSONObject Hswdjson=new JSONObject();
+	   				String number=Util.null2String(re.getString(str)).trim(); 
+	   				if(!"".equals(number)){
+	   					Hswdjson.put("FNumber",number);
+	   					FDetailID.put("FDETAILID__"+fxHswd.get(str),Hswdjson);
+	   				}else{
+	   					errormess=str+"核算维度没有设置值!";
+	   					break lable1;
+	   				}
+	   				
+	   			}
+	   		}
+	   	}
+	   	FEntityDetail.put("FDetailID",FDetailID);
+	   	JSONObject FCURRENCYID=new JSONObject();//币别 FNumber
+	   	FCURRENCYID.put("FNumber","IDR");//默认印尼盾
+	   	FEntityDetail.put("FCURRENCYID",FCURRENCYID);
+	   	JSONObject FEXCHANGERATETYPE=new JSONObject();;//汇率类型
+	   	FEXCHANGERATETYPE.put("FNumber","HLTX01_SYS");//默认
+	   	FEntityDetail.put("FEXCHANGERATETYPE",FEXCHANGERATETYPE);
+	   	String FEXCHANGERATE ="1";//汇率
+	   	FEntityDetail.put("FEXCHANGERATE",FEXCHANGERATE);
+	   	String FUnitId ="";//单位
+	   	//FEntityDetail.put("FUnitId",FUnitId);
+	   	String FPrice="0";//单价
+	   	//FEntityDetail.put("FPrice",FPrice);
+	   	String FQty="0";//数量
+	   	//FEntityDetail.put("FQty",FQty);
+	   	String FAMOUNTFOR="";//原币金额
+	   	String entrylx=Util.null2String(re.getString("entrylx"));
+	   	String FDEBIT="";//借方金额
+	   	String FCREDIT="";//贷方金额
+	   	String FDC="";//借贷方向
+	   	if("1".equals(entrylx)){//借方
+	   		FDEBIT=Util.null2String(re.getString("je"));
+	   		FDC="1";
+	   	}else{
+	   		FCREDIT=Util.null2String(re.getString("je"));
+	   		FDC="0";
+	   	}
+	   	FEntityDetail.put("FCREDIT",FCREDIT);
+	   	FEntityDetail.put("FDEBIT",FDEBIT);
+	   	FEntityDetail.put("FDC",FDC);
+	   	String FSettleTypeID="";//结束方式 FNumber
+	   	String FSETTLENO ="";//结算号
+	   	
+	   	String FAcctFullName=getKmname(demoKm,zt,zz,zb);//科目全称
+	   	String FACCOUNTNAME=getKmname(demoKm,zt,zz,zb);//科目名称
+	   	//FEntityDetail.put("FAcctFullName",FAcctFullName);
+	   	//FEntityDetail.put("FACCOUNTNAME",FACCOUNTNAME);
+	   	FEntity.add(FEntityDetail);
+	    }
+	    if(!"".equals(errormess)){
+	    	requestInfo.getRequestManager().setMessageid(errormess);
+	    	requestInfo.getRequestManager().setMessage(errormess);//提醒信息id
+	    	requestInfo.getRequestManager().setMessagecontent("写入K3系统不成功，系统反馈信息如下："+errormess);//提醒信息内容
+
+			return Action.FAILURE_AND_CONTINUE;
+	    }
+	    //out.print("errormess"+errormess);
+	    //out.print("FEntityDetail"+FEntity.toJSONString());
+	    //设置主数据
+	    JSONObject FAccountBookID=new JSONObject();//账薄
+	    FAccountBookID.put("FNumber",zb);
+	    Model.put("FAccountBookID",FAccountBookID);
+	    String FDate=sim.format(new Date());
+	    Model.put("FDate",FDate);
+	    JSONObject FVOUCHERGROUPID=new  JSONObject();//凭证字默认AP
+	    FVOUCHERGROUPID.put("FNumber","PZZ3");
+	    Model.put("FVOUCHERGROUPID",FVOUCHERGROUPID);
+	    String FYEAR=sim.format(new Date()).split("-")[0];//会计年度
+	    String FPERIOD =sim.format(new Date()).split("-")[1];//期间
+	    Model.put("FYEAR",FYEAR);
+	    Model.put("FPERIOD",FPERIOD);
+	    String FDEBITTOTAL=getjfZje(requestid);//借方总金额：FDEBITTOTAL 
+	    String FCREDITTOTAL=getdfZje(requestid);//贷方总金额：FCREDITTOTAL 
+	    Model.put("FDEBITTOTAL",FDEBITTOTAL);
+	    Model.put("FCREDITTOTAL",FCREDITTOTAL);
+	    String FCreateDate=sim.format(new Date());//创建日期：FCreateDate 
+	    JSONObject FACCBOOKORGID=new JSONObject();//核算组织：FACCBOOKORGID 
+	    FACCBOOKORGID.put("FNumber",zz);
+	    Model.put("FACCBOOKORGID",FACCBOOKORGID);
+	    //Model.put("FCreateDate",FCreateDate);
+	    String FPRINTTIMES="0";//打印次数：FPRINTTIMES 
+	    String FCurrentYear=sim.format(new Date()).split("-")[0];//当前年度：FCurrentYear 
+	    String FCurrentPeriod=sim.format(new Date()).split("-")[1];//当前期间：FCurrentPeriod
+	    Model.put("FPRINTTIMES",FPRINTTIMES);
+	    //Model.put("FCurrentYear",FCurrentYear);
+	    //Model.put("FCurrentPeriod",FCurrentPeriod);
+	    Model.put("FEntity",FEntity);
+	    //Models.add(Model);
+	    //凭借主数据
+	    VOUCHER.put("NeedReturnFields","[\"FVOUCHERID\",\"FVOUCHERGROUPNO\"]");
+	    VOUCHER.put("IsAutoSubmitAndAudit",true);
+	    VOUCHER.put("Model",Model);
+	    log.error(VOUCHER.toJSONString());
+	    /*开始调用接口 
+	    1；登陆
+	    2；调用接口 
+	    */
+	    //String Fv=getFv(Queryurl+"595130",baseis,out);
+	    //out.print(Fv);
+	    if(VOUCHER!=null&&VOUCHER.size()>0&&("".equals(sfxr)||"1".equals(sfxr))){
+	   	    RecordSet updRec=new RecordSet();
+	   	    com.jet.util.InvokeHelper.POST_K3CloudURL="http://k3.jet.co.id:8880/k3cloud/";
+	   		String dbid="5d48f604c8361e";//dbid1;//"5d48f604c8361e";//"5a964ecc967246";
+	   		String uuid=uuid1;
+	   		String password=password2;
+	   		org.json.JSONObject resultjson=null;
+	   		int lang=2052;
+	   		try {
+	   			boolean flag=InvokeHelper.Login(dbid, uuid, password, lang);
+	   			//out.print(flag);
+	   			if(flag){//登陆成功
+	   				resultjson=com.jet.util.InvokeHelper.Save("GL_VOUCHER",VOUCHER.toJSONString());
+	   				boolean flag1=resultjson.getBoolean("flag");
+	   				String  resultstr=resultjson.getString("sResult");
+	   				log.error("resultstr"+resultstr);
+	   				if(flag1){
+	   					JSONObject HAHA=JSONObject.parseObject(resultstr);
+	   					JSONObject Result=HAHA.getJSONObject("Result");
+	   					JSONObject ResponseStatus=Result.getJSONObject("ResponseStatus");
+	   					boolean IsSuccess=ResponseStatus.getBoolean("IsSuccess");
+	   					if(IsSuccess){
+	   						updRec.execute("update formtable_main_22 set sfxr='0' where requestid='"+requestid+"' ");
+	   						String FVOUCHERID=Result.getString("Id");
+	   						String Fv=getFv(Queryurl+""+FVOUCHERID,baseis);
+	   						updRec.execute("update formtable_main_22 set pzbhdyc='"+Fv+"' where requestid='"+requestid+"' ");
+	   						//out.print("成功"+FVOUCHERID);
+	   						
+	   					}else{
+	   						//out.print("失败");
+	   						requestInfo.getRequestManager().setMessageid("失败");
+	   				    	requestInfo.getRequestManager().setMessage("失败");//提醒信息id
+	   				    	requestInfo.getRequestManager().setMessagecontent("写入K3系统不成功，系统反馈信息如下："+HAHA.toString());//提醒信息内容
+
+	   						return Action.FAILURE_AND_CONTINUE;
+	   					}
+	   				}else{
+	   					//out.print("失败"+resultstr);
+	   					requestInfo.getRequestManager().setMessageid("失败");
+   				    	requestInfo.getRequestManager().setMessage("失败");//提醒信息id
+   				    	requestInfo.getRequestManager().setMessagecontent("写入K3系统不成功，系统反馈信息如下："+resultstr.toString());//提醒信息内容
+
+   						return Action.FAILURE_AND_CONTINUE;
+	   				}
+	   				
+	   			}
+	   		} catch (Exception e) {
+	   			 //TODO Auto-generated catch block
+	   			log.error("GL_VOUCHER--Exception"+e.getMessage());
+	   			e.printStackTrace();
+	   		} 
+	    }
+	    return SUCCESS;
+   }
+   
+ //更具ID获取凭证编号
+   public String getFv(String url,String basis)throws Exception{
+   	String Fv="";
+   	//out.print("url-"+url+" basis"+basis+" ");
+   	try{
+   	  String result=sendGet(url,"",basis);
+   	 // out.print("url-"+url+" basis"+basis+" result"+result);
+   	  JSONArray json=JSONArray.parseArray(result);
+   	  if(json!=null&&json.size()>0){
+   		   for(int i=0;i<json.size();i++){
+   			  JSONObject obj= json.getJSONObject(i);
+   			  Fv=obj.getString("Voucher No");
+   		   }
+   	  }
+   	}catch(Exception e){
+   		
+   	}
+   	return Fv;
+   }
+   public  static String sendGet(String url, String param,String basis) {
+   	String result = "";
+   	InputStream in = null;
+   try {
+   	String urlNameString = url ;
+   	URL realUrl = new URL(urlNameString);
+   URLConnection connection = realUrl.openConnection();
+   String auth=basis;//"JNT:JNT2019";
+   String code = new sun.misc.BASE64Encoder().encode(auth.getBytes());
+   connection.setRequestProperty("Authorization", "Basic " + code);
+   connection.connect();
+   Map<String, List<String>> map = connection.getHeaderFields();
+
+
+   	for (String key : map.keySet()) {
+   	System.out.println(key + "--->" + map.get(key));
+   	}
+   	//接收核心返回过来的数据 xml  需要解析
+   	in =connection.getInputStream();
+   	byte[] b =getBytes(in);
+   	if(b.length>0){
+   		result=new String(b);
+   	}
+       System.out.println(b.length);
+   	} catch (Exception e) {
+
+        System.out.println(e.getMessage());
+   	  e.printStackTrace();
+   	}finally {
+   	try {
+   	if (in != null) {
+   	  in.close();
+   	}
+   	} catch (Exception e2) {
+   		System.out.println(e2.getMessage());
+   	   e2.printStackTrace();
+   	}
+   	}
+   	//System.out.println("de"+result);
+   	return result;
+   	}
+   public static byte[] getBytes(InputStream fis){  
+       Logger log = Logger.getLogger(Logger.class);
+        byte[] buffer = null;  
+        try {  
+            //File file = new File(filePath);  
+            //FileInputStream fis = new FileInputStream(file);  
+            ByteArrayOutputStream bos = new ByteArrayOutputStream(1000);  
+            byte[] b = new byte[10000];  
+            int n;  
+            while ((n = fis.read(b)) != -1) {  
+                bos.write(b, 0, n);  
+            }  
+            fis.close();  
+            bos.close();  
+            buffer = bos.toByteArray();  
+        } catch (FileNotFoundException e) {  
+            e.printStackTrace();  
+        } catch (IOException e) {  
+            e.printStackTrace();  
+        }  
+        System.out.println("buffer--->"+buffer.length);
+        return buffer;  
+    }
+   //获取借方总金额
+   public static String getjfZje(String requestid){
+   	RecordSet re=new RecordSet();
+   	String je="";
+   	String sql="select sum(jfje) jfje from formtable_main_22 a,formtable_main_22_dt4 b where a.id=b.mainid and a.requestid='"+requestid+"'";
+   	re.execute(sql);
+   	while(re.next()){
+   		je=re.getString("jfje")	;
+   	}
+   	return je;
+   }
+   //获取贷方总金额
+   public static String getdfZje(String requestid){
+   	RecordSet re=new RecordSet();
+   	String je="";
+   	String sql="select sum(dfje) dfje from formtable_main_22 a,formtable_main_22_dt5 b where a.id=b.mainid and a.requestid='"+requestid+"'";
+   	re.execute(sql);
+   	while(re.next()){
+   		je=re.getString("dfje")	;
+   	}
+   	return je;
+   }
+   //获取赋值核算类型
+   public String getFzhx(String km,String zt,String zz,String zb,Map<String,String> Hswd ){
+   	String FDIMENSION="";//核算维度
+   	RecordSet re=new RecordSet();
+   	String sql="select b.FDIMENSION from uf_accountinfo a,uf_accountinfo_dt1 b where a.id=b.mainid and a.zt='"+zt+"' and b.FNUMBER='"+km+"' and b.forgnumber='"+zz+"' and FAcctBookNumber='"+zb+"' ";
+   	//out.print(sql);
+   	re.execute(sql);
+   	while(re.next()){
+   		String str=Util.null2String(re.getString("FDIMENSION")).trim() ;
+   		String[] FDIMENSIONs=str.split(",");
+   		for(String demo:FDIMENSIONs){
+   		  if(demo!=null&&!"".equals(demo)){
+   			FDIMENSION=FDIMENSION+Hswd.get(demo)+",";
+   		  }
+   		}
+   	}
+   	if(FDIMENSION.endsWith(",")){
+   		FDIMENSION=FDIMENSION.substring(0,FDIMENSION.length()-1);
+   	}
+   	return FDIMENSION;
+   }
+   //insert 事务
+   public  boolean SynInsert1(List<String> array){
+         if(array==null||array.size()<=0){
+           return false;
+         }
+         Logger log = Logger.getLogger(DataSource.class);
+         RecordSetTrans RecordSetTrans=new RecordSetTrans();
+         RecordSetTrans.setAutoCommit(false);
+   	  boolean flag=true;
+
+   	try{
+   		RecordSetTrans.setAutoCommit(false);	
+   	   // stmt = conn.createStatement();
+   	    for(String str:array){
+   	       //int index =RecordSetTrans.executeUpdate(str);
+   	    	flag=RecordSetTrans.executeSql(str);
+   	        log.error("SynInsert--"+str);
+   	       if(!flag){
+   	         //flag=false;
+   	         break;
+   	       }
+   	    }
+   	    if(!flag){//事务回滚
+   	    	RecordSetTrans.rollback();
+   	    }else{
+   	    	RecordSetTrans.commit();
+   	    }
+   	    }catch(Exception e){
+   	       log.error("SynInsert--Exception "+e.getMessage());
+   	       flag=false; 
+   	    }
+   	    
+   return 	  flag;  
+   }
+   //获取科目名称
+   public String getKmname(String km,String zt,String zz,String zb){
+   	String FNAME="";//核算维度
+   	RecordSet re=new RecordSet();
+   	String sql="select b.FNAME from uf_accountinfo a,uf_accountinfo_dt1 b where a.id=b.mainid and a.zt='"+zt+"' and b.FNUMBER='"+km+"' and b.forgnumber='"+zz+"' and FAcctBookNumber='"+zb+"' ";
+   	re.execute(sql);
+   	while(re.next()){
+   		FNAME=Util.null2String(re.getString("FNAME"));
+   	}
+   	return FNAME;
+   }
+   //获取币种的小数位
+   public int getXsw(String bz){
+   	int xsw=0;
+   	RecordSet re=new RecordSet();
+   	String sql="select * from uf_k3bz where bh='"+bz+"'";
+   	re.execute(sql);
+   	while(re.next()){
+   		xsw=Integer.parseInt(Util.null2o(re.getString("xsw")))  ;
+   	}
+      return xsw;
+   }
+
+   //浮点型转换
+   public static float getfloats(String demo,String demo1,int len){
+   	Logger log = Logger.getLogger(BigDecimal.class);
+   	if(len==0){
+   		len=0;
+   	}
+   	String str=Util.null2String(demo);
+   	String str1=Util.null2String(demo1);
+   	if("".equals(str)||"".equals(str.trim())||"null".equalsIgnoreCase(str.trim())){
+   		return 0;
+   	}
+   	if("".equals(str1)||"".equals(str.trim())||"null".equalsIgnoreCase(str1.trim())){
+   		str1="1";
+   	}
+   	float fl=0.0f;
+   	//String str=Util.null2String(demo);
+   	try{
+   	if(str.trim().length()>0){
+   		    BigDecimal b1 = new BigDecimal(str.trim());
+   		    BigDecimal b2 = new BigDecimal(str1.trim());
+   		    BigDecimal b3=b1.multiply(b2);
+   			//System.out.println(b1.setScale(2,BigDecimal.ROUND_HALF_UP));
+   		    fl=b3.setScale(len,BigDecimal.ROUND_HALF_UP).floatValue();
+   	}
+   	log.error("getfloats"+fl);
+   	}catch(Exception e){
+   		log.error(demo+"getfloats异常"+e.getMessage());	
+   	}
+   	return fl;
+   }
+
+
+   //浮点型转换
+   public static float getfloats1(String demo,String demo1,int len){
+   	Logger log = Logger.getLogger(BigDecimal.class); 
+   	if(len==0){
+   		len=0;
+   	}
+   	String str=Util.null2String(demo);
+   	String str1=Util.null2String(demo1);
+   	if("".equals(str)||"".equals(str.trim())||"null".equalsIgnoreCase(str.trim())){
+   		str="0";
+   	}
+   	if("".equals(str1)||"".equals(str.trim())||"null".equalsIgnoreCase(str1.trim())){
+   		str1="0";
+   	}
+   	float fl=0.0f;
+   	//String str=Util.null2String(demo);
+   	try{
+   	if(str.trim().length()>0){
+   		    BigDecimal b1 = new BigDecimal(str.trim());
+   		    BigDecimal b2 = new BigDecimal(str1.trim()); 
+   		    BigDecimal b3=b1.add(b2);
+   			//System.out.println(b1.setScale(2,BigDecimal.ROUND_HALF_UP));
+   		    fl=b3.setScale(len,BigDecimal.ROUND_HALF_UP).floatValue();
+   	}
+   	log.error("getfloats"+fl);
+   	}catch(Exception e){
+   		log.error(demo+"getfloats异常"+e.getMessage());	
+   	}
+   	return fl;
+   }
+
+}
diff --git a/src/main/youhong_ai_jitu_src/com/jet/action/CreateVoucherBx2.java b/src/main/youhong_ai_jitu_src/com/jet/action/CreateVoucherBx2.java
new file mode 100644
index 0000000..671011c
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/com/jet/action/CreateVoucherBx2.java
@@ -0,0 +1,787 @@
+package com.jet.action;
+
+import weaver.soa.workflow.request.RequestInfo;
+import weaver.workflow.action.BaseAction;
+import weaver.conn.RecordSet;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+
+import weaver.hrm.HrmUserVarify;
+import  weaver.hrm.User;
+import weaver.general.BaseBean;
+import weaver.general.Util;
+import org.apache.log4j.Logger;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import java.text.SimpleDateFormat;
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.Statement;
+import weaver.general.StaticObj;
+import weaver.interfaces.datasource.DataSource;
+import weaver.formmode.setup.ModeRightInfo;
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import weaver.general.StaticObj;
+import weaver.interfaces.datasource.DataSource;
+import weaver.interfaces.workflow.action.Action;
+
+import java.math.BigDecimal;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.PrintWriter;
+import java.net.URL;
+import java.net.URLConnection;
+import org.apache.http.Header;
+import org.apache.http.HttpResponse;
+import org.apache.http.HttpStatus;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.entity.*;
+import org.apache.http.*;
+import org.apache.http.util.*;
+import org.apache.http.impl.client.DefaultHttpClient;
+import org.apache.http.params.CoreConnectionPNames;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import java.nio.charset.Charset;
+import java.io.BufferedReader;
+import java.io.ByteArrayOutputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import weaver.conn.RecordSetTrans;
+import java.io.PrintWriter;
+import com.jet.util.*;
+import org.json.*;
+public class CreateVoucherBx2 extends BaseAction{
+   @Override
+   public String execute(RequestInfo requestInfo) {
+	// TODO Auto-generated method stub
+	   Logger log = Logger.getLogger(JSONObject.class);
+	   RecordSet urlre=new RecordSet();
+	   String urlsql="select * from uf_urlinfo where 	ms='model'";
+	   log.error(requestInfo.getRequestid()+"CreateVoucherBx2");
+	   urlre.execute(urlsql);
+	   String url="";
+	   String username="";
+	   String password1="";
+	   String dbid1="";
+	   String uuid1="";
+	   String password2="";
+	   while(urlre.next()){
+	   	 url=Util.null2String(urlre.getString("url"));
+	   	 username=Util.null2String(urlre.getString("username"));
+	   	 password1=Util.null2String(urlre.getString("password"));
+	   	 dbid1=Util.null2String(urlre.getString("dbid"));
+	   	 uuid1=Util.null2String(urlre.getString("uuid"));
+	   	 password2=Util.null2String(urlre.getString("password1"));
+	   }
+	   String baseis=username+":"+password1;
+	   String Queryurl=url+"GlVoucher/";
+	   //log.error("deeded");
+	   //out.print("haha");
+	    Map<String,String> Hswd=new HashMap<String,String>();//核算维度对照表
+	    JSONObject VOUCHER=new JSONObject();//VOUCHER
+	    JSONArray Models=new JSONArray();//ModelS
+	    JSONObject Model=new JSONObject();//Model
+	    Hswd.put("FFLEX4","gys");//供应商
+	    Hswd.put("FFLEX6","kh");//客户
+	    Hswd.put("FFLEX7","yg");//员工
+	    Hswd.put("FFLEX5","bm");//部门
+	    Hswd.put("FFLEX9","fyxm");//费用项目
+	    Hswd.put("FFLEX8","wl");//物料
+	    Hswd.put("FFLEX10","zc");//资产
+	    Hswd.put("FFLEX12","wlz");//物料组
+	    Hswd.put("FFLEX13","khz");//客户组
+	    Map<String,String> fxHswd=new HashMap<String,String>();//核算维度对照表
+	    fxHswd.put("gys","FFLEX4");//供应商
+	    fxHswd.put("kh","FFLEX6");//客户
+	    fxHswd.put("yg","FFLEX7");//员工
+	    fxHswd.put("bm","FFLEX5");//部门
+	    fxHswd.put("fyxm","FFLEX9");//费用项目
+	    fxHswd.put("wl","FFLEX8");//物料
+	    fxHswd.put("zc","FFLEX10");//资产
+	    fxHswd.put("wlz","FFLEX12");//物料组
+	    fxHswd.put("khz","FFLEX13");//客户组
+	    SimpleDateFormat sim=new SimpleDateFormat("yyyy-MM-dd");
+	    List<String> jlist=new ArrayList<String>();//借方
+	    List<String> dlist=new ArrayList<String>();//贷方
+	    String requestid="8015";//
+	    String mainid="";//
+	    String zt="";//账套
+	    String zz="";//组织
+	    String zb="";//账薄
+	    String zzjdhl="";//做账节点汇率
+	    String bz="";//币种
+	    String sfxr="";//是否写入
+	    String cnfkjdhl="";//出纳汇率
+	    String fkyxzh="";//付款银行账号
+	    String pzbhdyc="";//凭证编号（第一次）
+	    RecordSet re=new RecordSet();
+	    String errormess="";
+	    float zje=0.0f;
+	    //1:借方  2：贷方
+	    String sql= " select a.*  from formtable_main_22 a where a.requestid='"+requestid+"'"; 
+	    re.execute(sql);
+	    while(re.next()){
+	   	    zt=Util.null2String(re.getString("zt")).trim();
+	   		zz=Util.null2String(re.getString("zz")).trim();
+	   		zb=Util.null2String(re.getString("zb")).trim();
+	   		cnfkjdhl=Util.null2String(re.getString("cnfkjdhl")).trim();
+	   		fkyxzh=Util.null2String(re.getString("fkyxzh")).trim();
+	   		pzbhdyc=Util.null2String(re.getString("pzbhdyc")).trim();
+	    }
+	    String tskm =SpelKm(zt,zz,zb,"3");//获取特殊科目 汇率差设置
+	    
+	    float dje=getfloats(getDteJe5(requestid),"1",0);//第一次贷方金额
+	    String ysje=getDteJe(requestid);//原始金额
+	    float newdje=getfloats(ysje,cnfkjdhl,0);//原始换算之后的金额
+	    //获取金额差
+	    JSONArray FEntitys=null;
+	    float hlcJe= getfloats2(newdje+"",dje+"",0);//汇率差
+	    //out.print("ysje"+ysje);
+	    //out.print("cnfkjdhl"+cnfkjdhl);
+	    //out.print("hlcJe"+hlcJe);
+	    //out.print("dje"+dje);
+	    //out.print("newdje"+newdje);
+	    if(dje==newdje){ 
+	   	 
+	   	 JSONObject FEntity=new JSONObject();
+	   	 Map<String,Object> objMap=getModel(requestid,Hswd,fxHswd);
+	   	 Boolean.getBoolean((String)objMap.get("flag"));
+	   	 boolean flag=(Boolean)objMap.get("flag");
+	   	 if(flag){
+	   		 FEntitys=(JSONArray)objMap.get("FEntity");
+	   	 }else{
+	   		 errormess= (String)objMap.get("mess");
+	   	 }
+	   	 //生成贷方
+	   	 FEntity.put("FEXPLANATION","FEXPLANATION");//摘要
+	   	 FEntity.put("FACCOUNTID",fkyxzh);//科目
+	   	 JSONObject FCURRENCYID=new JSONObject();//币别 FNumber
+	   	 FCURRENCYID.put("FNumber","IDR");//默认印尼盾
+	   	 FEntity.put("FCURRENCYID",FCURRENCYID);
+	   	 JSONObject FEXCHANGERATETYPE=new JSONObject();;//汇率类型
+	   	 FEXCHANGERATETYPE.put("FNumber","HLTX01_SYS");//默认
+	   	 FEntity.put("FEXCHANGERATETYPE",FEXCHANGERATETYPE);
+	   	 String FEXCHANGERATE ="1";//汇率
+	   	 FEntity.put("FEXCHANGERATE",FEXCHANGERATE);
+	   	 FEntity.put("FCREDIT",newdje);
+	   	 FEntity.put("FDEBIT","");
+	   	 FEntity.put("FDC","0");
+	   	 FEntitys.add(FEntity);
+	   	 
+	   	 
+	   	 //FEntity.put("FEXPLANATION","FEXPLANATION");//摘要
+	   	 //FEntity.put("FEXPLANATION","FEXPLANATION");//摘要
+	    }else{ //付款小于 做账金额
+	   	 //贷银行存款  借汇率差以及  第一次凭证的贷方
+	   	 JSONObject FEntity=new JSONObject();
+	   	 Map<String,Object> objMap=getModel(requestid,Hswd,fxHswd);
+	   	
+	   	 //Boolean.getBoolean((String)objMap.get("flag"));
+	   	 boolean flag=(Boolean)objMap.get("flag");
+	   	 //out.print(flag);
+	   	 if(flag){
+	   		 FEntitys=(JSONArray)objMap.get("FEntity");
+	   	 }else{
+	   		 errormess= (String)objMap.get("mess");
+	   	 }
+	   	 //out.print(objMap.toString());
+	   	 //借汇率差
+	   	 JSONObject FACCOUNTID=new JSONObject();//科目  FNumber
+	   	 FACCOUNTID.put("FNumber",tskm);
+	   	 FEntity.put("FEXPLANATION","FEXPLANATION");//摘要
+	   	 FEntity.put("FACCOUNTID",FACCOUNTID);//科目
+	   	 JSONObject FCURRENCYID=new JSONObject();//币别 FNumber
+	   	 FCURRENCYID.put("FNumber","IDR");//默认印尼盾
+	   	 FEntity.put("FCURRENCYID",FCURRENCYID);
+	   	 JSONObject FEXCHANGERATETYPE=new JSONObject();;//汇率类型
+	   	 FEXCHANGERATETYPE.put("FNumber","HLTX01_SYS");//默认
+	   	 FEntity.put("FEXCHANGERATETYPE",FEXCHANGERATETYPE);
+	   	 String FEXCHANGERATE ="1";//汇率
+	   	 FEntity.put("FEXCHANGERATE",FEXCHANGERATE);
+	   	 FEntity.put("FCREDIT","");
+	   	 FEntity.put("FDEBIT",hlcJe);
+	   	 FEntity.put("FDC","1");
+	   	 FEntitys.add(FEntity);
+	   	 //贷银行
+	   	 JSONObject FACCOUNTID1=new JSONObject();//科目  FNumber
+	   	 FACCOUNTID1.put("FNumber",fkyxzh);
+	   	 JSONObject FEntity1=new JSONObject();
+	   	 FEntity1.put("FEXPLANATION","FEXPLANATION");//摘要
+	   	 FEntity1.put("FACCOUNTID",FACCOUNTID1);//科目
+	   	 JSONObject FCURRENCYID2=new JSONObject();//币别 FNumber
+	   	 FCURRENCYID2.put("FNumber","IDR");//默认印尼盾
+	   	 FEntity1.put("FCURRENCYID",FCURRENCYID2);
+	   	 JSONObject FEXCHANGERATETYPE2=new JSONObject();;//汇率类型
+	   	 FEXCHANGERATETYPE2.put("FNumber","HLTX01_SYS");//默认
+	   	 FEntity1.put("FEXCHANGERATETYPE",FEXCHANGERATETYPE2);
+	   	 String FEXCHANGERATE2 ="1";//汇率
+	   	 FEntity1.put("FEXCHANGERATE",FEXCHANGERATE2);
+	   	 FEntity1.put("FCREDIT",newdje);
+	   	 FEntity1.put("FDEBIT","");
+	   	 FEntity1.put("FDC","0");
+	   	 FEntitys.add(FEntity1); 
+	    }
+	    if(!"".equals(errormess)){
+	    	requestInfo.getRequestManager().setMessageid(errormess);
+	    	requestInfo.getRequestManager().setMessage(errormess);//提醒信息id
+	    	requestInfo.getRequestManager().setMessagecontent("写入K3系统不成功，系统反馈信息如下："+errormess);//提醒信息内容
+
+			return Action.FAILURE_AND_CONTINUE;
+	    }
+	    
+	    JSONObject FAccountBookID=new JSONObject();//账薄
+	    FAccountBookID.put("FNumber",zb);
+	    Model.put("FAccountBookID",FAccountBookID);
+	    String FDate=sim.format(new Date());
+	    Model.put("FDate",FDate);
+	    JSONObject FVOUCHERGROUPID=new  JSONObject();//凭证字默认AP
+	    FVOUCHERGROUPID.put("FNumber","PZZ3");
+	    Model.put("FVOUCHERGROUPID",FVOUCHERGROUPID);
+	    String FYEAR=sim.format(new Date()).split("-")[0];//会计年度
+	    String FPERIOD =sim.format(new Date()).split("-")[1];//期间
+	    Model.put("FYEAR",FYEAR);
+	    Model.put("FPERIOD",FPERIOD);
+	    String FDEBITTOTAL=newdje+"";//借方总金额：FDEBITTOTAL 
+	    String FCREDITTOTAL=newdje+"";//贷方总金额：FCREDITTOTAL 
+	    Model.put("FDEBITTOTAL",FDEBITTOTAL);
+	    Model.put("FCREDITTOTAL",FCREDITTOTAL);
+	    String FCreateDate=sim.format(new Date());//创建日期：FCreateDate 
+	    JSONObject FACCBOOKORGID=new JSONObject();//核算组织：FACCBOOKORGID 
+	    FACCBOOKORGID.put("FNumber",zz);
+	    Model.put("FACCBOOKORGID",FACCBOOKORGID);
+	    //Model.put("FCreateDate",FCreateDate);
+	    String FPRINTTIMES="0";//打印次数：FPRINTTIMES 
+	    String FCurrentYear=sim.format(new Date()).split("-")[0];//当前年度：FCurrentYear 
+	    String FCurrentPeriod=sim.format(new Date()).split("-")[1];//当前期间：FCurrentPeriod
+	    Model.put("FPRINTTIMES",FPRINTTIMES);
+	    //Model.put("FCurrentYear",FCurrentYear);
+	    //Model.put("FCurrentPeriod",FCurrentPeriod);
+	    Model.put("FEntity",FEntitys);
+	    //Models.add(Model);
+	    Model.put("F_RTA_Remarks",pzbhdyc);  
+	    //凭借主数据
+	    VOUCHER.put("NeedReturnFields","[\"FVOUCHERID\",\"FVOUCHERGROUPNO\"]");
+	    VOUCHER.put("IsAutoSubmitAndAudit",true);
+	    VOUCHER.put("Model",Model);
+	    log.error("CreateVoucherBx2"+VOUCHER.toJSONString());
+	    /*开始调用接口 
+	    1；登陆
+	    2；调用接口 
+	    */
+	    //String Fv=getFv(Queryurl+"595130",baseis,out);
+	    //out.print(Fv);
+	    if(VOUCHER!=null&&VOUCHER.size()>0&&("".equals(sfxr)||"1".equals(sfxr))){
+	   	    RecordSet updRec=new RecordSet();
+	   	    com.jet.util.InvokeHelper.POST_K3CloudURL="http://k3.jet.co.id:8880/k3cloud/";
+	   		String dbid="5d48f604c8361e";//dbid1;//"5d48f604c8361e";//"5a964ecc967246";
+	   		String uuid=uuid1;
+	   		String password=password2;
+	   		org.json.JSONObject resultjson=null;
+	   		int lang=2052;
+	   		try {
+	   			boolean flag=InvokeHelper.Login(dbid, uuid, password, lang);
+	   			//out.print(flag);
+	   			if(flag){//登陆成功
+	   				resultjson=com.jet.util.InvokeHelper.Save("GL_VOUCHER",VOUCHER.toJSONString());
+	   				boolean flag1=resultjson.getBoolean("flag");
+	   				String  resultstr=resultjson.getString("sResult");
+	   				log.error("resultstr"+resultstr);
+	   				if(flag1){
+	   					JSONObject HAHA=JSONObject.parseObject(resultstr);
+	   					JSONObject Result=HAHA.getJSONObject("Result");
+	   					JSONObject ResponseStatus=Result.getJSONObject("ResponseStatus");
+	   					boolean IsSuccess=ResponseStatus.getBoolean("IsSuccess");
+	   					if(IsSuccess){
+	   						updRec.execute("update formtable_main_22 set sfxr='0' where requestid='"+requestid+"' ");
+	   						String FVOUCHERID=Result.getString("Id");
+	   						String Fv=getFv(Queryurl+""+FVOUCHERID,baseis);
+	   						updRec.execute("update formtable_main_22 set pzbhdec='"+Fv+"' where requestid='"+requestid+"' ");
+	   						//out.print("成功"+FVOUCHERID);
+	   						
+	   					}else{
+	   						//out.print("失败");
+	   						requestInfo.getRequestManager().setMessageid("失败");
+	   				    	requestInfo.getRequestManager().setMessage("失败");//提醒信息id
+	   				    	requestInfo.getRequestManager().setMessagecontent("写入K3系统不成功，系统反馈信息如下："+HAHA.toString());//提醒信息内容
+
+	   						return Action.FAILURE_AND_CONTINUE;
+	   					}
+	   				}else{
+	   					//out.print("失败"+resultstr);
+	   					requestInfo.getRequestManager().setMessageid("失败");
+   				    	requestInfo.getRequestManager().setMessage("失败");//提醒信息id
+   				    	requestInfo.getRequestManager().setMessagecontent("写入K3系统不成功，系统反馈信息如下："+resultstr.toString());//提醒信息内容
+
+   						return Action.FAILURE_AND_CONTINUE;
+	   				}
+	   				
+	   			}
+	   		} catch (Exception e) {
+	   			 //TODO Auto-generated catch block
+	   			log.error("GL_VOUCHER--Exception"+e.getMessage());
+	   			e.printStackTrace();
+	   		} 
+	    }
+	    return SUCCESS;
+   }
+   
+ //更具ID获取凭证编号
+   public String getFv(String url,String basis)throws Exception{
+   	String Fv="";
+   	//out.print("url-"+url+" basis"+basis+" ");
+   	try{
+   	  String result=sendGet(url,"",basis);
+   	 // out.print("url-"+url+" basis"+basis+" result"+result);
+   	  JSONArray json=JSONArray.parseArray(result);
+   	  if(json!=null&&json.size()>0){
+   		   for(int i=0;i<json.size();i++){
+   			  JSONObject obj= json.getJSONObject(i);
+   			  Fv=obj.getString("Voucher No");
+   		   }
+   	  }
+   	}catch(Exception e){
+   		
+   	}
+   	return Fv;
+   }
+   public  static String sendGet(String url, String param,String basis) {
+   	String result = "";
+   	InputStream in = null;
+   try {
+   	String urlNameString = url ;
+   	URL realUrl = new URL(urlNameString);
+   URLConnection connection = realUrl.openConnection();
+   String auth=basis;//"JNT:JNT2019";
+   String code = new sun.misc.BASE64Encoder().encode(auth.getBytes());
+   connection.setRequestProperty("Authorization", "Basic " + code);
+   connection.connect();
+   Map<String, List<String>> map = connection.getHeaderFields();
+
+
+   	for (String key : map.keySet()) {
+   	System.out.println(key + "--->" + map.get(key));
+   	}
+   	//接收核心返回过来的数据 xml  需要解析
+   	in =connection.getInputStream();
+   	byte[] b =getBytes(in);
+   	if(b.length>0){
+   		result=new String(b);
+   	}
+       System.out.println(b.length);
+   	} catch (Exception e) {
+
+        System.out.println(e.getMessage());
+   	  e.printStackTrace();
+   	}finally {
+   	try {
+   	if (in != null) {
+   	  in.close();
+   	}
+   	} catch (Exception e2) {
+   		System.out.println(e2.getMessage());
+   	   e2.printStackTrace();
+   	}
+   	}
+   	//System.out.println("de"+result);
+   	return result;
+   	}
+   public static byte[] getBytes(InputStream fis){  
+       Logger log = Logger.getLogger(Logger.class);
+        byte[] buffer = null;  
+        try {  
+            //File file = new File(filePath);  
+            //FileInputStream fis = new FileInputStream(file);  
+            ByteArrayOutputStream bos = new ByteArrayOutputStream(1000);  
+            byte[] b = new byte[10000];  
+            int n;  
+            while ((n = fis.read(b)) != -1) {  
+                bos.write(b, 0, n);  
+            }  
+            fis.close();  
+            bos.close();  
+            buffer = bos.toByteArray();  
+        } catch (FileNotFoundException e) {  
+            e.printStackTrace();  
+        } catch (IOException e) {  
+            e.printStackTrace();  
+        }  
+        System.out.println("buffer--->"+buffer.length);
+        return buffer;  
+    }
+   //封装借贷方 Model
+   public Map<String,Object> getModel(String requestid, Map<String,String> Hswd, Map<String,String> fxHswd){
+   	 RecordSet re=new RecordSet();
+   	 boolean flag=true;
+   	 Map<String,Object> map=new HashMap<String,Object>();
+   	 String errormess="";//
+   	 	String sql= " select a.sfxr,a.zzjdhl,a.bz,a.id,a.zt,a.zz,a.zb,b.dfkmbm kmbh,b.zy,b.dfje je,b.bm,b.yg,b.kh,b.gys,b.fyxm,b.wl,b.zc,b.wlz,b.khz,b.dfkmmc kmmc,b.hswd,b.yje,'1' entrylx from formtable_main_22 a,formtable_main_22_dt5 b where a.id=b.mainid and a.requestid='"+requestid+"' ";
+   				//log.error("deeded"+);
+   		re.execute(sql);
+   		JSONArray FEntity=new JSONArray();
+   		lable1:while(re.next()){
+   		//拼接科目信息
+   		String sfxr=Util.null2String(re.getString("sfxr")).trim();
+   		String zt=Util.null2String(re.getString("zt")).trim();
+   		String zz=Util.null2String(re.getString("zz")).trim();
+   		String zb=Util.null2String(re.getString("zb")).trim();
+   		JSONObject FEntityDetail=new JSONObject();
+   		String FEXPLANATION=Util.null2String(re.getString("zy"));//摘要
+   		FEntityDetail.put("FEXPLANATION",FEXPLANATION);
+   		JSONObject FACCOUNTID=new JSONObject();//科目  FNumber
+   		String demoKm=Util.null2String(re.getString("kmbh")).trim();
+   		if("".equals(demoKm)){
+   		    errormess="科目编号不能为空";//科目编号不能为空
+   			break;
+   		}else{
+   			FACCOUNTID.put("FNumber",demoKm);
+   		}
+   			FEntityDetail.put("FACCOUNTID",FACCOUNTID);
+   		JSONObject FDetailID=new JSONObject();//辅助核算项   FDETAILID__FFLEX10 FNumber
+   		//获取科目的辅助核算项
+   		String demoHswd=getFzhx(demoKm,zt,zz,zb,Hswd);
+   		//out.print("demoHswd--"+demoHswd);
+   		if(demoHswd!=null&&!"".equals(demoHswd.trim())){
+   			String[] demoHswds=demoHswd.split(",");
+   		for(String str:demoHswds){
+   			if(str!=null&&!"".equals(str)){
+   				JSONObject Hswdjson=new JSONObject();
+   				String number=Util.null2String(re.getString(str)).trim(); 
+   				if(!"".equals(number)){
+   					Hswdjson.put("FNumber",number);
+   					FDetailID.put("FDETAILID__"+fxHswd.get(str),Hswdjson);
+   				}else{
+   					//errormess=str+"核算维度没有设置值!";
+   					//break lable1;
+   					}
+   		
+   			}
+   		}
+   }
+   		FEntityDetail.put("FDetailID",FDetailID);
+   		JSONObject FCURRENCYID=new JSONObject();//币别 FNumber
+   		FCURRENCYID.put("FNumber","IDR");//默认印尼盾
+   		FEntityDetail.put("FCURRENCYID",FCURRENCYID);
+   		JSONObject FEXCHANGERATETYPE=new JSONObject();;//汇率类型
+   		FEXCHANGERATETYPE.put("FNumber","HLTX01_SYS");//默认
+   		FEntityDetail.put("FEXCHANGERATETYPE",FEXCHANGERATETYPE);
+   		String FEXCHANGERATE ="1";//汇率
+   		FEntityDetail.put("FEXCHANGERATE",FEXCHANGERATE);
+   		String FUnitId ="";//单位
+   		//FEntityDetail.put("FUnitId",FUnitId);
+   		String FPrice="0";//单价
+   		//FEntityDetail.put("FPrice",FPrice);
+   		String FQty="0";//数量
+   		//FEntityDetail.put("FQty",FQty);
+   		String FAMOUNTFOR="";//原币金额
+   		String entrylx=Util.null2String(re.getString("entrylx"));
+   		String FDEBIT="";//借方金额
+   		String FCREDIT="";//贷方金额
+   		String FDC="";//借贷方向
+   		if("1".equals(entrylx)){//借方
+   			FDEBIT=getfloats(Util.null2String(re.getString("je")),"1",0)+"";
+   			FDC="1";
+   		}else{
+   			FCREDIT=getfloats(Util.null2String(re.getString("je")),"1",0)+"";
+   			FDC="0";
+   		}
+   		FEntityDetail.put("FCREDIT",FCREDIT);
+   		FEntityDetail.put("FDEBIT",FDEBIT);
+   		FEntityDetail.put("FDC",FDC);
+   		String FSettleTypeID="";//结束方式 FNumber
+   		String FSETTLENO ="";//结算号
+
+   		String FAcctFullName=getKmname(demoKm,zt,zz,zb);//科目全称
+   		String FACCOUNTNAME=getKmname(demoKm,zt,zz,zb);//科目名称
+   		//FEntityDetail.put("FAcctFullName",FAcctFullName);
+   		//FEntityDetail.put("FACCOUNTNAME",FACCOUNTNAME);
+   		FEntity.add(FEntityDetail);
+   	}
+      if(!"".equals(errormess)){
+   	   map.put("flag",false);
+   	   flag=false;
+   	   map.put("mess",errormess);
+      }
+      if(FEntity.size()<=0){
+   	   map.put("flag",false);
+   	   flag=false;
+   	   map.put("mess","无法获取原始借贷方");
+      }
+      map.put("flag",flag);
+      map.put("FEntity",FEntity);
+      return map;
+   }
+   //获取赋值核算类型
+   public String getFzhx1(String km,String zt,String zz,String zb,Map<String,String> Hswd){
+   	String FDIMENSION="";//核算维度
+   	RecordSet re=new RecordSet();
+   	String sql="select b.FDIMENSION from uf_accountinfo a,uf_accountinfo_dt1 b where a.id=b.mainid and a.zt='"+zt+"' and b.FNUMBER='"+km+"' and b.forgnumber='"+zz+"' and FAcctBookNumber='"+zb+"' ";
+   	//out.print(sql);
+   	re.execute(sql);
+   	while(re.next()){
+   		String str=Util.null2String(re.getString("FDIMENSION")).trim() ;
+   		String[] FDIMENSIONs=str.split(",");
+   		for(String demo:FDIMENSIONs){
+   		  if(demo!=null&&!"".equals(demo)){
+   			FDIMENSION=FDIMENSION+Hswd.get(demo)+",";
+   		  }
+   		}
+   	}
+   	if(FDIMENSION.endsWith(",")){
+   		FDIMENSION=FDIMENSION.substring(0,FDIMENSION.length()-1);
+   	}
+   	return FDIMENSION;
+   }
+   //获取原始报销金额
+   public String getDteJe(String requestid){
+   	RecordSet re=new RecordSet();
+   	String je="";
+   	String sql="select sum(je) je from formtable_main_22 a,formtable_main_22_dt8 b where a.id=b.mainid and a.requestid='"+requestid+"'";
+   	re.execute(sql);
+   	while(re.next()){
+   		je=re.getString("je")	;
+   	}
+   	return je;
+   }
+   //获取贷方总金额
+   public String getDteJe5(String requestid){
+   	RecordSet re=new RecordSet();
+   	String je="";
+   	String sql="select sum(dfje) je from formtable_main_22 a,formtable_main_22_dt5 b where a.id=b.mainid and a.requestid='"+requestid+"'";
+   	re.execute(sql);
+   	while(re.next()){
+   		je=re.getString("je")	;
+   	}
+   	return je;
+   }
+
+
+   //获取借方总金额
+   public static String getjfZje(String requestid){
+   	RecordSet re=new RecordSet();
+   	String je="";
+   	String sql="select sum(jfje) jfje from formtable_main_22 a,formtable_main_22_dt4 b where a.id=b.mainid and a.requestid='"+requestid+"'";
+   	re.execute(sql);
+   	while(re.next()){
+   		je=re.getString("jfje")	;
+   	}
+   	return je;
+   }
+   //获取贷方总金额
+   public static String getdfZje(String requestid){
+   	RecordSet re=new RecordSet();
+   	String je="";
+   	String sql="select sum(dfje) dfje from formtable_main_22 a,formtable_main_22_dt5 b where a.id=b.mainid and a.requestid='"+requestid+"'";
+   	re.execute(sql);
+   	while(re.next()){
+   		je=re.getString("dfje")	;
+   	}
+   	return je;
+   }
+   //获取赋值核算类型
+   public String getFzhx(String km,String zt,String zz,String zb,Map<String,String> Hswd){
+   	String FDIMENSION="";//核算维度
+   	RecordSet re=new RecordSet();
+   	String sql="select b.FDIMENSION from uf_accountinfo a,uf_accountinfo_dt1 b where a.id=b.mainid and a.zt='"+zt+"' and b.FNUMBER='"+km+"' and b.forgnumber='"+zz+"' and FAcctBookNumber='"+zb+"' ";
+   	//out.print(sql);
+   	re.execute(sql);
+   	while(re.next()){
+   		String str=Util.null2String(re.getString("FDIMENSION")).trim() ;
+   		String[] FDIMENSIONs=str.split(",");
+   		for(String demo:FDIMENSIONs){
+   		  if(demo!=null&&!"".equals(demo)){
+   			FDIMENSION=FDIMENSION+Hswd.get(demo)+",";
+   		  }
+   		}
+   	}
+   	if(FDIMENSION.endsWith(",")){
+   		FDIMENSION=FDIMENSION.substring(0,FDIMENSION.length()-1);
+   	}
+   	return FDIMENSION;
+   }
+   //insert 事务
+   public  boolean SynInsert1(List<String> array){
+         if(array==null||array.size()<=0){
+           return false;
+         }
+         Logger log = Logger.getLogger(DataSource.class);
+         RecordSetTrans RecordSetTrans=new RecordSetTrans();
+         RecordSetTrans.setAutoCommit(false);
+   	  boolean flag=true;
+
+   	try{
+   		RecordSetTrans.setAutoCommit(false);	
+   	   // stmt = conn.createStatement();
+   	    for(String str:array){
+   	       //int index =RecordSetTrans.executeUpdate(str);
+   	    	flag=RecordSetTrans.executeSql(str);
+   	        log.error("SynInsert--"+str);
+   	       if(!flag){
+   	         //flag=false;
+   	         break;
+   	       }
+   	    }
+   	    if(!flag){//事务回滚
+   	    	RecordSetTrans.rollback();
+   	    }else{
+   	    	RecordSetTrans.commit();
+   	    }
+   	    }catch(Exception e){
+   	       log.error("SynInsert--Exception "+e.getMessage());
+   	       flag=false; 
+   	    }
+   	    
+   return 	  flag;  
+   }
+   //获取科目名称
+   public String getKmname(String km,String zt,String zz,String zb){
+   	String FNAME="";//核算维度
+   	RecordSet re=new RecordSet();
+   	String sql="select b.FNAME from uf_accountinfo a,uf_accountinfo_dt1 b where a.id=b.mainid and a.zt='"+zt+"' and b.FNUMBER='"+km+"' and b.forgnumber='"+zz+"' and FAcctBookNumber='"+zb+"' ";
+   	re.execute(sql);
+   	while(re.next()){
+   		FNAME=Util.null2String(re.getString("FNAME"));
+   	}
+   	return FNAME;
+   }
+   //获取币种的小数位
+   public int getXsw(String bz){
+   	int xsw=0;
+   	RecordSet re=new RecordSet();
+   	String sql="select * from uf_k3bz where bh='"+bz+"'";
+   	re.execute(sql);
+   	while(re.next()){
+   		xsw=Integer.parseInt(Util.null2o(re.getString("xsw")))  ;
+   	}
+      return xsw;
+   }
+
+   //浮点型转换
+   public static float getfloats(String demo,String demo1,int len){
+   	Logger log = Logger.getLogger(BigDecimal.class);
+   	if(len==0){
+   		len=0;
+   	}
+   	String str=Util.null2String(demo);
+   	String str1=Util.null2String(demo1);
+   	if("".equals(str)||"".equals(str.trim())||"null".equalsIgnoreCase(str.trim())){
+   		return 0;
+   	}
+   	if("".equals(str1)||"".equals(str.trim())||"null".equalsIgnoreCase(str1.trim())){
+   		str1="1";
+   	}
+   	float fl=0.0f;
+   	//String str=Util.null2String(demo);
+   	try{
+   	if(str.trim().length()>0){
+   		    BigDecimal b1 = new BigDecimal(str.trim());
+   		    BigDecimal b2 = new BigDecimal(str1.trim());
+   		    BigDecimal b3=b1.multiply(b2);
+   			//System.out.println(b1.setScale(2,BigDecimal.ROUND_HALF_UP));
+   		    fl=b3.setScale(len,BigDecimal.ROUND_HALF_UP).floatValue();
+   	}
+   	log.error("getfloats"+fl);
+   	}catch(Exception e){
+   		log.error(demo+"getfloats异常"+e.getMessage());	
+   	}
+   	return fl;
+   }
+
+
+   //浮点型转换
+   public static float getfloats1(String demo,String demo1,int len){
+   	Logger log = Logger.getLogger(BigDecimal.class); 
+   	if(len==0){
+   		len=0;
+   	}
+   	String str=Util.null2String(demo);
+   	String str1=Util.null2String(demo1);
+   	if("".equals(str)||"".equals(str.trim())||"null".equalsIgnoreCase(str.trim())){
+   		str="0";
+   	}
+   	if("".equals(str1)||"".equals(str.trim())||"null".equalsIgnoreCase(str1.trim())){
+   		str1="0";
+   	}
+   	float fl=0.0f;
+   	//String str=Util.null2String(demo);
+   	try{
+   	if(str.trim().length()>0){
+   		    BigDecimal b1 = new BigDecimal(str.trim());
+   		    BigDecimal b2 = new BigDecimal(str1.trim()); 
+   		    BigDecimal b3=b1.add(b2);
+   			//System.out.println(b1.setScale(2,BigDecimal.ROUND_HALF_UP));
+   		    fl=b3.setScale(len,BigDecimal.ROUND_HALF_UP).floatValue();
+   	}
+   	log.error("getfloats"+fl);
+   	}catch(Exception e){
+   		log.error(demo+"getfloats异常"+e.getMessage());	
+   	}
+   	return fl;
+   }
+   //浮点型转换 金额差
+   public static float getfloats2(String demo,String demo1,int len){
+   	Logger log = Logger.getLogger(BigDecimal.class); 
+   	if(len==0){
+   		len=0;
+   	}
+   	String str=Util.null2String(demo);
+   	String str1=Util.null2String(demo1);
+   	if("".equals(str)||"".equals(str.trim())||"null".equalsIgnoreCase(str.trim())){
+   		str="0";
+   	}
+   	if("".equals(str1)||"".equals(str.trim())||"null".equalsIgnoreCase(str1.trim())){
+   		str1="0";
+   	}
+   	float fl=0.0f;
+   	//String str=Util.null2String(demo);
+   	try{
+   	if(str.trim().length()>0){
+   		    BigDecimal b1 = new BigDecimal(str.trim());
+   		    BigDecimal b2 = new BigDecimal(str1.trim()); 
+   		    BigDecimal b3=b1.subtract(b2);
+   			//System.out.println(b1.setScale(2,BigDecimal.ROUND_HALF_UP));
+   		    fl=b3.setScale(len,BigDecimal.ROUND_HALF_UP).floatValue();
+   	}
+   	log.error("getfloats"+fl);
+   	}catch(Exception e){
+   		log.error(demo+"getfloats异常"+e.getMessage());	
+   	}
+   	return fl;
+   }
+   public static float getFloat(String val){
+   	float floatval=0.0f;
+   	if(val==null||"".equals(Util.null2String(val).trim())){
+   		return 0.0f;
+   	}
+   	try{
+   		BigDecimal bg = new BigDecimal(val);
+   		floatval=bg.setScale(2, BigDecimal.ROUND_HALF_UP).floatValue();
+   	}catch(Exception e){
+   		
+   	}
+   	return floatval;
+   }
+   //取特殊科目编号
+   public String SpelKm(String zt,String zz,String zb,String lx){
+   	Logger log = Logger.getLogger(BigDecimal.class);
+   	RecordSet re=new RecordSet();
+   	String km="";//科目
+   	re.execute("select * from uf_k3tskm a,uf_k3tskm_dt1 b  where a.id=b.mainid and zt='"+zt+"' and zz='"+zz+"' and zb='"+zb+"' and lx='"+lx+"'");
+   	while(re.next()){
+   		km=re.getString("km");
+   	}
+   	return km;
+   }
+}
diff --git a/src/main/youhong_ai_jitu_src/com/jet/action/CreateVoucherHk.java b/src/main/youhong_ai_jitu_src/com/jet/action/CreateVoucherHk.java
new file mode 100644
index 0000000..cdd107e
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/com/jet/action/CreateVoucherHk.java
@@ -0,0 +1,570 @@
+package com.jet.action;
+
+import weaver.soa.workflow.request.RequestInfo;
+import weaver.workflow.action.BaseAction;
+import weaver.conn.RecordSet;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+
+import weaver.hrm.HrmUserVarify;
+import  weaver.hrm.User;
+import weaver.general.BaseBean;
+import weaver.general.Util;
+import org.apache.log4j.Logger;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import java.text.SimpleDateFormat;
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.Statement;
+import weaver.general.StaticObj;
+import weaver.interfaces.datasource.DataSource;
+import weaver.formmode.setup.ModeRightInfo;
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import weaver.general.StaticObj;
+import weaver.interfaces.datasource.DataSource;
+import weaver.interfaces.workflow.action.Action;
+
+import java.math.BigDecimal;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.PrintWriter;
+import java.net.URL;
+import java.net.URLConnection;
+import org.apache.http.Header;
+import org.apache.http.HttpResponse;
+import org.apache.http.HttpStatus;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.entity.*;
+import org.apache.http.*;
+import org.apache.http.util.*;
+import org.apache.http.impl.client.DefaultHttpClient;
+import org.apache.http.params.CoreConnectionPNames;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import java.nio.charset.Charset;
+import java.io.BufferedReader;
+import java.io.ByteArrayOutputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import weaver.conn.RecordSetTrans;
+import java.io.PrintWriter;
+import com.jet.util.*;
+import org.json.*;
+
+public class CreateVoucherHk extends BaseAction{
+  @Override
+  	public String execute(RequestInfo requestInfo) {
+	  	// TODO Auto-generated method stub
+	  Logger log = Logger.getLogger(JSONObject.class);
+	  RecordSet urlre=new RecordSet();
+	  String urlsql="select * from uf_urlinfo where 	ms='model'";
+
+	  urlre.execute(urlsql);
+	  String url="";
+	  String username="";
+	  String password1="";
+	  String dbid1="";
+	  String uuid1="";
+	  String password2="";
+	  while(urlre.next()){
+	  	 url=Util.null2String(urlre.getString("url"));
+	  	 username=Util.null2String(urlre.getString("username"));
+	  	 password1=Util.null2String(urlre.getString("password"));
+	  	 dbid1=Util.null2String(urlre.getString("dbid"));
+	  	 uuid1=Util.null2String(urlre.getString("uuid"));
+	  	 password2=Util.null2String(urlre.getString("password1"));
+	  }
+	  String baseis=username+":"+password1;
+	  String Queryurl=url+"GlVoucher/";
+	   Map<String,String> Hswd=new HashMap<String,String>();//核算维度对照表
+	   JSONObject VOUCHER=new JSONObject();//VOUCHER
+	   JSONArray Models=new JSONArray();//ModelS
+	   JSONObject Model=new JSONObject();//Model
+	   Hswd.put("FFLEX4","gys");//供应商
+	   Hswd.put("FFLEX6","kh");//客户
+	   Hswd.put("FFLEX7","yg");//员工
+	   Hswd.put("FFLEX5","bm");//部门
+	   Hswd.put("FFLEX9","fyxm");//费用项目
+	   Hswd.put("FFLEX8","wl");//物料
+	   Hswd.put("FFLEX10","zc");//资产
+	   Hswd.put("FFLEX12","wlz");//物料组
+	   Hswd.put("FFLEX13","khz");//客户组
+	   Map<String,String> fxHswd=new HashMap<String,String>();//核算维度对照表
+	   fxHswd.put("gys","FFLEX4");//供应商
+	   fxHswd.put("kh","FFLEX6");//客户
+	   fxHswd.put("yg","FFLEX7");//员工
+	   fxHswd.put("bm","FFLEX5");//部门
+	   fxHswd.put("fyxm","FFLEX9");//费用项目
+	   fxHswd.put("wl","FFLEX8");//物料
+	   fxHswd.put("zc","FFLEX10");//资产
+	   fxHswd.put("wlz","FFLEX12");//物料组
+	   fxHswd.put("khz","FFLEX13");//客户组
+	   SimpleDateFormat sim=new SimpleDateFormat("yyyy-MM-dd");
+	   List<String> jlist=new ArrayList<String>();//借方
+	   List<String> dlist=new ArrayList<String>();//贷方
+	   String requestid=requestInfo.getRequestid();//
+	   String mainid="";//
+	   String zt="";//账套
+	   String zz="";//组织
+	   String zb="";//账薄
+	   String zzjdhl="";//做账节点汇率
+	   String bz="";//币种
+	   String sfxr="";//是否写入
+	   RecordSet re=new RecordSet();
+	   String errormess="";
+	   float zje=0.0f;
+	   //1:借方  2：贷方
+	   String sql= " select a.sfxr,a.hklx,a.id,a.zt,a.zz,a.zb,b.jfkmbm kmbh,b.jfkmmc kmmc,b.jfje je,b.zy ,'' yg,'' kh,'1' entrylx from formtable_main_25 a,formtable_main_25_dt1 b where a.id=b.mainid and a.requestid='"+requestid+"'"+ 
+	               " union all "+
+	               " select a.sfxr,a.hklx,a.id,a.zt,a.zz,a.zb,b.dfkmbm kmbh,b.dfkmmc kmmc,b.dfje je,b.zy ,b.yg,b.kh,'2' entrylx from formtable_main_25 a,formtable_main_25_dt2 b where a.id=b.mainid and a.requestid='"+requestid+"' ";
+	   log.error(requestid+"CreateVoucherHk"+sql);
+	   re.execute(sql);
+	   JSONArray FEntity=new JSONArray();
+	   lable1:while(re.next()){
+	  	//拼接科目信息
+	  	sfxr=Util.null2String(re.getString("sfxr"));
+	  	String entrylx=Util.null2String(re.getString("entrylx"));
+	  	String hklx=Util.null2String(re.getString("hklx"));//还款类型  0:个人 1:客户
+	  	zt=Util.null2String(re.getString("zt")).trim();
+	  	zz=Util.null2String(re.getString("zz")).trim();
+	  	zb=Util.null2String(re.getString("zb")).trim();
+	  	String yg=Util.null2String(re.getString("yg")).trim();//员工
+	  	String kh=Util.null2String(re.getString("kh")).trim();//客户
+	  	zb=Util.null2String(re.getString("zb")).trim();
+	  	JSONObject FEntityDetail=new JSONObject();
+	  	String FEXPLANATION=Util.null2String(re.getString("zy"));//摘要
+	  	FEntityDetail.put("FEXPLANATION",FEXPLANATION);
+	  	JSONObject FACCOUNTID=new JSONObject();//科目  FNumber
+	  	String demoKm=Util.null2String(re.getString("kmbh")).trim();
+	  	if("".equals(demoKm)){
+	  		errormess="科目编号不能为空";//科目编号不能为空
+	  		break;
+	  	}else{
+	  		FACCOUNTID.put("FNumber",demoKm);
+	  	}
+	  	FEntityDetail.put("FACCOUNTID",FACCOUNTID);
+	  	JSONObject FDetailID=new JSONObject();//辅助核算项   FDETAILID__FFLEX10 FNumber
+	  	//获取科目的辅助核算项
+	  	if("2".equals(entrylx)){//贷方甚至核算项
+	  		JSONObject Hswdjson=new JSONObject();
+	  	   if("0".equals(hklx)){
+	  		  if("".equals(yg)){
+	  			    errormess="核算维度没有设置值!";
+	  				break lable1;
+	  		  }else{
+	  			  Hswdjson.put("FNumber",yg);
+	  			  FDetailID.put("FDETAILID__FFLEX7",Hswdjson); 
+	  		  }
+	  		  
+	  	   }else{
+	  		   if("".equals(kh)){
+	  			    //errormess="核算维度没有设置值!";
+	  				//break lable1;
+	  		  }else{
+	  			   //Hswdjson.put("FNumber",kh);
+	  			   //FDetailID.put("FDETAILID__FFLEX6",Hswdjson); 
+	  		  }
+	  		   
+	  	   }
+	  	}
+	  	
+	  	
+	  	FEntityDetail.put("FDetailID",FDetailID);
+	  	JSONObject FCURRENCYID=new JSONObject();//币别 FNumber
+	  	FCURRENCYID.put("FNumber","IDR");//默认印尼盾
+	  	FEntityDetail.put("FCURRENCYID",FCURRENCYID);
+	  	JSONObject FEXCHANGERATETYPE=new JSONObject();;//汇率类型
+	  	FEXCHANGERATETYPE.put("FNumber","HLTX01_SYS");//默认
+	  	FEntityDetail.put("FEXCHANGERATETYPE",FEXCHANGERATETYPE);
+	  	String FEXCHANGERATE ="1";//汇率
+	  	FEntityDetail.put("FEXCHANGERATE",FEXCHANGERATE);
+	  	String FUnitId ="";//单位
+	  	//FEntityDetail.put("FUnitId",FUnitId);
+	  	String FPrice="0";//单价
+	  	//FEntityDetail.put("FPrice",FPrice);
+	  	String FQty="0";//数量
+	  	//FEntityDetail.put("FQty",FQty);
+	  	String FAMOUNTFOR="";//原币金额
+	  	
+	  	String FDEBIT="";//借方金额
+	  	String FCREDIT="";//贷方金额
+	  	String FDC="";//借贷方向
+	  	if("1".equals(entrylx)){//借方
+	  		FDEBIT=Util.null2String(re.getString("je"));
+	  		FDC="1";
+	  	}else{
+	  		FCREDIT=Util.null2String(re.getString("je"));
+	  		FDC="0";
+	  	}
+	  	FEntityDetail.put("FCREDIT",FCREDIT);
+	  	FEntityDetail.put("FDEBIT",FDEBIT);
+	  	FEntityDetail.put("FDC",FDC);
+	  	String FSettleTypeID="";//结束方式 FNumber
+	  	String FSETTLENO ="";//结算号
+	  	
+	  	String FAcctFullName=getKmname(demoKm,zt,zz,zb);//科目全称
+	  	String FACCOUNTNAME=getKmname(demoKm,zt,zz,zb);//科目名称
+	  	//FEntityDetail.put("FAcctFullName",FAcctFullName);
+	  	//FEntityDetail.put("FACCOUNTNAME",FACCOUNTNAME);
+	  	FEntity.add(FEntityDetail);
+	   }
+	   if(!"".equals(errormess)){
+	    	requestInfo.getRequestManager().setMessageid(errormess);
+	    	requestInfo.getRequestManager().setMessage(errormess);//提醒信息id
+	    	requestInfo.getRequestManager().setMessagecontent("写入K3系统不成功，系统反馈信息如下："+errormess);//提醒信息内容
+
+			return Action.FAILURE_AND_CONTINUE;
+	    }
+	   //out.print("errormess"+errormess);
+	   //out.print("FEntityDetail"+FEntity.toJSONString());
+	   //设置主数据
+	   JSONObject FAccountBookID=new JSONObject();//账薄
+	   FAccountBookID.put("FNumber",zb);
+	   Model.put("FAccountBookID",FAccountBookID);
+	   String FDate=sim.format(new Date());
+	   Model.put("FDate",FDate);
+	   JSONObject FVOUCHERGROUPID=new  JSONObject();//凭证字默认AP
+	   FVOUCHERGROUPID.put("FNumber","PZZ3");
+	   Model.put("FVOUCHERGROUPID",FVOUCHERGROUPID);
+	   String FYEAR=sim.format(new Date()).split("-")[0];//会计年度
+	   String FPERIOD =sim.format(new Date()).split("-")[1];//期间
+	   Model.put("FYEAR",FYEAR);
+	   Model.put("FPERIOD",FPERIOD);
+	   String FDEBITTOTAL=getjfZje(requestid);//借方总金额：FDEBITTOTAL 
+	   String FCREDITTOTAL=getdfZje(requestid);//贷方总金额：FCREDITTOTAL 
+	   Model.put("FDEBITTOTAL",FDEBITTOTAL);
+	   Model.put("FCREDITTOTAL",FCREDITTOTAL);
+	   String FCreateDate=sim.format(new Date());//创建日期：FCreateDate 
+	   JSONObject FACCBOOKORGID=new JSONObject();//核算组织：FACCBOOKORGID 
+	   FACCBOOKORGID.put("FNumber",zz);
+	   Model.put("FACCBOOKORGID",FACCBOOKORGID);
+	   //Model.put("FCreateDate",FCreateDate);
+	   String FPRINTTIMES="0";//打印次数：FPRINTTIMES 
+	   String FCurrentYear=sim.format(new Date()).split("-")[0];//当前年度：FCurrentYear 
+	   String FCurrentPeriod=sim.format(new Date()).split("-")[1];//当前期间：FCurrentPeriod
+	   Model.put("FPRINTTIMES",FPRINTTIMES);
+	   //Model.put("FCurrentYear",FCurrentYear);
+	   //Model.put("FCurrentPeriod",FCurrentPeriod);
+	   Model.put("FEntity",FEntity);
+	   Models.add(Model);
+	   //凭借主数据
+	   VOUCHER.put("NeedReturnFields","[\"FVOUCHERID\",\"FVOUCHERGROUPNO\"]");
+	   VOUCHER.put("Model",Model);
+	   VOUCHER.put("IsAutoSubmitAndAudit",true);
+	   log.error(VOUCHER.toJSONString());
+	   /*开始调用接口 
+	   1；登陆
+	   2；调用接口 
+	   */
+	   if(VOUCHER!=null&&VOUCHER.size()>0&&("".equals(sfxr)||"1".equals(sfxr))){
+	  	 RecordSet updRec=new RecordSet();
+	  	    com.jet.util.InvokeHelper.POST_K3CloudURL="http://k3.jet.co.id:8880/k3cloud/";
+	  		String dbid="5d48f604c8361e";//dbid1;//"5d48f604c8361e";//"5a964ecc967246";
+	  		String uuid=uuid1;
+	  		String password=password2;
+	  		org.json.JSONObject resultjson=null;
+	  		int lang=2052;
+	  		try {
+	  			boolean flag=InvokeHelper.Login(dbid, uuid, password, lang);
+	  			//out.print(flag);
+	  			if(flag){//登陆成功
+	  				resultjson=com.jet.util.InvokeHelper.Save("GL_VOUCHER",VOUCHER.toJSONString());
+	  				boolean flag1=resultjson.getBoolean("flag");
+	  				String  resultstr=resultjson.getString("sResult");
+	  				log.error("resultstr"+resultstr);
+	  				if(flag1){
+	  					JSONObject HAHA=JSONObject.parseObject(resultstr);
+	  					JSONObject Result=HAHA.getJSONObject("Result");
+	  					JSONObject ResponseStatus=Result.getJSONObject("ResponseStatus");
+	  					boolean IsSuccess=ResponseStatus.getBoolean("IsSuccess");
+	  					if(IsSuccess){
+	  						updRec.execute("update formtable_main_25 set sfxr='0' where requestid='"+requestid+"' ");
+	  						String FVOUCHERID=Result.getString("Id");
+	  						String Fv=getFv(Queryurl+""+FVOUCHERID,baseis);
+	  						updRec.execute("update formtable_main_25  set pzbh='"+Fv+"' where requestid='"+requestid+"' ");
+	  						//out.print("成功"+FVOUCHERID);
+	  					}else{
+	  						//out.print("失败");
+	  						requestInfo.getRequestManager().setMessageid("失败");
+	   				    	requestInfo.getRequestManager().setMessage("失败");//提醒信息id
+	   				    	requestInfo.getRequestManager().setMessagecontent("写入K3系统不成功，系统反馈信息如下："+HAHA.toString());//提醒信息内容
+
+	   						return Action.FAILURE_AND_CONTINUE;
+	  					}
+	  				}else{
+	  					requestInfo.getRequestManager().setMessageid("失败");
+   				    	requestInfo.getRequestManager().setMessage("失败");//提醒信息id
+   				    	requestInfo.getRequestManager().setMessagecontent("写入K3系统不成功，系统反馈信息如下："+resultstr.toString());//提醒信息内容
+
+   						return Action.FAILURE_AND_CONTINUE;
+	  				}
+	  				
+	  			}
+	  		} catch (Exception e) {
+	  			 //TODO Auto-generated catch block
+	  			log.error("GL_VOUCHER--Exception"+e.getMessage());
+	  			e.printStackTrace();
+	  		}
+	   }
+	   return SUCCESS;
+  	}
+  
+//更具ID获取凭证编号
+  public String getFv(String url,String basis)throws Exception{
+  	String Fv="";
+  	//out.print("url-"+url+" basis"+basis+" ");
+  	try{
+  	  String result=sendGet(url,"",basis);
+  	 // out.print("url-"+url+" basis"+basis+" result"+result);
+  	  JSONArray json=JSONArray.parseArray(result);
+  	  if(json!=null&&json.size()>0){
+  		   for(int i=0;i<json.size();i++){
+  			  JSONObject obj= json.getJSONObject(i);
+  			  Fv=obj.getString("Voucher No");
+  		   }
+  	  }
+  	}catch(Exception e){
+  		
+  	}
+  	return Fv;
+  }
+  public  static String sendGet(String url, String param,String basis) {
+  	String result = "";
+  	InputStream in = null;
+  try {
+  	String urlNameString = url ;
+  	URL realUrl = new URL(urlNameString);
+  URLConnection connection = realUrl.openConnection();
+  String auth=basis;//"JNT:JNT2019";
+  String code = new sun.misc.BASE64Encoder().encode(auth.getBytes());
+  connection.setRequestProperty("Authorization", "Basic " + code);
+  connection.connect();
+  Map<String, List<String>> map = connection.getHeaderFields();
+
+
+  	for (String key : map.keySet()) {
+  	System.out.println(key + "--->" + map.get(key));
+  	}
+  	//接收核心返回过来的数据 xml  需要解析
+  	in =connection.getInputStream();
+  	byte[] b =getBytes(in);
+  	if(b.length>0){
+  		result=new String(b);
+  	}
+      System.out.println(b.length);
+  	} catch (Exception e) {
+
+       System.out.println(e.getMessage());
+  	  e.printStackTrace();
+  	}finally {
+  	try {
+  	if (in != null) {
+  	  in.close();
+  	}
+  	} catch (Exception e2) {
+  		System.out.println(e2.getMessage());
+  	   e2.printStackTrace();
+  	}
+  	}
+  	//System.out.println("de"+result);
+  	return result;
+  	}
+  public static byte[] getBytes(InputStream fis){  
+      Logger log = Logger.getLogger(Logger.class);
+       byte[] buffer = null;  
+       try {  
+           //File file = new File(filePath);  
+           //FileInputStream fis = new FileInputStream(file);  
+           ByteArrayOutputStream bos = new ByteArrayOutputStream(1000);  
+           byte[] b = new byte[10000];  
+           int n;  
+           while ((n = fis.read(b)) != -1) {  
+               bos.write(b, 0, n);  
+           }  
+           fis.close();  
+           bos.close();  
+           buffer = bos.toByteArray();  
+       } catch (FileNotFoundException e) {  
+           e.printStackTrace();  
+       } catch (IOException e) {  
+           e.printStackTrace();  
+       }  
+       System.out.println("buffer--->"+buffer.length);
+       return buffer;  
+   }
+  //获取借方总金额
+  public static String getjfZje(String requestid){
+  	RecordSet re=new RecordSet();
+  	String je="";
+  	String sql="select sum(jfje) jfje from formtable_main_22 a,formtable_main_22_dt4 b where a.id=b.mainid and a.requestid='"+requestid+"'";
+  	re.execute(sql);
+  	while(re.next()){
+  		je=re.getString("jfje")	;
+  	}
+  	return je;
+  }
+  //获取贷方总金额
+  public static String getdfZje(String requestid){
+  	RecordSet re=new RecordSet();
+  	String je="";
+  	String sql="select sum(dfje) dfje from formtable_main_22 a,formtable_main_22_dt5 b where a.id=b.mainid and a.requestid='"+requestid+"'";
+  	re.execute(sql);
+  	while(re.next()){
+  		je=re.getString("dfje")	;
+  	}
+  	return je;
+  }
+  //获取赋值核算类型
+  public String getFzhx(String km,String zt,String zz,String zb,Map<String,String> Hswd ){ 
+  	String FDIMENSION="";//核算维度
+  	RecordSet re=new RecordSet();
+  	String sql="select b.FDIMENSION from uf_accountinfo a,uf_accountinfo_dt1 b where a.id=b.mainid and a.zt='"+zt+"' and b.FNUMBER='"+km+"' and b.forgnumber='"+zz+"' and FAcctBookNumber='"+zb+"' ";
+  	//out.print(sql);
+  	re.execute(sql);
+  	while(re.next()){
+  		String str=Util.null2String(re.getString("FDIMENSION")).trim() ;
+  		String[] FDIMENSIONs=str.split(",");
+  		for(String demo:FDIMENSIONs){
+  		  if(demo!=null&&!"".equals(demo)){
+  			FDIMENSION=FDIMENSION+Hswd.get(demo)+",";
+  		  }
+  		}
+  	}
+  	if(FDIMENSION.endsWith(",")){
+  		FDIMENSION=FDIMENSION.substring(0,FDIMENSION.length()-1);
+  	}
+  	return FDIMENSION;
+  }
+  //insert 事务
+  public  boolean SynInsert1(List<String> array){
+        if(array==null||array.size()<=0){
+          return false;
+        }
+        Logger log = Logger.getLogger(DataSource.class);
+        RecordSetTrans RecordSetTrans=new RecordSetTrans();
+        RecordSetTrans.setAutoCommit(false);
+  	  boolean flag=true;
+
+  	try{
+  		RecordSetTrans.setAutoCommit(false);	
+  	   // stmt = conn.createStatement();
+  	    for(String str:array){
+  	       //int index =RecordSetTrans.executeUpdate(str);
+  	    	flag=RecordSetTrans.executeSql(str);
+  	        log.error("SynInsert--"+str);
+  	       if(!flag){
+  	         //flag=false;
+  	         break;
+  	       }
+  	    }
+  	    if(!flag){//事务回滚
+  	    	RecordSetTrans.rollback();
+  	    }else{
+  	    	RecordSetTrans.commit();
+  	    }
+  	    }catch(Exception e){
+  	       log.error("SynInsert--Exception "+e.getMessage());
+  	       flag=false; 
+  	    }
+  	    
+  return 	  flag;  
+  }
+  //获取科目名称
+  public String getKmname(String km,String zt,String zz,String zb){
+  	String FNAME="";//核算维度
+  	RecordSet re=new RecordSet();
+  	String sql="select b.FNAME from uf_accountinfo a,uf_accountinfo_dt1 b where a.id=b.mainid and a.zt='"+zt+"' and b.FNUMBER='"+km+"' and b.forgnumber='"+zz+"' and FAcctBookNumber='"+zb+"' ";
+  	re.execute(sql);
+  	while(re.next()){
+  		FNAME=Util.null2String(re.getString("FNAME"));
+  	}
+  	return FNAME;
+  }
+  //获取币种的小数位
+  public int getXsw(String bz){
+  	int xsw=0;
+  	RecordSet re=new RecordSet();
+  	String sql="select * from uf_k3bz where bh='"+bz+"'";
+  	re.execute(sql);
+  	while(re.next()){
+  		xsw=Integer.parseInt(Util.null2o(re.getString("xsw")))  ;
+  	}
+     return xsw;
+  }
+
+  //浮点型转换
+  public static float getfloats(String demo,String demo1,int len){
+  	Logger log = Logger.getLogger(BigDecimal.class);
+  	if(len==0){
+  		len=0;
+  	}
+  	String str=Util.null2String(demo);
+  	String str1=Util.null2String(demo1);
+  	if("".equals(str)||"".equals(str.trim())||"null".equalsIgnoreCase(str.trim())){
+  		return 0;
+  	}
+  	if("".equals(str1)||"".equals(str.trim())||"null".equalsIgnoreCase(str1.trim())){
+  		str1="1";
+  	}
+  	float fl=0.0f;
+  	//String str=Util.null2String(demo);
+  	try{
+  	if(str.trim().length()>0){
+  		    BigDecimal b1 = new BigDecimal(str.trim());
+  		    BigDecimal b2 = new BigDecimal(str1.trim());
+  		    BigDecimal b3=b1.multiply(b2);
+  			//System.out.println(b1.setScale(2,BigDecimal.ROUND_HALF_UP));
+  		    fl=b3.setScale(len,BigDecimal.ROUND_HALF_UP).floatValue();
+  	}
+  	log.error("getfloats"+fl);
+  	}catch(Exception e){
+  		log.error(demo+"getfloats异常"+e.getMessage());	
+  	}
+  	return fl;
+  }
+
+
+  //浮点型转换
+  public static float getfloats1(String demo,String demo1,int len){
+  	Logger log = Logger.getLogger(BigDecimal.class); 
+  	if(len==0){
+  		len=0;
+  	}
+  	String str=Util.null2String(demo);
+  	String str1=Util.null2String(demo1);
+  	if("".equals(str)||"".equals(str.trim())||"null".equalsIgnoreCase(str.trim())){
+  		str="0";
+  	}
+  	if("".equals(str1)||"".equals(str.trim())||"null".equalsIgnoreCase(str1.trim())){
+  		str1="0";
+  	}
+  	float fl=0.0f;
+  	//String str=Util.null2String(demo);
+  	try{
+  	if(str.trim().length()>0){
+  		    BigDecimal b1 = new BigDecimal(str.trim());
+  		    BigDecimal b2 = new BigDecimal(str1.trim()); 
+  		    BigDecimal b3=b1.add(b2);
+  			//System.out.println(b1.setScale(2,BigDecimal.ROUND_HALF_UP));
+  		    fl=b3.setScale(len,BigDecimal.ROUND_HALF_UP).floatValue();
+  	}
+  	log.error("getfloats"+fl);
+  	}catch(Exception e){
+  		log.error(demo+"getfloats异常"+e.getMessage());	
+  	}
+  	return fl;
+  }
+}
diff --git a/src/main/youhong_ai_jitu_src/com/jet/action/CreateVoucherJk.java b/src/main/youhong_ai_jitu_src/com/jet/action/CreateVoucherJk.java
new file mode 100644
index 0000000..1e3f5f8
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/com/jet/action/CreateVoucherJk.java
@@ -0,0 +1,566 @@
+package com.jet.action;
+
+import weaver.soa.workflow.request.RequestInfo;
+import weaver.workflow.action.BaseAction;
+import weaver.conn.RecordSet;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import weaver.hrm.HrmUserVarify;
+import  weaver.hrm.User;
+import weaver.general.BaseBean;
+import weaver.general.Util;
+import org.apache.log4j.Logger;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import java.text.SimpleDateFormat;
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.Statement;
+import weaver.general.StaticObj;
+import weaver.interfaces.datasource.DataSource;
+import weaver.formmode.setup.ModeRightInfo;
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import weaver.general.StaticObj;
+import weaver.interfaces.datasource.DataSource;
+import weaver.interfaces.workflow.action.Action;
+
+import java.math.BigDecimal;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.PrintWriter;
+import java.net.URL;
+import java.net.URLConnection;
+import org.apache.http.Header;
+import org.apache.http.HttpResponse;
+import org.apache.http.HttpStatus;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.entity.*;
+import org.apache.http.*;
+import org.apache.http.util.*;
+import org.apache.http.impl.client.DefaultHttpClient;
+import org.apache.http.params.CoreConnectionPNames;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import java.nio.charset.Charset;
+import java.io.BufferedReader;
+import java.io.ByteArrayOutputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import weaver.conn.RecordSetTrans;
+import java.io.PrintWriter;
+import com.jet.util.*;
+import org.json.*;
+
+public class CreateVoucherJk extends BaseAction{
+    @Override
+    public String execute(RequestInfo request) {
+    	// TODO Auto-generated method stub
+    	Logger log = Logger.getLogger(JSONObject.class);
+    	RecordSet urlre=new RecordSet();
+    	String urlsql="select * from uf_urlinfo where 	ms='model'";
+
+    	urlre.execute(urlsql);
+    	String url="";
+    	String username="";
+    	String password1="";
+    	String dbid1="";
+    	String uuid1="";
+    	String password2="";
+    	while(urlre.next()){
+    		 url=Util.null2String(urlre.getString("url"));
+    		 username=Util.null2String(urlre.getString("username"));
+    		 password1=Util.null2String(urlre.getString("password"));
+    		 dbid1=Util.null2String(urlre.getString("dbid"));
+    		 uuid1=Util.null2String(urlre.getString("uuid"));
+    		 password2=Util.null2String(urlre.getString("password1"));
+    	}
+    	String baseis=username+":"+password1;
+    	String Queryurl=url+"GlVoucher/";
+    	 Map<String,String> Hswd=new HashMap<String,String>();//核算维度对照表
+    	 JSONObject VOUCHER=new JSONObject();//VOUCHER
+    	 JSONArray Models=new JSONArray();//ModelS
+    	 JSONObject Model=new JSONObject();//Model
+    	 Hswd.put("FFLEX4","gys");//供应商
+    	 Hswd.put("FFLEX6","kh");//客户
+    	 Hswd.put("FFLEX7","yg");//员工
+    	 Hswd.put("FFLEX5","bm");//部门
+    	 Hswd.put("FFLEX9","fyxm");//费用项目
+    	 Hswd.put("FFLEX8","wl");//物料
+    	 Hswd.put("FFLEX10","zc");//资产
+    	 Hswd.put("FFLEX12","wlz");//物料组
+    	 Hswd.put("FFLEX13","khz");//客户组
+    	 Map<String,String> fxHswd=new HashMap<String,String>();//核算维度对照表
+    	 fxHswd.put("gys","FFLEX4");//供应商
+    	 fxHswd.put("kh","FFLEX6");//客户
+    	 fxHswd.put("yg","FFLEX7");//员工
+    	 fxHswd.put("bm","FFLEX5");//部门
+    	 fxHswd.put("fyxm","FFLEX9");//费用项目
+    	 fxHswd.put("wl","FFLEX8");//物料
+    	 fxHswd.put("zc","FFLEX10");//资产
+    	 fxHswd.put("wlz","FFLEX12");//物料组
+    	 fxHswd.put("khz","FFLEX13");//客户组
+    	 SimpleDateFormat sim=new SimpleDateFormat("yyyy-MM-dd");
+    	 List<String> jlist=new ArrayList<String>();//借方
+    	 List<String> dlist=new ArrayList<String>();//贷方
+    	 String requestid=request.getRequestid();//
+    	 String mainid="";//
+    	 String zt="";//账套
+    	 String zz="";//组织
+    	 String zb="";//账薄
+    	 String zzjdhl="";//做账节点汇率
+    	 String bz="";//币种
+    	 String sfxr="";//是否写入
+    	 RecordSet re=new RecordSet();
+    	 String errormess="";
+    	 float zje=0.0f;
+    	 //1:借方  2：贷方
+    	 String sql= " select a.sfxr,a.jklx,a.id,a.zt,a.zz,a.zb,b.jfkmbm kmbh,b.jfkmmc kmmc,b.jfje je,b.zy ,b.yg ,b.kh ,'1' entrylx from formtable_main_24 a,formtable_main_24_dt1 b where a.id=b.mainid and a.requestid='"+requestid+"'"+ 
+    	             " union all "+
+    	             " select a.sfxr,a.jklx,a.id,a.zt,a.zz,a.zb,b.dfkmbm kmbh,b.dfkmmc kmmc,b.dfje je,b.zy ,'' yg,'' kh,'2' entrylx from formtable_main_24 a,formtable_main_24_dt2 b where a.id=b.mainid and a.requestid='"+requestid+"' ";
+    	 log.error(request+"CreateVoucherJk"+sql);
+    	 re.execute(sql);
+    	 JSONArray FEntity=new JSONArray();
+    	 lable1:while(re.next()){
+    		//拼接科目信息
+    		sfxr=Util.null2String(re.getString("sfxr"));
+    		String entrylx=Util.null2String(re.getString("entrylx"));
+    		String jklx=Util.null2String(re.getString("jklx"));//借款类型  0:个人 1:客户
+    		zt=Util.null2String(re.getString("zt")).trim();
+    		zz=Util.null2String(re.getString("zz")).trim();
+    		zb=Util.null2String(re.getString("zb")).trim();
+    		String yg=Util.null2String(re.getString("yg")).trim();//员工
+    		String kh=Util.null2String(re.getString("kh")).trim();//客户
+    		zb=Util.null2String(re.getString("zb")).trim();
+    		JSONObject FEntityDetail=new JSONObject();
+    		String FEXPLANATION=Util.null2String(re.getString("zy"));//摘要
+    		FEntityDetail.put("FEXPLANATION",FEXPLANATION);
+    		JSONObject FACCOUNTID=new JSONObject();//科目  FNumber
+    		String demoKm=Util.null2String(re.getString("kmbh")).trim();
+    		if("".equals(demoKm)){
+    			errormess="科目编号不能为空";//科目编号不能为空
+    			break;
+    		}else{
+    			FACCOUNTID.put("FNumber",demoKm);
+    		}
+    		FEntityDetail.put("FACCOUNTID",FACCOUNTID);
+    		JSONObject FDetailID=new JSONObject();//辅助核算项   FDETAILID__FFLEX10 FNumber
+    		//获取科目的辅助核算项
+    		if("1".equals(entrylx)){//贷方甚至核算项
+    			JSONObject Hswdjson=new JSONObject();
+    		   if("0".equals(jklx)){
+    			  if("".equals(yg)){
+    				    errormess="核算维度没有设置值!";
+    					break lable1;
+    			  }else{
+    				  Hswdjson.put("FNumber",yg);
+    				  FDetailID.put("FDETAILID__FFLEX7",Hswdjson); 
+    			  }
+    			  
+    		   }else{
+    			   if("".equals(kh)){
+    				    errormess="核算维度没有设置值!";
+    					break lable1;
+    			  }else{
+    				   Hswdjson.put("FNumber",kh);
+    				   FDetailID.put("FDETAILID__FFLEX6",Hswdjson); 
+    			  }
+    			   
+    		   }
+    		}
+    		
+    		
+    		FEntityDetail.put("FDetailID",FDetailID);
+    		JSONObject FCURRENCYID=new JSONObject();//币别 FNumber
+    		FCURRENCYID.put("FNumber","IDR");//默认印尼盾
+    		FEntityDetail.put("FCURRENCYID",FCURRENCYID);
+    		JSONObject FEXCHANGERATETYPE=new JSONObject();;//汇率类型
+    		FEXCHANGERATETYPE.put("FNumber","HLTX01_SYS");//默认
+    		FEntityDetail.put("FEXCHANGERATETYPE",FEXCHANGERATETYPE);
+    		String FEXCHANGERATE ="1";//汇率
+    		FEntityDetail.put("FEXCHANGERATE",FEXCHANGERATE);
+    		String FUnitId ="";//单位
+    		//FEntityDetail.put("FUnitId",FUnitId);
+    		String FPrice="0";//单价
+    		//FEntityDetail.put("FPrice",FPrice);
+    		String FQty="0";//数量
+    		//FEntityDetail.put("FQty",FQty);
+    		String FAMOUNTFOR="";//原币金额
+    		
+    		String FDEBIT="";//借方金额
+    		String FCREDIT="";//贷方金额
+    		String FDC="";//借贷方向
+    		if("1".equals(entrylx)){//借方
+    			FDEBIT=Util.null2String(re.getString("je"));
+    			FDC="1";
+    		}else{
+    			FCREDIT=Util.null2String(re.getString("je"));
+    			FDC="0";
+    		}
+    		FEntityDetail.put("FCREDIT",FCREDIT);
+    		FEntityDetail.put("FDEBIT",FDEBIT);
+    		FEntityDetail.put("FDC",FDC);
+    		String FSettleTypeID="";//结束方式 FNumber
+    		String FSETTLENO ="";//结算号
+    		
+    		String FAcctFullName=getKmname(demoKm,zt,zz,zb);//科目全称
+    		String FACCOUNTNAME=getKmname(demoKm,zt,zz,zb);//科目名称
+    		//FEntityDetail.put("FAcctFullName",FAcctFullName);
+    		//FEntityDetail.put("FACCOUNTNAME",FACCOUNTNAME);
+    		FEntity.add(FEntityDetail);
+    	 }
+    	 if(!"".equals(errormess)){
+    		 request.getRequestManager().setMessageid(errormess);
+    		 request.getRequestManager().setMessage(errormess);//提醒信息id
+    		 request.getRequestManager().setMessagecontent("写入K3系统不成功，系统反馈信息如下："+errormess);//提醒信息内容
+
+ 			return Action.FAILURE_AND_CONTINUE;
+ 	    }
+    	 //out.print("FEntityDetail"+FEntity.toJSONString());
+    	 //设置主数据
+    	 JSONObject FAccountBookID=new JSONObject();//账薄
+    	 FAccountBookID.put("FNumber",zb);
+    	 Model.put("FAccountBookID",FAccountBookID);
+    	 String FDate=sim.format(new Date());
+    	 Model.put("FDate",FDate);
+    	 JSONObject FVOUCHERGROUPID=new  JSONObject();//凭证字默认AP
+    	 FVOUCHERGROUPID.put("FNumber","PZZ3");
+    	 Model.put("FVOUCHERGROUPID",FVOUCHERGROUPID);
+    	 String FYEAR=sim.format(new Date()).split("-")[0];//会计年度
+    	 String FPERIOD =sim.format(new Date()).split("-")[1];//期间
+    	 Model.put("FYEAR",FYEAR);
+    	 Model.put("FPERIOD",FPERIOD);
+    	 String FDEBITTOTAL=getjfZje(requestid);//借方总金额：FDEBITTOTAL 
+    	 String FCREDITTOTAL=getdfZje(requestid);//贷方总金额：FCREDITTOTAL 
+    	 Model.put("FDEBITTOTAL",FDEBITTOTAL);
+    	 Model.put("FCREDITTOTAL",FCREDITTOTAL);
+    	 String FCreateDate=sim.format(new Date());//创建日期：FCreateDate 
+    	 JSONObject FACCBOOKORGID=new JSONObject();//核算组织：FACCBOOKORGID 
+    	 FACCBOOKORGID.put("FNumber",zz);
+    	 Model.put("FACCBOOKORGID",FACCBOOKORGID);
+    	 //Model.put("FCreateDate",FCreateDate);
+    	 String FPRINTTIMES="0";//打印次数：FPRINTTIMES 
+    	 String FCurrentYear=sim.format(new Date()).split("-")[0];//当前年度：FCurrentYear 
+    	 String FCurrentPeriod=sim.format(new Date()).split("-")[1];//当前期间：FCurrentPeriod
+    	 Model.put("FPRINTTIMES",FPRINTTIMES);
+    	 //Model.put("FCurrentYear",FCurrentYear);
+    	 //Model.put("FCurrentPeriod",FCurrentPeriod);
+    	 Model.put("FEntity",FEntity);
+    	 Models.add(Model);
+    	 //凭借主数据
+    	 VOUCHER.put("NeedReturnFields","[\"FVOUCHERID\",\"FVOUCHERGROUPNO\"]");
+    	 VOUCHER.put("Model",Model);
+    	 log.error(VOUCHER.toJSONString());
+    	 /*开始调用接口 
+    	 1；登陆
+    	 2；调用接口 
+    	 */
+    	 if(VOUCHER!=null&&VOUCHER.size()>0&&("".equals(sfxr)||"1".equals(sfxr))){
+    		 RecordSet updRec=new RecordSet();
+    		    com.jet.util.InvokeHelper.POST_K3CloudURL="http://k3.jet.co.id:8880/k3cloud/";
+    			String dbid="5d48f604c8361e";//dbid1;//"5d48f604c8361e";//"5a964ecc967246";
+    			String uuid=uuid1;
+    			String password=password2;
+    			org.json.JSONObject resultjson=null;
+    			int lang=2052;
+    			try {
+    				boolean flag=InvokeHelper.Login(dbid, uuid, password, lang);
+    				//out.print(flag);
+    				if(flag){//登陆成功
+    					resultjson=com.jet.util.InvokeHelper.Save("GL_VOUCHER",VOUCHER.toJSONString());
+    					boolean flag1=resultjson.getBoolean("flag");
+    					String  resultstr=resultjson.getString("sResult");
+    					log.error("resultstr"+resultstr);
+    					if(flag1){
+    						JSONObject HAHA=JSONObject.parseObject(resultstr);
+    						JSONObject Result=HAHA.getJSONObject("Result");
+    						JSONObject ResponseStatus=Result.getJSONObject("ResponseStatus");
+    						boolean IsSuccess=ResponseStatus.getBoolean("IsSuccess");
+    						if(IsSuccess){
+    							updRec.execute("update formtable_main_24 set sfxr='0' where requestid='"+requestid+"' ");
+    							String FVOUCHERID=Result.getString("Id");
+    							String Fv=getFv(Queryurl+""+FVOUCHERID,baseis);
+    							updRec.execute("update formtable_main_24  set pzbh='"+Fv+"' where requestid='"+requestid+"' ");
+    							//out.print("成功"+FVOUCHERID);
+    						}else{
+    							request.getRequestManager().setMessageid("失败");
+    							request.getRequestManager().setMessage("失败");//提醒信息id
+    							request.getRequestManager().setMessagecontent("写入K3系统不成功，系统反馈信息如下："+HAHA.toString());//提醒信息内容
+
+    	   						return Action.FAILURE_AND_CONTINUE;
+    						}
+    					}else{
+    						request.getRequestManager().setMessageid("失败");
+    						request.getRequestManager().setMessage("失败");//提醒信息id
+    						request.getRequestManager().setMessagecontent("写入K3系统不成功，系统反馈信息如下："+resultstr.toString());//提醒信息内容
+
+       						return Action.FAILURE_AND_CONTINUE;
+    					}
+    					
+    				}
+    			} catch (Exception e) {
+    				 //TODO Auto-generated catch block
+    				log.error("GL_VOUCHER--Exception"+e.getMessage());
+    				e.printStackTrace();
+    			}
+    	 }
+    	 return SUCCESS;
+    }
+  //更具ID获取凭证编号
+    public String getFv(String url,String basis)throws Exception{
+    	String Fv="";
+    	//out.print("url-"+url+" basis"+basis+" ");
+    	try{
+    	  String result=sendGet(url,"",basis);
+    	 // out.print("url-"+url+" basis"+basis+" result"+result);
+    	  JSONArray json=JSONArray.parseArray(result);
+    	  if(json!=null&&json.size()>0){
+    		   for(int i=0;i<json.size();i++){
+    			  JSONObject obj= json.getJSONObject(i);
+    			  Fv=obj.getString("Voucher No");
+    		   }
+    	  }
+    	}catch(Exception e){
+    		
+    	}
+    	return Fv;
+    }
+    public  static String sendGet(String url, String param,String basis) {
+    	String result = "";
+    	InputStream in = null;
+    try {
+    	String urlNameString = url ;
+    	URL realUrl = new URL(urlNameString);
+    URLConnection connection = realUrl.openConnection();
+    String auth=basis;//"JNT:JNT2019";
+    String code = new sun.misc.BASE64Encoder().encode(auth.getBytes());
+    connection.setRequestProperty("Authorization", "Basic " + code);
+    connection.connect();
+    Map<String, List<String>> map = connection.getHeaderFields();
+
+
+    	for (String key : map.keySet()) {
+    	System.out.println(key + "--->" + map.get(key));
+    	}
+    	//接收核心返回过来的数据 xml  需要解析
+    	in =connection.getInputStream();
+    	byte[] b =getBytes(in);
+    	if(b.length>0){
+    		result=new String(b);
+    	}
+        System.out.println(b.length);
+    	} catch (Exception e) {
+
+         System.out.println(e.getMessage());
+    	  e.printStackTrace();
+    	}finally {
+    	try {
+    	if (in != null) {
+    	  in.close();
+    	}
+    	} catch (Exception e2) {
+    		System.out.println(e2.getMessage());
+    	   e2.printStackTrace();
+    	}
+    	}
+    	//System.out.println("de"+result);
+    	return result;
+    	}
+    public static byte[] getBytes(InputStream fis){  
+        Logger log = Logger.getLogger(Logger.class);
+         byte[] buffer = null;  
+         try {  
+             //File file = new File(filePath);  
+             //FileInputStream fis = new FileInputStream(file);  
+             ByteArrayOutputStream bos = new ByteArrayOutputStream(1000);  
+             byte[] b = new byte[10000];  
+             int n;  
+             while ((n = fis.read(b)) != -1) {  
+                 bos.write(b, 0, n);  
+             }  
+             fis.close();  
+             bos.close();  
+             buffer = bos.toByteArray();  
+         } catch (FileNotFoundException e) {  
+             e.printStackTrace();  
+         } catch (IOException e) {  
+             e.printStackTrace();  
+         }  
+         System.out.println("buffer--->"+buffer.length);
+         return buffer;  
+     }
+    //获取借方总金额
+    public static String getjfZje(String requestid){
+    	RecordSet re=new RecordSet();
+    	String je="";
+    	String sql="select sum(jfje) jfje from formtable_main_22 a,formtable_main_22_dt4 b where a.id=b.mainid and a.requestid='"+requestid+"'";
+    	re.execute(sql);
+    	while(re.next()){
+    		je=re.getString("jfje")	;
+    	}
+    	return je;
+    }
+    //获取贷方总金额
+    public static String getdfZje(String requestid){
+    	RecordSet re=new RecordSet();
+    	String je="";
+    	String sql="select sum(dfje) dfje from formtable_main_22 a,formtable_main_22_dt5 b where a.id=b.mainid and a.requestid='"+requestid+"'";
+    	re.execute(sql);
+    	while(re.next()){
+    		je=re.getString("dfje")	;
+    	}
+    	return je;
+    }
+    //获取赋值核算类型
+    public String getFzhx(String km,String zt,String zz,String zb,Map<String,String> Hswd ){
+    	String FDIMENSION="";//核算维度
+    	RecordSet re=new RecordSet();
+    	String sql="select b.FDIMENSION from uf_accountinfo a,uf_accountinfo_dt1 b where a.id=b.mainid and a.zt='"+zt+"' and b.FNUMBER='"+km+"' and b.forgnumber='"+zz+"' and FAcctBookNumber='"+zb+"' ";
+    	//out.print(sql);
+    	re.execute(sql);
+    	while(re.next()){
+    		String str=Util.null2String(re.getString("FDIMENSION")).trim() ;
+    		String[] FDIMENSIONs=str.split(",");
+    		for(String demo:FDIMENSIONs){
+    		  if(demo!=null&&!"".equals(demo)){
+    			FDIMENSION=FDIMENSION+Hswd.get(demo)+",";
+    		  }
+    		}
+    	}
+    	if(FDIMENSION.endsWith(",")){
+    		FDIMENSION=FDIMENSION.substring(0,FDIMENSION.length()-1);
+    	}
+    	return FDIMENSION;
+    }
+    //insert 事务
+    public  boolean SynInsert1(List<String> array){
+          if(array==null||array.size()<=0){
+            return false;
+          }
+          Logger log = Logger.getLogger(DataSource.class);
+          RecordSetTrans RecordSetTrans=new RecordSetTrans();
+          RecordSetTrans.setAutoCommit(false);
+    	  boolean flag=true;
+
+    	try{
+    		RecordSetTrans.setAutoCommit(false);	
+    	   // stmt = conn.createStatement();
+    	    for(String str:array){
+    	       //int index =RecordSetTrans.executeUpdate(str);
+    	    	flag=RecordSetTrans.executeSql(str);
+    	        log.error("SynInsert--"+str);
+    	       if(!flag){
+    	         //flag=false;
+    	         break;
+    	       }
+    	    }
+    	    if(!flag){//事务回滚
+    	    	RecordSetTrans.rollback();
+    	    }else{
+    	    	RecordSetTrans.commit();
+    	    }
+    	    }catch(Exception e){
+    	       log.error("SynInsert--Exception "+e.getMessage());
+    	       flag=false; 
+    	    }
+    	    
+    return 	  flag;  
+    }
+    //获取科目名称
+    public String getKmname(String km,String zt,String zz,String zb){
+    	String FNAME="";//核算维度
+    	RecordSet re=new RecordSet();
+    	String sql="select b.FNAME from uf_accountinfo a,uf_accountinfo_dt1 b where a.id=b.mainid and a.zt='"+zt+"' and b.FNUMBER='"+km+"' and b.forgnumber='"+zz+"' and FAcctBookNumber='"+zb+"' ";
+    	re.execute(sql);
+    	while(re.next()){
+    		FNAME=Util.null2String(re.getString("FNAME"));
+    	}
+    	return FNAME;
+    }
+    //获取币种的小数位
+    public int getXsw(String bz){
+    	int xsw=0;
+    	RecordSet re=new RecordSet();
+    	String sql="select * from uf_k3bz where bh='"+bz+"'";
+    	re.execute(sql);
+    	while(re.next()){
+    		xsw=Integer.parseInt(Util.null2o(re.getString("xsw")))  ;
+    	}
+       return xsw;
+    }
+
+    //浮点型转换
+    public static float getfloats(String demo,String demo1,int len){
+    	Logger log = Logger.getLogger(BigDecimal.class);
+    	if(len==0){
+    		len=0;
+    	}
+    	String str=Util.null2String(demo);
+    	String str1=Util.null2String(demo1);
+    	if("".equals(str)||"".equals(str.trim())||"null".equalsIgnoreCase(str.trim())){
+    		return 0;
+    	}
+    	if("".equals(str1)||"".equals(str.trim())||"null".equalsIgnoreCase(str1.trim())){
+    		str1="1";
+    	}
+    	float fl=0.0f;
+    	//String str=Util.null2String(demo);
+    	try{
+    	if(str.trim().length()>0){
+    		    BigDecimal b1 = new BigDecimal(str.trim());
+    		    BigDecimal b2 = new BigDecimal(str1.trim());
+    		    BigDecimal b3=b1.multiply(b2);
+    			//System.out.println(b1.setScale(2,BigDecimal.ROUND_HALF_UP));
+    		    fl=b3.setScale(len,BigDecimal.ROUND_HALF_UP).floatValue();
+    	}
+    	log.error("getfloats"+fl);
+    	}catch(Exception e){
+    		log.error(demo+"getfloats异常"+e.getMessage());	
+    	}
+    	return fl;
+    }
+
+
+    //浮点型转换
+    public static float getfloats1(String demo,String demo1,int len){
+    	Logger log = Logger.getLogger(BigDecimal.class); 
+    	if(len==0){
+    		len=0;
+    	}
+    	String str=Util.null2String(demo);
+    	String str1=Util.null2String(demo1);
+    	if("".equals(str)||"".equals(str.trim())||"null".equalsIgnoreCase(str.trim())){
+    		str="0";
+    	}
+    	if("".equals(str1)||"".equals(str.trim())||"null".equalsIgnoreCase(str1.trim())){
+    		str1="0";
+    	}
+    	float fl=0.0f;
+    	//String str=Util.null2String(demo);
+    	try{
+    	if(str.trim().length()>0){
+    		    BigDecimal b1 = new BigDecimal(str.trim());
+    		    BigDecimal b2 = new BigDecimal(str1.trim()); 
+    		    BigDecimal b3=b1.add(b2);
+    			//System.out.println(b1.setScale(2,BigDecimal.ROUND_HALF_UP));
+    		    fl=b3.setScale(len,BigDecimal.ROUND_HALF_UP).floatValue();
+    	}
+    	log.error("getfloats"+fl);
+    	}catch(Exception e){
+    		log.error(demo+"getfloats异常"+e.getMessage());	
+    	}
+    	return fl;
+    }
+
+}
diff --git a/src/main/youhong_ai_jitu_src/com/jet/action/CreatehkJD.java b/src/main/youhong_ai_jitu_src/com/jet/action/CreatehkJD.java
new file mode 100644
index 0000000..7dcc2b1
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/com/jet/action/CreatehkJD.java
@@ -0,0 +1,384 @@
+package com.jet.action;
+import java.util.*;
+import weaver.soa.workflow.request.RequestInfo;
+import weaver.workflow.action.BaseAction;
+import weaver.conn.RecordSet;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import weaver.general.Util;
+import org.apache.log4j.Logger;
+import weaver.interfaces.datasource.DataSource;
+import weaver.interfaces.workflow.action.Action;
+
+import java.math.BigDecimal;
+import java.io.IOException;
+import java.net.URL;
+import java.net.URLConnection;
+import java.io.ByteArrayOutputStream;
+import java.io.FileNotFoundException;
+import java.io.InputStream;
+import weaver.conn.RecordSetTrans;
+
+
+public class CreatehkJD extends BaseAction{
+    @Override
+    public String execute(RequestInfo requestInfo) {
+    	// TODO Auto-generated method stub
+    	//创建还款的借贷方
+    	//0:贷方现金　
+    	//1:借方还款(职员)　
+    	//2:借方借款(职员)
+    	Logger log = Logger.getLogger(JSONObject.class);
+    	 Map<String,String> Hswd=new HashMap<String,String>();//核算维度对照表
+    	 Hswd.put("FFLEX4","gys");//供应商
+    	 Hswd.put("FFLEX6","kh");//客户
+    	 Hswd.put("FFLEX7","yg");//员工
+    	 Hswd.put("FFLEX5","bm");//部门
+    	 Hswd.put("FFLEX9","fyxm");//费用项目
+    	 Hswd.put("FFLEX8","wl");//物料
+    	 Hswd.put("FFLEX10","zc");//资产
+    	 Hswd.put("FFLEX12","wlz");//物料组
+    	 Hswd.put("FFLEX13","khz");//客户组
+    	 RecordSet urlre=new RecordSet();
+    	 String urlsql="select * from uf_urlinfo ";
+    	 
+    	 String url="";
+    	 String username="";
+    	 String password="";
+    	 urlre.execute(urlsql);
+    	 while(urlre.next()){
+    		 url=Util.null2String(urlre.getString("url"));
+    		 username=Util.null2String(urlre.getString("username"));
+    		 password=Util.null2String(urlre.getString("password"));
+    	 }
+    	 List<String> jlist=new ArrayList<String>();//借方
+    	 List<String> dlist=new ArrayList<String>();//贷方
+    	 String requestid=requestInfo.getRequestid();//
+    	 String mainid="";//
+    	 String zt="";//账套
+    	 String zz="";//组织
+    	 String zb="";//账薄
+    	 String zzjdhl="";//做账节点汇率
+    	 String bz="";//币种
+    	 String fkyh="";//付款银行
+    	 String je="";//借款金额
+    	 String jklx="";//借款类型
+    	 String dls="";//代理商
+    	 String emp="";//职员
+    	 RecordSet re=new RecordSet();
+    	 String jsql="";
+    	 String dsql=""; 
+    	 String sql="select * from formtable_main_25 where requestid='"+requestid+"'";
+    	 log.error(requestid+"CreatehkJD"+sql);
+    	 re.execute(sql);
+    	 while(re.next()){
+    		mainid=Util.null2String(re.getString("id")).trim();
+    		zz=Util.null2String(re.getString("zz")).trim();//组织	
+    		zt=Util.null2String(re.getString("zt")).trim();//账套
+    		zb=Util.null2String(re.getString("zb")).trim();//账薄
+    		
+    		fkyh=Util.null2String(re.getString("hkzh")).trim();//付款银行
+    		je=Util.null2String(re.getString("hkje")).trim();//金额
+    		jklx=Util.null2String(re.getString("hklx")).trim();//借款类型
+    		dls=Util.null2String(re.getString("dls")).trim();//代理商
+    		emp=Util.null2String(re.getString("emp")).trim();//职员
+    	 }
+    	 //判定借方科目    还款与 借款的 借贷方向 相反   借银行或现金 贷供应商或个人
+    	 String jfkm="";//借方科目
+    	 String jfkmDesc="";//借方科目
+    	 String dfkm="";//贷方科目
+    	 String dfkmDesc="";//贷方科目
+    	 if("0".equals(jklx)){//个人
+    		 //jfkm=SpelKm(zt,zz,zb,"2");
+    		 //if("".equals(fkyh)){//现金
+    			 //dfkm=SpelKm(zt,zz,zb,"0");
+    		 //}else{//转账
+    			 //dfkm=fkyh;
+    		 //}
+    		dfkm=SpelKm(zt,zz,zb,"2");
+    		if("".equals(fkyh)){//现金
+    			jfkm=SpelKm(zt,zz,zb,"0");
+    		}else{
+    			jfkm=fkyh;
+    		}
+    	 }else{//代理商
+    		 //if("".equals(fkyh)){//现金
+    			 //dfkm=SpelKm(zt,zz,zb,"0");
+    		 //}else{//转账
+    			 //dfkm=fkyh;
+    		 //}
+    		if("".equals(fkyh)){//现金
+    			jfkm=SpelKm(zt,zz,zb,"0");
+    	 	}else{//转账
+    	 		jfkm=fkyh;
+    	 	}
+    		//通过接口 获取贷方科目
+    	    if(!"".equals(dls)){
+    		   String result=sendGet(url+"CusGlbalance/"+dls,"",username+":"+password);
+    		   //out.print(result);
+    		   Map<String,String> map=getJSONToMap(result);
+    		   dfkm=Util.null2String(map.get("FAcctNumber"));
+    	    }
+    	    //通过接口 获取贷方科目
+    	    //if(!"".equals(dls)){
+    		   //String result=sendGet(url+"CusGlbalance/"+dls,"",username+":"+password);
+    		   //out.print(result);
+    		  // Map<String,String> map=getJSONToMap(result);
+    		   //jfkm=Util.null2String(map.get("FAcctNumber"));
+    	    //}
+    	 }
+    	 if(!"".equals(jfkm)){
+    		 jfkmDesc=getKmname(jfkm,zt,zz,zb);
+    	 }
+    	 if(!"".equals(dfkm)){
+    		 dfkmDesc=getKmname(dfkm,zt,zz,zb);
+    	 }
+    	 if("0".equals(jklx)){
+    		 dls="";
+    	 }
+    	 jlist.add("insert into  formtable_main_25_dt1(mainid,jfkmbm,jfkmmc,jfje)values('"+mainid+"','"+jfkm+"','"+jfkmDesc+"','"+je+"')");
+    	 jlist.add("insert into  formtable_main_25_dt2(mainid,dfkmbm,dfkmmc,dfje,kh,yg)values('"+mainid+"','"+dfkm+"','"+dfkmDesc+"','"+je+"','"+dls+"','"+emp+"')");
+    	 if(jlist.size()>0){
+    		 log.error(jlist.toString());
+    		 boolean flag=SynInsert1(jlist);
+    		 if(!flag){
+    			    requestInfo.getRequestManager().setMessageid("创建借贷失败");
+    		    	requestInfo.getRequestManager().setMessage("创建借贷失败");//提醒信息id
+    		    	requestInfo.getRequestManager().setMessagecontent("创建借贷失败");//提醒信息内容
+
+    				return Action.FAILURE_AND_CONTINUE; 
+    		 }
+    		 //out.print(flag);
+    	 }
+    	return SUCCESS;
+    }
+  //将JSON 解析成 Map
+    public Map<String,String> getJSONToMap(String str){
+    	Map<String,String> map=new HashMap<String,String>();
+    	try{
+    		JSONArray jsons=JSONObject.parseArray(str);
+    	    if(jsons!=null&&jsons.size()>0){
+    	    	JSONObject json=(JSONObject)jsons.get(0);
+    	    	Set<String> set=json.keySet();
+    	    	for(String demo:set){
+    	    		map.put(demo,Util.null2String(json.getString(demo)));
+    	    	}
+    	    }
+    	}catch(Exception  e){
+    		
+    	}
+    	return map;
+    }
+    //取特殊科目编号
+    public String SpelKm(String zt,String zz,String zb,String lx){
+    	Logger log = Logger.getLogger(BigDecimal.class);
+    	RecordSet re=new RecordSet();
+    	String km="";//科目
+    	re.execute("select * from uf_k3tskm a,uf_k3tskm_dt1 b  where a.id=b.mainid and zt='"+zt+"' and zz='"+zz+"' and zb='"+zb+"' and lx='"+lx+"'");
+    	while(re.next()){
+    		km=re.getString("km");
+    	}
+    	return km;
+    }
+    //获取赋值核算类型
+    public String getFzhx(String km,String zt,String zz,String zb,Map<String,String> Hswd){
+    	String FDIMENSION="";//核算维度
+    	RecordSet re=new RecordSet();
+    	String sql="select b.FDIMENSION from uf_accountinfo a,uf_accountinfo_dt1 b where a.id=b.mainid and a.zt='"+zt+"' and b.FNUMBER='"+km+"' and b.forgnumber='"+zz+"' and FAcctBookNumber='"+zb+"' ";
+    	//out.print(sql);
+    	re.execute(sql);
+    	while(re.next()){
+    		String str=Util.null2String(re.getString("FDIMENSION")).trim() ;
+    		String[] FDIMENSIONs=str.split(",");
+    		for(String demo:FDIMENSIONs){
+    		  if(demo!=null&&!"".equals(demo)){
+    			FDIMENSION=FDIMENSION+Hswd.get(FDIMENSION)+",";
+    		  }
+    		}
+    	}
+    	return FDIMENSION;
+    }
+    //insert 事务
+    public  boolean SynInsert1(List<String> array){
+          if(array==null||array.size()<=0){
+            return false;
+          }
+          Logger log = Logger.getLogger(DataSource.class);
+          RecordSetTrans RecordSetTrans=new RecordSetTrans();
+          RecordSetTrans.setAutoCommit(false);
+    	  boolean flag=true;
+
+    	try{
+    		RecordSetTrans.setAutoCommit(false);	
+    	   // stmt = conn.createStatement();
+    	    for(String str:array){
+    	       //int index =RecordSetTrans.executeUpdate(str);
+    	    	flag=RecordSetTrans.executeSql(str);
+    	        log.error("SynInsert--"+str);
+    	       if(!flag){
+    	         //flag=false;
+    	         break;
+    	       }
+    	    }
+    	    if(!flag){//事务回滚
+    	    	RecordSetTrans.rollback();
+    	    }else{
+    	    	RecordSetTrans.commit();
+    	    }
+    	    }catch(Exception e){
+    	       log.error("SynInsert--Exception "+e.getMessage());
+    	       flag=false; 
+    	    }
+    	    
+    return 	  flag;  
+    }
+    //获取科目名称
+    public String getKmname(String km,String zt,String zz,String zb){
+    	String FNAME="";//核算维度
+    	RecordSet re=new RecordSet();
+    	String sql="select b.FNAME from uf_accountinfo a,uf_accountinfo_dt1 b where a.id=b.mainid and a.zt='"+zt+"' and b.FNUMBER='"+km+"' and b.forgnumber='"+zz+"' and FAcctBookNumber='"+zb+"' ";
+    	re.execute(sql);
+    	while(re.next()){
+    		FNAME=Util.null2String(re.getString("FNAME"));
+    	}
+    	return FNAME;
+    }
+    //获取币种的小数位
+    public int getXsw(String bz){
+    	int xsw=0;
+    	RecordSet re=new RecordSet();
+    	String sql="select * from uf_k3bz where bh='"+bz+"'";
+    	re.execute(sql);
+    	while(re.next()){
+    		xsw=Integer.parseInt(Util.null2o(re.getString("xsw")))  ;
+    	}
+       return xsw;
+    }
+
+    //浮点型转换
+    public static float getfloats(String demo,String demo1,int len){
+    	Logger log = Logger.getLogger(BigDecimal.class);
+    	if(len==0){
+    		len=0;
+    	}
+    	String str=Util.null2String(demo);
+    	String str1=Util.null2String(demo1);
+    	if("".equals(str)||"".equals(str.trim())||"null".equalsIgnoreCase(str.trim())){
+    		return 0;
+    	}
+    	if("".equals(str1)||"".equals(str.trim())||"null".equalsIgnoreCase(str1.trim())){
+    		str1="1";
+    	}
+    	float fl=0.0f;
+    	//String str=Util.null2String(demo);
+    	try{
+    	if(str.trim().length()>0){
+    		    BigDecimal b1 = new BigDecimal(str.trim());
+    		    BigDecimal b2 = new BigDecimal(str1.trim());
+    		    BigDecimal b3=b1.multiply(b2);
+    			//System.out.println(b1.setScale(2,BigDecimal.ROUND_HALF_UP));
+    		    fl=b3.setScale(len,BigDecimal.ROUND_HALF_UP).floatValue();
+    	}
+    	log.error("getfloats"+fl);
+    	}catch(Exception e){
+    		log.error(demo+"getfloats异常"+e.getMessage());	
+    	}
+    	return fl;
+    }
+
+
+    //浮点型转换
+    public static float getfloats1(String demo,String demo1,int len){
+    	Logger log = Logger.getLogger(BigDecimal.class); 
+    	if(len==0){
+    		len=0;
+    	}
+    	String str=Util.null2String(demo);
+    	String str1=Util.null2String(demo1);
+    	if("".equals(str)||"".equals(str.trim())||"null".equalsIgnoreCase(str.trim())){
+    		str="0";
+    	}
+    	if("".equals(str1)||"".equals(str.trim())||"null".equalsIgnoreCase(str1.trim())){
+    		str1="0";
+    	}
+    	float fl=0.0f;
+    	//String str=Util.null2String(demo);
+    	try{
+    	if(str.trim().length()>0){
+    		    BigDecimal b1 = new BigDecimal(str.trim());
+    		    BigDecimal b2 = new BigDecimal(str1.trim()); 
+    		    BigDecimal b3=b1.add(b2);
+    			//System.out.println(b1.setScale(2,BigDecimal.ROUND_HALF_UP));
+    		    fl=b3.setScale(len,BigDecimal.ROUND_HALF_UP).floatValue();
+    	}
+    	log.error("getfloats"+fl);
+    	}catch(Exception e){
+    		log.error(demo+"getfloats异常"+e.getMessage());	
+    	}
+    	return fl;
+    }
+    public  static String sendGet(String url, String param,String basis) {
+    	String result = "";
+    	InputStream in = null;
+    try {
+    	String urlNameString = url ;
+    	URL realUrl = new URL(urlNameString);
+    URLConnection connection = realUrl.openConnection();
+    String auth="JNT:JNT2019";
+    String code = new sun.misc.BASE64Encoder().encode(auth.getBytes());
+    connection.setRequestProperty("Authorization", "Basic " + code);
+    connection.connect();
+    Map<String, List<String>> map = connection.getHeaderFields();
+
+
+    	for (String key : map.keySet()) {
+    	System.out.println(key + "--->" + map.get(key));
+    	}
+    	//接收核心返回过来的数据 xml  需要解析
+    	in =connection.getInputStream();
+    	byte[] b =getBytes(in);
+    	if(b.length>0){
+    		result=new String(b);
+    	}
+        System.out.println(b.length);
+    	} catch (Exception e) {
+
+         System.out.println(e.getMessage());
+    	  e.printStackTrace();
+    	}finally {
+    	try {
+    	if (in != null) {
+    	  in.close();
+    	}
+    	} catch (Exception e2) {
+    		System.out.println(e2.getMessage());
+    	   e2.printStackTrace();
+    	}
+    	}
+    	//System.out.println("de"+result);
+    	return result;
+    	}
+    public static byte[] getBytes(InputStream fis){  
+        Logger log = Logger.getLogger(Logger.class);
+         byte[] buffer = null;  
+         try {  
+             //File file = new File(filePath);  
+             //FileInputStream fis = new FileInputStream(file);  
+             ByteArrayOutputStream bos = new ByteArrayOutputStream(1000);  
+             byte[] b = new byte[10000];  
+             int n;  
+             while ((n = fis.read(b)) != -1) {  
+                 bos.write(b, 0, n);  
+             }  
+             fis.close();  
+             bos.close();  
+             buffer = bos.toByteArray();  
+         } catch (FileNotFoundException e) {  
+             e.printStackTrace();  
+         } catch (IOException e) {  
+             e.printStackTrace();  
+         }  
+         System.out.println("buffer--->"+buffer.length);
+         return buffer;  
+     }
+}
diff --git a/src/main/youhong_ai_jitu_src/com/jet/action/UpdateContractByPayAction.java b/src/main/youhong_ai_jitu_src/com/jet/action/UpdateContractByPayAction.java
new file mode 100644
index 0000000..0201164
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/com/jet/action/UpdateContractByPayAction.java
@@ -0,0 +1,66 @@
+package com.jet.action;
+
+
+import weaver.conn.RecordSet;
+import weaver.general.BaseBean;
+import weaver.general.Util;
+import weaver.interfaces.workflow.action.Action;
+import weaver.soa.workflow.request.RequestInfo;
+import selfdev.util.base.BaseUtil;
+import selfdev.util.log.LogTool;
+
+/**
+ * 付款申请流程归档时更新合同台账数据
+ * @author KangMD
+ * 2019-12-06
+ */
+public class UpdateContractByPayAction extends BaseBean implements Action  {
+
+	public String  execute(RequestInfo ri) { 
+		 LogTool log=new LogTool("/log/selfdev/action", false);
+		 //获取requestid
+		 String requestid=ri.getRequestid();
+		 String workflowid=ri.getWorkflowid();
+		 //获取用户语言
+		 int language=ri.getRequestManager().getUser().getLanguage();
+		 log.writeLog("language---------->"+language);
+		 String workflowname=BaseUtil.getBaseInfoByParm("workflowname", "workflow_base", "id", workflowid, "");
+		 log.writeLog("---------------"+workflowname+"开始写入K3生成付款单-------------requestId:" + requestid);
+		 //获取表名
+		 String tablename=BaseUtil.getBaseInfoByParm("tablename", "workflow_bill", "1", "1", " and id in (select formid from workflow_base where id="+workflowid+")");;
+		 RecordSet rs=new RecordSet();
+		 try {
+			String mainid="";//主键ID
+			String sfyht="";//是否有合同
+			double bcfkje=0;//本次付款金额
+			String htxx="";//相关合同
+			String sql="select * from "+tablename+" where requestid="+requestid;
+			rs.execute(sql);
+			while(rs.next()){
+				mainid=Util.null2String(rs.getString("id"));
+				sfyht=Util.null2String(rs.getString("sfyht"));
+				bcfkje=Double.parseDouble(Util.null2o(rs.getString("bcfkje")).replaceAll(",", ""));
+				htxx=Util.null2String(rs.getString("htxx"));
+			}
+			//有合同才需更新合同台账
+			if("0".equals(sfyht)){
+				//更新至建模的批次明细中
+				sql="update uf_httz_dt1 a set (yfkje,fkzt)=(select TO_CHAR(to_number(replace(nvl(a.yfkje,0),',',''))+to_number(replace(nvl(b.bcfkje,0),',','')),'FM999,999,999,999,999,999,990.00'),(case when to_number(replace(nvl(a.yfkje,0),',',''))+to_number(replace(nvl(b.bcfkje,0),',',''))=to_number(replace(nvl(a.fkje,0),',','')) then 0 else 2 end) from "+tablename+"_dt5 b where a.id=b.fkpc and b.mainid='"+mainid+"') where  a.mainid='"+htxx+"'";
+				log.writeLog("流程中支付金额更新至合同建模明细中的金额SQL---------->"+sql);
+				rs.execute(sql);
+				//更新至建模的主表中
+				sql="update uf_httz a set yfkje=TO_CHAR(to_number(replace(nvl(a.yfkje,0),',',''))+"+bcfkje+",'FM999,999,999,999,999,999,990.00'),fkzt=(case when to_number(replace(nvl(a.yfkje,0),',',''))+"+bcfkje+"=to_number(replace(nvl(a.htzje,0),',','')) then 0 else 2 end) where id='"+htxx+"'";
+				log.writeLog("流程中支付金额更新至合同建模主表中的金额SQL---------->"+sql);
+				rs.execute(sql);
+				
+			}
+		 } catch (Exception e) {
+			e.printStackTrace();
+			String error_msg="付款流程写入K3失败，错误信息为：------>"+e.toString();
+			ri.getRequestManager().setMessage("111100");
+			ri.getRequestManager().setMessagecontent(error_msg);
+			return "0";
+		 }
+		 return SUCCESS;
+	}
+}
diff --git a/src/main/youhong_ai_jitu_src/com/jet/action/YyApply.java b/src/main/youhong_ai_jitu_src/com/jet/action/YyApply.java
new file mode 100644
index 0000000..6d07839
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/com/jet/action/YyApply.java
@@ -0,0 +1,45 @@
+package com.jet.action;
+
+import weaver.soa.workflow.request.RequestInfo;
+import weaver.workflow.action.BaseAction;
+import weaver.conn.RecordSet;
+import weaver.general.Util;
+
+import com.working.util.LogTool;
+import com.working.util.WorkflowUtil;
+
+/**
+ * 02-用印申请-J&T中国
+ * @author lwt
+ *
+ */
+public class YyApply extends BaseAction{
+	
+	LogTool log = new LogTool("/log/feeChina/",false);
+	
+    @Override
+    public String execute(RequestInfo requestInfo) {
+    	// TODO Auto-generated method stub
+    	String requestid = requestInfo.getRequestid();
+    	RecordSet rs = new RecordSet();
+    	RecordSet rs1 = new RecordSet();
+    	String mainTable = WorkflowUtil.getMainTable(requestid);
+    	String detail1Table = mainTable + "_dt1";
+    	int mainId = requestInfo.getRequestManager().getBillid();//主表数据id
+    	rs.execute("select * from " + detail1Table + " where mainid = '" + mainId + "' order by id desc");
+    	String sfwjMain = "1";//主表是否外借字段
+    	String sfwj = "";//明细表1是否外借字段
+    	while (rs.next()) {
+    		sfwj = Util.null2String(rs.getString("SFWJ"));
+    		if (!sfwj.isEmpty()) {
+    			if (sfwj.equals("0")) {//团队活动费
+    				sfwjMain = "0";//主表是否外借字段
+    			} 
+    		}
+    	}
+    	rs1.execute("update " + mainTable + " set sfwj = '" +sfwjMain+ "' where requestid = '" + requestid +"'");
+    	
+    	return SUCCESS;
+    }
+
+}
diff --git a/src/main/youhong_ai_jitu_src/com/jet/k3/K3Connect.java b/src/main/youhong_ai_jitu_src/com/jet/k3/K3Connect.java
new file mode 100644
index 0000000..03a9c07
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/com/jet/k3/K3Connect.java
@@ -0,0 +1,45 @@
+package com.jet.k3;
+
+
+import kingdee.bos.webapi.client.K3CloudApiClient;
+import selfdev.util.log.LogTool;
+import weaver.file.Prop;
+import weaver.general.Util;
+
+
+/**
+ * K3连接连接配置
+ * @author 
+ */
+public class K3Connect {
+	//日志类
+	public static LogTool log=new LogTool("/log/selfdev", false);
+	//当前系统模式
+	public static String mode=Util.null2String(Prop.getPropValue("DevToK3_jet", "mode"));
+	//获取K3 连接参数
+	public static String K3CloudURL =Util.null2String(Prop.getPropValue("DevToK3_jet", mode+"_K3CloudURL"));
+	public static String dbId = Util.null2String(Prop.getPropValue("DevToK3_jet", mode+"_dbId"));
+	public static String uid = Util.null2String(Prop.getPropValue("DevToK3_jet", mode+"_uid"));
+	public static String pwd = Util.null2String(Prop.getPropValue("DevToK3_jet", mode+"_pwd"));
+	public static int lang = Integer.parseInt(Util.null2o(Prop.getPropValue("DevToK3_jet", mode+"_lang")));
+	
+	/**
+	 * 获取K3连接
+	 * @return
+	 */
+	public static K3CloudApiClient connect(){
+		K3CloudApiClient client =null;
+		try {
+			client = new K3CloudApiClient(K3CloudURL);
+			boolean result = client.login(dbId, uid, pwd, lang);
+			if(!result){
+				log.writeLog("连接K3失败，可能是用户名或密码错误！");
+				client =null;
+			}
+		} catch (Exception e) {
+			log.writeLog("连接K3失败, 错误信息为: " + e.toString());
+			client =null;
+		}
+		return client;
+	}
+}
diff --git a/src/main/youhong_ai_jitu_src/com/jet/schedule/syn/SynAccountBookToOA.java b/src/main/youhong_ai_jitu_src/com/jet/schedule/syn/SynAccountBookToOA.java
new file mode 100644
index 0000000..2f0c1b1
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/com/jet/schedule/syn/SynAccountBookToOA.java
@@ -0,0 +1,115 @@
+package com.jet.schedule.syn;
+
+import java.util.List;
+import java.util.Map;
+
+import com.jet.k3.K3Connect;
+
+import kingdee.bos.webapi.client.K3CloudApiClient;
+
+import selfdev.util.base.BaseUtil;
+import selfdev.util.base.TimeCommonUtil;
+
+import selfdev.util.log.LogTool;
+import weaver.conn.RecordSet;
+import weaver.file.Prop;
+import weaver.general.Util;
+import weaver.interfaces.schedule.BaseCronJob;
+import weaver.interfaces.schedule.CronJob;
+
+
+/**
+ * 定时将K3中账簿数据同步至OA建模表
+ * @author KangMD
+ * 2019-11-14
+ */
+public class SynAccountBookToOA extends BaseCronJob implements CronJob {
+
+	public static RecordSet rs=new RecordSet();
+	public static LogTool log=new LogTool("/log/selfdev/syn", false);
+	
+	public void execute(){
+		long startStamp=System.currentTimeMillis();
+		log.writeLog("*******同步K3账簿开始start：（" + weaver.general.TimeUtil.getCurrentTimeString() + "）");
+		try {
+			//连接K3
+			K3CloudApiClient client =K3Connect.connect();
+			if(client!=null){
+				String sql="";
+				String now=TimeCommonUtil.obtainDate(0);//获取当前系统日期yyyy-MM-dd HH:mm:ss格式
+				String currDate = now.substring(0,10);//当前系统日期
+				String currTime = now.substring(11);//当前系统时间
+				//获取账簿key-value MAP值，主键为账簿内码ID
+				Map<String,String> zb_map=BaseUtil.getMapKeyValueInfoByParm("uf_zb_K3","","FBookId","FNumber");
+				//当前系统模式
+				String mode=Util.null2String(Prop.getPropValue("DevToK3_jet", "mode"));
+				//账簿建模ID
+				String modeid_zb=Util.null2String(Prop.getPropValue("DevToK3_jet", mode+"_modeid_zb"));
+				
+				//分页查询
+				for(int t=0;t<1000;t++){
+					String sContent = "{\"FormId\":\"BD_ACCOUNTBOOK\","
+			                // 账簿formid
+			                +"\"TopRowCount\":0,"
+			                // 最多允许查询的数量，0或者不要此属性表示不限制
+			                +"\"Limit\":2000,"
+			                // 分页取数每页允许获取的数据，最大不能超过2000
+			                +"\"StartRow\":"+(2000*t)+","
+			                //分页取数开始行索引，从0开始，例如每页10行数据，第2页开始是10，第3页开始是20
+			                //""FilterString":"FMaterialId.FNumber like 'HG_TEST%'","+// 过滤条件
+			                //""FilterString":"FBillNo='CGDD000008'","+// 过滤条件
+			                +"\"FilterString\":\"FNumber!=''\"," //过滤条件 编码不为空值
+			                //+"\"OrderString\":\"FGoodsNO ASC\","// 排序条件
+			                //获取账簿基础信息 组织ID、内码、名称、编码、科目表
+			                +"\"FieldKeys\":\"FUseOrgId,FBookId,FName,FNumber,FACCTTABLEID\"}";
+			        //获取账簿列表
+					List<List<Object>> sResult = client.executeBillQuery(sContent);
+					int rows=sResult.size();
+					//已经没有数据了，跳出循环
+					if(rows==0){
+						break;
+					}else{
+						for(int k=0;k<rows;k++){
+							String FUseOrgId=Util.null2String(sResult.get(k).get(0));//组织ID
+							String FBookId=Util.null2String(sResult.get(k).get(1));//账簿内码
+							String FName=Util.null2String(sResult.get(k).get(2));//账簿名称
+							String FNumber=Util.null2String(sResult.get(k).get(3));//账簿编码
+							String FAcctTableId=Util.null2String(sResult.get(k).get(4));//科目表
+							
+							//判断当前记录是否已同步，若已同步则更新，未同步则插入
+							if(zb_map.containsKey(FBookId)){
+								//更新SQL
+								sql="update uf_zb_K3 set " +
+										"FUseOrgId='"+FUseOrgId+"'," +//组织ID
+										"FName='"+FName+"'," +//账簿名称
+										"FAcctTableId='"+FAcctTableId+"'," +//科目表
+										"FNumber='"+FNumber+"' " +//账簿编码
+										" where FBookId='"+FBookId+"'";
+								log.writeLog("账簿数据更新SQL------->" + sql);
+							}else{
+								//插入SQL
+								sql="insert into uf_zb_K3(formmodeid,modedatacreater,modedatacreatertype,modedatacreatedate,modedatacreatetime," +
+										"FUseOrgId,FBookId,FName,FAcctTableId,FNumber) values(" +
+										"'"+modeid_zb+"','1','0','"+currDate+"','"+currTime+"'," +
+										"'"+FUseOrgId+"','"+FBookId+"','"+FName+"','"+FAcctTableId+"'," +
+										"'"+FNumber+"')";
+								log.writeLog("账簿数据插入SQL------->" + sql);
+								//将新增的数据加入至MAP中
+								zb_map.put(FBookId, FNumber);
+							}
+							rs.execute(sql);
+						}
+					}
+				}
+			}
+			
+		} catch (Exception e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+			log.writeLog("获取K3账簿数据错误，错误信息为------->" + e.toString());
+		} 
+		//获取同步耗时
+		long hs = (System.currentTimeMillis() - startStamp)/1000;
+		log.writeLog("*******同步K3账簿数据完成end：（" + weaver.general.TimeUtil.getCurrentTimeString() + "），耗时:"+hs+"秒");
+	}
+}
diff --git a/src/main/youhong_ai_jitu_src/com/jet/schedule/syn/SynAccountToOA.java b/src/main/youhong_ai_jitu_src/com/jet/schedule/syn/SynAccountToOA.java
new file mode 100644
index 0000000..1e27501
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/com/jet/schedule/syn/SynAccountToOA.java
@@ -0,0 +1,113 @@
+package com.jet.schedule.syn;
+
+import java.util.List;
+import java.util.Map;
+
+import com.jet.k3.K3Connect;
+
+import kingdee.bos.webapi.client.K3CloudApiClient;
+
+import selfdev.util.base.BaseUtil;
+import selfdev.util.base.TimeCommonUtil;
+
+import selfdev.util.log.LogTool;
+import weaver.conn.RecordSet;
+import weaver.file.Prop;
+import weaver.general.Util;
+import weaver.interfaces.schedule.BaseCronJob;
+import weaver.interfaces.schedule.CronJob;
+
+
+/**
+ * 定时将K3中科目数据同步至OA建模表
+ * @author KangMD
+ * 2019-08-28
+ */
+public class SynAccountToOA extends BaseCronJob implements CronJob {
+
+	public static RecordSet rs=new RecordSet();
+	public static LogTool log=new LogTool("/log/selfdev", false);
+	
+	public void execute(){
+		long startStamp=System.currentTimeMillis();
+		log.writeLog("*******同步K3科目开始start：（" + weaver.general.TimeUtil.getCurrentTimeString() + "）");
+		try {
+			//连接K3
+			K3CloudApiClient client =K3Connect.connect();
+			if(client!=null){
+				String sql="";
+				String now=TimeCommonUtil.obtainDate(0);//获取当前系统日期yyyy-MM-dd HH:mm:ss格式
+				String currDate = now.substring(0,10);//当前系统日期
+				String currTime = now.substring(11);//当前系统时间
+				//获取科目key-value MAP值，主键为科目内码ID
+				Map<String,String> km_map=BaseUtil.getMapKeyValueInfoByParm("uf_km_k3","","FAcctId","FNumber");
+				//当前系统模式
+				String mode=Util.null2String(Prop.getPropValue("DevToK3_winsun", "mode"));
+				//科目建模ID
+				String modeid_km=Util.null2String(Prop.getPropValue("DevToK3_winsun", mode+"_modeid_km"));
+				
+				//分页查询
+				for(int t=0;t<1000;t++){
+					String sContent = "{\"FormId\":\"BD_Account\","
+			                // 科目formid
+			                +"\"TopRowCount\":0,"
+			                // 最多允许查询的数量，0或者不要此属性表示不限制
+			                +"\"Limit\":2000,"
+			                // 分页取数每页允许获取的数据，最大不能超过2000
+			                +"\"StartRow\":"+(2000*t)+","
+			                //分页取数开始行索引，从0开始，例如每页10行数据，第2页开始是10，第3页开始是20
+			                //""FilterString":"FMaterialId.FNumber like 'HG_TEST%'","+// 过滤条件
+			                //""FilterString":"FBillNo='CGDD000008'","+// 过滤条件
+			                +"\"FilterString\":\"FNumber!=''\"," //过滤条件 编码不为空值
+			                //+"\"OrderString\":\"FGoodsNO ASC\","// 排序条件
+			                //获取科目基础信息 组织ID、内码、名称、编码
+			                +"\"FieldKeys\":\"FCreateOrgId,FAcctId,FName,FNumber\"}";
+			        //获取科目列表
+					List<List<Object>> sResult = client.executeBillQuery(sContent);
+					
+					int rows=sResult.size();
+					//已经没有数据了，跳出循环
+					if(rows==0){
+						break;
+					}else{
+						for(int k=0;k<rows;k++){
+							String FCreateOrgId=Util.null2String(sResult.get(k).get(0));//组织ID
+							String FAcctId=Util.null2String(sResult.get(k).get(1));//科目内码
+							String FName=Util.null2String(sResult.get(k).get(2));//科目名称
+							String FNumber=Util.null2String(sResult.get(k).get(3));//科目编码
+							
+							//判断当前记录是否已同步，若已同步则更新，未同步则插入
+							if(km_map.containsKey(FAcctId)){
+								//更新SQL
+								sql="update uf_km_k3 set " +
+										"FCreateOrgId='"+FCreateOrgId+"'," +//组织ID
+										"FName='"+FName+"'," +//科目名称
+										"FNumber='"+FNumber+"' " +//科目编码
+										" where FAcctId='"+FAcctId+"'";
+								log.writeLog("科目数据更新SQL------->" + sql);
+							}else{
+								//插入SQL
+								sql="insert into uf_km_k3(formmodeid,modedatacreater,modedatacreatertype,modedatacreatedate,modedatacreatetime," +
+										"FCreateOrgId,FAcctId,FName,FNumber) values(" +
+										"'"+modeid_km+"','1','0','"+currDate+"','"+currTime+"'," +
+										"'"+FCreateOrgId+"','"+FAcctId+"','"+FName+"','"+FNumber+"')";
+								log.writeLog("科目数据插入SQL------->" + sql);
+								//将新增的数据加入至MAP中
+								km_map.put(FAcctId, FNumber);
+							}
+							rs.execute(sql);
+						}
+					}
+				}
+			}
+			
+		} catch (Exception e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+			log.writeLog("获取K3科目数据错误，错误信息为------->" + e.toString());
+		} 
+		//获取同步耗时
+		long hs = (System.currentTimeMillis() - startStamp)/1000;
+		log.writeLog("*******同步K3科目数据完成end：（" + weaver.general.TimeUtil.getCurrentTimeString() + "），耗时:"+hs+"秒");
+	}
+}
diff --git a/src/main/youhong_ai_jitu_src/com/jet/schedule/syn/SynBankToOA.java b/src/main/youhong_ai_jitu_src/com/jet/schedule/syn/SynBankToOA.java
new file mode 100644
index 0000000..e585431
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/com/jet/schedule/syn/SynBankToOA.java
@@ -0,0 +1,110 @@
+package com.jet.schedule.syn;
+
+import java.util.List;
+import java.util.Map;
+
+import kingdee.bos.webapi.client.K3CloudApiClient;
+import selfdev.util.base.BaseUtil;
+import selfdev.util.base.TimeCommonUtil;
+import selfdev.util.log.LogTool;
+import weaver.conn.RecordSet;
+import weaver.file.Prop;
+import weaver.general.Util;
+import weaver.interfaces.schedule.BaseCronJob;
+import weaver.interfaces.schedule.CronJob;
+
+import com.jet.k3.K3Connect;
+
+
+/**
+ * 定时将K3中银行数据同步至OA建模表
+ * @author KangMD
+ * 2019-08-28
+ */
+public class SynBankToOA extends BaseCronJob implements CronJob {
+
+	public static RecordSet rs=new RecordSet();
+	public static LogTool log=new LogTool("/log/selfdev", false);
+	
+	public void execute(){
+		long startStamp=System.currentTimeMillis();
+		log.writeLog("*******同步K3银行开始start：（" + weaver.general.TimeUtil.getCurrentTimeString() + "）");
+		try {
+			//连接K3
+			K3CloudApiClient client =K3Connect.connect();
+			if(client!=null){
+				String sql="";
+				String now=TimeCommonUtil.obtainDate(0);//获取当前系统日期yyyy-MM-dd HH:mm:ss格式
+				String currDate = now.substring(0,10);//当前系统日期
+				String currTime = now.substring(11);//当前系统时间
+				//获取银行key-value MAP值，主键为银行内码ID
+				Map<String,String> yh_map=BaseUtil.getMapKeyValueInfoByParm("uf_yh_k3","","FBankId","FNumber");
+				//当前系统模式
+				String mode=Util.null2String(Prop.getPropValue("DevToK3_winsun", "mode"));
+				//银行建模ID
+				String modeid_yh=Util.null2String(Prop.getPropValue("DevToK3_winsun", mode+"_modeid_yh"));
+				
+				//分页查询
+				for(int t=0;t<1000;t++){
+					String sContent = "{\"FormId\":\"BD_BANK\","
+			                // 银行formid
+			                +"\"TopRowCount\":0,"
+			                // 最多允许查询的数量，0或者不要此属性表示不限制
+			                +"\"Limit\":2000,"
+			                // 分页取数每页允许获取的数据，最大不能超过2000
+			                +"\"StartRow\":"+(2000*t)+","
+			                //分页取数开始行索引，从0开始，例如每页10行数据，第2页开始是10，第3页开始是20
+			                //""FilterString":"FMaterialId.FNumber like 'HG_TEST%'","+// 过滤条件
+			                //""FilterString":"FBillNo='CGDD000008'","+// 过滤条件
+			                +"\"FilterString\":\"FNumber!=''\"," //过滤条件 编码不为空值
+			                //+"\"OrderString\":\"FGoodsNO ASC\","// 排序条件
+			                //获取银行基础信息 组织ID、内码、名称、编码
+			                +"\"FieldKeys\":\"FCreateOrgId,FBankId,FName,FNumber\"}";
+			        //获取银行列表
+					List<List<Object>> sResult = client.executeBillQuery(sContent);
+					int rows=sResult.size();
+					//已经没有数据了，跳出循环
+					if(rows==0){
+						break;
+					}else{
+						for(int k=0;k<rows;k++){
+							String FCreateOrgId=Util.null2String(sResult.get(k).get(0));//组织ID
+							String FBankId=Util.null2String(sResult.get(k).get(1));//银行内码
+							String FName=Util.null2String(sResult.get(k).get(2));//银行名称
+							String FNumber=Util.null2String(sResult.get(k).get(3));//银行编码
+							
+							//判断当前记录是否已同步，若已同步则更新，未同步则插入
+							if(yh_map.containsKey(FBankId)){
+								//更新SQL
+								sql="update uf_yh_k3 set " +
+										"FCreateOrgId='"+FCreateOrgId+"'," +//组织ID
+										"FName='"+FName+"'," +//银行名称
+										"FNumber='"+FNumber+"' " +//银行编码
+										" where FBankId='"+FBankId+"'";
+								log.writeLog("银行数据更新SQL------->" + sql);
+							}else{
+								//插入SQL
+								sql="insert into uf_yh_k3(formmodeid,modedatacreater,modedatacreatertype,modedatacreatedate,modedatacreatetime," +
+										"FCreateOrgId,FBankId,FName,FNumber) values(" +
+										"'"+modeid_yh+"','1','0','"+currDate+"','"+currTime+"'," +
+										"'"+FCreateOrgId+"','"+FBankId+"','"+FName+"','"+FNumber+"')";
+								log.writeLog("银行数据插入SQL------->" + sql);
+								//将新增的数据加入至MAP中
+								yh_map.put(FBankId, FNumber);
+							}
+							rs.execute(sql);
+						}
+					}
+				}
+			}
+			
+		} catch (Exception e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+			log.writeLog("获取K3银行数据错误，错误信息为------->" + e.toString());
+		} 
+		//获取同步耗时
+		long hs = (System.currentTimeMillis() - startStamp)/1000;
+		log.writeLog("*******同步K3银行数据完成end：（" + weaver.general.TimeUtil.getCurrentTimeString() + "），耗时:"+hs+"秒");
+	}
+}
diff --git a/src/main/youhong_ai_jitu_src/com/jet/schedule/syn/SynCustomerToOA.java b/src/main/youhong_ai_jitu_src/com/jet/schedule/syn/SynCustomerToOA.java
new file mode 100644
index 0000000..ca2adb5
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/com/jet/schedule/syn/SynCustomerToOA.java
@@ -0,0 +1,133 @@
+package com.jet.schedule.syn;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import com.jet.k3.K3Connect;
+
+import kingdee.bos.webapi.client.K3CloudApiClient;
+
+import selfdev.util.base.BaseUtil;
+import selfdev.util.base.TimeCommonUtil;
+
+import selfdev.util.log.LogTool;
+import weaver.conn.RecordSet;
+import weaver.file.Prop;
+import weaver.general.Util;
+import weaver.interfaces.schedule.BaseCronJob;
+import weaver.interfaces.schedule.CronJob;
+
+
+/**
+ * 定时将K3中客户数据同步至OA建模表
+ * @author KangMD
+ * 2019-08-28
+ */
+public class SynCustomerToOA extends BaseCronJob implements CronJob {
+
+	public static RecordSet rs=new RecordSet();
+	public static LogTool log=new LogTool("/log/selfdev", false);
+	
+	public void execute(){
+		long startStamp=System.currentTimeMillis();
+		log.writeLog("*******同步K3客户开始start：（" + weaver.general.TimeUtil.getCurrentTimeString() + "）");
+		try {
+			//连接K3
+			K3CloudApiClient client =K3Connect.connect();
+			if(client!=null){
+				String sql="";
+				String now=TimeCommonUtil.obtainDate(0);//获取当前系统日期yyyy-MM-dd HH:mm:ss格式
+				String currDate = now.substring(0,10);//当前系统日期
+				String currTime = now.substring(11);//当前系统时间
+				//获取客户key-value MAP值，主键为客户内码ID
+				Map<String,String> kh_map=BaseUtil.getMapKeyValueInfoByParm("uf_kh_k3","","FCustId","FNumber");
+				//保存已同步客户key-value MAP值，主键为客户内码ID
+				Map<String,String> ts_map=new HashMap<String, String>();
+				//当前系统模式
+				String mode=Util.null2String(Prop.getPropValue("DevToK3_winsun", "mode"));
+				//客户建模ID
+				String modeid_kh=Util.null2String(Prop.getPropValue("DevToK3_winsun", mode+"_modeid_kh"));
+				
+				//分页查询
+				for(int t=0;t<1000;t++){
+					String sContent = "{\"FormId\":\"BD_Customer\","
+			                // 客户formid
+			                +"\"TopRowCount\":0,"
+			                // 最多允许查询的数量，0或者不要此属性表示不限制
+			                +"\"Limit\":2000,"
+			                // 分页取数每页允许获取的数据，最大不能超过2000
+			                +"\"StartRow\":"+(2000*t)+","
+			                //分页取数开始行索引，从0开始，例如每页10行数据，第2页开始是10，第3页开始是20
+			                //""FilterString":"FMaterialId.FNumber like 'HG_TEST%'","+// 过滤条件
+			                //""FilterString":"FBillNo='CGDD000008'","+// 过滤条件
+			                +"\"FilterString\":\"FNumber!=''\"," //过滤条件 编码不为空值
+			                //+"\"OrderString\":\"FCustId ASC\","// 排序条件
+			                //获取客户基础信息 组织ID、内码、名称、编码、银行账号、开户银行、账户名称
+			                +"\"FieldKeys\":\"FUseOrgId,FCustId,FName,FNumber,FBankCode,FOpenBankName,FAccountName\"}";
+			        //获取客户列表
+					List<List<Object>> sResult = client.executeBillQuery(sContent);
+					int rows=sResult.size();
+					//已经没有数据了，跳出循环
+					if(rows==0){
+						break;
+					}else{
+						for(int k=0;k<rows;k++){
+							String FUseOrgId=Util.null2String(sResult.get(k).get(0));//组织ID
+							String FCustId=Util.null2String(sResult.get(k).get(1));//客户内码
+							String FName=Util.null2String(sResult.get(k).get(2));//客户名称
+							String FNumber=Util.null2String(sResult.get(k).get(3));//客户编码
+							String FBankCode=Util.null2String(sResult.get(k).get(4)).replaceAll("'", "");//银行账号(过滤银行账号带单引号的数据)
+							String FOpenBankName=Util.null2String(sResult.get(k).get(5));//开户银行
+							String FAccountName=Util.null2String(sResult.get(k).get(6));//账户名称
+							
+							//如果账户名称为空，则默认取客户名称
+							if("".equals(FAccountName)){
+								FAccountName=FName;
+							}
+							
+							//判断当前记录是否有相同数据
+							if(ts_map.containsKey(FCustId)){
+								log.writeLog("客户数据重复------->" + FCustId);
+								continue;
+							}
+							
+							//判断当前记录是否已同步，若已同步则更新，未同步则插入
+							if(kh_map.containsKey(FCustId)){
+								//更新SQL
+								sql="update uf_kh_k3 set " +
+										"FUseOrgId='"+FUseOrgId+"'," +//组织ID
+										"FName='"+FName+"'," +//客户名称
+										"FNumber='"+FNumber+"'," +//客户编码
+										"FBankCode='"+FBankCode+"'," +//银行账号
+										"FAccountName='"+FAccountName+"'," +//账户名称
+										"FOpenBankName='"+FOpenBankName+"' " +//开户银行
+										" where FCustId='"+FCustId+"'";
+								log.writeLog("客户数据更新SQL------->" + sql);
+							}else{
+								//插入SQL
+								sql="insert into uf_kh_k3(formmodeid,modedatacreater,modedatacreatertype,modedatacreatedate,modedatacreatetime," +
+										"FUseOrgId,FCustId,FName,FNumber,FBankCode,FOpenBankName,FAccountName) values(" +
+										"'"+modeid_kh+"','1','0','"+currDate+"','"+currTime+"'," +
+										"'"+FUseOrgId+"','"+FCustId+"','"+FName+"','"+FNumber+"','"+FBankCode+"','"+FOpenBankName+"','"+FAccountName+"')";
+								log.writeLog("客户数据插入SQL------->" + sql);
+								//将新增的数据加入至MAP中
+								kh_map.put(FCustId, FNumber);
+							}
+							rs.execute(sql);
+							ts_map.put(FCustId, FNumber);
+						}
+					}
+				}
+			}
+			
+		} catch (Exception e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+			log.writeLog("获取K3客户数据错误，错误信息为------->" + e.toString());
+		} 
+		//获取同步耗时
+		long hs = (System.currentTimeMillis() - startStamp)/1000;
+		log.writeLog("*******同步K3客户数据完成end：（" + weaver.general.TimeUtil.getCurrentTimeString() + "），耗时:"+hs+"秒");
+	}
+}
diff --git a/src/main/youhong_ai_jitu_src/com/jet/schedule/syn/SynDepartmentToOA.java b/src/main/youhong_ai_jitu_src/com/jet/schedule/syn/SynDepartmentToOA.java
new file mode 100644
index 0000000..791204a
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/com/jet/schedule/syn/SynDepartmentToOA.java
@@ -0,0 +1,113 @@
+package com.jet.schedule.syn;
+
+import java.util.List;
+import java.util.Map;
+
+import com.jet.k3.K3Connect;
+
+import kingdee.bos.webapi.client.K3CloudApiClient;
+
+import selfdev.util.base.BaseUtil;
+import selfdev.util.base.TimeCommonUtil;
+
+import selfdev.util.log.LogTool;
+import weaver.conn.RecordSet;
+import weaver.file.Prop;
+import weaver.general.Util;
+import weaver.interfaces.schedule.BaseCronJob;
+import weaver.interfaces.schedule.CronJob;
+
+
+/**
+ * 定时将K3中部门数据同步至OA建模表
+ * @author KangMD
+ * 2019-12-07
+ */
+public class SynDepartmentToOA extends BaseCronJob implements CronJob {
+
+	public static RecordSet rs=new RecordSet();
+	public static LogTool log=new LogTool("/log/selfdev/syn", false);
+	
+	public void execute(){
+		long startStamp=System.currentTimeMillis();
+		log.writeLog("*******同步K3部门开始start：（" + weaver.general.TimeUtil.getCurrentTimeString() + "）");
+		try {
+			//连接K3
+			K3CloudApiClient client =K3Connect.connect();
+			if(client!=null){
+				String sql="";
+				String now=TimeCommonUtil.obtainDate(0);//获取当前系统日期yyyy-MM-dd HH:mm:ss格式
+				String currDate = now.substring(0,10);//当前系统日期
+				String currTime = now.substring(11);//当前系统时间
+				//获取部门key-value MAP值，主键为部门内码ID
+				Map<String,String> bm_map=BaseUtil.getMapKeyValueInfoByParm("uf_bm_K3","","FDeptId","FNumber");
+				//当前系统模式
+				String mode=Util.null2String(Prop.getPropValue("DevToK3_jet", "mode"));
+				//部门建模ID
+				String modeid_bm=Util.null2String(Prop.getPropValue("DevToK3_jet", mode+"_modeid_bm"));
+				
+				//分页查询
+				for(int t=0;t<1000;t++){
+					String sContent = "{\"FormId\":\"BD_Department\","
+			                // 部门formid
+			                +"\"TopRowCount\":0,"
+			                // 最多允许查询的数量，0或者不要此属性表示不限制
+			                +"\"Limit\":2000,"
+			                // 分页取数每页允许获取的数据，最大不能超过2000
+			                +"\"StartRow\":"+(2000*t)+","
+			                //分页取数开始行索引，从0开始，例如每页10行数据，第2页开始是10，第3页开始是20
+			                //""FilterString":"FMaterialId.FNumber like 'HG_TEST%'","+// 过滤条件
+			                //""FilterString":"FBillNo='CGDD000008'","+// 过滤条件
+			                +"\"FilterString\":\"FNumber!=''\"," //过滤条件 编码不为空值
+			                //+"\"OrderString\":\"FGoodsNO ASC\","// 排序条件
+			                //获取部门基础信息 组织ID、内码、名称、编码
+			                +"\"FieldKeys\":\"FUseOrgId,FDeptId,FName,FNumber\"}";
+			        //获取部门列表
+					List<List<Object>> sResult = client.executeBillQuery(sContent);
+					int rows=sResult.size();
+					//已经没有数据了，跳出循环
+					if(rows==0){
+						break;
+					}else{
+						for(int k=0;k<rows;k++){
+							String FUseOrgId=Util.null2String(sResult.get(k).get(0));//组织ID
+							String FDeptId=Util.null2String(sResult.get(k).get(1));//部门内码
+							String FName=Util.null2String(sResult.get(k).get(2));//部门名称
+							String FNumber=Util.null2String(sResult.get(k).get(3));//部门编码
+							
+							//判断当前记录是否已同步，若已同步则更新，未同步则插入
+							if(bm_map.containsKey(FDeptId)){
+								//更新SQL
+								sql="update uf_bm_K3 set " +
+										"FUseOrgId='"+FUseOrgId+"'," +//组织ID
+										"FName='"+FName+"'," +//部门名称
+										"FNumber='"+FNumber+"' " +//部门编码
+										" where FDeptId='"+FDeptId+"'";
+								log.writeLog("部门数据更新SQL------->" + sql);
+							}else{
+								//插入SQL
+								sql="insert into uf_bm_K3(formmodeid,modedatacreater,modedatacreatertype,modedatacreatedate,modedatacreatetime," +
+										"FUseOrgId,FDeptId,FName,FNumber) values(" +
+										"'"+modeid_bm+"','1','0','"+currDate+"','"+currTime+"'," +
+										"'"+FUseOrgId+"','"+FDeptId+"','"+FName+"'," +
+										"'"+FNumber+"')";
+								log.writeLog("部门数据插入SQL------->" + sql);
+								//将新增的数据加入至MAP中
+								bm_map.put(FDeptId, FNumber);
+							}
+							rs.execute(sql);
+						}
+					}
+				}
+			}
+			
+		} catch (Exception e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+			log.writeLog("获取K3部门数据错误，错误信息为------->" + e.toString());
+		} 
+		//获取同步耗时
+		long hs = (System.currentTimeMillis() - startStamp)/1000;
+		log.writeLog("*******同步K3部门数据完成end：（" + weaver.general.TimeUtil.getCurrentTimeString() + "），耗时:"+hs+"秒");
+	}
+}
diff --git a/src/main/youhong_ai_jitu_src/com/jet/schedule/syn/SynMaterialToOA.java b/src/main/youhong_ai_jitu_src/com/jet/schedule/syn/SynMaterialToOA.java
new file mode 100644
index 0000000..b47b532
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/com/jet/schedule/syn/SynMaterialToOA.java
@@ -0,0 +1,118 @@
+package com.jet.schedule.syn;
+
+import java.util.List;
+import java.util.Map;
+
+import kingdee.bos.webapi.client.K3CloudApiClient;
+import selfdev.util.base.BaseUtil;
+import selfdev.util.base.TimeCommonUtil;
+import selfdev.util.log.LogTool;
+import weaver.conn.RecordSet;
+import weaver.file.Prop;
+import weaver.general.Util;
+import weaver.interfaces.schedule.BaseCronJob;
+import weaver.interfaces.schedule.CronJob;
+
+import com.jet.k3.K3Connect;
+
+
+/**
+ * 定时将K3中物料数据同步至OA建模表
+ * @author KangMD
+ * 2019-08-28
+ */
+public class SynMaterialToOA extends BaseCronJob implements CronJob {
+
+	public static RecordSet rs=new RecordSet();
+	public static LogTool log=new LogTool("/log/selfdev", false);
+	
+	public void execute(){
+		long startStamp=System.currentTimeMillis();
+		log.writeLog("*******同步K3物料开始start：（" + weaver.general.TimeUtil.getCurrentTimeString() + "）");
+		try {
+			//连接K3
+			K3CloudApiClient client =K3Connect.connect();
+			if(client!=null){
+				String sql="";
+				String now=TimeCommonUtil.obtainDate(0);//获取当前系统日期yyyy-MM-dd HH:mm:ss格式
+				String currDate = now.substring(0,10);//当前系统日期
+				String currTime = now.substring(11);//当前系统时间
+				//获取物料key-value MAP值，主键为物料内码ID
+				Map<String,String> wl_map=BaseUtil.getMapKeyValueInfoByParm("uf_wl_k3","","FNumber","FNumber");
+				//当前系统模式
+				String mode=Util.null2String(Prop.getPropValue("DevToK3_winsun", "mode"));
+				//物料建模ID
+				String modeid_wl=Util.null2String(Prop.getPropValue("DevToK3_winsun", mode+"_modeid_wl"));
+				
+				//分页查询
+				for(int t=0;t<1000;t++){
+					String sContent = "{\"FormId\":\"BD_MATERIAL\","
+			                // 物料formid
+			                +"\"TopRowCount\":0,"
+			                // 最多允许查询的数量，0或者不要此属性表示不限制
+			                +"\"Limit\":2000,"
+			                // 分页取数每页允许获取的数据，最大不能超过2000
+			                +"\"StartRow\":"+(2000*t)+","
+			                //分页取数开始行索引，从0开始，例如每页10行数据，第2页开始是10，第3页开始是20
+			                //""FilterString":"FMaterialId.FNumber like 'HG_TEST%'","+// 过滤条件
+			                //""FilterString":"FBillNo='CGDD000008'","+// 过滤条件
+			                +"\"FilterString\":\"FNumber!=''\"," //过滤条件 编码不为空值
+			                //+"\"OrderString\":\"FGoodsNO ASC\","// 排序条件
+			                //获取物料基础信息 组织ID、内码、名称、编码、货号、基本单位、规格型号
+			                //+"\"FieldKeys\":\"FUseOrgId.FNumber,FMaterialId,FName,FNumber,FMnemonicCode,FBaseUnitId.FNumber,FSpecification\"}";
+			                +"\"FieldKeys\":\"FMaterialId,FName,FNumber,FMnemonicCode,FBaseUnitId.FNumber,FSpecification\"}";
+			        //获取物料列表
+					List<List<Object>> sResult = client.executeBillQuery(sContent);
+					int rows=sResult.size();
+					//已经没有数据了，跳出循环
+					if(rows==0){
+						break;
+					}else{
+						for(int k=0;k<rows;k++){
+							//String FUseOrgId=Util.null2String(sResult.get(k).get(0));//组织ID
+							String FMaterialId=Util.null2String(sResult.get(k).get(0));//物料内码
+							String FName=Util.null2String(sResult.get(k).get(1));//物料名称
+							String FNumber=Util.null2String(sResult.get(k).get(2));//物料编码
+							String FMnemonicCode=Util.null2String(sResult.get(k).get(3));//货号
+							String FBaseUnitId=Util.null2String(sResult.get(k).get(4));//基本单位
+							String FSpecification=Util.null2String(sResult.get(k).get(5));//规格型号
+							
+							//判断当前记录是否已同步，若已同步则更新，未同步则插入
+							if(wl_map.containsKey(FNumber)){
+								//更新SQL
+								sql="update uf_wl_K3 set " +
+										//"FUseOrgId='"+FUseOrgId+"'," +//组织ID
+										"FName='"+FName+"'," +//物料名称
+										"FNumber='"+FNumber+"'," +//物料编码
+										"FMnemonicCode='"+FMnemonicCode+"'," +//货号
+										"FBaseUnitId='"+FBaseUnitId+"'," +//基本单位
+										"FSpecification='"+FSpecification+"' " +//规格型号
+										" where FMaterialId='"+FMaterialId+"'";
+								log.writeLog("物料数据更新SQL------->" + sql);
+							}else{
+								//插入SQL
+								sql="insert into uf_wl_K3(formmodeid,modedatacreater,modedatacreatertype,modedatacreatedate,modedatacreatetime," +
+										"FUseOrgId,FMaterialId,FName,FNumber,FMnemonicCode,FBaseUnitId,FSpecification) values(" +
+										"'"+modeid_wl+"','1','0','"+currDate+"','"+currTime+"'," +
+										"'100','"+FMaterialId+"','"+FName+"','"+FNumber+"','"+FMnemonicCode+"','"+FBaseUnitId+"','"+FSpecification+"')";
+										//"'"+FUseOrgId+"','"+FMaterialId+"','"+FName+"','"+FNumber+"','"+FMnemonicCode+"','"+FBaseUnitId+"','"+FSpecification+"')";
+								log.writeLog("物料数据插入SQL------->" + sql);
+								//将新增的数据加入至MAP中
+								wl_map.put(FNumber, FNumber);
+							}
+							rs.execute(sql);
+						}
+					}
+				}
+			}
+			
+		} catch (Exception e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+			log.writeLog("获取K3物料数据错误，错误信息为------->" + e.toString());
+		} 
+		//获取同步耗时
+		long hs = (System.currentTimeMillis() - startStamp)/1000;
+		log.writeLog("*******同步K3物料数据完成end：（" + weaver.general.TimeUtil.getCurrentTimeString() + "），耗时:"+hs+"秒");
+	}
+}
diff --git a/src/main/youhong_ai_jitu_src/com/jet/schedule/syn/SynOrganizationsToOA.java b/src/main/youhong_ai_jitu_src/com/jet/schedule/syn/SynOrganizationsToOA.java
new file mode 100644
index 0000000..a1b8f02
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/com/jet/schedule/syn/SynOrganizationsToOA.java
@@ -0,0 +1,110 @@
+package com.jet.schedule.syn;
+
+import java.util.List;
+import java.util.Map;
+
+import com.jet.k3.K3Connect;
+
+import kingdee.bos.webapi.client.K3CloudApiClient;
+
+import selfdev.util.base.BaseUtil;
+import selfdev.util.base.TimeCommonUtil;
+
+import selfdev.util.log.LogTool;
+import weaver.conn.RecordSet;
+import weaver.file.Prop;
+import weaver.general.Util;
+import weaver.interfaces.schedule.BaseCronJob;
+import weaver.interfaces.schedule.CronJob;
+
+
+/**
+ * 定时将K3中组织机构数据同步至OA建模表
+ * @author KangMD
+ * 2019-11-07
+ */
+public class SynOrganizationsToOA extends BaseCronJob implements CronJob {
+
+	public static RecordSet rs=new RecordSet();
+	public static LogTool log=new LogTool("/log/selfdev/syn", false);
+	
+	public void execute(){
+		long startStamp=System.currentTimeMillis();
+		log.writeLog("*******同步K3组织机构开始start：（" + weaver.general.TimeUtil.getCurrentTimeString() + "）");
+		try {
+			//连接K3
+			K3CloudApiClient client =K3Connect.connect();
+			if(client!=null){
+				String sql="";
+				String now=TimeCommonUtil.obtainDate(0);//获取当前系统日期yyyy-MM-dd HH:mm:ss格式
+				String currDate = now.substring(0,10);//当前系统日期
+				String currTime = now.substring(11);//当前系统时间
+				//获取组织机构key-value MAP值，主键为组织机构内码ID
+				Map<String,String> zz_map=BaseUtil.getMapKeyValueInfoByParm("uf_zz_k3","","Forgid","FNumber");
+				//当前系统模式
+				String mode=Util.null2String(Prop.getPropValue("DevToK3_jet", "mode"));
+				//组织机构建模ID
+				String modeid_zz=Util.null2String(Prop.getPropValue("DevToK3_jet", mode+"_modeid_zz"));
+				
+				//分页查询
+				for(int t=0;t<1000;t++){
+					String sContent = "{\"FormId\":\"ORG_Organizations\","
+			                // 组织机构formid
+			                +"\"TopRowCount\":0,"
+			                // 最多允许查询的数量，0或者不要此属性表示不限制
+			                +"\"Limit\":2000,"
+			                // 分页取数每页允许获取的数据，最大不能超过2000
+			                +"\"StartRow\":"+(2000*t)+","
+			                //分页取数开始行索引，从0开始，例如每页10行数据，第2页开始是10，第3页开始是20
+			                //""FilterString":"FMaterialId.FNumber like 'HG_TEST%'","+// 过滤条件
+			                //""FilterString":"FBillNo='CGDD000008'","+// 过滤条件
+			                +"\"FilterString\":\"FNumber!=''\"," //过滤条件 编码不为空值
+			                //+"\"OrderString\":\"FGoodsNO ASC\","// 排序条件
+			                //获取组织机构基础信息 组织ID、名称、编码
+			                +"\"FieldKeys\":\"Forgid,FName,FNumber\"}";
+			        //获取组织机构列表
+					List<List<Object>> sResult = client.executeBillQuery(sContent);
+					int rows=sResult.size();
+					//已经没有数据了，跳出循环
+					if(rows==0){
+						break;
+					}else{
+						for(int k=0;k<rows;k++){
+							String Forgid=Util.null2String(sResult.get(k).get(0));//组织ID
+							String FName=Util.null2String(sResult.get(k).get(1));//组织机构名称
+							String FNumber=Util.null2String(sResult.get(k).get(2));//组织机构编码
+							
+							//判断当前记录是否已同步，若已同步则更新，未同步则插入
+							if(zz_map.containsKey(Forgid)){
+								//更新SQL
+								sql="update uf_zz_k3 set " +
+										"FName='"+FName+"'," +//组织机构名称
+										"FNumber='"+FNumber+"' " +//组织机构编码
+										" where Forgid='"+Forgid+"'";
+								log.writeLog("组织机构数据更新SQL------->" + sql);
+							}else{
+								//插入SQL
+								sql="insert into uf_zz_k3(formmodeid,modedatacreater,modedatacreatertype,modedatacreatedate,modedatacreatetime," +
+										"Forgid,FName,FNumber) values(" +
+										"'"+modeid_zz+"','1','0','"+currDate+"','"+currTime+"'," +
+										"'"+Forgid+"','"+FName+"','"+FNumber+"')";
+								log.writeLog("组织机构数据插入SQL------->" + sql);
+								//将新增的数据加入至MAP中
+								zz_map.put(Forgid, FNumber);
+							}
+							rs.execute(sql);
+						}
+					}
+				}
+			}
+			
+		} catch (Exception e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+			log.writeLog("获取K3组织机构数据错误，错误信息为------->" + e.toString());
+		} 
+		//获取同步耗时
+		long hs = (System.currentTimeMillis() - startStamp)/1000;
+		log.writeLog("*******同步K3组织机构数据完成end：（" + weaver.general.TimeUtil.getCurrentTimeString() + "），耗时:"+hs+"秒");
+	}
+}
diff --git a/src/main/youhong_ai_jitu_src/com/jet/schedule/syn/SynPayBankAcntToOA.java b/src/main/youhong_ai_jitu_src/com/jet/schedule/syn/SynPayBankAcntToOA.java
new file mode 100644
index 0000000..717f9f3
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/com/jet/schedule/syn/SynPayBankAcntToOA.java
@@ -0,0 +1,114 @@
+package com.jet.schedule.syn;
+
+import java.util.List;
+import java.util.Map;
+
+import kingdee.bos.webapi.client.K3CloudApiClient;
+import selfdev.util.base.BaseUtil;
+import selfdev.util.base.TimeCommonUtil;
+import selfdev.util.log.LogTool;
+import weaver.conn.RecordSet;
+import weaver.file.Prop;
+import weaver.general.Util;
+import weaver.interfaces.schedule.BaseCronJob;
+import weaver.interfaces.schedule.CronJob;
+
+import com.jet.k3.K3Connect;
+
+
+/**
+ * 定时将K3中付款银行同步至OA建模表
+ * @author KangMD
+ * 2019-12-04
+ */
+public class SynPayBankAcntToOA extends BaseCronJob implements CronJob {
+
+	public static RecordSet rs=new RecordSet();
+	public static LogTool log=new LogTool("/log/selfdev/syn", false);
+	
+	public void execute(){
+		long startStamp=System.currentTimeMillis();
+		log.writeLog("*******同步K3付款银行开始start：（" + weaver.general.TimeUtil.getCurrentTimeString() + "）");
+		try {
+			//连接K3
+			K3CloudApiClient client =K3Connect.connect();
+			if(client!=null){
+				String sql="";
+				String now=TimeCommonUtil.obtainDate(0);//获取当前系统日期yyyy-MM-dd HH:mm:ss格式
+				String currDate = now.substring(0,10);//当前系统日期
+				String currTime = now.substring(11);//当前系统时间
+				//获取付款银行key-value MAP值，主键为付款银行内码ID
+				Map<String,String> fkyh_map=BaseUtil.getMapKeyValueInfoByParm("uf_fkyh_k3","","FBankAcntId","FNumber");
+				//当前系统模式
+				String mode=Util.null2String(Prop.getPropValue("DevToK3_jet", "mode"));
+				//付款银行建模ID
+				String modeid_gys=Util.null2String(Prop.getPropValue("DevToK3_jet", mode+"_modeid_fkyh"));
+				
+				//分页查询
+				for(int t=0;t<1000;t++){
+					String sContent = "{\"FormId\":\"CN_BANKACNT\","
+			                // 付款银行formid
+			                +"\"TopRowCount\":0,"
+			                // 最多允许查询的数量，0或者不要此属性表示不限制
+			                +"\"Limit\":2000,"
+			                // 分页取数每页允许获取的数据，最大不能超过2000
+			                +"\"StartRow\":"+(2000*t)+","
+			                //分页取数开始行索引，从0开始，例如每页10行数据，第2页开始是10，第3页开始是20
+			                //""FilterString":"FMaterialId.FNumber like 'HG_TEST%'","+// 过滤条件
+			                //""FilterString":"FBillNo='CGDD000008'","+// 过滤条件
+			                +"\"FilterString\":\"FNumber!='' \"," //过滤条件 编码不为空值
+			                //+"\"OrderString\":\"FGoodsNO ASC\","// 排序条件
+			                //获取付款银行基础信息 组织ID、内码、名称、编码、开户银行
+			                +"\"FieldKeys\":\"FUseOrgId,FBankAcntId,FName,FNumber,FBankId\"}";
+			        //获取付款银行列表
+					List<List<Object>> sResult = client.executeBillQuery(sContent);
+					int rows=sResult.size();
+					//已经没有数据了，跳出循环
+					if(rows==0){
+						break;
+					}else{
+						for(int k=0;k<rows;k++){
+							String FUseOrgId=Util.null2String(sResult.get(k).get(0));//组织ID
+							String FBankAcntId=Util.null2String(sResult.get(k).get(1));//付款银行内码
+							String FName=Util.null2String(sResult.get(k).get(2));//账号名称
+							String FNumber=Util.null2String(sResult.get(k).get(3));//付款银行账号
+							String FBankId=Util.null2String(sResult.get(k).get(4));//开户行
+							
+							//判断当前记录是否已同步，若已同步则更新，未同步则插入
+							if(fkyh_map.containsKey(FBankAcntId)){
+								//更新SQL
+								sql="update uf_fkyh_k3 set " +
+										"FUseOrgId='"+FUseOrgId+"'," +//组织ID
+										"FName='"+FName+"'," +//账号名称
+										"FNumber='"+FNumber+"'," +//付款银行账号
+										"FBankId='"+FBankId+"' " +//开户银行
+										" where FBankAcntId='"+FBankAcntId+"'";
+								log.writeLog("付款银行数据更新SQL------->" + sql);
+							}else{
+								//插入SQL
+								sql="insert into uf_fkyh_k3(formmodeid,modedatacreater,modedatacreatertype,modedatacreatedate,modedatacreatetime," +
+										"FUseOrgId,FBankAcntId,FName,FNumber,FBankId) values(" +
+										"'"+modeid_gys+"','1','0','"+currDate+"','"+currTime+"'," +
+										"'"+FUseOrgId+"','"+FBankAcntId+"','"+FName+"','"+FNumber+"'," +
+										"'"+FBankId+"')";
+								log.writeLog("付款银行数据插入SQL------->" + sql);
+								
+								//将新增的数据加入至MAP中
+								fkyh_map.put(FBankAcntId, FNumber);
+							}
+							rs.execute(sql);
+						}
+					}
+				}
+			}
+			
+		} catch (Exception e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+			log.writeLog("获取K3付款银行数据错误，错误信息为------->" + e.toString());
+		} 
+		//获取同步耗时
+		long hs = (System.currentTimeMillis() - startStamp)/1000;
+		log.writeLog("*******同步K3付款银行数据完成end：（" + weaver.general.TimeUtil.getCurrentTimeString() + "），耗时:"+hs+"秒");
+	}
+}
diff --git a/src/main/youhong_ai_jitu_src/com/jet/schedule/syn/SynSettleTypeToOA.java b/src/main/youhong_ai_jitu_src/com/jet/schedule/syn/SynSettleTypeToOA.java
new file mode 100644
index 0000000..e75437d
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/com/jet/schedule/syn/SynSettleTypeToOA.java
@@ -0,0 +1,109 @@
+package com.jet.schedule.syn;
+
+import java.util.List;
+import java.util.Map;
+
+import kingdee.bos.webapi.client.K3CloudApiClient;
+import selfdev.util.base.BaseUtil;
+import selfdev.util.base.TimeCommonUtil;
+import selfdev.util.log.LogTool;
+import weaver.conn.RecordSet;
+import weaver.file.Prop;
+import weaver.general.Util;
+import weaver.interfaces.schedule.BaseCronJob;
+import weaver.interfaces.schedule.CronJob;
+
+import com.jet.k3.K3Connect;
+
+
+/**
+ * 定时将K3中结算方式数据同步至OA建模表
+ * @author KangMD
+ * 2019-09-04
+ */
+public class SynSettleTypeToOA extends BaseCronJob implements CronJob {
+
+	public static RecordSet rs=new RecordSet();
+	public static LogTool log=new LogTool("/log/selfdev", false);
+	
+	public void execute(){
+		long startStamp=System.currentTimeMillis();
+		log.writeLog("*******同步K3结算方式开始start：（" + weaver.general.TimeUtil.getCurrentTimeString() + "）");
+		try {
+			//连接K3
+			K3CloudApiClient client =K3Connect.connect();
+			if(client!=null){
+				String sql="";
+				String now=TimeCommonUtil.obtainDate(0);//获取当前系统日期yyyy-MM-dd HH:mm:ss格式
+				String currDate = now.substring(0,10);//当前系统日期
+				String currTime = now.substring(11);//当前系统时间
+				//获取结算方式key-value MAP值，主键为结算方式内码ID
+				Map<String,String> jsfs_map=BaseUtil.getMapKeyValueInfoByParm("uf_jsfs_K3","","FID","FNumber");
+				//当前系统模式
+				String mode=Util.null2String(Prop.getPropValue("DevToK3_winsun", "mode"));
+				//结算方式建模ID
+				String modeid_jsfs=Util.null2String(Prop.getPropValue("DevToK3_winsun", mode+"_modeid_jsfs"));
+				
+				//分页查询
+				for(int t=0;t<1000;t++){
+					String sContent = "{\"FormId\":\"BD_SETTLETYPE\","
+			                // 结算方式formid
+			                +"\"TopRowCount\":0,"
+			                // 最多允许查询的数量，0或者不要此属性表示不限制
+			                +"\"Limit\":2000,"
+			                // 分页取数每页允许获取的数据，最大不能超过2000
+			                +"\"StartRow\":"+(2000*t)+","
+			                //分页取数开始行索引，从0开始，例如每页10行数据，第2页开始是10，第3页开始是20
+			                //""FilterString":"FMaterialId.FNumber like 'HG_TEST%'","+// 过滤条件
+			                //""FilterString":"FBillNo='CGDD000008'","+// 过滤条件
+			                +"\"FilterString\":\"FNumber!=''\"," //过滤条件 编码不为空值
+			                //+"\"OrderString\":\"FGoodsNO ASC\","// 排序条件
+			                //获取结算方式基础信息 内码、名称、编码
+			                +"\"FieldKeys\":\"FID,FName,FNumber\"}";
+			        //获取结算方式列表
+					List<List<Object>> sResult = client.executeBillQuery(sContent);
+					int rows=sResult.size();
+					//已经没有数据了，跳出循环
+					if(rows==0){
+						break;
+					}else{
+						for(int k=0;k<rows;k++){
+							String FID=Util.null2String(sResult.get(k).get(0));//结算方式内码
+							String FName=Util.null2String(sResult.get(k).get(1));//结算方式名称
+							String FNumber=Util.null2String(sResult.get(k).get(2));//结算方式编码
+							
+							//判断当前记录是否已同步，若已同步则更新，未同步则插入
+							if(jsfs_map.containsKey(FID)){
+								//更新SQL
+								sql="update uf_jsfs_K3 set " +
+										"FName='"+FName+"'," +//结算方式名称
+										"FNumber='"+FNumber+"' " +//结算方式编码
+										" where FID='"+FID+"'";
+								log.writeLog("结算方式数据更新SQL------->" + sql);
+							}else{
+								//插入SQL
+								sql="insert into uf_jsfs_K3(formmodeid,modedatacreater,modedatacreatertype,modedatacreatedate,modedatacreatetime," +
+										"FID,FName,FNumber) values(" +
+										"'"+modeid_jsfs+"','1','0','"+currDate+"','"+currTime+"'," +
+										"'"+FID+"','"+FName+"'," +
+										"'"+FNumber+"')";
+								log.writeLog("结算方式数据插入SQL------->" + sql);
+								//将新增的数据加入至MAP中
+								jsfs_map.put(FID, FNumber);
+							}
+							rs.execute(sql);
+						}
+					}
+				}
+			}
+			
+		} catch (Exception e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+			log.writeLog("获取K3结算方式数据错误，错误信息为------->" + e.toString());
+		} 
+		//获取同步耗时
+		long hs = (System.currentTimeMillis() - startStamp)/1000;
+		log.writeLog("*******同步K3结算方式数据完成end：（" + weaver.general.TimeUtil.getCurrentTimeString() + "），耗时:"+hs+"秒");
+	}
+}
diff --git a/src/main/youhong_ai_jitu_src/com/jet/schedule/syn/SynSupplierToOA.java b/src/main/youhong_ai_jitu_src/com/jet/schedule/syn/SynSupplierToOA.java
new file mode 100644
index 0000000..4b056c8
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/com/jet/schedule/syn/SynSupplierToOA.java
@@ -0,0 +1,128 @@
+package com.jet.schedule.syn;
+
+import java.util.List;
+import java.util.Map;
+
+import kingdee.bos.webapi.client.K3CloudApiClient;
+import selfdev.util.base.BaseUtil;
+import selfdev.util.base.TimeCommonUtil;
+import selfdev.util.log.LogTool;
+import weaver.conn.RecordSet;
+import weaver.file.Prop;
+import weaver.general.Util;
+import weaver.interfaces.schedule.BaseCronJob;
+import weaver.interfaces.schedule.CronJob;
+
+import com.jet.k3.K3Connect;
+
+
+/**
+ * 定时将K3中供应商数据同步至OA建模表
+ * @author KangMD
+ * 2019-11-08
+ */
+public class SynSupplierToOA extends BaseCronJob implements CronJob {
+
+	public static RecordSet rs=new RecordSet();
+	public static LogTool log=new LogTool("/log/selfdev/syn", false);
+	
+	public void execute(){
+		long startStamp=System.currentTimeMillis();
+		log.writeLog("*******同步K3供应商开始start：（" + weaver.general.TimeUtil.getCurrentTimeString() + "）");
+		try {
+			//连接K3
+			K3CloudApiClient client =K3Connect.connect();
+			if(client!=null){
+				String sql="";
+				String now=TimeCommonUtil.obtainDate(0);//获取当前系统日期yyyy-MM-dd HH:mm:ss格式
+				String currDate = now.substring(0,10);//当前系统日期
+				String currTime = now.substring(11);//当前系统时间
+				//获取供应商key-value MAP值，主键为供应商内码ID
+				Map<String,String> gys_map=BaseUtil.getMapKeyValueInfoByParm("uf_gys_k3","","FSupplierId","FNumber");
+				//当前系统模式
+				String mode=Util.null2String(Prop.getPropValue("DevToK3_jet", "mode"));
+				//供应商建模ID
+				String modeid_gys=Util.null2String(Prop.getPropValue("DevToK3_jet", mode+"_modeid_gys"));
+				
+				//分页查询
+				for(int t=0;t<1000;t++){
+					String sContent = "{\"FormId\":\"BD_Supplier\","
+			                // 供应商formid
+			                +"\"TopRowCount\":0,"
+			                // 最多允许查询的数量，0或者不要此属性表示不限制
+			                +"\"Limit\":2000,"
+			                // 分页取数每页允许获取的数据，最大不能超过2000
+			                +"\"StartRow\":"+(2000*t)+","
+			                //分页取数开始行索引，从0开始，例如每页10行数据，第2页开始是10，第3页开始是20
+			                //""FilterString":"FMaterialId.FNumber like 'HG_TEST%'","+// 过滤条件
+			                //""FilterString":"FBillNo='CGDD000008'","+// 过滤条件
+			                +"\"FilterString\":\"FNumber!='' and FDocumentStatus='C'\"," //过滤条件 编码不为空值,FDocumentStatus='C'标识数据状态为已审核
+			                //+"\"OrderString\":\"FGoodsNO ASC\","// 排序条件
+			                //获取供应商基础信息 组织ID、内码、名称、编码、银行账号、账户名称、开户银行
+			                +"\"FieldKeys\":\"FUseOrgId,FSupplierId,FName,FNumber,FBankCode,FBankHolder,FOpenBankName,F_RTA_VATType.FNumber,FTaxRateId.FNumber\"}";
+			        //获取供应商列表
+					List<List<Object>> sResult = client.executeBillQuery(sContent);
+					int rows=sResult.size();
+					//已经没有数据了，跳出循环
+					if(rows==0){
+						break;
+					}else{
+						for(int k=0;k<rows;k++){
+							String FUseOrgId=Util.null2String(sResult.get(k).get(0));//组织ID
+							String FSupplierId=Util.null2String(sResult.get(k).get(1));//供应商内码
+							String FName=Util.null2String(sResult.get(k).get(2));//供应商名称
+							String FNumber=Util.null2String(sResult.get(k).get(3));//供应商编码
+							String FBankCode=Util.null2String(sResult.get(k).get(4));//银行账号
+							String FBankHolder=Util.null2String(sResult.get(k).get(5));//账户名称
+							String FOpenBankName=Util.null2String(sResult.get(k).get(6));//开户银行
+							String F_RTA_VATType=Util.null2String(sResult.get(k).get(7));//PPN Type
+							String FTaxRate=Util.null2String(sResult.get(k).get(8));//默认税率
+							
+							//如果账户名称为空，则默认取供应商名称
+							if("".equals(FBankHolder)){
+								FBankHolder=FName;
+							}
+							
+							//判断当前记录是否已同步，若已同步则更新，未同步则插入
+							if(gys_map.containsKey(FSupplierId)){
+								//更新SQL
+								sql="update uf_gys_K3 set " +
+										"FUseOrgId='"+FUseOrgId+"'," +//组织ID
+										"FName='"+FName+"'," +//供应商名称
+										"FNumber='"+FNumber+"'," +//供应商编码
+										"FBankCode='"+FBankCode+"'," +//银行账号
+										"FBankHolder='"+FBankHolder+"'," +//账户名称
+										"F_RTA_VATType='"+F_RTA_VATType+"'," +//PPN Type
+										"FTaxRate='"+FTaxRate+"'," +//默认税率
+										"FOpenBankName='"+FOpenBankName+"' " +//开户银行
+										" where FSupplierId='"+FSupplierId+"'";
+								log.writeLog("供应商数据更新SQL------->" + sql);
+							}else{
+								//插入SQL
+								sql="insert into uf_gys_K3(formmodeid,modedatacreater,modedatacreatertype,modedatacreatedate,modedatacreatetime," +
+										"FUseOrgId,FSupplierId,FName,FNumber,FBankCode,FBankHolder,F_RTA_VATType,FTaxRate,FOpenBankName) values(" +
+										"'"+modeid_gys+"','1','0','"+currDate+"','"+currTime+"'," +
+										"'"+FUseOrgId+"','"+FSupplierId+"','"+FName+"','"+FNumber+"','"+FBankCode+"'," +
+										"'"+FBankHolder+"','"+F_RTA_VATType+"','"+FTaxRate+"'," +
+										"'"+FOpenBankName+"')";
+								log.writeLog("供应商数据插入SQL------->" + sql);
+								
+								//将新增的数据加入至MAP中
+								gys_map.put(FSupplierId, FNumber);
+							}
+							rs.execute(sql);
+						}
+					}
+				}
+			}
+			
+		} catch (Exception e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+			log.writeLog("获取K3供应商数据错误，错误信息为------->" + e.toString());
+		} 
+		//获取同步耗时
+		long hs = (System.currentTimeMillis() - startStamp)/1000;
+		log.writeLog("*******同步K3供应商数据完成end：（" + weaver.general.TimeUtil.getCurrentTimeString() + "），耗时:"+hs+"秒");
+	}
+}
diff --git a/src/main/youhong_ai_jitu_src/com/jet/test/AP_OtherPayableSaveTestK3.java b/src/main/youhong_ai_jitu_src/com/jet/test/AP_OtherPayableSaveTestK3.java
new file mode 100644
index 0000000..3b6a181
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/com/jet/test/AP_OtherPayableSaveTestK3.java
@@ -0,0 +1,175 @@
+package com.jet.test;
+
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.serializer.SerializerFeature;
+
+import kingdee.bos.webapi.client.K3CloudApiClient; 
+
+/**
+ * 其他应付款
+ * @author KangMD
+ *
+ */
+public class AP_OtherPayableSaveTestK3 {
+	static String K3CloudURL = "http://k3.jet.co.id:8880/K3Cloud/";
+	static String dbId = "5da41554614595";
+	static String uid = "lulu yang";
+	static String pwd = "20190716";
+	static int lang = 2052;
+	
+
+	public static void main(String[] args) {
+		// TODO Auto-generated method stub
+		try {
+			queryBD_Expense();
+		} catch (Exception e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+	}
+	
+	//供应商
+	public static void queryBD_Expense() throws Exception {
+	    K3CloudApiClient client = new K3CloudApiClient(K3CloudURL);
+	    boolean result = client.login(dbId, uid, pwd, lang);
+	    if (result) {
+	    	Map<String,Object> data=new HashMap<String,Object>();
+	    	
+	    	Map<String,Object> Model=new HashMap<String,Object>();
+	    	//单据类型(必填项)--------默认为标准应付单YFD01_SYS
+	    	Map<String,Object> FBillTypeID=new HashMap<String,Object>();
+	    	FBillTypeID.put("FNUMBER", "QTYFD01_SYS");
+	    	Model.put("FBillTypeID", FBillTypeID);
+	    	
+	    	//Model.put("FISINIT", false);//是否期初单据
+	    	Model.put("FDATE", "2019-11-28");//业务日期(必填项)--------默认为申请日期
+	    	Model.put("FENDDATE_H", "2019-11-28");//到期日(必填项)--------
+	    	Model.put("FCONTACTUNITTYPE", "BD_Empinfo");//往来单位类型，默认为员工
+	    	//Model.put("FDOCUMENTSTATUS", "Z");//单据状态
+	    	
+	    	//往来单位编码（即员工编码）
+	    	Map<String,Object> FCONTACTUNIT=new HashMap<String,Object>();
+	    	FCONTACTUNIT.put("FNUMBER", "E0003");
+	    	Model.put("FCONTACTUNIT", FCONTACTUNIT);
+	    	
+	    	//币别(必填项)--------
+	    	Map<String,Object> FCURRENCYID=new HashMap<String,Object>();
+	    	FCURRENCYID.put("FNUMBER", "IDR");
+	    	Model.put("FCURRENCYID", FCURRENCYID);
+	    	
+	    	Model.put("FTOTALAMOUNTFOR_H", 10000.0);//总金额
+	    	Model.put("FNOTSETTLEAMOUNTFOR", 10000.0);//未结算金额
+	    	
+	    	//申请部门
+	    	Map<String,Object> FDEPARTMENTID=new HashMap<String,Object>();
+	    	FDEPARTMENTID.put("FNumber", "BM000002");
+	    	Model.put("FDEPARTMENTID", FDEPARTMENTID);
+	    	
+	    	//付款组织(必填项)----
+	    	Map<String,Object> FPAYORGID=new HashMap<String,Object>();
+	    	FPAYORGID.put("FNUMBER", "100");
+	    	Model.put("FPAYORGID", FPAYORGID);
+	    	//结算组织
+	    	Model.put("FSETTLEORGID", FPAYORGID);
+	    	//采购组织
+	    	Model.put("FPURCHASEORGID", FPAYORGID);
+	    	//采购部门
+	    	Map<String,Object> FPURCHASEDEPTID=new HashMap<String,Object>();
+	    	FPURCHASEDEPTID.put("FNumber", "BM000001");
+	    	Model.put("FPURCHASEDEPTID", FPURCHASEDEPTID);
+	    	//本位币
+	    	Model.put("FMAINBOOKSTDCURRID", FCURRENCYID);
+	    	
+
+	    	//汇率类型
+//	    	Map<String,Object> FEXCHANGETYPE=new HashMap<String,Object>();
+//	    	FEXCHANGETYPE.put("FNUMBER", "HLTX01_SYS");
+//	    	Model.put("FEXCHANGETYPE", FEXCHANGETYPE);
+	    	
+	    	//到期日计算日期(期望支付日期)
+	    	Model.put("FACCNTTIMEJUDGETIME", "2019-12-20");
+	    	//作废状态
+	    	Model.put("FCancelStatus", "A");
+
+	    	
+	    	//-----------------明细 start-----------------//
+	    	List<Map<String,Object>> FEntity=new ArrayList<Map<String,Object>>();
+	    	//定义一行明细
+	    	Map<String,Object> EntityDetail=new HashMap<String, Object>();
+			//费用项目编码
+	    	Map<String,Object> FCOSTID=new HashMap<String,Object>();
+	    	FCOSTID.put("FNUMBER", "CI074");
+			EntityDetail.put("FCOSTID", FCOSTID);
+			//费用归属部门
+			EntityDetail.put("FCOSTDEPARTMENTID", FDEPARTMENTID);
+			//不含税金额
+			EntityDetail.put("FNOTAXAMOUNTFOR", 10000);
+			//总金额
+			EntityDetail.put("FTOTALAMOUNTFOR", 10000);
+			//未结算金额
+			EntityDetail.put("FNOTSETTLEAMOUNTFOR_D", 10000);
+			//不含税金额本位币
+			EntityDetail.put("FNOTAXAMOUNT_D", 10000);
+			//发票类型
+			//EntityDetail.put("FINVOICETYPE", "");
+			//将MAP添加至List中
+			FEntity.add(EntityDetail);
+	    	//EntityDetail.clear();//清空继续循环----------
+	    	
+	    	Model.put("FEntity", FEntity);//
+	    	
+	    	//-----------------明细 end-----------------//
+	    	
+	    	
+	    	data.put("Model", Model);
+	    	
+	    	//将MAP转JSON，fastjson默认开启引用检测将相同的对象写成引用的形式，所以必须加上SerializerFeature.DisableCircularReferenceDetect，否则转换的字符串会出现$ref
+	    	String jsonStr = JSON.toJSONString(data, SerializerFeature.DisableCircularReferenceDetect);
+	    	System.out.println(jsonStr);
+	    	//调用应付单保存接口
+			String sResult = client.excuteOperation("AP_OtherPayable", "save", jsonStr);
+			System.out.println(sResult);
+			
+			//解析K3返回的JSO字符串
+			JSONObject jsonObject = JSONObject.parseObject(sResult);
+			JSONObject ResponseStatus=jsonObject.getJSONObject("Result").getJSONObject("ResponseStatus");
+			//是否成功写入K3
+			String IsSuccess=ResponseStatus.get("IsSuccess").toString();
+			System.out.println(IsSuccess);
+			if("true".equals(IsSuccess)){
+				JSONArray SuccessJSONArray=ResponseStatus.getJSONArray("SuccessEntitys");
+				String Id="";//单据ID
+				String Number="";//单据编号
+				
+				for(int p=0;p<SuccessJSONArray.size();p++){
+					Id=SuccessJSONArray.getJSONObject(p).get("Id").toString();
+					Number=SuccessJSONArray.getJSONObject(p).get("Number").toString();
+				}
+				System.out.println("Id------>"+Id+",Number------>"+Number);
+//				String jsonStr2="{\"CreateOrgId\":0,\"Numbers\":[],\"Ids\":\""+Id+"\",\"SelectedPostId\":0}";
+//				//调用应付单提交接口(将单据状态由创建--->审核中)
+//				String sResult2 = client.excuteOperation("AP_Payable", "submit", jsonStr2);
+//				System.out.println(sResult2);
+				
+			}else{
+				JSONArray ErrorsJSONArray=ResponseStatus.getJSONArray("Errors");
+				String msg="";
+				for(int p=0;p<ErrorsJSONArray.size();p++){
+					msg+=ErrorsJSONArray.getJSONObject(p).get("Message").toString();
+				}
+				System.out.println(msg);
+			}
+			
+	    }
+	}
+	
+
+}
diff --git a/src/main/youhong_ai_jitu_src/com/jet/test/AP_OtherPayableViewTestK3.java b/src/main/youhong_ai_jitu_src/com/jet/test/AP_OtherPayableViewTestK3.java
new file mode 100644
index 0000000..26651ba
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/com/jet/test/AP_OtherPayableViewTestK3.java
@@ -0,0 +1,83 @@
+package com.jet.test;
+
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.serializer.SerializerFeature;
+
+import kingdee.bos.webapi.client.K3CloudApiClient; 
+
+/**
+ * 其他应付款
+ * @author KangMD
+ *
+ */
+public class AP_OtherPayableViewTestK3 {
+	static String K3CloudURL = "http://k3.jet.co.id:8880/K3Cloud/";
+	static String dbId = "5da41554614595";
+	static String uid = "lulu yang";
+	static String pwd = "20190716";
+	static int lang = 2052;
+	
+
+	public static void main(String[] args) {
+		// TODO Auto-generated method stub
+		try {
+			queryBD_Expense();
+		} catch (Exception e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+	}
+	
+	//供应商
+	public static void queryBD_Expense() throws Exception {
+	    K3CloudApiClient client = new K3CloudApiClient(K3CloudURL);
+	    boolean result = client.login(dbId, uid, pwd, lang);
+	    if (result) {
+	    	String jsonStr="{\"CreateOrgId\":100,\"Number\":\"QTYFD00001592\",\"Id\":\"\"}";//
+	    	//调用应付单保存接口
+			String sResult = client.excuteOperation("AP_OtherPayable", "view", jsonStr);
+			System.out.println(sResult);
+			
+			//解析K3返回的JSO字符串
+			JSONObject jsonObject = JSONObject.parseObject(sResult);
+			JSONObject ResponseStatus=jsonObject.getJSONObject("Result").getJSONObject("ResponseStatus");
+			//是否成功写入K3
+			String IsSuccess=ResponseStatus.get("IsSuccess").toString();
+			System.out.println(IsSuccess);
+			if("true".equals(IsSuccess)){
+				JSONArray SuccessJSONArray=ResponseStatus.getJSONArray("SuccessEntitys");
+				String Id="";//单据ID
+				String Number="";//单据编号
+				
+				for(int p=0;p<SuccessJSONArray.size();p++){
+					Id=SuccessJSONArray.getJSONObject(p).get("Id").toString();
+					Number=SuccessJSONArray.getJSONObject(p).get("Number").toString();
+				}
+				System.out.println("Id------>"+Id+",Number------>"+Number);
+//				String jsonStr2="{\"CreateOrgId\":0,\"Numbers\":[],\"Ids\":\""+Id+"\",\"SelectedPostId\":0}";
+//				//调用应付单提交接口(将单据状态由创建--->审核中)
+//				String sResult2 = client.excuteOperation("AP_Payable", "submit", jsonStr2);
+//				System.out.println(sResult2);
+				
+			}else{
+				JSONArray ErrorsJSONArray=ResponseStatus.getJSONArray("Errors");
+				String msg="";
+				for(int p=0;p<ErrorsJSONArray.size();p++){
+					msg+=ErrorsJSONArray.getJSONObject(p).get("Message").toString();
+				}
+				System.out.println(msg);
+			}
+			
+	    }
+	}
+	
+
+}
diff --git a/src/main/youhong_ai_jitu_src/com/jet/test/AP_PayBillSaveTestK3.java b/src/main/youhong_ai_jitu_src/com/jet/test/AP_PayBillSaveTestK3.java
new file mode 100644
index 0000000..56b06c5
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/com/jet/test/AP_PayBillSaveTestK3.java
@@ -0,0 +1,196 @@
+package com.jet.test;
+
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.serializer.SerializerFeature;
+
+import kingdee.bos.webapi.client.K3CloudApiClient; 
+
+public class AP_PayBillSaveTestK3 {
+	static String K3CloudURL = "http://k3.jet.co.id:8880/K3Cloud/";
+	static String dbId = "5da41554614595";
+	static String uid = "lulu yang";
+	static String pwd = "20190716";
+	static int lang = 2052;
+	
+
+	public static void main(String[] args) {
+		// TODO Auto-generated method stub
+		try {
+			queryBD_Expense();
+		} catch (Exception e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+	}
+	
+	//供应商
+	public static void queryBD_Expense() throws Exception {
+	    K3CloudApiClient client = new K3CloudApiClient(K3CloudURL);
+	    boolean result = client.login(dbId, uid, pwd, lang);
+	    if (result) {
+	    	//传入的JSON格式
+	    	Map<String,Object> data=new HashMap<String,Object>();
+	    	Map<String,Object> Model=new HashMap<String,Object>();
+	    	//单据类型(必填项)--------默认为采购业务付款单FKDLX01_SYS
+	    	Map<String,Object> FBillTypeID=new HashMap<String,Object>();
+	    	FBillTypeID.put("FNUMBER", "FKDLX01_SYS");
+	    	Model.put("FBillTypeID", FBillTypeID);
+	    	Model.put("FDATE", "2019-11-28");//业务日期(必填项)--------默认为申请日期
+	    	//往来单位类型,默认为供应商
+	    	Model.put("FCONTACTUNITTYPE", "BD_Supplier");
+	    	//往来单位(必填项)--------
+	    	Map<String,Object> FCONTACTUNIT=new HashMap<String,Object>();
+	    	FCONTACTUNIT.put("FNUMBER", "1009");
+	    	Model.put("FCONTACTUNIT", FCONTACTUNIT);
+	    	
+	    	//收款单位类型,默认为供应商
+	    	Model.put("FRECTUNITTYPE", "BD_Supplier");
+	    	//收款单位(必填项)--------
+	    	Map<String,Object> FRECTUNIT=new HashMap<String,Object>();
+	    	FRECTUNIT.put("FNUMBER", "1009");
+	    	Model.put("FRECTUNIT", FRECTUNIT);
+
+	    	//币别(必填项)--------
+	    	Map<String,Object> FCURRENCYID=new HashMap<String,Object>();
+	    	FCURRENCYID.put("FNUMBER", "IDR");
+	    	Model.put("FCURRENCYID", FCURRENCYID);
+	    	Model.put("FEXCHANGERATE", 1.0);//汇率
+	    	Model.put("FSETTLERATE", 1.0);//结算汇率
+	    	//采购部门
+	    	Map<String,Object> FPURCHASEDEPTID=new HashMap<String,Object>();
+	    	FPURCHASEDEPTID.put("FNUMBER", "BM000001");
+	    	Model.put("FPURCHASEDEPTID", FPURCHASEDEPTID);
+	    	//结算组织(必填项)----
+	    	Map<String,Object> FSETTLEORGID=new HashMap<String,Object>();
+	    	FSETTLEORGID.put("FNumber", "100");
+	    	Model.put("FSETTLEORGID", FSETTLEORGID);//结算组织(必填项)----
+	    	//采购组织
+	    	Model.put("FPURCHASEORGID", FSETTLEORGID);
+	    	//备注
+	    	Model.put("FREMARK", "备注test123");
+	    	//期望付款日期
+	    	Model.put("FBookingDate", "2019-12-12");
+	    	Model.put("FDOCUMENTSTATUS", "Z");//单据状态
+	    	Model.put("FCancelStatus", "A");//作废状态(必填项)----默认为A
+	    	//结算组织
+	    	Model.put("FPAYORGID", FSETTLEORGID);
+	    	//结算币别
+	    	Model.put("FSETTLECUR", FCURRENCYID);
+	    	//结算本位币
+	    	Model.put("FSETTLEMAINBOOKID", FCURRENCYID);
+	    	
+	    	//-----------------付款单明细 start-----------------//
+	    	List<Map<String,Object>> FPAYBILLENTRY=new ArrayList<Map<String,Object>>();
+	    	//定义一行明细
+	    	Map<String,Object> PAYBILLENTRY=new HashMap<String, Object>();
+			//结算方式
+	    	Map<String,Object> FSETTLETYPEID=new HashMap<String,Object>();
+	    	FSETTLETYPEID.put("FNUMBER", "JSFS03_SYS");
+	    	PAYBILLENTRY.put("FSETTLETYPEID", FSETTLETYPEID);
+			
+	    	//付款用途
+	    	Map<String,Object> FPURPOSEID=new HashMap<String,Object>();
+	    	FPURPOSEID.put("FNUMBER", "SFKYT08_SYS");
+	    	PAYBILLENTRY.put("FPURPOSEID", FPURPOSEID);
+	    	
+	    	PAYBILLENTRY.put("FPAYTOTALAMOUNTFOR", 88.0);//表体-应付金额
+	    	PAYBILLENTRY.put("FPAYAMOUNTFOR_E", 88.0);//付款金额
+	    	PAYBILLENTRY.put("FSETTLEPAYAMOUNTFOR", 88.0);//折后金额
+	    	PAYBILLENTRY.put("FREALPAYAMOUNTFOR_D", 88.0);//表体-实付金额
+	    	//我方银行账号
+	    	Map<String,Object> FACCOUNTID=new HashMap<String,Object>();
+	    	FACCOUNTID.put("FNUMBER", "1683066137");
+	    	PAYBILLENTRY.put("FACCOUNTID", FACCOUNTID);
+	    	
+	    	PAYBILLENTRY.put("FPAYAMOUNT_E", 88.0);//付款金额本位币
+	    	PAYBILLENTRY.put("FPOSTDATE", "2019-12-03");//登账日期
+	    	PAYBILLENTRY.put("FRuZhangType", "1");//入账类型
+	    	PAYBILLENTRY.put("FPayType", "A");//支付类型
+	    	
+	    	
+			//将MAP添加至List中
+			FPAYBILLENTRY.add(PAYBILLENTRY);
+	    	
+	    	Model.put("FPAYBILLENTRY", FPAYBILLENTRY);//
+	    	
+	    	//-----------------付款单明细 end-----------------//
+	    	
+	    	
+	    	//-----------------付款单源单明细 start-----------------//
+	    	List<Map<String,Object>> FPAYBILLSRCENTRY=new ArrayList<Map<String,Object>>();
+	    	//定义一行明细
+	    	Map<String,Object> PAYBILLSRCENTRY=new HashMap<String, Object>();
+			//源单类型
+	    	PAYBILLSRCENTRY.put("FSOURCETYPE", "AP_Payable");
+	    	//源单编号
+	    	PAYBILLSRCENTRY.put("FSRCBILLNO", "AP00000081");
+	    	//本次付款金额
+	    	PAYBILLSRCENTRY.put("FREALPAYAMOUNT_S", 88);
+	    	//应付金额
+	    	PAYBILLSRCENTRY.put("FAFTTAXTOTALAMOUNT", 100);
+	    	//计划付款金额
+	    	PAYBILLSRCENTRY.put("FPLANPAYAMOUNT", 100);
+	    	//源单币别
+	    	PAYBILLSRCENTRY.put("FSRCCURRENCYID", FCURRENCYID);
+	    	//到期日
+	    	PAYBILLSRCENTRY.put("FEXPIRY", "2019-12-01");
+	    	
+			//将MAP添加至List中
+	    	FPAYBILLSRCENTRY.add(PAYBILLSRCENTRY);
+	    	Model.put("FPAYBILLSRCENTRY", FPAYBILLSRCENTRY);//
+	    	
+	    	//-----------------付款单源单明细 end-----------------//
+	    	
+	    	
+	    	
+	    	data.put("Model", Model);
+	    	
+	    	//将MAP转JSON，fastjson默认开启引用检测将相同的对象写成引用的形式，所以必须加上SerializerFeature.DisableCircularReferenceDetect，否则转换的字符串会出现$ref
+	    	String jsonStr = JSON.toJSONString(data, SerializerFeature.DisableCircularReferenceDetect);
+	    	System.out.println(jsonStr);
+	    	//String str="{\"Model\":{\"FBUSINESSTYPE\":\"CG\",\"FBillTypeID\":{\"FNUMBER\":\"YFD01_SYS\"},\"FISINIT\":false,\"FDATE\":\"2019-11-28\",\"FENDDATE_H\":\"2019-11-28\",\"FDOCUMENTSTATUS\":\"Z\",\"FSUPPLIERID\":{\"FNumber\":\"1009\"},\"FCURRENCYID\":{\"FNumber\":\"IDR\"},\"FISPRICEEXCLUDETAX\":true,\"FISTAX\":true,\"FSETTLEORGID\":{\"FNumber\":\"100\"},\"FTaxType\":{\"FNumber\":\"Non-PKP\"},\"FPAYORGID\":{\"FNumber\":\"100\"},\"FSetAccountType\":\"1\",\"FISTAXINCOST\":false,\"FISHookMatch\":false,\"FCancelStatus\":\"A\",\"F_RTA_NPWPNumber\":\"000000000000000\",\"F_RTA_EntityType\":\"Company\",\"F_RTA_PPH_H\":{\"FNumber\":\"PPH23-4\"},\"FISBYIV\":false,\"FISGENHSADJ\":false,\"FISINVOICEARLIER\":false,\"F_RTA_VATType\":{\"FNUMBER\":\"000\"},\"F_RTA_InvoiceNo\":\"1574998101931\",\"F_RTA_CanDeductVAT\":false,\"F_RTA_PPHByComp\":true,\"F_RTA_BusinessType\":\"S\",\"F_RTA_CalculateFlag\":false,\"F_RTA_PPNByComp\":false,\"FsubHeadSuppiler\":{\"FORDERID\":{\"FNumber\":\"1009\"},\"FTRANSFERID\":{\"FNumber\":\"1009\"},\"FChargeId\":{\"FNumber\":\"1009\"}},\"FsubHeadFinc\":{\"FACCNTTIMEJUDGETIME\":\"2019-11-28\",\"FMAINBOOKSTDCURRID\":{\"FNumber\":\"IDR\"},\"FEXCHANGETYPE\":{\"FNumber\":\"HLTX01_SYS\"},\"FExchangeRate\":1.0,\"FNoTaxAmountFor\":11.0},\"FEntityDetail\":[{\"FMATERIALID\":{\"FNumber\":\"100013\"},\"FMaterialDesc\":\"ROYALTYFEE\",\"FPRICEUNITID\":{\"FNumber\":\"Pcs\"},\"FPrice\":11.0,\"FPriceQty\":1.0,\"FTaxPrice\":11.0,\"FPriceWithTax\":11.0,\"F_RTA_VATType_d\":{\"FNUMBER\":\"000\"},\"FNoTaxAmountFor_D\":11.0,\"FALLAMOUNTFOR_D\":11.0,\"F_RTA_PPH\":{\"FNUMBER\":\"PPH23-4\"},\"FINCLUDECOST\":false,\"FISOUTSTOCK\":false,\"F_RTA_FakturPajakNo_d\":\"6666666666\",\"FIsFree\":false,\"FStockUnitId\":{\"FNumber\":\"Pcs\"},\"FStockQty\":1.0,\"FStockBaseQty\":1.0,\"FPriceBaseDen\":1.0,\"FStockBaseNum\":1.0,\"F_RTA_SUPPLIER_D\":{\"FNUMBER\":\"1009\"}}],\"FEntityPlan\":[{\"FENDDATE\":\"2019-11-28\",\"FPAYAMOUNTFOR\":11.0,\"FPAYRATE\":100.0}]}}";
+	    	//String str2="{\"Model\":{\"FBUSINESSTYPE\":\"CG\",\"FBillTypeID\":{\"FNUMBER\":\"YFD01_SYS\"},\"FISINIT\":false,\"FDATE\":\"2019-11-28\",\"FENDDATE_H\":\"2019-11-28\",\"FDOCUMENTSTATUS\":\"Z\",\"FSUPPLIERID\":{\"FNUMBER\":\"1009\"},\"FCURRENCYID\":{\"FNUMBER\":\"IDR\"},\"FISPRICEEXCLUDETAX\":true,\"FISTAX\":true,\"FSETTLEORGID\":{\"FNumber\":\"100\"},\"FTaxType\":{\"FNumber\":\"Non-PKP\"},\"FPAYORGID\":{\"FNUMBER\":\"100\"},\"FSetAccountType\":\"1\",\"FISTAXINCOST\":false,\"FISHookMatch\":false,\"FCancelStatus\":\"A\",\"F_RTA_NPWPNumber\":\"000000000000000\",\"F_RTA_EntityType\":\"Company\",\"F_RTA_PPH_H\":{\"FNUMBER\":\"PPH23-4\"},\"FISBYIV\":false,\"FISGENHSADJ\":false,\"FISINVOICEARLIER\":false,\"F_RTA_VATType\":{\"FNUMBER\":\"000\"},\"F_RTA_InvoiceNo\":\"4184918116892\",\"F_RTA_CanDeductVAT\":false,\"F_RTA_PPHByComp\":true,\"F_RTA_BusinessType\":\"S\",\"F_RTA_CalculateFlag\":false,\"F_RTA_PPNByComp\":false,\"FsubHeadSuppiler\":{\"FORDERID\":{\"FNUMBER\":\"1009\"},\"FTRANSFERID\":{\"FNUMBER\":\"1009\"},\"FChargeId\":{\"FNUMBER\":\"1009\"}},\"FsubHeadFinc\":{\"FACCNTTIMEJUDGETIME\":\"2019-11-28\",\"FMAINBOOKSTDCURRID\":{\"FNUMBER\":\"IDR\"},\"FEXCHANGETYPE\":{\"FNUMBER\":\"HLTX01_SYS\"},\"FExchangeRate\":1.0,\"FNoTaxAmountFor\":11.0},\"FEntityDetail\":[{\"FMATERIALID\":{\"FNUMBER\":\"100013\"},\"FMaterialDesc\":\"ROYALTYFEE\",\"FPRICEUNITID\":{\"FNUMBER\":\"Pcs\"},\"FPrice\":11.0,\"FPriceQty\":1.0,\"FTaxPrice\":11.0,\"FPriceWithTax\":11.0,\"F_RTA_VATType_d\":{\"FNUMBER\":\"000\"},\"FNoTaxAmountFor_D\":11.0,\"FALLAMOUNTFOR_D\":11.0,\"FAUXPROPID\":{},\"FBASICUNITQTY\":1,\"FBUYIVQTY\":0,\"FINCLUDECOST\":false,\"FISOUTSTOCK\":false,\"FIVALLAMOUNTFOR\":0,\"FIsFree\":false,\"FPriceBaseDen\":1,\"FStockBaseNum\":1,\"FStockBaseQty\":1,\"FStockQty\":1,\"F_RTA_PPH\":{\"FNUMBER\":\"PPH23-4\"},\"FStockUnitId\":{\"FNUMBER\":\"Pcs\"},\"FTAXAMOUNTFOR_D\":0,\"F_RTA_EntryRemarks\":\"testtest\",\"F_RTA_FakturPajakNo_d\":\"9999999999\",\"F_RTA_SUPPLIER_D\":{\"FNUMBER\":\"1009\"}}],\"FEntityPlan\":[{\"FENDDATE\":\"2019-11-27\",\"FPAYAMOUNTFOR\":11,\"FPAYRATE\":100}]}}";
+	    	//System.out.println(str);
+	    	//调用应付单保存接口
+			String sResult = client.excuteOperation("AP_PAYBILL", "save", jsonStr);
+			System.out.println(sResult);
+			
+			//解析K3返回的JSO字符串
+			JSONObject jsonObject = JSONObject.parseObject(sResult);
+			JSONObject ResponseStatus=jsonObject.getJSONObject("Result").getJSONObject("ResponseStatus");
+			//是否成功写入K3
+			String IsSuccess=ResponseStatus.get("IsSuccess").toString();
+			System.out.println(IsSuccess);
+			if("true".equals(IsSuccess)){
+				JSONArray SuccessJSONArray=ResponseStatus.getJSONArray("SuccessEntitys");
+				String Id="";//单据ID
+				String Number="";//单据编号
+				
+				for(int p=0;p<SuccessJSONArray.size();p++){
+					Id=SuccessJSONArray.getJSONObject(p).get("Id").toString();
+					Number=SuccessJSONArray.getJSONObject(p).get("Number").toString();
+				}
+				System.out.println("Id------>"+Id+",Number------>"+Number);
+				
+			}else{
+				JSONArray ErrorsJSONArray=ResponseStatus.getJSONArray("Errors");
+				String msg="";
+				for(int p=0;p<ErrorsJSONArray.size();p++){
+					msg+=ErrorsJSONArray.getJSONObject(p).get("Message").toString();
+				}
+				System.out.println(msg);
+			}
+			
+	    }
+	}
+	
+
+}
diff --git a/src/main/youhong_ai_jitu_src/com/jet/test/AP_PayBillViewTestK3.java b/src/main/youhong_ai_jitu_src/com/jet/test/AP_PayBillViewTestK3.java
new file mode 100644
index 0000000..a4c30da
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/com/jet/test/AP_PayBillViewTestK3.java
@@ -0,0 +1,73 @@
+package com.jet.test;
+
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.serializer.SerializerFeature;
+
+import kingdee.bos.webapi.client.K3CloudApiClient; 
+
+public class AP_PayBillViewTestK3 {
+	static String K3CloudURL = "http://k3.jet.co.id:8880/K3Cloud/";
+	static String dbId = "5da41554614595";
+	static String uid = "lulu yang";
+	static String pwd = "20190716";
+	static int lang = 2052;
+	
+
+	public static void main(String[] args) {
+		// TODO Auto-generated method stub
+		try {
+			queryBD_Expense();
+		} catch (Exception e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+	}
+	
+	//供应商
+	public static void queryBD_Expense() throws Exception {
+	    K3CloudApiClient client = new K3CloudApiClient(K3CloudURL);
+	    boolean result = client.login(dbId, uid, pwd, lang);
+	    if (result) {
+	    	//调用应付单保存接口
+			String sResult = client.excuteOperation("AP_PAYBILL", "view", "{\"CreateOrgId\":0,\"Number\":\"FKD00000055\",\"Id\":\"\"}");
+			System.out.println(sResult);
+			
+			//解析K3返回的JSO字符串
+			JSONObject jsonObject = JSONObject.parseObject(sResult);
+			JSONObject ResponseStatus=jsonObject.getJSONObject("Result").getJSONObject("ResponseStatus");
+			//是否成功写入K3
+			String IsSuccess=ResponseStatus.get("IsSuccess").toString();
+			System.out.println(IsSuccess);
+			if("true".equals(IsSuccess)){
+				JSONArray SuccessJSONArray=ResponseStatus.getJSONArray("SuccessEntitys");
+				String Id="";//单据ID
+				String Number="";//单据编号
+				
+				for(int p=0;p<SuccessJSONArray.size();p++){
+					Id=SuccessJSONArray.getJSONObject(p).get("Id").toString();
+					Number=SuccessJSONArray.getJSONObject(p).get("Number").toString();
+				}
+				System.out.println("Id------>"+Id+",Number------>"+Number);
+				
+			}else{
+				JSONArray ErrorsJSONArray=ResponseStatus.getJSONArray("Errors");
+				String msg="";
+				for(int p=0;p<ErrorsJSONArray.size();p++){
+					msg+=ErrorsJSONArray.getJSONObject(p).get("Message").toString();
+				}
+				System.out.println(msg);
+			}
+			
+	    }
+	}
+	
+
+}
diff --git a/src/main/youhong_ai_jitu_src/com/jet/test/AP_PayablePushTestK3.java b/src/main/youhong_ai_jitu_src/com/jet/test/AP_PayablePushTestK3.java
new file mode 100644
index 0000000..8363fab
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/com/jet/test/AP_PayablePushTestK3.java
@@ -0,0 +1,99 @@
+package com.jet.test;
+
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.serializer.SerializerFeature;
+
+import kingdee.bos.webapi.client.K3CloudApiClient; 
+
+public class AP_PayablePushTestK3 {
+	static String K3CloudURL = "http://k3.jet.co.id:8880/K3Cloud/";
+	static String dbId = "5da41554614595";
+	static String uid = "lulu yang";
+	static String pwd = "20190716";
+	static int lang = 2052;
+	
+
+	public static void main(String[] args) {
+		// TODO Auto-generated method stub
+		try {
+			queryBD_Expense();
+		} catch (Exception e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+	}
+	
+	//供应商
+	public static void queryBD_Expense() throws Exception {
+	    K3CloudApiClient client = new K3CloudApiClient(K3CloudURL);
+	    boolean result = client.login(dbId, uid, pwd, lang);
+	    if (result) {
+	    	Map<String,Object> data=new HashMap<String,Object>();
+	    	Map<String,Object> Model=new HashMap<String,Object>();
+	    	List<Map<String,Object>> FPAYBILLENTRY=new ArrayList<Map<String,Object>>();
+	    	//定义一行明细
+	    	Map<String,Object> PAYBILLENTRY=new HashMap<String, Object>();
+			//结算方式
+	    	Map<String,Object> FSETTLETYPEID=new HashMap<String,Object>();
+	    	FSETTLETYPEID.put("FNUMBER", "JSFS03_SYS");
+	    	PAYBILLENTRY.put("FSETTLETYPEID", FSETTLETYPEID);
+	    	//将MAP添加至List中
+			FPAYBILLENTRY.add(PAYBILLENTRY);
+	    	Model.put("FPAYBILLENTRY", FPAYBILLENTRY);//
+	    	
+	    	data.put("Model", Model);
+	    	
+	    	//将MAP转JSON，fastjson默认开启引用检测将相同的对象写成引用的形式，所以必须加上SerializerFeature.DisableCircularReferenceDetect，否则转换的字符串会出现$ref
+	    	String str = JSON.toJSONString(data, SerializerFeature.DisableCircularReferenceDetect);
+	    	System.out.println(str);
+	    	
+	    	//传入的JSON格式
+	    	String jsonStr="{\"Ids\": \"\",\"Numbers\": \"AP00022976\",\"EntryIds\": \"\",\"RuleId\": \"AP_PayableToPayBill\",\"TargetBillTypeId\": \"\",\"TargetOrgId\": 0,\"TargetFormId\": \"\",\"IsEnableDefaultRule\": \"false\",\"IsDraftWhenSaveFail\": \"false\",\"CustomParams\": "+str+"}";
+	    	System.out.println(jsonStr);
+	    	//调用应付单保存接口
+			String sResult = client.excuteOperation("AP_Payable", "push", jsonStr);
+			System.out.println(sResult);
+			
+			//解析K3返回的JSO字符串
+			JSONObject jsonObject = JSONObject.parseObject(sResult);
+			JSONObject ResponseStatus=jsonObject.getJSONObject("Result").getJSONObject("ResponseStatus");
+			//是否成功写入K3
+			String IsSuccess=ResponseStatus.get("IsSuccess").toString();
+			System.out.println(IsSuccess);
+			if("true".equals(IsSuccess)){
+				JSONArray SuccessJSONArray=ResponseStatus.getJSONArray("SuccessEntitys");
+				String Id="";//单据ID
+				String Number="";//单据编号
+				
+				
+				for(int p=0;p<SuccessJSONArray.size();p++){
+					Id=SuccessJSONArray.getJSONObject(p).get("Id").toString();
+					Number=SuccessJSONArray.getJSONObject(p).get("Number").toString();
+				}
+				System.out.println("Id------>"+Id+",Number------>"+Number);
+//				String jsonStr2="{\"CreateOrgId\":0,\"Numbers\":[],\"Ids\":\""+Id+"\",\"SelectedPostId\":0}";
+//				//调用应付单提交接口(将单据状态由创建--->审核中)
+//				String sResult2 = client.excuteOperation("AP_Payable", "submit", jsonStr2);
+//				System.out.println(sResult2);
+				
+			}else{
+				JSONArray ErrorsJSONArray=ResponseStatus.getJSONArray("Errors");
+				String msg="";
+				for(int p=0;p<ErrorsJSONArray.size();p++){
+					msg+=ErrorsJSONArray.getJSONObject(p).get("Message").toString();
+				}
+				System.out.println(msg);
+			}
+			
+	    }
+	}
+
+}
diff --git a/src/main/youhong_ai_jitu_src/com/jet/test/AP_PayableSaveTestK3.java b/src/main/youhong_ai_jitu_src/com/jet/test/AP_PayableSaveTestK3.java
new file mode 100644
index 0000000..4737aa2
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/com/jet/test/AP_PayableSaveTestK3.java
@@ -0,0 +1,390 @@
+package com.jet.test;
+
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.serializer.SerializerFeature;
+
+import kingdee.bos.webapi.client.K3CloudApiClient; 
+
+public class AP_PayableSaveTestK3 {
+	static String K3CloudURL = "http://k3.jet.co.id:8880/K3Cloud/";
+	static String dbId = "5f33b66059caeb";
+	static String uid = "lulu yang";
+	static String pwd = "123456";
+	static int lang = 2052;
+	
+
+	public static void main(String[] args) {
+		// TODO Auto-generated method stub
+		try {
+			queryBD_Expense();
+		} catch (Exception e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+	}
+	
+	//供应商
+	public static void queryBD_Expense() throws Exception {
+	    K3CloudApiClient client = new K3CloudApiClient(K3CloudURL);
+	    boolean result = client.login(dbId, uid, pwd, lang);
+	    if (result) {
+	    	//传入的JSON格式
+	    	//String data="";
+	    	
+	    	Map<String,Object> data=new HashMap<String,Object>();
+//	    	data.put("Creator", "");
+//	    	data.put("NeedUpDateFields", new String[0]);
+//	    	data.put("NeedReturnFields", new String[0]);
+//	    	data.put("IsDeleteEntry", "true");
+//	    	data.put("SubSystemId", "");
+//	    	data.put("IsVerifyBaseDataField", "false");
+//	    	data.put("IsEntryBatchFill", "true");
+//	    	data.put("ValidateFlag", "true");
+//	    	data.put("NumberSearch", "true");
+//	    	data.put("InterationFlags", "");
+//	    	data.put("IsAutoSubmitAndAudit", "false");
+	    	
+	    	Map<String,Object> Model=new HashMap<String,Object>();
+	    	//Model.put("FID", "0");//实体主键
+	    	//单据类型(必填项)--------默认为标准应付单YFD01_SYS
+	    	Map<String,Object> FBillTypeID=new HashMap<String,Object>();
+	    	FBillTypeID.put("FNUMBER", "YFD01_SYS");
+	    	Model.put("FBillTypeID", FBillTypeID);
+	    	
+	    	//Model.put("FBillNo", "");//单据编号--------K3动生成
+	    	Model.put("FISINIT", false);//是否期初单据
+	    	Model.put("FDATE", "2019-11-28");//业务日期(必填项)--------默认为申请日期
+	    	Model.put("FENDDATE_H", "2019-11-28");//到期日(必填项)--------
+	    	Model.put("FDOCUMENTSTATUS", "Z");//单据状态
+	    	
+	    	//供应商(必填项)--------
+	    	Map<String,Object> FSUPPLIERID=new HashMap<String,Object>();
+	    	FSUPPLIERID.put("FNUMBER", "1009");
+	    	Model.put("FSUPPLIERID", FSUPPLIERID);
+	    	
+	    	//币别(必填项)--------
+	    	Map<String,Object> FCURRENCYID=new HashMap<String,Object>();
+	    	FCURRENCYID.put("FNUMBER", "IDR");
+	    	Model.put("FCURRENCYID", FCURRENCYID);
+	    	
+	    	Model.put("FISPRICEEXCLUDETAX", true);//价外税
+	    	Model.put("FBUSINESSTYPE", "CG");//业务类型(必填项)----默认为CG
+	    	Model.put("FISTAX", true);//按含税单价录入----
+	    	
+	    	//结算组织(必填项)----
+	    	Map<String,Object> FSETTLEORGID=new HashMap<String,Object>();
+	    	FSETTLEORGID.put("FNumber", "100");
+	    	Model.put("FSETTLEORGID", FSETTLEORGID);//结算组织(必填项)----
+	    	
+	    	//税分类----//根据供应商自动带出
+//	    	Map<String,Object> FTaxType=new HashMap<String,Object>();
+//	    	FTaxType.put("FNumber", "Non-PKP");
+//	    	Model.put("FTaxType", FTaxType);
+	    	
+	    	//付款组织(必填项)----
+	    	Map<String,Object> FPAYORGID=new HashMap<String,Object>();
+	    	FPAYORGID.put("FNUMBER", "100");
+	    	Model.put("FPAYORGID", FPAYORGID);
+
+	    	//Model.put("FSetAccountType", "1");//立账类型----默认为1
+//	    	Model.put("FISTAXINCOST", false);//税额计入成本
+//	    	Model.put("FISHookMatch", false);//参与暂估应付核销
+	    	Model.put("FCancelStatus", "A");//作废状态(必填项)----默认为A
+	    	
+	    	//Model.put("F_RTA_NPWPNumber", "000000000000000");//NPWP Number----//根据供应商自动带出
+	    	//Model.put("F_RTA_EntityType", "Company");//Entity Type----//根据供应商自动带出
+	    	
+	    	//PPH----
+//	    	Map<String,Object> F_RTA_PPH_H=new HashMap<String,Object>();
+//	    	F_RTA_PPH_H.put("FNUMBER", "PPH23-4");
+//	    	Model.put("F_RTA_PPH_H", F_RTA_PPH_H);
+	    	
+//	    	Model.put("FISBYIV", false);//是发票审核自动生成
+//	    	Model.put("FISGENHSADJ", false);//是否需要成本调整
+	    	//Model.put("FMatchMethodID", 0);//核销方式
+//	    	Model.put("FISINVOICEARLIER", false);//先到票后入库
+	    	
+//	    	Map<String,Object> F_RTA_VATType=new HashMap<String,Object>();
+//	    	F_RTA_VATType.put("FNUMBER", "000");
+//	    	Model.put("F_RTA_VATType", F_RTA_VATType);//PPN Type
+	    	
+	    	Model.put("F_RTA_InvoiceNo", System.currentTimeMillis()+"");//Invoice No(必填项)----
+	    	//Model.put("F_RTA_CanDeductVAT", false);//可否抵扣增值税选项
+	    	//Model.put("FBILLMATCHLOGID", 0);//开票核销记录序号
+	    	//Model.put("F_RTA_PPHByComp", true);//PPH By Company
+	    	Model.put("F_RTA_BusinessType", "S");//business type(必填项)----默认为服务类
+	    	//Model.put("F_RTA_CalculateFlag", false);//PPH21已计算标识
+	    	//Model.put("F_RTA_PPNByComp", false);//PPN By Company
+	    	
+	    	
+	    	//-----------------表头供应商 start-----------------//
+	    	Map<String,Object> FsubHeadSuppiler=new HashMap<String,Object>();
+	    	//FsubHeadSuppiler.put("FEntryId", 0);//实体主键
+	    	FsubHeadSuppiler.put("FORDERID", FSUPPLIERID);//订货方
+	    	FsubHeadSuppiler.put("FTRANSFERID", FSUPPLIERID);//供货方
+	    	FsubHeadSuppiler.put("FChargeId", FSUPPLIERID);//收款方
+	    	
+	    	Model.put("FsubHeadSuppiler", FsubHeadSuppiler);//
+	    	//-----------------表头供应商 end-----------------//
+	    	
+	    	
+	    	
+	    	//付款条件----
+//	    	Map<String,Object> FPayConditon=new HashMap<String,Object>();
+//	    	FPayConditon.put("FNUMBER", "FKTJ01_SYS");
+//	    	Model.put("FPayConditon", FPayConditon);
+//	    	
+//	    	
+//	    	Model.put("FSourceBillType", "");//源单类型----
+//	    	
+//	    	
+	    	Model.put("FAP_Remark", "test测试");//备注----
+//	    	
+//	    	//Model.put("FACCOUNTSYSTEM", "{\"FNUMBER\":\"\"}");//会计核算体系
+//
+//	    	//采购部门----
+//	    	Map<String,Object> FPURCHASEDEPTID=new HashMap<String,Object>();
+//	    	FPURCHASEDEPTID.put("FNUMBER", "BM000009");
+//	    	Model.put("FPURCHASEDEPTID", FPURCHASEDEPTID);
+//	    	
+//	    	//采购组----
+//	    	Map<String,Object> FPURCHASERGROUPID=new HashMap<String,Object>();
+//	    	FPURCHASERGROUPID.put("FNUMBER", "");
+//	    	Model.put("FPURCHASERGROUPID", FPURCHASERGROUPID);
+//	    	
+//	    	//采购员----
+//	    	Map<String,Object> FPURCHASERID=new HashMap<String,Object>();
+//	    	FPURCHASERID.put("FNUMBER", "");
+//	    	Model.put("FPURCHASERID", FPURCHASERID);
+//	    	
+//	    	
+//	    	Model.put("F_RTA_Isclerka", "");//Is Staff----//根据供应商自动带出
+	    	
+	    	
+	    	
+	    	
+	    	//Model.put("FScanPoint", "{\"FNUMBER\":\"\"}");//扫描点
+	    	//Model.put("F_RTA_DPwithPPN", "A1");//Down Payment with PPN(必填项)----
+	    	
+	    	
+	    	
+	    	
+	    	//-----------------表头财务 start-----------------//
+	    	Map<String,Object> FsubHeadFinc=new HashMap<String,Object>();
+	    	//FsubHeadFinc.put("FEntryId", 0);//实体主键
+	    	FsubHeadFinc.put("FACCNTTIMEJUDGETIME", "2019-11-28");//到期日计算日期(必填项)----
+	    	
+	    	//结算方式
+	    	Map<String,Object> FSettleTypeID=new HashMap<String,Object>();
+	    	FSettleTypeID.put("FNUMBER", "JSFS03_SYS");
+	    	FsubHeadFinc.put("FSettleTypeID", FSettleTypeID);
+	    	//本位币
+	    	FsubHeadFinc.put("FMAINBOOKSTDCURRID", FCURRENCYID);
+	    	//汇率类型
+//	    	Map<String,Object> FEXCHANGETYPE=new HashMap<String,Object>();
+//	    	FEXCHANGETYPE.put("FNUMBER", "HLTX01_SYS");
+//	    	FsubHeadFinc.put("FEXCHANGETYPE", FEXCHANGETYPE);//
+//	    	FsubHeadFinc.put("FExchangeRate", 1.0);//汇率
+	    	//FsubHeadFinc.put("FTaxAmountFor", 2276.0);//税额
+	    	//FsubHeadFinc.put("FNoTaxAmountFor", 11.0);//不含税金额
+	    	
+	    	Model.put("FsubHeadFinc", FsubHeadFinc);//
+	    	//-----------------表头财务 end-----------------//
+	    	
+	    	
+	    	//-----------------明细 start-----------------//
+	    	List<Map<String,Object>> FEntityDetail=new ArrayList<Map<String,Object>>();
+	    	//定义一行明细
+	    	Map<String,Object> EntityDetail=new HashMap<String, Object>();
+			//EntityDetail.put("FEntryId", 0);//实体主键
+			//EntityDetail.put("FCOSTID", "{\"FNUMBER\":\"\"}");//费用项目编码
+			//物料编码
+	    	Map<String,Object> FMATERIALID=new HashMap<String,Object>();
+	    	FMATERIALID.put("FNUMBER", "100013");
+			EntityDetail.put("FMATERIALID", FMATERIALID);
+			//EntityDetail.put("FMaterialDesc", "ROYALTY FEE");//物料说明
+			
+			EntityDetail.put("F_RTA_EntryRemarks", "testtest");//备 注
+			
+			//EntityDetail.put("FASSETID", "{\"FNUMBER\":\"\"}");//卡片编码
+			//计价单位
+	    	Map<String,Object> FPRICEUNITID=new HashMap<String,Object>();
+	    	FPRICEUNITID.put("FNUMBER", "Pcs");
+			EntityDetail.put("FPRICEUNITID", FPRICEUNITID);
+			
+			EntityDetail.put("FPrice", 11.0);//单价
+			EntityDetail.put("FPriceQty", 1.0);//计价数量
+			//EntityDetail.put("FBASICUNITQTY", 1);//计价基本数量
+			EntityDetail.put("FTaxPrice", 11.0);//含税单价
+			//EntityDetail.put("F_RTA_PPHAmount", 3035);//PPH Amount
+			EntityDetail.put("FPriceWithTax", 11);//含税净价
+			
+			//PPN Type
+	    	Map<String,Object> F_RTA_VATType_d=new HashMap<String,Object>();
+	    	F_RTA_VATType_d.put("FNUMBER", "000");
+			EntityDetail.put("F_RTA_VATType_d", F_RTA_VATType_d);
+			
+			//EntityDetail.put("FEntryTaxRate", 0);//税率(%)
+			//EntityDetail.put("FTaxCombination", "{\"FNUMBER\":\"\"}");//税组合
+			//EntityDetail.put("FEntryDiscountRate", 0);//折扣率(%)
+			//EntityDetail.put("FDISCOUNTAMOUNTFOR", 0);//折扣额
+			EntityDetail.put("FNoTaxAmountFor_D", 11.0);//不含税金额
+			EntityDetail.put("FTAXAMOUNTFOR_D", 0);//税额
+			EntityDetail.put("FALLAMOUNTFOR_D", 11.0);//价税合计
+			
+			//PPH-------------
+//	    	Map<String,Object> F_RTA_PPH=new HashMap<String,Object>();
+//	    	F_RTA_PPH.put("FNUMBER", "PPH23-4");
+//			EntityDetail.put("F_RTA_PPH", F_RTA_PPH);
+			
+			//EntityDetail.put("FINCLUDECOST", false);//计入成本
+			//EntityDetail.put("FOUTSTOCKID", "[{\"FNUMBER\":\"\"}]");//出库单号
+			//EntityDetail.put("FAUXPROPID", new HashMap<String, Object>());//辅助属性
+			//EntityDetail.put("FBUYIVQTY", 0);//采购发票数量
+			//EntityDetail.put("FIVALLAMOUNTFOR", 0);//采购发票价税合计
+			//EntityDetail.put("FISOUTSTOCK", false);//是否有出库单号
+			EntityDetail.put("F_RTA_FakturPajakNo_d", "-");//Faktur Pajak No
+			//EntityDetail.put("FIsFree", false);//是否赠品
+			//EntityDetail.put("FStockUnitId", FPRICEUNITID);//库存单位
+			
+			
+			//EntityDetail.put("FCOSTDEPARTMENTID", "{\"FNUMBER\":\"\"}");//费用承担部门
+			//EntityDetail.put("FLot", "{\"FNUMBER\":\"\"}");//批号
+//			EntityDetail.put("FMONUMBER", "");//生产订单编号
+//			EntityDetail.put("FMOENTRYSEQ", 0);//生产订单行号
+//			EntityDetail.put("FOPNO", "");//工序计划号
+//			EntityDetail.put("FSEQNUMBER", "");//序列号
+//			EntityDetail.put("FOPERNUMBER", 0);//工序号
+			//EntityDetail.put("FPROCESSID", "{\"FNUMBER\":\"\"}");//作业
+			//EntityDetail.put("FFPRODEPARTMENTID", "{\"FNUMBER\":\"\"}");//生产车间
+//			EntityDetail.put("FWWINTYPE", "");//入库类型
+			
+			
+			
+//			EntityDetail.put("FStockQty", 1);//库存数量
+//			EntityDetail.put("FStockBaseQty", 1);//库存基本数量
+//			EntityDetail.put("FPriceBaseDen", 1);//计价基本分母
+//			EntityDetail.put("FStockBaseNum", 1);//库存基本分子
+			//EntityDetail.put("FOrderEntryID", 0);//采购订单明细内码
+			//EntityDetail.put("FORDERENTRYSEQ", 0);//采购订单行号
+			//EntityDetail.put("FBUYIVINIQTY", 0);//采购发票数量期初
+			//EntityDetail.put("FBUYIVINIBASICQTY", 0);//采购发票基本单位数量期初
+			//EntityDetail.put("FIVINIALLAMOUNTFOR", 0);//采购发票价税合计期初
+			//EntityDetail.put("FPushRedQty", 0);//已下推负数财务应付数量
+			EntityDetail.put("F_RTA_SUPPLIER_D", FSUPPLIERID);//表体供应商(用于校验税票号唯一)
+			//EntityDetail.put("F_RTA_AccumulatedAmount", 0);//累计金额
+			//EntityDetail.put("FSRCROWID", 0);//源单行内码
+			//EntityDetail.put("F_RTA_AccumulatedPPH21", 0);//累计PPH21税额
+			//EntityDetail.put("F_RTA_PPHAmountM", 0);//PPH Amount（本位币）
+			
+			//-----------------税务明细 start-----------------//
+//	    	List<Map<String,Object>> FTaxDetailSubEntity=new ArrayList<Map<String,Object>>();
+//	    	Map<String,Object> FTax=new HashMap<String,Object>();
+//	    	FTax.put("FDetailID", 0);//实体主键
+//	    	//FTax.put("FTaxRateId", "{\"FNUMBER\":\"\"}");//税率名称
+//	    	FTax.put("FTaxRate", 0);//税率(%)
+//	    	FTax.put("FTaxAmount_T", 0);//税额
+//	    	FTax.put("FCostPercent", 0);//计入成本比例
+//	    	FTax.put("FCostAmount", 0);//计入成本金额
+//	    	FTax.put("FVAT", "false");//增值税
+//	    	FTax.put("FSellerWithholding", "false");//卖方代扣代缴
+//	    	FTax.put("FBuyerWithholding", "false");//买方代扣代缴
+//	    	
+//	    	FTaxDetailSubEntity.add(FTax);
+//	    	EntityDetail.put("FTaxDetailSubEntity", FTaxDetailSubEntity);//
+	    	//-----------------税务明细 end-----------------//
+			//将MAP添加至List中
+	    	FEntityDetail.add(EntityDetail);
+	    	//EntityDetail.clear();//清空继续循环----------
+	    	
+	    	Model.put("FEntityDetail", FEntityDetail);//
+	    	
+	    	//-----------------明细 end-----------------//
+	    	
+	    	
+	    	//-----------------付款计划 start-----------------//
+	    	List<Map<String,Object>> FEntityPlan=new ArrayList<Map<String,Object>>();
+	    	Map<String,Object> FPlan=new HashMap<String,Object>();
+	    	//FPlan.put("FEntryID", 0);//实体主键
+	    	FPlan.put("FENDDATE", "2019-11-27");//表头计划 - 到期日
+	    	FPlan.put("FPAYAMOUNTFOR", 11.0);//应付金额
+	    	//FPlan.put("FPAYAMOUNT", 11);//应付金额
+	    	FPlan.put("FPAYRATE", 100);//应付比例(%)
+//	    	FPlan.put("FPURCHASEORDERID", 0);//采购订单ID
+//	    	FPlan.put("FPAYABLEENTRYID", 0);//采购订单明细内码
+	    	
+	    	//物料编码
+//	    	Map<String,Object> FMATERIALID_P=new HashMap<String,Object>();
+//	    	FMATERIALID_P.put("FNUMBER", "2-07.01");
+//	    	FPlan.put("FMATERIALID_P", FMATERIALID_P);
+//	    	FPlan.put("FPRICEUNITID_P", FPRICEUNITID);//计价单位
+//	    	FPlan.put("FPRICE_P", 11);//含税单价
+//	    	FPlan.put("FQTY_P", 1);//数量
+//	    	FPlan.put("FPURCHASEORDERNO", "");//采购订单号
+//	    	FPlan.put("FMATERIALSEQ", 0);//订单行号
+//	    	FPlan.put("FRELATEHADPAYQTY", 1);//付(退)款关联数量
+	    	FEntityPlan.add(FPlan);
+	    	//FPlan.clear();
+	    	Model.put("FEntityPlan", FEntityPlan);//
+	    	//-----------------付款计划 end-----------------//
+	    	
+	    	data.put("Model", Model);
+	    	
+	    	//将MAP转JSON，fastjson默认开启引用检测将相同的对象写成引用的形式，所以必须加上SerializerFeature.DisableCircularReferenceDetect，否则转换的字符串会出现$ref
+	    	String jsonStr = JSON.toJSONString(data, SerializerFeature.DisableCircularReferenceDetect);
+	    	System.out.println(jsonStr);
+	    	
+	    	//MAP转JSON
+	    	//JSONObject json = new JSONObject(data);
+	    	//System.out.println(json.toJSONString());
+	    	
+	    	String str="{\"Model\": {\"FBillTypeID\": {\"FNUMBER\": \"YFD01_SYS\"},\"FISINIT\": false,\"FDATE\": \"2020-08-26\",\"FENDDATE_H\": \"2020-08-26\",\"FDOCUMENTSTATUS\": \"Z\",\"FSUPPLIERID\": {\"FNUMBER\": \"1160\"},\"FCURRENCYID\": {\"FNUMBER\": \"IDR\"},\"FISPRICEEXCLUDETAX\": true,\"FBUSINESSTYPE\": \"CG\",\"FISTAX\": true,\"FSETTLEORGID\": {\"FNumber\": \"100\"},\"FPURCHASEDEPTID\": {\"FNUMBER\": \"BM000002\"},\"FPAYORGID\": {\"FNUMBER\": \"100\"},\"F_RTA_VATType\": {\"FNUMBER\": \"II-6\"},\"FCancelStatus\": \"A\",\"F_RTA_InvoiceNo\": \"TEST\",\"F_RTA_BusinessType\": \"S\",\"FAP_Remark\": \"TEST\",\"F_RTA_PPHByComp\": false,\"FsubHeadSuppiler\": {\"FORDERID\": {\"FNUMBER\": \"1160\"},\"FTRANSFERID\": {\"FNUMBER\": \"1160\"},\"FChargeId\": {\"FNUMBER\": \"1160\"}},\"FsubHeadFinc\": {\"FACCNTTIMEJUDGETIME\": \"2020-08-19\",\"FSettleTypeID\": {\"FNUMBER\": \"JSFS03_SYS\"},\"FMAINBOOKSTDCURRID\": {\"FNUMBER\": \"IDR\"}},\"FEntityDetail\": [{\"FMATERIALID\": {\"FNUMBER\": \"100013\"},\"F_RTA_EntryRemarks\": \"TEST\",\"FPRICEUNITID\": {\"FNUMBER\": \"Pcs\"},\"FPrice\": \"1000000.00\",\"FPriceQty\": 1.0,\"FTaxPrice\": \"1100000.00\",\"FTAXAMOUNTFOR_D\": \"100000.00\",\"FPriceWithTax\": \"1000000.00\",\"F_RTA_VATType_d\": {\"FNUMBER\": \"II-6\"},\"FNoTaxAmountFor_D\": \"1000000.00\",\"FTAXAMOUNTFOR_D\": 0,\"FALLAMOUNTFOR_D\": \"1000000.00\",\"F_RTA_FakturPajakNo_d\": \"-\",\"F_RTA_SUPPLIER_D\": {\"FNUMBER\": \"1160\"}}],\"FEntityPlan\": [{\"FENDDATE\": \"2020-08-19\",\"FPAYAMOUNTFOR\": \"1000000.00\",\"FPAYRATE\": 100}]}}";
+	    	//String str2="{\"Model\":{\"FBUSINESSTYPE\":\"CG\",\"FBillTypeID\":{\"FNUMBER\":\"YFD01_SYS\"},\"FISINIT\":false,\"FDATE\":\"2019-11-28\",\"FENDDATE_H\":\"2019-11-28\",\"FDOCUMENTSTATUS\":\"Z\",\"FSUPPLIERID\":{\"FNUMBER\":\"1009\"},\"FCURRENCYID\":{\"FNUMBER\":\"IDR\"},\"FISPRICEEXCLUDETAX\":true,\"FISTAX\":true,\"FSETTLEORGID\":{\"FNumber\":\"100\"},\"FTaxType\":{\"FNumber\":\"Non-PKP\"},\"FPAYORGID\":{\"FNUMBER\":\"100\"},\"FSetAccountType\":\"1\",\"FISTAXINCOST\":false,\"FISHookMatch\":false,\"FCancelStatus\":\"A\",\"F_RTA_NPWPNumber\":\"000000000000000\",\"F_RTA_EntityType\":\"Company\",\"F_RTA_PPH_H\":{\"FNUMBER\":\"PPH23-4\"},\"FISBYIV\":false,\"FISGENHSADJ\":false,\"FISINVOICEARLIER\":false,\"F_RTA_VATType\":{\"FNUMBER\":\"000\"},\"F_RTA_InvoiceNo\":\"4184918116892\",\"F_RTA_CanDeductVAT\":false,\"F_RTA_PPHByComp\":true,\"F_RTA_BusinessType\":\"S\",\"F_RTA_CalculateFlag\":false,\"F_RTA_PPNByComp\":false,\"FsubHeadSuppiler\":{\"FORDERID\":{\"FNUMBER\":\"1009\"},\"FTRANSFERID\":{\"FNUMBER\":\"1009\"},\"FChargeId\":{\"FNUMBER\":\"1009\"}},\"FsubHeadFinc\":{\"FACCNTTIMEJUDGETIME\":\"2019-11-28\",\"FMAINBOOKSTDCURRID\":{\"FNUMBER\":\"IDR\"},\"FEXCHANGETYPE\":{\"FNUMBER\":\"HLTX01_SYS\"},\"FExchangeRate\":1.0,\"FNoTaxAmountFor\":11.0},\"FEntityDetail\":[{\"FMATERIALID\":{\"FNUMBER\":\"100013\"},\"FMaterialDesc\":\"ROYALTYFEE\",\"FPRICEUNITID\":{\"FNUMBER\":\"Pcs\"},\"FPrice\":11.0,\"FPriceQty\":1.0,\"FTaxPrice\":11.0,\"FPriceWithTax\":11.0,\"F_RTA_VATType_d\":{\"FNUMBER\":\"000\"},\"FNoTaxAmountFor_D\":11.0,\"FALLAMOUNTFOR_D\":11.0,\"FAUXPROPID\":{},\"FBASICUNITQTY\":1,\"FBUYIVQTY\":0,\"FINCLUDECOST\":false,\"FISOUTSTOCK\":false,\"FIVALLAMOUNTFOR\":0,\"FIsFree\":false,\"FPriceBaseDen\":1,\"FStockBaseNum\":1,\"FStockBaseQty\":1,\"FStockQty\":1,\"F_RTA_PPH\":{\"FNUMBER\":\"PPH23-4\"},\"FStockUnitId\":{\"FNUMBER\":\"Pcs\"},\"FTAXAMOUNTFOR_D\":0,\"F_RTA_EntryRemarks\":\"testtest\",\"F_RTA_FakturPajakNo_d\":\"9999999999\",\"F_RTA_SUPPLIER_D\":{\"FNUMBER\":\"1009\"}}],\"FEntityPlan\":[{\"FENDDATE\":\"2019-11-27\",\"FPAYAMOUNTFOR\":11,\"FPAYRATE\":100}]}}";
+	    	//System.out.println(str);
+	    	//调用应付单保存接口
+			String sResult = client.excuteOperation("AP_Payable", "save", str);
+			System.out.println(sResult);
+			
+			//解析K3返回的JSO字符串
+			JSONObject jsonObject = JSONObject.parseObject(sResult);
+			JSONObject ResponseStatus=jsonObject.getJSONObject("Result").getJSONObject("ResponseStatus");
+			//是否成功写入K3
+			String IsSuccess=ResponseStatus.get("IsSuccess").toString();
+			System.out.println(IsSuccess);
+			if("true".equals(IsSuccess)){
+				JSONArray SuccessJSONArray=ResponseStatus.getJSONArray("SuccessEntitys");
+				String Id="";//单据ID
+				String Number="";//单据编号
+				
+				for(int p=0;p<SuccessJSONArray.size();p++){
+					Id=SuccessJSONArray.getJSONObject(p).get("Id").toString();
+					Number=SuccessJSONArray.getJSONObject(p).get("Number").toString();
+				}
+				System.out.println("Id------>"+Id+",Number------>"+Number);
+//				String jsonStr2="{\"CreateOrgId\":0,\"Numbers\":[],\"Ids\":\""+Id+"\",\"SelectedPostId\":0}";
+//				//调用应付单提交接口(将单据状态由创建--->审核中)
+//				String sResult2 = client.excuteOperation("AP_Payable", "submit", jsonStr2);
+//				System.out.println(sResult2);
+				
+			}else{
+				JSONArray ErrorsJSONArray=ResponseStatus.getJSONArray("Errors");
+				String msg="";
+				for(int p=0;p<ErrorsJSONArray.size();p++){
+					msg+=ErrorsJSONArray.getJSONObject(p).get("Message").toString();
+				}
+				System.out.println(msg);
+			}
+			
+	    }
+	}
+	
+
+}
diff --git a/src/main/youhong_ai_jitu_src/com/jet/test/BD_SupplierTestK3.java b/src/main/youhong_ai_jitu_src/com/jet/test/BD_SupplierTestK3.java
new file mode 100644
index 0000000..6243ca6
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/com/jet/test/BD_SupplierTestK3.java
@@ -0,0 +1,72 @@
+package com.jet.test;
+
+
+import java.util.List;
+
+import weaver.general.Util;
+
+
+import kingdee.bos.webapi.client.K3CloudApiClient; 
+
+public class BD_SupplierTestK3 {
+	static String K3CloudURL = "http://k3.jet.co.id:8880/K3Cloud/";
+	static String dbId = "5f33b66059caeb";
+	static String uid = "lulu yang";
+	static String pwd = "123456";
+	static int lang = 2052;
+
+	public static void main(String[] args) {
+		// TODO Auto-generated method stub
+		try {
+			queryBD_Expense();
+		} catch (Exception e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+	}
+	
+	//供应商
+	public static void queryBD_Expense() throws Exception {
+	    K3CloudApiClient client = new K3CloudApiClient(K3CloudURL);
+	    boolean result = client.login(dbId, uid, pwd, lang);
+	    if (result) {
+	    	String sContent = "{\"FormId\":\"BD_Supplier\","
+	                // 供应商formid
+	                +"\"TopRowCount\":0,"
+	                // 最多允许查询的数量，0或者不要此属性表示不限制
+	                +"\"Limit\":100,"
+	                // 分页取数每页允许获取的数据，最大不能超过2000
+	                +"\"StartRow\":0,"
+	                //分页取数开始行索引，从0开始，例如每页10行数据，第2页开始是10，第3页开始是20
+	                //""FilterString":"FMaterialId.FNumber like 'HG_TEST%'","+// 过滤条件
+	                //""FilterString":"FBillNo='CGDD000008'","+// 过滤条件
+	                +"\"FilterString\":\"FNumber!='' and FDocumentStatus='C'\"," //过滤条件 编码不为空值
+	                //+"\"OrderString\":\"FGoodsNO ASC\","// 排序条件
+	                //获取供应商基础信息 组织ID、内码、名称、编码、银行账号、账户名称、开户银行
+	                +"\"FieldKeys\":\"FUseOrgId,FSupplierId,FName,FNumber,FBankCode,FBankHolder,FOpenBankName,FForbidStatus,FDocumentStatus,F_RTA_VATType.FNumber,FTaxRateId.FNumber\"}";
+	       
+	    	List<List<Object>> sResult = client.executeBillQuery(sContent);
+	    	int rows=sResult.size();
+	    	for(int k=0;k<rows;k++){
+				String FUseOrgId=Util.null2String(sResult.get(k).get(0));//组织ID
+				String FSupplierId=Util.null2String(sResult.get(k).get(1));//供应商内码
+				String FName=Util.null2String(sResult.get(k).get(2));//供应商名称
+				String FNumber=Util.null2String(sResult.get(k).get(3));//供应商编码
+				String FBankCode=Util.null2String(sResult.get(k).get(4));//银行账号
+				String FBankHolder=Util.null2String(sResult.get(k).get(5));//账户名称
+				String FOpenBankName=Util.null2String(sResult.get(k).get(6));//开户银行
+				String FForbidStatus=Util.null2String(sResult.get(k).get(7));//禁用状态
+				String FDocumentStatus=Util.null2String(sResult.get(k).get(8));//数据状态（D重新审核  B审核中  C已审核）
+				String F_RTA_VATType=Util.null2String(sResult.get(k).get(9));//PPN Type
+				String FTaxRateId=Util.null2String(sResult.get(k).get(10));//默认税率
+				if(!"A".equals(FForbidStatus)){
+					System.out.println("FName----->"+FName+";FNumber----->"+FNumber+";FForbidStatus----->"+FForbidStatus);
+				}
+				System.out.println("F_RTA_VATType----->"+F_RTA_VATType+";FTaxRateId----->"+FTaxRateId+";FForbidStatus----->"+FForbidStatus);
+				
+	    	}
+	    }
+	}
+	
+
+}
diff --git a/src/main/youhong_ai_jitu_src/com/jet/test/CN_BankAcntTestK3.java b/src/main/youhong_ai_jitu_src/com/jet/test/CN_BankAcntTestK3.java
new file mode 100644
index 0000000..d0ebaa1
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/com/jet/test/CN_BankAcntTestK3.java
@@ -0,0 +1,64 @@
+package com.jet.test;
+
+
+import java.util.List;
+
+import weaver.general.Util;
+
+
+import kingdee.bos.webapi.client.K3CloudApiClient; 
+
+public class CN_BankAcntTestK3 {
+	static String K3CloudURL = "http://k3.jet.co.id:8880/K3Cloud/";
+	static String dbId = "5da41554614595";
+	static String uid = "lulu yang";
+	static String pwd = "20190716";
+	static int lang = 2052;
+	
+
+	public static void main(String[] args) {
+		// TODO Auto-generated method stub
+		try {
+			queryBD_Expense();
+		} catch (Exception e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+	}
+	
+	//供应商
+	public static void queryBD_Expense() throws Exception {
+	    K3CloudApiClient client = new K3CloudApiClient(K3CloudURL);
+	    boolean result = client.login(dbId, uid, pwd, lang);
+	    if (result) {
+	    	String sContent = "{\"FormId\":\"CN_BANKACNT\","
+	                // 供应商formid
+	                +"\"TopRowCount\":0,"
+	                // 最多允许查询的数量，0或者不要此属性表示不限制
+	                +"\"Limit\":2000,"
+	                // 分页取数每页允许获取的数据，最大不能超过2000
+	                +"\"StartRow\":0,"
+	                //分页取数开始行索引，从0开始，例如每页10行数据，第2页开始是10，第3页开始是20
+	                //""FilterString":"FMaterialId.FNumber like 'HG_TEST%'","+// 过滤条件
+	                //""FilterString":"FBillNo='CGDD000008'","+// 过滤条件
+	                +"\"FilterString\":\"FNumber!=''\"," //过滤条件 编码不为空值
+	                //+"\"OrderString\":\"FGoodsNO ASC\","// 排序条件
+	                //获取供应商基础信息 组织ID、内码、名称、编码、银行账号、账户名称、开户银行
+	                +"\"FieldKeys\":\"FUseOrgId,FBANKACNTID,FName,FNumber,FBANKID\"}";
+	       
+	    	List<List<Object>> sResult = client.executeBillQuery(sContent);
+	    	int rows=sResult.size();
+	    	for(int k=0;k<rows;k++){
+				String FUseOrgId=Util.null2String(sResult.get(k).get(0));//组织ID
+				String FBANKACNTID=Util.null2String(sResult.get(k).get(1));//供应商内码
+				String FName=Util.null2String(sResult.get(k).get(2));//供应商名称
+				String FNumber=Util.null2String(sResult.get(k).get(3));//供应商编码
+				String FBANKID=Util.null2String(sResult.get(k).get(4));//银行账号
+				System.out.println("FBANKACNTID----->"+FBANKACNTID+";FName----->"+FName+";FNumber----->"+FNumber+";FBANKID----->"+FBANKID);
+				
+	    	}
+	    }
+	}
+	
+
+}
diff --git a/src/main/youhong_ai_jitu_src/com/jet/test/DBSSO_Test.java b/src/main/youhong_ai_jitu_src/com/jet/test/DBSSO_Test.java
new file mode 100644
index 0000000..bd8f7f4
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/com/jet/test/DBSSO_Test.java
@@ -0,0 +1,15 @@
+package com.jet.test;
+
+import org.apache.commons.codec.digest.DigestUtils;
+
+import com.jet.util.JwtUtil;
+
+public class DBSSO_Test {
+
+	public static void main(String[] args) {
+		String aa= DigestUtils.shaHex("782ZfF谢莹1603935541292");
+		System.out.println("aa------->"+aa);
+		String token=JwtUtil.createSsoToken("00001304","TPFKAGB3QGPM2LBD","DPQY6CN2UT",36000).getToken();
+		System.out.println("token------->"+token);
+	}
+}
diff --git a/src/main/youhong_ai_jitu_src/com/jet/test/Decode_Encode.java b/src/main/youhong_ai_jitu_src/com/jet/test/Decode_Encode.java
new file mode 100644
index 0000000..fff8dba
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/com/jet/test/Decode_Encode.java
@@ -0,0 +1,19 @@
+package com.jet.test;
+
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+public class Decode_Encode {
+
+	
+	public static void main(String[] args) {
+		String pcurlsrc="/openDoc?title=Suhana%25E7%259A%2584%25E8%25AF%25B7%25E5%2581%2587%25E5%258D%2595%2528JT20191121000001%25EF%25BC%2589&templateId=1122317121229303809&workId=1197361606271516673";
+		try {
+			String s=URLDecoder.decode(pcurlsrc,"UTF-8");
+			System.out.println(s);
+		} catch (UnsupportedEncodingException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		
+	}
+}
diff --git a/src/main/youhong_ai_jitu_src/com/jet/test/Test.java b/src/main/youhong_ai_jitu_src/com/jet/test/Test.java
new file mode 100644
index 0000000..02e2587
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/com/jet/test/Test.java
@@ -0,0 +1,43 @@
+package com.jet.test;
+
+import java.text.DecimalFormat;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import com.alibaba.fastjson.JSONObject;
+
+public class Test {
+
+	/**
+	 * @param args
+	 */
+	public static void main(String[] args) {
+		double te=88888888888.00;
+		DecimalFormat   df   =     new   DecimalFormat( "###############0.00 ");//   16位整数位，两小数位 
+		String   temp     =   df.format(te); 
+		System.out.println(temp);
+		// TODO Auto-generated method stub
+		Map<String,Object> data=new HashMap<String,Object>();
+		List<Map<String,Object>> Model=new ArrayList<Map<String,Object>>();
+		Map<String,Object> map1=new HashMap<String, Object>();
+		Map<String,Object> map2=new HashMap<String, Object>();
+		
+		map1.put("A", "test1");
+		map1.put("B", "test2");
+		
+		map2.put("C", "test3");
+		map2.put("D", "test4");
+		
+		Model.add(map1);
+		Model.add(map2);
+		
+		data.put("Model", Model);
+		//MAP转JSON
+    	JSONObject json = new JSONObject(data);
+    	
+    	System.out.println(json.toJSONString());
+	}
+
+}
diff --git a/src/main/youhong_ai_jitu_src/com/jet/util/BaseUtil.java b/src/main/youhong_ai_jitu_src/com/jet/util/BaseUtil.java
new file mode 100644
index 0000000..82b86a9
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/com/jet/util/BaseUtil.java
@@ -0,0 +1,30 @@
+package com.jet.util;
+
+import weaver.conn.RecordSet;
+import weaver.general.Util;
+
+public class BaseUtil {
+	public static String getFormidId(String workflowid){
+    	StringBuffer lSQL = new StringBuffer();
+    	lSQL.append(" SELECT formid FROM workflow_base WHERE id='"+workflowid+"' ");
+    	RecordSet rs = new RecordSet();
+    	rs.execute(lSQL.toString());
+    	String formid="0";
+    	if(rs.next()){
+    		formid=Util.null2String(rs.getString("formid"));
+    		formid=Math.abs(Integer.parseInt(formid))+"";
+    	}
+    	return formid;
+    }
+    	public static String getWorkflowId(String requestid){
+    	StringBuffer lSQL = new StringBuffer();
+    	lSQL.append(" SELECT workflowid FROM workflow_requestbase WHERE requestid='"+requestid+"' ");
+    	RecordSet rs = new RecordSet();
+    	rs.execute(lSQL.toString());
+    	String workflowid="";
+    	if(rs.next()){
+    		workflowid=Util.null2String(rs.getString("workflowid"));
+    	}
+    	return workflowid;
+    }
+}
diff --git a/src/main/youhong_ai_jitu_src/com/jet/util/InvokeHelper.java b/src/main/youhong_ai_jitu_src/com/jet/util/InvokeHelper.java
new file mode 100644
index 0000000..881a8fb
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/com/jet/util/InvokeHelper.java
@@ -0,0 +1,226 @@
+package com.jet.util;
+import java.io.BufferedReader;
+import java.io.DataOutputStream;
+import java.io.InputStreamReader;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+import org.apache.log4j.Logger;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import org.json.JSONArray;
+import org.json.JSONObject;
+
+public class InvokeHelper {
+
+        // K3 Cloud WebSite URL Example "http://192.168.19.113/K3Cloud/"
+        public static String POST_K3CloudURL = "http://k3.jet.co.id:8880/k3cloud/";
+
+        // Cookie 值
+        private static String CookieVal = null;
+
+        private static Map map = new HashMap();
+        static {
+                map.put("Save",
+                                "Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Save.common.kdsvc");
+                map.put("View",
+                                "Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.View.common.kdsvc");
+                map.put("Submit",
+                                "Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Submit.common.kdsvc");
+                map.put("Audit",
+                                "Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Audit.common.kdsvc");
+                map.put("UnAudit",
+                                "Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.UnAudit.common.kdsvc");
+                map.put("StatusConvert",
+                                "Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.StatusConvert.common.kdsvc");
+        }
+
+        // HttpURLConnection
+        private static HttpURLConnection initUrlConn(String url, JSONArray paras)
+                        throws Exception {
+        	System.out.println(POST_K3CloudURL.concat(url));
+                URL postUrl = new URL(POST_K3CloudURL.concat(url));
+                HttpURLConnection connection = (HttpURLConnection) postUrl
+                                .openConnection();
+                if (CookieVal != null) {
+                        connection.setRequestProperty("Cookie", CookieVal);
+                }
+                if (!connection.getDoOutput()) {
+                        connection.setDoOutput(true);
+                }
+                connection.setRequestMethod("POST");
+                connection.setUseCaches(false);
+                connection.setInstanceFollowRedirects(true);
+                connection.setRequestProperty("Content-Type", "application/json");
+                DataOutputStream out = new DataOutputStream(
+                                connection.getOutputStream());
+
+                UUID uuid = UUID.randomUUID();
+                int hashCode = uuid.toString().hashCode();
+
+                JSONObject jObj = new JSONObject();
+
+                jObj.put("format", 1);
+                jObj.put("useragent", "ApiClient");
+                jObj.put("rid", hashCode);
+                jObj.put("parameters", chinaToUnicode(paras.toString()));
+                jObj.put("timestamp", new Date().toString());
+                jObj.put("v", "1.0");
+
+                out.writeBytes(jObj.toString());
+                out.flush();
+                out.close();
+
+                return connection;
+        }
+
+        // Login
+        public static boolean Login(String dbId, String user, String pwd, int lang)
+                        throws Exception {
+
+                boolean bResult = false;
+
+                String sUrl = "Kingdee.BOS.WebApi.ServicesStub.AuthService.ValidateUser.common.kdsvc";
+
+                JSONArray jParas = new JSONArray();
+                jParas.put(dbId);// 帐套Id
+                jParas.put(user);// 用户名
+                jParas.put(pwd);// 密码
+                jParas.put(lang);// 语言
+
+                HttpURLConnection connection = initUrlConn(sUrl, jParas);
+                // 获取Cookie
+                String key = null;
+                for (int i = 1; (key = connection.getHeaderFieldKey(i)) != null; i++) {
+                        if (key.equalsIgnoreCase("Set-Cookie")) {
+                                String tempCookieVal = connection.getHeaderField(i);
+                                if (tempCookieVal.startsWith("kdservice-sessionid")) {
+                                        CookieVal = tempCookieVal;
+                                        break;
+                                }
+                        }
+                }
+
+                BufferedReader reader = new BufferedReader(new InputStreamReader(
+                                connection.getInputStream()));
+                String line;
+                System.out.println(" ============================= ");
+                System.out.println(" Contents of post request ");
+                System.out.println(" ============================= ");
+                while ((line = reader.readLine()) != null) {
+                        String sResult = new String(line.getBytes());
+                        System.out.println(sResult);
+                        bResult = line.contains("\"LoginResultType\":1");
+                }
+                System.out.println(" ============================= ");
+                System.out.println(" Contents of post request ends ");
+                System.out.println(" ============================= ");
+                reader.close();
+
+                connection.disconnect();
+
+                return bResult;
+        }
+
+        // Save
+        public static JSONObject Save(String formId, String content) throws Exception {
+        	    JSONObject JSONObject=Invoke("Save", formId, content);
+        	  return JSONObject;
+        }
+
+        // View
+        public static void View(String formId, String content) throws Exception {
+                Invoke("View", formId, content);
+        }
+
+        // Submit
+        public static void Submit(String formId, String content) throws Exception {
+                Invoke("Submit", formId, content);
+        }
+
+        // Audit
+        public static void Audit(String formId, String content) throws Exception {
+                Invoke("Audit", formId, content);
+        }
+
+        // UnAudit
+        public static void UnAudit(String formId, String content) throws Exception {
+                Invoke("UnAudit", formId, content);
+        }
+
+        // StatusConvert
+        public static void StatusConvert(String formId, String content)
+                        throws Exception {
+                Invoke("StatusConvert", formId, content);
+        }
+
+        private static JSONObject Invoke(String deal, String formId, String content)
+        throws Exception {
+        	Logger log = Logger.getLogger(JSONObject.class);
+JSONObject json=new JSONObject();
+boolean flag=false;
+BufferedReader reader =null;
+HttpURLConnection connectionInvoke =null;
+String sResult="";
+try{
+String sUrl = map.get(deal).toString();
+JSONArray jParas = new JSONArray();
+jParas.put(formId);
+jParas.put(content);
+
+ connectionInvoke = initUrlConn(sUrl, jParas);
+
+ reader = new BufferedReader(new InputStreamReader(
+                connectionInvoke.getInputStream()));
+
+String line;
+System.out.println(" ============================= ");
+System.out.println(" Contents of post request ");
+System.out.println(" ============================= ");
+while ((line = reader.readLine()) != null) {
+         sResult = new String(line.getBytes(), "utf-8");
+        System.out.println(sResult);
+        log.error("sResult--"+sResult);
+}
+
+System.out.println(" ============================= ");
+System.out.println(" Contents of post request ends ");
+System.out.println(" ============================= ");
+flag=true;
+reader.close();
+connectionInvoke.disconnect();
+
+}catch(Exception e){
+	sResult=e.getMessage();
+	reader.close();
+    connectionInvoke.disconnect();
+}
+json.put("flag", flag);
+json.put("sResult", sResult);
+return json;
+}
+
+
+        /**
+         * 把中文转成Unicode码
+         * 
+         * @param str
+         * @return
+         */
+        public static String chinaToUnicode(String str) {
+                String result = "";
+                for (int i = 0; i < str.length(); i++) {
+                        int chr1 = (char) str.charAt(i);
+                        if (chr1 >= 19968 && chr1 <= 171941) {// 汉字范围 \u4e00-\u9fa5 (中文)
+                                result += "\\u" + Integer.toHexString(chr1);
+                        } else {
+                                result += str.charAt(i);
+                        }
+                }
+                return result;
+        }
+}
\ No newline at end of file
diff --git a/src/main/youhong_ai_jitu_src/com/jet/util/JwtSsoTokenResult.java b/src/main/youhong_ai_jitu_src/com/jet/util/JwtSsoTokenResult.java
new file mode 100644
index 0000000..95abe25
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/com/jet/util/JwtSsoTokenResult.java
@@ -0,0 +1,23 @@
+package com.jet.util;
+
+public class JwtSsoTokenResult {
+
+    public JwtSsoTokenResult(String token){
+     this.token = token;
+    }
+
+    private String token;
+    private Long expires = 7200L;
+
+    public String getToken(){
+        return token;
+    }
+
+    public Long getExpires(){
+        return expires;
+    }
+
+    public Boolean IsSuccess(){
+        return token != null;
+    }
+}
diff --git a/src/main/youhong_ai_jitu_src/com/jet/util/JwtUtil.java b/src/main/youhong_ai_jitu_src/com/jet/util/JwtUtil.java
new file mode 100644
index 0000000..7b8ba9e
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/com/jet/util/JwtUtil.java
@@ -0,0 +1,53 @@
+package com.jet.util;
+
+import com.auth0.jwt.JWT;
+import com.auth0.jwt.algorithms.Algorithm;
+import com.auth0.jwt.exceptions.JWTCreationException;
+
+import java.io.UnsupportedEncodingException;
+import java.util.*;
+
+public class JwtUtil {
+	
+	/**
+	 * 简单Sso登录
+	 *
+	 * @param account:工号
+	 * @param clientId：客户端ID
+	 * @param secret：秘钥
+	 * @param second：有效时长
+	 * @return
+	 */
+	public static JwtSsoTokenResult createSsoToken(String account, String clientId, String secret, int second) {
+		try {
+			Algorithm algorithm = Algorithm.HMAC256(secret);
+			Map<String, Object> map = new HashMap<String, Object>();
+			
+			map.put("alg", "HS256");
+			map.put("typ", "JWT");
+			Date nowDate = new Date();
+			Calendar cal = new GregorianCalendar();
+			cal.setTime(nowDate);
+			cal.add(Calendar.SECOND, second);
+			Date expireDate = cal.getTime();
+			String token = JWT.create()
+					               .withHeader(map)
+					               .withClaim("uid", account)
+					               .withClaim("clientId", clientId)
+					               .withIssuer("DbSsoServer")
+					               .withSubject("DbSso_AccessToken")
+					               .withAudience("Web")
+					               .withIssuedAt(nowDate)
+					               .withExpiresAt(expireDate)
+					               .sign(algorithm);
+			return new JwtSsoTokenResult(token);
+			
+		} catch (JWTCreationException exception) {
+			exception.printStackTrace();
+		} catch (UnsupportedEncodingException e) {
+			throw new RuntimeException(e);
+		}
+		return new JwtSsoTokenResult(null);
+	}
+	
+}
diff --git a/src/main/youhong_ai_jitu_src/com/working/link/RequestLink.java b/src/main/youhong_ai_jitu_src/com/working/link/RequestLink.java
new file mode 100644
index 0000000..0efb304
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/com/working/link/RequestLink.java
@@ -0,0 +1,16 @@
+package com.working.link;
+
+import javax.servlet.http.HttpServletRequest;
+
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.jsp.JspWriter;
+
+import weaver.hrm.User;
+import weaver.soa.workflow.request.RequestInfo;
+
+public interface RequestLink {
+	
+	public abstract  Object ExecuteRequest(HttpServletRequest request,HttpServletResponse  response,
+			User user,JspWriter out,RequestInfo requestinfo,StringBuffer sb)  throws Exception;
+	
+}
diff --git a/src/main/youhong_ai_jitu_src/com/working/schedule/SynDeptOrSubCom.java b/src/main/youhong_ai_jitu_src/com/working/schedule/SynDeptOrSubCom.java
new file mode 100644
index 0000000..bda1350
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/com/working/schedule/SynDeptOrSubCom.java
@@ -0,0 +1,159 @@
+package com.working.schedule;
+
+import com.working.util.LogTool;
+
+import weaver.conn.RecordSet;
+import weaver.general.Util;
+import weaver.interfaces.schedule.BaseCronJob;
+
+/**
+ * 第一次初始化是同步部门或者分部信息
+ * @author lwt
+ *
+ */
+public class SynDeptOrSubCom extends BaseCronJob{
+	
+	public void execute() {
+		LogTool log = new LogTool("/log/working/",false);
+		log.writeLog("同步部门或分部信息开始.");
+		RecordSet rs = new RecordSet();
+		RecordSet rs1 = new RecordSet();
+		RecordSet rs2 = new RecordSet();
+		RecordSet rs3 = new RecordSet();
+		String name = "";//组织名称
+		String code = "";//组织编码
+		String type = "";//组织类型
+		String supId = "";//上级组织id
+		String supName = "";//上级组织名称
+		String datasourType = rs.getDBType();
+		log.writeLog("datasourType="+datasourType);
+		if ("oracle".equals(datasourType)) {
+			rs.executeQuery("select * from uf_dept_subcom order by length(code) asc");
+		} else if ("sqlserver".equals(datasourType)) {
+			rs.executeQuery("select * from uf_dept_subcom order by len(code) asc");
+		}
+		while (rs.next()) {
+			name = Util.null2String(rs.getString("NAME"));
+			code = Util.null2String(rs.getString("CODE"));
+			type = Util.null2String(rs.getString("TYPE"));
+			supName = Util.null2String(rs.getString("SUP_NAME"));
+			if ("oracle".equals(datasourType)) {
+				if (name.indexOf("&")!=-1) {//包含&
+					name = name.replaceAll("&", "'||chr(38)||'");
+				}
+				if (supName.indexOf("&")!=-1) {//包含&
+					supName = supName.replaceAll("&", "'||chr(38)||'");
+				}
+				log.writeLog("name="+name+";supName="+supName);
+			}
+			if ("0".equals(type)) {//分部
+				//先查询上级分部的id
+				rs1.execute("select * from hrmsubcompany where subcompanyname like '%"+supName+"%'");
+				log.writeLog("sql1="+"select * from hrmsubcompany where subcompanyname like '%"+supName+"%'");
+				while (rs1.next()) {
+					supId = Util.null2String(rs1.getInt("ID"));
+					rs2.executeQuery("select * from hrmsubcompany where subcompanyname like '%"+name+"%' and supsubcomid = " + supId);
+					log.writeLog("sql2="+"select * from hrmsubcompany where subcompanyname like '%"+name+"%' and supsubcomid = " + supId);
+					while (rs2.next()) {
+						log.writeLog("sql3="+"update hrmsubcompany set subcompanycode = '"+code+"' where subcompanyname like '%"
+							+name+"%' and supsubcomid = "+supId);
+						rs3.executeQuery("update hrmsubcompany set subcompanycode = '"+code+"' where subcompanyname like '%"
+							+name+"%' and supsubcomid = "+supId);
+					}
+				}
+			} else if ("1".equals(type)) {//部门
+				if (code.length()==4) {//表示是jnt-->部门
+					//先查询上级分部的id
+					rs1.executeQuery("select * from hrmsubcompany where subcompanycode = ?", code.substring(0, 2));
+					while (rs1.next()) {
+						supId = Util.null2String(rs1.getInt("ID"));
+						log.writeLog("sql2="+"select * from hrmdepartment where departmentname like '%"+name+"%' and subcompanyid1 = "+ supId);
+						rs2.executeQuery("select * from hrmdepartment where departmentname like '%"+name+"%' and subcompanyid1 = "+ supId);
+						while (rs2.next()) {
+							log.writeLog("sql3="+"update hrmdepartment set departmentcode = '"+code+"' where departmentname like '%"
+									+name+"%' and subcompanyid1 = "+supId);
+							rs3.executeQuery("update hrmdepartment set departmentcode = '"+code+"' where departmentname like '%"
+									+name+"%' and subcompanyid1 = "+supId);
+						}
+					}
+				} else if (code.length()==6) {//表示是分部-->部门
+					//先查询上级分部的id
+					rs1.executeQuery("select * from hrmsubcompany where subcompanycode = ?", code.substring(0, 4));
+					while (rs1.next()) {
+						supId = Util.null2String(rs1.getInt("ID"));
+						log.writeLog("sql2="+"select * from hrmdepartment where departmentname like '%"+name+"%' and subcompanyid1 = "+ supId);
+						rs2.executeQuery("select * from hrmdepartment where departmentname like '%"+name+"%' and subcompanyid1 = "+ supId);
+						while (rs2.next()) {
+							log.writeLog("sql3="+"update hrmdepartment set departmentcode = '"+code+"' where departmentname like '%"
+									+name+"%' and subcompanyid1 = "+supId);
+							rs3.executeQuery("update hrmdepartment set departmentcode = '"+code+"' where departmentname like '%"
+									+name+"%' and subcompanyid1 = "+supId);
+						}
+					}
+				} else if (code.length()==8) {//表示是分部-->部门-->部门
+					//先查询上级部门的id
+					rs1.executeQuery("select * from hrmdepartment where departmentcode = ?", code.substring(0, 6));
+					while (rs1.next()) {
+						supId = Util.null2String(rs1.getInt("ID"));
+						log.writeLog("sql2="+"select * from hrmdepartment where departmentname like '%"+name+"%' and supdepid = "+supId);
+						rs2.executeQuery("select * from hrmdepartment where departmentname like '%"+name+"%' and supdepid = "+supId);
+						while (rs2.next()) {
+							log.writeLog("sql3="+"update hrmdepartment set departmentcode = '"+code+"' where departmentname like '%"
+									+name+"%' and supdepid = "+supId);
+							rs3.executeQuery("update hrmdepartment set departmentcode = '"+code+"' where departmentname like '%"
+									+name+"%' and supdepid = "+supId);
+						}
+					}
+				} else if (code.length()==10) {//表示是分部-->分部-->部门
+					//先查询上级分部的id
+					rs1.executeQuery("select * from hrmsubcompany where subcompanycode = ?", code.substring(0, 8));
+					while (rs1.next()) {
+						supId = Util.null2String(rs1.getInt("ID"));
+						log.writeLog("sql2="+"select * from hrmdepartment where departmentname like '%"+name+"%' and subcompanyid1 = "+ supId);
+						rs2.executeQuery("select * from hrmdepartment where departmentname like '%"+name+"%' and subcompanyid1 = "+ supId);
+						while (rs2.next()) {
+							log.writeLog("sql3="+"update hrmdepartment set departmentcode = '"+code+"' where departmentname like '%"
+								+name+"%' and subcompanyid1 = "+supId);
+							rs3.executeQuery("update hrmdepartment set departmentcode = '"+code+"' where departmentname like '%"
+								+name+"%' and subcompanyid1 = "+supId);
+						}
+					}
+					//再查询上级部门的id
+					rs1.executeQuery("select * from hrmdepartment where departmentcode = ?", code.substring(0, 8));
+					while (rs1.next()) {
+						supId = Util.null2String(rs1.getInt("ID"));
+						log.writeLog("sql2="+"select * from hrmdepartment where departmentname like '%"+name+"%' and supdepid = "+ supId);
+						rs2.executeQuery("select * from hrmdepartment where departmentname like '%"+name+"%' and supdepid = "+ supId);
+						while (rs2.next()) {
+							log.writeLog("sql3="+"update hrmdepartment set departmentcode = '"+code+"' where departmentname like '%"
+								+name+"%' and supdepid = "+supId);
+							rs3.executeQuery("update hrmdepartment set departmentcode = '"+code+"' where departmentname like '%"
+								+name+"%' and supdepid = "+supId);
+						}
+					}
+				} else if (code.length()==12) {//表示分部-->分部-->部门-->部门
+					//先查询上级部门的id
+					rs1.executeQuery("select * from hrmdepartment where departmentcode = ?", code.substring(0, 10));
+					while (rs1.next()) {
+						supId = Util.null2String(rs1.getInt("ID"));
+						log.writeLog("sql2="+"select * from hrmdepartment where departmentname like '%"+name+"%' and supdepid = "+ supId);
+						rs2.executeQuery("select * from hrmdepartment where departmentname like '%"+name+"%' and supdepid = "+ supId);
+						while (rs2.next()) {
+							log.writeLog("sql3="+"update hrmdepartment set departmentcode = '"+code+"' where departmentname like '%"
+									+name+"%' and supdepid = "+supId);
+							rs3.executeQuery("update hrmdepartment set departmentcode = '"+code+"' where departmentname like '%"
+									+name+"%' and supdepid = "+supId);
+						}
+					}
+				}
+			}
+		}
+		log.writeLog("同步部门或分部信息结束.");
+	}
+	
+}
+
+
+
+
+
diff --git a/src/main/youhong_ai_jitu_src/com/working/schedule/SynScheduleSignDatas.java b/src/main/youhong_ai_jitu_src/com/working/schedule/SynScheduleSignDatas.java
new file mode 100644
index 0000000..d08958b
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/com/working/schedule/SynScheduleSignDatas.java
@@ -0,0 +1,193 @@
+package com.working.schedule;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.commons.httpclient.HttpException;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.serializer.SerializerFeature;
+
+import weaver.file.Prop;
+
+import com.working.third.JwtUtil;
+import com.working.util.HttpManager;
+import com.working.util.LogTool;
+import com.working.util.WorkflowUtil;
+
+import weaver.conn.RecordSet;
+import weaver.general.Util;
+import weaver.interfaces.schedule.BaseCronJob;
+
+/**
+ * 查询人员移动端考勤信息,并同步更新到东宝系统
+ * @author lwt
+ *
+ */
+public class SynScheduleSignDatas extends BaseCronJob{
+	
+	public void execute() {
+		LogTool log = new LogTool("/log/working/schedule",false);
+		String clientId = Prop.getPropValue("db_work","clientId");
+		String secret = Prop.getPropValue("db_work","secret");
+		Integer second = Integer.valueOf(Prop.getPropValue("db_work","second"));
+		String code = Prop.getPropValue("db_work","code");
+		String moduleCode = Prop.getPropValue("db_work","moduleCode");
+		String batchCardDataUrl = Prop.getPropValue("db_work","batchCardDataUrl");
+		log.writeLog("同步人员移动端考勤信息更新到东宝系统开始.clientId="+clientId+";secret="+secret+";second="+second
+			+";code="+code+";moduleCode="+moduleCode+";batchCardDataUrl="+batchCardDataUrl);
+		String token = JwtUtil.createThirdToken(clientId,secret,second).getToken();
+		Map<String,String> dataMap = new HashMap<String,String>();//保存数据id和员工编号的集合
+		Map headMap = new HashMap();
+		headMap.put("code",code);
+		headMap.put("moduleCode",moduleCode);
+		headMap.put("token",token);
+		headMap.put("clientId",clientId);
+		Map bodyMap2 = new HashMap();
+		Map bodyMap3 = new HashMap();
+		List list = new ArrayList();//存储打卡数据
+		List idList = new ArrayList();//存储数据id
+		
+		RecordSet rs = new RecordSet();
+		RecordSet rs1 = new RecordSet();
+		String id = "";//签到id
+		String workCode = "";//人员编号
+		String userId = "";//签到人id
+		String signDate = "";//签到日期
+		String signTime = "";//签到时间
+		String longitude = "";//经度
+		String latitude = "";//纬度
+		String address = "";//地址
+		String remark = "";//签到备注
+		//查询考勤数据
+		String datasource = rs.getDBType();
+		log.writeLog("datasource="+datasource);
+		if ("oracle".equals(datasource)) {
+			rs.execute("select * from hrmschedulesign where syn_flag != 2 order by signdate desc");
+		} else if ("sqlserver".equals(datasource)) {
+			rs.execute("select * from hrmschedulesign where syn_flag != 2 order by signdate desc");
+		}
+		//取到考勤数据,调用同步接口
+		while (rs.next()) {
+			Map bodyMap = new HashMap();
+			Map bodyMap1 = new HashMap();
+			id = Util.null2String(rs.getInt("ID"));
+			idList.add(id);
+			userId = Util.null2String(rs.getString("USERID"));
+			workCode = Util.null2String(WorkflowUtil.getUserInfo(userId).get("workcode"));
+			dataMap.put(id, workCode);
+			signDate = Util.null2String(rs.getString("SIGNDATE"));
+			signTime = Util.null2String(rs.getString("SIGNTIME"));
+			longitude = Util.null2String(rs.getString("LONGITUDE"));
+			latitude = Util.null2String(rs.getString("LATITUDE"));
+			address = Util.null2String(rs.getString("ADDR"));
+			remark = Util.null2String(rs.getString("REMARK"));
+//			log.writeLog("id="+id+";workCode="+workCode+";userId="+userId+";signDate="+signDate+";signTime="+signTime
+//				+";longitude="+longitude+";latitude="+latitude+";address="+address);
+			bodyMap.put("cardTime", signDate + " " +signTime);
+			bodyMap.put("dataSource", "8");
+			bodyMap.put("signPlace", address);
+			bodyMap.put("status", "1");
+			bodyMap.put("longitude", longitude);
+			bodyMap.put("latitude", latitude);
+			bodyMap.put("describe", remark);
+			bodyMap.put("timeZone", "GMT+8");
+			bodyMap1.put("empRule","1");
+			bodyMap1.put("empKey",workCode);
+			bodyMap1.put("cardData",bodyMap);
+			//存储所有数据在集合中
+			list.add(bodyMap1);
+		}
+//		bodyMap2.put("empOrders", list);
+		bodyMap3.put("header",headMap);
+		bodyMap3.put("body",bodyMap2);
+		try {
+			if (list.size()>0) {
+				//循环次数,每次传输1000条数据
+				int num = list.size()/1000+1;
+				for (int i=0;i<=num;i++) {
+					//初始化传输的list
+					List listSign = new ArrayList();
+					List listSignId = new ArrayList();
+					for (int j=i*1000;j<(i+1)*1000;j++) {
+						if (j>=list.size()) {//超出list的下标,跳出循环
+							break;
+						}
+						listSign.add(list.get(j));
+						listSignId.add(idList.get(j));
+					}
+					if (listSign.size() ==0) {
+						continue;
+					} else {
+						bodyMap2.put("empOrders", listSign);
+					}
+					String param = JSON.toJSONString(bodyMap3,SerializerFeature.DisableCircularReferenceDetect);
+//					log.writeLog("param="+param);
+					String result = HttpManager.postMap(batchCardDataUrl,headMap,param);
+					log.writeLog("result="+result);
+					//解析返回值result
+					JSONObject jsonObject = new JSONObject();
+					//解析JOSN
+					jsonObject = JSONObject.parseObject(result);
+					String returnCode = Util.null2String(jsonObject.get("code"));
+					String data = Util.null2String(jsonObject.get("data"));
+					if ("200".equals(returnCode)) {//同步成功(可能存在部分数据失败)
+						//先全部更新为同步成功
+						log.writeLog("sql1="+"update hrmschedulesign set syn_flag = 2 where id in ("+listSignId.toString().replace("[", "'").replace("]", "'").replace(",", "','")+")");
+						rs1.execute("update hrmschedulesign set syn_flag = 2 where id in ("+listSignId.toString().replace("[", "'").replace("]", "'").replace(",", "','")+")");
+						if (!data.isEmpty()) {//有更新失败的
+							//解析返回值data
+							JSONObject dataObject = new JSONObject();
+							dataObject = JSONObject.parseObject(data);
+							String key = "";//返回的错误的数据的员工编号
+							String mapKey = "";//保存map的key
+							String mapValue = "";//保存map的value
+							Iterator<String> dataIterator = dataObject.keySet().iterator();
+							Iterator<String> dataMapIter = dataMap.keySet().iterator();
+							while (dataIterator.hasNext()) {
+								// 获得key 
+								key = dataIterator.next(); 
+								while (dataMapIter.hasNext()) {
+									mapKey = dataMapIter.next();
+									mapValue = dataMap.get(mapKey);
+									if (key.equals(mapValue)) {
+										//更新为同步失败
+										rs1.executeQuery("update hrmschedulesign set syn_flag = 1 where id = ?", mapKey);
+									}
+								}
+							}
+						}
+					} else {//同步异常,更新这批数据为同步失败
+						rs1.executeQuery("update hrmschedulesign set syn_flag = 1 where id in (?)", listSignId.toString().replace("[", "'").replace("]", "'").replace(",", "','"));
+					}
+				}
+			} else {
+				log.writeLog("此次查询无符合数据!");
+			}
+		} catch (HttpException e) {
+			// TODO Auto-generated catch block
+			log.writeLog("HttpException="+e.toString());
+			e.printStackTrace();
+		} catch (IOException e) {
+			// TODO Auto-generated catch block
+			log.writeLog("IOException="+e.toString());
+			e.printStackTrace();
+		} catch (Exception e) {
+			log.writeLog("Exception="+e.toString());
+			e.printStackTrace();
+		}
+		
+		log.writeLog("同步人员移动端考勤信息更新到东宝系统结束.");
+	}
+	
+}
+
+
+
+
+
diff --git a/src/main/youhong_ai_jitu_src/com/working/schedule/SynSignDatas.java b/src/main/youhong_ai_jitu_src/com/working/schedule/SynSignDatas.java
new file mode 100644
index 0000000..811b77e
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/com/working/schedule/SynSignDatas.java
@@ -0,0 +1,193 @@
+package com.working.schedule;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.commons.httpclient.HttpException;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.serializer.SerializerFeature;
+
+import weaver.file.Prop;
+
+import com.working.third.JwtUtil;
+import com.working.util.HttpManager;
+import com.working.util.LogTool;
+import com.working.util.WorkflowUtil;
+
+import weaver.conn.RecordSet;
+import weaver.general.Util;
+import weaver.interfaces.schedule.BaseCronJob;
+
+/**
+ * 查询人员移动端外勤考勤信息,并同步更新到东宝系统
+ * @author lwt
+ *
+ */
+public class SynSignDatas extends BaseCronJob{
+	
+	public void execute() {
+		LogTool log = new LogTool("/log/working/sign",false);
+		String clientId = Prop.getPropValue("db_work","clientId");
+		String secret = Prop.getPropValue("db_work","secret");
+		Integer second = Integer.valueOf(Prop.getPropValue("db_work","second"));
+		String code = Prop.getPropValue("db_work","code");
+		String moduleCode = Prop.getPropValue("db_work","moduleCode");
+		String batchCardDataUrl = Prop.getPropValue("db_work","batchCardDataUrl");
+		log.writeLog("同步人员移动端考勤信息更新到东宝系统开始.clientId="+clientId+";secret="+secret+";second="+second
+			+";code="+code+";moduleCode="+moduleCode+";batchCardDataUrl="+batchCardDataUrl);
+		String token = JwtUtil.createThirdToken(clientId,secret,second).getToken();
+		Map<String,String> dataMap = new HashMap<String,String>();//保存数据id和员工编号的集合
+		Map headMap = new HashMap();
+		headMap.put("code",code);
+		headMap.put("moduleCode",moduleCode);
+		headMap.put("token",token);
+		headMap.put("clientId",clientId);
+		Map bodyMap2 = new HashMap();
+		Map bodyMap3 = new HashMap();
+		List list = new ArrayList();//存储打卡数据
+		List idList = new ArrayList();//存储数据id
+		
+		RecordSet rs = new RecordSet();
+		RecordSet rs1 = new RecordSet();
+		String id = "";//移动签到id
+		String workCode = "";//人员编号
+		String operater = "";//签到人id
+		String operateDate = "";//签到日期
+		String operateTime = "";//签到时间
+		String longitude = "";//经度
+		String latitude = "";//纬度
+		String address = "";//地址
+		String remark = "";//签到备注
+		//查询考勤数据
+		String datasource = rs.getDBType();
+		log.writeLog("datasource="+datasource);
+		if ("oracle".equals(datasource)) {
+			rs.execute("select * from mobile_sign where syn_flag != 2 order by operate_date desc");
+		} else if ("sqlserver".equals(datasource)) {
+			rs.execute("select * from mobile_sign where syn_flag != 2 order by operate_date desc");
+		}
+		//取到考勤数据,调用同步接口
+		while (rs.next()) {
+			Map bodyMap = new HashMap();
+			Map bodyMap1 = new HashMap();
+			id = Util.null2String(rs.getInt("ID"));
+			idList.add(id);
+			operater = Util.null2String(rs.getString("OPERATER"));
+			workCode = Util.null2String(WorkflowUtil.getUserInfo(operater).get("workcode"));
+			dataMap.put(id, workCode);
+			operateDate = Util.null2String(rs.getString("OPERATE_DATE"));
+			operateTime = Util.null2String(rs.getString("OPERATE_TIME"));
+			longitude = Util.null2String(rs.getString("LONGITUDE"));
+			latitude = Util.null2String(rs.getString("LATITUDE"));
+			address = Util.null2String(rs.getString("ADDRESS"));
+			remark = Util.null2String(rs.getString("REMARK"));
+//			log.writeLog("id="+id+";workCode="+workCode+";operater="+operater+";operateDate="+operateDate+";operateTime="+operateTime
+//				+";longitude="+longitude+";latitude="+latitude+";address="+address+";remark="+remark);
+			bodyMap.put("cardTime", operateDate + " " +operateTime);
+			bodyMap.put("dataSource", "8");
+			bodyMap.put("signPlace", address);
+			bodyMap.put("status", "1");
+			bodyMap.put("longitude", longitude);
+			bodyMap.put("latitude", latitude);
+			bodyMap.put("describe", remark);
+			bodyMap.put("timeZone", "GMT+8");
+			bodyMap1.put("empRule","1");
+			bodyMap1.put("empKey",workCode);
+			bodyMap1.put("cardData",bodyMap);
+			//查询所有数据放入集合
+			list.add(bodyMap1);
+		}
+//		bodyMap2.put("empOrders", list);
+		bodyMap3.put("header",headMap);
+		bodyMap3.put("body",bodyMap2);
+		try {
+			if (list.size()>0) {
+				//循环次数,每次传输1000条数据
+				int num = list.size()/1000+1;
+				for (int i=0;i<=num;i++) {
+					//初始化传输的list
+					List listSign = new ArrayList();
+					List listSignId = new ArrayList();
+					for (int j=i*1000;j<(i+1)*1000;j++) {
+						if (j>=list.size()) {//超出list的下标,跳出循环
+							break;
+						}
+						listSign.add(list.get(j));
+						listSignId.add(idList.get(j));
+					}
+					if (listSign.size() ==0) {
+						continue;
+					} else {
+						bodyMap2.put("empOrders", listSign);
+					}
+					String param = JSON.toJSONString(bodyMap3,SerializerFeature.DisableCircularReferenceDetect);
+//					log.writeLog("param="+param);
+					String result = HttpManager.postMap(batchCardDataUrl,headMap,param);
+					log.writeLog("result="+result);
+					//解析返回值result
+					JSONObject jsonObject = new JSONObject();
+					//解析JOSN
+					jsonObject = JSONObject.parseObject(result);
+					String returnCode = Util.null2String(jsonObject.get("code"));
+					String data = Util.null2String(jsonObject.get("data"));
+					if ("200".equals(returnCode)) {//同步成功(可能存在部分数据失败)
+						//先全部更新为同步成功
+						log.writeLog("sql1="+"update mobile_sign set syn_flag = 2 where id in ("+listSignId.toString().replace("[", "'").replace("]", "'").replace(",", "','")+")");
+						rs1.execute("update mobile_sign set syn_flag = 2 where id in ("+listSignId.toString().replace("[", "'").replace("]", "'").replace(",", "','")+")");
+						if (!data.isEmpty()) {//有更新失败的
+							//解析返回值data
+							JSONObject dataObject = new JSONObject();
+							dataObject = JSONObject.parseObject(data);
+							String key = "";//返回的错误的数据的员工编号
+							String mapKey = "";//保存map的key
+							String mapValue = "";//保存map的value
+							Iterator<String> dataIterator = dataObject.keySet().iterator();
+							Iterator<String> dataMapIter = dataMap.keySet().iterator();
+							while (dataIterator.hasNext()) {
+								// 获得key 
+								key = dataIterator.next(); 
+								while (dataMapIter.hasNext()) {
+									mapKey = dataMapIter.next();
+									mapValue = dataMap.get(mapKey);
+									if (key.equals(mapValue)) {
+										//更新为同步失败
+										rs1.executeQuery("update mobile_sign set syn_flag = 1 where id = ?", mapKey);
+									}
+								}
+							}
+						}
+					} else {//同步异常,更新这批数据为同步失败
+						rs1.executeQuery("update mobile_sign set syn_flag = 1 where id in (?)", listSignId.toString().replace("[", "'").replace("]", "'").replace(",", "','"));
+					}
+				}
+			} else {
+				log.writeLog("此次查询无符合数据!");
+			}
+		} catch (HttpException e) {
+			// TODO Auto-generated catch block
+			log.writeLog("HttpException="+e.toString());
+			e.printStackTrace();
+		} catch (IOException e) {
+			// TODO Auto-generated catch block
+			log.writeLog("IOException="+e.toString());
+			e.printStackTrace();
+		} catch (Exception e) {
+			log.writeLog("Exception="+e.toString());
+			e.printStackTrace();
+		}
+		
+		log.writeLog("同步人员移动端考勤信息更新到东宝系统结束.");
+	}
+	
+}
+
+
+
+
+
diff --git a/src/main/youhong_ai_jitu_src/com/working/schedule/WorkingTimer.java b/src/main/youhong_ai_jitu_src/com/working/schedule/WorkingTimer.java
new file mode 100644
index 0000000..84a4c7a
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/com/working/schedule/WorkingTimer.java
@@ -0,0 +1,28 @@
+package com.working.schedule;
+
+import com.working.util.LogTool;
+import weaver.interfaces.schedule.BaseCronJob;
+
+/**
+ * 考勤同步数据总的定时器
+ * @author lwt
+ *
+ */
+public class WorkingTimer extends BaseCronJob{
+	
+	public void execute() {
+		LogTool log = new LogTool("/log/working",false);
+		log.writeLog("考勤总的同步定时开始.");
+		SynSignDatas ssd = new SynSignDatas();
+		ssd.execute();
+		SynScheduleSignDatas sssd = new SynScheduleSignDatas();
+		sssd.execute();
+		log.writeLog("考勤总的同步定时结束.");
+	}
+	
+}
+
+
+
+
+
diff --git a/src/main/youhong_ai_jitu_src/com/working/test/SSLClient.java b/src/main/youhong_ai_jitu_src/com/working/test/SSLClient.java
new file mode 100644
index 0000000..095dc4e
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/com/working/test/SSLClient.java
@@ -0,0 +1,35 @@
+package com.working.test;
+
+import java.security.cert.CertificateException;
+import java.security.cert.X509Certificate;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.TrustManager;
+import javax.net.ssl.X509TrustManager;
+import org.apache.http.conn.ClientConnectionManager;
+import org.apache.http.conn.scheme.Scheme;
+import org.apache.http.conn.scheme.SchemeRegistry;
+import org.apache.http.conn.ssl.SSLSocketFactory;
+import org.apache.http.impl.client.DefaultHttpClient;
+//用于进行Https请求的HttpClient
+public class SSLClient extends DefaultHttpClient{
+    public SSLClient() throws Exception{
+        super();
+        SSLContext ctx = SSLContext.getInstance("TLS");
+        X509TrustManager tm = new X509TrustManager() {
+                public void checkClientTrusted(X509Certificate[] chain,
+                        String authType) throws CertificateException {
+                }
+                public void checkServerTrusted(X509Certificate[] chain,
+                        String authType) throws CertificateException {
+                }
+                public X509Certificate[] getAcceptedIssuers() {
+                    return null;
+                }
+        };
+        ctx.init(null, new TrustManager[]{tm}, null);
+        SSLSocketFactory ssf = new SSLSocketFactory(ctx,SSLSocketFactory.ALLOW_ALL_HOSTNAME_VERIFIER);
+        ClientConnectionManager ccm = this.getConnectionManager();
+        SchemeRegistry sr = ccm.getSchemeRegistry();
+        sr.register(new Scheme("https", 443, ssf));
+    }
+}
\ No newline at end of file
diff --git a/src/main/youhong_ai_jitu_src/com/working/test/Test.java b/src/main/youhong_ai_jitu_src/com/working/test/Test.java
new file mode 100644
index 0000000..06e8dcc
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/com/working/test/Test.java
@@ -0,0 +1,82 @@
+package com.working.test;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.serializer.SerializerFeature;
+import com.working.third.JwtUtil;
+import com.working.util.HttpManager;
+
+public class Test {
+	
+	/**
+	 * 单个接口
+	 * @param args
+	 * @throws Exception
+	 */
+	public static void main(String[] args) throws Exception {
+		// TODO Auto-generated method stub
+		try {
+			String token = JwtUtil.createThirdToken("P3F28BIFKGFL0ANX","5UGY7G1N8O",36000).getToken();
+//			System.out.println(token);
+			String param = 
+				"{"+
+				"\"header\":{"+
+				"\"code\":\"saveCardDataToThird\","+
+				"\"moduleCode\":\"attCardDataService\","+
+				"\"token\":\""+token+"\","+
+				"\"clientId\":\"P3F28BIFKGFL0ANX\","+
+				"\"empRule\":\"1\","+
+				"\"empInfo\":\"00000775\""+
+				"},"+
+				"\"body\":{"+
+				"\"cardData\":{"+
+				"\"cardTime\":\"\","+
+				"\"dataSource\":\"8\","+
+				"\"signPlace\":\"上海市王者村\","+
+				"\"status\":\"1\","+
+				"\"longitude\":\"121.45787447\","+
+				"\"latitude\":\"124.54444411\","+
+				"\"orderId\":\"1168801193654599682\","+
+				"\"orderCode\":\"BT20190903000204\","+
+				"\"describe\":\"移动签到测试\","+
+				"\"timeZone\":\"\""+
+				"}"+
+				"}"+
+				"}";
+			Map headMap = new HashMap();
+			headMap.put("code","saveCardDataToThird");
+			headMap.put("moduleCode","attCardDataService");
+			headMap.put("token",token);
+			headMap.put("clientId","P3F28BIFKGFL0ANX");
+			headMap.put("empRule","1");
+			headMap.put("empInfo","00000775");
+			Map bodyMap = new HashMap();
+			Map bodyMap1 = new HashMap();
+			Map bodyMap2 = new HashMap();
+			bodyMap.put("cardTime", "");
+			bodyMap.put("dataSource", "8");
+			bodyMap.put("signPlace", "上海市王者村");
+			bodyMap.put("status", "1");
+			bodyMap.put("longitude", "121.45787447");
+			bodyMap.put("latitude", "124.54444411");
+			bodyMap.put("orderId", "1168801193654599682");
+			bodyMap.put("orderCode", "BT20190903000204");
+			bodyMap.put("describe", "移动签到测试");
+			bodyMap.put("timeZone", "GMT+8");
+			bodyMap1.put("cardData",bodyMap);
+			bodyMap2.put("header",headMap);
+			bodyMap2.put("body",bodyMap1);
+			param = JSON.toJSONString(bodyMap2,SerializerFeature.DisableCircularReferenceDetect);
+			System.out.println(param);
+			String result = HttpManager.postMap("https://hr.jtexpress.com:9022/third/api",headMap,param);
+			System.out.println(result);
+		} catch (Exception e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		
+	}
+
+}
diff --git a/src/main/youhong_ai_jitu_src/com/working/test/Test1.java b/src/main/youhong_ai_jitu_src/com/working/test/Test1.java
new file mode 100644
index 0000000..f43f135
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/com/working/test/Test1.java
@@ -0,0 +1,63 @@
+package com.working.test;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.serializer.SerializerFeature;
+import com.working.third.JwtUtil;
+import com.working.util.HttpManager;
+
+public class Test1 {
+	
+	/**
+	 * 批量接口
+	 * @param args
+	 * @throws Exception
+	 */
+	public static void main(String[] args) throws Exception {
+		// TODO Auto-generated method stub
+		try {
+			String token = JwtUtil.createThirdToken("P3F28BIFKGFL0ANX","5UGY7G1N8O",36000).getToken();
+//			System.out.println(token);
+			Map headMap = new HashMap();
+			headMap.put("code","saveBatchCardDataToThird");
+			headMap.put("moduleCode","attCardDataService");
+			headMap.put("token",token);
+			headMap.put("clientId","P3F28BIFKGFL0ANX");
+			Map bodyMap2 = new HashMap();
+			Map bodyMap3 = new HashMap();
+			List list = new ArrayList();
+			for (int i=0;i<=2;i++) {
+				Map bodyMap = new HashMap();
+				Map bodyMap1 = new HashMap();
+				bodyMap.put("cardTime", "2019-07-20 13:22:13");
+				bodyMap.put("dataSource", "8");
+				bodyMap.put("signPlace", "上海市王者村");
+				bodyMap.put("status", "1");
+				bodyMap.put("longitude", "121.45787447");
+				bodyMap.put("latitude", "124.54444411");
+				bodyMap.put("describe", "移动签到测试");
+				bodyMap.put("timeZone", "GMT+8");
+				bodyMap1.put("empRule","1");
+				bodyMap1.put("empKey","00000006");
+				bodyMap1.put("cardData",bodyMap);
+				list.add(bodyMap1);
+			}
+			bodyMap2.put("empOrders", list);
+			bodyMap3.put("header",headMap);
+			bodyMap3.put("body",bodyMap2);
+			String param = JSON.toJSONString(bodyMap3,SerializerFeature.DisableCircularReferenceDetect);
+			System.out.println(param);
+			String result = HttpManager.postMap("https://hr.jtexpress.com:9022/third/api",headMap,param);
+			System.out.println(result);
+		} catch (Exception e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		
+	}
+
+}
diff --git a/src/main/youhong_ai_jitu_src/com/working/test/Test2.java b/src/main/youhong_ai_jitu_src/com/working/test/Test2.java
new file mode 100644
index 0000000..e9308ba
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/com/working/test/Test2.java
@@ -0,0 +1,47 @@
+package com.working.test;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.serializer.SerializerFeature;
+import com.working.third.JwtUtil;
+import com.working.util.HttpManager;
+
+public class Test2 {
+	
+	public static void main(String[] args) throws Exception {
+		// TODO Auto-generated method stub
+		//解析JOSN()
+		Map map = new HashMap();
+		map.put("deptCode", "01010101");
+		map.put("bmfzr", "00000001");
+		map.put("bmfgld", "");
+		String json = JSON.toJSONString(map);
+		System.out.println(json);
+//		List<String> list = new ArrayList<String>();
+//		System.out.println(list);
+//		JSONObject jsonObject = new JSONObject();
+//		//解析JOSN
+//		jsonObject = JSONObject.parseObject(json);
+//		String bmfzr = jsonObject.getString("bmfzr");
+//		System.out.println(bmfzr.isEmpty());
+		
+//		Map comMap = new HashMap();
+//		comMap.put("subComCode", "JTyn");
+//		comMap.put("cwsh", "389,390");
+//		comMap.put("zzcw", "412,413");
+//		comMap.put("cwzj", "MSIL15,MSIL47");
+//		comMap.put("ceozjl", "MSIL15,MSIL47");
+//		comMap.put("cn", "389,390");
+//		comMap.put("cnfh", "MSIL15,MSIL47");
+//		comMap.put("zjbfzr", "412,413");
+//		String comJson = JSON.toJSONString(comMap);
+//		System.out.println(comJson);
+		
+	}
+
+}
diff --git a/src/main/youhong_ai_jitu_src/com/working/test/Test3.java b/src/main/youhong_ai_jitu_src/com/working/test/Test3.java
new file mode 100644
index 0000000..ed2a396
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/com/working/test/Test3.java
@@ -0,0 +1,33 @@
+package com.working.test;
+
+import java.util.Iterator;
+
+import weaver.general.Util;
+
+import com.alibaba.fastjson.JSONObject;
+
+public class Test3 {
+	
+	public static void main(String[] args) throws Exception {
+//		String json = "{\"code\":200,\"data\":{\"123000007701\":\"用户信息为空\",\"12300000770\":\"用户信息为空\",\"1230000077012\":\"用户信息为空\"},\"id\":\"\",\"list\":[],\"message\":\"操作成功\",\"rows\":null}";
+//		//解析返回值result
+//		JSONObject jsonObject = new JSONObject();
+//		//解析JOSN
+//		jsonObject = JSONObject.parseObject(json);
+//		String returnCode = Util.null2String(jsonObject.getString("code"));
+//		String data = Util.null2String(jsonObject.getString("data"));
+//		JSONObject dataObject = jsonObject.parseObject(data);
+//		String key = "";
+//		Iterator<String> entry = dataObject.keySet().iterator();
+//		while(entry.hasNext()){
+//			// 获得key 
+//			key = entry.next(); 
+//			System.out.println(key);
+//		}
+		String code = "01091138";
+		System.out.println(code.substring(0, 6));
+		System.out.println(code.length());
+		
+	}
+
+}
diff --git a/src/main/youhong_ai_jitu_src/com/working/test/Test4.java b/src/main/youhong_ai_jitu_src/com/working/test/Test4.java
new file mode 100644
index 0000000..f0510e8
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/com/working/test/Test4.java
@@ -0,0 +1,18 @@
+package com.working.test;
+
+import java.util.Iterator;
+
+import weaver.general.Util;
+
+import com.alibaba.fastjson.JSONObject;
+
+public class Test4 {
+	
+	public static void main(String[] args) throws Exception {
+		StringBuffer a = new StringBuffer();
+		a.append("'").append("'");
+		System.out.println(a);
+		System.out.println(a.toString().equals("''"));
+	}
+
+}
diff --git a/src/main/youhong_ai_jitu_src/com/working/third/JwtThirdTokenResult.java b/src/main/youhong_ai_jitu_src/com/working/third/JwtThirdTokenResult.java
new file mode 100644
index 0000000..100222c
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/com/working/third/JwtThirdTokenResult.java
@@ -0,0 +1,8 @@
+package com.working.third;
+
+public class JwtThirdTokenResult extends JwtTokenResult{
+
+    public JwtThirdTokenResult(String token) {
+        super(token);
+    }
+}
diff --git a/src/main/youhong_ai_jitu_src/com/working/third/JwtTokenResult.java b/src/main/youhong_ai_jitu_src/com/working/third/JwtTokenResult.java
new file mode 100644
index 0000000..1f851e6
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/com/working/third/JwtTokenResult.java
@@ -0,0 +1,23 @@
+package com.working.third;
+
+public class JwtTokenResult {
+
+    public JwtTokenResult(String token){
+     this.token = token;
+    }
+
+    private String token;
+    private Long expires = 7200L;
+
+    public String getToken(){
+        return token;
+    }
+
+    public Long getExpires(){
+        return expires;
+    }
+
+    public Boolean IsSuccess(){
+        return token != null;
+    }
+}
diff --git a/src/main/youhong_ai_jitu_src/com/working/third/JwtUtil.java b/src/main/youhong_ai_jitu_src/com/working/third/JwtUtil.java
new file mode 100644
index 0000000..b8fc16f
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/com/working/third/JwtUtil.java
@@ -0,0 +1,60 @@
+package com.working.third;
+
+import com.auth0.jwt.JWT;
+import com.auth0.jwt.JWTVerifier;
+import com.auth0.jwt.algorithms.Algorithm;
+import com.auth0.jwt.interfaces.Claim;
+import com.auth0.jwt.interfaces.DecodedJWT;
+
+import java.util.Calendar;
+import java.util.Date;
+import java.util.GregorianCalendar;
+import java.util.HashMap;
+import java.util.Map;
+
+public class JwtUtil {
+
+    private static final String SECRET = "5UGY7G1N8O";
+
+    /**
+     * 生成token
+     * @param secret
+     * @param second
+     * @return
+     */
+    public static JwtThirdTokenResult createThirdToken(String clientId,String secret,int second){
+        try {
+            Algorithm algorithm = Algorithm.HMAC256(secret);
+            Map<String, Object> map = new HashMap<String, Object>();
+
+            map.put("alg", "HS256");
+            map.put("typ", "JWT");
+            Date nowDate = new Date();
+            Calendar cal = new GregorianCalendar();
+            cal.setTime(nowDate);
+            cal.add(Calendar.SECOND, -3600);
+            nowDate = cal.getTime();
+
+            cal = new GregorianCalendar();
+            cal.setTime(nowDate);
+            cal.add(Calendar.SECOND, second);
+
+            Date expireDate = cal.getTime();
+            String token = JWT.create()
+                    .withHeader(map)
+                    .withClaim("clientId", clientId)
+                    .withIssuer("DbSsoServer")
+                    .withSubject("DbSso_AccessToken")
+                    .withAudience("Web")
+                    .withIssuedAt(nowDate)
+                    .withExpiresAt(expireDate)
+                    .sign(algorithm);
+            return new JwtThirdTokenResult(token);
+
+        } catch (Exception exception){
+            exception.printStackTrace();
+        }
+        return new JwtThirdTokenResult(null);
+    }
+
+}
diff --git a/src/main/youhong_ai_jitu_src/com/working/util/ActionUtil.java b/src/main/youhong_ai_jitu_src/com/working/util/ActionUtil.java
new file mode 100644
index 0000000..01fb00d
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/com/working/util/ActionUtil.java
@@ -0,0 +1,49 @@
+package com.working.util;
+
+import weaver.conn.RecordSet;
+import weaver.general.Util;
+import weaver.soa.workflow.request.RequestInfo;
+
+public class ActionUtil {
+	
+	/**
+	 * 通过请求id获得流程基本参数
+	 * @param requsetid
+	 * @return
+	 */
+	public  static WAction getMainTable(RequestInfo requestInfo){
+		WAction action=new WAction();
+		String requestid = Util.getIntValue(requestInfo.getRequestid())+"";
+		String workflowId = requestInfo.getWorkflowid(); 
+		RecordSet rs0  = new RecordSet();
+		rs0.execute("select formid from workflow_base where id in(select workflowid from workflow_requestbase where  requestid='"+requestid+"')");
+		String mainTabName="";
+		String formid="";
+		if(rs0.next()){
+			formid=Util.null2String(rs0.getString("formid").replace("-", ""));
+			mainTabName="formtable_main_"+formid;
+		}
+		action.setRequestid(requestid);
+		action.setFormid(formid);
+		action.setMainTabName(mainTabName);
+		action.setWorkflowId(workflowId);
+		return action;
+	}
+	
+	/**
+	 * 获得流程主表的id
+	 * @param tableName
+	 * @param requestid
+	 * @return
+	 */
+	public  static String getMainId(String tableName,String requestid){
+		RecordSet rsRecordSet = new RecordSet();
+		String sql=" select id from "+tableName+" where requestid='"+requestid+"' ";
+		rsRecordSet.execute(sql);
+		if(rsRecordSet.next()){
+			return rsRecordSet.getString("id");
+		}
+		return "";
+	}
+	
+}
diff --git a/src/main/youhong_ai_jitu_src/com/working/util/HttpManager.java b/src/main/youhong_ai_jitu_src/com/working/util/HttpManager.java
new file mode 100644
index 0000000..75316a0
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/com/working/util/HttpManager.java
@@ -0,0 +1,101 @@
+package com.working.util;
+
+import org.apache.commons.httpclient.HttpException;
+import org.apache.http.HttpEntity;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.conn.ssl.NoopHostnameVerifier;
+import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
+import org.apache.http.conn.ssl.TrustSelfSignedStrategy;
+import org.apache.http.conn.ssl.TrustStrategy;
+import org.apache.http.entity.ContentType;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.ssl.SSLContextBuilder;
+import org.apache.http.ssl.SSLContexts;
+import org.apache.http.util.EntityUtils;
+
+import javax.net.ssl.SSLContext;
+import java.io.IOException;
+import java.security.KeyManagementException;
+import java.security.KeyStoreException;
+import java.security.NoSuchAlgorithmException;
+import java.security.cert.CertificateException;
+import java.security.cert.X509Certificate;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+
+/**
+ * @author Administrator
+ *
+ */
+public class HttpManager {
+	/**
+	 * 向指定 URL 发送POST方法的请求
+	 * @param url
+	 *            发送请求的 URL
+	 * @param param
+	 *            请求参数，请求参数应该是 name1=value1&name2=value2 的形式。
+	 * @return 所代表远程资源的响应结果
+	 * @throws IOException 
+	 * @throws HttpException 
+	 * @throws Exception 
+	 */
+	public static String postMap(String requestUrl,Map<String,String> headerMap, String param) throws HttpException, IOException {
+		String result = null;
+		try {
+			CloseableHttpClient httpClient = new SSLClient();
+			HttpPost postMethod = new HttpPost(requestUrl);
+			CloseableHttpResponse response = null;
+	        //设置请求头Authorization
+	//		postMethod.setRequestHeader("Authorization", "Basic " + authorization);
+	        //设置请求头  Content-Type
+			postMethod.setHeader("Content-Type", "application/json");
+			Iterator headerIterator = headerMap.entrySet().iterator();//循环增加header
+		    while(headerIterator.hasNext()){
+		        Entry<String,String> elem = (Entry<String, String>) headerIterator.next();
+	//	        System.out.println("key="+elem.getKey()+";value="+elem.getValue());
+		        postMethod.addHeader(elem.getKey(),elem.getValue());
+		    }
+		    StringEntity stringentity = new StringEntity(param,ContentType.create("application/json", "UTF-8"));
+		    postMethod.setEntity(stringentity);
+		    response = httpClient.execute(postMethod);//发送请求并接收返回数据
+	//	    System.out.println(response.getStatusLine());
+		    if(response != null && response.getStatusLine().getStatusCode() == 200){
+		    	HttpEntity entity = response.getEntity();//获取response的body部分
+		    	result = EntityUtils.toString(entity);//读取reponse的body部分并转化成字符串
+		    }
+		} catch (Exception e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+	        //打印返回结果
+	//	    System.out.println(result);
+	        return result;
+	}
+	
+    public static CloseableHttpClient createSSLClientDefault(){
+        try {
+            SSLContext sslContext = new SSLContextBuilder().loadTrustMaterial(null, new TrustStrategy() {
+	            //信任所有
+	            public boolean isTrusted(X509Certificate[] chain,String authType) throws CertificateException {
+	                return true;
+	            }
+            }).build();
+            //SSLConnectionSocketFactory sslsf = new SSLConnectionSocketFactory(sslContext);
+            SSLConnectionSocketFactory sslsf = new SSLConnectionSocketFactory(SSLContexts.custom().loadTrustMaterial(
+            		 null, new TrustSelfSignedStrategy()).build(), NoopHostnameVerifier.INSTANCE);
+            return HttpClients.custom().setSSLSocketFactory(sslsf).build();
+        } catch (KeyManagementException e) {
+            e.printStackTrace();
+        } catch (NoSuchAlgorithmException e) {
+            e.printStackTrace();
+        } catch (KeyStoreException e) {
+            e.printStackTrace();
+        }
+        return  HttpClients.createDefault();
+    }
+
+}
diff --git a/src/main/youhong_ai_jitu_src/com/working/util/LogTool.java b/src/main/youhong_ai_jitu_src/com/working/util/LogTool.java
new file mode 100644
index 0000000..d0da778
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/com/working/util/LogTool.java
@@ -0,0 +1,118 @@
+package com.working.util;
+
+import java.io.PrintWriter;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.File;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+import weaver.general.BaseBean;
+import weaver.general.GCONST;
+
+/**
+ * * 
+ *  Copyright (C), 2010,9, szcport 
+ *  File name and path : szcport.weaver.formmode.data.ModeDataManager.java
+ *  Author : KangMD,    Version : 1.0,    First complete date : 2018-5-14 下午05:01:55  
+ *  Description :日志类         
+ *  Others:                                                     
+ *  Function List:        
+ *  History:             
+ *    1. Date:
+ *       Version:
+ *       Author:
+ *       Modification:
+ *    
+ **
+ */
+public class LogTool {
+	
+    private PrintWriter logPrint;
+    private String logFile = "";
+    private String logPath = "";
+    private boolean systemlog = false;//是否写系统日记
+    
+    static SimpleDateFormat newDf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+    static SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd");
+    static BaseBean log = new BaseBean();
+    
+    public LogTool(){
+   	 //if(logFile == null || logFile.trim().equals("") || !logFile.equals(getLogFile())){
+          //  newLog();
+        //}
+    }
+    
+    public LogTool(String logPath,boolean systemlog){
+    	this.logPath = logPath;
+    	this.systemlog = systemlog;
+    }
+    
+    private String getLogFile(){
+    	//获取当前系统路径
+    	String sysPath = GCONST.getRootPath();
+    	if (sysPath == null) {
+    		sysPath = System.getProperty("user.dir");
+    	}
+    	if (!"".equals(logPath)) {
+    		if (logPath.endsWith("/")) {
+    			sysPath += logPath+df.format(new Date())+".log";
+    		} else {
+    			sysPath += logPath+"/"+df.format(new Date())+".log";
+    		}
+    	} else {
+    		sysPath += "/log/dev/"+df.format(new Date())+".log";
+		}
+        return sysPath;
+    }
+   
+    private void newLog(){
+        logFile = getLogFile();
+        try {
+            logPrint = new PrintWriter(new FileWriter(logFile, true), true);
+        } catch(IOException e) {
+            try {
+            	 File file = new File(logFile);
+            	 if (!file.getParentFile().exists()) {  
+                     //如果目标文件所在的目录不存在，则创建父目录  
+                     if (file.getParentFile().mkdirs()) {
+                    	 file.createNewFile();
+                     }
+                 }  
+                logPrint = new PrintWriter(new FileWriter(logFile, true), true);
+            } catch(IOException ex) {
+            	log.writeLog("Log记录出错了",ex);
+            }
+        }
+    }
+
+    public void writeLog(Object msg) {
+    	if (systemlog) {
+    		log.writeLog(msg);
+    	}
+    	newLog();
+        logPrint.println(newDf.format(new Date()) + ": " + msg);
+        logPrint.flush();
+        logPrint.close();
+    }
+   
+    public void writeLog(String msg,Throwable e) {
+    	if (systemlog) {
+    		log.writeLog(msg,e);
+    	}
+    	newLog();
+        logPrint.println(newDf.format(new Date()) + ": " + msg);
+        e.printStackTrace(logPrint);
+        logPrint.flush();
+        logPrint.close();
+    }
+    
+    public static void main(String[] args) {
+    	try {
+			Double.parseDouble("aaa");
+		} catch (Exception e) {
+			new LogTool().writeLog("哈哈111哈",e);
+		}
+	}
+    
+}
\ No newline at end of file
diff --git a/src/main/youhong_ai_jitu_src/com/working/util/MyDateUtil.java b/src/main/youhong_ai_jitu_src/com/working/util/MyDateUtil.java
new file mode 100644
index 0000000..70dbdf9
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/com/working/util/MyDateUtil.java
@@ -0,0 +1,70 @@
+package com.working.util;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
+
+public class MyDateUtil {
+
+	/**
+	 * 获取当前时间字符串
+	 * @return
+	 */
+	public static String getDateStr(){
+		Date now = new Date();
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+		return sdf.format(now);
+	}
+	
+	/**
+	 * 根据传入的日期字符串添加年，月，日等
+	 * @param dateStr    yyyy-MM-dd
+	 * @param addyear    
+	 * @param addmonth   
+	 * @param addday     
+	 * @return
+	 */
+	public static String addDate(String dateStr,int addyear,int addmonth,int addday){
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+		Calendar cal = Calendar.getInstance();
+		String newDateStr = "";
+		try {
+			Date date = sdf.parse(dateStr);
+			cal.setTime(date);
+			cal.add(Calendar.YEAR,addyear);
+			cal.add(Calendar.MONTH,addmonth);
+			cal.add(Calendar.DAY_OF_YEAR,addday);
+			newDateStr = sdf.format(cal.getTime());
+		} catch (ParseException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		return newDateStr;
+	}
+	
+	/**
+	 * 将日期格式字符串转化为日期
+	 * @param dateStr
+	 * @return
+	 */
+	public static Date getDate(String dateStr){
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+		Date now = new Date();
+		try {
+			now = sdf.parse(dateStr);
+		} catch (ParseException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		return now;
+	}
+	
+	public static void main(String[] args) {
+		// TODO Auto-generated method stub
+		System.out.println(getDateStr());
+		System.out.println(addDate("2018-12-10",1,2,5));
+		System.out.println(getDate("2018-12-10 09:00:00"));
+	}
+
+}
diff --git a/src/main/youhong_ai_jitu_src/com/working/util/SSLClient.java b/src/main/youhong_ai_jitu_src/com/working/util/SSLClient.java
new file mode 100644
index 0000000..cf15863
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/com/working/util/SSLClient.java
@@ -0,0 +1,35 @@
+package com.working.util;
+
+import java.security.cert.CertificateException;
+import java.security.cert.X509Certificate;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.TrustManager;
+import javax.net.ssl.X509TrustManager;
+import org.apache.http.conn.ClientConnectionManager;
+import org.apache.http.conn.scheme.Scheme;
+import org.apache.http.conn.scheme.SchemeRegistry;
+import org.apache.http.conn.ssl.SSLSocketFactory;
+import org.apache.http.impl.client.DefaultHttpClient;
+//用于进行Https请求的HttpClient
+public class SSLClient extends DefaultHttpClient{
+    public SSLClient() throws Exception{
+        super();
+        SSLContext ctx = SSLContext.getInstance("TLS");
+        X509TrustManager tm = new X509TrustManager() {
+                public void checkClientTrusted(X509Certificate[] chain,
+                        String authType) throws CertificateException {
+                }
+                public void checkServerTrusted(X509Certificate[] chain,
+                        String authType) throws CertificateException {
+                }
+                public X509Certificate[] getAcceptedIssuers() {
+                    return null;
+                }
+        };
+        ctx.init(null, new TrustManager[]{tm}, null);
+        SSLSocketFactory ssf = new SSLSocketFactory(ctx,SSLSocketFactory.ALLOW_ALL_HOSTNAME_VERIFIER);
+        ClientConnectionManager ccm = this.getConnectionManager();
+        SchemeRegistry sr = ccm.getSchemeRegistry();
+        sr.register(new Scheme("https", 443, ssf));
+    }
+}
\ No newline at end of file
diff --git a/src/main/youhong_ai_jitu_src/com/working/util/WAction.java b/src/main/youhong_ai_jitu_src/com/working/util/WAction.java
new file mode 100644
index 0000000..7af8491
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/com/working/util/WAction.java
@@ -0,0 +1,42 @@
+package com.working.util;
+
+public class WAction {
+	
+	private String requestid;
+	private String workflowId;
+	private String formid;
+	private String mainTabName;
+	
+	public String getRequestid() {
+		return requestid;
+	}
+	
+	public void setRequestid(String requestid) {
+		this.requestid = requestid;
+	}
+	
+	public String getWorkflowId() {
+		return workflowId;
+	}
+	
+	public void setWorkflowId(String workflowId) {
+		this.workflowId = workflowId;
+	}
+	
+	public String getFormid() {
+		return formid;
+	}
+	
+	public void setFormid(String formid) {
+		this.formid = formid;
+	}
+	
+	public String getMainTabName() {
+		return mainTabName;
+	}
+	
+	public void setMainTabName(String mainTabName) {
+		this.mainTabName = mainTabName;
+	}
+	
+}
diff --git a/src/main/youhong_ai_jitu_src/com/working/util/WorkflowUtil.java b/src/main/youhong_ai_jitu_src/com/working/util/WorkflowUtil.java
new file mode 100644
index 0000000..48a1f07
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/com/working/util/WorkflowUtil.java
@@ -0,0 +1,73 @@
+package com.working.util;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import weaver.conn.RecordSet;
+import weaver.formmode.setup.ModeRightInfo;
+import weaver.general.Util;
+
+public class WorkflowUtil {
+
+	/**
+	 * 根据流程id获取主表名称
+	 * @param requestid
+	 * @return
+	 */
+	public static String getMainTable(String requestid){
+		String tablename = "";
+		RecordSet rs = new RecordSet();
+		rs.executeQuery("select * from workflow_requestbase a,workflow_base b,workflow_bill c " 
+				  +"where a.requestid=? and a.workflowid = b.id and b.formid = c.id",requestid);
+		while(rs.next()){
+			tablename = Util.null2String(rs.getString("tablename"));
+		}
+		return tablename;
+	}
+	
+	/**
+	 * 获取用户部分信息
+	 * @param requestid
+	 * @return
+	 */
+	public static Map getUserInfo(String userid){
+		Map map = new HashMap();
+		RecordSet rs = new RecordSet();
+		rs.executeQuery("select * from hrmresource where id = ?",userid);
+		while(rs.next()){
+			map.put("workcode",(Util.null2String(rs.getString("workcode"))));
+			map.put("startdate",(Util.null2String(rs.getString("startdate"))));
+			map.put("lastname",(Util.null2String(rs.getString("lastname"))));
+			map.put("departmentid",(Util.null2String(rs.getString("departmentid"))));
+			map.put("subcompanyid",(Util.null2String(rs.getString("subcompanyid1"))));
+		}
+		return map;
+	}
+	
+	/**
+	 * 获取部门部分信息
+	 * @param requestid
+	 * @return
+	 */
+	public static Map getDepartInfo(String departid){
+		Map map = new HashMap();
+		RecordSet rs = new RecordSet();
+		rs.executeQuery("select * from hrmdepartment where id = ?",departid);
+		while(rs.next()){
+			map.put("departmentname",(Util.null2String(rs.getString("departmentname"))));
+			map.put("subcompanyid1",(Util.null2String(rs.getString("subcompanyid1"))));
+		}
+		return map;
+	}
+	
+	/**
+	 * 权限设置
+	 * @param id
+	 */
+	public static void modeRight(int id,int modeid){
+		//给该记录设置权限(即权限重构) 第一个参数表示人员ID，第二个参数表建模模块modeid，第三个参数表示建模数据billid
+		ModeRightInfo mri = new ModeRightInfo();
+		mri.editModeDataShare(1,modeid,id);
+	}
+	
+}
diff --git a/src/main/youhong_ai_jitu_src/com/working/webservices/hrmmatrix/SynDepartmentDefined.java b/src/main/youhong_ai_jitu_src/com/working/webservices/hrmmatrix/SynDepartmentDefined.java
new file mode 100644
index 0000000..9aa6c5d
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/com/working/webservices/hrmmatrix/SynDepartmentDefined.java
@@ -0,0 +1,8 @@
+package com.working.webservices.hrmmatrix;
+
+public interface SynDepartmentDefined {
+	
+	//同步部门矩阵表信息
+	public abstract String synDeptDefined(String json);
+	
+}
diff --git a/src/main/youhong_ai_jitu_src/com/working/webservices/hrmmatrix/SynDepartmentDefinedImpl.java b/src/main/youhong_ai_jitu_src/com/working/webservices/hrmmatrix/SynDepartmentDefinedImpl.java
new file mode 100644
index 0000000..f455e16
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/com/working/webservices/hrmmatrix/SynDepartmentDefinedImpl.java
@@ -0,0 +1,117 @@
+package com.working.webservices.hrmmatrix;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import weaver.conn.RecordSet;
+import weaver.general.Util;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.working.util.LogTool;
+import com.working.webservices.util.DepartmentUtil;
+
+public class SynDepartmentDefinedImpl implements SynDepartmentDefined{
+	
+	LogTool log = new LogTool("/log/matrix/", false);
+	
+	public String synDeptDefined(String json) {
+		log.writeLog("同步部门传入数据为="+json);
+		RecordSet rs = new RecordSet();
+		RecordSet rs1 = new RecordSet();
+		DepartmentUtil deptUtil = new DepartmentUtil();
+		//保存报错信息
+		Map<String,String> msgMap = new HashMap<String,String>();
+		JSONObject jsonObject = new JSONObject();
+		try{
+			if (json.isEmpty()||json==null) {
+				log.writeLog("同步部门传入数据不能为空!");
+//				System.out.println("传入数据不能为空!");
+				msgMap.put("msg", "传入数据不能为空!");
+				return JSON.toJSONString(msgMap);
+			}
+			//解析JOSN
+			jsonObject = JSONObject.parseObject(json);
+			//获取部门编号
+			String deptCode = Util.null2String(jsonObject.getString("deptCode"));
+			if (deptCode.isEmpty()) {
+				log.writeLog("传入数据部门编号不能为空!");
+//				System.out.println("传入数据部门编号不能为空!");
+				msgMap.put("msg", "传入数据部门编号不能为空!");
+				return JSON.toJSONString(msgMap);
+			}
+			log.writeLog("deptCode="+deptCode);
+			//获取部门id
+			String deptId = deptUtil.selectDept(deptCode);
+			log.writeLog("deptId="+deptId);
+			if (deptId.equals("-1")) {//-1表示根据编号在部门表查不到部门信息
+				log.writeLog("传入数据部门编号["+deptCode+"]在OA中查不到,请联系OA管理员确认两边编号是否一致!");
+//				System.out.println("传入数据部门编号["+deptCode+"]在OA中查不到,请联系OA管理员确认两边编号是否一致!");
+				msgMap.put("msg", "传入数据部门编号["+deptCode+"]在OA中查不到,请联系OA管理员确认两边编号是否一致!");
+				return JSON.toJSONString(msgMap);
+			}
+			rs.executeQuery("select * from hrmdepartmentdefined where deptid = ?", deptId);
+			//获取部门自定义表的字段英文名称
+			String[] columnNames = deptUtil.getColumnName().split(",");
+			//得到需要转换的多人力资源字段集合
+			List<String> list = deptUtil.getHrmList();
+			log.writeLog("list="+list);
+			//得到部门插入sql拼接字段
+			StringBuffer intoSql = new StringBuffer();
+			//得到部门更新sql拼接字段
+			StringBuffer updateSql = new StringBuffer();
+			//得到部门插入字段
+			StringBuffer columnSql = new StringBuffer();
+			//得到参数拼接字段
+			StringBuffer params = new StringBuffer();
+			//通过编号查询人员
+			Map<String,String> userMsgMap = new HashMap<String,String>();
+			String status = "";//判断查询人员返回信息的状态0=成功，1-存在查不到的人员
+			for (String columnName : columnNames) {
+//				log.writeLog("columnName="+columnName);
+				//例如: ,name,loginid,age
+				columnSql.append(",").append(columnName);
+				if (list.contains(columnName)&&jsonObject.getString(columnName)!=null&&!jsonObject.getString(columnName).equals("")) {//存在需要转换的多人力资源字段
+					userMsgMap = deptUtil.getUserIdByCodes(jsonObject.getString(columnName));
+					status = userMsgMap.get("status");
+					if (status.equals("0")) {//0表示根据工号转换人员id全部成功
+						log.writeLog("0-userMap="+userMsgMap.get("msg"));
+						params.append("'" + userMsgMap.get("msg")).append("',");
+						updateSql.append(columnName).append("='"+userMsgMap.get("msg")).append("',");
+					} else if (status.equals("1")) {//1表示根据工号转换人员id存在不存在的
+						log.writeLog("1-userMap="+userMsgMap.get("msg"));
+						msgMap.put("msg", userMsgMap.get("msg"));
+						return JSON.toJSONString(msgMap);
+					}
+				} else {
+					params.append("'").append(jsonObject.getString(columnName)==null?"":jsonObject.getString(columnName)).append("',");
+					updateSql.append(columnName).append("='").append(jsonObject.getString(columnName)==null?"":jsonObject.getString(columnName)).append("',");
+				}
+			}
+			String sql = "";//执行更新操作的sql语句
+			if (rs.getCounts() <= 0) {//不存在,插入数据
+				intoSql.append("insert into hrmdepartmentdefined(deptid").append(columnSql).append(")values(").append(deptId)
+					.append(","+params.substring(0,params.length()-1)).append(")");
+				log.writeLog("intoSql="+intoSql);
+				rs1.execute(intoSql.toString());
+			} else {//更新
+				//去掉第一个英文逗号
+				sql = "update hrmdepartmentdefined set ";
+				log.writeLog("updateSql="+updateSql.substring(0,updateSql.length()-1).toString());
+				sql = sql + updateSql.substring(0,updateSql.length()-1).toString() + " where deptid = " + deptId;
+				log.writeLog("sql="+sql);
+				rs1.execute(sql);
+			}
+			
+		}catch (Exception e) {
+			log.writeLog("errorMsg="+e.toString());
+//			System.out.println(e.toString());
+			msgMap.put("msg", e.toString());
+			return JSON.toJSONString(msgMap);
+		}
+		msgMap.put("msg", "部门矩阵同步成功!");
+		return JSON.toJSONString(msgMap);
+	}
+	
+}
diff --git a/src/main/youhong_ai_jitu_src/com/working/webservices/hrmmatrix/SynSubCompanyDefined.java b/src/main/youhong_ai_jitu_src/com/working/webservices/hrmmatrix/SynSubCompanyDefined.java
new file mode 100644
index 0000000..05ec022
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/com/working/webservices/hrmmatrix/SynSubCompanyDefined.java
@@ -0,0 +1,8 @@
+package com.working.webservices.hrmmatrix;
+
+public interface SynSubCompanyDefined {
+	
+	//同步分部矩阵表信息
+	public abstract String synSubComDefined(String json);
+	
+}
diff --git a/src/main/youhong_ai_jitu_src/com/working/webservices/hrmmatrix/SynSubCompanyDefinedImpl.java b/src/main/youhong_ai_jitu_src/com/working/webservices/hrmmatrix/SynSubCompanyDefinedImpl.java
new file mode 100644
index 0000000..f68aed9
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/com/working/webservices/hrmmatrix/SynSubCompanyDefinedImpl.java
@@ -0,0 +1,117 @@
+package com.working.webservices.hrmmatrix;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import weaver.conn.RecordSet;
+import weaver.general.Util;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.working.util.LogTool;
+import com.working.webservices.util.DepartmentUtil;
+import com.working.webservices.util.SubComUtil;
+
+public class SynSubCompanyDefinedImpl implements SynSubCompanyDefined{
+	
+	LogTool log = new LogTool("/log/matrix/", false);
+	
+	public String synSubComDefined(String json) {
+		log.writeLog("分部传入数据为="+json);
+		RecordSet rs = new RecordSet();
+		RecordSet rs1 = new RecordSet();
+		//部门矩阵工具类
+		DepartmentUtil deptUtil = new DepartmentUtil();
+		//分部矩阵工具类
+		SubComUtil subComUtil = new SubComUtil();
+		//保存报错信息
+		Map<String,String> msgMap = new HashMap<String,String>();
+		JSONObject jsonObject = new JSONObject();
+		try{
+			if (json.isEmpty()||json==null) {
+				log.writeLog("同步分部传入数据不能为空!");
+				msgMap.put("msg", "传入数据不能为空!");
+				return JSON.toJSONString(msgMap);
+			}
+			//解析JOSN
+			jsonObject = JSONObject.parseObject(json);
+			//获取分部编号
+			String subComCode = Util.null2String(jsonObject.getString("subComCode"));
+			if (subComCode.isEmpty()) {
+				log.writeLog("传入数据分部编号不能为空!");
+				msgMap.put("msg", "传入数据分部编号不能为空!");
+				return JSON.toJSONString(msgMap);
+			}
+			log.writeLog("subComCode="+subComCode);
+			//获取分部id
+			String subComId = subComUtil.selectSubCom(subComCode);
+			log.writeLog("subComId="+subComId);
+			if (subComId.equals("-1")) {//-1表示根据编号在分部表查不到分部信息
+				log.writeLog("传入数据分部编号["+subComCode+"]在OA中查不到,请联系OA管理员确认两边编号是否一致!");
+				msgMap.put("msg", "传入数据分部编号["+subComCode+"]在OA中查不到,请联系OA管理员确认两边编号是否一致!");
+				return JSON.toJSONString(msgMap);
+			}
+			rs.executeQuery("select * from hrmsubcompanydefined where subcomid = ?", subComId);
+			//获取分部自定义表的字段英文名称
+			String[] columnNames = subComUtil.getColumnName().split(",");
+			//得到需要转换的多人力资源字段集合
+			List<String> list = deptUtil.getHrmList();
+			log.writeLog("list="+list);
+			//得到分部插入sql拼接字段
+			StringBuffer intoSql = new StringBuffer();
+			//得到分部更新sql拼接字段
+			StringBuffer updateSql = new StringBuffer();
+			//得到分部插入字段
+			StringBuffer columnSql = new StringBuffer();
+			//得到参数拼接字段
+			StringBuffer params = new StringBuffer();
+			//通过编号查询人员
+			Map<String,String> userMsgMap = new HashMap<String,String>();
+			String status = "";//判断查询人员返回信息的状态0=成功，1-存在查不到的人员
+			for (String columnName : columnNames) {
+//				log.writeLog("columnName="+columnName);
+				//例如: ,name,loginid,age
+				columnSql.append(",").append(columnName);
+				if (list.contains(columnName)&&jsonObject.getString(columnName)!=null&&!jsonObject.getString(columnName).equals("")) {//存在需要转换的多人力资源字段
+					userMsgMap = deptUtil.getUserIdByCodes(jsonObject.getString(columnName));
+					status = userMsgMap.get("status");
+					if (status.equals("0")) {//0表示根据工号转换人员id全部成功
+						log.writeLog("0-userMap="+userMsgMap.get("msg"));
+						params.append("'" + userMsgMap.get("msg")).append("',");
+						updateSql.append(columnName).append("='"+userMsgMap.get("msg")).append("',");
+					} else if (status.equals("1")) {//1表示根据工号转换人员id存在不存在的
+						log.writeLog("1-userMap="+userMsgMap.get("msg"));
+						msgMap.put("msg", userMsgMap.get("msg"));
+						return JSON.toJSONString(msgMap);
+					}
+				} else {
+					params.append("'").append(jsonObject.getString(columnName)==null?"":jsonObject.getString(columnName)).append("',");
+					updateSql.append(columnName).append("='").append(jsonObject.getString(columnName)==null?"":jsonObject.getString(columnName)).append("',");
+				}
+			}
+			String sql = "";//执行更新操作的sql语句
+			if (rs.getCounts() <= 0) {//不存在,插入数据
+				intoSql.append("insert into hrmsubcompanydefined(subcomid").append(columnSql).append(")values(").append(subComId)
+					.append(","+params.substring(0,params.length()-1)).append(")");
+				log.writeLog("intoSql="+intoSql);
+				rs1.execute(intoSql.toString());
+			} else {//更新
+				//去掉第一个英文逗号
+				sql = "update hrmsubcompanydefined set ";
+				log.writeLog("updateSql="+updateSql.substring(0,updateSql.length()-1).toString());
+				sql = sql + updateSql.substring(0,updateSql.length()-1).toString() + " where subcomid = " + subComId;
+				log.writeLog("sql="+sql);
+				rs1.execute(sql);
+			}
+			
+		}catch (Exception e) {
+			log.writeLog("errorMsg="+e.toString());
+			msgMap.put("msg", e.toString());
+			return JSON.toJSONString(msgMap);
+		}
+		msgMap.put("msg", "同步成功!");
+		return JSON.toJSONString(msgMap);
+	}
+	
+}
diff --git a/src/main/youhong_ai_jitu_src/com/working/webservices/org/GetDeptInfoService.java b/src/main/youhong_ai_jitu_src/com/working/webservices/org/GetDeptInfoService.java
new file mode 100644
index 0000000..dbad823
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/com/working/webservices/org/GetDeptInfoService.java
@@ -0,0 +1,11 @@
+package com.working.webservices.org;
+
+public interface GetDeptInfoService {
+	
+	//校验部门是否存在
+	public abstract String checkDeptIsExist(String json);
+	
+	//校验分部是否存在
+	public abstract String checkSubIsExist(String json);
+	
+}
diff --git a/src/main/youhong_ai_jitu_src/com/working/webservices/org/GetDeptInfoServiceImpl.java b/src/main/youhong_ai_jitu_src/com/working/webservices/org/GetDeptInfoServiceImpl.java
new file mode 100644
index 0000000..22d5589
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/com/working/webservices/org/GetDeptInfoServiceImpl.java
@@ -0,0 +1,119 @@
+package com.working.webservices.org;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import weaver.general.Util;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.working.util.LogTool;
+import com.working.webservices.util.DepartmentUtil;
+import com.working.webservices.util.SubComUtil;
+
+public class GetDeptInfoServiceImpl implements GetDeptInfoService{
+	
+	LogTool log = new LogTool("/log/checkDept/", false);
+	
+	public String checkDeptIsExist(String json) {
+		log.writeLog("同步部门传入数据为="+json);
+		DepartmentUtil deptUtil = new DepartmentUtil();
+		//保存信息
+		Map<String,Object> msgMap = new HashMap<String,Object>();
+		//保存OA不存在的部门编码
+		List<Object> codeList = new ArrayList<Object>();
+		//保存OA不存在的部门编码
+		Map<String,String> codeMap = null;
+		try{
+			if (json.isEmpty()||json==null) {
+				log.writeLog("校验部门是否存在的数据不能为空!");
+				msgMap.put("isAllExist", "no");
+				msgMap.put("notExistList", "传入部门的json不能为空!");
+				return JSON.toJSONString(msgMap);
+			}
+			//解析JOSN
+			JSONArray datas = JSONArray.parseArray(json);
+			log.writeLog("datas="+datas);
+			if (datas.size()>0) {
+				for (int i=0;i<datas.size();i++) {
+					JSONObject data = datas.getJSONObject(i);
+					String deptno = Util.null2String(data.getString("deptno"));//部门编码
+					//获取部门id
+					String deptId = deptUtil.selectDept(deptno);
+					if (deptId.equals("-1")) {//-1表示根据编号在部门表查不到部门信息
+						log.writeLog("传入数据部门编号["+deptno+"]在OA中查不到,请联系OA管理员确认两边编号是否一致!");
+						codeMap = new HashMap<String,String>();
+						codeMap.put("deptno", deptno);
+						codeList.add(codeMap);
+					}
+				}
+			}
+			if (codeList.size()>0) {//大于0表示有传入的部门编码在OA没有
+				msgMap.put("isAllExist", "no");
+				msgMap.put("notExistList", codeList);
+			} else {
+				msgMap.put("isAllExist", "yes");
+			}
+			
+		} catch (Exception e) {
+			log.writeLog("errorMsg="+e.toString());
+			msgMap.put("isAllExist", "no");
+			msgMap.put("notExistList", e.toString());
+			return JSON.toJSONString(msgMap);
+		}
+		return JSON.toJSONString(msgMap);
+	}
+	
+	public String checkSubIsExist(String json) {
+		log.writeLog("同步分部传入数据为="+json);
+		SubComUtil subComUtil = new SubComUtil();
+		//保存信息
+		Map<String,Object> msgMap = new HashMap<String,Object>();
+		//保存OA不存在的分部编码
+		List<Object> codeList = new ArrayList<Object>();
+		//保存OA不存在的分部编码
+		Map<String,String> codeMap = null;
+		try{
+			if (json.isEmpty()||json==null) {
+				log.writeLog("校验分部是否存在的数据不能为空!");
+				msgMap.put("isAllExist", "no");
+				msgMap.put("notExistList", "传入分部的json不能为空!");
+				return JSON.toJSONString(msgMap);
+			}
+			//解析JOSN
+			JSONArray datas = JSONArray.parseArray(json);
+			log.writeLog("datas="+datas);
+			if (datas.size()>0) {
+				for (int i=0;i<datas.size();i++) {
+					JSONObject data = datas.getJSONObject(i);
+					String subno = Util.null2String(data.getString("subno"));//分部编码
+					//获取分部id
+					String subId = subComUtil.selectSubCom(subno);
+					if (subId.equals("-1")) {//-1表示根据编号在分部表查不到分部信息
+						log.writeLog("传入数据分部编号["+subno+"]在OA中查不到,请联系OA管理员确认两边编号是否一致!");
+						codeMap = new HashMap<String,String>();
+						codeMap.put("subno", subno);
+						codeList.add(codeMap);
+					}
+				}
+			}
+			if (codeList.size()>0) {//大于0表示有传入的分部编码在OA没有
+				msgMap.put("isAllExist", "no");
+				msgMap.put("notExistList", codeList);
+			} else {
+				msgMap.put("isAllExist", "yes");
+			}
+			
+		} catch (Exception e) {
+			log.writeLog("errorMsg="+e.toString());
+			msgMap.put("isAllExist", "no");
+			msgMap.put("notExistList", e.toString());
+			return JSON.toJSONString(msgMap);
+		}
+		return JSON.toJSONString(msgMap);
+	}
+	
+}
diff --git a/src/main/youhong_ai_jitu_src/com/working/webservices/util/DepartmentUtil.java b/src/main/youhong_ai_jitu_src/com/working/webservices/util/DepartmentUtil.java
new file mode 100644
index 0000000..c5253d9
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/com/working/webservices/util/DepartmentUtil.java
@@ -0,0 +1,81 @@
+package com.working.webservices.util;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import com.working.util.LogTool;
+
+import weaver.conn.RecordSet;
+import weaver.general.Util;
+
+public class DepartmentUtil {
+	
+	LogTool log = new LogTool("/log/matrix/", false);
+	
+	//根据部门编号查询部门是否存在,存在返回部门id
+	public String selectDept(String deptCode) {
+		String pdetId = "-1";//默认设置为-1
+		RecordSet rs = new RecordSet();
+		rs.executeQuery("select * from hrmdepartment where departmentcode = ?", deptCode);
+		while (rs.next()) {
+			pdetId = Util.null2String(rs.getString("ID"));
+		}
+		return pdetId;
+	}
+	
+	//查询部门自定义字段需要同步的字段名称
+	public String getColumnName() {
+		String columnNames = "";//默认设置为-1
+		RecordSet rs = new RecordSet();
+		rs.execute("select * from uf_definded_data where type = 0");
+		while (rs.next()) {
+			columnNames = Util.null2String(rs.getString("TRANS_STR"));
+		}
+		return columnNames;
+	}
+	
+	//查询需转换的多人力资源字段
+	public List<String> getHrmList(){
+		List<String> list = new ArrayList<String>();//插入部门自定义表的自定义字段的sql语句
+		RecordSet rs = new RecordSet();
+		rs.execute("select * from uf_definded_data where type = 4");
+		while (rs.next()) {
+			list.add(Util.null2String(rs.getString("TRANS_STR")));
+		}
+		return list;
+	}
+	
+	/**
+	 * 通过人员编号查询人员id,将返回信息保存到map中返回给调用函数
+	 * @param workCodes 员工编号集合例子 : a,b,c
+	 * @return 查询的信息,成功或失败信息
+	 */
+	public Map<String,String> getUserIdByCodes(String workCodes){
+		//保存通过人员编号查询人员信息的结果
+		log.writeLog("workCodes="+workCodes);
+		Map<String,String> map = new HashMap<String,String>();
+		String status = "0";//默认为0,表示根据编号查的员工全部存在
+		String[] codeArr = workCodes.split(",");
+		StringBuffer msg = new StringBuffer();
+		RecordSet rs = new RecordSet();
+		for (int i=0;i<codeArr.length;i++) {
+			rs.executeQuery("select * from hrmresource where workcode = ?",codeArr[i]);
+			String userId = "";
+			while (rs.next()) {
+				userId = Util.null2String(rs.getInt("ID"));
+			}
+			if (!userId.isEmpty()) {//查到有人员信息
+				msg.append(userId).append(",");
+			} else {
+				status = "1";//为1,表示根据编号查的员工不存在
+				msg.append("存在编号为["+codeArr[i]+"]的员工编号在OA不存在!");
+			}
+		}
+		map.put("status", status);
+		map.put("msg", msg.substring(0, msg.length()-1));
+		return map;
+	}
+	
+}
diff --git a/src/main/youhong_ai_jitu_src/com/working/webservices/util/SubComUtil.java b/src/main/youhong_ai_jitu_src/com/working/webservices/util/SubComUtil.java
new file mode 100644
index 0000000..9f16d98
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/com/working/webservices/util/SubComUtil.java
@@ -0,0 +1,37 @@
+package com.working.webservices.util;
+
+import com.working.util.LogTool;
+
+import weaver.conn.RecordSet;
+import weaver.general.Util;
+
+public class SubComUtil {
+	
+	LogTool log = new LogTool("/log/matrix/", false);
+	
+	//根据分部编号查询分部是否存在,存在返回分部id
+	public String selectSubCom(String subComCode) {
+		String subComId = "-1";//默认设置为-1
+		RecordSet rs = new RecordSet();
+		rs.executeQuery("select * from hrmsubcompany where subcompanycode = ?", subComCode);
+		while (rs.next()) {
+			subComId = Util.null2String(rs.getString("ID"));
+		}
+		return subComId;
+	}
+	
+	//查询分部自定义字段需要同步的字段名称
+	public String getColumnName() {
+		String columnNames = "";//默认设置为-1
+		RecordSet rs = new RecordSet();
+		rs.execute("select * from uf_definded_data where type = 1");
+		while (rs.next()) {
+			columnNames = Util.null2String(rs.getString("TRANS_STR"));
+		}
+		return columnNames;
+	}
+	
+}
+
+
+
diff --git a/src/main/youhong_ai_jitu_src/jntchina/action/BorrowOrderAction.java b/src/main/youhong_ai_jitu_src/jntchina/action/BorrowOrderAction.java
new file mode 100644
index 0000000..a1ce293
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/action/BorrowOrderAction.java
@@ -0,0 +1,327 @@
+package jntchina.action;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
+
+
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.serializer.SerializerFeature;
+import com.working.util.WorkflowUtil;
+
+import jntchina.entity.BorrowOrder;
+import jntchina.entity.BorrowOrderBody;
+import jntchina.util.HttpClientToDC;
+import selfdev.util.base.BaseUtil;
+import selfdev.util.base.TimeCommonUtil;
+import selfdev.util.log.LogTool;
+import weaver.conn.RecordSet;
+import weaver.file.Prop;
+import weaver.general.Util;
+import weaver.hrm.resource.ResourceComInfo;
+import weaver.interfaces.workflow.action.Action;
+import weaver.interfaces.workflow.action.BaseAction;
+import weaver.soa.workflow.request.RequestInfo;
+
+/**
+ * @Author Administrator
+ * @Description 借款申请单数据传入NCC生成单据
+ * @Date 2021/1/8  12:14
+ */
+public class BorrowOrderAction extends BaseAction {
+
+	@Override
+    public String execute(RequestInfo requestInfo) {
+        String src = requestInfo.getRequestManager().getSrc();//获取操作方式
+        if (!"submit".equals(src)) { // 只有submit才执行接口
+            return SUCCESS;
+        }
+        LogTool log = new LogTool("/log/selfdev/action", false);
+        String requestId = requestInfo.getRequestid(); // 获取requestid
+        String workflowid=requestInfo.getWorkflowid();
+        log.writeLog("--------借款申请单数据传入中台开始----requestId值为：" + requestId);
+
+        //获取当前用户的登录账号（即工号）
+        String loginid=requestInfo.getRequestManager().getUser().getLoginid();
+        //获取配置文件中的参数
+    	String mode = Prop.getPropValue("DevToDC_jntchina","mode");
+        // 服务器ip：port
+        String baseUrl = Prop.getPropValue("DevToDC_jntchina", mode+"_baseUrl");
+        String url = baseUrl+"/dcnccapi/billLoan/receiveData";
+        BorrowOrder borrowOrder = new BorrowOrder();
+
+        String mainTable = WorkflowUtil.getMainTable(requestId);
+        String pk_org = ""; // JTSDCN0001 //借款单位编码
+        String isShowErrorMsg = "";//写入NCC失败时是否显示报错信息
+        String total = ""; // 1000.00 //合计金额
+        String deptid = ""; // SD3300101 //借款人部门
+        String djlxbm = ""; // 263X-Cxx-DSJKD", //交易类型编码 263X-Cxx-DSJKD:对私借款单    263X-Cxx-DGJKD:对公预付/借款单
+        String djrq = TimeCommonUtil.obtainDate(0); // 2021-03-05 10:17:10", //单据日期
+        String payflag = "1"; //1", //支付状态
+        String paytarget = ""; // 0" //收款对象（0=员工，1=供应商）
+        //String bzbm = "CNY"; // 币种编码，默认为人民币
+        String yxzh = ""; //银行账号(员工)
+        String yxzhjtglgs = ""; //银行账号_集团关联公司
+        String yxzhdlgs = ""; //银行账号_代理公司
+        String receiver = ""; // yonyou88", //收款人(员工)
+        String skyhzh = ""; //收款人银行账号(员工)
+        String custaccount = ""; //收款人银行账号(供应商)
+        String jkbxr = ""; // yonyou88  //借款报销人
+        String operator = ""; // yonyou88  //录入人
+        String jsfs = "";  //结算方式  0现金   3网银 
+        String fkyhzh = ""; //单位银行账户
+        String zy = ""; //借款测试", //事由
+        String djzt = "1"; // 1", //单据状态 1 保存
+        String kjqj = ""; // 03", //会计期间
+        String kjnd = ""; // 2021", //会计年度
+        String zyx1 = ""; // CSBX21020501", //OA单据号
+        String zyx2 = ""; // 提交人
+        String zyx3 = ""; // OA核销单号
+        String zyx5 = ""; // CSBX21020501", // OARequestID
+        String zyx8="";//银行付款备注
+        String zyx9=requestInfo.getRequestManager().getRequestname();//标题
+        String defitem46 = ""; // 网点（成本中心）
+        String xm="";//申请人
+        String bm="";//申请部门
+        String dls="";//代理公司编码
+        String jtglgsbm="";//集团关联公司编码
+        String jklx="";//借款类型
+        String hbbm="";//供应商编码
+        String szxmid = "901038"; // 收支项目  默认为员工借款
+        
+        RecordSet rs = new RecordSet();
+        try {
+            String sql = " select *  from " + mainTable + " where requestid='" + requestId + "'";
+            rs.execute(sql);
+            while (rs.next()) {
+            	isShowErrorMsg = Util.null2String(rs.getString("xrnccsbcsfts"));
+                pk_org = Util.null2String(rs.getString("gsmc")); // 付款公司名称
+                total = Util.null2String(rs.getString("jkje")); // 借款金额   金额由表体相应字段汇总得出
+//                djrq = Util.null2String(rs.getString("cjrq")); // 单据日期   yyyy-mm-dd hh:mm:ss
+                jklx = Util.null2String(rs.getString("jklx")); // 收款对象   
+                xm = Util.null2String(rs.getString("xm")); // 姓名
+                yxzh = Util.null2String(rs.getString("yxzh")).replace(" ", ""); //收款人银行账号
+                dls = Util.null2String(rs.getString("dls")); // 代理公司编码
+                jtglgsbm = Util.null2String(rs.getString("jtglgsbm")); // 集团关联公司编码
+                yxzhdlgs = Util.null2String(rs.getString("yxzhdlgs")); // 银行账号_代理公司
+                yxzhjtglgs = Util.null2String(rs.getString("yxzhjtglgs")); // 银行账号_集团关联公司
+                bm = Util.null2String(rs.getString("bm")); //申请部门
+                jsfs = Util.null2String(rs.getString("zffs")); //结算方式 传输编码
+                fkyhzh = Util.null2String(rs.getString("")); // 付款银行账户 传输编码
+                zy = Util.null2String(rs.getString("jkyy")); //借款原因
+                zyx8 = Util.null2String(rs.getString("yxfkbz")); //银行付款备注
+                zyx1 = Util.null2String(rs.getString("lcbh")); // OA单据号   OA传过来，用于联查单据
+                zyx2 = new ResourceComInfo().getLastname(xm); //提交人姓名
+                zyx3 = Util.null2String(rs.getString("")); // OA核销单号
+                zyx5 = requestId; // OARequestID
+                defitem46 = Util.null2String(rs.getString("cbzx")); // 网点（成本中心）
+            }
+            kjqj = djrq.substring(5,7); //  会计期间
+            kjnd = djrq.substring(0,4); // 会计年度
+            //根据申请部门ID转换查询部门编码
+            deptid=BaseUtil.getBaseInfoByParm("departmentcode", "hrmdepartment", "id", bm, "");
+            //获取员工默认的组织对应的类型
+            String userDefaultCompanyType=BaseUtil.getBaseInfoByParm("company_type", "v_oa_user_org_nsrsbh", "userid", xm, "");
+            //获取付款单选择的组织对应的类型
+            String selectCompanyType=BaseUtil.getBaseInfoByParm("company_type", "uf_businessunit", "code", pk_org, "");
+            log.writeLog("userDefaultCompanyType------>" + userDefaultCompanyType);
+            log.writeLog("selectCompanyType------>" + selectCompanyType);
+            //跨组织，则说明代理区想总部借款
+            if(!userDefaultCompanyType.equals(selectCompanyType)){
+            	if("".equals(userDefaultCompanyType)){
+            		//获取流程名称
+            		String workflowname=BaseUtil.getBaseInfoByParm("workflowname", "workflow_base", "id", workflowid, "");
+            		//若名称中带有“代理区”，则说明员工默认组织类型是代理区
+            		if(workflowname.contains("代理区")){
+            			userDefaultCompanyType="2";
+            		}
+            	}
+            	//查询建模维护的对应关系
+            	String defaultDeptNo=BaseUtil.getBaseInfoByParm("mroabmbm", "uf_kzzfkdybmsz", "sqgslx", userDefaultCompanyType, " and fkgslx='"+selectCompanyType+"'");
+            	log.writeLog("defaultDeptNo------>" + defaultDeptNo);
+            	if(!"".equals(defaultDeptNo)){
+            		deptid=defaultDeptNo;
+            	}
+            }
+            //截取前120位
+            if(zy.length()>120){
+            	zy=zy.substring(0,120);
+            }
+            //标题截取前150位
+            if (zyx9.length() > 150){
+                zyx9 = zyx9.substring(0, 150);
+            }
+            //结算方式
+            if("0".equals(jsfs)){
+            	jsfs = "3"; //网银
+            }else{
+            	jsfs = "0"; //现金
+            }
+            receiver = new ResourceComInfo().getWorkcode(xm); //收款人,与申请人一致
+            jkbxr = receiver; // 借款报销人,与申请人一致
+            //收款对象为员工时，则对应NCC的对私借款单
+            if("0".equals(jklx)){
+            	paytarget="0";//0=员工，1=供应商，2=客户
+            	djlxbm = "263X-Cxx-DSJKD"; // 单据类型编码
+            	skyhzh=yxzh;
+            	//供应商收款信息清空
+            	hbbm="";
+            	custaccount="";
+            }else{//对公借款单
+            	djlxbm = "263X-Cxx-DGJKD"; // 单据类型编码
+            	paytarget="1";//0=员工，1=供应商，2=客户
+            	if("3".equals(jklx)){//集团关联公司
+            		hbbm=jtglgsbm;
+            		szxmid="901062";//经营借款（外部借款）
+            		custaccount=yxzhjtglgs;
+            	}else{
+            		hbbm=dls;
+            		szxmid="901061";//经营借款（内部借款）
+            		custaccount=yxzhdlgs;
+            	}
+            	//员工收款信息清空
+            	receiver="";
+            	skyhzh="";
+            }
+            
+            //获取UUID
+            String uuid=UUID.randomUUID().toString().replace("-", "").toUpperCase();
+            operator = loginid;//当前节点操作者
+            
+            borrowOrder.setUuid(uuid);
+            borrowOrder.setPk_org(pk_org);
+            borrowOrder.setTotal(total);
+            borrowOrder.setDeptid(deptid);
+            borrowOrder.setDjlxbm(djlxbm);
+            borrowOrder.setDjrq(djrq);
+            borrowOrder.setPayflag(payflag);
+            borrowOrder.setPaytarget(paytarget);
+            borrowOrder.setHbbm(hbbm);
+            borrowOrder.setReceiver(receiver);
+            borrowOrder.setJkbxr(jkbxr);
+            borrowOrder.setOperator(operator);
+            borrowOrder.setJsfs(jsfs);
+            borrowOrder.setFkyhzh(fkyhzh);
+            borrowOrder.setSkyhzh(skyhzh);
+            borrowOrder.setCustaccount(custaccount);
+            borrowOrder.setZy(zy);
+            borrowOrder.setDjzt(djzt);
+            borrowOrder.setKjqj(kjqj);
+            borrowOrder.setKjnd(kjnd);
+            borrowOrder.setZyx1(zyx1);
+            borrowOrder.setZyx2(zyx2);
+            borrowOrder.setZyx3(zyx3);
+            borrowOrder.setZyx5(zyx5);
+            borrowOrder.setZyx8(zyx8);
+            borrowOrder.setZyx9(zyx9);
+            log.writeLog("【header数据准备完毕...】");
+
+            List<BorrowOrderBody> borrowOrderBodyList = new ArrayList<BorrowOrderBody>();
+            String tablecode = ""; // jk_busitem
+            String rowno = ""; // 10
+            String defitem50 = ""; // 发票类型
+            String defitem49 = ""; // 发票号码
+            String defitem42 = ""; // OA明细ID
+            String defitem43 = ""; // 车牌号
+            String defitem44 = ""; // 仓库
+            String defitem45 = ""; // 国家
+            
+            String defitem48 = deptid; // SD3300301" //分摊部门
+            BorrowOrderBody body = new BorrowOrderBody();
+            tablecode = "jk_busitem";
+            rowno = "10";
+
+            body.setAmount(total);
+            body.setTablecode(tablecode);
+            body.setRowno(rowno);
+            body.setSzxmid(szxmid);
+            body.setDefitem50(defitem50);
+            body.setDefitem49(defitem49);
+            body.setDefitem42(defitem42);
+            body.setDefitem43(defitem43);
+            body.setDefitem44(defitem44);
+            body.setDefitem45(defitem45);
+            body.setDefitem46(defitem46);
+            body.setDefitem48(defitem48);
+            borrowOrderBodyList.add(body);
+            borrowOrder.setJk_busitem(borrowOrderBodyList);
+            
+            String parm=JSONObject.toJSONString(borrowOrder, SerializerFeature.DisableCircularReferenceDetect);
+            log.writeLog("借款单准备传入数据中台的数据为------>" + parm);
+
+            //获取TOKEN
+            String token = HttpClientToDC.getToken();
+            log.writeLog("获取数据中台的token------>" + token);
+            if ("".equals(Util.null2String(token))) {
+            	String tokenMsg="流程提交失败，未获取到数据中台接口TOKEN，请联系管理员处理！";
+            	//将NCC返回结果回写至OA流程表单
+                rs.execute(" update " + mainTable + " set sfcgscnccfkd = 1 ,nccfhxx='" + tokenMsg.replace("'", "''") + "'  where requestid = " + requestId); 
+                //是否需要显示报错信息
+                if("yes".equals(isShowErrorMsg)){
+                	requestInfo.getRequestManager().setMessagecontent(tokenMsg);
+                    return Action.FAILURE_AND_CONTINUE;
+                }else{
+                	return SUCCESS;
+                }
+            }
+            
+            
+            //调用NCC接口，将数据传给NCC
+            String returndata = HttpClientToDC.sendPostApi(url,token, parm);
+            log.writeLog("【调用数据中台借款接口返回结果result:】" + returndata);
+            if (!"".equals(returndata) && returndata != null) {
+                JSONObject jsonObject = JSONObject.parseObject(returndata);
+                String success = Util.null2String(jsonObject.get("succ"));
+                log.writeLog("--------发送请求返回的success值为：" + success);
+                if ("true".equals(success)) {
+                	JSONObject data = jsonObject.getJSONObject("data");
+                    String billno = Util.null2String(data.get("billno"));//NCC单号
+                    log.writeLog("--------发送请求返回的billno值为：" + billno);
+                    //将NCC返回结果回写至OA流程表单
+                    rs.execute(" update " + mainTable + " set sfcgscnccfkd = 0 , nccfkdh = '" + billno + "',nccfhxx=''  where requestid = " + requestId); 
+                } else {
+                	String message = Util.null2String(jsonObject.get("msg"));
+                	String message2=message.replace("'", "''");
+                	//超出1333个字符，则只截取前面这部分
+                	if(message2.length()>1334){
+                		message2=message2.substring(0,1333);
+                	}
+                	//将NCC返回结果回写至OA流程表单
+                    rs.execute(" update " + mainTable + " set sfcgscnccfkd = 1 ,nccfhxx='" + message2 + "'  where requestid = " + requestId); 
+                    //是否需要显示报错信息
+                    if("yes".equals(isShowErrorMsg)){
+                    	requestInfo.getRequestManager().setMessagecontent("流程数据写入NCC借款单失败,失败信息：<br/>"+message);
+                        return Action.FAILURE_AND_CONTINUE;
+                    }else{
+                    	return SUCCESS;
+                    }
+                }
+            } else {
+            	String ermsg="流程数据写入NCC借款单失败,未获取到接口返回结果，请联系系统管理员处理！";
+            	//将NCC返回结果回写至OA流程表单
+                rs.execute(" update " + mainTable + " set sfcgscnccfkd = 1 ,nccfhxx='" + ermsg.replace("'", "''") + "'  where requestid = " + requestId); 
+                //是否需要显示报错信息
+                if("yes".equals(isShowErrorMsg)){
+                	requestInfo.getRequestManager().setMessagecontent(ermsg);
+                    return Action.FAILURE_AND_CONTINUE;
+                }else{
+                	return SUCCESS;
+                }
+            }
+        } catch (Exception e) {
+        	String ermsg="流程数据生成中台借款单失败,失败信息：<br/>" + e.toString();
+        	//将NCC返回结果回写至OA流程表单
+            rs.execute(" update " + mainTable + " set sfcgscnccfkd = 1 ,nccfhxx='" + ermsg.replace("'", "''") + "'  where requestid = " + requestId); 
+            //是否需要显示报错信息
+            if("yes".equals(isShowErrorMsg)){
+            	requestInfo.getRequestManager().setMessagecontent(ermsg);
+                return Action.FAILURE_AND_CONTINUE;
+            }else{
+            	return SUCCESS;
+            }
+        }
+        log.writeLog("--------借款单数据传入中台完毕----requestId值为：" + requestId);
+        return Action.SUCCESS;
+    }
+    
+}
\ No newline at end of file
diff --git a/src/main/youhong_ai_jitu_src/jntchina/action/BorrowOrderActionYY.java b/src/main/youhong_ai_jitu_src/jntchina/action/BorrowOrderActionYY.java
new file mode 100644
index 0000000..60267e7
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/action/BorrowOrderActionYY.java
@@ -0,0 +1,324 @@
+package jntchina.action;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
+
+
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.serializer.SerializerFeature;
+import com.working.util.WorkflowUtil;
+
+import jntchina.entity.BorrowOrder;
+import jntchina.entity.BorrowOrderBody;
+import jntchina.util.HttpClientToDC;
+import selfdev.util.base.BaseUtil;
+import selfdev.util.base.TimeCommonUtil;
+import selfdev.util.log.LogTool;
+import weaver.conn.RecordSet;
+import weaver.file.Prop;
+import weaver.general.Util;
+import weaver.hrm.resource.ResourceComInfo;
+import weaver.interfaces.workflow.action.Action;
+import weaver.interfaces.workflow.action.BaseAction;
+import weaver.soa.workflow.request.RequestInfo;
+
+/**
+ * @Author Administrator
+ * @Description 借款申请单数据传入NCC生成单据
+ * @Date 2021/1/8  12:14
+ */
+public class BorrowOrderActionYY extends BaseAction {
+
+    @Override
+    public String execute(RequestInfo requestInfo) {
+        String src = requestInfo.getRequestManager().getSrc();//获取操作方式
+        if (!"submit".equals(src)) { // 只有submit才执行接口
+            return SUCCESS;
+        }
+        LogTool log = new LogTool("/log/selfdev/action", false);
+        String requestId = requestInfo.getRequestid(); // 获取requestid
+        String workflowid=requestInfo.getWorkflowid();
+        log.writeLog("--------借款申请单数据传入中台开始----requestId值为：" + requestId);
+
+        //获取当前用户的登录账号（即工号）
+        String loginid=requestInfo.getRequestManager().getUser().getLoginid();
+        //获取配置文件中的参数
+        String mode = Prop.getPropValue("DevToDC_jntchina","mode");
+        // 服务器ip：port
+        String baseUrl = Prop.getPropValue("DevToDC_jntchina", mode+"_baseUrl");
+        String url = baseUrl+"/dcnccapi/billLoan/receiveData";
+        BorrowOrder borrowOrder = new BorrowOrder();
+
+        String mainTable = WorkflowUtil.getMainTable(requestId);
+        String pk_org = ""; // JTSDCN0001 //借款单位编码
+        String isShowErrorMsg = "";//写入NCC失败时是否显示报错信息
+        String total = ""; // 1000.00 //合计金额
+        String deptid = ""; // SD3300101 //借款人部门
+        String djlxbm = ""; // 263X-Cxx-DSJKD", //交易类型编码 263X-Cxx-DSJKD:对私借款单    263X-Cxx-DGJKD:对公预付/借款单
+        String djrq = TimeCommonUtil.obtainDate(0); // 2021-03-05 10:17:10", //单据日期
+        String payflag = "1"; //1", //支付状态
+        String paytarget = ""; // 0" //收款对象（0=员工，1=供应商）
+        //String bzbm = "CNY"; // 币种编码，默认为人民币
+        String yxzh = ""; //银行账号(员工)
+        String yxzhjtglgs = ""; //银行账号_集团关联公司
+        String yxzhdlgs = ""; //银行账号_代理公司
+        String receiver = ""; // yonyou88", //收款人(员工)
+        String skyhzh = ""; //收款人银行账号(员工)
+        String custaccount = ""; //收款人银行账号(供应商)
+        String jkbxr = ""; // yonyou88  //借款报销人
+        String operator = ""; // yonyou88  //录入人
+        String jsfs = "";  //结算方式  0现金   3网银
+        String fkyhzh = ""; //单位银行账户
+        String zy = ""; //借款测试", //事由
+        String djzt = "1"; // 1", //单据状态 1 保存
+        String kjqj = ""; // 03", //会计期间
+        String kjnd = ""; // 2021", //会计年度
+        String zyx1 = ""; // CSBX21020501", //OA单据号
+        String zyx2 = ""; // 提交人
+        String zyx3 = ""; // OA核销单号
+        String zyx5 = ""; // CSBX21020501", // OARequestID
+        String zyx8="";//银行付款备注
+//        String zyx9=requestInfo.getRequestManager().getRequestname();//标题
+        String zyx9=requestInfo.getRequestManager().getRequestname().length()>140?requestInfo.getRequestManager().getRequestname().substring(0,140):requestInfo.getRequestManager().getRequestname();//标题
+
+        String defitem46 = ""; // 网点（成本中心）
+        String xm="";//申请人
+        String bm="";//申请部门
+        String dls="";//代理公司编码
+        String jtglgsbm="";//集团关联公司编码
+        String jklx="";//借款类型
+        String hbbm="";//供应商编码
+        String szxmid = "901038"; // 收支项目  默认为员工借款
+
+        RecordSet rs = new RecordSet();
+        try {
+            String sql = " select *  from " + mainTable + " where requestid='" + requestId + "'";
+            rs.execute(sql);
+            while (rs.next()) {
+                isShowErrorMsg = Util.null2String(rs.getString("xrnccsbcsfts"));
+                pk_org = Util.null2String(rs.getString("gsmc")); // 付款公司名称
+                total = Util.null2String(rs.getString("jkje")); // 借款金额   金额由表体相应字段汇总得出
+//                djrq = Util.null2String(rs.getString("cjrq")); // 单据日期   yyyy-mm-dd hh:mm:ss
+                jklx = Util.null2String(rs.getString("jklx")); // 收款对象
+                xm = Util.null2String(rs.getString("xm")); // 姓名
+                yxzh = Util.null2String(rs.getString("yxzh")).replace(" ", ""); //收款人银行账号
+                dls = Util.null2String(rs.getString("dls")); // 代理公司编码
+                jtglgsbm = Util.null2String(rs.getString("jtglgsbm")); // 集团关联公司编码
+                yxzhdlgs = Util.null2String(rs.getString("yxzhdlgs")); // 银行账号_代理公司
+                yxzhjtglgs = Util.null2String(rs.getString("yxzhjtglgs")); // 银行账号_集团关联公司
+                bm = Util.null2String(rs.getString("bm")); //申请部门
+                jsfs = Util.null2String(rs.getString("zffs")); //结算方式 传输编码
+                fkyhzh = Util.null2String(rs.getString("")); // 付款银行账户 传输编码
+                zy = Util.null2String(rs.getString("jkyy")); //借款原因
+                zyx8 = Util.null2String(rs.getString("yxfkbz")); //银行付款备注
+                zyx1 = Util.null2String(rs.getString("lcbh")); // OA单据号   OA传过来，用于联查单据
+                zyx2 = new ResourceComInfo().getLastname(xm); //提交人姓名
+                zyx3 = Util.null2String(rs.getString("")); // OA核销单号
+                zyx5 = requestId; // OARequestID
+                defitem46 = Util.null2String(rs.getString("cbzx")); // 网点（成本中心）
+            }
+            kjqj = djrq.substring(5,7); //  会计期间
+            kjnd = djrq.substring(0,4); // 会计年度
+            //根据申请部门ID转换查询部门编码
+            deptid=BaseUtil.getBaseInfoByParm("departmentcode", "hrmdepartment", "id", bm, "");
+            //获取员工默认的组织对应的类型
+            String userDefaultCompanyType=BaseUtil.getBaseInfoByParm("company_type", "v_oa_user_org_nsrsbh", "userid", xm, "");
+            //获取付款单选择的组织对应的类型
+            String selectCompanyType=BaseUtil.getBaseInfoByParm("company_type", "uf_businessunit", "code", pk_org, "");
+            log.writeLog("userDefaultCompanyType------>" + userDefaultCompanyType);
+            log.writeLog("selectCompanyType------>" + selectCompanyType);
+            //跨组织，则说明代理区想总部借款
+            if(!userDefaultCompanyType.equals(selectCompanyType)){
+                if("".equals(userDefaultCompanyType)){
+                    //获取流程名称
+                    String workflowname=BaseUtil.getBaseInfoByParm("workflowname", "workflow_base", "id", workflowid, "");
+                    //若名称中带有“代理区”，则说明员工默认组织类型是代理区
+                    if(workflowname.contains("代理区")){
+                        userDefaultCompanyType="2";
+                    }
+                }
+                //查询建模维护的对应关系
+                String defaultDeptNo=BaseUtil.getBaseInfoByParm("mroabmbm", "uf_kzzfkdybmsz", "sqgslx", userDefaultCompanyType, " and fkgslx='"+selectCompanyType+"'");
+                log.writeLog("defaultDeptNo------>" + defaultDeptNo);
+                if(!"".equals(defaultDeptNo)){
+                    deptid=defaultDeptNo;
+                }
+            }
+            //截取前120位
+            if(zy.length()>120){
+                zy=zy.substring(0,120);
+            }
+            //结算方式
+            if("0".equals(jsfs)){
+                jsfs = "3"; //网银
+            }else{
+                jsfs = "0"; //现金
+            }
+            receiver = new ResourceComInfo().getWorkcode(xm); //收款人,与申请人一致
+            jkbxr = receiver; // 借款报销人,与申请人一致
+            //收款对象为员工时，则对应NCC的对私借款单
+            if("0".equals(jklx)){
+                paytarget="0";//0=员工，1=供应商，2=客户
+                djlxbm = "263X-Cxx-DSJKD"; // 单据类型编码
+                skyhzh=yxzh;
+                //供应商收款信息清空
+                hbbm="";
+                custaccount="";
+            }else{//对公借款单
+                djlxbm = "263X-Cxx-DGJKD"; // 单据类型编码
+                paytarget="1";//0=员工，1=供应商，2=客户
+                if("3".equals(jklx)){//集团关联公司
+                    hbbm=jtglgsbm;
+                    szxmid="901062";//经营借款（外部借款）
+                    custaccount=yxzhjtglgs;
+                }else{
+                    hbbm=dls;
+                    szxmid="901061";//经营借款（内部借款）
+                    custaccount=yxzhdlgs;
+                }
+                //员工收款信息清空
+                receiver="";
+                skyhzh="";
+            }
+
+            //获取UUID
+            String uuid=UUID.randomUUID().toString().replace("-", "").toUpperCase();
+            operator = loginid;//当前节点操作者
+
+            borrowOrder.setUuid(uuid);
+            borrowOrder.setPk_org(pk_org);
+            borrowOrder.setTotal(total);
+            borrowOrder.setDeptid(deptid);
+            borrowOrder.setDjlxbm(djlxbm);
+            borrowOrder.setDjrq(djrq);
+            borrowOrder.setPayflag(payflag);
+            borrowOrder.setPaytarget(paytarget);
+            borrowOrder.setHbbm(hbbm);
+            borrowOrder.setReceiver(receiver);
+            borrowOrder.setJkbxr(jkbxr);
+            borrowOrder.setOperator(operator);
+            borrowOrder.setJsfs(jsfs);
+            borrowOrder.setFkyhzh(fkyhzh);
+            borrowOrder.setSkyhzh(skyhzh);
+            borrowOrder.setCustaccount(custaccount);
+            borrowOrder.setZy(zy);
+            borrowOrder.setDjzt(djzt);
+            borrowOrder.setKjqj(kjqj);
+            borrowOrder.setKjnd(kjnd);
+            borrowOrder.setZyx1(zyx1);
+            borrowOrder.setZyx2(zyx2);
+            borrowOrder.setZyx3(zyx3);
+            borrowOrder.setZyx5(zyx5);
+            borrowOrder.setZyx8(zyx8);
+            borrowOrder.setZyx9(zyx9);
+            log.writeLog("【header数据准备完毕...】");
+
+            List<BorrowOrderBody> borrowOrderBodyList = new ArrayList<BorrowOrderBody>();
+            String tablecode = ""; // jk_busitem
+            String rowno = ""; // 10
+            String defitem50 = ""; // 发票类型
+            String defitem49 = ""; // 发票号码
+            String defitem42 = ""; // OA明细ID
+            String defitem43 = ""; // 车牌号
+            String defitem44 = ""; // 仓库
+            String defitem45 = ""; // 国家
+
+            String defitem48 = deptid; // SD3300301" //分摊部门
+            BorrowOrderBody body = new BorrowOrderBody();
+            tablecode = "jk_busitem";
+            rowno = "10";
+
+            body.setAmount(total);
+            body.setTablecode(tablecode);
+            body.setRowno(rowno);
+            body.setSzxmid(szxmid);
+            body.setDefitem50(defitem50);
+            body.setDefitem49(defitem49);
+            body.setDefitem42(defitem42);
+            body.setDefitem43(defitem43);
+            body.setDefitem44(defitem44);
+            body.setDefitem45(defitem45);
+            body.setDefitem46(defitem46);
+            body.setDefitem48(defitem48);
+            borrowOrderBodyList.add(body);
+            borrowOrder.setJk_busitem(borrowOrderBodyList);
+
+            String parm=JSONObject.toJSONString(borrowOrder, SerializerFeature.DisableCircularReferenceDetect);
+            log.writeLog("借款单准备传入数据中台的数据为------>" + parm);
+
+            //获取TOKEN
+            String token = HttpClientToDC.getToken();
+            log.writeLog("获取数据中台的token------>" + token);
+            if ("".equals(Util.null2String(token))) {
+                String tokenMsg="流程提交失败，未获取到数据中台接口TOKEN，请联系管理员处理！";
+                //将NCC返回结果回写至OA流程表单
+                rs.execute(" update " + mainTable + " set sfcgscnccfkd = 1 ,nccfhxx='" + tokenMsg.replace("'", "''") + "'  where requestid = " + requestId);
+                //是否需要显示报错信息
+                if("yes".equals(isShowErrorMsg)){
+                    requestInfo.getRequestManager().setMessagecontent(tokenMsg);
+                    return Action.FAILURE_AND_CONTINUE;
+                }else{
+                    return SUCCESS;
+                }
+            }
+
+
+            //调用NCC接口，将数据传给NCC
+            String returndata = HttpClientToDC.sendPostApi(url,token, parm);
+            log.writeLog("【调用数据中台借款接口返回结果result:】" + returndata);
+            if (!"".equals(returndata) && returndata != null) {
+                JSONObject jsonObject = JSONObject.parseObject(returndata);
+                String success = Util.null2String(jsonObject.get("succ"));
+                log.writeLog("--------发送请求返回的success值为：" + success);
+                if ("true".equals(success)) {
+                    JSONObject data = jsonObject.getJSONObject("data");
+                    String billno = Util.null2String(data.get("billno"));//NCC单号
+                    log.writeLog("--------发送请求返回的billno值为：" + billno);
+                    //将NCC返回结果回写至OA流程表单
+                    rs.execute(" update " + mainTable + " set sfcgscnccfkd = 0 , nccfkdh = '" + billno + "',nccfhxx=''  where requestid = " + requestId);
+                } else {
+                    String message = Util.null2String(jsonObject.get("msg"));
+                    String message2=message.replace("'", "''");
+                    //超出1333个字符，则只截取前面这部分
+                    if(message2.length()>1334){
+                        message2=message2.substring(0,1333);
+                    }
+                    //将NCC返回结果回写至OA流程表单
+                    rs.execute(" update " + mainTable + " set sfcgscnccfkd = 1 ,nccfhxx='" + message2 + "'  where requestid = " + requestId);
+                    //是否需要显示报错信息
+                    if("yes".equals(isShowErrorMsg)){
+                        requestInfo.getRequestManager().setMessagecontent("流程数据写入NCC借款单失败,失败信息：<br/>"+message);
+                        return Action.FAILURE_AND_CONTINUE;
+                    }else{
+                        return SUCCESS;
+                    }
+                }
+            } else {
+                String ermsg="流程数据写入NCC借款单失败,未获取到接口返回结果，请联系系统管理员处理！";
+                //将NCC返回结果回写至OA流程表单
+                rs.execute(" update " + mainTable + " set sfcgscnccfkd = 1 ,nccfhxx='" + ermsg.replace("'", "''") + "'  where requestid = " + requestId);
+                //是否需要显示报错信息
+                if("yes".equals(isShowErrorMsg)){
+                    requestInfo.getRequestManager().setMessagecontent(ermsg);
+                    return Action.FAILURE_AND_CONTINUE;
+                }else{
+                    return SUCCESS;
+                }
+            }
+        } catch (Exception e) {
+            String ermsg="流程数据生成中台借款单失败,失败信息：<br/>" + e.toString();
+            //将NCC返回结果回写至OA流程表单
+            rs.execute(" update " + mainTable + " set sfcgscnccfkd = 1 ,nccfhxx='" + ermsg.replace("'", "''") + "'  where requestid = " + requestId);
+            //是否需要显示报错信息
+            if("yes".equals(isShowErrorMsg)){
+                requestInfo.getRequestManager().setMessagecontent(ermsg);
+                return Action.FAILURE_AND_CONTINUE;
+            }else{
+                return SUCCESS;
+            }
+        }
+        log.writeLog("--------借款单数据传入中台完毕----requestId值为：" + requestId);
+        return Action.SUCCESS;
+    }
+}
\ No newline at end of file
diff --git a/src/main/youhong_ai_jitu_src/jntchina/action/BusinessTripChangeAction.java b/src/main/youhong_ai_jitu_src/jntchina/action/BusinessTripChangeAction.java
new file mode 100644
index 0000000..2090d8f
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/action/BusinessTripChangeAction.java
@@ -0,0 +1,60 @@
+package jntchina.action;
+
+import com.working.util.WorkflowUtil;
+
+import selfdev.util.base.TimeUtil;
+import selfdev.util.log.LogTool;
+import weaver.conn.RecordSet;
+import weaver.general.Util;
+import weaver.soa.workflow.request.RequestInfo;
+import weaver.workflow.action.BaseAction;
+
+/**
+ * 出差申请变更时更新流程表单数据
+ * @author KangMD
+ * 2021-08-09
+ */
+public class BusinessTripChangeAction extends BaseAction {
+
+    @Override
+    public String execute(RequestInfo requestInfo) {
+        LogTool log = new LogTool("/log/selfdev/action", false);
+        log.writeLog("-----------------------开始OA出差申请变更时，删除明细行-----------------------");
+        String requestId = requestInfo.getRequestid(); //获取requestid
+        log.writeLog("------------requestId值为：" + requestId);
+        String mainTable = WorkflowUtil.getMainTable(requestId);
+        String mainid = ""; // 
+        RecordSet rs = new RecordSet();
+        String sql = " select *  from " + mainTable + " where requestid='" + requestId + "'";
+        rs.execute(sql);
+        while (rs.next()) {
+        	mainid=Util.null2String(rs.getString("id"));
+        }
+        //获取获取系统当前时间
+        String nowDate=TimeUtil.obtainDate(0).substring(0,10);
+        //将数据插入历史记录表
+        
+        //插入机票明细至历史记录表
+        rs.execute("insert into "+mainTable+"_dt5(MAINID,BGCZRQ,CCRY,CFD,DDD,HBLX,CFRQ,FCRQ,BZ) "
+        		+ "select MAINID,'"+nowDate+"',CCRY,CFD,DDD,HBLX,CFRQ,FCRQ,BZ from "+mainTable+"_dt1 where mainid="+mainid);
+        //插入酒店明细至历史记录表
+        rs.execute("insert into "+mainTable+"_dt6(MAINID,BGCZRQ,ccry,rzrq,ldrq,rzcs,BZ) "
+        		+ "select MAINID,'"+nowDate+"',ccry,rzrq,ldrq,rzcs,BZ from "+mainTable+"_dt2 where mainid="+mainid);
+        //插入火车明细至历史记录表
+        rs.execute("insert into "+mainTable+"_dt7(MAINID,BGCZRQ,ccry,cfrq,cfcs,ddcs,BZ) "
+        		+ "select MAINID,'"+nowDate+"',ccry,cfksrq,cfcs,ddcs,BZ from "+mainTable+"_dt3 where mainid="+mainid);
+        //插入用车明细至历史记录表
+        rs.execute("insert into "+mainTable+"_dt8(MAINID,BGCZRQ,ycry,ksrq,jsrq,yccs,BZ) "
+        		+ "select MAINID,'"+nowDate+"',ycry,ksrq,jsrq,yccs,BZ from "+mainTable+"_dt4 where mainid="+mainid);
+        
+        //删除已填写的历史明细
+//        rs.execute("delete from "+mainTable+"_dt1 where mainid="+mainid);
+//        rs.execute("delete from "+mainTable+"_dt2 where mainid="+mainid);
+//        rs.execute("delete from "+mainTable+"_dt3 where mainid="+mainid);
+//        rs.execute("delete from "+mainTable+"_dt4 where mainid="+mainid);
+        //将“行程是否已修改过”更新为是
+        rs.execute("update "+mainTable+" set xcsfyxgg=0,xczt=null where requestid="+requestId);
+        
+        return SUCCESS;
+    }
+}
\ No newline at end of file
diff --git a/src/main/youhong_ai_jitu_src/jntchina/action/BusinessTripIntoHRAction.java b/src/main/youhong_ai_jitu_src/jntchina/action/BusinessTripIntoHRAction.java
new file mode 100644
index 0000000..baf87b0
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/action/BusinessTripIntoHRAction.java
@@ -0,0 +1,211 @@
+package jntchina.action;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.serializer.SerializerFeature;
+import com.working.third.JwtUtil;
+import com.working.util.HttpManager;
+import com.working.util.WorkflowUtil;
+import selfdev.util.log.LogTool;
+import weaver.conn.RecordSet;
+import weaver.file.Prop;
+import weaver.general.Util;
+import weaver.soa.workflow.request.RequestInfo;
+import weaver.workflow.action.BaseAction;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Author Administrator
+ * @Description OA出差申请数据写入东宝HR系统
+ * @Date 2020/10/20  16:26
+ * <p>
+ *     这两个值后需要写在配置文件中
+ * 正式环境
+ * https://hr.jtexpress.com.cn
+ * clientId：TPFKAGB3QGPM2LBD
+ * 测试环境
+ * http://121.36.223.187:8093
+ * clientId: P3F28BIFKGFL0ANX
+ */
+public class BusinessTripIntoHRAction extends BaseAction {
+
+    @Override
+    public String execute(RequestInfo requestInfo) {
+        LogTool log = new LogTool("/log/selfdev/action", false);
+        log.writeLog("-----------------------开始OA出差申请数据写入东宝HR系统-----------------------");
+        String requestId = requestInfo.getRequestid(); //获取requestid
+        log.writeLog("------------requestId值为：" + requestId);
+
+        //获取配置文件中的参数
+        String mode = Prop.getPropValue("db_work_china","mode");
+
+        String mainTable = WorkflowUtil.getMainTable(requestId);
+
+        String clientId = Prop.getPropValue("db_work_china", mode+"_clientId");
+//        String clientId = "P3F28BIFKGFL0ANX";
+        String secret = Prop.getPropValue("db_work_china", mode+"_secret");
+        int second = Integer.parseInt(Prop.getPropValue("db_work_china", mode+"_second"));
+
+        String batchCardDataUrl = Prop.getPropValue("db_work_china", mode+"_batchCardDataUrl");
+//        String batchCardDataUrl = "http://121.36.223.187:8093/third/api";
+
+        String code = Prop.getPropValue("db_work_china", mode+"_code");
+        String moduleCode = Prop.getPropValue("db_work_china", mode+"_moduleCode");
+//        String code = "saveBusinessTripOrderToThirdNew";
+//        String moduleCode = "attBusinessTripOrderService";
+        String token = JwtUtil.createThirdToken(clientId, secret, second).getToken();
+
+        HashMap<String, String> headMap = new HashMap<String, String>(); // 存放head的值
+        headMap.put("code", code);
+        headMap.put("moduleCode", moduleCode);
+        headMap.put("token", token);
+        headMap.put("clientId", clientId);
+
+        HashMap<String, Object> bodyMap = new HashMap<String, Object>(); // 存放body的值
+
+        String userId = ""; // 申请人id
+        String workCode = ""; //人员编号
+
+        String trip_category = "2"; // 出差类型(1-外出，2-出差)
+        String trip_area = ""; // 出差区域(1-市内，2-省内，3-国内，4-海外)  暂时只分3和4
+        String trip_way = "4"; // 出差方式(1-整天，2-上半天，3-下半天，4-连续时间段，5-每天固定时间)
+
+        String begin_date = ""; // 开始日期
+        String end_date = ""; // 结束日期
+        String begin_time = ""; // 开始时间
+        String end_time = ""; // 结束时间
+        String reason = ""; // 出差事由
+        String origin = ""; // 出发地
+        String destination = ""; // 目的地
+
+        String is_overtime = "1"; // 是否出差计加班（默认传入1）
+        String audit_status = "5"; // 提交状态 0-保存 1-提交  5-无需审核
+
+        RecordSet rs = new RecordSet();
+        String sql = " select *  from " + mainTable + " where requestid='" + requestId + "'";
+        rs.execute(sql);
+        while (rs.next()) {
+            HashMap<String, Object> empOrderMap = new HashMap<String, Object>(); // 存放empOrder的值
+            HashMap<String, Object> businessTripOrderMap = new HashMap<String, Object>(); // 存放businessTripOrder的值
+
+            userId = Util.null2String(rs.getString("sqr"));// 人员转换唯一标识
+            workCode = Util.null2String(WorkflowUtil.getUserInfo(userId).get("workcode"));
+            log.writeLog("------------人员转换唯一标识值为：" + workCode);
+
+            String trip_area1 = Util.null2String(rs.getString("cclb")); // 出差类别
+            if ("0".equals(trip_area1)) {
+                trip_area = "3"; // 国内
+            }
+            if ("1".equals(trip_area1)) {
+                trip_area = "4"; // 国外
+            }
+            
+            
+            begin_date = Util.null2String(rs.getString("ksrq")); // 开始日期
+            end_date = Util.null2String(rs.getString("jsrq1")); // 结束日期
+            begin_time = Util.null2String(rs.getString("kssj")); // 开始时间
+            end_time = Util.null2String(rs.getString("jssj")); // 结束时间
+            
+            reason = Util.null2String(rs.getString("ccsy")); // 出差事由
+            origin = Util.null2String(rs.getString("cfd")); // 出发地
+            destination = Util.null2String(rs.getString("mdd")); // 目的地
+
+//            String[] s = begin_date.split(" ");
+//            begin_time = s[1];
+//            String[] s1 = end_date.split(" ");
+//            end_time = s1[1];
+
+            List<Map<String, String>> scheduleList = new ArrayList<Map<String, String>>(); // 出差行程记录
+            Map<String, String> scheduleMap1 = new HashMap<String, String>();
+            scheduleMap1.put("name", "出发地");
+            scheduleMap1.put("place", origin);
+            scheduleMap1.put("longitude", "");
+            scheduleMap1.put("latitude", "");
+            scheduleMap1.put("id", "");
+
+            Map<String, String> scheduleMap2 = new HashMap<String, String>();
+            scheduleMap2.put("name", "目的地");
+            scheduleMap2.put("place", destination);
+            scheduleMap2.put("longitude", "");
+            scheduleMap2.put("latitude", "");
+            scheduleMap2.put("id", "");
+            scheduleList.add(scheduleMap1);
+            scheduleList.add(scheduleMap2);
+
+            log.writeLog("------------出差类型值为：" + trip_category);
+            log.writeLog("------------出差区域值为：" + trip_area);
+            log.writeLog("------------出差方式值为：" + trip_way);
+            log.writeLog("------------开始日期值为：" + begin_date);
+            log.writeLog("------------结束日期值为：" + end_date);
+            log.writeLog("------------开始时间值为：" + begin_time);
+            log.writeLog("------------结束时间值为：" + end_time);
+            log.writeLog("------------出差事由值为：" + reason);
+            log.writeLog("------------出发地值为：" + origin);
+            log.writeLog("------------目的地值为：" + destination);
+
+            empOrderMap.put("empKey", workCode);
+            empOrderMap.put("empRule", "1"); // 人员转换规则(0-无，1-工号，2-身份证，3邮箱，4-手机号码)
+
+            businessTripOrderMap.put("trip_category", trip_category);
+            businessTripOrderMap.put("trip_area", trip_area);
+            businessTripOrderMap.put("trip_way", trip_way);
+            businessTripOrderMap.put("begin_date", begin_date);
+            businessTripOrderMap.put("end_date", end_date);
+            businessTripOrderMap.put("begin_time", begin_time);
+            businessTripOrderMap.put("end_time", end_time);
+            businessTripOrderMap.put("reason", reason);
+
+            businessTripOrderMap.put("is_overtime", is_overtime);
+            businessTripOrderMap.put("audit_status", audit_status);
+            businessTripOrderMap.put("isChangeTripOrder", false); // 是否变更出差单（默认传入false）
+
+            businessTripOrderMap.put("scheduleList", scheduleList);
+
+            empOrderMap.put("businessTripOrder", businessTripOrderMap);
+            bodyMap.put("empOrder", empOrderMap);
+        }
+
+        HashMap<String, Object> paramMap = new HashMap<String, Object>();
+        paramMap.put("header", headMap);
+        paramMap.put("body", bodyMap);
+
+        try {
+            String param = JSON.toJSONString(paramMap, SerializerFeature.DisableCircularReferenceDetect);
+            log.writeLog("---------------paramMap的值为：" + param);
+            String result = HttpManager.postMap(batchCardDataUrl, headMap, param);
+            log.writeLog("-----------发送请求返回的结果值为：" + result);
+
+            JSONObject jsonObject = JSONObject.parseObject(result);
+            String returnCode = Util.null2String(jsonObject.get("code"));
+            String data = Util.null2String(jsonObject.get("data"));
+            String message = Util.null2String(jsonObject.get("message"));
+            String id = Util.null2String(jsonObject.get("id"));
+
+            log.writeLog("--------发送请求返回的code值为：" + returnCode);
+            log.writeLog("--------发送请求返回的数据值为：" + data);
+            log.writeLog("--------发送请求返回的信息为：" + message);
+            log.writeLog("--------发送请求返回的id值为：" + id);
+
+            if (!"".equals(result) && result != null) {
+                if ("200".equals(returnCode)) {
+                    return SUCCESS;
+                } else {
+                    requestInfo.getRequestManager().setMessagecontent("写入HR系统失败，失败信息为：" + message);
+                    return "0";
+                }
+            } else {
+                requestInfo.getRequestManager().setMessagecontent("写入HR系统失败，发送请求返回的结果值为" + result);
+                return "0";
+            }
+
+        } catch (IOException ioException) {
+            requestInfo.getRequestManager().setMessagecontent("发生异常了，写入HR系统失败");
+            return "0";
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/main/youhong_ai_jitu_src/jntchina/action/CarApplicationAction.java b/src/main/youhong_ai_jitu_src/jntchina/action/CarApplicationAction.java
new file mode 100644
index 0000000..4efda47
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/action/CarApplicationAction.java
@@ -0,0 +1,341 @@
+package jntchina.action;
+
+import com.alibaba.fastjson.JSONObject;
+import com.working.util.WorkflowUtil;
+
+import jntchina.entity.BorrowOrder;
+import jntchina.entity.BorrowOrderBody;
+import jntchina.entity.ReimbursementOrder;
+import jntchina.entity.ReimbursementOrderBody;
+import jntchina.util.HttpClientToDC;
+import selfdev.util.base.BaseUtil;
+import selfdev.util.log.LogTool;
+import weaver.conn.RecordSet;
+import weaver.file.Prop;
+import weaver.general.Util;
+import weaver.interfaces.workflow.action.Action;
+import weaver.soa.workflow.request.RequestInfo;
+import weaver.workflow.action.BaseAction;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
+
+import org.apache.commons.lang3.StringEscapeUtils;
+
+/**
+ * @Author Administrator
+ * @Description 汽运承运商付款申请写入中台生成NCC对公报销单或者对公借款单
+ * @Date 2021/3/2  11:50
+ */
+public class CarApplicationAction extends BaseAction {
+    @Override
+    public String execute(RequestInfo requestInfo) {
+        String src = requestInfo.getRequestManager().getSrc();//获取操作方式
+        if (!"submit".equals(src)) { // 只有submit才执行接口
+            return SUCCESS;
+        }
+        LogTool log = new LogTool("/log/selfdev/action", false);
+        String requestId = requestInfo.getRequestid(); // 获取requestid
+        log.writeLog("--------汽运承运商付款申请数据传入NCC开始----requestId值为：" + requestId);
+        //获取当前用户的登录账号（即工号）
+        String loginid=requestInfo.getRequestManager().getUser().getLoginid();
+        //获取配置文件中的参数
+    	String mode = Prop.getPropValue("DevToDC_jntchina","mode");
+        // 服务器ip：port
+        String baseUrl = Prop.getPropValue("DevToDC_jntchina", mode+"_baseUrl");
+        //String url = baseUrl+ "/dcoaapi/claimForm/receiveData";
+        String url = baseUrl+ "/dcnccapi/claimForm/receiveData";
+//        List<ReimbursementOrder> reimbursementList=new ArrayList<ReimbursementOrder>();
+        ReimbursementOrder reimbursementOrder = new ReimbursementOrder();
+        
+//        List<BorrowOrder> borrowList=new ArrayList<BorrowOrder>();
+        BorrowOrder borrowOrder = new BorrowOrder();
+        
+        String mainTable = WorkflowUtil.getMainTable(requestId);
+        String mainId = "";
+        String fygsbm = ""; // 申请部门
+        String pk_org = ""; // 报销单位 JTSDCN0001
+        String total = ""; // 报销金额   金额由表体相应字段汇总得出
+        String deptid = ""; // 部门   传输编码
+        String djlxbm = "264X-Cxx-DGBXD"; // 单据类型编码  默认 对公报销单:264X-Cxx-DGBXD
+        String djlxmc = "对公报销单"; // 单据类型名称  默认 对公报销单
+        String djrq = ""; // 单据日期   yyyy-mm-dd hh:mm:ss
+        String payflag = ""; // 支付状态
+        String paytarget = "1"; // 受款对象   0=员工，1=供应商，2=客户
+        String hbbm = ""; //供应商编码
+        String sfyfp = ""; // 是否有发票
+        String receiver = ""; // 收款人
+        String skyhzh = ""; // 收款人银行账号(员工)
+        String custaccount = ""; // 收款人银行账号(供应商)
+        String jkbxr = ""; // 借款报销人   传输编码
+        String operator = ""; // 录入人
+        String jsfs = "3"; // 结算方式 3 网银
+        String fkyhzh = ""; // 单位银行账户 传输编码
+        String jobid = ""; // 项目
+        String zy = ""; // 报销事由
+        String kjqj = ""; // 会计期间
+        String kjnd = ""; // 会计年度
+        String fjzs = ""; // 附件张数   需业务人员在OA上传附件同时填写附件张数后传数据到NCC
+        String zyx1 = ""; // OA单据号   OA传过来，用于联查单据
+        String zyx2 = ""; // 提交人    提交人姓名
+        String zyx3 = ""; // OA核销单号
+        String zyx5 = ""; // OARequestID
+        String zyx8 = ""; // 银行付款备注
+        String zyx9=requestInfo.getRequestManager().getRequestname();//标题
+
+        RecordSet rs = new RecordSet();
+        RecordSet rsFna = new RecordSet();
+        try {
+            String sql = " select *  from " + mainTable + " where requestid='" + requestId + "'";
+            rs.execute(sql);
+            while (rs.next()) {
+                mainId = Util.null2String(rs.getString("id"));
+                fygsbm = Util.null2String(rs.getString("fygsbm"));//申请部门
+                pk_org = Util.null2String(rs.getString("gsmc")); // 报销单位
+                total = Util.null2String(rs.getString("fkje")); // 金额   金额由表体相应字段汇总得出
+                custaccount = Util.null2String(rs.getString("yxhm")).replace(" ", ""); //收款银行账号
+                sfyfp = Util.null2String(rs.getString("sfyfp")); //是否有发票
+                djrq = Util.null2String(rs.getString("cjrq")); // 单据日期   yyyy-mm-dd hh:mm:ss
+                zy = Util.null2String(rs.getString("fksm")); // 付款说明
+                hbbm = Util.null2String(rs.getString("gysmc")); // 供应商名称
+                kjqj = djrq.substring(5,7); //  会计期间
+                kjnd = djrq.substring(0,4); // 会计年度
+                fjzs = Util.null2String(rs.getString("fjzs")); // 附件张数   需业务人员在OA上传附件同时填写附件张数后传数据到NCC
+                zyx1 = Util.null2String(rs.getString("lcbh")); // OA单据号   OA传过来，用于联查单据
+                zyx2 = Util.null2String(rs.getString("xm")); // 提交人    提交人姓名
+                zyx5 = requestId; // OARequestID
+                zyx8 = Util.null2String(rs.getString("yxfkbz")); //银行付款备注
+            }
+            //获取UUID
+            String uuid=UUID.randomUUID().toString().replace("-", "").toUpperCase();
+            //根据部门ID查询部门编码
+            deptid=BaseUtil.getBaseInfoByParm("departmentcode", "hrmdepartment", "id", fygsbm, "");
+            operator = loginid;//当前节点操作者
+            //没有发票时，则对应NCC的对公借款单
+            if("1".equals(sfyfp)){
+            	djlxmc = "对公借款单"; 
+            	djlxbm = "263X-Cxx-DGJKD"; // 单据类型编码
+            	//url = baseUrl+"/dcoaapi/billLoan/receiveData";
+            	url = baseUrl+"/dcnccapi/billLoan/receiveData";
+            	borrowOrder.setUuid(uuid);
+                borrowOrder.setPk_org(pk_org);
+                borrowOrder.setTotal(total);
+                borrowOrder.setDeptid(deptid);
+                borrowOrder.setDjlxbm(djlxbm);
+                borrowOrder.setDjrq(djrq);
+                borrowOrder.setPayflag(payflag);
+                borrowOrder.setPaytarget(paytarget);
+                borrowOrder.setHbbm(hbbm);
+                borrowOrder.setReceiver(receiver);
+                //borrowOrder.setCustaccount(custaccount);
+                //borrowOrder.setSkyhzh(skyhzh);
+                borrowOrder.setJkbxr(jkbxr);
+                borrowOrder.setOperator(operator);
+                borrowOrder.setJsfs(jsfs);
+                borrowOrder.setFkyhzh(fkyhzh);
+                borrowOrder.setZy(zy);
+                borrowOrder.setDjzt("1");
+                borrowOrder.setKjqj(kjqj);
+                borrowOrder.setKjnd(kjnd);
+                borrowOrder.setZyx1(zyx1);
+                borrowOrder.setZyx2(zyx2);
+                borrowOrder.setZyx3(zyx3);
+                borrowOrder.setZyx5(zyx5);
+                borrowOrder.setZyx8(zyx8);
+                borrowOrder.setZyx9(zyx9);
+            	
+            }else{
+            	reimbursementOrder.setUuid(uuid);
+            	reimbursementOrder.setPk_org(pk_org);
+                reimbursementOrder.setTotal(total);
+                reimbursementOrder.setDeptid(deptid);
+                reimbursementOrder.setDjlxbm(djlxbm);
+                reimbursementOrder.setDjrq(djrq);
+                reimbursementOrder.setPayflag(payflag);
+                reimbursementOrder.setPaytarget(paytarget);
+                reimbursementOrder.setReceiver(receiver);
+                reimbursementOrder.setHbbm(hbbm);
+                reimbursementOrder.setJkbxr(jkbxr);
+                reimbursementOrder.setOperator(operator);
+                reimbursementOrder.setJsfs(jsfs);
+//                reimbursementOrder.setCustaccount(custaccount);
+//                reimbursementOrder.setSkyhzh(skyhzh);
+                reimbursementOrder.setFkyhzh(fkyhzh);
+                reimbursementOrder.setJobid(jobid);
+                reimbursementOrder.setZy(zy);
+                reimbursementOrder.setKjqj(kjqj);
+                reimbursementOrder.setKjnd(kjnd);
+                reimbursementOrder.setFjzs(fjzs);
+                reimbursementOrder.setZyx1(zyx1);
+                reimbursementOrder.setZyx2(zyx2);
+                reimbursementOrder.setZyx3(zyx3);
+                reimbursementOrder.setZyx5(zyx5);
+                reimbursementOrder.setZyx8(zyx8);
+                reimbursementOrder.setZyx9(zyx9);
+            }
+            
+            log.writeLog("【header数据准备完毕...】");
+            int rowno = 0;
+            //对公报销
+            List<ReimbursementOrderBody> reimbursementOrderBodyList = new ArrayList<ReimbursementOrderBody>();
+            //对公借款
+            List<BorrowOrderBody> borrowOrderBodyList = new ArrayList<BorrowOrderBody>();
+            rs.execute(" select * from " + mainTable + "_dt1 where mainid = " + mainId);
+            while (rs.next()) {
+                String fpdm = ""; //发票代码
+                String fphm = ""; //发票号码
+                String deptid1 = ""; // 费用承担部门 
+                String fycdbm = Util.null2String(rs.getString("fycdbm")); //费用承担部门
+                String jobid1 = Util.null2String(rs.getString("")); // 项目
+                String amount = Util.null2String(rs.getString("yfkje")); // 付款金额
+                String defitem36 = Util.null2o(rs.getString("fpje")); // 发票金额
+                String tax_rate = Util.null2String(rs.getString("sl")); // 税率 3%
+                String tax_amount = Util.null2String(rs.getString("se")); // 税额
+                String tni_amount = Util.null2String(rs.getString("bhsje")); // 无税金额
+                String tablecode = "arap_bxbusitem";
+                String szxmid = Util.null2String(rs.getString("fylx")); // 收支项目
+                String defitem46 = Util.null2String(rs.getString("wd")); // 网点（成本中心）
+                String defitem45 = Util.null2String(rs.getString("gj")); // 国家
+                String defitem44 = Util.null2String(rs.getString("ck")); // 仓库
+                String defitem43 = Util.null2String(rs.getString("cph")); //车牌号
+                String defitem42 = Util.null2String(rs.getString("id")); // OA明细行ID
+                
+                // 得到浏览按钮中发票号码的id,再去数据库中把发票号码和发票代码查出来
+                String fphmId = Util.null2String(rs.getString("fphm")); // 发票号码
+                if(!"".equals(fphmId)){
+                	// 得到浏览按钮中发票号码的id,再去数据库中把发票号码和发票代码查出来
+                	rsFna.execute(" select * from fnainvoiceledger where id = " + fphmId);
+                    while (rsFna.next()) {
+                        fpdm = Util.null2String(rsFna.getString("INVOICECODE")); // 发票代码
+                        fphm = Util.null2String(rsFna.getString("INVOICENUMBER")); // 发票号码
+                    }
+                }
+                //发票金额为空时，默认等于付款金额
+                if(Double.parseDouble(defitem36)==0){
+                	defitem36=amount;
+                }
+                //若收支项目为空时，则费用类型默认为物流运输费用
+                if("".equals(szxmid)){
+                	szxmid="901052";
+                }
+                //根据部门ID查询部门编码
+                String defitem48=BaseUtil.getBaseInfoByParm("departmentcode", "hrmdepartment", "id", fycdbm, "");
+                deptid1=defitem48;
+                rowno++;
+                
+                
+                log.writeLog("----deptid1:" + deptid1);
+                log.writeLog("----amount:" + amount);
+                log.writeLog("----tax_rate:" + tax_rate);
+                log.writeLog("----tax_amount:" + tax_amount);
+                log.writeLog("----tni_amount:" + tni_amount);
+                log.writeLog("----defitem48:" + defitem48);
+
+                //没有发票时，则对应NCC的对公借款单
+                if("1".equals(sfyfp)){
+                	BorrowOrderBody body = new BorrowOrderBody();
+                	body.setAmount(total);
+                    body.setTablecode(tablecode);
+                    body.setRowno(rowno+"");
+                    body.setSzxmid(szxmid);
+                    body.setDefitem50("");
+                    body.setDefitem49("");
+                    body.setDefitem42(defitem42);
+                    body.setDefitem43(defitem43);
+                    body.setDefitem44(defitem44);
+                    body.setDefitem45(defitem45);
+                    body.setDefitem46(defitem46);
+                    body.setDefitem48(defitem48);
+                    borrowOrderBodyList.add(body);
+                }else{
+                	ReimbursementOrderBody body = new ReimbursementOrderBody();
+                	body.setJobid(jobid1);
+                    body.setDeptid(deptid1);
+                    body.setAmount(amount);
+                    body.setTax_rate(tax_rate);
+                    body.setTax_amount(tax_amount);
+                    body.setTni_amount(tni_amount);
+                    body.setTablecode(tablecode);
+                    body.setRowno(rowno+"");
+                    body.setSzxmid(szxmid);
+                    body.setFpdm(fpdm);
+                    body.setFphm(fphm);
+                    body.setDefitem36(defitem36);
+                    body.setDefitem46(defitem46);
+                    body.setDefitem45(defitem45);
+                    body.setDefitem44(defitem44);
+                    body.setDefitem43(defitem43);
+                    body.setDefitem42(defitem42);
+                    body.setDefitem48(defitem48);
+                    reimbursementOrderBodyList.add(body);
+                }
+                
+            }
+            
+            String parm="";
+            //没有发票时，则对应NCC的对公借款单
+            if("1".equals(sfyfp)){
+            	borrowOrder.setJk_busitem(borrowOrderBodyList);
+//                borrowList.add(borrowOrder);
+            	parm=JSONObject.toJSONString(borrowOrder);
+            	log.writeLog(djlxmc+"准备传入中台的数据为------>" + parm);
+            }else{
+            	reimbursementOrder.setEr_busitem(reimbursementOrderBodyList);
+//                reimbursementList.add(reimbursementOrder);
+            	parm=JSONObject.toJSONString(reimbursementOrder);
+            	log.writeLog(djlxmc+"准备传入中台的数据为------>" + parm);
+            }
+            
+            //获取TOKEN
+            String token = HttpClientToDC.getToken();
+            log.writeLog("获取数据中台的token------>" + token);
+            if ("".equals(Util.null2String(token))) {
+            	requestInfo.getRequestManager().setMessagecontent("流程提交失败，未获取到数据中台接口TOKEN，请联系管理员处理！");
+                return Action.FAILURE_AND_CONTINUE;
+            }
+            
+            //调用NCC接口，将数据传给NCC
+            String returndata = HttpClientToDC.sendPostApi(url,token, parm);
+            log.writeLog("【调用数据中台"+djlxmc+"接口返回结果result:】" + returndata);
+            if (!"".equals(returndata) && returndata != null) {
+//            	//过滤前面的双引号
+//            	if(returndata.startsWith("\"")){
+//        			returndata=returndata.substring(1);
+//        		}
+//            	//过滤后面的双引号
+//        		if(returndata.endsWith("\"")){
+//        			returndata=returndata.substring(0,returndata.length()-1);
+//        		}
+//        		//转义\"
+//        		returndata=StringEscapeUtils.unescapeJava(returndata);
+//        		log.writeLog("【借款接口返回转译处理后的结果result:】" + returndata);
+                JSONObject jsonObject = JSONObject.parseObject(returndata);
+                String success = Util.null2String(jsonObject.get("succ"));
+                log.writeLog("--------发送请求返回的success值为：" + success);
+                if ("true".equals(success)) {
+                	JSONObject data = jsonObject.getJSONObject("data");
+                    String billno = Util.null2String(data.get("billno"));//NCC单号
+                    log.writeLog("--------发送请求返回的billno值为：" + billno);
+                    //将NCC返回结果回写至OA流程表单
+                    rs.execute(" update " + mainTable + " set sfcgscnccfkd = 0 , nccfkdh = '" + billno + "',nccfhxx=''  where requestid = " + requestId); 
+                } else {
+                	String message = Util.null2String(jsonObject.get("msg"));
+                	//将NCC返回结果回写至OA流程表单
+                    rs.execute(" update " + mainTable + " set sfcgscnccfkd = 1 ,nccfhxx='" + message.replace("'", "''") + "'  where requestid = " + requestId); 
+                    requestInfo.getRequestManager().setMessagecontent("流程数据写入NCC借款单失败,失败信息：<br/>"+message);
+                    return Action.FAILURE_AND_CONTINUE;
+                }
+            } else {
+                requestInfo.getRequestManager().setMessagecontent("流程数据写入中台"+djlxmc+"失败,未获取到接口返回结果，请联系系统管理员处理！");
+                return Action.FAILURE_AND_CONTINUE;
+            }
+
+        } catch (Exception e) {
+        	requestInfo.getRequestManager().setMessagecontent("流程数据生成中台对公报销单/对公借款单失败！" + e.toString());
+            return Action.FAILURE_AND_CONTINUE;
+        }
+        log.writeLog("--------承运商付款单数据传入中台完毕----requestId值为：" + requestId);
+        return Action.SUCCESS;
+    }
+}
\ No newline at end of file
diff --git a/src/main/youhong_ai_jitu_src/jntchina/action/ChargeCardAction.java b/src/main/youhong_ai_jitu_src/jntchina/action/ChargeCardAction.java
new file mode 100644
index 0000000..143fd8a
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/action/ChargeCardAction.java
@@ -0,0 +1,152 @@
+package jntchina.action;
+
+import com.alibaba.fastjson.JSONObject;
+import jntchina.util.HttpClientToDC;
+import selfdev.util.base.BaseUtil;
+import selfdev.util.log.LogTool;
+import weaver.conn.RecordSet;
+import weaver.file.Prop;
+import weaver.general.Util;
+import weaver.interfaces.workflow.action.BaseAction;
+import weaver.soa.workflow.request.RequestInfo;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @description: 签卡申请单
+ * @author: dzs
+ * @date: 2021/7/29
+ **/
+public class ChargeCardAction extends BaseAction {
+
+    @Override
+    public String execute(RequestInfo requestInfo) {
+        LogTool log = new LogTool("/log/selfdev/action/hrm", true);
+        String requestId = requestInfo.getRequestid(); // 获取requestid
+        String workflowid = requestInfo.getWorkflowid(); // 获取workflowid
+
+        //获取工作流名称
+        String workflowname = BaseUtil.getBaseInfoByParm("workflowname", "workflow_base", "id", workflowid, "");
+        log.writeLog("---------------工作流名称---------·--workflowname为：" + workflowname);
+        log.writeLog("--------签卡申请单数据传入中台开始----requestId值为：" + requestId);
+
+        //获取配置文件中的参数，到时候URL路径
+        String mode = Prop.getPropValue("DevToDC_jntchina", "mode");
+        //服务器ip：port
+        String baseUrl = Prop.getPropValue("DevToDC_jntchina", mode + "_baseUrl");
+        //访问路径拼接
+        String url = baseUrl + "/dcoaapi/hr/signCard";
+
+        //根据流程id获取主表名称
+        String mainTable = RegularizationApplyForAction.getMainTable(requestId);
+        log.writeLog("-------------获取到的表名为-------------：" + mainTable);
+
+        String mainid = "";
+        //申请单号
+        String C_OA_NUM = "";
+        //员工编码
+        String EMPLID = "";
+
+        //签卡数据
+        List<Map<String, String>> list = new ArrayList<Map<String, String>>();
+        //签卡日期
+        String C_CARD_DT = "";
+        //签卡时间
+        String C_CARD_TM = "";
+        //签卡类型
+        String C_APP_CARD_TYPE = "10";
+        String qklx = "";//OA签卡类型
+        //签卡原因
+        String C_CARD_REASON = "";
+        //签卡时段
+        String detail_signtype = "";
+
+        RecordSet rs = new RecordSet();
+        try {
+            String sql = "select a.* from " + mainTable + " a where a.requestid = '" + requestId + "'";
+            rs.execute(sql);
+            log.writeLog("查询主表数据sql语句---------------->" + sql);
+            while (rs.next()) {
+                mainid = Util.null2String(rs.getString("id"));//主表主键ID
+                C_OA_NUM = Util.null2String(rs.getString("lcbh"));//申请单号
+                EMPLID = Util.null2String(rs.getString("tjrgh"));//员工编号
+                qklx = Util.null2String(rs.getString("qklx"));//签卡类型
+                C_CARD_REASON = Util.null2String(rs.getString("qkyy"));//签卡原因
+            }
+            log.writeLog("qklx---------------->" + qklx);
+
+            //历史选项，因公或者因私
+            if ("".equals(qklx) || "0".equals(qklx) || "1".equals(qklx)) {
+                C_APP_CARD_TYPE = "10";
+            } else {
+                //根据下拉框的值获取对应的描述
+                C_APP_CARD_TYPE = BaseUtil.getBaseInfoByParm("selectname", "workflow_selectitem", "selectvalue", qklx,
+                        " and fieldid in (select id from workflow_billfield where billid in (select formid from workflow_base where id=" + workflowid + ") and fieldname='qklx' and viewtype=0)");
+                //过滤多语言,截取"-"前面的编码
+                C_APP_CARD_TYPE = Util.formatMultiLang(C_APP_CARD_TYPE, "7").split("-")[0];
+            }
+            log.writeLog("C_APP_CARD_TYPE---------------->" + C_APP_CARD_TYPE);
+            //查询明细数据
+            sql = "select * from " + mainTable + "_dt1 a where a.mainid = '" + mainid + "'";
+            rs.execute(sql);
+            log.writeLog("查询sql语句---------------->" + sql);
+            while (rs.next()) {
+                C_CARD_DT = Util.null2String(rs.getString("detail_signdate"));//签卡日期
+                C_CARD_TM = Util.null2String(rs.getString("detail_signtime"));//签卡时间
+                detail_signtype = Util.null2String(rs.getString("detail_signtype"));//签卡时段
+                //将签卡数据进行包装
+                Map<String, String> maps = new HashMap<String, String>();
+                maps.put("EMPLID", EMPLID);
+                maps.put("C_CARD_DT", C_CARD_DT);
+                maps.put("C_CARD_TM", C_CARD_TM);
+                maps.put("C_APP_CARD_TYPE", C_APP_CARD_TYPE);
+                maps.put("C_CARD_REASON", C_CARD_REASON);
+                maps.put("detail_signtype", detail_signtype);
+                list.add(maps);
+            }
+            log.writeLog("----------------->签卡数据明细数据:" + list.toString());
+
+            //最后再将数据全部打包
+            Map<String, Object> map = new HashMap<String, Object>();
+            map.put("C_OA_NUM", C_OA_NUM);
+            map.put("EMPLID", EMPLID);
+            map.put("LINES", list);
+            String strParm = JSONObject.toJSONString(map);
+            log.writeLog("---------------打印的Map数据为：-----------------：" + strParm);
+
+            //获取Token
+            String token = HttpClientToDC.getToken();
+            log.writeLog("签卡申请单token------>" + token);
+            log.writeLog("签卡申请单url------>" + url);
+
+            //调用NCC接口，将数据传给NCC
+            String returndata = HttpClientToDC.sendPostApi(url, token, strParm);
+            log.writeLog("【调用数据中台签卡申请单接口返回结果result:】" + returndata);
+            if (!"".equals(returndata) && returndata != null) {
+                JSONObject jsonObject = JSONObject.parseObject(returndata);
+                String code = Util.null2String(jsonObject.get("code"));
+                log.writeLog("--------发送请求返回的code值为：" + code);
+                if (code.equals("1")) {
+                    return SUCCESS;
+                } else {
+                    String msg = Util.null2String(jsonObject.get("msg"));
+                    requestInfo.getRequestManager().setMessageid("111100");
+                    requestInfo.getRequestManager().setMessagecontent(msg);
+                    return "0";
+                }
+            } else {
+                String ermsg = "流程数据写入NCC调动申请单失败,未获取到接口返回结果，请联系系统管理员处理！";
+                requestInfo.getRequestManager().setMessageid("111100");
+                requestInfo.getRequestManager().setMessagecontent(ermsg);
+                return "0";
+            }
+        } catch (Exception e) {
+            //返回0，调用失败
+            log.writeLog("------------------------捕获到的异常是：" + e.toString());
+            return "0";
+        }
+    }
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/action/ChuchaiCheckAction.java b/src/main/youhong_ai_jitu_src/jntchina/action/ChuchaiCheckAction.java
new file mode 100644
index 0000000..2897e43
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/action/ChuchaiCheckAction.java
@@ -0,0 +1,86 @@
+package jntchina.action;
+
+import weaver.conn.RecordSet;
+import weaver.general.Util;
+import weaver.interfaces.workflow.action.BaseAction;
+import weaver.soa.workflow.request.RequestInfo;
+
+import selfdev.util.log.LogTool;
+import selfdev.util.base.BaseUtil;
+/**
+ * @description: 出差校验
+ * @author: daizhishun
+ * @date: 2021/9/6
+ **/
+public class ChuchaiCheckAction extends BaseAction{
+    public static LogTool log=new LogTool("/log/selfdev/action/hrm", true);
+    public String execute(RequestInfo ri){
+        String requestid=ri.getRequestid();
+        log.writeLog("---------------出差流程提交时数据逻辑校验开始-------------requestId:" + requestid);
+        //获取workflowid
+        String workflowid=ri.getWorkflowid();
+        try {
+            //获取表名
+            String tablename=BaseUtil.getBaseInfoByParm("tablename", "workflow_bill", "1", "1", " and id in (select formid from workflow_base where id="+workflowid+")");
+            RecordSet rs=new RecordSet();
+
+            String sql="select * from "+tablename+" where requestid="+requestid;
+
+            String lastname="";//申请人
+            String workcode = "";
+            String fromDate="";//开始日期
+            String fromTime="";//开始时间
+            String toDate="";//结束日期
+            String toTime="";//结束时间
+
+            rs.execute(sql);
+            while(rs.next()){
+                workcode = Util.null2String(rs.getString("tjrgh"));//主键ID
+                lastname=Util.null2String(rs.getString("resourceId"));//BaseUtil.getBaseInfoByParm("lastname", "HrmResource", "id", rs.getString("resourceId"), "");//申请人
+                fromDate=Util.null2String(rs.getString("fromDate"));//开始日期
+                fromTime=Util.null2String(rs.getString("fromTime"));//开始时间
+                toDate=Util.null2String(rs.getString("toDate"));//结束日期
+                toTime=Util.null2String(rs.getString("toTime"));//结束时间
+            }
+
+            //开始
+            String ks=(fromDate+" "+fromTime).substring(0,16);
+            //结束
+            String js=(toDate+" "+toTime).substring(0,16);
+            String msg="";
+
+            //检查当前员工在此期间是否有出差记录
+            RecordSet rs1=new RecordSet();
+            sql="select * from FORMTABLE_MAIN_1723 b where"+
+            "((b.fromdate||' '||b.fromtime)>'"+ks+"' and (b.fromdate||' '||b.fromtime)<'"+js+"')"+
+            "or ((b.toDate||' '||b.toTime)>'"+ks+"' and (b.toDate||' '||b.toTime)<'"+js+"')"+
+            "or ((b.fromdate||' '||b.fromtime)<='"+ks+"' and (b.fromdate||' '||b.fromtime)>='"+js+"')"+
+            "and b.resourceId="+lastname+" and b.requestid != "+requestid+"";
+            log.writeLog("检查当前员工在此期间是否有出差记录sql--------->"+sql);
+            rs1.execute(sql);
+            if(rs1.getCounts()>0){
+                log.writeLog("进入判断,查询的数据大于0，说明有数据存在,存在："+rs.getCounts());
+                String temp="";
+                while(rs1.next()){
+                    temp+="【requestid="+requestid+"";
+                }
+                temp=temp.substring(0,temp.length()-1);
+                msg+=lastname+"【"+workcode+"】出差时间段"+ks+"~"+js+"之前的流程"+temp+"已提交过出差申请，请重新选择出差时间<br/>";
+            }
+            if(!"".equals(msg)){
+                ri.getRequestManager().setMessage("111100");
+                ri.getRequestManager().setMessagecontent(msg);
+                return "0";
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.writeLog("出差流程提交时数据逻辑校验失败，错误信息为：------>"+e.toString());
+            ri.getRequestManager().setMessageid("111100");
+            ri.getRequestManager().setMessagecontent("出差流程提交时数据逻辑校验失败，错误信息为：------>"+e.toString());
+            return "0";
+        }
+        log.writeLog("---------------出差流程提交时数据逻辑校验结束-------------requestId:" + requestid);
+        return SUCCESS;
+    }
+}
+
diff --git a/src/main/youhong_ai_jitu_src/jntchina/action/ChuchaiForceDrawBackAction.java b/src/main/youhong_ai_jitu_src/jntchina/action/ChuchaiForceDrawBackAction.java
new file mode 100644
index 0000000..e8e7b08
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/action/ChuchaiForceDrawBackAction.java
@@ -0,0 +1,37 @@
+package jntchina.action;
+
+import selfdev.util.base.BaseUtil;
+import selfdev.util.log.LogTool;
+import weaver.interfaces.workflow.action.BaseAction;
+import weaver.soa.workflow.request.RequestInfo;
+
+/**
+ * @description: 出差强制收回时的节点附加操作
+ * @author: KangMD
+ * @date: 2021-12-19
+ **/
+public class ChuchaiForceDrawBackAction extends BaseAction {
+
+        public static LogTool log=new LogTool("/log/selfdev/action/hrm", false);
+        public String execute(RequestInfo requestInfo){
+            String requestId = requestInfo.getRequestid(); // 获取requestid
+            String workflowid = requestInfo.getWorkflowid(); // 获取workflowid
+            //获取工作流名称
+            String workflowname = BaseUtil.getBaseInfoByParm("workflowname", "workflow_base", "id", workflowid, "");
+            log.writeLog("--------【"+workflowname+"】强制收回时的节点附加操作----requestId值为：" + requestId);
+            try{
+            	ChuchaiForceDrawBackThread forceDrawBackThread=new ChuchaiForceDrawBackThread();
+       		 	//设置参数
+            	forceDrawBackThread.setRequestInfo(requestInfo);
+       		 	Thread thread = new Thread(forceDrawBackThread);
+       		 	//启动线程
+       		 	thread.start();
+       		 	log.writeLog("--------【"+workflowname+"】强制收回时启用线程--------");
+            }catch (Exception e){
+                //返回0，调用失败
+                log.writeLog("------------------------捕获到的异常是：" + e.toString());
+                return "0";
+            }
+            return SUCCESS;
+    }
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/action/ChuchaiForceDrawBackAction2.java b/src/main/youhong_ai_jitu_src/jntchina/action/ChuchaiForceDrawBackAction2.java
new file mode 100644
index 0000000..d01a70b
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/action/ChuchaiForceDrawBackAction2.java
@@ -0,0 +1,37 @@
+package jntchina.action;
+
+import selfdev.util.base.BaseUtil;
+import selfdev.util.log.LogTool;
+import weaver.interfaces.workflow.action.BaseAction;
+import weaver.soa.workflow.request.RequestInfo;
+
+/**
+ * @description: 携程集成出差强制收回时的节点附加操作
+ * @author: KangMD
+ * @date: 2021-12-19
+ **/
+public class ChuchaiForceDrawBackAction2 extends BaseAction {
+
+        public static LogTool log=new LogTool("/log/selfdev/action/hrm", false);
+        public String execute(RequestInfo requestInfo){
+            String requestId = requestInfo.getRequestid(); // 获取requestid
+            String workflowid = requestInfo.getWorkflowid(); // 获取workflowid
+            //获取工作流名称
+            String workflowname = BaseUtil.getBaseInfoByParm("workflowname", "workflow_base", "id", workflowid, "");
+            log.writeLog("--------【"+workflowname+"】强制收回时的节点附加操作----requestId值为：" + requestId);
+            try{
+            	ChuchaiForceDrawBackThread2 forceDrawBackThread=new ChuchaiForceDrawBackThread2();
+       		 	//设置参数
+            	forceDrawBackThread.setRequestInfo(requestInfo);
+       		 	Thread thread = new Thread(forceDrawBackThread);
+       		 	//启动线程
+       		 	thread.start();
+       		 	log.writeLog("--------【"+workflowname+"】强制收回时启用线程--------");
+            }catch (Exception e){
+                //返回0，调用失败
+                log.writeLog("------------------------捕获到的异常是：" + e.toString());
+                return "0";
+            }
+            return SUCCESS;
+    }
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/action/ChuchaiForceDrawBackThread.java b/src/main/youhong_ai_jitu_src/jntchina/action/ChuchaiForceDrawBackThread.java
new file mode 100644
index 0000000..91c61e3
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/action/ChuchaiForceDrawBackThread.java
@@ -0,0 +1,124 @@
+package jntchina.action;
+
+import com.alibaba.fastjson.JSONObject;
+import jntchina.util.HttpClientToDC;
+import selfdev.util.base.BaseUtil;
+import selfdev.util.log.LogTool;
+import weaver.conn.RecordSet;
+import weaver.file.Prop;
+import weaver.general.Util;
+import weaver.soa.workflow.request.RequestInfo;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @description: 出差流程强制收回时执行接口
+ * @author: KangMD
+ * @date: 2021-12-19
+ **/
+public class ChuchaiForceDrawBackThread implements Runnable {
+    public static LogTool log=new LogTool("/log/selfdev/action/hrm", true);
+    public RequestInfo requestInfo;
+    
+	public RequestInfo getRequestInfo() {
+		return requestInfo;
+	}
+
+	public void setRequestInfo(RequestInfo requestInfo) {
+		this.requestInfo = requestInfo;
+	}
+
+	public void run(){
+		String requestId = requestInfo.getRequestid(); // 获取requestid
+		try {
+			log.writeLog("----------1.5秒后再启动【requestId:" + requestId+"】-------------");
+			Thread.sleep(1500);//延迟执行
+		} catch (InterruptedException e1) {
+			// TODO Auto-generated catch block
+			e1.printStackTrace();
+		}
+		log.writeLog("----------1.5秒结束，开启执行代码【requestId:" +requestId+"】-------------");
+		
+        String workflowid = requestInfo.getWorkflowid(); // 获取workflowid
+        //获取工作流名称
+        String workflowname = BaseUtil.getBaseInfoByParm("workflowname", "workflow_base", "id", workflowid, "");
+        log.writeLog("--------【"+workflowname+"】数据传入中台开始----requestId值为：" + requestId);
+
+        try{
+        	//流程当前状态
+        	String currentnodetype="";
+        	RecordSet rs = new RecordSet();
+            String sql = "select * from workflow_requestbase where requestid = "+requestId+"";
+            rs.execute(sql);
+            while (rs.next()) {
+            	currentnodetype = Util.null2String(rs.getString("currentnodetype"));//当前流程状态
+            }
+            log.writeLog("currentnodetype---------------->"+currentnodetype);
+            //流程当前处于申请节点，才需要调用HR接口
+            if(!"0".equals(currentnodetype)){
+            	log.writeLog("*************流程不是强制收回到申请节点，不需要调用HR接口*************");
+            	return;
+            }
+            //获取配置文件中的参数，到时候URL路径
+            String mode = Prop.getPropValue("DevToDC_jntchina", "mode");
+            // 服务器ip：port
+            String baseUrl = Prop.getPropValue("DevToDC_jntchina", mode + "_baseUrl");
+            //访问路径拼接
+            String url = baseUrl + "/dcoaapi/hr/attendance";
+
+            //根据流程id获取主表名称
+            String mainTable = RegularizationApplyForAction.getMainTable(requestId);
+            log.writeLog("--------获取到的表名为----：" + mainTable);
+            //申请单号
+            String C_OA_NUM = "";
+            //单据来源：默认OA
+            String C_APPLY_SOURCE = "OA";
+            //流程名称：出差流程为30
+            String C_WORKFLOW = "30";
+            //审批状态：已通过：3    驳回：5
+            String C_STATUS = "5";
+
+            sql = "select lcbh1 from "+mainTable+" where requestid = "+requestId+"";
+            rs.execute(sql);
+            log.writeLog("----------------》打印sql语句"+sql);
+            while (rs.next()) {
+                C_OA_NUM = Util.null2String(rs.getString("lcbh1"));//申请单号
+            }
+
+
+            Map<String,Object> map = new HashMap<String,Object>();
+            map.put("C_OA_NUM",C_OA_NUM);
+            map.put("C_APPLY_SOURCE",C_APPLY_SOURCE);
+            map.put("C_WORKFLOW",C_WORKFLOW);
+            map.put("C_STATUS",C_STATUS);
+            String strParm = JSONObject.toJSONString(map);
+            log.writeLog("---------------打印的Map数据为：-----------------："+strParm);
+
+            //获取Token
+            String token = HttpClientToDC.getToken();
+            log.writeLog("出差申请单token------>" + token);
+            log.writeLog("出差申请单url------>" + url);
+
+            //调用NCC接口，将数据传给NCC
+            String returndata = HttpClientToDC.sendPostApi(url,token,strParm);
+            log.writeLog("【调用数据中台出差申请单接口返回结果:】" + returndata);
+            if (!"".equals(returndata) && returndata != null) {
+                JSONObject jsonObject = JSONObject.parseObject(returndata);
+                String code = Util.null2String(jsonObject.get("code"));
+                log.writeLog("--------发送请求返回的code值为：" + code);
+                if ("1".equals(code)) {
+                	
+                } else {
+                	String msg = Util.null2String(jsonObject.get("msg"));
+                    log.writeLog("调用HR接口返回错误信息----->" + msg);
+                }
+            }else {
+            	log.writeLog("调用HR接口返回为空----->");
+            }
+        }catch (Exception e){
+            //返回0，调用失败
+            log.writeLog("------------------------捕获到的异常是：" + e.toString());
+        }
+    }
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/action/ChuchaiForceDrawBackThread2.java b/src/main/youhong_ai_jitu_src/jntchina/action/ChuchaiForceDrawBackThread2.java
new file mode 100644
index 0000000..fc5a63d
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/action/ChuchaiForceDrawBackThread2.java
@@ -0,0 +1,123 @@
+package jntchina.action;
+
+import com.alibaba.fastjson.JSONObject;
+import jntchina.util.HttpClientToDC;
+import selfdev.util.base.BaseUtil;
+import selfdev.util.log.LogTool;
+import weaver.conn.RecordSet;
+import weaver.file.Prop;
+import weaver.general.Util;
+import weaver.soa.workflow.request.RequestInfo;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @description: 携程出差退回至申请人回传状态至OracleHR
+ * @author: KangMD
+ * @date: 2021-12-13
+ **/
+public class ChuchaiForceDrawBackThread2 implements Runnable  {
+    public static LogTool log=new LogTool("/log/selfdev/action/hrm", true);
+    public RequestInfo requestInfo;
+    
+	public RequestInfo getRequestInfo() {
+		return requestInfo;
+	}
+
+	public void setRequestInfo(RequestInfo requestInfo) {
+		this.requestInfo = requestInfo;
+	}
+
+	public void run(){
+		String requestId = requestInfo.getRequestid(); // 获取requestid
+		try {
+			log.writeLog("----------1.5秒后再启动【requestId:" + requestId+"】-------------");
+			Thread.sleep(1500);//延迟执行
+		} catch (InterruptedException e1) {
+			// TODO Auto-generated catch block
+			e1.printStackTrace();
+		}
+		log.writeLog("----------1.5秒结束，开启执行代码【requestId:" +requestId+"】-------------");
+        String workflowid = requestInfo.getWorkflowid(); // 获取workflowid
+        //获取工作流名称
+        String workflowname = BaseUtil.getBaseInfoByParm("workflowname", "workflow_base", "id", workflowid, "");
+        log.writeLog("--------【"+workflowname+"】状态传入中台开始----requestId值为：" + requestId);
+
+        try{
+        	//流程当前状态
+        	String currentnodetype="";
+        	RecordSet rs = new RecordSet();
+            String sql = "select * from workflow_requestbase where requestid = "+requestId+"";
+            rs.execute(sql);
+            while (rs.next()) {
+            	currentnodetype = Util.null2String(rs.getString("currentnodetype"));//当前流程状态
+            }
+            log.writeLog("currentnodetype---------------->"+currentnodetype);
+            //流程当前处于申请节点，才需要调用HR接口
+            if(!"0".equals(currentnodetype)){
+            	log.writeLog("*************流程不是强制收回到申请节点，不需要调用HR接口*************");
+            	return;
+            }
+            //获取配置文件中的参数，到时候URL路径
+            String mode = Prop.getPropValue("DevToDC_jntchina", "mode");
+            // 服务器ip：port
+            String baseUrl = Prop.getPropValue("DevToDC_jntchina", mode + "_baseUrl");
+            //访问路径拼接
+            String url = baseUrl + "/dcoaapi/hr/attendance";
+
+            //根据流程id获取主表名称
+            String mainTable = RegularizationApplyForAction.getMainTable(requestId);
+            log.writeLog("--------获取到的表名为----：" + mainTable);
+            //申请单号
+            String C_OA_NUM = "";
+            //单据来源：默认OA
+            String C_APPLY_SOURCE = "OA";
+            //流程名称：出差流程为30
+            String C_WORKFLOW = "30";
+            //审批状态：已通过：3，    驳回：5
+            String C_STATUS = "5";
+
+            sql = "select lcbh from "+mainTable+" where requestid = "+requestId+"";
+            rs.execute(sql);
+            log.writeLog("----------------》打印sql语句"+sql);
+            while (rs.next()) {
+                C_OA_NUM = Util.null2String(rs.getString("lcbh"));//申请单号
+            }
+
+
+            Map<String,Object> map = new HashMap<String,Object>();
+            map.put("C_OA_NUM",C_OA_NUM);
+            map.put("C_APPLY_SOURCE",C_APPLY_SOURCE);
+            map.put("C_WORKFLOW",C_WORKFLOW);
+            map.put("C_STATUS",C_STATUS);
+            String strParm = JSONObject.toJSONString(map);
+            log.writeLog("---------------打印的Map数据为：-----------------："+strParm);
+
+            //获取Token
+            String token = HttpClientToDC.getToken();
+            log.writeLog("出差申请单token------>" + token);
+            log.writeLog("出差申请单url------>" + url);
+
+            //调用NCC接口，将数据传给NCC
+            String returndata = HttpClientToDC.sendPostApi(url,token,strParm);
+            log.writeLog("【调用数据中台出差退回状态回传接口返回结果:】" + returndata);
+            if (!"".equals(returndata) && returndata != null) {
+                JSONObject jsonObject = JSONObject.parseObject(returndata);
+                String code = Util.null2String(jsonObject.get("code"));
+                log.writeLog("--------发送请求返回的code值为：" + code);
+                if ("1".equals(code)) {
+                	
+                } else {
+                    String msg = Util.null2String(jsonObject.get("msg"));
+                    log.writeLog("调用HR接口返回错误信息----->" + msg);
+                }
+            }else {
+            	log.writeLog("调用HR接口返回为空----->");
+            }
+        }catch (Exception e){
+            //返回0，调用失败
+            log.writeLog("------------------------捕获到的异常是：" + e.toString());
+        }
+    }
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/action/ChuchaiHuiChuanReturnAction.java b/src/main/youhong_ai_jitu_src/jntchina/action/ChuchaiHuiChuanReturnAction.java
new file mode 100644
index 0000000..6e18bb6
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/action/ChuchaiHuiChuanReturnAction.java
@@ -0,0 +1,100 @@
+package jntchina.action;
+
+import com.alibaba.fastjson.JSONObject;
+import jntchina.util.HttpClientToDC;
+import selfdev.util.base.BaseUtil;
+import selfdev.util.log.LogTool;
+import weaver.conn.RecordSet;
+import weaver.file.Prop;
+import weaver.general.Util;
+import weaver.interfaces.workflow.action.BaseAction;
+import weaver.soa.workflow.request.RequestInfo;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @description: 出差结果回传-退回至发起人
+ * @author: daizhishun
+ * @date: 2021/9/10
+ **/
+public class ChuchaiHuiChuanReturnAction extends BaseAction {
+    public static LogTool log=new LogTool("/log/selfdev/action/hrm", true);
+    public String execute(RequestInfo requestInfo){
+        String requestId = requestInfo.getRequestid(); // 获取requestid
+        String workflowid = requestInfo.getWorkflowid(); // 获取workflowid
+
+        //获取工作流名称
+        String workflowname = BaseUtil.getBaseInfoByParm("workflowname", "workflow_base", "id", workflowid, "");
+        log.writeLog("--------【"+workflowname+"】退回到申请节点时数据传入中台开始----requestId值为：" + requestId);
+
+        try{
+            //获取配置文件中的参数，到时候URL路径
+            String mode = Prop.getPropValue("DevToDC_jntchina", "mode");
+            // 服务器ip：port
+            String baseUrl = Prop.getPropValue("DevToDC_jntchina", mode + "_baseUrl");
+            //访问路径拼接
+            String url = baseUrl + "/dcoaapi/hr/attendance";
+
+            //根据流程id获取主表名称
+            String mainTable = RegularizationApplyForAction.getMainTable(requestId);
+            log.writeLog("--------获取到的表名为----：" + mainTable);
+            //申请单号
+            String C_OA_NUM = "";
+            //单据来源：默认OA
+            String C_APPLY_SOURCE = "OA";
+            //流程名称：出差流程为30
+            String C_WORKFLOW = "30";
+            //审批状态：已通过：3，驳回：5
+            String C_STATUS = "5";
+
+            RecordSet rs = new RecordSet();
+            String sql = "select lcbh1 from "+mainTable+" where requestid = "+requestId+"";
+            rs.execute(sql);
+            log.writeLog("----------------》打印sql语句"+sql);
+            while (rs.next()) {
+                C_OA_NUM = Util.null2String(rs.getString("lcbh1"));//申请单号
+            }
+
+
+            Map<String,Object> map = new HashMap<String,Object>();
+            map.put("C_OA_NUM",C_OA_NUM);
+            map.put("C_APPLY_SOURCE",C_APPLY_SOURCE);
+            map.put("C_WORKFLOW",C_WORKFLOW);
+            map.put("C_STATUS",C_STATUS);
+            String strParm = JSONObject.toJSONString(map);
+            log.writeLog("---------------打印的Map数据为：-----------------："+strParm);
+
+            //获取Token
+            String token = HttpClientToDC.getToken();
+            log.writeLog("出差申请单token------>" + token);
+            log.writeLog("出差申请单url------>" + url);
+
+            //调用NCC接口，将数据传给NCC
+            String returndata = HttpClientToDC.sendPostApi(url,token,strParm);
+            log.writeLog("【调用数据中台出差申请单接口返回结果:】" + returndata);
+            if (!"".equals(returndata) && returndata != null) {
+                JSONObject jsonObject = JSONObject.parseObject(returndata);
+                String code = Util.null2String(jsonObject.get("code"));
+                log.writeLog("--------发送请求返回的code值为：" + code);
+                if ("1".equals(code)) {
+                    return SUCCESS;
+                } else {
+                    String msg = Util.null2String(jsonObject.get("msg"));
+                    requestInfo.getRequestManager().setMessageid("111100");
+                    requestInfo.getRequestManager().setMessagecontent(msg);
+                    return "0";
+                }
+            }else {
+                String ermsg = "流程数据已审批状态提交至中台失败，请联系系统管理员处理！";
+                requestInfo.getRequestManager().setMessageid("111100");
+                requestInfo.getRequestManager().setMessagecontent(ermsg);
+                return "0";
+            }
+        }catch (Exception e){
+            //返回0，调用失败
+            log.writeLog("------------------------捕获到的异常是：" + e.toString());
+            return "0";
+        }
+    }
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/action/ChuchaiHuiChuanReturnAction2.java b/src/main/youhong_ai_jitu_src/jntchina/action/ChuchaiHuiChuanReturnAction2.java
new file mode 100644
index 0000000..36432a1
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/action/ChuchaiHuiChuanReturnAction2.java
@@ -0,0 +1,100 @@
+package jntchina.action;
+
+import com.alibaba.fastjson.JSONObject;
+import jntchina.util.HttpClientToDC;
+import selfdev.util.base.BaseUtil;
+import selfdev.util.log.LogTool;
+import weaver.conn.RecordSet;
+import weaver.file.Prop;
+import weaver.general.Util;
+import weaver.interfaces.workflow.action.BaseAction;
+import weaver.soa.workflow.request.RequestInfo;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @description: 携程出差退回至申请人回传状态至OracleHR
+ * @author: KangMD
+ * @date: 2021-12-13
+ **/
+public class ChuchaiHuiChuanReturnAction2 extends BaseAction {
+    public static LogTool log=new LogTool("/log/selfdev/action/hrm", true);
+    public String execute(RequestInfo requestInfo){
+        String requestId = requestInfo.getRequestid(); // 获取requestid
+        String workflowid = requestInfo.getWorkflowid(); // 获取workflowid
+
+        //获取工作流名称
+        String workflowname = BaseUtil.getBaseInfoByParm("workflowname", "workflow_base", "id", workflowid, "");
+        log.writeLog("--------【"+workflowname+"】退回到申请节点时状态传入中台开始----requestId值为：" + requestId);
+
+        try{
+            //获取配置文件中的参数，到时候URL路径
+            String mode = Prop.getPropValue("DevToDC_jntchina", "mode");
+            // 服务器ip：port
+            String baseUrl = Prop.getPropValue("DevToDC_jntchina", mode + "_baseUrl");
+            //访问路径拼接
+            String url = baseUrl + "/dcoaapi/hr/attendance";
+
+            //根据流程id获取主表名称
+            String mainTable = RegularizationApplyForAction.getMainTable(requestId);
+            log.writeLog("--------获取到的表名为----：" + mainTable);
+            //申请单号
+            String C_OA_NUM = "";
+            //单据来源：默认OA
+            String C_APPLY_SOURCE = "OA";
+            //流程名称：出差流程为30
+            String C_WORKFLOW = "30";
+            //审批状态：已通过：3，驳回：5
+            String C_STATUS = "5";
+
+            RecordSet rs = new RecordSet();
+            String sql = "select lcbh from "+mainTable+" where requestid = "+requestId+"";
+            rs.execute(sql);
+            log.writeLog("----------------》打印sql语句"+sql);
+            while (rs.next()) {
+                C_OA_NUM = Util.null2String(rs.getString("lcbh"));//申请单号
+            }
+
+
+            Map<String,Object> map = new HashMap<String,Object>();
+            map.put("C_OA_NUM",C_OA_NUM);
+            map.put("C_APPLY_SOURCE",C_APPLY_SOURCE);
+            map.put("C_WORKFLOW",C_WORKFLOW);
+            map.put("C_STATUS",C_STATUS);
+            String strParm = JSONObject.toJSONString(map);
+            log.writeLog("---------------打印的Map数据为：-----------------："+strParm);
+
+            //获取Token
+            String token = HttpClientToDC.getToken();
+            log.writeLog("出差申请单token------>" + token);
+            log.writeLog("出差申请单url------>" + url);
+
+            //调用NCC接口，将数据传给NCC
+            String returndata = HttpClientToDC.sendPostApi(url,token,strParm);
+            log.writeLog("【调用数据中台出差退回状态回传接口返回结果:】" + returndata);
+            if (!"".equals(returndata) && returndata != null) {
+                JSONObject jsonObject = JSONObject.parseObject(returndata);
+                String code = Util.null2String(jsonObject.get("code"));
+                log.writeLog("--------发送请求返回的code值为：" + code);
+                if ("1".equals(code)) {
+                    return SUCCESS;
+                } else {
+                    String msg = Util.null2String(jsonObject.get("msg"));
+                    requestInfo.getRequestManager().setMessageid("111100");
+                    requestInfo.getRequestManager().setMessagecontent(msg);
+                    return "0";
+                }
+            }else {
+                String ermsg = "流程数据退回状态提交至中台失败，请联系系统管理员处理！";
+                requestInfo.getRequestManager().setMessageid("111100");
+                requestInfo.getRequestManager().setMessagecontent(ermsg);
+                return "0";
+            }
+        }catch (Exception e){
+            //返回0，调用失败
+            log.writeLog("------------------------捕获到的异常是：" + e.toString());
+            return "0";
+        }
+    }
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/action/ChuchaiHuiChuanSuccessAction.java b/src/main/youhong_ai_jitu_src/jntchina/action/ChuchaiHuiChuanSuccessAction.java
new file mode 100644
index 0000000..6b6bb7e
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/action/ChuchaiHuiChuanSuccessAction.java
@@ -0,0 +1,102 @@
+package jntchina.action;
+
+import com.alibaba.fastjson.JSONObject;
+import jntchina.util.HttpClientToDC;
+import selfdev.util.base.BaseUtil;
+import selfdev.util.log.LogTool;
+import weaver.conn.RecordSet;
+import weaver.file.Prop;
+import weaver.general.Util;
+import weaver.interfaces.workflow.action.BaseAction;
+import weaver.soa.workflow.request.RequestInfo;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @description: 出差结果回传-成功-放归档节点前操作
+ * @author: daizhishun
+ * @date: 2021/9/10
+ **/
+public class ChuchaiHuiChuanSuccessAction extends BaseAction {
+
+    public static LogTool log=new LogTool("/log/selfdev/action/hrm", true);
+    public String execute(RequestInfo requestInfo){
+        String requestId = requestInfo.getRequestid(); // 获取requestid
+        String workflowid = requestInfo.getWorkflowid(); // 获取workflowid
+
+        //获取工作流名称
+        String workflowname = BaseUtil.getBaseInfoByParm("workflowname", "workflow_base", "id", workflowid, "");
+        log.writeLog("--------【"+workflowname+"】数据传入中台开始----requestId值为：" + requestId);
+
+        try{
+            //获取配置文件中的参数，到时候URL路径
+            String mode = Prop.getPropValue("DevToDC_jntchina", "mode");
+            // 服务器ip：port
+            String baseUrl = Prop.getPropValue("DevToDC_jntchina", mode + "_baseUrl");
+            //访问路径拼接
+            String url = baseUrl + "/dcoaapi/hr/attendance";
+
+            //根据流程id获取主表名称
+            String mainTable = RegularizationApplyForAction.getMainTable(requestId);
+            log.writeLog("--------获取到的表名为----：" + mainTable);
+            //申请单号
+            String C_OA_NUM = "";
+            //单据来源：默认OA
+            String C_APPLY_SOURCE = "OA";
+            //流程名称：出差流程为30
+            String C_WORKFLOW = "30";
+            //审批状态：已通过：3，驳回：5
+            String C_STATUS = "3";
+
+            RecordSet rs = new RecordSet();
+            String sql = "select lcbh1 from "+mainTable+" where requestid = "+requestId+"";
+            rs.execute(sql);
+            log.writeLog("----------------》打印sql语句"+sql);
+            while (rs.next()) {
+                C_OA_NUM = Util.null2String(rs.getString("lcbh1"));//申请单号
+            }
+
+
+            Map<String,Object> map = new HashMap<String,Object>();
+            map.put("C_OA_NUM",C_OA_NUM);
+            map.put("C_APPLY_SOURCE",C_APPLY_SOURCE);
+            map.put("C_WORKFLOW",C_WORKFLOW);
+            map.put("C_STATUS",C_STATUS);
+            String strParm = JSONObject.toJSONString(map);
+            log.writeLog("---------------打印的Map数据为：-----------------："+strParm);
+
+            //获取Token
+            String token = HttpClientToDC.getToken();
+            log.writeLog("出差申请单token------>" + token);
+            log.writeLog("出差申请单url------>" + url);
+
+            //调用NCC接口，将数据传给NCC
+            String returndata = HttpClientToDC.sendPostApi(url,token,strParm);
+            log.writeLog("【调用数据中台出差申请单接口返回结果:】" + returndata);
+            if (!"".equals(returndata) && returndata != null) {
+                JSONObject jsonObject = JSONObject.parseObject(returndata);
+                String code = Util.null2String(jsonObject.get("code"));
+                log.writeLog("--------发送请求返回的code值为：" + code);
+                if ("1".equals(code)) {
+                    return SUCCESS;
+                } else {
+                    String msg = Util.null2String(jsonObject.get("msg"));
+                    requestInfo.getRequestManager().setMessageid("111100");
+                    requestInfo.getRequestManager().setMessagecontent(msg);
+                    return "0";
+                }
+            }else {
+                String ermsg = "流程数据已审批状态提交至中台失败，请联系系统管理员处理！";
+                requestInfo.getRequestManager().setMessageid("111100");
+                requestInfo.getRequestManager().setMessagecontent(ermsg);
+                return "0";
+            }
+        }catch (Exception e){
+            //返回0，调用失败
+            log.writeLog("------------------------捕获到的异常是：" + e.toString());
+            return "0";
+        }
+    }
+
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/action/ChuchaiHuiChuanSuccessAction2.java b/src/main/youhong_ai_jitu_src/jntchina/action/ChuchaiHuiChuanSuccessAction2.java
new file mode 100644
index 0000000..e69ca57
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/action/ChuchaiHuiChuanSuccessAction2.java
@@ -0,0 +1,101 @@
+package jntchina.action;
+
+import com.alibaba.fastjson.JSONObject;
+import jntchina.util.HttpClientToDC;
+import selfdev.util.base.BaseUtil;
+import selfdev.util.log.LogTool;
+import weaver.conn.RecordSet;
+import weaver.file.Prop;
+import weaver.general.Util;
+import weaver.interfaces.workflow.action.BaseAction;
+import weaver.soa.workflow.request.RequestInfo;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @description: 携程出差审批完成状态回传OracleHR
+ * @author: KangMD
+ * @date: 2021-12-13
+ **/
+public class ChuchaiHuiChuanSuccessAction2 extends BaseAction {
+
+    public static LogTool log=new LogTool("/log/selfdev/action/hrm", true);
+    public String execute(RequestInfo requestInfo){
+        String requestId = requestInfo.getRequestid(); // 获取requestid
+        String workflowid = requestInfo.getWorkflowid(); // 获取workflowid
+
+        //获取工作流名称
+        String workflowname = BaseUtil.getBaseInfoByParm("workflowname", "workflow_base", "id", workflowid, "");
+        log.writeLog("--------【"+workflowname+"】数据传入中台开始----requestId值为：" + requestId);
+        
+        try{
+            //获取配置文件中的参数，到时候URL路径
+            String mode = Prop.getPropValue("DevToDC_jntchina", "mode");
+            // 服务器ip：port
+            String baseUrl = Prop.getPropValue("DevToDC_jntchina", mode + "_baseUrl");
+            //访问路径拼接
+            String url = baseUrl + "/dcoaapi/hr/attendance";
+
+            //根据流程id获取主表名称
+            String mainTable = RegularizationApplyForAction.getMainTable(requestId);
+            log.writeLog("--------获取到的表名为----：" + mainTable);
+            //申请单号
+            String C_OA_NUM = "";
+            //单据来源：默认OA
+            String C_APPLY_SOURCE = "OA";
+            //流程名称：出差流程为30
+            String C_WORKFLOW = "30";
+            //审批状态：已通过：3，驳回：5
+            String C_STATUS = "3";
+
+            RecordSet rs = new RecordSet();
+            String sql = "select lcbh from "+mainTable+" where requestid = "+requestId+"";
+            rs.execute(sql);
+            log.writeLog("---------------->打印sql语句"+sql);
+            while (rs.next()) {
+                C_OA_NUM = Util.null2String(rs.getString("lcbh"));//申请单号
+            }
+
+            Map<String,Object> map = new HashMap<String,Object>();
+            map.put("C_OA_NUM",C_OA_NUM);
+            map.put("C_APPLY_SOURCE",C_APPLY_SOURCE);
+            map.put("C_WORKFLOW",C_WORKFLOW);
+            map.put("C_STATUS",C_STATUS);
+            String strParm = JSONObject.toJSONString(map);
+            log.writeLog("---------------传入参数Map数据-----------------："+strParm);
+
+            //获取Token
+            String token = HttpClientToDC.getToken();
+            log.writeLog("出差申请单token------>" + token);
+            log.writeLog("出差申请单url------>" + url);
+
+            //调用NCC接口，将数据传给NCC
+            String returndata = HttpClientToDC.sendPostApi(url,token,strParm);
+            log.writeLog("【调用数据中台出差申请单审批完成状态回传接口返回结果:】" + returndata);
+            if (!"".equals(returndata) && returndata != null) {
+                JSONObject jsonObject = JSONObject.parseObject(returndata);
+                String code = Util.null2String(jsonObject.get("code"));
+                log.writeLog("--------发送请求返回的code值为：" + code);
+                if ("1".equals(code)) {
+                    return SUCCESS;
+                } else {
+                    String msg = Util.null2String(jsonObject.get("msg"));
+                    requestInfo.getRequestManager().setMessageid("111100");
+                    requestInfo.getRequestManager().setMessagecontent(msg);
+                    return "0";
+                }
+            }else {
+                String ermsg = "流程数据已审批状态提交至中台失败，请联系系统管理员处理！";
+                requestInfo.getRequestManager().setMessageid("111100");
+                requestInfo.getRequestManager().setMessagecontent(ermsg);
+                return "0";
+            }
+        }catch (Exception e){
+            //返回0，调用失败
+            log.writeLog("------------------------捕获到的异常是：" + e.toString());
+            return "0";
+        }
+    }
+
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/action/EHRHolidayInterface.java b/src/main/youhong_ai_jitu_src/jntchina/action/EHRHolidayInterface.java
new file mode 100644
index 0000000..7f18647
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/action/EHRHolidayInterface.java
@@ -0,0 +1,131 @@
+package jntchina.action;
+
+
+
+
+import com.alibaba.fastjson.JSONObject;
+import jntchina.util.HttpClientToDC;
+import weaver.file.Prop;
+import weaver.general.Util;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @description: 调用假期余额查询接口
+ * @author: daizhishun
+ * @date: 2021/8/6
+ **/
+public class EHRHolidayInterface {
+
+    /**
+     * 调用假期余额查询接口
+     * @param EMPLID 员工编码
+     * @return
+     */
+    public Map VacationBalanceSrvh(String EMPLID) {
+        //前端传进来的键值对字符串，类型转换为Map
+        Map map1  = (Map)JSONObject.parseObject(EMPLID);
+        //用来返回数据
+        Map<String, Double> map = new HashMap<String, Double>();
+        //非空校验
+        if ("".equals(map1.get("EMPLID")) || map1.get("EMPLID")==null){
+            map.put("zero",0.0);
+            return map;
+        }
+
+        //用来传递数据
+        String strParm = JSONObject.toJSONString(map1);
+
+        //假期余额查询接口路径,EHR路径
+        //String url = "http://121.37.156.206:21005/PSIGW/RESTListeningConnector/PSFT_HR/C_VACATION_BALANCE_SRCH.v1/";
+
+        String mode = Prop.getPropValue("DevToDC_jntchina", "mode");
+        // 服务器ip：port
+        String baseUrl = Prop.getPropValue("DevToDC_jntchina", mode + "_baseUrl");
+        //访问路径拼接
+        String url = baseUrl + "/dcoaapi/hr/vacation";
+
+        //获取Token
+        String token = HttpClientToDC.getToken();
+
+        //携带参数调用
+        String returndata = HttpClientToDC.sendPostApi(url,token,strParm);
+        if (!"".equals(returndata) && returndata != null) {
+            JSONObject jsonObject = JSONObject.parseObject(returndata);
+            String code = Util.null2String(jsonObject.get("code"));
+            if("1".equals(code)){
+                List<Map> list = (List<Map>) jsonObject.get("DATA");
+                String result = list.get(0).get("C_NJ_BAL").toString();
+                String result2 = list.get(0).get("C_TX_BAL").toString();
+                double re1 = Double.parseDouble(result);
+                double re2 = Double.parseDouble(result2);
+                //本年剩余年休假
+                map.put("year_low",re1);
+                //本年剩余调休假
+                map.put("rest_low",re2);
+                return map;
+            }
+        }
+        map.put("zero",0.0);
+        return map;
+    }
+
+
+    /**
+     * 获取员工请假天数接口
+     * 员工编号 请假类型 开始日期 开始时间 结束日期 结束时间
+     * @return
+     */
+    public Map StaffLeaveByDay(String EMPLID,String C_VACATION_TYPE,
+                               String C_START_DT,String C_START_DTM,
+                               String C_END_DT,String C_END_DTM) {
+        //用来返回数据
+        Map<String, Double> map = new HashMap();
+        //非空校验
+        if ("".equals(EMPLID) || "".equals(C_VACATION_TYPE)
+                || "".equals(C_START_DT) ||"".equals(C_START_DTM)
+                ||"".equals(C_END_DT) ||"".equals(C_END_DTM)){
+            map.put("zero",0.0);
+            return map;
+        }
+
+        //NCC路径地址
+        String mode = Prop.getPropValue("DevToDC_jntchina", "mode");
+        // 服务器ip：port
+        String baseUrl = Prop.getPropValue("DevToDC_jntchina", mode + "_baseUrl");
+        //访问路径拼接
+        String url = baseUrl + "/dcoaapi/hr/leaveDay";
+
+        //数据封装
+        Map<String, String> map1 = new HashMap();
+        map1.put("EMPLID",EMPLID);//员工编号
+        map1.put("C_VACATION_TYPE",C_VACATION_TYPE);//请假类型
+        map1.put("C_START_DT",C_START_DT);//开始日期
+        map1.put("C_START_DTM",C_START_DTM);//开始时间
+        map1.put("C_END_DT",C_END_DT);//结束日期
+        map1.put("C_END_DTM",C_END_DTM);//结束时间
+        String strParm = JSONObject.toJSONString(map1);
+
+        //获取Token
+        String token = HttpClientToDC.getToken();
+
+        //携带参数调用
+        String returndata = HttpClientToDC.sendPostApi(url,token,strParm);
+        if (!"".equals(returndata) && returndata != null) {
+            JSONObject jsonObject = JSONObject.parseObject(returndata);
+            String code = Util.null2String(jsonObject.get("code"));
+            if("1".equals(code)) {
+                List<Map> list = (List<Map>) jsonObject.get("DATA");
+                String result = list.get(0).get("LEAVE_DAY").toString();
+                //转换为double类型
+                double result2 = Double.parseDouble(result);
+                map.put("leavedays",result2);
+                return map;
+            }
+        }
+        map.put("zero",0.0);
+        return map;
+    }
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/action/EmploymentPatternChangeAction.java b/src/main/youhong_ai_jitu_src/jntchina/action/EmploymentPatternChangeAction.java
new file mode 100644
index 0000000..c396fbf
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/action/EmploymentPatternChangeAction.java
@@ -0,0 +1,261 @@
+package jntchina.action;
+
+import com.alibaba.fastjson.JSONObject;
+import jntchina.util.HttpClientToDC;
+import selfdev.util.base.BaseUtil;
+import selfdev.util.log.LogTool;
+import weaver.conn.RecordSet;
+import weaver.file.Prop;
+import weaver.general.Util;
+import weaver.interfaces.workflow.action.BaseAction;
+import weaver.soa.workflow.request.RequestInfo;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @description: 用工模式变更申请单
+ * @author: dzs
+ * @date: 2021/7/26
+ **/
+public class EmploymentPatternChangeAction extends BaseAction {
+
+	@Override
+	public String execute(RequestInfo requestInfo) {
+	    LogTool log = new LogTool("/log/selfdev/action/hrm", true);
+	    String requestId = requestInfo.getRequestid(); // 获取requestid
+	    String workflowid=requestInfo.getWorkflowid(); // 获取workflowid
+	    //获取工作流名称
+	    String workflowname= BaseUtil.getBaseInfoByParm("workflowname", "workflow_base", "id", workflowid, "");
+	    log.writeLog("---------------工作流名称-----------workflowname为：" + workflowname);
+	    log.writeLog("--------用工模式变更申请单数据传入中台开始----requestId值为：" + requestId);
+	
+	    //获取配置文件中的参数
+	    String mode = Prop.getPropValue("DevToDC_jntchina","mode");
+	    // 服务器ip：port
+	    String baseUrl = Prop.getPropValue("DevToDC_jntchina", mode+"_baseUrl");
+	    //访问路径拼接
+	    String url = baseUrl+"/dcoaapi/hr/factoryChange";
+	
+	    //根据流程id获取主表名称
+	    String mainTable = EmploymentPatternChangeAction.getMainTable(requestId);
+	    log.writeLog("--------获取到的表名为----：" + mainTable);
+	
+	    //申请单号
+	    String C_APP_SEQ = "";
+	    //审批状态
+	    String C_APPLI_RS ="3"; //3:已通过(默认)
+	    //申请日期
+	    String C_APP_DT = "";
+	    //申请人ID
+	    String EMPLID = "";
+	    //变更员工ID
+	    String EMPLID2 ="";
+	    //变更日期
+	    String ACTION_DT ="";
+	    //变更员工类型
+	    String C_EMPL_CLASS2 ="";//默认写:10全日制
+	    //变更岗位
+	    String POSITION_NBR2="";//取岗位表里的outkey值
+	    //变更职级--->测试环境已维护，字段改为:变更职级(更新后)
+	    String C_POSN_GRDE_ID1 ="";
+	    //变更薪资组
+	    String GP_PAYGROUP2 ="";//默认写:NOPAY
+	    //变更社保缴纳地
+	    String C_SB_LOC_ID1 ="";
+	    //变更直接上级
+	    String SUPERVISOR_ID2 ="";
+	    //社保缴纳公司
+	    String C_SB_LOC_COMPANY ="";
+	    //社保缴纳规则
+	    String C_SB_LOC_RULE ="";
+	    //个人缴费基数及比例
+	    String C_ENDO_INSU ="";
+	    //单位缴费基数及比例
+	    String C_ENDO_INSU1 ="";
+	    //公积金缴费规则
+	    String C_GJJ_RULE_ID ="";
+	    //个人公积金基数
+	    String C_HOUS_FUND ="";
+	    //公司公积金基数
+	    String C_HOUS_FUND1 ="";
+	    //社保公积金生效日期
+	    String C_SB_EFFDT ="";
+	    //是否涉及社保公积金变更
+	    String sfsjsbgjjbg ="";
+	
+	    RecordSet rs = new RecordSet();
+	
+	    try {
+	        //转换值接口的数据为10全日制，后续需要更改******
+	        String sql = "select C_APP_SEQ,C_APP_DT,EMPLID,EMPLID2,sfsjsbgjjbg," +
+	                "ACTION_DT,C_EMPL_CLASS2,POSITION_NBR2," +
+	                "C_POSN_GRDE_ID111,GP_PAYGROUP2,C_SB_LOC_ID1," +
+	                "SUPERVISOR_ID2," +
+	                "C_SB_LOC_COMPANY," +
+	                "C_SB_LOC_RULE," +
+	                "C_ENDO_INSU," +
+	                "C_ENDO_INSU1," +
+	                "C_GJJ_RULE_ID," +
+	                "C_HOUS_FUND," +
+	                "C_HOUS_FUND1," +
+	                "C_SB_EFFDT " +
+	                " from " + mainTable + " where requestid='" + requestId + "'";
+	        rs.execute(sql);
+	        log.writeLog("----------------》打印sql语句"+sql);
+	        while (rs.next()) {
+	            C_APP_SEQ = Util.null2String(rs.getString("C_APP_SEQ"));
+	            C_APP_DT = Util.null2String(rs.getString("C_APP_DT"));
+	            EMPLID = Util.null2String(rs.getString("EMPLID"));
+	            EMPLID2 =Util.null2String(rs.getString("EMPLID2"));
+	            ACTION_DT =Util.null2String(rs.getString("ACTION_DT"));
+	            C_EMPL_CLASS2 =Util.null2String(rs.getString("C_EMPL_CLASS2"));
+	            //根据岗位的ID查询对应的岗位编码
+	            POSITION_NBR2 = EmploymentPatternChangeAction.selectPOSITION_NBR2(Util.null2String(rs.getString("POSITION_NBR2")));
+	            log.writeLog("--------------->打印表单变更岗位字段的id："+Util.null2String(rs.getString("POSITION_NBR2"))+"执行查询方法后取到的outkey："+POSITION_NBR2);
+	            C_POSN_GRDE_ID1 =Util.null2String(rs.getString("C_POSN_GRDE_ID111"));
+	            GP_PAYGROUP2 =Util.null2String(rs.getString("GP_PAYGROUP2"));
+	            C_SB_LOC_ID1 =Util.null2String(rs.getString("C_SB_LOC_ID1"));
+	            SUPERVISOR_ID2 =Util.null2String(rs.getString("SUPERVISOR_ID2"));
+	
+	            C_SB_LOC_COMPANY =Util.null2String(rs.getString("C_SB_LOC_COMPANY"));
+	            C_SB_LOC_RULE =Util.null2String(rs.getString("C_SB_LOC_RULE"));
+	            C_ENDO_INSU =Util.null2String(rs.getString("C_ENDO_INSU"));
+	            C_ENDO_INSU1 =Util.null2String(rs.getString("C_ENDO_INSU1"));
+	            C_GJJ_RULE_ID =Util.null2String(rs.getString("C_GJJ_RULE_ID"));
+	            C_HOUS_FUND =Util.null2String(rs.getString("C_HOUS_FUND"));
+	            C_HOUS_FUND1 =Util.null2String(rs.getString("C_HOUS_FUND1"));
+	            C_SB_EFFDT =Util.null2String(rs.getString("C_SB_EFFDT"));
+	            sfsjsbgjjbg =Util.null2String(rs.getString("sfsjsbgjjbg"));
+	
+	        }
+	        //使用Map封装数据
+	        Map<String,String> map = new HashMap<String,String>();
+	        map.put("C_APP_SEQ",C_APP_SEQ);//申请单号
+	        map.put("C_APPLI_RS",C_APPLI_RS);//审批状态：默认放为3
+	        map.put("C_APP_DT",C_APP_DT);//申请日期
+	        map.put("EMPLID",EMPLID);//申请人ID
+	        map.put("EMPLID2",EMPLID2);//变更员工ID
+	        map.put("ACTION_DT",ACTION_DT);//变更日期
+	        //变更员工类型,下拉框显示值
+	        String c_empl_class2 = ResignationFormWriteBackAction.getItemName2("C_EMPL_CLASS2", C_EMPL_CLASS2.toString(), workflowid);
+	        map.put("C_EMPL_CLASS2",c_empl_class2.split("-")[0]);//变更员工类型，获取下拉框显示值"-"前面部分的编码
+	        map.put("POSITION_NBR2",POSITION_NBR2);//变更岗位
+	
+	
+	        if (C_POSN_GRDE_ID1.equals("")){//存在历史问题 所以加判断 变更职级
+	            map.put("C_POSN_GRDE_ID1","101");//变更职级
+	        }else{
+	            map.put("C_POSN_GRDE_ID1",C_POSN_GRDE_ID1);//变更职级
+	        }
+	
+	        if (GP_PAYGROUP2.equals("")){//存在历史问题 所以加判断
+	            map.put("GP_PAYGROUP2","100");//变更薪资组 默认100 G0
+	        }else{
+	            map.put("GP_PAYGROUP2",GP_PAYGROUP2);//变更薪资组
+	        }
+	
+	       //根据上级ID获取上级编码
+	        String ucode = ResignationFormWriteBackAction.getWorkcodeByUid(SUPERVISOR_ID2);
+	        map.put("SUPERVISOR_ID2",ucode);//变更直接上级
+	
+	        if("0".equals(sfsjsbgjjbg)){
+	        	 map.put("C_SB_LOC_COMPANY",C_SB_LOC_COMPANY);//社保缴纳公司
+	        	 map.put("C_SB_LOC_ID1",C_SB_LOC_ID1);//变更社保缴纳地
+	             map.put("C_SB_LOC_RULE",C_SB_LOC_RULE);//社保缴纳规则
+	             map.put("C_ENDO_INSU",C_ENDO_INSU);//个人缴费基数及比例
+	             map.put("C_ENDO_INSU1",C_ENDO_INSU1);//单位缴费基数及比例
+	             map.put("C_GJJ_RULE_ID",C_GJJ_RULE_ID);//公积金缴费规则
+	             map.put("C_HOUS_FUND",C_HOUS_FUND);//个人公积金基数
+	             map.put("C_HOUS_FUND1",C_HOUS_FUND1);//公司公积金基数
+	             map.put("C_SB_EFFDT",C_SB_EFFDT);//社保公积金生效日期
+	        }else{
+	        	 map.put("C_SB_LOC_COMPANY","");//社保缴纳公司
+	        	 map.put("C_SB_LOC_ID1","");//变更社保缴纳地
+	             map.put("C_SB_LOC_RULE","");//社保缴纳规则
+	             map.put("C_ENDO_INSU","");//个人缴费基数及比例
+	             map.put("C_ENDO_INSU1","");//单位缴费基数及比例
+	             map.put("C_GJJ_RULE_ID","");//公积金缴费规则
+	             map.put("C_HOUS_FUND","");//个人公积金基数
+	             map.put("C_HOUS_FUND1","");//公司公积金基数
+	             map.put("C_SB_EFFDT","");//社保公积金生效日期
+	        }
+	        
+	
+	        String strParm = JSONObject.toJSONString(map);
+	        log.writeLog("---------------打印的Map数据为：-----------------："+strParm);
+	
+	        //获取Token
+	        String token = HttpClientToDC.getToken();
+	        log.writeLog("用工模式变更申请单token------>" + token);
+	        log.writeLog("用工模式变更申请单url------>" + url);
+	
+	        //调用NCC接口，将数据传给NCC
+	        String returndata = HttpClientToDC.sendPostApi(url,token,strParm);
+	        log.writeLog("【调用数据中台用工模式变更申请单接口返回结果result:】" + returndata);
+	        if (!"".equals(returndata) && returndata != null) {
+	            JSONObject jsonObject = JSONObject.parseObject(returndata);
+	            String code = Util.null2String(jsonObject.get("code"));
+	            log.writeLog("--------发送请求返回的code值为：" + code);
+	            if("1".equals(code)){
+	                return SUCCESS;
+	            }else{
+	                String msg = Util.null2String(jsonObject.get("msg"));
+	                requestInfo.getRequestManager().setMessageid("111100");
+	                requestInfo.getRequestManager().setMessagecontent(msg);
+	                return "0";
+	            }
+	        }else{
+	            String ermsg="流程数据写入NCC用工模式变更失败,未获取到接口返回结果，请联系系统管理员处理！";
+	            requestInfo.getRequestManager().setMessageid("111100");
+	            requestInfo.getRequestManager().setMessagecontent(ermsg);
+	            return "0";
+	        }
+	    }catch (Exception e){
+	        //返回0，调用失败
+	        log.writeLog("------------------------捕获到的异常是：" + e.toString());
+	        return "0";
+	    }
+	}
+
+
+
+    /**
+     * 使用requestid获取数据库表名
+     * @param requestid
+     * @return
+     */
+    public static String getMainTable(String requestid){
+        String tablename = "";
+        RecordSet rs = new RecordSet();
+        rs.executeQuery("select * from workflow_requestbase a,workflow_base b,workflow_bill c "
+                +"where a.requestid=? and a.workflowid = b.id and b.formid = c.id",requestid);
+        while(rs.next()){
+            tablename = Util.null2String(rs.getString("tablename"));
+        }
+        return tablename;
+        }
+
+
+    /**
+     * 使用岗位的id查询对应的Outkey
+     * @param str:入参岗位ID
+     * @return
+     */
+    public static String selectPOSITION_NBR2(String str){
+        //查询变更岗位取outkey
+        RecordSet rs = new RecordSet();
+        String result = "";
+        if(!"".equals(str) || str!=""){
+            String sqls = "select OUTKEY from HRMJOBTITLES where id ="+str+"";
+            rs.executeQuery(sqls);
+            while (rs.next()) {
+               result = Util.null2String(rs.getString("OUTKEY"));
+            }
+            return result;
+        }else {
+            return result;
+        }
+    }
+
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/action/EvectionApplicationAction.java b/src/main/youhong_ai_jitu_src/jntchina/action/EvectionApplicationAction.java
new file mode 100644
index 0000000..4611851
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/action/EvectionApplicationAction.java
@@ -0,0 +1,144 @@
+package jntchina.action;
+
+import com.alibaba.fastjson.JSONObject;
+import jntchina.util.HttpClientToDC;
+import selfdev.util.base.BaseUtil;
+import selfdev.util.log.LogTool;
+import weaver.conn.RecordSet;
+import weaver.file.Prop;
+import weaver.general.Util;
+import weaver.interfaces.workflow.action.BaseAction;
+import weaver.soa.workflow.request.RequestInfo;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @description: 出差申请单
+ * @author: daizhishun
+ * @date: 2021/7/30
+ **/
+public class EvectionApplicationAction extends BaseAction {
+    @Override
+    public String execute(RequestInfo requestInfo) {
+        LogTool log = new LogTool("/log/selfdev/action/hrm", true);
+        String requestId = requestInfo.getRequestid(); // 获取requestid
+        String workflowid = requestInfo.getWorkflowid(); // 获取workflowid
+
+        //获取工作流名称
+        String workflowname = BaseUtil.getBaseInfoByParm("workflowname", "workflow_base", "id", workflowid, "");
+        log.writeLog("---------------工作流名称-----------workflowname为：" + workflowname);
+        log.writeLog("--------出差申请单数据传入中台开始----requestId值为：" + requestId);
+
+        //获取配置文件中的参数，到时候URL路径
+        String mode = Prop.getPropValue("DevToDC_jntchina", "mode");
+        // 服务器ip：port
+        String baseUrl = Prop.getPropValue("DevToDC_jntchina", mode + "_baseUrl");
+        //访问路径拼接
+        String url = baseUrl + "/dcoaapi/hr/trip";
+
+        //对接EHR系统路径
+        //String url = "http://121.37.156.206:21005/PSIGW/RESTListeningConnector/PSFT_HR/C_TRIP_APPLY.v1/";
+
+
+        //根据流程id获取主表名称
+        String mainTable = RegularizationApplyForAction.getMainTable(requestId);
+        log.writeLog("-------------获取到的表名为-------------：" + mainTable);
+        //申请编号
+        String C_OA_NUM = "";
+        //单据来源
+        String C_APPLY_SOURCE = "OA";
+        //提单人，申请人
+        String EMPLID = "";
+
+        //{
+        //出差数据
+        List<Map<String, String>> list = new ArrayList<Map<String, String>>();
+        //出差开始日期
+        String C_START_DT = "";
+        //出差开始时间
+        String C_START_DTM = "";
+        //出差结束日期
+        String C_END_DT = "";
+        //出差结束时间
+        String C_END_DTM = "";
+        //出差原因
+        String C_REASON = "";
+        //出差天数
+        // String C_TRIP_DAYS = "";
+        //出差地点
+        String ccdd = "";
+
+        RecordSet rs = new RecordSet();
+        try {
+            String sql = "select * from " + mainTable + " where requestid = '" + requestId + "'";
+            rs.executeQuery(sql);
+            log.writeLog("查询sql语句---------------->" + sql);
+            while (rs.next()) {
+                C_OA_NUM = Util.null2String(rs.getString("lcbh1"));//申请单号
+                EMPLID = Util.null2String(rs.getString("gh"));//申请人
+                C_START_DT = Util.null2String(rs.getString("fromDate"));//开始日期
+                C_START_DTM = Util.null2String(rs.getString("fromTime"));//开始时间
+                C_END_DT = Util.null2String(rs.getString("toDate"));//结束日期
+                C_END_DTM = Util.null2String(rs.getString("toTime"));//结束时间
+                C_REASON = Util.null2String(rs.getString("ccsy"));//出差事由
+                //C_TRIP_DAYS = Util.null2o(rs.getString("duration"));//出差天数
+                ccdd = Util.null2String(rs.getString("ccdd"));//出差地点
+            }
+            //将出差数据进行包装
+            Map<String, String> maps = new HashMap<String, String>();
+            maps.put("EMPLID", EMPLID);
+            maps.put("C_START_DT", C_START_DT);
+            maps.put("C_START_DTM", C_START_DTM);
+            maps.put("C_END_DT", C_END_DT);
+            maps.put("C_END_DTM", C_END_DTM);
+            maps.put("C_REASON", C_REASON);
+            maps.put("ccdd",ccdd);
+            maps.put("C_TRIP_DAYS", "1");//20220429 by KangMD  不需要传出差天数，HR系统自动计算，默认传固定值1
+            list.add(maps);
+            log.writeLog("----------------->出差数据明细数据:" + list.toString());
+
+            //最后再将数据全部打包
+            Map<String, Object> map = new HashMap<String, Object>();
+            map.put("C_OA_NUM", C_OA_NUM);
+            map.put("C_APPLY_SOURCE", C_APPLY_SOURCE);
+            map.put("EMPLID", EMPLID);
+            map.put("LINES", list);
+            String strParm = JSONObject.toJSONString(map);
+            log.writeLog("---------------打印的Map数据为：-----------------：" + strParm);
+
+            //获取Token
+            String token = HttpClientToDC.getToken();
+            log.writeLog("出差申请单token------>" + token);
+            log.writeLog("出差申请单url------>" + url);
+
+            //调用NCC接口，将数据传给NCC
+            String returndata = HttpClientToDC.sendPostApi(url, token, strParm);
+            log.writeLog("【调用数据中台出差申请单接口返回结果result:】" + returndata);
+            if (!"".equals(returndata) && returndata != null) {
+                JSONObject jsonObject = JSONObject.parseObject(returndata);
+                String code = Util.null2String(jsonObject.get("code"));
+                log.writeLog("--------发送请求返回的code值为：" + code);
+                if (code.equals("1")) {
+                    return SUCCESS;
+                } else {
+                    String msg = Util.null2String(jsonObject.get("msg"));
+                    requestInfo.getRequestManager().setMessageid("111100");
+                    requestInfo.getRequestManager().setMessagecontent(msg);
+                    return "0";
+                }
+            } else {
+                String ermsg = "流程数据写入NCC出差申请单失败,未获取到接口返回结果，请联系系统管理员处理！";
+                requestInfo.getRequestManager().setMessageid("111100");
+                requestInfo.getRequestManager().setMessagecontent(ermsg);
+                return "0";
+            }
+        } catch (Exception e) {
+            //返回0，调用失败
+            log.writeLog("------------------------捕获到的异常是：" + e.toString());
+            return "0";
+        }
+    }
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/action/EvectionApplicationAction2.java b/src/main/youhong_ai_jitu_src/jntchina/action/EvectionApplicationAction2.java
new file mode 100644
index 0000000..1f10a64
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/action/EvectionApplicationAction2.java
@@ -0,0 +1,147 @@
+package jntchina.action;
+
+import com.alibaba.fastjson.JSONObject;
+import jntchina.util.HttpClientToDC;
+import selfdev.util.base.BaseUtil;
+import selfdev.util.log.LogTool;
+import weaver.conn.RecordSet;
+import weaver.file.Prop;
+import weaver.general.Util;
+import weaver.interfaces.workflow.action.BaseAction;
+import weaver.soa.workflow.request.RequestInfo;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @description: 出差申请单-对接hr
+ * @author: daizhishun
+ * @date: 2021/7/30
+ **/
+public class EvectionApplicationAction2 extends BaseAction {
+    @Override
+    public String execute(RequestInfo requestInfo) {
+        LogTool log = new LogTool("/log/selfdev/action/hrm", true);
+        String requestId = requestInfo.getRequestid(); // 获取requestid
+        String workflowid = requestInfo.getWorkflowid(); // 获取workflowid
+
+        //获取工作流名称
+        String workflowname = BaseUtil.getBaseInfoByParm("workflowname", "workflow_base", "id", workflowid, "");
+        log.writeLog("---------------工作流名称-----------workflowname为：" + workflowname);
+        log.writeLog("--------出差申请单数据传入中台开始----requestId值为：" + requestId);
+
+        //获取配置文件中的参数，到时候URL路径
+        String mode = Prop.getPropValue("DevToDC_jntchina", "mode");
+        // 服务器ip：port
+        String baseUrl = Prop.getPropValue("DevToDC_jntchina", mode + "_baseUrl");
+        //访问路径拼接
+        String url = baseUrl + "/dcoaapi/hr/trip";
+
+        //对接EHR系统路径
+        //String url = "http://121.37.156.206:21005/PSIGW/RESTListeningConnector/PSFT_HR/C_TRIP_APPLY.v1/";
+
+
+        //根据流程id获取主表名称
+        String mainTable = RegularizationApplyForAction.getMainTable(requestId);
+        log.writeLog("-------------获取到的表名为-------------：" + mainTable);
+        //申请编号
+        String C_OA_NUM = "";
+        //单据来源
+        String C_APPLY_SOURCE = "OA";
+        //提单人，申请人
+        String EMPLID = "";
+
+        //{
+        //出差数据
+        List<Map<String,String>> list = new ArrayList<>();
+        //出差开始日期
+        String C_START_DT = "";
+        //出差开始时间
+        String C_START_DTM = "";
+        //出差结束日期
+        String C_END_DT = "";
+        //出差结束时间
+        String C_END_DTM = "";
+        //出差原因
+        String C_REASON = "";
+        //出差天数( HR页面显示的出差天数不再通过OA传过来了，HR会自己计算对应的出差时长和天数。原本传入出差天数的字段改成出差类型，通过这个字段来区分是国内出差还是外出)
+        String C_TRIP_DAYS = "0";
+        //出差类别
+        String cclb = "";
+
+        RecordSet rs = new RecordSet();
+        try {
+            String sql = "select * from "+mainTable+" where requestid = '" + requestId + "'";
+            rs.executeQuery(sql);
+            log.writeLog("查询sql语句---------------->"+sql);
+            while (rs.next()){
+                C_OA_NUM = Util.null2String(rs.getString("lcbh"));//编号
+                EMPLID = Util.null2String(rs.getString("gh"));//申请人
+                C_START_DT = Util.null2String(rs.getString("ksrq"));//开始日期
+                C_START_DTM = Util.null2String(rs.getString("kssj"));//开始时间
+                C_END_DT = Util.null2String(rs.getString("jsrq1"));//结束日期
+                C_END_DTM = Util.null2String(rs.getString("jssj"));//结束时间
+                C_REASON = Util.null2String(rs.getString("ccsy"));//出差事由
+                cclb = Util.null2String(rs.getString("cclb"));//出差类别
+//                C_TRIP_DAYS = Util.null2o(rs.getString("ccts"));//出差天数
+            }
+            log.writeLog("cclb---------------->"+cclb);
+            if("0".equals(cclb)){//20220429 by KangMD  国内出差，则传到HR的值为1；市内外出或者夜间用车，则传到HR的值为0
+                C_TRIP_DAYS = "1";
+            }
+            //将出差数据进行包装
+            Map<String,String> maps= new HashMap<>();
+            maps.put("EMPLID",EMPLID);
+            maps.put("C_START_DT",C_START_DT);
+            maps.put("C_START_DTM",C_START_DTM);
+            maps.put("C_END_DT",C_END_DT);
+            maps.put("C_END_DTM",C_END_DTM);
+            maps.put("C_REASON",C_REASON);
+            maps.put("C_TRIP_DAYS",C_TRIP_DAYS);
+            list.add(maps);
+            log.writeLog("----------------->出差数据明细数据:" + list.toString());
+
+            //最后再将数据全部打包
+            Map<String,Object> map = new HashMap<>();
+            map.put("C_OA_NUM",C_OA_NUM);
+            map.put("C_APPLY_SOURCE",C_APPLY_SOURCE);
+            map.put("EMPLID",EMPLID);
+            map.put("LINES",list);
+            String strParm = JSONObject.toJSONString(map);
+            log.writeLog("---------------打印的Map数据为：-----------------："+strParm);
+
+            //获取Token
+            String token = HttpClientToDC.getToken();
+            log.writeLog("出差申请单token------>" + token);
+            log.writeLog("出差申请单url------>" + url);
+
+            //调用NCC接口，将数据传给NCC
+            String returndata = HttpClientToDC.sendPostApi(url,token, strParm);
+            log.writeLog("【调用数据中台出差申请单接口返回结果result:】" + returndata);
+            if (!"".equals(returndata) && returndata != null) {
+                JSONObject jsonObject = JSONObject.parseObject(returndata);
+                String code = Util.null2String(jsonObject.get("code"));
+                log.writeLog("--------发送请求返回的code值为：" + code);
+                if (code.equals("1")){
+                    return SUCCESS;
+                }else{
+                    String msg = Util.null2String(jsonObject.get("msg"));
+                    requestInfo.getRequestManager().setMessageid("111100");
+                    requestInfo.getRequestManager().setMessagecontent(msg);
+                    return "0";
+                }
+            }else{
+                String ermsg="流程数据写入NCC出差申请单失败,未获取到接口返回结果，请联系系统管理员处理！";
+                requestInfo.getRequestManager().setMessageid("111100");
+                requestInfo.getRequestManager().setMessagecontent(ermsg);
+                return "0";
+            }
+        }catch (Exception e){
+            //返回0，调用失败
+            log.writeLog("------------------------捕获到的异常是：" + e.toString());
+            return "0";
+        }
+    }
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/action/HolidayAction.java b/src/main/youhong_ai_jitu_src/jntchina/action/HolidayAction.java
new file mode 100644
index 0000000..c376540
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/action/HolidayAction.java
@@ -0,0 +1,163 @@
+package jntchina.action;
+
+import com.alibaba.fastjson.JSONObject;
+import jntchina.util.HttpClientToDC;
+import selfdev.util.base.BaseUtil;
+import selfdev.util.log.LogTool;
+import weaver.conn.RecordSet;
+import weaver.file.Prop;
+import weaver.general.Util;
+import weaver.interfaces.workflow.action.BaseAction;
+import weaver.soa.workflow.request.RequestInfo;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @description: 请假申请单(调用假期余额查询接口, 以及获取员工请假天数接口)
+ * @author: daizhishun
+ * @date: 2021/8/3
+ **/
+public class HolidayAction extends BaseAction {
+
+    @Override
+    public String execute(RequestInfo requestInfo) {
+        LogTool log = new LogTool("/log/selfdev/action/hrm", true);
+        String requestId = requestInfo.getRequestid(); // 获取requestid
+        String workflowid = requestInfo.getWorkflowid(); // 获取workflowid
+        //获取工作流名称
+        String workflowname = BaseUtil.getBaseInfoByParm("workflowname", "workflow_base", "id", workflowid, "");
+        log.writeLog("---------------工作流名称-----------workflowname为：" + workflowname);
+        log.writeLog("--------请假申请单数据传入中台开始----requestId值为：" + requestId);
+
+        //获取配置文件中的参数，到时候URL路径
+        String mode = Prop.getPropValue("DevToDC_jntchina", "mode");
+        // 服务器ip：port
+        String baseUrl = Prop.getPropValue("DevToDC_jntchina", mode + "_baseUrl");
+        //访问路径拼接
+        String url = baseUrl + "/dcoaapi/hr/vacation";
+        //String url = "http://121.37.156.206:21005/PSIGW/RESTListeningConnector/PSFT_HR/C_LEAVE_APPLY.v1/";
+
+        //根据流程id获取主表名称
+        String mainTable = RegularizationApplyForAction.getMainTable(requestId);
+        log.writeLog("--------获取到的表名为----：" + mainTable);
+        //申请单号
+        String C_OA_NUM = "";
+        //假期类型
+        String C_VACATION_TYPE = "";
+        //员工编码
+        String EMPLID = "";
+
+        //{
+        //请假数据
+        List<Map<String, String>> list = new ArrayList<Map<String, String>>();
+        //请假开始日期
+        String C_START_DT = "";
+        //请假开始时间
+        String C_START_DTM = "";
+        //请假结束日期
+        String C_END_DT = "";
+        //请假结束时间
+        String C_END_DTM = "";
+        //请假原因
+        String C_REASON = "";
+        //OA请假类型
+        String newLeaveType = "";
+        //}
+
+        //新加的 4个String
+        // oa请假时长
+        String duration = "";
+        //oa是否通宵补休
+        String sftxbx = "";
+        //oa补休加班流程
+        String bxjblx = "";
+        //oa是否为抵扣考勤异常数据
+        String sfwdkkqycsq = "";
+
+        RecordSet rs = new RecordSet();
+        try {
+            String sql = "select * from " + mainTable + " where requestId = '" + requestId + "'";
+            rs.execute(sql);
+            log.writeLog("查询sql语句---------------->" + sql);
+            while (rs.next()) {
+                C_OA_NUM = Util.null2String(rs.getString("lcbh"));//申请单号
+                newLeaveType = Util.null2String(rs.getString("newLeaveType"));//OA请假类型
+                EMPLID = Util.null2String(rs.getString("gh"));//员工编码
+                C_START_DT = Util.null2String(rs.getString("fromDate"));//开始日期
+                C_START_DTM = Util.null2String(rs.getString("fromTime"));//开始时间
+                C_END_DT = Util.null2String(rs.getString("toDate"));//结束日期
+                C_END_DTM = Util.null2String(rs.getString("toTime"));//结束时间
+                C_REASON = Util.null2String(rs.getString("qjyy"));//请假原因
+                duration = Util.null2String(rs.getString("duration"));//请假时长
+                sftxbx = Util.null2String(rs.getString("sftxbx"));//是否通宵补休
+                bxjblx = Util.null2String(rs.getString("bxjblx"));//补休加班流程
+                sfwdkkqycsq = Util.null2String(rs.getString("sfwdkkqycsq"));//oa是否为抵扣考勤异常数据
+            }
+
+            log.writeLog("newLeaveType------>" + newLeaveType);
+            //获取HR对应的请假类型编码
+            C_VACATION_TYPE = BaseUtil.getBaseInfoByParm("hrqjlxbm", "uf_oaqjlx_hrqjlx", "oaqjlx", newLeaveType, "");
+            log.writeLog("C_VACATION_TYPE------>" + C_VACATION_TYPE);
+
+            //将请假数据进行包装
+            Map<String, String> maps = new HashMap<String, String>();
+            maps.put("EMPLID", EMPLID);
+            maps.put("C_START_DT", C_START_DT);
+            maps.put("C_START_DTM", C_START_DTM);
+            maps.put("C_END_DT", C_END_DT);
+            maps.put("C_END_DTM", C_END_DTM);
+            maps.put("C_REASON", C_REASON);
+
+            maps.put("duration",duration);
+            maps.put("sftxbx",sftxbx);
+            maps.put("bxjblx",bxjblx);
+            maps.put("sfwdkkqycsq",sfwdkkqycsq);
+
+            list.add(maps);
+            log.writeLog("----------------->出差数据明细数据:" + list.toString());
+
+            //最后再将数据全部打包
+            Map<String, Object> map = new HashMap<String, Object>();
+            map.put("C_OA_NUM", C_OA_NUM);
+            map.put("C_VACATION_TYPE", C_VACATION_TYPE);
+            map.put("EMPLID", EMPLID);
+            map.put("LINES", list);
+            String strParm = JSONObject.toJSONString(map);
+            log.writeLog("---------------打印的Map数据为：-----------------：" + strParm);
+
+            //获取Token
+            String token = HttpClientToDC.getToken();
+            log.writeLog("请假申请单token------>" + token);
+            log.writeLog("请假申请单url------>" + url);
+
+            //调用NCC接口，将数据传给NCC
+            String returndata = HttpClientToDC.sendPostApi(url, token, strParm);
+            log.writeLog("【调用数据中台请假申请单接口返回结果:】" + returndata);
+            if (!"".equals(returndata) && returndata != null) {
+                JSONObject jsonObject = JSONObject.parseObject(returndata);
+                String code = Util.null2String(jsonObject.get("code"));
+                log.writeLog("--------发送请求返回的code值为：" + code);
+                if ("1".equals(code)) {
+                    return SUCCESS;
+                } else {
+                    String msg = Util.null2String(jsonObject.get("msg"));
+                    requestInfo.getRequestManager().setMessageid("111100");
+                    requestInfo.getRequestManager().setMessagecontent(msg);
+                    return "0";
+                }
+            } else {
+                String ermsg = "流程数据写入NCC请假申请单失败,未获取到接口返回结果，请联系系统管理员处理！";
+                requestInfo.getRequestManager().setMessageid("111100");
+                requestInfo.getRequestManager().setMessagecontent(ermsg);
+                return "0";
+            }
+        } catch (Exception e) {
+            //返回0，调用失败
+            log.writeLog("------------------------捕获到的异常是：" + e.toString());
+            return "0";
+        }
+    }
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/action/InvestmentApplicationAction.java b/src/main/youhong_ai_jitu_src/jntchina/action/InvestmentApplicationAction.java
new file mode 100644
index 0000000..e6f2ae5
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/action/InvestmentApplicationAction.java
@@ -0,0 +1,225 @@
+package jntchina.action;
+
+import com.alibaba.fastjson.JSONObject;
+import com.working.util.WorkflowUtil;
+import jntchina.entity.BorrowOrder;
+import jntchina.entity.BorrowOrderBody;
+import jntchina.util.HttpClientToDC;
+import selfdev.util.base.BaseUtil;
+import selfdev.util.log.LogTool;
+import weaver.conn.RecordSet;
+import weaver.file.Prop;
+import weaver.general.Util;
+import weaver.interfaces.workflow.action.Action;
+import weaver.interfaces.workflow.action.BaseAction;
+import weaver.soa.workflow.request.RequestInfo;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
+
+import org.apache.commons.lang3.StringEscapeUtils;
+
+/**
+ * @Author Administrator
+ * @Description 投资申请单数据写入中台生成NCC对公借款单
+ * @Date 2021/1/8  12:14
+ */
+public class InvestmentApplicationAction extends BaseAction {
+    @Override
+    public String execute(RequestInfo requestInfo) {
+        String src = requestInfo.getRequestManager().getSrc();//获取操作方式
+        if (!"submit".equals(src)) { // 只有submit才执行接口
+            return SUCCESS;
+        }
+        LogTool log = new LogTool("/log/selfdev/action", false);
+        String requestId = requestInfo.getRequestid(); // 获取requestid
+        log.writeLog("--------投资申请单数据传入NCC开始----requestId值为：" + requestId);
+
+        //获取当前用户的登录账号（即工号）
+        String loginid=requestInfo.getRequestManager().getUser().getLoginid();
+        //获取配置文件中的参数
+    	String mode = Prop.getPropValue("DevToDC_jntchina","mode");
+        // 服务器ip：port
+        String baseUrl = Prop.getPropValue("DevToDC_jntchina", mode+"_baseUrl");
+        //String url = baseUrl+"/dcoaapi/billLoan/receiveData";
+        String url = baseUrl+"/dcnccapi/billLoan/receiveData";
+//        List<BorrowOrder> borrowList=new ArrayList<BorrowOrder>();
+        BorrowOrder borrowOrder = new BorrowOrder();
+
+        String mainTable = WorkflowUtil.getMainTable(requestId);
+        String mainId = "";
+        String pk_org = ""; // JTSDCN0001 //借款单位编码
+        String total = ""; // 1000.00 //合计金额
+        String bm = ""; // 申请人部门
+        String deptid = ""; // SD3300101 //借款人部门
+        String djlxbm = "263X-Cxx-DGJKD"; // 263X-Cxx-DSJKD", //交易类型编码 263X-Cxx-DSJKD:对私借款单    263X-Cxx-DGJKD:对公预付/借款单
+        String djrq = ""; // 2021-03-05 10:17:10", //单据日期
+        String payflag = ""; //1", //支付状态
+        String paytarget = "1"; // 0" //收款对象（0=员工，1=供应商）
+        String receiver = ""; // yonyou88", //收款人(员工)
+        String hbbm = ""; // yonyou88", //收款人（供应商）
+        String skyhzh = ""; // 收款人银行账号(员工)
+        String custaccount; //收款银行账户（供应商）
+        String jkbxr = ""; // yonyou88  //借款报销人
+        String operator = ""; // yonyou88  //录入人
+        String jsfs = "3"; // 3 //结算方式 3 网银 。。。
+        String fkyhzh = ""; //单位银行账户
+        String jobid = ""; //项目
+        String zy = ""; //借款测试", //事由
+        String djzt = "1"; // 1", //单据状态 1 保存
+        String kjqj = ""; // 03", //会计期间
+        String kjnd = ""; // 2021", //会计年度
+        String zyx1 = ""; // CSBX21020501", //OA单据号
+        String zyx2 = ""; // 提交人
+        String zyx3 = ""; // OA核销单号
+        String zyx5 = ""; // CSBX21020501", // OARequestID
+        String zyx8 = ""; // 银行付款备注
+        String zyx9=requestInfo.getRequestManager().getRequestname();//标题
+        String defitem46 = ""; // 网点（成本中心）
+        
+        RecordSet rs = new RecordSet();
+        try {
+            String sql = " select *  from " + mainTable + " where requestid='" + requestId + "'";
+            rs.execute(sql);
+            while (rs.next()) {
+                mainId = Util.null2String(rs.getString("id"));
+                bm = Util.null2String(rs.getString("bm"));// 申请部门
+                pk_org = Util.null2String(rs.getString("gsmc")); // 公司名称
+                skyhzh = Util.null2String(rs.getString("yxzh")); // 收款银行账号
+                total = Util.null2String(rs.getString("fkje")); // 申请金额   金额由表体相应字段汇总得出
+                djrq = Util.null2String(rs.getString("cjrq")); // 单据日期   yyyy-mm-dd hh:mm:ss
+                hbbm = Util.null2String(rs.getString("btzgsmc")); // 收款人（被投资公司名称）
+                zy = Util.null2String(rs.getString("jkyy")); // 备注
+                kjqj = djrq.substring(5,7); //  会计期间
+                kjnd = djrq.substring(0,4); // 会计年度
+                zyx1 = Util.null2String(rs.getString("lcbh")); // OA单据号   OA传过来，用于联查单据
+                zyx2 = Util.null2String(rs.getString("xm")); // 提交人    提交人姓名
+                zyx5 = requestId; // OARequestID
+                defitem46 = Util.null2String(rs.getString("cbzx")); // 网点（成本中心）
+                zyx8 = Util.null2String(rs.getString("yxfkbz")); //银行付款备注
+                log.writeLog("----mainId:" + mainId);
+            }
+            //获取UUID
+            String uuid=UUID.randomUUID().toString().replace("-", "").toUpperCase();
+            //根据部门ID查询部门编码
+            deptid=BaseUtil.getBaseInfoByParm("departmentcode", "hrmdepartment", "id", bm, "");
+            operator = loginid;//当前节点操作者
+            
+            borrowOrder.setUuid(uuid);
+            borrowOrder.setPk_org(pk_org);
+            borrowOrder.setTotal(total);
+            borrowOrder.setDeptid(deptid);
+            borrowOrder.setDjlxbm(djlxbm);
+            borrowOrder.setDjrq(djrq);
+            borrowOrder.setPayflag(payflag);
+            borrowOrder.setPaytarget(paytarget);
+            borrowOrder.setReceiver(receiver);
+            borrowOrder.setHbbm(hbbm);
+            //borrowOrder.setSkyhzh(skyhzh);
+            //borrowOrder.setCustaccount(custaccount);
+            borrowOrder.setJkbxr(jkbxr);
+            borrowOrder.setOperator(operator);
+            borrowOrder.setJsfs(jsfs);
+            borrowOrder.setFkyhzh(fkyhzh);
+            borrowOrder.setJobid(jobid);
+            borrowOrder.setZy(zy);
+            borrowOrder.setDjzt(djzt);
+            borrowOrder.setKjqj(kjqj);
+            borrowOrder.setKjnd(kjnd);
+            borrowOrder.setZyx1(zyx1);
+            borrowOrder.setZyx2(zyx2);
+            borrowOrder.setZyx3(zyx3);
+            borrowOrder.setZyx5(zyx5);
+            borrowOrder.setZyx8(zyx8);
+            borrowOrder.setZyx9(zyx9);
+            log.writeLog("【header数据准备完毕...】");
+
+            List<BorrowOrderBody> borrowOrderBodyList = new ArrayList<BorrowOrderBody>();
+            String tablecode = ""; // jk_busitem
+            String rowno = "1"; // 10
+            String szxmid = "901038"; // 收支项目  默认为员工借款**********8
+            String defitem50 = ""; // 发票类型
+            String defitem49 = ""; // 发票号码
+            String defitem42 = ""; // OA明细ID
+            String defitem43 = ""; // 车牌号
+            String defitem44 = ""; // 仓库
+            String defitem45 = ""; // 国家
+            
+            String defitem48 = ""; // SD3300301" //分摊部门
+            BorrowOrderBody body = new BorrowOrderBody();
+            tablecode = "jk_busitem";
+            //根据部门ID查询部门编码
+            defitem48= BaseUtil.getBaseInfoByParm("departmentcode", "hrmdepartment", "id", bm, "");
+
+            body.setAmount(total);
+            body.setTablecode(tablecode);
+            body.setRowno(rowno);
+            body.setSzxmid(szxmid);
+            body.setDefitem50(defitem50);
+            body.setDefitem49(defitem49);
+            body.setDefitem42(defitem42);
+            body.setDefitem43(defitem43);
+            body.setDefitem44(defitem44);
+            body.setDefitem45(defitem45);
+            body.setDefitem46(defitem46);
+            body.setDefitem48(defitem48);
+            borrowOrderBodyList.add(body);
+            borrowOrder.setJk_busitem(borrowOrderBodyList);
+            
+//            borrowList.add(borrowOrder);
+            String parm=JSONObject.toJSONString(borrowOrder);
+            log.writeLog("借款单准备传入数据中台的数据为------>" + parm);
+
+            //获取TOKEN
+            String token = HttpClientToDC.getToken();
+            log.writeLog("获取数据中台的token------>" + token);
+            if ("".equals(Util.null2String(token))) {
+            	requestInfo.getRequestManager().setMessagecontent("流程提交失败，未获取到数据中台接口TOKEN，请联系管理员处理！");
+                return Action.FAILURE_AND_CONTINUE;
+            }
+            
+            //调用NCC接口，将数据传给NCC
+            String returndata = HttpClientToDC.sendPostApi(url,token, parm);
+            log.writeLog("【调用数据中台借款接口返回结果result:】" + returndata);
+            if (!"".equals(returndata) && returndata != null) {
+//            	//过滤前面的双引号
+//            	if(returndata.startsWith("\"")){
+//        			returndata=returndata.substring(1);
+//        		}
+//            	//过滤后面的双引号
+//        		if(returndata.endsWith("\"")){
+//        			returndata=returndata.substring(0,returndata.length()-1);
+//        		}
+//        		//转义\"
+//        		returndata=StringEscapeUtils.unescapeJava(returndata);
+//        		log.writeLog("【借款接口返回转译处理后的结果result:】" + returndata);
+                JSONObject jsonObject = JSONObject.parseObject(returndata);
+                String success = Util.null2String(jsonObject.get("succ"));
+                log.writeLog("--------发送请求返回的success值为：" + success);
+                if ("true".equals(success)) {
+                	JSONObject data = jsonObject.getJSONObject("data");
+                    String billno = Util.null2String(data.get("billno"));//NCC单号
+                    log.writeLog("--------发送请求返回的billno值为：" + billno);
+                    //将NCC返回结果回写至OA流程表单
+                    rs.execute(" update " + mainTable + " set sfcgscnccfkd = 0 , nccfkdh = '" + billno + "',nccfhxx=''  where requestid = " + requestId); 
+                } else {
+                	String message = Util.null2String(jsonObject.get("msg"));
+                	//将NCC返回结果回写至OA流程表单
+                    rs.execute(" update " + mainTable + " set sfcgscnccfkd = 1 ,nccfhxx='" + message.replace("'", "''") + "'  where requestid = " + requestId); 
+                    requestInfo.getRequestManager().setMessagecontent("流程数据写入NCC借款单失败,失败信息：<br/>"+message);
+                    return Action.FAILURE_AND_CONTINUE;
+                }
+            } else {
+                requestInfo.getRequestManager().setMessagecontent("流程数据写入中台借款单失败,未获取到接口返回结果，请联系系统管理员处理！");
+                return Action.FAILURE_AND_CONTINUE;
+            }
+
+        } catch (Exception e) {
+        	 requestInfo.getRequestManager().setMessagecontent("流程数据生成中台对公借款单失败,失败信息：<br/>" + e.toString());
+            return Action.FAILURE_AND_CONTINUE;
+        }
+        log.writeLog("--------对公借款单数据传入中台完毕----requestId值为：" + requestId);
+        return Action.SUCCESS;
+    }
+}
\ No newline at end of file
diff --git a/src/main/youhong_ai_jitu_src/jntchina/action/InvoiceToTaxCloudBx.java b/src/main/youhong_ai_jitu_src/jntchina/action/InvoiceToTaxCloudBx.java
new file mode 100644
index 0000000..dc28c4f
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/action/InvoiceToTaxCloudBx.java
@@ -0,0 +1,114 @@
+package jntchina.action;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.serializer.SerializerFeature;
+import com.working.util.WorkflowUtil;
+
+import jntchina.util.HttpClientUtil;
+import jntchina.util.URLConfigEnum;
+import selfdev.util.base.BaseUtil;
+import selfdev.util.log.LogTool;
+import weaver.conn.RecordSet;
+import weaver.general.Util;
+import weaver.hrm.resource.ResourceComInfo;
+import weaver.interfaces.workflow.action.Action;
+import weaver.interfaces.workflow.action.BaseAction;
+import weaver.soa.workflow.request.RequestInfo;
+
+/**
+ * 报销单数据传入税务云报销状态变为已报销
+ */
+public class InvoiceToTaxCloudBx extends BaseAction {
+
+    @Override
+    public String execute(RequestInfo requestInfo) {
+        String src = requestInfo.getRequestManager().getSrc();//获取操作方式
+        if (!"submit".equals(src)) { // 只有submit才执行接口
+            return SUCCESS;
+        }
+        LogTool log = new LogTool("/log/selfdev/action", false);
+        String requestId = requestInfo.getRequestid(); // 获取requestid
+        log.writeLog("--------报销单数据传入税务云开始----requestId值为：" + requestId);
+        String mainTable = WorkflowUtil.getMainTable(requestId);
+        String mainId = "";
+        String nsrsbh = ""; //纳税人识别号tax_number
+        String lcbh = ""; //流程编号
+        String gsmc = ""; //公司名称(组织编码)
+        String xm = "";  //申请人
+        String fpdm = ""; //发票代码
+        String fphm = ""; //发票号码
+
+        RecordSet rs = new RecordSet();
+        RecordSet rs2 = new RecordSet();
+        try {
+            Map<String, Object> data = new HashMap<String, Object>();
+            List<Object> datas = new ArrayList<Object>();
+            String sql = " select *  from " + mainTable + " where requestid='" + requestId + "'";
+            rs.execute(sql);
+            while (rs.next()) {
+                mainId = Util.null2String(rs.getString("id"));
+                xm = new ResourceComInfo().getLastname(Util.null2String(rs.getString("xm"))); //申请人
+                gsmc = Util.null2String(rs.getString("gsmc")); // 公司名称(组织编码)
+                lcbh = Util.null2String(rs.getString("lcbh")); // OA单据号   OA传过来，用于联查单据
+            }
+            //获取OA-NCC发票映射关系表
+            Map<String,String> map_oafplx_nccfplcx=BaseUtil.getMapKeyValueInfoByParm("uf_oafplx_nccfplx", "", "oafplxid", "nccfplxbm");
+            //查询明细
+            sql=" select distinct c.INVOICECODE,c.INVOICENUMBER,c.invoicetype from " + mainTable + "_dt8 a "
+                    + "left join uf_fylx b on to_char(a.bxlx)=to_char(b.id) "
+                    + "left join fnainvoiceledger c on a.fphm=c.id "
+                    + "where a.mainid = " + mainId;
+            log.writeLog("查询付款明细sql------>" + sql);
+            rs.execute(sql);
+            while (rs.next()) {
+                fpdm = Util.null2String(rs.getString("INVOICECODE")); // 发票代码
+                fphm = Util.null2String(rs.getString("INVOICENUMBER")); // 发票号码
+                String invoicetype = Util.null2String(rs.getString("invoicetype")); // OA发票类型
+                //NCC发票类型
+                String fplxpk=Util.null2String(map_oafplx_nccfplcx.get(invoicetype));
+                if (fplxpk.startsWith("invoice")){
+                    fplxpk="invoice";
+                }
+                //发票代码
+                data.put("invoiceCode",fpdm);
+                //发票号码
+                data.put("invoiceNum",fphm);
+                //发票类型
+                data.put("billType",fplxpk);
+                //记账人
+                data.put("reimburseUser",xm);
+//                //记账人备注
+//                data.put("accountNote",lcbh);
+                datas.add(data);
+                log.writeLog("发票代码------>" + fpdm);
+                log.writeLog("发票号码------>" + fphm);
+                log.writeLog("发票类型------>" + fplxpk);
+                log.writeLog("datas-----"+datas);
+            }
+            //根据组织编码查询纳税人识别号
+            rs2.execute("select * from uf_businessunit"+" where code = '"+gsmc+"'");
+            while (rs2.next()) {
+                nsrsbh = Util.null2String(rs2.getString("tax_number"));
+            }
+            Map<String, Object> paramsMap = new HashMap<String, Object>();
+            paramsMap.put("nsrsbh", nsrsbh);
+            paramsMap.put("orgcode", gsmc);
+            paramsMap.put("bills",datas);
+            log.writeLog("调用税务云接口传入参数----->"+JSON.toJSONString(paramsMap, SerializerFeature.DisableCircularReferenceDetect));
+            String result=HttpClientUtil.jsonPost(URLConfigEnum.REIMBURSED.getUrl(), paramsMap);
+            log.writeLog("调用税务云接口将发票状态更新为已报销返回结果------>"+result);
+
+        } catch (Exception e) {
+            log.writeLog("流程数据生成税务云发票记账失败！错误信息------>" + e.toString());
+            requestInfo.getRequestManager().setMessagecontent("流程数据生成税务云发票记账失败！错误信息------>" + e.toString());
+            return Action.FAILURE_AND_CONTINUE;
+        }
+        return Action.SUCCESS;
+    }
+
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/action/InvoiceToTaxCloudFk.java b/src/main/youhong_ai_jitu_src/jntchina/action/InvoiceToTaxCloudFk.java
new file mode 100644
index 0000000..735ce8f
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/action/InvoiceToTaxCloudFk.java
@@ -0,0 +1,110 @@
+package jntchina.action;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.serializer.SerializerFeature;
+import com.working.util.WorkflowUtil;
+import jntchina.util.HttpClientUtil;
+import jntchina.util.URLConfigEnum;
+import selfdev.util.base.BaseUtil;
+import selfdev.util.log.LogTool;
+import weaver.conn.RecordSet;
+import weaver.general.Util;
+import weaver.hrm.resource.ResourceComInfo;
+import weaver.interfaces.workflow.action.Action;
+import weaver.interfaces.workflow.action.BaseAction;
+import weaver.soa.workflow.request.RequestInfo;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 付款单数据传入税务云报销状态变为已报销
+ */
+public class InvoiceToTaxCloudFk extends BaseAction {
+
+    @Override
+    public String execute(RequestInfo requestInfo) {
+        String src = requestInfo.getRequestManager().getSrc();//获取操作方式
+        if (!"submit".equals(src)) { // 只有submit才执行接口
+            return SUCCESS;
+        }
+        LogTool log = new LogTool("/log/selfdev/action", false);
+        String requestId = requestInfo.getRequestid(); // 获取requestid
+        log.writeLog("--------报销单数据传入税务云开始----requestId值为：" + requestId);
+        String mainTable = WorkflowUtil.getMainTable(requestId);
+        String mainId = "";
+        String nsrsbh = ""; //纳税人识别号tax_number
+        String gsmc = "";
+        String xm = "";  //申请人
+        String fpdm = ""; //发票代码
+        String fphm = ""; //发票号码
+        String lcbh = "";
+
+        RecordSet rs = new RecordSet();
+        RecordSet rs2 = new RecordSet();
+        try {
+            Map<String, Object> data = new HashMap<String, Object>();
+            List<Object> datas = new ArrayList<Object>();
+            String sql = " select *  from " + mainTable + " where requestid='" + requestId + "'";
+            rs.execute(sql);
+            while (rs.next()) {
+                mainId = Util.null2String(rs.getString("id"));
+                xm = new ResourceComInfo().getLastname(Util.null2String(rs.getString("xm"))); //申请人
+                gsmc = Util.null2String(rs.getString("gsmc")); // 公司名称
+                lcbh = Util.null2String(rs.getString("lcbh")); // 流程编号
+
+            }
+            //获取OA-NCC发票映射关系表
+            Map<String,String> map_oafplx_nccfplcx=BaseUtil.getMapKeyValueInfoByParm("uf_oafplx_nccfplx", "", "oafplxid", "nccfplxbm");
+            //查询明细
+            sql=" select distinct c.INVOICECODE,c.INVOICENUMBER,c.invoicetype from " + mainTable + "_dt2 a "
+                    + "left join uf_fylx b on to_char(a.fylx)=to_char(b.id) "
+                    + "left join fnainvoiceledger c on a.fphm=c.id "
+                    + "where a.mainid = " + mainId;
+            log.writeLog("查询报销明细sql------>" + sql);
+            rs.execute(sql);
+
+            while (rs.next()) {
+                fpdm = Util.null2String(rs.getString("INVOICECODE")); // 发票代码
+                fphm = Util.null2String(rs.getString("INVOICENUMBER")); // 发票号码
+                String invoicetype = Util.null2String(rs.getString("invoicetype")); // OA发票类型
+                //NCC发票类型
+                String fplxpk=Util.null2String(map_oafplx_nccfplcx.get(invoicetype));
+                if (fplxpk.startsWith("invoice")){
+                    fplxpk="invoice";
+                }
+                //发票代码
+                data.put("invoiceCode",fpdm);
+                //发票号码
+                data.put("invoiceNum",fphm);
+                //发票类型
+                data.put("billType",fplxpk);
+              //记账人
+                data.put("reimburseUser",xm);
+//                //记账人备注
+//                data.put("accountNote",lcbh);
+                datas.add(data);
+            }
+            //根据组织编码查询纳税人识别号
+            rs2.execute("select * from uf_businessunit"+" where code = '"+gsmc+"'");
+            while (rs2.next()) {
+                nsrsbh = Util.null2String(rs2.getString("tax_number"));
+            }
+            Map<String, Object> paramsMap = new HashMap<String, Object>();
+            paramsMap.put("nsrsbh", nsrsbh);
+            paramsMap.put("orgcode", gsmc);
+            paramsMap.put("bills",datas);
+            log.writeLog("调用税务云接口传入参数----->"+JSON.toJSONString(paramsMap, SerializerFeature.DisableCircularReferenceDetect));
+            String result=HttpClientUtil.jsonPost(URLConfigEnum.REIMBURSED.getUrl(), paramsMap);
+            log.writeLog("调用税务云接口将发票状态更新为已报销返回结果------>"+result);
+
+        } catch (Exception e) {
+            log.writeLog("流程数据生成税务云报记账失败！错误信息------>" + e.toString());
+            requestInfo.getRequestManager().setMessagecontent("流程数据生成税务云报记账失败！错误信息------>" + e.toString());
+            return Action.FAILURE_AND_CONTINUE;
+        }
+        return Action.SUCCESS;
+    }
+
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/action/JiabanCheckAction.java b/src/main/youhong_ai_jitu_src/jntchina/action/JiabanCheckAction.java
new file mode 100644
index 0000000..7b81893
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/action/JiabanCheckAction.java
@@ -0,0 +1,87 @@
+package jntchina.action;
+
+import selfdev.util.log.LogTool;
+import selfdev.util.base.BaseUtil;
+
+import weaver.conn.RecordSet;
+import weaver.general.Util;
+import weaver.interfaces.workflow.action.BaseAction;
+import weaver.soa.workflow.request.RequestInfo;
+
+/**
+ * @description: 加班校验
+ * @author: daizhishun
+ * @date: 2021/9/8
+ **/
+public class JiabanCheckAction extends BaseAction {
+    public static LogTool log=new LogTool("/log/selfdev/action/hrm", true);
+    public String execute(RequestInfo ri){
+        String  requestid=ri.getRequestid();
+        log.writeLog("---------------加班流程提交时数据逻辑校验开始-------------requestId:" + requestid);
+        try {
+            String workflowid=ri.getWorkflowid();
+            //获取表名
+            String tablename=BaseUtil.getBaseInfoByParm("tablename", "workflow_bill", "1", "1", " and id in (select formid from workflow_base where id="+workflowid+")");
+            RecordSet rs=new RecordSet();
+            RecordSet rs1=new RecordSet();
+            String sql="select * from "+tablename+" where requestid="+requestid;
+            String lastname = "";
+            String workcode = "";
+            String fromDate = "";
+            String fromTime = "";
+            String toDate = "";
+            String toTime = "";
+            rs.execute(sql);
+            while(rs.next()){
+                workcode = Util.null2String(rs.getString("tjrgh"));//主键ID
+                lastname = Util.null2String(rs.getString("resourceId"));//主键ID
+                fromDate = Util.null2String(rs.getString("fromDate"));//主键ID
+                fromTime = Util.null2String(rs.getString("fromTime"));//主键ID
+                toDate = Util.null2String(rs.getString("toDate"));//主键ID
+                toTime = Util.null2String(rs.getString("toTime"));//主键ID
+            }
+            //开始
+            String ks=(fromDate+" "+fromTime).substring(0,16);
+            //结束
+            String js=(toDate+" "+toTime).substring(0,16);
+            String msg = "";
+            //判断加班时间必须以00或者30结尾
+            if(!ks.substring(14,16).endsWith("00")&&!ks.substring(14,16).endsWith("30")){
+                msg+="加班开始时间"+ks+"中的分钟必须是以00或者30这种半小时整为单位;<br/>";//返回信息
+            }
+            if(!js.substring(14,16).endsWith("00")&&!js.substring(14,16).endsWith("30")){
+                msg+="加班结束时间"+js+"中的分钟必须是以00或者30这种半小时整为单位;<br/>";//返回信息
+            }
+
+            //检查当前员工在此期间是否有加班记录
+            sql="select b.* from FORMTABLE_MAIN_1424 b,workflow_requestbase c where"+
+            "((b.fromdate||' '||b.fromtime)>'"+ks+"' and (b.fromdate||' '||b.fromtime)<'"+js+"')"+
+            "or ((b.toDate||' '||b.toTime)>'"+ks+"' and (b.toDate||' '||b.toTime)<'"+js+"')"+
+            "or ((b.fromdate||' '||b.fromtime)<'"+ks+"' and (b.fromdate||' '||b.fromtime)>'"+js+"')"+
+            "and b.requestid!= "+requestid+" and c.currentnodetype!=0 and c.createdate>='2021-05-27' and b.requestid=c.requestid  and b.resourceId="+lastname+"";
+            log.writeLog("检查当前员工在此期间是否有加班记录sql--------->"+sql);
+            rs1.execute(sql);
+            if(rs1.getCounts()>0){
+                String temp="";
+                while(rs1.next()){
+                    temp+="【requestid="+rs1.getString("requestid")+"";
+                }
+                temp=temp.substring(0,temp.length()-1);
+                msg+=lastname+"【"+workcode+"】加班时间段"+ks+"~"+js+"之前的流程"+temp+"已提交过加班申请，请重新选择加班时间<br/>";
+            }
+            if(!"".equals(msg)){
+            	ri.getRequestManager().setMessageid("111100");
+                ri.getRequestManager().setMessagecontent(msg);
+                return "0";
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            log.writeLog("加班流程提交时数据逻辑校验失败，错误信息为：------>"+e.toString());
+            ri.getRequestManager().setMessageid("111100");
+            ri.getRequestManager().setMessagecontent("加班流程提交时数据逻辑校验失败，错误信息为：------>"+e.toString());
+            return "0";
+        }
+        log.writeLog("---------------加班流程提交时数据逻辑校验结束-------------requestId:" + requestid);
+        return SUCCESS;
+    }
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/action/JiabanForceDrawBackAction.java b/src/main/youhong_ai_jitu_src/jntchina/action/JiabanForceDrawBackAction.java
new file mode 100644
index 0000000..6a84002
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/action/JiabanForceDrawBackAction.java
@@ -0,0 +1,38 @@
+package jntchina.action;
+
+import selfdev.util.base.BaseUtil;
+import selfdev.util.log.LogTool;
+import weaver.interfaces.workflow.action.BaseAction;
+import weaver.soa.workflow.request.RequestInfo;
+
+/**
+ * @description: 加班流程强制收回时的节点附加操作
+ * @author: KangMD
+ * @date: 2021-12-19
+ **/
+public class JiabanForceDrawBackAction extends BaseAction {
+
+        public static LogTool log=new LogTool("/log/selfdev/action/hrm", false);
+        public String execute(RequestInfo requestInfo){
+            String requestId = requestInfo.getRequestid(); // 获取requestid
+            String workflowid = requestInfo.getWorkflowid(); // 获取workflowid
+
+            //获取工作流名称
+            String workflowname = BaseUtil.getBaseInfoByParm("workflowname", "workflow_base", "id", workflowid, "");
+            log.writeLog("--------【"+workflowname+"】强制收回时的节点附加操作----requestId值为：" + requestId);
+            try{
+            	JiabanForceDrawBackThread forceDrawBackThread=new JiabanForceDrawBackThread();
+       		 	//设置参数
+            	forceDrawBackThread.setRequestInfo(requestInfo);
+       		 	Thread thread = new Thread(forceDrawBackThread);
+       		 	//启动线程
+       		 	thread.start();
+       		 	log.writeLog("--------【"+workflowname+"】强制收回时启用线程--------");
+            }catch (Exception e){
+                //返回0，调用失败
+                log.writeLog("------------------------捕获到的异常是：" + e.toString());
+                return "0";
+            }
+            return SUCCESS;
+    }
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/action/JiabanForceDrawBackThread.java b/src/main/youhong_ai_jitu_src/jntchina/action/JiabanForceDrawBackThread.java
new file mode 100644
index 0000000..693a449
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/action/JiabanForceDrawBackThread.java
@@ -0,0 +1,124 @@
+package jntchina.action;
+
+import com.alibaba.fastjson.JSONObject;
+import jntchina.util.HttpClientToDC;
+import selfdev.util.base.BaseUtil;
+import selfdev.util.log.LogTool;
+import weaver.conn.RecordSet;
+import weaver.file.Prop;
+import weaver.general.Util;
+import weaver.soa.workflow.request.RequestInfo;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @description: 加班强制收回时调用HR接口
+ * @author: KangMD
+ * @date: 2021-12-19
+ **/
+public class JiabanForceDrawBackThread  implements Runnable {
+    public static LogTool log=new LogTool("/log/selfdev/action/hrm", true);
+    public RequestInfo requestInfo;
+    
+	public RequestInfo getRequestInfo() {
+		return requestInfo;
+	}
+
+	public void setRequestInfo(RequestInfo requestInfo) {
+		this.requestInfo = requestInfo;
+	}
+
+	public void run(){
+		String requestId = requestInfo.getRequestid(); // 获取requestid
+		try {
+			log.writeLog("----------1.5秒后再启动【requestId:" + requestId+"】-------------");
+			Thread.sleep(1500);//延迟执行
+		} catch (InterruptedException e1) {
+			// TODO Auto-generated catch block
+			e1.printStackTrace();
+		}
+		log.writeLog("----------1.5秒结束，开启执行代码【requestId:" +requestId+"】-------------");
+		
+        String workflowid = requestInfo.getWorkflowid(); // 获取workflowid
+        //获取工作流名称
+        String workflowname = BaseUtil.getBaseInfoByParm("workflowname", "workflow_base", "id", workflowid, "");
+        log.writeLog("--------【"+workflowname+"】数据传入中台开始----requestId值为：" + requestId);
+
+        try{
+        	//流程当前状态
+        	String currentnodetype="";
+        	RecordSet rs = new RecordSet();
+            String sql = "select * from workflow_requestbase where requestid = "+requestId+"";
+            rs.execute(sql);
+            while (rs.next()) {
+            	currentnodetype = Util.null2String(rs.getString("currentnodetype"));//当前流程状态
+            }
+            log.writeLog("currentnodetype---------------->"+currentnodetype);
+            //流程当前处于申请节点，才需要调用HR接口
+            if(!"0".equals(currentnodetype)){
+            	log.writeLog("*************流程不是强制收回到申请节点，不需要调用HR接口*************");
+            	return;
+            }
+            //获取配置文件中的参数，到时候URL路径
+            String mode = Prop.getPropValue("DevToDC_jntchina", "mode");
+            // 服务器ip：port
+            String baseUrl = Prop.getPropValue("DevToDC_jntchina", mode + "_baseUrl");
+            //访问路径拼接
+            String url = baseUrl + "/dcoaapi/hr/attendance";
+
+            //根据流程id获取主表名称
+            String mainTable = RegularizationApplyForAction.getMainTable(requestId);
+            log.writeLog("--------获取到的表名为----：" + mainTable);
+            //申请单号
+            String C_OA_NUM = "";
+            //单据来源：默认OA
+            String C_APPLY_SOURCE = "OA";
+            //流程名称：加班流程为：40
+            String C_WORKFLOW = "40";
+            //审批状态：已通过：3，驳回：5
+            String C_STATUS = "5";
+
+            sql = "select lcbh from "+mainTable+" where requestid = "+requestId+"";
+            rs.execute(sql);
+            log.writeLog("----------------》打印sql语句"+sql);
+            while (rs.next()) {
+                C_OA_NUM = Util.null2String(rs.getString("lcbh"));//申请单号
+            }
+
+
+            Map<String,Object> map = new HashMap<String,Object>();
+            map.put("C_OA_NUM",C_OA_NUM);
+            map.put("C_APPLY_SOURCE",C_APPLY_SOURCE);
+            map.put("C_WORKFLOW",C_WORKFLOW);
+            map.put("C_STATUS",C_STATUS);
+            String strParm = JSONObject.toJSONString(map);
+            log.writeLog("---------------打印的Map数据为：-----------------："+strParm);
+
+            //获取Token
+            String token = HttpClientToDC.getToken();
+            log.writeLog("加班申请单token------>" + token);
+            log.writeLog("加班申请单url------>" + url);
+
+            //调用NCC接口，将数据传给NCC
+            String returndata = HttpClientToDC.sendPostApi(url,token,strParm);
+            log.writeLog("【调用数据中台加班申请单接口返回结果:】" + returndata);
+            if (!"".equals(returndata) && returndata != null) {
+                JSONObject jsonObject = JSONObject.parseObject(returndata);
+                String code = Util.null2String(jsonObject.get("code"));
+                log.writeLog("--------发送请求返回的code值为：" + code);
+                if ("1".equals(code)) {
+                	
+                } else {
+                	String msg = Util.null2String(jsonObject.get("msg"));
+                    log.writeLog("调用HR接口返回错误信息----->" + msg);
+                }
+            }else {
+            	log.writeLog("调用HR接口返回为空----->");
+            }
+        }catch (Exception e){
+            //返回0，调用失败
+            log.writeLog("------------------------捕获到的异常是：" + e.toString());
+        }
+    }
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/action/JiabanHuichuanReturnAction.java b/src/main/youhong_ai_jitu_src/jntchina/action/JiabanHuichuanReturnAction.java
new file mode 100644
index 0000000..5ad07e3
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/action/JiabanHuichuanReturnAction.java
@@ -0,0 +1,100 @@
+package jntchina.action;
+
+import com.alibaba.fastjson.JSONObject;
+import jntchina.util.HttpClientToDC;
+import selfdev.util.base.BaseUtil;
+import selfdev.util.log.LogTool;
+import weaver.conn.RecordSet;
+import weaver.file.Prop;
+import weaver.general.Util;
+import weaver.interfaces.workflow.action.BaseAction;
+import weaver.soa.workflow.request.RequestInfo;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @description: 加班结果回传-退回至发起人
+ * @author: daizhishun
+ * @date: 2021/9/10
+ **/
+public class JiabanHuichuanReturnAction extends BaseAction {
+    public static LogTool log=new LogTool("/log/selfdev/action/hrm", true);
+    public String execute(RequestInfo requestInfo){
+        String requestId = requestInfo.getRequestid(); // 获取requestid
+        String workflowid = requestInfo.getWorkflowid(); // 获取workflowid
+
+        //获取工作流名称
+        String workflowname = BaseUtil.getBaseInfoByParm("workflowname", "workflow_base", "id", workflowid, "");
+        log.writeLog("--------【"+workflowname+"】退回到申请节点时数据传入中台开始----requestId值为：" + requestId);
+
+        try{
+            //获取配置文件中的参数，到时候URL路径
+            String mode = Prop.getPropValue("DevToDC_jntchina", "mode");
+            // 服务器ip：port
+            String baseUrl = Prop.getPropValue("DevToDC_jntchina", mode + "_baseUrl");
+            //访问路径拼接
+            String url = baseUrl + "/dcoaapi/hr/attendance";
+
+            //根据流程id获取主表名称
+            String mainTable = RegularizationApplyForAction.getMainTable(requestId);
+            log.writeLog("--------获取到的表名为----：" + mainTable);
+            //申请单号
+            String C_OA_NUM = "";
+            //单据来源：默认OA
+            String C_APPLY_SOURCE = "OA";
+            //流程名称：加班流程为：40
+            String C_WORKFLOW = "40";
+            //审批状态：已通过：3，驳回：5
+            String C_STATUS = "5";
+
+            RecordSet rs = new RecordSet();
+            String sql = "select lcbh from "+mainTable+" where requestid = "+requestId+"";
+            rs.execute(sql);
+            log.writeLog("----------------》打印sql语句"+sql);
+            while (rs.next()) {
+                C_OA_NUM = Util.null2String(rs.getString("lcbh"));//申请单号
+            }
+
+
+            Map<String,Object> map = new HashMap<String,Object>();
+            map.put("C_OA_NUM",C_OA_NUM);
+            map.put("C_APPLY_SOURCE",C_APPLY_SOURCE);
+            map.put("C_WORKFLOW",C_WORKFLOW);
+            map.put("C_STATUS",C_STATUS);
+            String strParm = JSONObject.toJSONString(map);
+            log.writeLog("---------------打印的Map数据为：-----------------："+strParm);
+
+            //获取Token
+            String token = HttpClientToDC.getToken();
+            log.writeLog("加班申请单token------>" + token);
+            log.writeLog("加班申请单url------>" + url);
+
+            //调用NCC接口，将数据传给NCC
+            String returndata = HttpClientToDC.sendPostApi(url,token,strParm);
+            log.writeLog("【调用数据中台加班申请单接口返回结果:】" + returndata);
+            if (!"".equals(returndata) && returndata != null) {
+                JSONObject jsonObject = JSONObject.parseObject(returndata);
+                String code = Util.null2String(jsonObject.get("code"));
+                log.writeLog("--------发送请求返回的code值为：" + code);
+                if ("1".equals(code)) {
+                    return SUCCESS;
+                } else {
+                    String msg = Util.null2String(jsonObject.get("msg"));
+                    requestInfo.getRequestManager().setMessageid("111100");
+                    requestInfo.getRequestManager().setMessagecontent(msg);
+                    return "0";
+                }
+            }else {
+                String ermsg = "流程数据已审批状态提交至中台失败，请联系系统管理员处理！";
+                requestInfo.getRequestManager().setMessageid("111100");
+                requestInfo.getRequestManager().setMessagecontent(ermsg);
+                return "0";
+            }
+        }catch (Exception e){
+            //返回0，调用失败
+            log.writeLog("------------------------捕获到的异常是：" + e.toString());
+            return "0";
+        }
+    }
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/action/JiabanHuichuanSuccessAction.java b/src/main/youhong_ai_jitu_src/jntchina/action/JiabanHuichuanSuccessAction.java
new file mode 100644
index 0000000..0cb6c6d
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/action/JiabanHuichuanSuccessAction.java
@@ -0,0 +1,101 @@
+package jntchina.action;
+
+import com.alibaba.fastjson.JSONObject;
+import jntchina.util.HttpClientToDC;
+import selfdev.util.base.BaseUtil;
+import selfdev.util.log.LogTool;
+import weaver.conn.RecordSet;
+import weaver.file.Prop;
+import weaver.general.Util;
+import weaver.interfaces.workflow.action.BaseAction;
+import weaver.soa.workflow.request.RequestInfo;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @description: 加班结果回传-成功-放归档节点前操作
+ * @author: daizhishun
+ * @date: 2021/9/10
+ **/
+public class JiabanHuichuanSuccessAction extends BaseAction {
+
+    public static LogTool log=new LogTool("/log/selfdev/action/hrm", true);
+    public String execute(RequestInfo requestInfo){
+        String requestId = requestInfo.getRequestid(); // 获取requestid
+        String workflowid = requestInfo.getWorkflowid(); // 获取workflowid
+
+        //获取工作流名称
+        String workflowname = BaseUtil.getBaseInfoByParm("workflowname", "workflow_base", "id", workflowid, "");
+        log.writeLog("--------【"+workflowname+"】数据传入中台开始----requestId值为：" + requestId);
+
+        try{
+            //获取配置文件中的参数，到时候URL路径
+            String mode = Prop.getPropValue("DevToDC_jntchina", "mode");
+            // 服务器ip：port
+            String baseUrl = Prop.getPropValue("DevToDC_jntchina", mode + "_baseUrl");
+            //访问路径拼接
+            String url = baseUrl + "/dcoaapi/hr/attendance";
+
+            //根据流程id获取主表名称
+            String mainTable = RegularizationApplyForAction.getMainTable(requestId);
+            log.writeLog("--------获取到的表名为----：" + mainTable);
+            //申请单号
+            String C_OA_NUM = "";
+            //单据来源：默认OA
+            String C_APPLY_SOURCE = "OA";
+            //流程名称：加班流程为：40
+            String C_WORKFLOW = "40";
+            //审批状态：已通过：3，驳回：5
+            String C_STATUS = "3";
+
+            RecordSet rs = new RecordSet();
+            String sql = "select lcbh from "+mainTable+" where requestid = "+requestId+"";
+            rs.execute(sql);
+            log.writeLog("----------------》打印sql语句"+sql);
+            while (rs.next()) {
+                C_OA_NUM = Util.null2String(rs.getString("lcbh"));//申请单号
+            }
+
+
+            Map<String,Object> map = new HashMap<String,Object>();
+            map.put("C_OA_NUM",C_OA_NUM);
+            map.put("C_APPLY_SOURCE",C_APPLY_SOURCE);
+            map.put("C_WORKFLOW",C_WORKFLOW);
+            map.put("C_STATUS",C_STATUS);
+            String strParm = JSONObject.toJSONString(map);
+            log.writeLog("---------------打印的Map数据为：-----------------："+strParm);
+
+            //获取Token
+            String token = HttpClientToDC.getToken();
+            log.writeLog("加班申请单token------>" + token);
+            log.writeLog("加班申请单url------>" + url);
+
+            //调用NCC接口，将数据传给NCC
+            String returndata = HttpClientToDC.sendPostApi(url,token,strParm);
+            log.writeLog("【调用数据中台加班申请单接口返回结果:】" + returndata);
+            if (!"".equals(returndata) && returndata != null) {
+                JSONObject jsonObject = JSONObject.parseObject(returndata);
+                String code = Util.null2String(jsonObject.get("code"));
+                log.writeLog("--------发送请求返回的code值为：" + code);
+                if ("1".equals(code)) {
+                    return SUCCESS;
+                } else {
+                    String msg = Util.null2String(jsonObject.get("msg"));
+                    requestInfo.getRequestManager().setMessageid("111100");
+                    requestInfo.getRequestManager().setMessagecontent(msg);
+                    return "0";
+                }
+            }else {
+                String ermsg = "流程数据已审批状态提交至中台失败，请联系系统管理员处理！";
+                requestInfo.getRequestManager().setMessageid("111100");
+                requestInfo.getRequestManager().setMessagecontent(ermsg);
+                return "0";
+            }
+        }catch (Exception e){
+            //返回0，调用失败
+            log.writeLog("------------------------捕获到的异常是：" + e.toString());
+            return "0";
+        }
+    }
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/action/JwtParamBuilder.java b/src/main/youhong_ai_jitu_src/jntchina/action/JwtParamBuilder.java
new file mode 100644
index 0000000..3e58631
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/action/JwtParamBuilder.java
@@ -0,0 +1,110 @@
+package jntchina.action;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+
+/**
+ * @program: yesfp-demo
+ * @description:
+ * @author: kw
+ * @create: 2020/04/30 12:37
+ */
+public class JwtParamBuilder {
+
+    /** JWT {@code Issuer} claims parameter name: <code>"iss"</code> */
+    public static final String ISSUER = "iss";
+
+    /** JWT {@code Subject} claims parameter name: <code>"sub"</code> */
+    public static final String SUBJECT = "sub";
+
+    /** JWT {@code Audience} claims parameter name: <code>"aud"</code> */
+    public static final String AUDIENCE = "aud";
+
+    /** JWT {@code Expiration} claims parameter name: <code>"exp"</code> */
+    public static final String EXPIRATION = "exp";
+
+    /** JWT {@code Not Before} claims parameter name: <code>"nbf"</code> */
+    public static final String NOT_BEFORE = "nbf";
+
+    /** JWT {@code Issued At} claims parameter name: <code>"iat"</code> */
+    public static final String ISSUED_AT = "iat";
+
+    /** JWT {@code JWT ID} claims parameter name: <code>"jti"</code> */
+    public static final String ID = "jti";
+
+    private Map<String, Object> claims;
+
+    private final long now;
+
+    private JwtParamBuilder() {
+        claims = new HashMap<>();
+        now = System.currentTimeMillis() / 1000l;
+    }
+
+    public static JwtParamBuilder build() {
+        return new JwtParamBuilder();
+    }
+
+    public JwtParamBuilder addIssuedAt() {
+        claims.put(ISSUED_AT, now);
+        return this;
+    }
+
+    public JwtParamBuilder setExpirySeconds(final Integer expirySeconds) {
+        claims.put(EXPIRATION, now + expirySeconds);
+        return this;
+    }
+
+    public JwtParamBuilder setNotBeforeSeconds(final Integer beforeSeconds) {
+        claims.put(NOT_BEFORE, now - beforeSeconds);
+        return this;
+    }
+
+    public JwtParamBuilder setSubject(String sub) {
+        addOneClaim(SUBJECT, sub);
+        return this;
+    }
+
+    public JwtParamBuilder setIssuer(String iss) {
+        addOneClaim(ISSUER, iss);
+        return this;
+    }
+
+    public JwtParamBuilder setAudience(String aud) {
+        addOneClaim(AUDIENCE, aud);
+        return this;
+    }
+
+    public JwtParamBuilder addJwtId() {
+        return setJwtId(UUID.randomUUID().toString());
+    }
+
+    public JwtParamBuilder setJwtId(String jwtid) {
+        addOneClaim(ID, UUID.randomUUID().toString());
+        return this;
+    }
+
+    public JwtParamBuilder claim(String name, Object value) {
+        if (value == null) {
+            this.claims.remove(name);
+        } else {
+            this.claims.put(name, value);
+        }
+        return this;
+    }
+
+    private void addOneClaim(String key, String value) {
+        if (value != null && value.length() > 0) {
+            claims.put(key, value);
+        }
+    }
+
+
+    /**
+     * @return the claims
+     */
+    public Map<String, Object> getClaims() {
+        return claims;
+    }
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/action/OverTimeApplicantAction.java b/src/main/youhong_ai_jitu_src/jntchina/action/OverTimeApplicantAction.java
new file mode 100644
index 0000000..09dbe29
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/action/OverTimeApplicantAction.java
@@ -0,0 +1,136 @@
+package jntchina.action;
+
+
+import com.alibaba.fastjson.JSONObject;
+import jntchina.util.HttpClientToDC;
+import selfdev.util.base.BaseUtil;
+import selfdev.util.log.LogTool;
+import weaver.conn.RecordSet;
+import weaver.file.Prop;
+import weaver.general.Util;
+import weaver.interfaces.workflow.action.BaseAction;
+import weaver.soa.workflow.request.RequestInfo;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @description: 加班申请单
+ * @author: dzs
+ * @date: 2021/7/29
+ **/
+public class OverTimeApplicantAction extends BaseAction {
+
+    @Override
+    public String execute(RequestInfo requestInfo) {
+        LogTool log = new LogTool("/log/selfdev/action/hrm", true);
+        String requestId = requestInfo.getRequestid(); // 获取requestid
+        String workflowid = requestInfo.getWorkflowid(); // 获取workflowid
+        //获取工作流名称
+        String workflowname = BaseUtil.getBaseInfoByParm("workflowname", "workflow_base", "id", workflowid, "");
+        log.writeLog("---------------工作流名称-----------workflowname为：" + workflowname);
+        log.writeLog("--------加班申请单数据传入中台开始----requestId值为：" + requestId);
+
+        //获取配置文件中的参数，到时候URL路径
+        String mode = Prop.getPropValue("DevToDC_jntchina", "mode");
+        // 服务器ip：port
+        String baseUrl = Prop.getPropValue("DevToDC_jntchina", mode + "_baseUrl");
+        //访问路径拼接
+        String url = baseUrl + "/dcoaapi/hr/work";
+        //String url = "http://121.37.156.206:21005/PSIGW/RESTListeningConnector/PSFT_HR/C_WORK_APPLY.v1/";
+
+
+        //根据流程id获取主表名称
+        String mainTable = RegularizationApplyForAction.getMainTable(requestId);
+        log.writeLog("--------获取到的表名为----：" + mainTable);
+        //申请单号  OA单据号码
+        String C_OA_NUM = "";
+        //员工编码 OA提单人工号,加班人工号
+        String EMPLID = "";
+        //加班原因 自由文本
+        String C_REASON = "";
+
+        //{
+        //加班数据
+        List<Map<String,String>> list = new ArrayList<Map<String,String>>();
+        //加班开始日期
+        String C_START_DT="";
+        //加班开始时间
+        String C_START_DTM="";
+        //加班结束日期
+        String C_END_DT="";
+        //加班结束时间
+        String C_END_DTM="";
+        //}
+
+
+        RecordSet rs = new RecordSet();
+        try {
+            String sql = "select * from " + mainTable + " where requestid='" + requestId + "'";
+            rs.execute(sql);
+            log.writeLog("查询sql语句---------------->"+sql);
+            while (rs.next()) {
+                C_OA_NUM = Util.null2String(rs.getString("lcbh"));//申请单号
+                EMPLID = Util.null2String(rs.getString("tjrgh"));//员工编码
+                C_REASON = Util.null2String(rs.getString("qjyy"));//加班原因
+                C_START_DT = Util.null2String(rs.getString("fromDate"));//加班开始日期
+                C_START_DTM = Util.null2String(rs.getString("fromTime"));//加班开始时间
+                C_END_DT = Util.null2String(rs.getString("toDate"));//加班结束日期
+                C_END_DTM = Util.null2String(rs.getString("toTime"));//加班结束时间
+            }
+
+            //将加班数据进行包装
+            Map<String,String> maps= new HashMap<String,String>();
+            maps.put("EMPLID",EMPLID);
+            maps.put("C_START_DT",C_START_DT);
+            maps.put("C_START_DTM",C_START_DTM);
+            maps.put("C_END_DT",C_END_DT);
+            maps.put("C_END_DTM",C_END_DTM);
+            list.add(maps);
+            log.writeLog("----------------->加班数据明细数据:" + list.toString());
+
+            //最后再将数据全部打包
+            Map<String,Object> map = new HashMap<String,Object>();
+            map.put("C_OA_NUM",C_OA_NUM);
+            map.put("EMPLID",EMPLID);
+            map.put("C_REASON",C_REASON);
+            map.put("LINES",list);
+            String strParm = JSONObject.toJSONString(map);
+            log.writeLog("---------------加班打印的Map数据为：-----------------："+strParm);
+
+            //获取Token
+            String token = HttpClientToDC.getToken();
+            log.writeLog("加班申请单token------>" + token);
+            log.writeLog("加班申请单url------>" + url);
+
+
+            //调用NCC接口，将数据传给NCC
+            String returndata = HttpClientToDC.sendPostApi(url,token, strParm);
+            log.writeLog("【调用数据中台出差申请单接口返回结果result:】" + returndata);
+            if (!"".equals(returndata) && returndata != null) {
+                JSONObject jsonObject = JSONObject.parseObject(returndata);
+                String code = Util.null2String(jsonObject.get("code"));
+                log.writeLog("--------发送请求返回的code值为：" + code);
+                if (code.equals("1")){
+                    return SUCCESS;
+                }else{
+                    String msg = Util.null2String(jsonObject.get("msg"));
+                    requestInfo.getRequestManager().setMessageid("111100");
+                    requestInfo.getRequestManager().setMessagecontent(msg);
+                    return "0";
+                }
+            }else{
+                String ermsg="流程数据写入NCC调动申请单失败,未获取到接口返回结果，请联系系统管理员处理！";
+                requestInfo.getRequestManager().setMessageid("111100");
+                requestInfo.getRequestManager().setMessagecontent(ermsg);
+                return "0";
+            }
+        }catch (Exception e){
+            //返回0，调用失败
+            log.writeLog("------------------------捕获到的异常是：" + e.toString());
+            return "0";
+        }
+    }
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/action/OverTimeApplicantActionNew.java b/src/main/youhong_ai_jitu_src/jntchina/action/OverTimeApplicantActionNew.java
new file mode 100644
index 0000000..1b00600
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/action/OverTimeApplicantActionNew.java
@@ -0,0 +1,120 @@
+package jntchina.action;
+
+
+import com.alibaba.fastjson.JSONObject;
+import jntchina.util.HttpClientToDC;
+import selfdev.util.base.BaseUtil;
+import selfdev.util.log.LogTool;
+import weaver.conn.RecordSet;
+import weaver.file.Prop;
+import weaver.general.Util;
+import weaver.interfaces.workflow.action.BaseAction;
+import weaver.soa.workflow.request.RequestInfo;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @description: 加班申请单
+ * @author: ycf
+ * @date: 2021/01/07
+ **/
+public class OverTimeApplicantActionNew extends BaseAction {
+
+    @Override
+    public String execute(RequestInfo requestInfo) {
+        LogTool log = new LogTool("/log/selfdev/action/hrm", true);
+        String requestId = requestInfo.getRequestid(); // 获取requestid
+        String workflowid = requestInfo.getWorkflowid(); // 获取workflowid
+        //获取工作流名称
+        String workflowname = BaseUtil.getBaseInfoByParm("workflowname", "workflow_base", "id", workflowid, "");
+        log.writeLog("---------------工作流名称-----------workflowname为：" + workflowname);
+        log.writeLog("--------加班申请单数据传入中台开始----requestId值为：" + requestId);
+
+        //获取配置文件中的参数，到时候URL路径
+        String mode = Prop.getPropValue("DevToDC_jntchina", "mode");
+        // 服务器ip：port
+        String baseUrl = Prop.getPropValue("DevToDC_jntchina", mode + "_baseUrl");
+        //访问路径拼接
+        String url = baseUrl + "/dcoaapi/hr/work";
+        //String url = "http://121.37.156.206:21005/PSIGW/RESTListeningConnector/PSFT_HR/C_WORK_APPLY.v1/";
+
+        //根据流程id获取主表名称
+        String mainTable = RegularizationApplyForAction.getMainTable(requestId);
+        log.writeLog("--------获取到的表名为----：" + mainTable);
+
+        //{
+        //加班数据
+        List<Map<String, String>> list = new ArrayList<Map<String, String>>();
+
+        RecordSet rs = new RecordSet();
+        try {
+            String sql = "select * from " + mainTable + " where requestid='" + requestId + "'";
+            rs.execute(sql);
+            log.writeLog("查询sql语句---------------->" + sql);
+            Map<String, Object> map = new HashMap<String, Object>();
+            String id = "";
+            while (rs.next()) {
+                id = rs.getString("ID");
+                map.put("C_REASON", Util.null2String(rs.getString("QJYY")));//原因
+                map.put("EMPLID", Util.null2String(rs.getString("TJRGH")));//申请人
+                map.put("C_OA_NUM", Util.null2String(rs.getString("LCBH")));//申请单号
+                map.put("overtime_type", Util.null2String(rs.getString("overtime_type")));//加班补偿类型
+            }
+            sql = "select b.*, (select workcode from hrmresource a where a.id = b.xm) code  from " + mainTable + "_dt1 b where mainid = " + id;
+            log.writeLog("查找加班明细:" + sql);
+            rs.execute(sql);
+            while (rs.next()) {
+                HashMap<String, String> map2 = new HashMap<String, String>();
+                map2.put("EMPLID", Util.null2String(rs.getString("code")));
+                //加班开始日期
+                map2.put("C_START_DT", Util.null2String(rs.getString("jbksrq")));
+                //加班开始时间
+                map2.put("C_START_DTM", Util.null2String(rs.getString("jbkssj")));
+                //加班结束时间
+                map2.put("C_END_DTM", Util.null2String(rs.getString("jbjssj")));
+                //加班结束日期
+                map2.put("jbjsrq", Util.null2String(rs.getString("jbjsrq")));
+                list.add(map2);
+            }
+            map.put("LINES", list);
+
+            String strParm = JSONObject.toJSONString(map);
+            log.writeLog("---------------加班打印的Map数据为：-----------------：" + strParm);
+
+            //获取Token
+            String token = HttpClientToDC.getToken();
+            log.writeLog("加班申请单token------>" + token);
+            log.writeLog("加班申请单url------>" + url);
+
+
+            //调用NCC接口，将数据传给NCC
+            String returndata = HttpClientToDC.sendPostApi(url, token, strParm);
+            log.writeLog("【调用数据中台出差申请单接口返回结果result:】" + returndata);
+            if (!"".equals(returndata) && returndata != null) {
+                JSONObject jsonObject = JSONObject.parseObject(returndata);
+                String code = Util.null2String(jsonObject.getString("code"));
+                log.writeLog("--------发送请求返回的code值为：" + code);
+                if (code.equals("1")) {
+                    return SUCCESS;
+                } else {
+                    String msg = Util.null2String(jsonObject.getString("msg"));
+                    requestInfo.getRequestManager().setMessageid("111100");
+                    requestInfo.getRequestManager().setMessagecontent(msg);
+                    return "0";
+                }
+            } else {
+                String ermsg = "流程数据写入NCC调动申请单失败,未获取到接口返回结果，请联系系统管理员处理！";
+                requestInfo.getRequestManager().setMessageid("111100");
+                requestInfo.getRequestManager().setMessagecontent(ermsg);
+                return "0";
+            }
+        } catch (Exception e) {
+            //返回0，调用失败
+            log.writeLog("------------------------捕获到的异常是：" + e.toString());
+            return "0";
+        }
+    }
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/action/PayApplicationAction.java b/src/main/youhong_ai_jitu_src/jntchina/action/PayApplicationAction.java
new file mode 100644
index 0000000..6de9c9e
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/action/PayApplicationAction.java
@@ -0,0 +1,422 @@
+package jntchina.action;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.serializer.SerializerFeature;
+import com.api.lh.port.AddJournal;
+import com.working.util.WorkflowUtil;
+
+import jntchina.entity.*;
+import jntchina.util.HttpClientToDC;
+import selfdev.util.base.BaseUtil;
+import selfdev.util.base.TimeCommonUtil;
+import selfdev.util.log.LogTool;
+import weaver.conn.RecordSet;
+import weaver.file.Prop;
+import weaver.general.Util;
+import weaver.hrm.resource.ResourceComInfo;
+import weaver.interfaces.workflow.action.Action;
+import weaver.soa.workflow.request.RequestInfo;
+import weaver.workflow.action.BaseAction;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+
+
+/**
+ * @Author Administrator
+ * @Description 付款申请数据写入中台生成NCC对公报销单或者对公借款单
+ * @Date 2021/3/2  11:50
+ */
+public class PayApplicationAction extends BaseAction {
+    @Override
+    public String execute(RequestInfo requestInfo) {
+        String src = requestInfo.getRequestManager().getSrc();//获取操作方式
+        if (!"submit".equals(src)) { // 只有submit才执行接口
+            return SUCCESS;
+        }
+        LogTool log = new LogTool("/log/selfdev/action", false);
+        String requestId = requestInfo.getRequestid(); // 获取requestid
+        log.writeLog("--------付款申请单数据传入数据中台开始----requestId值为：" + requestId);
+        //获取当前用户的登录账号（即工号）
+        String loginid=requestInfo.getRequestManager().getUser().getLoginid();
+        log.writeLog("loginid-------->"+loginid);
+        //获取配置文件中的参数
+    	String mode = Prop.getPropValue("DevToDC_jntchina","mode");
+        // 服务器ip：port
+        String baseUrl = Prop.getPropValue("DevToDC_jntchina", mode+"_baseUrl");
+        String url = baseUrl+"/dcnccapi/claimForm/receiveData";
+        ReimbursementOrder reimbursementOrder = new ReimbursementOrder();
+        BorrowOrder borrowOrder = new BorrowOrder();
+        String mainTable = WorkflowUtil.getMainTable(requestId);
+        String mainId = "";
+        String isShowErrorMsg = "";//写入NCC失败时是否显示报错信息
+        String pk_org = ""; // 报销单位 JTSDCN0001
+        String fygsbm = ""; // 申请部门
+        String total = ""; // 报销金额   金额由表体相应字段汇总得出
+        String deptid = ""; // 部门   传输编码
+        String djlxbm = "264X-Cxx-DGBXD"; // 单据类型编码   对私报销单:264X-Cxx-DSBXD  对公报销单:264X-Cxx-DGBXD
+        String djlxmc = "对公报销单"; // 单据类型名称  默认 对公报销单
+        String djrq = TimeCommonUtil.obtainDate(0); // 单据日期   yyyy-mm-dd hh:mm:ss
+        String payflag = ""; // 支付状态
+        String paytarget = "1"; // 收款对象   0=员工，1=供应商，2=客户，默认为供应商
+        String receiver = ""; // 收款人
+        String skyhzh = ""; // 收款人银行账号
+        String hbbm = ""; // yonyou88", //收款人（供应商）
+        String custaccount= ""; //收款银行账户（供应商）
+        String sfyfp = ""; // 是否有发票
+        String jkbxr = ""; // 借款报销人   传输编码
+        String operator = ""; // 录入人
+        String xm= ""; // 申请人
+        String jsfs = "3"; // 结算方式 3 网银
+        String fkfs = ""; // 付款方式
+        String fkyhzh = ""; // 单位银行账户 传输编码
+        String jobid = ""; // 项目
+        String zy = ""; // 报销事由
+        String kjqj = ""; // 会计期间
+        String kjnd = ""; // 会计年度
+        String fjzs = ""; // 附件张数   需业务人员在OA上传附件同时填写附件张数后传数据到NCC
+        String zyx1 = ""; // OA单据号   OA传过来，用于联查单据
+        String zyx2 = ""; // 提交人    提交人姓名
+        String zyx3 = ""; // OA核销单号
+        String zyx5 = ""; // OARequestID
+        String zyx8="";//银行付款备注
+        String zyx9=requestInfo.getRequestManager().getRequestname();//标题
+        String tablecode = "arap_bxbusitem";
+        
+        RecordSet rs = new RecordSet();
+        try {
+            String sql = " select *  from " + mainTable + " where requestid='" + requestId + "'";
+            rs.execute(sql);
+            while (rs.next()) {
+                mainId = Util.null2String(rs.getString("id"));
+                isShowErrorMsg = Util.null2String(rs.getString("xrnccsbcsfts"));
+                xm = Util.null2String(rs.getString("xm")); // 借款报销人（取流程申请人）
+                sfyfp = Util.null2String(rs.getString("sfyfp")); // 是否有发票
+                pk_org = Util.null2String(rs.getString("gsmc")); // 公司名称
+                total = Util.null2String(rs.getString("jshjje")); // 报销金额   金额由表体相应字段汇总得出
+                fygsbm = Util.null2String(rs.getString("fygsbm")); // 申请部门
+//                djrq = Util.null2String(rs.getString("cjrq")); // 单据日期   yyyy-mm-dd hh:mm:ss
+                fkfs = Util.null2String(rs.getString("fkfs")); // 付款方式
+                hbbm = Util.null2String(rs.getString("gysmc")); // 收款人，供应商编码
+                custaccount = Util.null2String(rs.getString("yxhm")); // 收款人银行账号
+                zyx8 = Util.null2String(rs.getString("yxfkbz")); //银行付款备注
+                fkyhzh = Util.null2String(rs.getString("")); // 付款银行账户 传输编码
+                zy = Util.null2String(rs.getString("fksm")); // 付款说明
+                
+                fjzs = Util.null2String(rs.getString("fjzs")); // 附件张数   需业务人员在OA上传附件同时填写附件张数后传数据到NCC
+                zyx1 = Util.null2String(rs.getString("lcbh")); // OA单据号   OA传过来，用于联查单据
+                zyx2 = Util.null2String(rs.getString("xm")); // 提交人    提交人姓名
+                zyx3 = Util.null2String(rs.getString("")); // OA核销单号
+                zyx5 = requestId; // OARequestID
+
+            }
+            kjqj = djrq.substring(5,7); //  会计期间
+            kjnd = djrq.substring(0,4); // 会计年度
+            //根据部门ID查询部门编码
+            deptid=BaseUtil.getBaseInfoByParm("departmentcode", "hrmdepartment", "id", fygsbm, "");
+            //获取员工默认的组织对应的类型
+            String userDefaultCompanyType=BaseUtil.getBaseInfoByParm("company_type", "v_oa_user_org_nsrsbh", "userid", xm, "");
+            //获取付款单选择的组织对应的类型
+            String selectCompanyType=BaseUtil.getBaseInfoByParm("company_type", "uf_businessunit", "code", pk_org, "");
+            log.writeLog("userDefaultCompanyType------>" + userDefaultCompanyType);
+            log.writeLog("selectCompanyType------>" + selectCompanyType);
+            //跨组织，则说明代理区向总部申请付款
+            if(!userDefaultCompanyType.equals(selectCompanyType)){
+            	//查询建模维护的对应关系
+            	String defaultDeptNo=BaseUtil.getBaseInfoByParm("mroabmbm", "uf_kzzfkdybmsz", "sqgslx", userDefaultCompanyType, " and fkgslx='"+selectCompanyType+"'");
+            	log.writeLog("defaultDeptNo------>" + defaultDeptNo);
+            	if(!"".equals(defaultDeptNo)){
+            		deptid=defaultDeptNo;
+            	}
+            }
+            //截取前120位
+            if(zy.length()>120){
+            	zy=zy.substring(0,120);
+            }
+            
+            if("1".equals(fkfs)){
+            	jsfs = "0"; //现金
+            }
+            jkbxr = new ResourceComInfo().getWorkcode(xm); //借款报销人工号(即申请人工号)
+            operator = loginid;//当前节点操作者
+            //获取UUID
+            String uuid=UUID.randomUUID().toString().replace("-", "").toUpperCase();
+            log.writeLog("receiver------>"+receiver);
+            
+            //查询抵扣明细
+            sql = " select *  from " + mainTable + "_dt1 where mainid='" + mainId + "'";
+            rs.execute(sql);
+            while (rs.next()) {
+            	zyx3+=Util.null2String(rs.getString("yflcbh"))+",";
+            }
+            //将预付流程编号赋值到zyx3字段中
+            if(!"".equals(zyx3)){
+            	zyx3=zyx3.substring(0,zyx3.length()-1);
+            }
+            
+            //没有发票时，则对应NCC的对公借款单
+            if("1".equals(sfyfp)){
+            	djlxbm = "263X-Cxx-DGJKD"; // 单据类型编码
+            	djlxmc = "对公借款单"; 
+            	tablecode = "jk_busitem";
+            	//url = baseUrl+"/dcoaapi/billLoan/receiveData";
+            	url = baseUrl+"/dcnccapi/billLoan/receiveData";
+            	borrowOrder.setUuid(uuid);
+                borrowOrder.setPk_org(pk_org);
+                borrowOrder.setTotal(total);
+                borrowOrder.setDeptid(deptid);
+                borrowOrder.setDjlxbm(djlxbm);
+                borrowOrder.setDjrq(djrq);
+                borrowOrder.setPayflag(payflag);
+                borrowOrder.setPaytarget(paytarget);
+                borrowOrder.setHbbm(deptid);
+                borrowOrder.setReceiver(receiver);
+                borrowOrder.setHbbm(hbbm);
+                borrowOrder.setSkyhzh(skyhzh);
+                borrowOrder.setCustaccount(custaccount);
+                borrowOrder.setJkbxr(jkbxr);
+                borrowOrder.setOperator(operator);
+                borrowOrder.setJsfs(jsfs);
+                borrowOrder.setFkyhzh(fkyhzh);
+                
+                borrowOrder.setZy(zy);
+                borrowOrder.setDjzt("1");
+                borrowOrder.setKjqj(kjqj);
+                borrowOrder.setKjnd(kjnd);
+                borrowOrder.setZyx1(zyx1);
+                borrowOrder.setZyx2(zyx2);
+                borrowOrder.setZyx3(zyx3);
+                borrowOrder.setZyx5(zyx5);
+                borrowOrder.setZyx8(zyx8);
+                borrowOrder.setZyx9(zyx9);
+            }else{
+            	reimbursementOrder.setUuid(uuid);
+                reimbursementOrder.setPk_org(pk_org);
+                reimbursementOrder.setTotal(total);
+                reimbursementOrder.setDeptid(deptid);
+                reimbursementOrder.setDjlxbm(djlxbm);
+                reimbursementOrder.setDjrq(djrq);
+                reimbursementOrder.setPayflag(payflag);
+                reimbursementOrder.setPaytarget(paytarget);
+                reimbursementOrder.setReceiver(receiver);
+                reimbursementOrder.setHbbm(hbbm);
+                reimbursementOrder.setSkyhzh(skyhzh);
+                reimbursementOrder.setCustaccount(custaccount);
+                reimbursementOrder.setJkbxr(jkbxr);
+                reimbursementOrder.setOperator(operator);
+                reimbursementOrder.setJsfs(jsfs);
+                reimbursementOrder.setFkyhzh(fkyhzh);
+                reimbursementOrder.setJobid(jobid);
+                reimbursementOrder.setZy(zy);
+                reimbursementOrder.setKjqj(kjqj);
+                reimbursementOrder.setKjnd(kjnd);
+                reimbursementOrder.setFjzs(fjzs);
+                reimbursementOrder.setZyx1(zyx1);
+                reimbursementOrder.setZyx2(zyx2);
+                reimbursementOrder.setZyx3(zyx3);
+                reimbursementOrder.setZyx5(zyx5);
+                reimbursementOrder.setZyx8(zyx8);
+                reimbursementOrder.setZyx9(zyx9);
+            }
+            log.writeLog("【header数据准备完毕...】");
+            
+            //获取OA-NCC发票映射关系表
+            Map<String,String> map_oafplx_nccfplcx=BaseUtil.getMapKeyValueInfoByParm("uf_oafplx_nccfplx", "", "oafplxid", "nccfplxbm");
+            
+            //对公报销
+            List<ReimbursementOrderBody> reimbursementOrderBodyList = new ArrayList<ReimbursementOrderBody>();
+            //对公借款
+            List<BorrowOrderBody> borrowOrderBodyList = new ArrayList<BorrowOrderBody>();
+
+            int rowno = 0;
+            rs.execute(" select b.bm as szxmid,c.INVOICECODE,c.INVOICENUMBER,c.invoicetype,a.* from " + mainTable + "_dt2 a "
+            		+ "left join uf_fylx b on to_char(a.fylx)=to_char(b.id) "
+            		+ "left join fnainvoiceledger c on a.fphm=c.id "
+            		+ "where a.mainid = " + mainId);
+            while (rs.next()) {
+                
+                String jobid1 = ""; // 项目
+                String fycdbm = Util.null2String(rs.getString("fycdbm")); //费用承担部门
+                String amount = Util.null2String(rs.getString("je")); // 付款
+                String defitem36 = Util.null2o(rs.getString("fpje")); // 发票金额
+                String tax_rate = Util.null2String(rs.getString("sl")); // 税率 3%
+                String tax_amount = Util.null2String(rs.getString("se")); // 税额
+                String tni_amount = Util.null2String(rs.getString("bhsje")); // 无税金额
+                String szxmid = Util.null2String(rs.getString("szxmid")); // 收支项目  0101 汽车费用
+                String fpdm = Util.null2String(rs.getString("INVOICECODE")); // 发票代码
+                String fphm = Util.null2String(rs.getString("INVOICENUMBER")); // 发票号码
+                String invoicetype = Util.null2String(rs.getString("invoicetype")); // OA发票类型
+                //NCC发票类型
+                String fplxpk=Util.null2String(map_oafplx_nccfplcx.get(invoicetype));
+                
+//                String fphmId = Util.null2String(rs.getString("fphm")); // 发票号码
+//                if(!"".equals(fphmId)){
+//                	// 得到浏览按钮中发票号码的id,再去数据库中把发票号码和发票代码查出来
+//                	rsFna.execute(" select * from fnainvoiceledger where id = " + fphmId);
+//                    while (rsFna.next()) {
+//                        fpdm = Util.null2String(rsFna.getString("INVOICECODE")); // 发票代码
+//                        fphm = Util.null2String(rsFna.getString("INVOICENUMBER")); // 发票号码
+//                        fplxpk = Util.null2String(map_oafplx_nccfplcx.get(Util.null2String(rsFna.getString("invoicetype")))); // OA发票类型
+//                    }
+//                }
+                //发票金额为空时，默认等于付款金额
+                if(Double.parseDouble(defitem36)==0){
+                	defitem36=amount;
+                }
+                
+                String defitem46 = Util.null2String(rs.getString("wd")); // 网点（成本中心）
+                String defitem45 = Util.null2String(rs.getString("gj")); // 国家
+                String defitem44 = Util.null2String(rs.getString("ck")); // 仓库
+                String defitem43 = Util.null2String(rs.getString("cph")); //车牌号
+                String defitem42 = Util.null2String(rs.getString("id")); // OA明细行ID
+                //根据部门ID查询部门编码(传NCC)
+                String fycdbm_NCC=BaseUtil.getBaseInfoByParm("departmentcode", "hrmdepartment", "id", fycdbm, "");
+                
+                rowno++;
+                
+                log.writeLog("----fycdbm_NCC:" + fycdbm_NCC);
+                log.writeLog("----amount:" + amount);
+                log.writeLog("----tax_rate:" + tax_rate);
+                log.writeLog("----tax_amount:" + tax_amount);
+                log.writeLog("----tni_amount:" + tni_amount);
+//                log.writeLog("----defitem48:" + defitem48);
+
+                //没有发票时，则对应NCC的对公借款单
+                if("1".equals(sfyfp)){
+                	BorrowOrderBody body = new BorrowOrderBody();
+               	 	body.setAmount(amount);
+                    body.setTablecode(tablecode);
+                    body.setRowno(rowno+"");
+                    body.setSzxmid(szxmid);
+                    body.setDefitem50("");
+                    body.setDefitem49("");
+                    body.setDefitem42(defitem42);
+                    body.setDefitem43(defitem43);
+                    body.setDefitem44(defitem44);
+                    body.setDefitem45(defitem45);
+                    body.setDefitem46(defitem46);
+                    body.setDefitem48(fycdbm_NCC);
+                    borrowOrderBodyList.add(body);
+                }else{
+                	ReimbursementOrderBody body = new ReimbursementOrderBody();
+                	body.setJobid(jobid1);
+                    body.setDeptid(fycdbm_NCC);
+                    body.setAmount(amount);
+                    body.setTax_rate(tax_rate);
+                    body.setTax_amount(tax_amount);
+                    body.setTni_amount(tni_amount);
+                    body.setTablecode(tablecode);
+                    body.setRowno(rowno+"");
+                    body.setSzxmid(szxmid);
+                    body.setFpdm(fpdm);
+                    body.setFphm(fphm);
+                    body.setFplxpk(fplxpk);
+                    body.setDefitem36(defitem36);
+                    body.setDefitem46(defitem46);
+                    body.setDefitem45(defitem45);
+                    body.setDefitem44(defitem44);
+                    body.setDefitem43(defitem43);
+                    body.setDefitem42(defitem42);
+                    //body.setDefitem48(fycdbm_NCC);
+                    reimbursementOrderBodyList.add(body);
+                }
+            }
+
+            String parm="";
+            //没有发票时，则对应NCC的对公借款单
+            if("1".equals(sfyfp)){
+            	borrowOrder.setJk_busitem(borrowOrderBodyList);
+//                borrowList.add(borrowOrder);
+            	parm=JSONObject.toJSONString(borrowOrder, SerializerFeature.DisableCircularReferenceDetect);
+            	log.writeLog(djlxmc+"准备传入中台的数据为------>" + parm);
+            }else{
+            	reimbursementOrder.setEr_busitem(reimbursementOrderBodyList);
+//                reimbursementList.add(reimbursementOrder);
+            	parm=JSONObject.toJSONString(reimbursementOrder, SerializerFeature.DisableCircularReferenceDetect);
+            	log.writeLog(djlxmc+"准备传入中台的数据为------>" + parm);
+            }
+            
+            
+            //获取TOKEN
+            String token = HttpClientToDC.getToken();
+            log.writeLog("获取数据中台的token------>" + token);
+            if ("".equals(Util.null2String(token))) {
+                String tokenMsg="流程提交失败，未获取到数据中台接口TOKEN，请联系管理员处理！";
+            	//将NCC返回结果回写至OA流程表单
+                rs.execute(" update " + mainTable + " set sfcgscnccfkd = 1 ,nccfhxx='" + tokenMsg.replace("'", "''") + "'  where requestid = " + requestId);
+                AddJournal.addInfo("费用报销接口", JSON.parseObject(parm), tokenMsg, "1", requestId);
+                //是否需要显示报错信息
+                if("yes".equals(isShowErrorMsg)){
+                	requestInfo.getRequestManager().setMessagecontent(tokenMsg);
+                    return Action.FAILURE_AND_CONTINUE;
+                }else{
+                	return SUCCESS;
+                }
+            }
+            
+            //调用NCC接口，将数据传给NCC
+            String returndata = HttpClientToDC.sendPostApi(url,token, parm);
+            log.writeLog("【调用数据中台报销接口返回结果result:】" + returndata);
+            if (!"".equals(returndata) && returndata != null) {
+                JSONObject jsonObject = JSONObject.parseObject(returndata);
+                String success = Util.null2String(jsonObject.get("succ"));
+                log.writeLog("--------发送请求返回的success值为：" + success);
+                if ("true".equals(success)) {
+                	JSONObject data = jsonObject.getJSONObject("data");
+                    String billno = Util.null2String(data.get("billno"));//NCC单号
+                    log.writeLog("--------发送请求返回的billno值为：" + billno);
+                    //将NCC返回结果回写至OA流程表单
+                    rs.execute(" update " + mainTable + " set sfcgscnccfkd = 0 , nccfkdh = '" + billno + "',nccfhxx=''  where requestid = " + requestId);
+                    AddJournal.addInfo("费用报销接口", JSON.parseObject(parm), returndata, "0", requestId);
+                } else {
+                	String message = Util.null2String(jsonObject.get("msg"));
+                	String message2=message.replace("'", "''");
+                	//超出1333个字符，则只截取前面这部分
+                	if(message2.length()>1334){
+                		message2=message2.substring(0,1333);
+                	}
+                	//将NCC返回结果回写至OA流程表单
+                    rs.execute(" update " + mainTable + " set sfcgscnccfkd = 1 ,nccfhxx='" + message2 + "'  where requestid = " + requestId);
+                    AddJournal.addInfo("费用报销接口", JSON.parseObject(parm), returndata, "1", requestId);
+                    //是否需要显示报错信息
+                    if("yes".equals(isShowErrorMsg)){
+                    	 requestInfo.getRequestManager().setMessagecontent("流程数据写入NCC生成"+djlxmc+"失败,失败信息：<br/>"+message);
+                         return Action.FAILURE_AND_CONTINUE;
+                    }else{
+                    	return SUCCESS;
+                    }
+                }
+            } else {
+            	String ermsg="流程数据写入NCC生成"+djlxmc+"失败,未获取到接口返回结果，请联系系统管理员处理！";
+                AddJournal.addInfo("费用报销接口", JSON.parseObject(parm), ermsg, "1", requestId);
+            	//将NCC返回结果回写至OA流程表单
+                rs.execute(" update " + mainTable + " set sfcgscnccfkd = 1 ,nccfhxx='" + ermsg.replace("'", "''") + "'  where requestid = " + requestId); 
+                //是否需要显示报错信息
+                if("yes".equals(isShowErrorMsg)){
+                	requestInfo.getRequestManager().setMessagecontent(ermsg);
+                    return Action.FAILURE_AND_CONTINUE;
+                }else{
+                	return SUCCESS;
+                }
+            }
+
+        } catch (Exception e) {
+            String ermsg="流程数据生成中台对公报销单/对公借款单失败！" + e.toString();
+        	//将NCC返回结果回写至OA流程表单
+            AddJournal.addInfo("费用报销接口", new JSONObject(), ermsg, "1", requestId);
+            rs.execute(" update " + mainTable + " set sfcgscnccfkd = 1 ,nccfhxx='" + ermsg.replace("'", "''") + "'  where requestid = " + requestId); 
+            //是否需要显示报错信息
+            if("yes".equals(isShowErrorMsg)){
+            	requestInfo.getRequestManager().setMessagecontent(ermsg);
+                return Action.FAILURE_AND_CONTINUE;
+            }else{
+            	return SUCCESS;
+            }
+        }
+        log.writeLog("--------付款单数据传入中台完毕----requestId值为：" + requestId);
+        return Action.SUCCESS;
+    }
+}
\ No newline at end of file
diff --git a/src/main/youhong_ai_jitu_src/jntchina/action/PayApplicationActionNew.java b/src/main/youhong_ai_jitu_src/jntchina/action/PayApplicationActionNew.java
new file mode 100644
index 0000000..275c016
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/action/PayApplicationActionNew.java
@@ -0,0 +1,447 @@
+package jntchina.action;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.serializer.SerializerFeature;
+import com.api.lh.port.AddJournal;
+import com.working.util.WorkflowUtil;
+import jntchina.entity.*;
+import jntchina.util.DataBaseUtils;
+import jntchina.util.HttpClientToDC;
+import selfdev.util.base.BaseUtil;
+import selfdev.util.base.TimeCommonUtil;
+import selfdev.util.log.LogTool;
+import weaver.conn.RecordSet;
+import weaver.file.Prop;
+import weaver.general.Util;
+import weaver.hrm.resource.ResourceComInfo;
+import weaver.interfaces.workflow.action.Action;
+import weaver.soa.workflow.request.RequestInfo;
+import weaver.workflow.action.BaseAction;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+
+
+/**
+ * @Author louh
+ * @Description 付款申请数据写入中台生成NCC对公报销单或者对公借款单， 添加抵扣明细数据
+ * @Date 2022/5/9 16:00
+ * @Version 1.0
+ */
+public class PayApplicationActionNew extends BaseAction {
+    @Override
+    public String execute(RequestInfo requestInfo) {
+        String src = requestInfo.getRequestManager().getSrc();//获取操作方式
+        if (!"submit".equals(src)) { // 只有submit才执行接口
+            return SUCCESS;
+        }
+        LogTool log = new LogTool("/log/selfdev/action", false);
+        String requestId = requestInfo.getRequestid(); // 获取requestid
+        log.writeLog("--------付款申请单数据传入数据中台开始----requestId值为：" + requestId);
+        //获取当前用户的登录账号（即工号）
+        String loginid=requestInfo.getRequestManager().getUser().getLoginid();
+        log.writeLog("loginid-------->"+loginid);
+        //获取配置文件中的参数
+    	String mode = Prop.getPropValue("DevToDC_jntchina","mode");
+        // 服务器ip：port
+        String baseUrl = Prop.getPropValue("DevToDC_jntchina", mode+"_baseUrl");
+        String url = baseUrl+"/dcnccapi/claimForm/receiveData";
+        ReimbursementOrder reimbursementOrder = new ReimbursementOrder();
+        BorrowOrder borrowOrder = new BorrowOrder();
+        String mainTable = WorkflowUtil.getMainTable(requestId);
+        String mainId = "";
+        String isShowErrorMsg = "";//写入NCC失败时是否显示报错信息
+        String pk_org = ""; // 报销单位 JTSDCN0001
+        String fygsbm = ""; // 申请部门
+        String total = ""; // 报销金额   金额由表体相应字段汇总得出
+        String deptid = ""; // 部门   传输编码
+        String djlxbm = "264X-Cxx-DGBXD"; // 单据类型编码   对私报销单:264X-Cxx-DSBXD  对公报销单:264X-Cxx-DGBXD
+        String djlxmc = "对公报销单"; // 单据类型名称  默认 对公报销单
+        String djrq = TimeCommonUtil.obtainDate(0); // 单据日期   yyyy-mm-dd hh:mm:ss
+        String payflag = ""; // 支付状态
+        String paytarget = "1"; // 收款对象   0=员工，1=供应商，2=客户，默认为供应商
+        String receiver = ""; // 收款人
+        String skyhzh = ""; // 收款人银行账号
+        String hbbm = ""; // yonyou88", //收款人（供应商）
+        String custaccount= ""; //收款银行账户（供应商）
+        String sfyfp = ""; // 是否有发票
+        String jkbxr = ""; // 借款报销人   传输编码
+        String operator = ""; // 录入人
+        String xm= ""; // 申请人
+        String jsfs = "3"; // 结算方式 3 网银
+        String fkfs = ""; // 付款方式
+        String fkyhzh = ""; // 单位银行账户 传输编码
+        String jobid = ""; // 项目
+        String zy = ""; // 报销事由
+        String kjqj = ""; // 会计期间
+        String kjnd = ""; // 会计年度
+        String fjzs = ""; // 附件张数   需业务人员在OA上传附件同时填写附件张数后传数据到NCC
+        String zyx1 = ""; // OA单据号   OA传过来，用于联查单据
+        String zyx2 = ""; // 提交人    提交人姓名
+        String zyx3 = ""; // OA核销单号
+        String zyx5 = ""; // OARequestID
+        String zyx8="";//银行付款备注
+        String zyx9=requestInfo.getRequestManager().getRequestname();//标题
+        String tablecode = "arap_bxbusitem";
+
+        RecordSet rs = new RecordSet();
+        try {
+            String sql = " select *  from " + mainTable + " where requestid='" + requestId + "'";
+            rs.execute(sql);
+            while (rs.next()) {
+                mainId = Util.null2String(rs.getString("id"));
+                isShowErrorMsg = Util.null2String(rs.getString("xrnccsbcsfts"));
+                xm = Util.null2String(rs.getString("xm")); // 借款报销人（取流程申请人）
+                sfyfp = Util.null2String(rs.getString("sfyfp")); // 是否有发票
+                pk_org = Util.null2String(rs.getString("gsmc")); // 公司名称
+                total = Util.null2String(rs.getString("jshjje")); // 报销金额   金额由表体相应字段汇总得出
+                fygsbm = Util.null2String(rs.getString("fygsbm")); // 申请部门
+//                djrq = Util.null2String(rs.getString("cjrq")); // 单据日期   yyyy-mm-dd hh:mm:ss
+                fkfs = Util.null2String(rs.getString("fkfs")); // 付款方式
+                hbbm = Util.null2String(rs.getString("gysmc")); // 收款人，供应商编码
+                custaccount = Util.null2String(rs.getString("yxhm")); // 收款人银行账号
+                zyx8 = Util.null2String(rs.getString("yxfkbz")); //银行付款备注
+                fkyhzh = Util.null2String(rs.getString("")); // 付款银行账户 传输编码
+                zy = Util.null2String(rs.getString("fksm")); // 付款说明
+
+                fjzs = Util.null2String(rs.getString("fjzs")); // 附件张数   需业务人员在OA上传附件同时填写附件张数后传数据到NCC
+                zyx1 = Util.null2String(rs.getString("lcbh")); // OA单据号   OA传过来，用于联查单据
+                zyx2 = Util.null2String(rs.getString("xm")); // 提交人    提交人姓名
+                zyx3 = Util.null2String(rs.getString("")); // OA核销单号
+                zyx5 = requestId; // OARequestID
+
+            }
+            kjqj = djrq.substring(5,7); //  会计期间
+            kjnd = djrq.substring(0,4); // 会计年度
+            //根据部门ID查询部门编码
+            deptid=BaseUtil.getBaseInfoByParm("departmentcode", "hrmdepartment", "id", fygsbm, "");
+            //获取员工默认的组织对应的类型
+            String userDefaultCompanyType=BaseUtil.getBaseInfoByParm("company_type", "v_oa_user_org_nsrsbh", "userid", xm, "");
+            //获取付款单选择的组织对应的类型
+            String selectCompanyType=BaseUtil.getBaseInfoByParm("company_type", "uf_businessunit", "code", pk_org, "");
+            log.writeLog("userDefaultCompanyType------>" + userDefaultCompanyType);
+            log.writeLog("selectCompanyType------>" + selectCompanyType);
+            //跨组织，则说明代理区向总部申请付款
+            if(!userDefaultCompanyType.equals(selectCompanyType)){
+            	//查询建模维护的对应关系
+            	String defaultDeptNo=BaseUtil.getBaseInfoByParm("mroabmbm", "uf_kzzfkdybmsz", "sqgslx", userDefaultCompanyType, " and fkgslx='"+selectCompanyType+"'");
+            	log.writeLog("defaultDeptNo------>" + defaultDeptNo);
+            	if(!"".equals(defaultDeptNo)){
+            		deptid=defaultDeptNo;
+            	}
+            }
+            //截取前120位
+            if(zy.length()>120){
+            	zy=zy.substring(0,120);
+            }
+            //标题截取前150位
+            if (zyx9.length() > 150){
+                zyx9 = zyx9.substring(0, 150);
+            }
+            if("1".equals(fkfs)){
+            	jsfs = "0"; //现金
+            }
+            jkbxr = new ResourceComInfo().getWorkcode(xm); //借款报销人工号(即申请人工号)
+            operator = loginid;//当前节点操作者
+            //获取UUID
+            String uuid=UUID.randomUUID().toString().replace("-", "").toUpperCase();
+            log.writeLog("receiver------>"+receiver);
+
+            //查询抵扣明细
+            sql = " select *  from " + mainTable + "_dt1 where mainid='" + mainId + "'";
+            rs.execute(sql);
+            while (rs.next()) {
+            	zyx3+=Util.null2String(rs.getString("yflcbh"))+",";
+            }
+            //将预付流程编号赋值到zyx3字段中
+            if(!"".equals(zyx3)){
+            	zyx3=zyx3.substring(0,zyx3.length()-1);
+            }
+
+            //没有发票时，则对应NCC的对公借款单
+            if("1".equals(sfyfp)){
+            	djlxbm = "263X-Cxx-DGJKD"; // 单据类型编码
+            	djlxmc = "对公借款单";
+            	tablecode = "jk_busitem";
+            	//url = baseUrl+"/dcoaapi/billLoan/receiveData";
+            	url = baseUrl+"/dcnccapi/billLoan/receiveData";
+            	borrowOrder.setUuid(uuid);
+                borrowOrder.setPk_org(pk_org);
+                borrowOrder.setTotal(total);
+                borrowOrder.setDeptid(deptid);
+                borrowOrder.setDjlxbm(djlxbm);
+                borrowOrder.setDjrq(djrq);
+                borrowOrder.setPayflag(payflag);
+                borrowOrder.setPaytarget(paytarget);
+                borrowOrder.setHbbm(deptid);
+                borrowOrder.setReceiver(receiver);
+                borrowOrder.setHbbm(hbbm);
+                borrowOrder.setSkyhzh(skyhzh);
+                borrowOrder.setCustaccount(custaccount);
+                borrowOrder.setJkbxr(jkbxr);
+                borrowOrder.setOperator(operator);
+                borrowOrder.setJsfs(jsfs);
+                borrowOrder.setFkyhzh(fkyhzh);
+
+                borrowOrder.setZy(zy);
+                borrowOrder.setDjzt("1");
+                borrowOrder.setKjqj(kjqj);
+                borrowOrder.setKjnd(kjnd);
+                borrowOrder.setZyx1(zyx1);
+                borrowOrder.setZyx2(zyx2);
+                borrowOrder.setZyx3(zyx3);
+                borrowOrder.setZyx5(zyx5);
+                borrowOrder.setZyx8(zyx8);
+                borrowOrder.setZyx9(zyx9);
+            }else{
+            	reimbursementOrder.setUuid(uuid);
+                reimbursementOrder.setPk_org(pk_org);
+                reimbursementOrder.setTotal(total);
+                reimbursementOrder.setDeptid(deptid);
+                reimbursementOrder.setDjlxbm(djlxbm);
+                reimbursementOrder.setDjrq(djrq);
+                reimbursementOrder.setPayflag(payflag);
+                reimbursementOrder.setPaytarget(paytarget);
+                reimbursementOrder.setReceiver(receiver);
+                reimbursementOrder.setHbbm(hbbm);
+                reimbursementOrder.setSkyhzh(skyhzh);
+                reimbursementOrder.setCustaccount(custaccount);
+                reimbursementOrder.setJkbxr(jkbxr);
+                reimbursementOrder.setOperator(operator);
+                reimbursementOrder.setJsfs(jsfs);
+                reimbursementOrder.setFkyhzh(fkyhzh);
+                reimbursementOrder.setJobid(jobid);
+                reimbursementOrder.setZy(zy);
+                reimbursementOrder.setKjqj(kjqj);
+                reimbursementOrder.setKjnd(kjnd);
+                reimbursementOrder.setFjzs(fjzs);
+                reimbursementOrder.setZyx1(zyx1);
+                reimbursementOrder.setZyx2(zyx2);
+                reimbursementOrder.setZyx3(zyx3);
+                reimbursementOrder.setZyx5(zyx5);
+                reimbursementOrder.setZyx8(zyx8);
+                reimbursementOrder.setZyx9(zyx9);
+            }
+            log.writeLog("【header数据准备完毕...】");
+
+            //获取OA-NCC发票映射关系表
+            Map<String,String> map_oafplx_nccfplcx=BaseUtil.getMapKeyValueInfoByParm("uf_oafplx_nccfplx", "", "oafplxid", "nccfplxbm");
+
+            //对公报销
+            List<ReimbursementOrderBody> reimbursementOrderBodyList = new ArrayList<ReimbursementOrderBody>();
+            List<ErBxcontrast> erBxcontrasts = new ArrayList<>();
+            //对公借款
+            List<BorrowOrderBody> borrowOrderBodyList = new ArrayList<BorrowOrderBody>();
+
+            int rowno = 0;
+            rs.execute(" select b.bm as szxmid,c.INVOICECODE,c.INVOICENUMBER,c.invoicetype,a.* from " + mainTable + "_dt2 a "
+            		+ "left join uf_fylx b on to_char(a.fylx)=to_char(b.id) "
+            		+ "left join fnainvoiceledger c on a.fphm=c.id "
+            		+ "where a.mainid = " + mainId);
+            while (rs.next()) {
+
+                String jobid1 = ""; // 项目
+                String fycdbm = Util.null2String(rs.getString("fycdbm")); //费用承担部门
+                String amount = Util.null2String(rs.getString("je")); // 付款
+                String defitem36 = Util.null2o(rs.getString("fpje")); // 发票金额
+                String tax_rate = Util.null2String(rs.getString("sl")); // 税率 3%
+                String tax_amount = Util.null2String(rs.getString("se")); // 税额
+                String tni_amount = Util.null2String(rs.getString("bhsje")); // 无税金额
+                String szxmid = Util.null2String(rs.getString("szxmid")); // 收支项目  0101 汽车费用
+                String fpdm = Util.null2String(rs.getString("INVOICECODE")); // 发票代码
+                String fphm = Util.null2String(rs.getString("INVOICENUMBER")); // 发票号码
+                String invoicetype = Util.null2String(rs.getString("invoicetype")); // OA发票类型
+                //NCC发票类型
+                String fplxpk=Util.null2String(map_oafplx_nccfplcx.get(invoicetype));
+
+//                String fphmId = Util.null2String(rs.getString("fphm")); // 发票号码
+//                if(!"".equals(fphmId)){
+//                	// 得到浏览按钮中发票号码的id,再去数据库中把发票号码和发票代码查出来
+//                	rsFna.execute(" select * from fnainvoiceledger where id = " + fphmId);
+//                    while (rsFna.next()) {
+//                        fpdm = Util.null2String(rsFna.getString("INVOICECODE")); // 发票代码
+//                        fphm = Util.null2String(rsFna.getString("INVOICENUMBER")); // 发票号码
+//                        fplxpk = Util.null2String(map_oafplx_nccfplcx.get(Util.null2String(rsFna.getString("invoicetype")))); // OA发票类型
+//                    }
+//                }
+                //发票金额为空时，默认等于付款金额
+                if(Double.parseDouble(defitem36)==0){
+                	defitem36=amount;
+                }
+
+                String defitem46 = Util.null2String(rs.getString("wd")); // 网点（成本中心）
+                String defitem45 = Util.null2String(rs.getString("gj")); // 国家
+                String defitem44 = Util.null2String(rs.getString("ck")); // 仓库
+                String defitem43 = Util.null2String(rs.getString("cph")); //车牌号
+                String defitem42 = Util.null2String(rs.getString("id")); // OA明细行ID
+                //根据部门ID查询部门编码(传NCC)
+                String fycdbm_NCC=BaseUtil.getBaseInfoByParm("departmentcode", "hrmdepartment", "id", fycdbm, "");
+
+                rowno++;
+
+                log.writeLog("----fycdbm_NCC:" + fycdbm_NCC);
+                log.writeLog("----amount:" + amount);
+                log.writeLog("----tax_rate:" + tax_rate);
+                log.writeLog("----tax_amount:" + tax_amount);
+                log.writeLog("----tni_amount:" + tni_amount);
+//                log.writeLog("----defitem48:" + defitem48);
+
+                //没有发票时，则对应NCC的对公借款单
+                if("1".equals(sfyfp)){
+                	BorrowOrderBody body = new BorrowOrderBody();
+               	 	body.setAmount(amount);
+                    body.setTablecode(tablecode);
+                    body.setRowno(rowno+"");
+                    body.setSzxmid(szxmid);
+                    body.setDefitem50("");
+                    body.setDefitem49("");
+                    body.setDefitem42(defitem42);
+                    body.setDefitem43(defitem43);
+                    body.setDefitem44(defitem44);
+                    body.setDefitem45(defitem45);
+                    body.setDefitem46(defitem46);
+                    body.setDefitem48(fycdbm_NCC);
+                    borrowOrderBodyList.add(body);
+                }else{
+                	ReimbursementOrderBody body = new ReimbursementOrderBody();
+                	body.setJobid(jobid1);
+                    body.setDeptid(fycdbm_NCC);
+                    body.setAmount(amount);
+                    body.setTax_rate(tax_rate);
+                    body.setTax_amount(tax_amount);
+                    body.setTni_amount(tni_amount);
+                    body.setTablecode(tablecode);
+                    body.setRowno(rowno+"");
+                    body.setSzxmid(szxmid);
+                    body.setFpdm(fpdm);
+                    body.setFphm(fphm);
+                    body.setFplxpk(fplxpk);
+                    body.setDefitem36(defitem36);
+                    body.setDefitem46(defitem46);
+                    body.setDefitem45(defitem45);
+                    body.setDefitem44(defitem44);
+                    body.setDefitem43(defitem43);
+                    body.setDefitem42(defitem42);
+                    //body.setDefitem48(fycdbm_NCC);
+                    reimbursementOrderBodyList.add(body);
+                }
+            }
+
+            String parm="";
+            //没有发票时，则对应NCC的对公借款单
+            if("1".equals(sfyfp)){
+            	borrowOrder.setJk_busitem(borrowOrderBodyList);
+//                borrowList.add(borrowOrder);
+            	parm=JSONObject.toJSONString(borrowOrder, SerializerFeature.DisableCircularReferenceDetect);
+            	log.writeLog(djlxmc+"准备传入中台的数据为------>" + parm);
+            }else{
+                RecordSet rs4 = new RecordSet();
+                String sql1 = "select * from " + mainTable + "_dt1 where mainid = " + mainId;
+                log.writeLog("查询当前单据是否有抵扣信息sql-----> " + sql1);
+                rs.execute(sql1);
+                while(rs.next()){
+                    String yfkqptzmxid = Util.null2String(rs.getString("yfkqptzmxid"));  //预付欠票台账id
+                    String yfklcmxid = Util.null2String(rs.getString("yfklcmxid"));  //预付款流程明细id
+                    String sql2 = "select fylx from uf_fksqyfb_dt1 where id = " + yfkqptzmxid;
+                    String fylx = "";
+                    rs4.execute(sql2);
+                    if(rs4.next()){
+                        fylx = Util.null2String(rs4.getString("fylx"));
+                    }
+                    fylx = DataBaseUtils.getFirstValue("select BM from uf_fylx where id = " + fylx);
+                    String nccdh = Util.null2String(rs.getString("nccdh"));//ncc单号
+                    String bcdjje = Util.null2o(rs.getString("bcdjje"));  //本次抵扣金额
+                    ErBxcontrast erBxcontrast = new ErBxcontrast(nccdh, fylx, bcdjje, yfklcmxid, yfkqptzmxid);
+                    erBxcontrasts.add(erBxcontrast);
+                }
+            	reimbursementOrder.setEr_busitem(reimbursementOrderBodyList);
+            	reimbursementOrder.setEr_bxcontrast(erBxcontrasts);
+//                reimbursementList.add(reimbursementOrder);
+            	parm=JSONObject.toJSONString(reimbursementOrder, SerializerFeature.DisableCircularReferenceDetect);
+            	log.writeLog(djlxmc+"准备传入中台的数据为------>" + parm);
+            }
+
+
+            //获取TOKEN
+            String token = HttpClientToDC.getToken();
+            log.writeLog("获取数据中台的token------>" + token);
+            if ("".equals(Util.null2String(token))) {
+                String tokenMsg="流程提交失败，未获取到数据中台接口TOKEN，请联系管理员处理！";
+            	//将NCC返回结果回写至OA流程表单
+                rs.execute(" update " + mainTable + " set sfcgscnccfkd = 1 ,nccfhxx='" + tokenMsg.replace("'", "''") + "'  where requestid = " + requestId);
+                AddJournal.addInfo("费用报销接口", JSON.parseObject(parm), tokenMsg, "1", requestId);
+                //是否需要显示报错信息
+                if("yes".equals(isShowErrorMsg)){
+                	requestInfo.getRequestManager().setMessagecontent(tokenMsg);
+                    return Action.FAILURE_AND_CONTINUE;
+                }else{
+                	return SUCCESS;
+                }
+            }
+
+            //调用NCC接口，将数据传给NCC
+            String returndata = HttpClientToDC.sendPostApi(url,token, parm);
+            log.writeLog("【调用数据中台报销接口返回结果result:】" + returndata);
+            if (!"".equals(returndata) && returndata != null) {
+                JSONObject jsonObject = JSONObject.parseObject(returndata);
+                String success = Util.null2String(jsonObject.get("succ"));
+                log.writeLog("--------发送请求返回的success值为：" + success);
+                if ("true".equals(success)) {
+                	JSONObject data = jsonObject.getJSONObject("data");
+                    String billno = Util.null2String(data.get("billno"));//NCC单号
+                    log.writeLog("--------发送请求返回的billno值为：" + billno);
+                    //将NCC返回结果回写至OA流程表单
+                    rs.execute(" update " + mainTable + " set sfcgscnccfkd = 0 , nccfkdh = '" + billno + "',nccfhxx=''  where requestid = " + requestId);
+                    AddJournal.addInfo("费用报销接口", JSON.parseObject(parm), returndata, "0", requestId);
+                } else {
+                	String message = Util.null2String(jsonObject.get("msg"));
+                	String message2=message.replace("'", "''");
+                	//超出1333个字符，则只截取前面这部分
+                	if(message2.length()>1334){
+                		message2=message2.substring(0,1333);
+                	}
+                	//将NCC返回结果回写至OA流程表单
+                    rs.execute(" update " + mainTable + " set sfcgscnccfkd = 1 ,nccfhxx='" + message2 + "'  where requestid = " + requestId);
+                    AddJournal.addInfo("费用报销接口", JSON.parseObject(parm), returndata, "1", requestId);
+                    //是否需要显示报错信息
+                    if("yes".equals(isShowErrorMsg)){
+                    	 requestInfo.getRequestManager().setMessagecontent("流程数据写入NCC生成"+djlxmc+"失败,失败信息：<br/>"+message);
+                         return Action.FAILURE_AND_CONTINUE;
+                    }else{
+                    	return SUCCESS;
+                    }
+                }
+            } else {
+            	String ermsg="流程数据写入NCC生成"+djlxmc+"失败,未获取到接口返回结果，请联系系统管理员处理！";
+                AddJournal.addInfo("费用报销接口", JSON.parseObject(parm), ermsg, "1", requestId);
+            	//将NCC返回结果回写至OA流程表单
+                rs.execute(" update " + mainTable + " set sfcgscnccfkd = 1 ,nccfhxx='" + ermsg.replace("'", "''") + "'  where requestid = " + requestId);
+                //是否需要显示报错信息
+                if("yes".equals(isShowErrorMsg)){
+                	requestInfo.getRequestManager().setMessagecontent(ermsg);
+                    return Action.FAILURE_AND_CONTINUE;
+                }else{
+                	return SUCCESS;
+                }
+            }
+
+        } catch (Exception e) {
+            String ermsg="流程数据生成中台对公报销单/对公借款单失败！" + e.toString();
+        	//将NCC返回结果回写至OA流程表单
+            AddJournal.addInfo("费用报销接口", new JSONObject(), ermsg, "1", requestId);
+            rs.execute(" update " + mainTable + " set sfcgscnccfkd = 1 ,nccfhxx='" + ermsg.replace("'", "''") + "'  where requestid = " + requestId);
+            //是否需要显示报错信息
+            if("yes".equals(isShowErrorMsg)){
+            	requestInfo.getRequestManager().setMessagecontent(ermsg);
+                return Action.FAILURE_AND_CONTINUE;
+            }else{
+            	return SUCCESS;
+            }
+        }
+        log.writeLog("--------付款单数据传入中台完毕----requestId值为：" + requestId);
+        return Action.SUCCESS;
+    }
+}
\ No newline at end of file
diff --git a/src/main/youhong_ai_jitu_src/jntchina/action/PayApplicationActionYY.java b/src/main/youhong_ai_jitu_src/jntchina/action/PayApplicationActionYY.java
new file mode 100644
index 0000000..11d9d64
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/action/PayApplicationActionYY.java
@@ -0,0 +1,431 @@
+package jntchina.action;
+
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.serializer.SerializerFeature;
+import com.working.util.WorkflowUtil;
+import jntchina.entity.BorrowOrderYY;
+import jntchina.entity.BorrowOrderBodyYY;
+import jntchina.entity.ReimbursementOrderYY;
+import jntchina.entity.ReimbursementOrderBodyYY;
+import jntchina.util.HttpClientToDC;
+import selfdev.util.base.BaseUtil;
+import selfdev.util.base.TimeCommonUtil;
+import selfdev.util.log.LogTool;
+import weaver.conn.RecordSet;
+import weaver.file.Prop;
+import weaver.general.Util;
+import weaver.hrm.resource.ResourceComInfo;
+import weaver.interfaces.workflow.action.Action;
+import weaver.soa.workflow.request.RequestInfo;
+import weaver.workflow.action.BaseAction;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+
+
+/**
+ * @Author Administrator
+ * @Description 付款申请数据写入中台生成NCC对公报销单或者对公借款单(紜毅)1
+ * @Date 2021/3/2  11:50
+ */
+public class PayApplicationActionYY extends BaseAction {
+    @Override
+    public String execute(RequestInfo requestInfo) {
+        String src = requestInfo.getRequestManager().getSrc();//获取操作方式
+        if (!"submit".equals(src)) { // 只有submit才执行接口
+            return SUCCESS;
+        }
+        LogTool log = new LogTool("/log/selfdev/action", false);
+        String requestId = requestInfo.getRequestid(); // 获取requestid
+        log.writeLog("--------付款申请单数据传入数据中台开始----requestId值为：" + requestId);
+        //获取当前用户的登录账号（即工号）
+        String loginid=requestInfo.getRequestManager().getUser().getLoginid();
+        log.writeLog("loginid-------->"+loginid);
+        //获取配置文件中的参数
+    	String mode = Prop.getPropValue("DevToDC_jntchina","mode");
+        // 服务器ip：port
+        String baseUrl = Prop.getPropValue("DevToDC_jntchina", mode+"_baseUrl");
+        String url = baseUrl+"/dcnccapi/claimForm/receiveData";
+        ReimbursementOrderYY reimbursementOrder = new ReimbursementOrderYY();
+        BorrowOrderYY borrowOrder = new BorrowOrderYY();
+        String mainTable = WorkflowUtil.getMainTable(requestId);
+        String mainId = "";
+        String isShowErrorMsg = "";//写入NCC失败时是否显示报错信息
+        String pk_org = ""; // 报销单位 JTSDCN0001
+        String fygsbm = ""; // 申请部门
+        String total = ""; // 报销金额   金额由表体相应字段汇总得出
+        String deptid = ""; // 部门   传输编码
+        String djlxbm = "264X-Cxx-DGBXD"; // 单据类型编码   对私报销单:264X-Cxx-DSBXD  对公报销单:264X-Cxx-DGBXD
+        String djlxmc = "对公报销单"; // 单据类型名称  默认 对公报销单
+        String djrq = TimeCommonUtil.obtainDate(0); // 单据日期   yyyy-mm-dd hh:mm:ss
+        String payflag = ""; // 支付状态
+        String paytarget = "1"; // 收款对象   0=员工，1=供应商，2=客户，默认为供应商
+        String receiver = ""; // 收款人
+        String skyhzh = ""; // 收款人银行账号
+        String hbbm = ""; // yonyou88", //收款人（供应商）
+        String custaccount= ""; //收款银行账户（供应商）
+        String sfyfp = ""; // 是否有发票
+        String jkbxr = ""; // 借款报销人   传输编码
+        String operator = ""; // 录入人
+        String xm= ""; // 申请人
+        String jsfs = "3"; // 结算方式 3 网银
+        String fkfs = ""; // 付款方式
+        String fkyhzh = ""; // 单位银行账户 传输编码
+        String jobid = ""; // 项目
+        String zy = ""; // 报销事由
+        String kjqj = ""; // 会计期间
+        String kjnd = ""; // 会计年度
+        String fjzs = ""; // 附件张数   需业务人员在OA上传附件同时填写附件张数后传数据到NCC
+        String zyx1 = ""; // OA单据号   OA传过来，用于联查单据
+        String zyx2 = ""; // 提交人    提交人姓名
+        String zyx3 = ""; // OA核销单号
+        String zyx5 = ""; // OARequestID
+        String zyx8="";//银行付款备注
+//        String zyx9=requestInfo.getRequestManager().getRequestname();//标题
+        String zyx9=requestInfo.getRequestManager().getRequestname().length()>140?requestInfo.getRequestManager().getRequestname().substring(0,140):requestInfo.getRequestManager().getRequestname();//标题
+
+        String tablecode = "arap_bxbusitem";
+        
+        RecordSet rs = new RecordSet();
+        try {
+            String sql = " select *  from " + mainTable + " where requestid='" + requestId + "'";
+            rs.execute(sql);
+            while (rs.next()) {
+                mainId = Util.null2String(rs.getString("id"));
+                isShowErrorMsg = Util.null2String(rs.getString("xrnccsbcsfts"));
+                xm = Util.null2String(rs.getString("xm")); // 借款报销人（取流程申请人）
+                sfyfp = Util.null2String(rs.getString("sfyfp")); // 是否有发票
+                pk_org = Util.null2String(rs.getString("gsmc")); // 公司名称
+                total = Util.null2String(rs.getString("jshjje")); // 报销金额   金额由表体相应字段汇总得出
+                fygsbm = Util.null2String(rs.getString("sqrbm")); // 申请部门
+//                djrq = Util.null2String(rs.getString("cjrq")); // 单据日期   yyyy-mm-dd hh:mm:ss
+                fkfs = Util.null2String(rs.getString("fkfs")); // 付款方式
+                hbbm = Util.null2String(rs.getString("gysmc")); // 收款人，供应商编码
+                custaccount = Util.null2String(rs.getString("yxhm")); // 收款人银行账号
+                zyx8 = Util.null2String(rs.getString("yxfkbz")); //银行付款备注
+                fkyhzh = Util.null2String(rs.getString("")); // 付款银行账户 传输编码
+                zy = Util.null2String(rs.getString("fksm")); // 付款说明
+                
+                fjzs = Util.null2String(rs.getString("fjzs")); // 附件张数   需业务人员在OA上传附件同时填写附件张数后传数据到NCC
+                zyx1 = Util.null2String(rs.getString("lcbh")); // OA单据号   OA传过来，用于联查单据
+                zyx2 = Util.null2String(rs.getString("xm")); // 提交人    提交人姓名
+                zyx3 = Util.null2String(rs.getString("")); // OA核销单号
+                zyx5 = requestId; // OARequestID
+
+            }
+            kjqj = djrq.substring(5,7); //  会计期间
+            kjnd = djrq.substring(0,4); // 会计年度
+            //根据部门ID查询部门编码
+//            deptid=BaseUtil.getBaseInfoByParm("BM", "uf_dept_ncc", "id", fygsbm, "");
+            deptid=BaseUtil.getBaseInfoByParm("departmentcode", "hrmdepartment", "id", fygsbm, "");
+            //获取员工默认的组织对应的类型
+            String userDefaultCompanyType=BaseUtil.getBaseInfoByParm("company_type", "v_oa_user_org_nsrsbh", "userid", xm, "");
+            //获取付款单选择的组织对应的类型
+            String selectCompanyType=BaseUtil.getBaseInfoByParm("company_type", "uf_businessunit", "code", pk_org, "");
+            log.writeLog("userDefaultCompanyType------>" + userDefaultCompanyType);
+            log.writeLog("selectCompanyType------>" + selectCompanyType);
+            //跨组织，则说明代理区向总部申请付款
+            if(!userDefaultCompanyType.equals(selectCompanyType)){
+            	//查询建模维护的对应关系
+            	String defaultDeptNo=BaseUtil.getBaseInfoByParm("mroabmbm", "uf_kzzfkdybmsz", "sqgslx", userDefaultCompanyType, " and fkgslx='"+selectCompanyType+"'");
+            	log.writeLog("defaultDeptNo------>" + defaultDeptNo);
+            	if(!"".equals(defaultDeptNo)){
+            		deptid=defaultDeptNo;
+            	}
+            }
+            //截取前120位
+            if(zy.length()>120){
+            	zy=zy.substring(0,120);
+            }
+            
+            if("1".equals(fkfs)){
+            	jsfs = "0"; //现金
+            }
+            jkbxr = new ResourceComInfo().getWorkcode(xm); //借款报销人工号(即申请人工号)
+            operator = loginid;//当前节点操作者
+            //获取UUID
+            String uuid=UUID.randomUUID().toString().replace("-", "").toUpperCase();
+            log.writeLog("receiver------>"+receiver);
+            
+            //查询抵扣明细
+            sql = " select *  from " + mainTable + "_dt1 where mainid='" + mainId + "'";
+            rs.execute(sql);
+            while (rs.next()) {
+            	zyx3+=Util.null2String(rs.getString("yflcbh"))+",";
+            }
+            //将预付流程编号赋值到zyx3字段中
+            if(!"".equals(zyx3)){
+            	zyx3=zyx3.substring(0,zyx3.length()-1);
+            }
+            
+            //没有发票时，则对应NCC的对公借款单
+            if("1".equals(sfyfp)){
+            	djlxbm = "263X-Cxx-DGJKD"; // 单据类型编码
+            	djlxmc = "对公借款单"; 
+            	tablecode = "jk_busitem";
+            	//url = baseUrl+"/dcoaapi/billLoan/receiveData";
+            	url = baseUrl+"/dcnccapi/billLoan/receiveData";
+            	borrowOrder.setUuid(uuid);
+                borrowOrder.setPk_org(pk_org);
+                borrowOrder.setTotal(total);
+                borrowOrder.setDeptid(deptid);
+                borrowOrder.setDjlxbm(djlxbm);
+                borrowOrder.setDjrq(djrq);
+                borrowOrder.setPayflag(payflag);
+                borrowOrder.setPaytarget(paytarget);
+                borrowOrder.setHbbm(deptid);
+                borrowOrder.setReceiver(receiver);
+                borrowOrder.setHbbm(hbbm);
+                borrowOrder.setSkyhzh(skyhzh);
+                borrowOrder.setCustaccount(custaccount);
+                borrowOrder.setJkbxr(jkbxr);
+                borrowOrder.setOperator(operator);
+                borrowOrder.setJsfs(jsfs);
+                borrowOrder.setFkyhzh(fkyhzh);
+                
+                borrowOrder.setZy(zy);
+                borrowOrder.setDjzt("1");
+                borrowOrder.setKjqj(kjqj);
+                borrowOrder.setKjnd(kjnd);
+                borrowOrder.setZyx1(zyx1);
+                borrowOrder.setZyx2(zyx2);
+                borrowOrder.setZyx3(zyx3);
+                borrowOrder.setZyx5(zyx5);
+                borrowOrder.setZyx8(zyx8);
+                borrowOrder.setZyx9(zyx9);
+//                borrowOrder.setDeptidIsNeedConvert("no");
+            }else{
+            	reimbursementOrder.setUuid(uuid);
+                reimbursementOrder.setPk_org(pk_org);
+                reimbursementOrder.setTotal(total);
+                reimbursementOrder.setDeptid(deptid);
+                reimbursementOrder.setDjlxbm(djlxbm);
+                reimbursementOrder.setDjrq(djrq);
+                reimbursementOrder.setPayflag(payflag);
+                reimbursementOrder.setPaytarget(paytarget);
+                reimbursementOrder.setReceiver(receiver);
+                reimbursementOrder.setHbbm(hbbm);
+                reimbursementOrder.setSkyhzh(skyhzh);
+                reimbursementOrder.setCustaccount(custaccount);
+                reimbursementOrder.setJkbxr(jkbxr);
+                reimbursementOrder.setOperator(operator);
+                reimbursementOrder.setJsfs(jsfs);
+                reimbursementOrder.setFkyhzh(fkyhzh);
+                reimbursementOrder.setJobid(jobid);
+                reimbursementOrder.setZy(zy);
+                reimbursementOrder.setKjqj(kjqj);
+                reimbursementOrder.setKjnd(kjnd);
+                reimbursementOrder.setFjzs(fjzs);
+                reimbursementOrder.setZyx1(zyx1);
+                reimbursementOrder.setZyx2(zyx2);
+                reimbursementOrder.setZyx3(zyx3);
+                reimbursementOrder.setZyx5(zyx5);
+                reimbursementOrder.setZyx8(zyx8);
+                reimbursementOrder.setZyx9(zyx9);
+//                reimbursementOrder.setDeptidIsNeedConvert("no");
+            }
+            log.writeLog("【header数据准备完毕...】");
+            
+            //获取OA-NCC发票映射关系表
+            Map<String,String> map_oafplx_nccfplcx=BaseUtil.getMapKeyValueInfoByParm("uf_oafplx_nccfplx", "", "oafplxid", "nccfplxbm");
+            
+            //对公报销
+            List<ReimbursementOrderBodyYY> reimbursementOrderBodyList = new ArrayList<ReimbursementOrderBodyYY>();
+            //对公借款
+            List<BorrowOrderBodyYY> borrowOrderBodyList = new ArrayList<BorrowOrderBodyYY>();
+            int rowno = 0;
+            rs.execute(" select b.bm as szxmid,c.INVOICECODE,c.INVOICENUMBER,c.invoicetype,a.* from " + mainTable + "_dt2 a "
+            		+ "left join uf_fylx b on to_char(a.fylx)=to_char(b.id) "
+            		+ "left join fnainvoiceledger c on a.fphm=c.id "
+            		+ "where a.mainid = " + mainId);
+            while (rs.next()) {
+                
+                String jobid1 = ""; // 项目
+                String fycdbm = Util.null2String(rs.getString("fycdbm")); //费用承担部门
+                String amount = Util.null2String(rs.getString("je")); // 付款
+                String defitem36 = Util.null2o(rs.getString("fpje")); // 发票金额
+                String tax_rate = Util.null2String(rs.getString("sl")); // 税率 3%
+                String tax_amount = Util.null2String(rs.getString("se")); // 税额
+                String tni_amount = Util.null2String(rs.getString("bhsje")); // 无税金额
+                String szxmid = Util.null2String(rs.getString("szxmid")); // 收支项目  0101 汽车费用
+                String fpdm = Util.null2String(rs.getString("INVOICECODE")); // 发票代码
+                String fphm = Util.null2String(rs.getString("INVOICENUMBER")); // 发票号码
+                String invoicetype = Util.null2String(rs.getString("invoicetype")); // OA发票类型
+                //NCC发票类型
+                String fplxpk=Util.null2String(map_oafplx_nccfplcx.get(invoicetype));
+                
+//                String fphmId = Util.null2String(rs.getString("fphm")); // 发票号码
+//                if(!"".equals(fphmId)){
+//                	// 得到浏览按钮中发票号码的id,再去数据库中把发票号码和发票代码查出来
+//                	rsFna.execute(" select * from fnainvoiceledger where id = " + fphmId);
+//                    while (rsFna.next()) {
+//                        fpdm = Util.null2String(rsFna.getString("INVOICECODE")); // 发票代码
+//                        fphm = Util.null2String(rsFna.getString("INVOICENUMBER")); // 发票号码
+//                        fplxpk = Util.null2String(map_oafplx_nccfplcx.get(Util.null2String(rsFna.getString("invoicetype")))); // OA发票类型
+//                    }
+//                }
+                //发票金额为空时，默认等于付款金额
+                if(Double.parseDouble(defitem36)==0){
+                	defitem36=amount;
+                }
+                
+                String defitem46 = Util.null2String(rs.getString("wd")); // 网点（成本中心）
+                String defitem45 = Util.null2String(rs.getString("gj")); // 国家
+                String defitem44 = Util.null2String(rs.getString("ck")); // 仓库
+                String defitem43 = Util.null2String(rs.getString("cph")); //车牌号
+                String defitem42 = Util.null2String(rs.getString("id")); // OA明细行ID
+                //根据部门ID查询部门编码(传NCC)
+//                String fycdbm_NCC=BaseUtil.getBaseInfoByParm("bm", "uf_dept_ncc", "id", fycdbm, "");
+                String fycdbm_NCC=fycdbm;
+
+                rowno++;
+                
+                log.writeLog("----fycdbm_NCC:" + fycdbm_NCC);
+                log.writeLog("----amount:" + amount);
+                log.writeLog("----tax_rate:" + tax_rate);
+                log.writeLog("----tax_amount:" + tax_amount);
+                log.writeLog("----tni_amount:" + tni_amount);
+//                log.writeLog("----defitem48:" + defitem48);
+
+                //没有发票时，则对应NCC的对公借款单
+                if("1".equals(sfyfp)){
+                	BorrowOrderBodyYY body = new BorrowOrderBodyYY();
+               	 	body.setAmount(amount);
+                    body.setTablecode(tablecode);
+                    body.setRowno(rowno+"");
+                    body.setSzxmid(szxmid);
+                    body.setDefitem50("");
+                    body.setDefitem49("");
+                    body.setDefitem42(defitem42);
+                    body.setDefitem43(defitem43);
+                    body.setDefitem44(defitem44);
+                    body.setDefitem45(defitem45);
+                    body.setDefitem46(defitem46);
+                    body.setDefitem48(fycdbm_NCC);
+                    body.setDefitem48IsNeedConvert("no");
+                    borrowOrderBodyList.add(body);
+                }else{
+                	ReimbursementOrderBodyYY body = new ReimbursementOrderBodyYY();
+                	body.setJobid(jobid1);
+                    body.setDeptid(fycdbm_NCC);
+                    body.setAmount(amount);
+                    body.setTax_rate(tax_rate);
+                    body.setTax_amount(tax_amount);
+                    body.setTni_amount(tni_amount);
+                    body.setTablecode(tablecode);
+                    body.setRowno(rowno+"");
+                    body.setSzxmid(szxmid);
+                    body.setFpdm(fpdm);
+                    body.setFphm(fphm);
+                    body.setFplxpk(fplxpk);
+                    body.setDefitem36(defitem36);
+                    body.setDefitem46(defitem46);
+                    body.setDefitem45(defitem45);
+                    body.setDefitem44(defitem44);
+                    body.setDefitem43(defitem43);
+                    body.setDeptidIsNeedConvert("no");
+                    body.setDefitem42(defitem42);
+                    //body.setDefitem48(fycdbm_NCC);
+                    reimbursementOrderBodyList.add(body);
+                }
+            }
+
+            String parm="";
+            //没有发票时，则对应NCC的对公借款单
+            if("1".equals(sfyfp)){
+            	borrowOrder.setJk_busitem(borrowOrderBodyList);
+//                borrowList.add(borrowOrder);
+            	parm=JSONObject.toJSONString(borrowOrder, SerializerFeature.DisableCircularReferenceDetect);
+            	log.writeLog(djlxmc+"准备传入中台的数据为------>" + parm);
+            }else{
+            	reimbursementOrder.setEr_busitem(reimbursementOrderBodyList);
+//                reimbursementList.add(reimbursementOrder);
+            	parm=JSONObject.toJSONString(reimbursementOrder, SerializerFeature.DisableCircularReferenceDetect);
+            	log.writeLog(djlxmc+"准备传入中台的数据为------>" + parm);
+            }
+
+//            JSONObject jsonObject1 = JSONObject.parseObject(parm);
+//            jsonObject1.put("deptidIsNeedConvert", "no");
+//            parm = jsonObject1.toJSONString();
+
+            //获取TOKEN
+            String token = HttpClientToDC.getToken();
+            log.writeLog("获取数据中台的token------>" + token);
+            if ("".equals(Util.null2String(token))) {
+                String tokenMsg="流程提交失败，未获取到数据中台接口TOKEN，请联系管理员处理！";
+            	//将NCC返回结果回写至OA流程表单
+                rs.execute(" update " + mainTable + " set sfcgscnccfkd = 1 ,nccfhxx='" + tokenMsg.replace("'", "''") + "'  where requestid = " + requestId); 
+                //是否需要显示报错信息
+                if("yes".equals(isShowErrorMsg)){
+                	requestInfo.getRequestManager().setMessagecontent(tokenMsg);
+                    return Action.FAILURE_AND_CONTINUE;
+                }else{
+                	return SUCCESS;
+                }
+            }
+            
+            log.writeLog("url:"+url);
+            log.writeLog("token:"+token);
+            log.writeLog("param:"+parm);
+            
+            //调用NCC接口，将数据传给NCC
+            String returndata = HttpClientToDC.sendPostApi(url,token, parm);
+            log.writeLog("【调用数据中台报销接口返回结果result:】" + returndata);
+            if (!"".equals(returndata) && returndata != null) {
+                JSONObject jsonObject = JSONObject.parseObject(returndata);
+                String success = Util.null2String(jsonObject.get("succ"));
+                log.writeLog("--------发送请求返回的success值为：" + success);
+                if ("true".equals(success)) {
+                	JSONObject data = jsonObject.getJSONObject("data");
+                    String billno = Util.null2String(data.get("billno"));//NCC单号
+                    log.writeLog("--------发送请求返回的billno值为：" + billno);
+                    //将NCC返回结果回写至OA流程表单
+                    rs.execute(" update " + mainTable + " set sfcgscnccfkd = 0 , nccfkdh = '" + billno + "',nccfhxx=''  where requestid = " + requestId); 
+                } else {
+                	String message = Util.null2String(jsonObject.get("msg"));
+                	String message2=message.replace("'", "''");
+                	//超出1333个字符，则只截取前面这部分
+                	if(message2.length()>1334){
+                		message2=message2.substring(0,1333);
+                	}
+                	//将NCC返回结果回写至OA流程表单
+                    rs.execute(" update " + mainTable + " set sfcgscnccfkd = 1 ,nccfhxx='" + message2 + "'  where requestid = " + requestId); 
+                    //是否需要显示报错信息
+                    if("yes".equals(isShowErrorMsg)){
+                    	 requestInfo.getRequestManager().setMessagecontent("流程数据写入NCC生成"+djlxmc+"失败,失败信息：<br/>"+message);
+                         return Action.FAILURE_AND_CONTINUE;
+                    }else{
+                    	return SUCCESS;
+                    }
+                }
+            } else {
+            	String ermsg="流程数据写入NCC生成"+djlxmc+"失败,未获取到接口返回结果，请联系系统管理员处理！";
+            	//将NCC返回结果回写至OA流程表单
+                rs.execute(" update " + mainTable + " set sfcgscnccfkd = 1 ,nccfhxx='" + ermsg.replace("'", "''") + "'  where requestid = " + requestId); 
+                //是否需要显示报错信息
+                if("yes".equals(isShowErrorMsg)){
+                	requestInfo.getRequestManager().setMessagecontent(ermsg);
+                    return Action.FAILURE_AND_CONTINUE;
+                }else{
+                	return SUCCESS;
+                }
+            }
+
+        } catch (Exception e) {
+            String ermsg="流程数据生成中台对公报销单/对公借款单失败！" + e.toString();
+        	//将NCC返回结果回写至OA流程表单
+            rs.execute(" update " + mainTable + " set sfcgscnccfkd = 1 ,nccfhxx='" + ermsg.replace("'", "''") + "'  where requestid = " + requestId); 
+            //是否需要显示报错信息
+            if("yes".equals(isShowErrorMsg)){
+            	requestInfo.getRequestManager().setMessagecontent(ermsg);
+                return Action.FAILURE_AND_CONTINUE;
+            }else{
+            	return SUCCESS;
+            }
+        }
+        log.writeLog("--------付款单数据传入中台完毕----requestId值为：" + requestId);
+        return Action.SUCCESS;
+    }
+}
\ No newline at end of file
diff --git a/src/main/youhong_ai_jitu_src/jntchina/action/PayApplicationActionYYGYS.java b/src/main/youhong_ai_jitu_src/jntchina/action/PayApplicationActionYYGYS.java
new file mode 100644
index 0000000..679aff5
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/action/PayApplicationActionYYGYS.java
@@ -0,0 +1,461 @@
+package jntchina.action;
+
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.serializer.SerializerFeature;
+import com.working.util.WorkflowUtil;
+import jntchina.entity.*;
+import jntchina.util.DataBaseUtils;
+import jntchina.util.HttpClientToDC;
+import selfdev.util.base.BaseUtil;
+import selfdev.util.base.TimeCommonUtil;
+import selfdev.util.log.LogTool;
+import weaver.conn.RecordSet;
+import weaver.file.Prop;
+import weaver.general.Util;
+import weaver.hrm.resource.ResourceComInfo;
+import weaver.interfaces.workflow.action.Action;
+import weaver.soa.workflow.request.RequestInfo;
+import weaver.workflow.action.BaseAction;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+
+
+/**
+ * @Author Administrator
+ * @Description 付款申请数据写入中台生成NCC对公报销单或者对公借款单(紜毅)1
+ * @Date 2021/3/2  11:50
+ */
+public class PayApplicationActionYYGYS extends BaseAction {
+    @Override
+    public String execute(RequestInfo requestInfo) {
+        String src = requestInfo.getRequestManager().getSrc();//获取操作方式
+        if (!"submit".equals(src)) { // 只有submit才执行接口
+            return SUCCESS;
+        }
+        LogTool log = new LogTool("/log/selfdev/action", false);
+        String requestId = requestInfo.getRequestid(); // 获取requestid
+        log.writeLog("--------付款申请单数据传入数据中台开始----requestId值为：" + requestId);
+        //获取当前用户的登录账号（即工号）
+        String loginid=requestInfo.getRequestManager().getUser().getLoginid();
+        log.writeLog("loginid-------->"+loginid);
+        //获取配置文件中的参数
+    	String mode = Prop.getPropValue("DevToDC_jntchina","mode");
+        // 服务器ip：port
+        String baseUrl = Prop.getPropValue("DevToDC_jntchina", mode+"_baseUrl");
+        String url = baseUrl+"/dcnccapi/claimForm/receiveData";
+        ReimbursementOrderYY reimbursementOrder = new ReimbursementOrderYY();
+        BorrowOrderYY borrowOrder = new BorrowOrderYY();
+        String mainTable = WorkflowUtil.getMainTable(requestId);
+        String mainId = "";
+        String isShowErrorMsg = "";//写入NCC失败时是否显示报错信息
+        String pk_org = ""; // 报销单位 JTSDCN0001
+        String fygsbm = ""; // 申请部门
+        String total = ""; // 报销金额   金额由表体相应字段汇总得出
+        String deptid = ""; // 部门   传输编码
+        String djlxbm = "264X-Cxx-DGBXD"; // 单据类型编码   对私报销单:264X-Cxx-DSBXD  对公报销单:264X-Cxx-DGBXD
+        String djlxmc = "对公报销单"; // 单据类型名称  默认 对公报销单
+        String djrq = TimeCommonUtil.obtainDate(0); // 单据日期   yyyy-mm-dd hh:mm:ss
+        String payflag = ""; // 支付状态
+        String paytarget = "1"; // 收款对象   0=员工，1=供应商，2=客户，默认为供应商
+        String receiver = ""; // 收款人
+        String skyhzh = ""; // 收款人银行账号
+        String hbbm = ""; // yonyou88", //收款人（供应商）
+        String custaccount= ""; //收款银行账户（供应商）
+        String sfyfp = ""; // 是否有发票
+        String jkbxr = ""; // 借款报销人   传输编码
+        String operator = ""; // 录入人
+        String xm= ""; // 申请人
+        String jsfs = "3"; // 结算方式 3 网银
+        String fkfs = ""; // 付款方式
+        String fkyhzh = ""; // 单位银行账户 传输编码
+        String jobid = ""; // 项目
+        String zy = ""; // 报销事由
+        String kjqj = ""; // 会计期间
+        String kjnd = ""; // 会计年度
+        String fjzs = ""; // 附件张数   需业务人员在OA上传附件同时填写附件张数后传数据到NCC
+        String zyx1 = ""; // OA单据号   OA传过来，用于联查单据
+        String zyx2 = ""; // 提交人    提交人姓名
+        String zyx3 = ""; // OA核销单号
+        String zyx5 = ""; // OARequestID
+        String zyx8="";//银行付款备注
+//        String zyx9=requestInfo.getRequestManager().getRequestname();//标题
+        String zyx9=requestInfo.getRequestManager().getRequestname().length()>140?requestInfo.getRequestManager().getRequestname().substring(0,140):requestInfo.getRequestManager().getRequestname();//标题
+
+        String tablecode = "arap_bxbusitem";
+        
+        RecordSet rs = new RecordSet();
+        try {
+            String sql = " select *  from " + mainTable + " where requestid='" + requestId + "'";
+            rs.execute(sql);
+            while (rs.next()) {
+                mainId = Util.null2String(rs.getString("id"));
+                isShowErrorMsg = Util.null2String(rs.getString("xrnccsbcsfts"));
+                xm = Util.null2String(rs.getString("xm")); // 借款报销人（取流程申请人）
+                sfyfp = Util.null2String(rs.getString("sfyfp")); // 是否有发票
+                pk_org = Util.null2String(rs.getString("gsmc")); // 公司名称
+                total = Util.null2String(rs.getString("jshjje")); // 报销金额   金额由表体相应字段汇总得出
+                fygsbm = Util.null2String(rs.getString("sqrbm")); // 申请部门
+//                djrq = Util.null2String(rs.getString("cjrq")); // 单据日期   yyyy-mm-dd hh:mm:ss
+                fkfs = Util.null2String(rs.getString("fkfs")); // 付款方式
+                hbbm = Util.null2String(rs.getString("gysmc")); // 收款人，供应商编码
+                custaccount = Util.null2String(rs.getString("yxhm")); // 收款人银行账号
+                zyx8 = Util.null2String(rs.getString("yxfkbz")); //银行付款备注
+                fkyhzh = Util.null2String(rs.getString("")); // 付款银行账户 传输编码
+                zy = Util.null2String(rs.getString("fksm")); // 付款说明
+                
+                fjzs = Util.null2String(rs.getString("fjzs")); // 附件张数   需业务人员在OA上传附件同时填写附件张数后传数据到NCC
+                zyx1 = Util.null2String(rs.getString("lcbh")); // OA单据号   OA传过来，用于联查单据
+                zyx2 = Util.null2String(rs.getString("xm")); // 提交人    提交人姓名
+                zyx3 = Util.null2String(rs.getString("")); // OA核销单号
+                zyx5 = requestId; // OARequestID
+
+            }
+            kjqj = djrq.substring(5,7); //  会计期间
+            kjnd = djrq.substring(0,4); // 会计年度
+            //根据部门ID查询部门编码
+//            deptid=BaseUtil.getBaseInfoByParm("BM", "uf_dept_ncc", "id", fygsbm, "");
+            deptid=BaseUtil.getBaseInfoByParm("departmentcode", "hrmdepartment", "id", fygsbm, "");
+            //获取员工默认的组织对应的类型
+            String userDefaultCompanyType=BaseUtil.getBaseInfoByParm("company_type", "v_oa_user_org_nsrsbh", "userid", xm, "");
+            //获取付款单选择的组织对应的类型
+            String selectCompanyType=BaseUtil.getBaseInfoByParm("company_type", "uf_businessunit", "code", pk_org, "");
+            log.writeLog("userDefaultCompanyType------>" + userDefaultCompanyType);
+            log.writeLog("selectCompanyType------>" + selectCompanyType);
+            //跨组织，则说明代理区向总部申请付款
+            if(!userDefaultCompanyType.equals(selectCompanyType)){
+            	//查询建模维护的对应关系
+            	String defaultDeptNo=BaseUtil.getBaseInfoByParm("mroabmbm", "uf_kzzfkdybmsz", "sqgslx", userDefaultCompanyType, " and fkgslx='"+selectCompanyType+"'");
+            	log.writeLog("defaultDeptNo------>" + defaultDeptNo);
+            	if(!"".equals(defaultDeptNo)){
+            		deptid=defaultDeptNo;
+            	}
+            }
+            //截取前120位
+            if(zy.length()>120){
+            	zy=zy.substring(0,120);
+            }
+            
+            if("1".equals(fkfs)){
+            	jsfs = "0"; //现金
+            }
+            jkbxr = new ResourceComInfo().getWorkcode(xm); //借款报销人工号(即申请人工号)
+            operator = loginid;//当前节点操作者
+            //获取UUID
+            String uuid=UUID.randomUUID().toString().replace("-", "").toUpperCase();
+            log.writeLog("receiver------>"+receiver);
+            
+            //查询抵扣明细
+            sql = " select *  from " + mainTable + "_dt1 where mainid='" + mainId + "'";
+            rs.execute(sql);
+            while (rs.next()) {
+            	zyx3+=Util.null2String(rs.getString("yflcbh"))+",";
+            }
+            //将预付流程编号赋值到zyx3字段中
+            if(!"".equals(zyx3)){
+            	zyx3=zyx3.substring(0,zyx3.length()-1);
+            }
+            
+            //没有发票时，则对应NCC的对公借款单
+            if("1".equals(sfyfp)){
+            	djlxbm = "263X-Cxx-DGJKD"; // 单据类型编码
+            	djlxmc = "对公借款单"; 
+            	tablecode = "jk_busitem";
+            	//url = baseUrl+"/dcoaapi/billLoan/receiveData";
+            	url = baseUrl+"/dcnccapi/billLoan/receiveData";
+            	borrowOrder.setUuid(uuid);
+                borrowOrder.setPk_org(pk_org);
+                borrowOrder.setTotal(total);
+                borrowOrder.setDeptid(deptid);
+                borrowOrder.setDjlxbm(djlxbm);
+                borrowOrder.setDjrq(djrq);
+                borrowOrder.setPayflag(payflag);
+                borrowOrder.setPaytarget(paytarget);
+                borrowOrder.setHbbm(deptid);
+                borrowOrder.setReceiver(receiver);
+                borrowOrder.setHbbm(hbbm);
+                borrowOrder.setSkyhzh(skyhzh);
+                borrowOrder.setCustaccount(custaccount);
+                borrowOrder.setJkbxr(jkbxr);
+                borrowOrder.setOperator(operator);
+                borrowOrder.setJsfs(jsfs);
+                borrowOrder.setFkyhzh(fkyhzh);
+                
+                borrowOrder.setZy(zy);
+                borrowOrder.setDjzt("1");
+                borrowOrder.setKjqj(kjqj);
+                borrowOrder.setKjnd(kjnd);
+                borrowOrder.setZyx1(zyx1);
+                borrowOrder.setZyx2(zyx2);
+                borrowOrder.setZyx3(zyx3);
+                borrowOrder.setZyx5(zyx5);
+                borrowOrder.setZyx8(zyx8);
+                borrowOrder.setZyx9(zyx9);
+//                borrowOrder.setDeptidIsNeedConvert("no");
+            }else{
+            	reimbursementOrder.setUuid(uuid);
+                reimbursementOrder.setPk_org(pk_org);
+                reimbursementOrder.setTotal(total);
+                reimbursementOrder.setDeptid(deptid);
+                reimbursementOrder.setDjlxbm(djlxbm);
+                reimbursementOrder.setDjrq(djrq);
+                reimbursementOrder.setPayflag(payflag);
+                reimbursementOrder.setPaytarget(paytarget);
+                reimbursementOrder.setReceiver(receiver);
+                reimbursementOrder.setHbbm(hbbm);
+                reimbursementOrder.setSkyhzh(skyhzh);
+                reimbursementOrder.setCustaccount(custaccount);
+                reimbursementOrder.setJkbxr(jkbxr);
+                reimbursementOrder.setOperator(operator);
+                reimbursementOrder.setJsfs(jsfs);
+                reimbursementOrder.setFkyhzh(fkyhzh);
+                reimbursementOrder.setJobid(jobid);
+                reimbursementOrder.setZy(zy);
+                reimbursementOrder.setKjqj(kjqj);
+                reimbursementOrder.setKjnd(kjnd);
+                reimbursementOrder.setFjzs(fjzs);
+                reimbursementOrder.setZyx1(zyx1);
+                reimbursementOrder.setZyx2(zyx2);
+                reimbursementOrder.setZyx3(zyx3);
+                reimbursementOrder.setZyx5(zyx5);
+                reimbursementOrder.setZyx8(zyx8);
+                reimbursementOrder.setZyx9(zyx9);
+//                reimbursementOrder.setDeptidIsNeedConvert("no");
+            }
+            log.writeLog("【header数据准备完毕...】");
+            
+            //获取OA-NCC发票映射关系表
+            Map<String,String> map_oafplx_nccfplcx=BaseUtil.getMapKeyValueInfoByParm("uf_oafplx_nccfplx", "", "oafplxid", "nccfplxbm");
+            
+            //对公报销
+            List<ReimbursementOrderBodyYY> reimbursementOrderBodyList = new ArrayList<ReimbursementOrderBodyYY>();
+            //对公借款
+            List<BorrowOrderBodyYY> borrowOrderBodyList = new ArrayList<BorrowOrderBodyYY>();
+            int rowno = 0;
+            rs.execute(" select b.bm as szxmid,c.INVOICECODE,c.INVOICENUMBER,c.invoicetype,a.* from " + mainTable + "_dt2 a "
+            		+ "left join uf_fylx b on to_char(a.fylx)=to_char(b.id) "
+            		+ "left join fnainvoiceledger c on a.fphm=c.id "
+            		+ "where a.mainid = " + mainId);
+            while (rs.next()) {
+                
+                String jobid1 = ""; // 项目
+                String fycdbm = Util.null2String(rs.getString("fycdbm")); //费用承担部门
+                String amount = Util.null2String(rs.getString("je")); // 付款
+                String defitem36 = Util.null2o(rs.getString("fpje")); // 发票金额
+                String tax_rate = Util.null2String(rs.getString("sl")); // 税率 3%
+                String tax_amount = Util.null2String(rs.getString("se")); // 税额
+                String tni_amount = Util.null2String(rs.getString("bhsje")); // 无税金额
+                String szxmid = Util.null2String(rs.getString("szxmid")); // 收支项目  0101 汽车费用
+                String fpdm = Util.null2String(rs.getString("INVOICECODE")); // 发票代码
+                String fphm = Util.null2String(rs.getString("INVOICENUMBER")); // 发票号码
+                String invoicetype = Util.null2String(rs.getString("invoicetype")); // OA发票类型
+                //NCC发票类型
+                String fplxpk=Util.null2String(map_oafplx_nccfplcx.get(invoicetype));
+                
+//                String fphmId = Util.null2String(rs.getString("fphm")); // 发票号码
+//                if(!"".equals(fphmId)){
+//                	// 得到浏览按钮中发票号码的id,再去数据库中把发票号码和发票代码查出来
+//                	rsFna.execute(" select * from fnainvoiceledger where id = " + fphmId);
+//                    while (rsFna.next()) {
+//                        fpdm = Util.null2String(rsFna.getString("INVOICECODE")); // 发票代码
+//                        fphm = Util.null2String(rsFna.getString("INVOICENUMBER")); // 发票号码
+//                        fplxpk = Util.null2String(map_oafplx_nccfplcx.get(Util.null2String(rsFna.getString("invoicetype")))); // OA发票类型
+//                    }
+//                }
+                //发票金额为空时，默认等于付款金额
+                if(Double.parseDouble(defitem36)==0){
+                	defitem36=amount;
+                }
+                
+                String defitem46 = Util.null2String(rs.getString("wd")); // 网点（成本中心）
+                String defitem45 = Util.null2String(rs.getString("gj")); // 国家
+                String defitem44 = Util.null2String(rs.getString("ck")); // 仓库
+                String defitem43 = Util.null2String(rs.getString("cph")); //车牌号
+                String defitem42 = Util.null2String(rs.getString("id")); // OA明细行ID
+                //根据部门ID查询部门编码(传NCC)
+//                String fycdbm_NCC=BaseUtil.getBaseInfoByParm("bm", "uf_dept_ncc", "id", fycdbm, "");
+                String fycdbm_NCC=fycdbm;
+
+                rowno++;
+                
+                log.writeLog("----fycdbm_NCC:" + fycdbm_NCC);
+                log.writeLog("----amount:" + amount);
+                log.writeLog("----tax_rate:" + tax_rate);
+                log.writeLog("----tax_amount:" + tax_amount);
+                log.writeLog("----tni_amount:" + tni_amount);
+//                log.writeLog("----defitem48:" + defitem48);
+
+                //没有发票时，则对应NCC的对公借款单
+                if("1".equals(sfyfp)){
+                	BorrowOrderBodyYY body = new BorrowOrderBodyYY();
+               	 	body.setAmount(amount);
+                    body.setTablecode(tablecode);
+                    body.setRowno(rowno+"");
+                    body.setSzxmid(szxmid);
+                    body.setDefitem50("");
+                    body.setDefitem49("");
+                    body.setDefitem42(defitem42);
+                    body.setDefitem43(defitem43);
+                    body.setDefitem44(defitem44);
+                    body.setDefitem45(defitem45);
+                    body.setDefitem46(defitem46);
+                    body.setDefitem48(fycdbm_NCC);
+                    body.setDefitem48IsNeedConvert("no");
+                    borrowOrderBodyList.add(body);
+                }else{
+                	ReimbursementOrderBodyYY body = new ReimbursementOrderBodyYY();
+                	body.setJobid(jobid1);
+                    body.setDeptid(fycdbm_NCC);
+                    body.setAmount(amount);
+                    body.setTax_rate(tax_rate);
+                    body.setTax_amount(tax_amount);
+                    body.setTni_amount(tni_amount);
+                    body.setTablecode(tablecode);
+                    body.setRowno(rowno+"");
+                    body.setSzxmid(szxmid);
+                    body.setFpdm(fpdm);
+                    body.setFphm(fphm);
+                    body.setFplxpk(fplxpk);
+                    body.setDefitem36(defitem36);
+                    body.setDefitem46(defitem46);
+                    body.setDefitem45(defitem45);
+                    body.setDefitem44(defitem44);
+                    body.setDefitem43(defitem43);
+                    body.setDeptidIsNeedConvert("no");
+                    body.setDefitem42(defitem42);
+                    //body.setDefitem48(fycdbm_NCC);
+                    reimbursementOrderBodyList.add(body);
+                }
+            }
+            List<ErBxcontrast> erBxcontrasts = new ArrayList<>();
+            String parm="";
+            //没有发票时，则对应NCC的对公借款单
+            if("1".equals(sfyfp)){
+            	borrowOrder.setJk_busitem(borrowOrderBodyList);
+//                borrowList.add(borrowOrder);
+            	parm=JSONObject.toJSONString(borrowOrder, SerializerFeature.DisableCircularReferenceDetect);
+            	log.writeLog(djlxmc+"准备传入中台的数据为------>" + parm);
+            }else{
+            	reimbursementOrder.setEr_busitem(reimbursementOrderBodyList);
+
+                RecordSet rs4 = new RecordSet();
+                String sql1 = "select * from " + mainTable + "_dt1 where mainid = " + mainId;
+                log.writeLog("查询当前单据是否有抵扣信息sql-----> " + sql1);
+                rs.execute(sql1);
+                while(rs.next()){
+                    String yfkqptzmxid = Util.null2String(rs.getString("yfkqptzmxid"));  //预付欠票台账id
+                    String yfklcmxid = Util.null2String(rs.getString("yfklcmxid"));  //预付款流程明细id
+                    String sql2 = "select fylx from uf_gysqktzyy_dt1 where id = " + yfkqptzmxid;
+                    String fylx = "";
+                    rs4.execute(sql2);
+                    if(rs4.next()){
+                        fylx = Util.null2String(rs4.getString("fylx"));
+                    }
+                    fylx = DataBaseUtils.getFirstValue("select BM from uf_fylx where id = " + fylx);
+                    String nccdh = Util.null2String(rs.getString("nccdh"));//ncc单号
+                    String bcdjje = Util.null2o(rs.getString("bcdjje"));  //本次抵扣金额
+                    ErBxcontrast erBxcontrast = new ErBxcontrast(nccdh, fylx, bcdjje, yfklcmxid, yfkqptzmxid);
+                    erBxcontrasts.add(erBxcontrast);
+                }
+//                reimbursementOrder.setEr_busitem(reimbursementOrderBodyList);
+                reimbursementOrder.setEr_bxcontrast(erBxcontrasts);
+            	
+
+
+
+//                reimbursementList.add(reimbursementOrder);
+            	parm=JSONObject.toJSONString(reimbursementOrder, SerializerFeature.DisableCircularReferenceDetect);
+
+
+
+
+
+
+            	log.writeLog(djlxmc+"准备传入中台的数据为------>" + parm);
+            }
+
+//            JSONObject jsonObject1 = JSONObject.parseObject(parm);
+//            jsonObject1.put("deptidIsNeedConvert", "no");
+//            parm = jsonObject1.toJSONString();
+
+            //获取TOKEN
+            String token = HttpClientToDC.getToken();
+            log.writeLog("获取数据中台的token------>" + token);
+            if ("".equals(Util.null2String(token))) {
+                String tokenMsg="流程提交失败，未获取到数据中台接口TOKEN，请联系管理员处理！";
+            	//将NCC返回结果回写至OA流程表单
+                rs.execute(" update " + mainTable + " set sfcgscnccfkd = 1 ,nccfhxx='" + tokenMsg.replace("'", "''") + "'  where requestid = " + requestId); 
+                //是否需要显示报错信息
+                if("yes".equals(isShowErrorMsg)){
+                	requestInfo.getRequestManager().setMessagecontent(tokenMsg);
+                    return Action.FAILURE_AND_CONTINUE;
+                }else{
+                	return SUCCESS;
+                }
+            }
+            
+            log.writeLog("url:"+url);
+            log.writeLog("token:"+token);
+            log.writeLog("param:"+parm);
+            
+            //调用NCC接口，将数据传给NCC
+            String returndata = HttpClientToDC.sendPostApi(url,token, parm);
+            log.writeLog("【调用数据中台报销接口返回结果result:】" + returndata);
+            if (!"".equals(returndata) && returndata != null) {
+                JSONObject jsonObject = JSONObject.parseObject(returndata);
+                String success = Util.null2String(jsonObject.get("succ"));
+                log.writeLog("--------发送请求返回的success值为：" + success);
+                if ("true".equals(success)) {
+                	JSONObject data = jsonObject.getJSONObject("data");
+                    String billno = Util.null2String(data.get("billno"));//NCC单号
+                    log.writeLog("--------发送请求返回的billno值为：" + billno);
+                    //将NCC返回结果回写至OA流程表单
+                    rs.execute(" update " + mainTable + " set sfcgscnccfkd = 0 , nccfkdh = '" + billno + "',nccfhxx=''  where requestid = " + requestId); 
+                } else {
+                	String message = Util.null2String(jsonObject.get("msg"));
+                	String message2=message.replace("'", "''");
+                	//超出1333个字符，则只截取前面这部分
+                	if(message2.length()>1334){
+                		message2=message2.substring(0,1333);
+                	}
+                	//将NCC返回结果回写至OA流程表单
+                    rs.execute(" update " + mainTable + " set sfcgscnccfkd = 1 ,nccfhxx='" + message2 + "'  where requestid = " + requestId); 
+                    //是否需要显示报错信息
+                    if("yes".equals(isShowErrorMsg)){
+                    	 requestInfo.getRequestManager().setMessagecontent("流程数据写入NCC生成"+djlxmc+"失败,失败信息：<br/>"+message);
+                         return Action.FAILURE_AND_CONTINUE;
+                    }else{
+                    	return SUCCESS;
+                    }
+                }
+            } else {
+            	String ermsg="流程数据写入NCC生成"+djlxmc+"失败,未获取到接口返回结果，请联系系统管理员处理！";
+            	//将NCC返回结果回写至OA流程表单
+                rs.execute(" update " + mainTable + " set sfcgscnccfkd = 1 ,nccfhxx='" + ermsg.replace("'", "''") + "'  where requestid = " + requestId); 
+                //是否需要显示报错信息
+                if("yes".equals(isShowErrorMsg)){
+                	requestInfo.getRequestManager().setMessagecontent(ermsg);
+                    return Action.FAILURE_AND_CONTINUE;
+                }else{
+                	return SUCCESS;
+                }
+            }
+
+        } catch (Exception e) {
+            String ermsg="流程数据生成中台对公报销单/对公借款单失败！" + e.toString();
+        	//将NCC返回结果回写至OA流程表单
+            rs.execute(" update " + mainTable + " set sfcgscnccfkd = 1 ,nccfhxx='" + ermsg.replace("'", "''") + "'  where requestid = " + requestId); 
+            //是否需要显示报错信息
+            if("yes".equals(isShowErrorMsg)){
+            	requestInfo.getRequestManager().setMessagecontent(ermsg);
+                return Action.FAILURE_AND_CONTINUE;
+            }else{
+            	return SUCCESS;
+            }
+        }
+        log.writeLog("--------付款单数据传入中台完毕----requestId值为：" + requestId);
+        return Action.SUCCESS;
+    }
+}
\ No newline at end of file
diff --git a/src/main/youhong_ai_jitu_src/jntchina/action/PayApplicationDataValid.java b/src/main/youhong_ai_jitu_src/jntchina/action/PayApplicationDataValid.java
new file mode 100644
index 0000000..c240040
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/action/PayApplicationDataValid.java
@@ -0,0 +1,189 @@
+package jntchina.action;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.util.HashMap;
+import java.util.Map;
+
+import com.working.util.WorkflowUtil;
+
+import selfdev.util.log.LogTool;
+import weaver.conn.RecordSet;
+import weaver.general.Util;
+import weaver.interfaces.workflow.action.Action;
+import weaver.interfaces.workflow.action.BaseAction;
+import weaver.soa.workflow.request.RequestInfo;
+
+/**
+ * @Author KangMD
+ * @Description 付款流程提交时数据校验
+ * @Date 2021/6/7  16:27
+ */
+public class PayApplicationDataValid extends BaseAction {
+
+    @Override
+    public String execute(RequestInfo requestInfo) {
+
+        String src = requestInfo.getRequestManager().getSrc();//获取操作方式
+        if (!"submit".equals(src)) { // 只有submit才执行接口
+            return SUCCESS;
+        }
+
+        LogTool log = new LogTool("/log/selfdev/action", false);
+        String requestId = requestInfo.getRequestid(); // 获取requestid
+        log.writeLog("--------付款单数据校验开始----requestId值为：" + requestId);
+
+        RecordSet rs = new RecordSet();
+        RecordSet rs2 = new RecordSet();
+        RecordSet rs3 = new RecordSet();
+        String mainTable = WorkflowUtil.getMainTable(requestId);
+        String mainId = "";
+        String sql = " select id  from " + mainTable + " where requestid='" + requestId + "'";
+        rs.execute(sql);
+        while (rs.next()) {
+            mainId = Util.null2String(rs.getString("id"));
+        }
+
+        StringBuilder message = new StringBuilder();
+
+        //查询是否有发票被多行分摊
+        sql="select fphm  from " + mainTable + "_dt2  where fphm is not null and mainid="+mainId+" group by fphm having count(*)>1";
+        rs.execute(sql);
+        int row=rs.getCounts();
+        if(row>0){
+        	while(rs.next()){
+        		BigDecimal bd_temp=new BigDecimal("0");
+        		String fphm=Util.null2String(rs.getString("fphm"));//发票号码
+        		String sql2="select a.*,b.invoicecode,b.invoicenumber,b.taxincludedprice,b.tax from " + mainTable + "_dt2 a,fnainvoiceledger b where a.mainid="+mainId+" and a.fphm=b.id and a.fphm ='"+fphm+"'";
+        		rs2.execute(sql2);
+        		int row2=rs2.getCounts();
+        		int temp2=0;
+        		while(rs2.next()){
+        			String id=Util.null2String(rs2.getString("id"));//主键ID
+                	String je=Util.null2o(rs2.getString("je"));//付款金额
+                	String sl=Util.null2o(rs2.getString("sl"));//税率
+                	String tax=Util.null2o(rs2.getString("tax"));//发票税金
+                	BigDecimal bd_tax=new BigDecimal(tax);
+                	//税额=总金额/(1+税率)*税率
+                	BigDecimal bd_se=new BigDecimal(je).divide(new BigDecimal("100").add(new BigDecimal(sl)), 10, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(sl)).setScale(2, RoundingMode.HALF_UP);
+                	
+                	bd_temp=bd_temp.add(bd_se);
+                	temp2++;
+                	
+                	if(row2==temp2){//最后一行
+                		//可能存在相除有差额的情况
+                		if(bd_temp.compareTo(bd_tax)!=0){
+                			//两者相差多少
+                			BigDecimal bd_xe=bd_temp.subtract(bd_tax);
+                			log.writeLog("bd_temp=【"+bd_temp+"】、bd_tax=【"+bd_tax+"】，两者相差的税额bd_xe------------>"+bd_xe);
+                			//当相差低于0.2元时,则将差额算在最后一行上面
+                			if(bd_xe.compareTo(new BigDecimal("0.2"))<=0&&bd_xe.compareTo(new BigDecimal("-0.2"))>=0){
+                				bd_se=bd_se.subtract(bd_xe).setScale(2, RoundingMode.HALF_UP);
+                			}
+                		}
+                	}
+                	//不含税金额=付款金额-税额
+                	BigDecimal bhsje=new BigDecimal(je).subtract(bd_se).setScale(2, RoundingMode.HALF_UP);
+                	
+                	//一张发票是否被多个明细行引用时，将此行的税额和不含税金额刷新，其中税额=总金额/(1+税率)*税率
+                    sql = "update " + mainTable + "_dt2 set se="+bd_se+",bhsje="+bhsje+"  where mainid= "+mainId+" and id= "+id;
+                    log.writeLog("一张发票被多个明细行引用刷新其税额和不含税金额sql------------>"+sql);
+                    rs3.execute(sql);
+        		}
+        	}
+        }
+        
+//        //一张发票是否被多个明细行引用时，将此行的税额和不含税金额刷新，其中税额=总金额/(1+税率)*税率
+//        sql = "update " + mainTable + "_dt2 set se=je/(1+(nvl(sl,0)*1.00/100))*(nvl(sl,0)*1.00/100),"
+//        	 +"bhsje=je-je/(1+(nvl(sl,0)*1.00/100))*(nvl(sl,0)*1.00/100)  where mainid= "+mainId+" and fphm in ( ";
+//        sql+=" 	   select fphm  from " + mainTable + "_dt2  where fphm is not null and mainid="+mainId+" group by fphm having count(*)>1";
+//        sql+=" ) ";
+//        log.writeLog("查询一张发票是否被多个明细行引用,若存在则刷新其税额和不含税金额sql------------>"+sql);
+//        rs.execute(sql);
+        
+        Map<String,String> map=new HashMap<String,String>();
+        map.put("901063", "0");//客服理赔备用金报销
+        map.put("901059", "1");//客服理赔备用金专项核销
+        map.put("901069", "2");//工资发放申请
+        map.put("901058", "3");//客服理赔备用金申请
+        map.put("901060", "4");//押金保证金
+        map.put("901009", "4");//保证金退款
+        map.put("901072", "5");//提现
+        map.put("901056", "6");//航空费
+        map.put("901094", "9");//投标保证金退款
+        
+        int p=0;
+        String sfxnccfk="0";//是否对接NCC
+        String ygdsfzyxtjzyzlx="1";//一个单是否只允许提交这一种类型
+        String fylxmcwb="";//费用类型没错
+        String fylxbmwb="";//费用类型编码
+        sql="select a.*, nvl(b.sfdjncc,0) as sfdjncc, nvl(b.ygdsfzyxtjzyzlx,1) as ygdsfzyxtjzyzlx,b.fylx as fylxmcwb,b.bm as fylxbmwb from " + mainTable + "_dt2 a left join uf_fylx b on a.fylx=b.id where a.mainid="+mainId;
+        rs.execute(sql);
+        while (rs.next()) {
+        	
+        	if(p==0){//第一行
+        		sfxnccfk=Util.null2String(rs.getString("sfdjncc"));//是否对接NCC
+        		ygdsfzyxtjzyzlx=Util.null2String(rs.getString("ygdsfzyxtjzyzlx"));//一个单是否只允许提交这一种类型
+        		fylxmcwb=Util.null2String(rs.getString("fylxmcwb"));//费用类型名称
+        		fylxbmwb=Util.null2String(rs.getString("fylxbmwb"));//费用类型编码
+        	}else{
+        		//第二行以下与第一行是否相同
+        		if(!ygdsfzyxtjzyzlx.equals(Util.null2String(rs.getString("ygdsfzyxtjzyzlx")))){
+        			message.append("一个付款单中不可同时选择【"+fylxmcwb+"】【"+Util.null2String(rs.getString("fylxmcwb"))+"】两种费用类型，若需要申请这2种费用，则请拆分成2个单发起申请！<br/>");
+        		}else{
+        			if("0".equals(ygdsfzyxtjzyzlx)){//如果是选择一个单只允许提交这一种类型的费用科目，那么判断
+        				if(!fylxbmwb.equals(Util.null2String(rs.getString("fylxbmwb")))){
+                			message.append("一个付款单中不可同时选择【"+fylxmcwb+"】【"+Util.null2String(rs.getString("fylxmcwb"))+"】两种费用类型，若需要申请这2种费用，则请拆分成2个单发起申请！<br/>");
+                		}
+        			}
+        		}
+        	}
+        	String je=Util.null2o(rs.getString("je"));//付款金额
+        	if(Double.parseDouble(je)<=0){
+        		message.append("明细中的付款金额【"+je+"】填写有误，付款金额需大于0<br/>");
+        	}
+        	p++;
+        }
+        //获取费用类型下拉框的值
+        String fklx1=Util.null2String(map.get(fylxbmwb));
+        if("".equals(fklx1)){
+        	fklx1="null";
+        }
+        //给“是否对接NCC”赋值
+        rs.execute("update " + mainTable + " set sfxnccfk='"+sfxnccfk+"',fklx1="+fklx1+" where requestid="+requestId);
+        
+        //查询付款金额合计是否超出发票金额，付款税额合计是否超出发票税金
+        String sql1 = " select a.*,b.invoicecode,b.invoicenumber,b.taxincludedprice,b.tax,"
+        		+ "(case when a.je-b.taxincludedprice>0 then 'yes' else 'no' end) as bxjesfcc,"
+        		+ "(case when a.se-b.tax>0 then 'yes' else 'no' end) as sjsfcc from ( ";
+        sql1+=" select fphm,sum(je) as je,sum(se) as se  from " + mainTable + "_dt2  where fphm is not null and mainid="+mainId+" group by fphm";
+        sql1+=" ) a ,fnainvoiceledger b where a.fphm=b.id  and (a.je>b.taxincludedprice or a.se>b.tax) ";
+        log.writeLog("查询付款金额合计是否超出发票金额，付款税额合计是否超出发票税金sql1------------>"+sql1);
+        rs.execute(sql1);
+        while (rs.next()) {
+        	
+        	String bxjesfcc=Util.null2String(rs.getString("bxjesfcc"));//付款是否已超出
+        	String sjsfcc=Util.null2String(rs.getString("sjsfcc"));//税金是否已超出
+        	String invoiceNumber=Util.null2String(rs.getString("invoicenumber"));//发票号码
+        	String je=Util.null2String(rs.getString("je"));//付款金额
+        	String se=Util.null2String(rs.getString("se"));//付款税金
+        	String taxincludedprice=Util.null2String(rs.getString("taxincludedprice"));//发票金额
+        	String tax=Util.null2o(rs.getString("tax"));//发票税金
+        	if("yes".equals(bxjesfcc)){
+        		message.append("付款明细表中发票号【").append(invoiceNumber).append("】的明细行付款金额合计【"+je+"】元超出发票金额【"+taxincludedprice+"】元！</br>");
+        	}
+        	if("yes".equals(sjsfcc)){
+        		//可能存在相除有差额的情况，当相差低于0.2元时可以正常通过
+        		if(new BigDecimal(se).subtract(new BigDecimal(tax)).compareTo(new BigDecimal("0.2"))>0){
+        			message.append("付款明细表中发票号【").append(invoiceNumber).append("】的明细行税额合计【"+se+"】元超出发票税金【"+tax+"】元！</br>");
+        		}
+        	}
+        }
+        if (!"".equals(message.toString())) {
+            requestInfo.getRequestManager().setMessagecontent(message.toString());
+            return Action.FAILURE_AND_CONTINUE;
+        }
+        log.writeLog("--------付款单数据校验完毕----requestId值为：" + requestId);
+        return Action.SUCCESS;
+    }
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/action/QiankaCheckAction.java b/src/main/youhong_ai_jitu_src/jntchina/action/QiankaCheckAction.java
new file mode 100644
index 0000000..4e0ded8
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/action/QiankaCheckAction.java
@@ -0,0 +1,102 @@
+package jntchina.action;
+
+import weaver.general.Util;
+import selfdev.util.base.BaseUtil;
+import selfdev.util.log.LogTool;
+import weaver.conn.RecordSet;
+import weaver.soa.workflow.request.*;
+import weaver.interfaces.workflow.action.BaseAction;
+
+/**
+ * @description: 签卡校验
+ * @author: daizhishun
+ * @date: 2021/9/8
+ **/
+public class QiankaCheckAction extends BaseAction {
+    public String execute(RequestInfo ri){
+        LogTool log=new LogTool("/log/selfdev/action/hrm", true);
+        //获取requestid
+        String requestid=ri.getRequestid();
+        String workflowid=ri.getWorkflowid();
+        String workflowname=BaseUtil.getBaseInfoByParm("workflowname", "workflow_base", "id", workflowid, "");
+        log.writeLog("---------------"+workflowname+"数据写入HR系统开始-------------requestId:" + requestid);
+        try {
+            //获取表名
+            String tablename=BaseUtil.getBaseInfoByParm("tablename", "workflow_bill", "1", "1", " and id in (select formid from workflow_base where id="+workflowid+")");
+            log.writeLog("获取到的主表名为："+tablename);
+            RecordSet rs=new RecordSet();
+            //查询主表数据
+            String sql=" select a.*,b.* from "+tablename+" a " +
+                        "left join "+tablename+"_dt1 b on a.id=b.mainid where a.requestid="+requestid+"";
+            log.writeLog("查询主表数据sql------------->" + sql);
+            String xm = "";//姓名
+            String mainid = "";//id
+            rs.execute(sql);
+            while(rs.next()){
+                xm=Util.null2String(rs.getString("resourceId"));//姓名
+                mainid = Util.null2String(rs.getString("mainid"));//id
+            }
+            String msg="";
+            sql="select detail_signdate,detail_signtime from "+tablename+"_dt1 a where mainid="+mainid+" group by detail_signdate,detail_signtime having COUNT(*)>1";
+            log.writeLog("查询当前流程签卡明细中是否有2行相同的签卡时间sql------------->" + sql);
+            rs.execute(sql);
+            while(rs.next()){
+                String date = Util.null2String(rs.getString("detail_signdate"));//签卡日期
+                String time = Util.null2String(rs.getString("detail_signtime"));//签卡时间
+                String rq_sj = date+" "+time;
+                msg+=rq_sj+"、";
+            }
+            if(!"".equals(msg)){
+                msg="明细中的签卡时间【"+(msg.substring(0,msg.length()-1))+"】存在重复！";
+                ri.getRequestManager().setMessageid("111100");
+                ri.getRequestManager().setMessagecontent(msg);
+                return "0";
+            }
+
+            //明细表
+            DetailTable dtTable = ri.getDetailTableInfo().getDetailTable(0);
+            String rq = "";
+            String sj = "";
+            String con = "";
+            //遍历明细表字段数据
+            Row[] row = dtTable.getRow();
+            for (int i = 0 ; i< row.length; i++){
+                Cell[] cell = row[i].getCell();
+                for (int j = 0;j <cell.length; j++){
+                    if(cell[j].getName().equals("detail_signdate")){
+                        rq = cell[j].getValue();
+                        log.writeLog("签卡日期为："+rq);
+                    }
+                    if(cell[j].getName().equals("detail_signtime")){
+                        sj = cell[j].getValue();
+                        log.writeLog("签卡时间为："+sj);
+                    }
+                    RecordSet rs1=new RecordSet();
+                    String sql1 = "select COUNT(*) as con from "+tablename+" a left join " +
+                            ""+tablename+"_DT1 b on a.id=b.mainid where " +
+                            "a.RESOURCEID="+xm+" and b.DETAIL_SIGNDATE= '"+rq+"'  " +
+                            "and b.DETAIL_SIGNTIME = '"+sj+"'";
+                    rs1.execute(sql1);
+                    while(rs1.next()){
+                        con = Util.null2String(rs1.getString("con"));//获取查询的总数
+                        log.writeLog("查询到的总数为："+con);
+                        if("2".equals(con)){
+                            msg="当前人员的时间【"+rq+" "+sj+"】之前已申请过补签卡，请勿重复提交！";
+                            ri.getRequestManager().setMessageid("111100");
+                            ri.getRequestManager().setMessagecontent(msg);
+                            return "0";
+                        }
+                    }
+                }
+            }
+            return SUCCESS;
+        }catch (Exception e){
+            e.printStackTrace();
+            log.writeLog(workflowname+"数据写入HR系统失败，错误信息为：------>"+e.toString());
+            ri.getRequestManager().setMessageid("111100");
+            ri.getRequestManager().setMessagecontent(workflowname+"数据写入HR系统失败，错误信息为：------>"+e.toString());
+            return "0";
+        }
+    }
+
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/action/QiankaForceDrawBackAction.java b/src/main/youhong_ai_jitu_src/jntchina/action/QiankaForceDrawBackAction.java
new file mode 100644
index 0000000..1ee9d11
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/action/QiankaForceDrawBackAction.java
@@ -0,0 +1,38 @@
+package jntchina.action;
+
+import selfdev.util.base.BaseUtil;
+import selfdev.util.log.LogTool;
+import weaver.interfaces.workflow.action.BaseAction;
+import weaver.soa.workflow.request.RequestInfo;
+
+/**
+ * @description: 签卡流程强制收回时的节点附加操作
+ * @author: KangMD
+ * @date: 2021-12-19
+ **/
+public class QiankaForceDrawBackAction extends BaseAction {
+
+        public static LogTool log=new LogTool("/log/selfdev/action/hrm", false);
+        public String execute(RequestInfo requestInfo){
+            String requestId = requestInfo.getRequestid(); // 获取requestid
+            String workflowid = requestInfo.getWorkflowid(); // 获取workflowid
+
+            //获取工作流名称
+            String workflowname = BaseUtil.getBaseInfoByParm("workflowname", "workflow_base", "id", workflowid, "");
+            log.writeLog("--------【"+workflowname+"】强制收回时的节点附加操作----requestId值为：" + requestId);
+            try{
+            	QiankaForceDrawBackThread forceDrawBackThread=new QiankaForceDrawBackThread();
+       		 	//设置参数
+            	forceDrawBackThread.setRequestInfo(requestInfo);
+       		 	Thread thread = new Thread(forceDrawBackThread);
+       		 	//启动线程
+       		 	thread.start();
+       		 	log.writeLog("--------【"+workflowname+"】强制收回时启用线程--------");
+            }catch (Exception e){
+                //返回0，调用失败
+                log.writeLog("------------------------捕获到的异常是：" + e.toString());
+                return "0";
+            }
+            return SUCCESS;
+    }
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/action/QiankaForceDrawBackThread.java b/src/main/youhong_ai_jitu_src/jntchina/action/QiankaForceDrawBackThread.java
new file mode 100644
index 0000000..d6d223c
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/action/QiankaForceDrawBackThread.java
@@ -0,0 +1,125 @@
+package jntchina.action;
+
+import com.alibaba.fastjson.JSONObject;
+import jntchina.util.HttpClientToDC;
+import selfdev.util.base.BaseUtil;
+import selfdev.util.log.LogTool;
+import weaver.conn.RecordSet;
+import weaver.file.Prop;
+import weaver.general.Util;
+import weaver.soa.workflow.request.RequestInfo;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @description: 签卡结果回传-成功-放归档节点前操作
+ * @author: daizhishun
+ * @date: 2021/9/10
+ **/
+public class QiankaForceDrawBackThread  implements Runnable {
+
+    public static LogTool log=new LogTool("/log/selfdev/action/hrm", true);
+    public RequestInfo requestInfo;
+    
+	public RequestInfo getRequestInfo() {
+		return requestInfo;
+	}
+
+	public void setRequestInfo(RequestInfo requestInfo) {
+		this.requestInfo = requestInfo;
+	}
+
+	public void run(){
+		String requestId = requestInfo.getRequestid(); // 获取requestid
+		try {
+			log.writeLog("----------1.5秒后再启动【requestId:" + requestId+"】-------------");
+			Thread.sleep(1500);//延迟执行
+		} catch (InterruptedException e1) {
+			// TODO Auto-generated catch block
+			e1.printStackTrace();
+		}
+		log.writeLog("----------1.5秒结束，开启执行代码【requestId:" +requestId+"】-------------");
+		
+        String workflowid = requestInfo.getWorkflowid(); // 获取workflowid
+        //获取工作流名称
+        String workflowname = BaseUtil.getBaseInfoByParm("workflowname", "workflow_base", "id", workflowid, "");
+        log.writeLog("--------【"+workflowname+"】数据传入中台开始----requestId值为：" + requestId);
+
+        try{
+        	//流程当前状态
+        	String currentnodetype="";
+        	RecordSet rs = new RecordSet();
+            String sql = "select * from workflow_requestbase where requestid = "+requestId+"";
+            rs.execute(sql);
+            while (rs.next()) {
+            	currentnodetype = Util.null2String(rs.getString("currentnodetype"));//当前流程状态
+            }
+            log.writeLog("currentnodetype---------------->"+currentnodetype);
+            //流程当前处于申请节点，才需要调用HR接口
+            if(!"0".equals(currentnodetype)){
+            	log.writeLog("*************流程不是强制收回到申请节点，不需要调用HR接口*************");
+            	return;
+            }
+            
+            //获取配置文件中的参数，到时候URL路径
+            String mode = Prop.getPropValue("DevToDC_jntchina", "mode");
+            // 服务器ip：port
+            String baseUrl = Prop.getPropValue("DevToDC_jntchina", mode + "_baseUrl");
+            //访问路径拼接
+            String url = baseUrl + "/dcoaapi/hr/attendance";
+
+            //根据流程id获取主表名称
+            String mainTable = RegularizationApplyForAction.getMainTable(requestId);
+            log.writeLog("--------获取到的表名为----：" + mainTable);
+            //申请单号
+            String C_OA_NUM = "";
+            //单据来源：默认OA
+            String C_APPLY_SOURCE = "OA";
+            //流程名称：签卡流程为：10
+            String C_WORKFLOW = "10";
+            //审批状态    已通过：3，驳回：5驳回至发起人
+            String C_STATUS = "5";
+
+            sql = "select lcbh from "+mainTable+" where requestid = "+requestId+"";
+            rs.execute(sql);
+            log.writeLog("---------------->打印sql语句"+sql);
+            while (rs.next()) {
+                C_OA_NUM = Util.null2String(rs.getString("lcbh"));//申请单号
+            }
+
+            Map<String,Object> map = new HashMap<String,Object>();
+            map.put("C_OA_NUM",C_OA_NUM);
+            map.put("C_APPLY_SOURCE",C_APPLY_SOURCE);
+            map.put("C_WORKFLOW",C_WORKFLOW);
+            map.put("C_STATUS",C_STATUS);
+            String strParm = JSONObject.toJSONString(map);
+            log.writeLog("---------------打印的Map数据为：-----------------："+strParm);
+
+            //获取Token
+            String token = HttpClientToDC.getToken();
+            log.writeLog("签卡申请单token------>" + token);
+            log.writeLog("签卡申请单url------>" + url);
+
+            //调用NCC接口，将数据传给NCC
+            String returndata = HttpClientToDC.sendPostApi(url,token,strParm);
+            log.writeLog("【调用数据中台签卡申请单接口返回结果:】" + returndata);
+            if (!"".equals(returndata) && returndata != null) {
+                JSONObject jsonObject = JSONObject.parseObject(returndata);
+                String code = Util.null2String(jsonObject.get("code"));
+                log.writeLog("--------发送请求返回的code值为：" + code);
+                if ("1".equals(code)) {
+                    
+                } else {
+                	String msg = Util.null2String(jsonObject.get("msg"));
+                    log.writeLog("调用HR接口返回错误信息----->" + msg);
+                }
+            }else {
+            	log.writeLog("调用HR接口返回为空----->");
+            }
+        }catch (Exception e){
+            //返回0，调用失败
+            log.writeLog("------------------------捕获到的异常是：" + e.toString());
+        }
+    }
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/action/QiankaHuiChuanReturnAction.java b/src/main/youhong_ai_jitu_src/jntchina/action/QiankaHuiChuanReturnAction.java
new file mode 100644
index 0000000..f03b184
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/action/QiankaHuiChuanReturnAction.java
@@ -0,0 +1,99 @@
+package jntchina.action;
+
+import com.alibaba.fastjson.JSONObject;
+import jntchina.util.HttpClientToDC;
+import selfdev.util.base.BaseUtil;
+import selfdev.util.log.LogTool;
+import weaver.conn.RecordSet;
+import weaver.file.Prop;
+import weaver.general.Util;
+import weaver.interfaces.workflow.action.BaseAction;
+import weaver.soa.workflow.request.RequestInfo;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @description: 签卡结果回传-退回至发起人
+ * @author: daizhishun
+ * @date: 2021/9/10
+ **/
+public class QiankaHuiChuanReturnAction extends BaseAction {
+    public static LogTool log=new LogTool("/log/selfdev/action/hrm", true);
+    public String execute(RequestInfo requestInfo){
+        String requestId = requestInfo.getRequestid(); // 获取requestid
+        String workflowid = requestInfo.getWorkflowid(); // 获取workflowid
+
+        //获取工作流名称
+        String workflowname = BaseUtil.getBaseInfoByParm("workflowname", "workflow_base", "id", workflowid, "");
+        log.writeLog("--------【"+workflowname+"】退回到申请节点时数据传入中台开始----requestId值为：" + requestId);
+
+        try{
+            //获取配置文件中的参数，到时候URL路径
+            String mode = Prop.getPropValue("DevToDC_jntchina", "mode");
+            // 服务器ip：port
+            String baseUrl = Prop.getPropValue("DevToDC_jntchina", mode + "_baseUrl");
+            //访问路径拼接
+            String url = baseUrl + "/dcoaapi/hr/attendance";
+
+            //根据流程id获取主表名称
+            String mainTable = RegularizationApplyForAction.getMainTable(requestId);
+            log.writeLog("--------获取到的表名为----：" + mainTable);
+            //申请单号
+            String C_OA_NUM = "";
+            //单据来源：默认OA
+            String C_APPLY_SOURCE = "OA";
+            //流程名称：签卡流程为：10
+            String C_WORKFLOW = "10";
+            //审批状态：已通过：3，驳回：5
+            String C_STATUS = "5";
+
+            RecordSet rs = new RecordSet();
+            String sql = "select lcbh from "+mainTable+" where requestid = "+requestId+"";
+            rs.execute(sql);
+            log.writeLog("---------------->打印sql语句"+sql);
+            while (rs.next()) {
+                C_OA_NUM = Util.null2String(rs.getString("lcbh"));//申请单号
+            }
+
+            Map<String,Object> map = new HashMap<String,Object>();
+            map.put("C_OA_NUM",C_OA_NUM);
+            map.put("C_APPLY_SOURCE",C_APPLY_SOURCE);
+            map.put("C_WORKFLOW",C_WORKFLOW);
+            map.put("C_STATUS",C_STATUS);
+            String strParm = JSONObject.toJSONString(map);
+            log.writeLog("---------------打印的Map数据为：-----------------："+strParm);
+
+            //获取Token
+            String token = HttpClientToDC.getToken();
+            log.writeLog("签卡申请单token------>" + token);
+            log.writeLog("签卡申请单url------>" + url);
+
+            //调用NCC接口，将数据传给NCC
+            String returndata = HttpClientToDC.sendPostApi(url,token,strParm);
+            log.writeLog("【调用数据中台签卡申请单接口返回结果:】" + returndata);
+            if (!"".equals(returndata) && returndata != null) {
+                JSONObject jsonObject = JSONObject.parseObject(returndata);
+                String code = Util.null2String(jsonObject.get("code"));
+                log.writeLog("--------发送请求返回的code值为：" + code);
+                if ("1".equals(code)) {
+                    return SUCCESS;
+                } else {
+                    String msg = Util.null2String(jsonObject.get("msg"));
+                    requestInfo.getRequestManager().setMessageid("111100");
+                    requestInfo.getRequestManager().setMessagecontent(msg);
+                    return "0";
+                }
+            }else {
+                String ermsg = "流程数据已审批状态提交至中台失败，请联系系统管理员处理！";
+                requestInfo.getRequestManager().setMessageid("111100");
+                requestInfo.getRequestManager().setMessagecontent(ermsg);
+                return "0";
+            }
+        }catch (Exception e){
+            //返回0，调用失败
+            log.writeLog("------------------------捕获到的异常是：" + e.toString());
+            return "0";
+        }
+    }
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/action/QiankaHuiChuanSuccessAction.java b/src/main/youhong_ai_jitu_src/jntchina/action/QiankaHuiChuanSuccessAction.java
new file mode 100644
index 0000000..70ff469
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/action/QiankaHuiChuanSuccessAction.java
@@ -0,0 +1,101 @@
+package jntchina.action;
+
+import com.alibaba.fastjson.JSONObject;
+import jntchina.util.HttpClientToDC;
+import selfdev.util.base.BaseUtil;
+import selfdev.util.log.LogTool;
+import weaver.conn.RecordSet;
+import weaver.file.Prop;
+import weaver.general.Util;
+import weaver.interfaces.workflow.action.BaseAction;
+import weaver.soa.workflow.request.RequestInfo;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @description: 签卡结果回传-成功-放归档节点前操作
+ * @author: daizhishun
+ * @date: 2021/9/10
+ **/
+public class QiankaHuiChuanSuccessAction extends BaseAction {
+
+    public static LogTool log=new LogTool("/log/selfdev/action/hrm", true);
+    public String execute(RequestInfo requestInfo){
+        String requestId = requestInfo.getRequestid(); // 获取requestid
+        String workflowid = requestInfo.getWorkflowid(); // 获取workflowid
+
+        //获取工作流名称
+        String workflowname = BaseUtil.getBaseInfoByParm("workflowname", "workflow_base", "id", workflowid, "");
+        log.writeLog("--------【"+workflowname+"】数据传入中台开始----requestId值为：" + requestId);
+
+        try{
+            //获取配置文件中的参数，到时候URL路径
+            String mode = Prop.getPropValue("DevToDC_jntchina", "mode");
+            // 服务器ip：port
+            String baseUrl = Prop.getPropValue("DevToDC_jntchina", mode + "_baseUrl");
+            //访问路径拼接
+            String url = baseUrl + "/dcoaapi/hr/attendance";
+
+            //根据流程id获取主表名称
+            String mainTable = RegularizationApplyForAction.getMainTable(requestId);
+            log.writeLog("--------获取到的表名为----：" + mainTable);
+            //申请单号
+            String C_OA_NUM = "";
+            //单据来源：默认OA
+            String C_APPLY_SOURCE = "OA";
+            //流程名称：签卡流程为：10
+            String C_WORKFLOW = "10";
+            //审批状态：已通过：3，驳回：5
+            String C_STATUS = "3";
+
+            RecordSet rs = new RecordSet();
+            String sql = "select lcbh from "+mainTable+" where requestid = "+requestId+"";
+            rs.execute(sql);
+            log.writeLog("---------------->打印sql语句"+sql);
+            while (rs.next()) {
+                C_OA_NUM = Util.null2String(rs.getString("lcbh"));//申请单号
+            }
+
+
+            Map<String,Object> map = new HashMap<String,Object>();
+            map.put("C_OA_NUM",C_OA_NUM);
+            map.put("C_APPLY_SOURCE",C_APPLY_SOURCE);
+            map.put("C_WORKFLOW",C_WORKFLOW);
+            map.put("C_STATUS",C_STATUS);
+            String strParm = JSONObject.toJSONString(map);
+            log.writeLog("---------------打印的Map数据为：-----------------："+strParm);
+
+            //获取Token
+            String token = HttpClientToDC.getToken();
+            log.writeLog("签卡申请单token------>" + token);
+            log.writeLog("签卡申请单url------>" + url);
+
+            //调用NCC接口，将数据传给NCC
+            String returndata = HttpClientToDC.sendPostApi(url,token,strParm);
+            log.writeLog("【调用数据中台签卡申请单接口返回结果:】" + returndata);
+            if (!"".equals(returndata) && returndata != null) {
+                JSONObject jsonObject = JSONObject.parseObject(returndata);
+                String code = Util.null2String(jsonObject.get("code"));
+                log.writeLog("--------发送请求返回的code值为：" + code);
+                if ("1".equals(code)) {
+                    return SUCCESS;
+                } else {
+                    String msg = Util.null2String(jsonObject.get("msg"));
+                    requestInfo.getRequestManager().setMessageid("111100");
+                    requestInfo.getRequestManager().setMessagecontent(msg);
+                    return "0";
+                }
+            }else {
+                String ermsg = "流程数据已审批状态提交至中台失败，请联系系统管理员处理！";
+                requestInfo.getRequestManager().setMessageid("111100");
+                requestInfo.getRequestManager().setMessagecontent(ermsg);
+                return "0";
+            }
+        }catch (Exception e){
+            //返回0，调用失败
+            log.writeLog("------------------------捕获到的异常是：" + e.toString());
+            return "0";
+        }
+    }
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/action/QingjiaForceDrawBackAction.java b/src/main/youhong_ai_jitu_src/jntchina/action/QingjiaForceDrawBackAction.java
new file mode 100644
index 0000000..c0e06fa
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/action/QingjiaForceDrawBackAction.java
@@ -0,0 +1,38 @@
+package jntchina.action;
+
+import selfdev.util.base.BaseUtil;
+import selfdev.util.log.LogTool;
+import weaver.interfaces.workflow.action.BaseAction;
+import weaver.soa.workflow.request.RequestInfo;
+
+/**
+ * @description: 请假强制收回时的节点附加操作
+ * @author: KangMD
+ * @date: 2021-12-13
+ **/
+public class QingjiaForceDrawBackAction extends BaseAction {
+
+        public static LogTool log=new LogTool("/log/selfdev/action/hrm", false);
+        public String execute(RequestInfo requestInfo){
+            String requestId = requestInfo.getRequestid(); // 获取requestid
+            String workflowid = requestInfo.getWorkflowid(); // 获取workflowid
+
+            //获取工作流名称
+            String workflowname = BaseUtil.getBaseInfoByParm("workflowname", "workflow_base", "id", workflowid, "");
+            log.writeLog("--------【"+workflowname+"】强制收回时的节点附加操作----requestId值为：" + requestId);
+            try{
+            	QingjiaForceDrawBackThread forceDrawBackThread=new QingjiaForceDrawBackThread();
+       		 	//设置参数
+            	forceDrawBackThread.setRequestInfo(requestInfo);
+       		 	Thread thread = new Thread(forceDrawBackThread);
+       		 	//启动线程
+       		 	thread.start();
+       		 	log.writeLog("--------【"+workflowname+"】强制收回时启用线程--------");
+            }catch (Exception e){
+                //返回0，调用失败
+                log.writeLog("------------------------捕获到的异常是：" + e.toString());
+                return "0";
+            }
+            return SUCCESS;
+    }
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/action/QingjiaForceDrawBackThread.java b/src/main/youhong_ai_jitu_src/jntchina/action/QingjiaForceDrawBackThread.java
new file mode 100644
index 0000000..fdc345d
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/action/QingjiaForceDrawBackThread.java
@@ -0,0 +1,126 @@
+package jntchina.action;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import com.alibaba.fastjson.JSONObject;
+
+import jntchina.util.HttpClientToDC;
+import selfdev.util.base.BaseUtil;
+import selfdev.util.log.LogTool;
+import weaver.conn.RecordSet;
+import weaver.file.Prop;
+import weaver.general.Util;
+import weaver.soa.workflow.request.RequestInfo;
+
+/**
+ * @description: 请假强制收回时的节点附加操作
+ * @author: KangMD
+ * @date: 2021-12-13
+ **/
+public class QingjiaForceDrawBackThread implements Runnable {
+
+        public static LogTool log=new LogTool("/log/selfdev/action/hrm", false);
+        public RequestInfo requestInfo;
+    
+    	public RequestInfo getRequestInfo() {
+			return requestInfo;
+		}
+
+		public void setRequestInfo(RequestInfo requestInfo) {
+			this.requestInfo = requestInfo;
+		}
+
+		public void run(){
+			String requestId = requestInfo.getRequestid(); // 获取requestid
+    		try {
+    			log.writeLog("----------1.5秒后再启动【requestId:" + requestId+"】-------------");
+    			Thread.sleep(1500);//延迟执行
+    		} catch (InterruptedException e1) {
+    			// TODO Auto-generated catch block
+    			e1.printStackTrace();
+    		}
+    		log.writeLog("----------1.5秒结束，开启执行代码【requestId:" +requestId+"】-------------");
+    		
+    		String workflowid = requestInfo.getWorkflowid(); // 获取workflowid
+            //获取工作流名称
+            String workflowname = BaseUtil.getBaseInfoByParm("workflowname", "workflow_base", "id", workflowid, "");
+            log.writeLog("--------【"+workflowname+"】强制收回时的节点附加操作----requestId值为：" + requestId);
+
+            try{
+            	//流程当前状态
+            	String currentnodetype="";
+            	RecordSet rs = new RecordSet();
+	            String sql = "select * from workflow_requestbase where requestid = "+requestId+"";
+	            rs.execute(sql);
+	            while (rs.next()) {
+	            	currentnodetype = Util.null2String(rs.getString("currentnodetype"));//当前流程状态
+	            }
+	            log.writeLog("currentnodetype---------------->"+currentnodetype);
+	            //流程当前处于申请节点，才需要调用HR接口
+	            if(!"0".equals(currentnodetype)){
+	            	log.writeLog("*************流程不是强制收回到申请节点，不需要调用HR接口*************");
+	            	return;
+	            }
+	            //获取配置文件中的参数，到时候URL路径
+	            String mode = Prop.getPropValue("DevToDC_jntchina", "mode");
+	            // 服务器ip：port
+	            String baseUrl = Prop.getPropValue("DevToDC_jntchina", mode + "_baseUrl");
+	            //访问路径拼接
+	            String url = baseUrl + "/dcoaapi/hr/attendance";
+	
+	            //根据流程id获取主表名称
+	            String mainTable = RegularizationApplyForAction.getMainTable(requestId);
+	            log.writeLog("--------获取到的表名为----：" + mainTable);
+	            //申请单号
+	            String C_OA_NUM = "";
+	            //单据来源：默认OA
+	            String C_APPLY_SOURCE = "OA";
+	            //流程名称：请假流程为：20
+	            String C_WORKFLOW = "20";
+	            //审批状态：已通过：3，驳回：5
+	            String C_STATUS = "5";
+	
+	            sql = "select lcbh from "+mainTable+" where requestid = "+requestId+"";
+	            rs.execute(sql);
+	            log.writeLog("---------------->打印sql语句"+sql);
+	            while (rs.next()) {
+	                C_OA_NUM = Util.null2String(rs.getString("lcbh"));//申请单号
+	            }
+	
+	
+	            Map<String,Object> map = new HashMap<String,Object>();
+	            map.put("C_OA_NUM",C_OA_NUM);
+	            map.put("C_APPLY_SOURCE",C_APPLY_SOURCE);
+	            map.put("C_WORKFLOW",C_WORKFLOW);
+	            map.put("C_STATUS",C_STATUS);
+	            String strParm = JSONObject.toJSONString(map);
+	            log.writeLog("---------------打印的Map数据为：-----------------："+strParm);
+	
+	            //获取Token
+	            String token = HttpClientToDC.getToken();
+	            log.writeLog("请假申请单token------>" + token);
+	            log.writeLog("请假申请单url------>" + url);
+	
+	            //调用NCC接口，将数据传给NCC
+	            String returndata = HttpClientToDC.sendPostApi(url,token,strParm);
+	            log.writeLog("【请假强制收回时的节点附加操作调用数据中台请假申请单接口返回结果:】" + returndata);
+	            if (!"".equals(returndata) && returndata != null) {
+	                JSONObject jsonObject = JSONObject.parseObject(returndata);
+	                String code = Util.null2String(jsonObject.get("code"));
+	                log.writeLog("--------发送请求返回的code值为：" + code);
+	                if ("1".equals(code)) {
+	                	
+	                }else {
+	                	String msg = Util.null2String(jsonObject.get("msg"));
+	                    log.writeLog("调用HR接口返回错误信息----->" + msg);
+	                }
+	            }else {
+	            	log.writeLog("调用HR接口返回为空----->");
+	            }
+            }catch (Exception e){
+                //返回0，调用失败
+                log.writeLog("------------------------捕获到的异常是：" + e.toString());
+        }
+    }
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/action/QingjiaHuiChuanReturnAction.java b/src/main/youhong_ai_jitu_src/jntchina/action/QingjiaHuiChuanReturnAction.java
new file mode 100644
index 0000000..6e65a97
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/action/QingjiaHuiChuanReturnAction.java
@@ -0,0 +1,102 @@
+package jntchina.action;
+
+import com.alibaba.fastjson.JSONObject;
+import jntchina.util.HttpClientToDC;
+import selfdev.util.base.BaseUtil;
+import selfdev.util.log.LogTool;
+import weaver.conn.RecordSet;
+import weaver.file.Prop;
+import weaver.general.Util;
+import weaver.interfaces.workflow.action.BaseAction;
+import weaver.soa.workflow.request.RequestInfo;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @description: 请假结果回传-退回至发起人
+ * @author: daizhishun
+ * @date: 2021/9/10
+ **/
+public class QingjiaHuiChuanReturnAction extends BaseAction{
+    public static LogTool log=new LogTool("/log/selfdev/action/hrm", true);
+    public String execute(RequestInfo requestInfo){
+        String requestId = requestInfo.getRequestid(); // 获取requestid
+        String workflowid = requestInfo.getWorkflowid(); // 获取workflowid
+
+        //获取工作流名称
+        String workflowname = BaseUtil.getBaseInfoByParm("workflowname", "workflow_base", "id", workflowid, "");
+        log.writeLog("---------------工作流名称-----------workflowname为：" + workflowname);
+        log.writeLog("--------【"+workflowname+"】退回到申请节点时数据传入中台开始----requestId值为：" + requestId);
+
+        try{
+            //获取配置文件中的参数，到时候URL路径
+            String mode = Prop.getPropValue("DevToDC_jntchina", "mode");
+            // 服务器ip：port
+            String baseUrl = Prop.getPropValue("DevToDC_jntchina", mode + "_baseUrl");
+            //访问路径拼接
+            String url = baseUrl + "/dcoaapi/hr/attendance";
+
+            //根据流程id获取主表名称
+            String mainTable = RegularizationApplyForAction.getMainTable(requestId);
+            log.writeLog("--------获取到的表名为----：" + mainTable);
+            //申请单号
+            String C_OA_NUM = "";
+            //单据来源：默认OA
+            String C_APPLY_SOURCE = "OA";
+            //流程名称：请假流程为：20
+            String C_WORKFLOW = "20";
+            //审批状态：已通过：3，驳回：5
+            String C_STATUS = "5";
+
+            RecordSet rs = new RecordSet();
+            String sql = "select lcbh from "+mainTable+" where requestid = "+requestId+"";
+            rs.execute(sql);
+            log.writeLog("----------------》打印sql语句"+sql);
+            while (rs.next()) {
+                C_OA_NUM = Util.null2String(rs.getString("lcbh"));//申请单号
+            }
+
+
+            Map<String,Object> map = new HashMap<String,Object>();
+            map.put("C_OA_NUM",C_OA_NUM);
+            map.put("C_APPLY_SOURCE",C_APPLY_SOURCE);
+            map.put("C_WORKFLOW",C_WORKFLOW);
+            map.put("C_STATUS",C_STATUS);
+            String strParm = JSONObject.toJSONString(map);
+            log.writeLog("---------------打印的Map数据为：-----------------："+strParm);
+
+            //获取Token
+            String token = HttpClientToDC.getToken();
+            log.writeLog("请假申请单token------>" + token);
+            log.writeLog("请假申请单url------>" + url);
+
+            //调用NCC接口，将数据传给NCC
+            String returndata = HttpClientToDC.sendPostApi(url,token,strParm);
+            log.writeLog("【调用数据中台请假申请单接口返回结果:】" + returndata);
+            if (!"".equals(returndata) && returndata != null) {
+                JSONObject jsonObject = JSONObject.parseObject(returndata);
+                String code = Util.null2String(jsonObject.get("code"));
+                log.writeLog("--------发送请求返回的code值为：" + code);
+                if ("1".equals(code)) {
+                    return SUCCESS;
+                } else {
+                    String msg = Util.null2String(jsonObject.get("msg"));
+                    requestInfo.getRequestManager().setMessageid("111100");
+                    requestInfo.getRequestManager().setMessagecontent(msg);
+                    return "0";
+                }
+            }else {
+                String ermsg = "流程数据已审批状态提交至中台失败，请联系系统管理员处理！";
+                requestInfo.getRequestManager().setMessageid("111100");
+                requestInfo.getRequestManager().setMessagecontent(ermsg);
+                return "0";
+            }
+        }catch (Exception e){
+            //返回0，调用失败
+            log.writeLog("------------------------捕获到的异常是：" + e.toString());
+            return "0";
+        }
+    }
+    
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/action/QingjiaHuiChuanSuccessAction.java b/src/main/youhong_ai_jitu_src/jntchina/action/QingjiaHuiChuanSuccessAction.java
new file mode 100644
index 0000000..b266bc8
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/action/QingjiaHuiChuanSuccessAction.java
@@ -0,0 +1,101 @@
+package jntchina.action;
+
+import com.alibaba.fastjson.JSONObject;
+import jntchina.util.HttpClientToDC;
+import selfdev.util.base.BaseUtil;
+import selfdev.util.log.LogTool;
+import weaver.conn.RecordSet;
+import weaver.file.Prop;
+import weaver.general.Util;
+import weaver.interfaces.workflow.action.BaseAction;
+import weaver.soa.workflow.request.RequestInfo;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @description: 请假结果回传-成功-放归档节点前操作
+ * @author: daizhishun
+ * @date: 2021/9/10
+ **/
+public class QingjiaHuiChuanSuccessAction extends BaseAction {
+
+        public static LogTool log=new LogTool("/log/selfdev/action/hrm", true);
+        public String execute(RequestInfo requestInfo){
+            String requestId = requestInfo.getRequestid(); // 获取requestid
+            String workflowid = requestInfo.getWorkflowid(); // 获取workflowid
+
+            //获取工作流名称
+            String workflowname = BaseUtil.getBaseInfoByParm("workflowname", "workflow_base", "id", workflowid, "");
+            log.writeLog("--------【"+workflowname+"】数据传入中台开始----requestId值为：" + requestId);
+
+            try{
+            //获取配置文件中的参数，到时候URL路径
+            String mode = Prop.getPropValue("DevToDC_jntchina", "mode");
+            // 服务器ip：port
+            String baseUrl = Prop.getPropValue("DevToDC_jntchina", mode + "_baseUrl");
+            //访问路径拼接
+            String url = baseUrl + "/dcoaapi/hr/attendance";
+
+            //根据流程id获取主表名称
+            String mainTable = RegularizationApplyForAction.getMainTable(requestId);
+            log.writeLog("--------获取到的表名为----：" + mainTable);
+            //申请单号
+            String C_OA_NUM = "";
+            //单据来源：默认OA
+            String C_APPLY_SOURCE = "OA";
+            //流程名称：请假流程为：20
+            String C_WORKFLOW = "20";
+            //审批状态：已通过：3，驳回：5
+            String C_STATUS = "3";
+
+            RecordSet rs = new RecordSet();
+            String sql = "select lcbh from "+mainTable+" where requestid = "+requestId+"";
+            rs.execute(sql);
+            log.writeLog("----------------》打印sql语句"+sql);
+            while (rs.next()) {
+                C_OA_NUM = Util.null2String(rs.getString("lcbh"));//申请单号
+            }
+
+
+                Map<String,Object> map = new HashMap<String,Object>();
+                map.put("C_OA_NUM",C_OA_NUM);
+                map.put("C_APPLY_SOURCE",C_APPLY_SOURCE);
+                map.put("C_WORKFLOW",C_WORKFLOW);
+                map.put("C_STATUS",C_STATUS);
+                String strParm = JSONObject.toJSONString(map);
+                log.writeLog("---------------打印的Map数据为：-----------------："+strParm);
+
+                //获取Token
+                String token = HttpClientToDC.getToken();
+                log.writeLog("请假申请单token------>" + token);
+                log.writeLog("请假申请单url------>" + url);
+
+                //调用NCC接口，将数据传给NCC
+                String returndata = HttpClientToDC.sendPostApi(url,token,strParm);
+                log.writeLog("【调用数据中台请假申请单接口返回结果:】" + returndata);
+                if (!"".equals(returndata) && returndata != null) {
+                    JSONObject jsonObject = JSONObject.parseObject(returndata);
+                    String code = Util.null2String(jsonObject.get("code"));
+                    log.writeLog("--------发送请求返回的code值为：" + code);
+                    if ("1".equals(code)) {
+                        return SUCCESS;
+                    } else {
+                        String msg = Util.null2String(jsonObject.get("msg"));
+                        requestInfo.getRequestManager().setMessageid("111100");
+                        requestInfo.getRequestManager().setMessagecontent(msg);
+                        return "0";
+                    }
+                }else {
+                    String ermsg = "流程数据已审批状态提交至中台失败，请联系系统管理员处理！";
+                    requestInfo.getRequestManager().setMessageid("111100");
+                    requestInfo.getRequestManager().setMessagecontent(ermsg);
+                    return "0";
+                }
+            }catch (Exception e){
+                //返回0，调用失败
+                log.writeLog("------------------------捕获到的异常是：" + e.toString());
+                return "0";
+        }
+    }
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/action/RegularizationApplyForAction.java b/src/main/youhong_ai_jitu_src/jntchina/action/RegularizationApplyForAction.java
new file mode 100644
index 0000000..68206ec
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/action/RegularizationApplyForAction.java
@@ -0,0 +1,138 @@
+package jntchina.action;
+
+
+
+
+import com.alibaba.fastjson.JSONObject;
+import jntchina.util.HttpClientToDC;
+import selfdev.util.base.BaseUtil;
+import selfdev.util.log.LogTool;
+import weaver.conn.RecordSet;
+import weaver.file.Prop;
+import weaver.general.Util;
+import weaver.interfaces.workflow.action.BaseAction;
+import weaver.soa.workflow.request.RequestInfo;
+
+import java.util.HashMap;
+import java.util.Map;
+
+
+/**
+ * @description: 转正申请单 - 审批结果回传
+ * @author: dzs
+ * @date: 2021/7/22
+ **/
+public class RegularizationApplyForAction extends BaseAction {
+
+    @Override
+    public String execute(RequestInfo requestInfo) {
+        LogTool log = new LogTool("/log/selfdev/action/hrm", true);
+        String requestId = requestInfo.getRequestid(); // 获取requestid
+        String workflowid=requestInfo.getWorkflowid(); // 获取workflowid
+        //获取工作流名称
+        String workflowname= BaseUtil.getBaseInfoByParm("workflowname", "workflow_base", "id", workflowid, "");
+        log.writeLog("---------------工作流名称-----------workflowname为：" + workflowname);
+        log.writeLog("--------转正申请单数据传入中台开始----requestId值为：" + requestId);
+
+        //获取配置文件中的参数
+        String mode = Prop.getPropValue("DevToDC_jntchina","mode");
+        // 服务器ip：port
+        String baseUrl = Prop.getPropValue("DevToDC_jntchina", mode+"_baseUrl");
+        //访问路径拼接
+        String url = baseUrl+"/dcoaapi/hr/becomeRegular";
+
+
+        //根据流程id获取主表名称
+        String mainTable = RegularizationApplyForAction.getMainTable(requestId);
+        log.writeLog("--------获取到的表名为----：" + mainTable);
+        //申请单号
+        String C_APP_SEQ = "";
+        //申请日期
+        String C_APP_DT = "";
+        //审批状态 3：已通过(默认)
+        String C_APPLI_RS = "3";
+        //发起人工号
+        String EMPLID = "";
+        //转正人工号
+        String EMPLID2 = "";
+        //转正日期
+        String C_PRD_DT = "";
+
+        RecordSet rs = new RecordSet();
+        try {
+            String sql = "select C_APP_SEQ,C_APP_DT,EMPLID,EMPLID2,C_PRD_DT from " + mainTable + " where requestid='" + requestId + "'";
+            rs.execute(sql);
+            log.writeLog("----------------》打印sql语句"+sql);
+            while (rs.next()) {
+                C_APP_SEQ = Util.null2String(rs.getString("C_APP_SEQ"));//申请单号
+
+                C_APP_DT = Util.null2String(rs.getString("C_APP_DT"));//申请日期
+
+                EMPLID = Util.null2String(rs.getString("EMPLID"));//发起人工号
+
+                EMPLID2 = Util.null2String(rs.getString("EMPLID2"));//转正人工号
+
+                C_PRD_DT = Util.null2String(rs.getString("C_PRD_DT"));//转正日期
+            }
+
+            //使用Map封装数据
+            Map<String,String> map = new HashMap<String,String>();
+            map.put("C_APP_SEQ",C_APP_SEQ);
+            map.put("C_APP_DT",C_APP_DT);
+            map.put("C_APPLI_RS",C_APPLI_RS);
+            map.put("EMPLID",EMPLID);
+            map.put("EMPLID2",EMPLID2);
+            map.put("C_PRD_DT",C_PRD_DT);
+            String strParm = JSONObject.toJSONString(map);
+            log.writeLog("---------------打印的Map数据为：-----------------："+strParm);
+
+            //获取Token
+            String token = HttpClientToDC.getToken();
+            log.writeLog("转正申请单token------>" + token);
+            log.writeLog("转正申请单url------>" + url);
+
+
+            //调用NCC接口，将数据传给NCC
+            String returndata = HttpClientToDC.sendPostApi(url,token,strParm);
+            log.writeLog("【调用数据中台转正申请单接口返回结果result:】" + returndata);
+            if (!"".equals(returndata) && returndata != null) {
+                JSONObject jsonObject = JSONObject.parseObject(returndata);
+                String code = Util.null2String(jsonObject.get("code"));
+                log.writeLog("--------发送请求返回的code值为：" + code);
+                if("1".equals(code)){
+                    return SUCCESS;
+                }else{
+                    String msg = Util.null2String(jsonObject.get("msg"));
+                    requestInfo.getRequestManager().setMessageid("111100");
+                    requestInfo.getRequestManager().setMessagecontent(msg);
+                    return "0";
+                }
+            }else{
+                String ermsg="流程数据写入NCC转正申请单失败,未获取到接口返回结果，请联系系统管理员处理！";
+                requestInfo.getRequestManager().setMessageid("111100");
+                requestInfo.getRequestManager().setMessagecontent(ermsg);
+                return "0";
+            }
+        }catch (Exception e) {
+            //返回0，调用失败
+            log.writeLog("------------------------捕获到的异常是：" + e.toString());
+            return "0";
+        }
+    }
+
+    /**
+     * 使用requestid获取数据库表名
+     * @param requestid
+     * @return
+     */
+    public static String getMainTable(String requestid){
+        String tablename = "";
+        RecordSet rs = new RecordSet();
+        rs.executeQuery("select * from workflow_requestbase a,workflow_base b,workflow_bill c "
+                +"where a.requestid=? and a.workflowid = b.id and b.formid = c.id",requestid);
+        while(rs.next()){
+            tablename = Util.null2String(rs.getString("tablename"));
+        }
+        return tablename;
+    }
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/action/ReimbursementDataValid.java b/src/main/youhong_ai_jitu_src/jntchina/action/ReimbursementDataValid.java
new file mode 100644
index 0000000..7333cd9
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/action/ReimbursementDataValid.java
@@ -0,0 +1,135 @@
+package jntchina.action;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+
+import com.working.util.WorkflowUtil;
+import selfdev.util.log.LogTool;
+import weaver.conn.RecordSet;
+import weaver.general.Util;
+import weaver.interfaces.workflow.action.Action;
+import weaver.interfaces.workflow.action.BaseAction;
+import weaver.soa.workflow.request.RequestInfo;
+
+/**
+ * @Author Administrator
+ * @Description 报销单数据校验
+ * @Date 2021/1/16  16:27
+ */
+public class ReimbursementDataValid extends BaseAction {
+
+    @Override
+    public String execute(RequestInfo requestInfo) {
+
+        String src = requestInfo.getRequestManager().getSrc();//获取操作方式
+        if (!"submit".equals(src)) { // 只有submit才执行接口
+            return SUCCESS;
+        }
+
+        LogTool log = new LogTool("/log/selfdev/action", false);
+        String requestId = requestInfo.getRequestid(); // 获取requestid
+        log.writeLog("--------报销单数据校验开始----requestId值为：" + requestId);
+
+        RecordSet rs = new RecordSet();
+        RecordSet rs2 = new RecordSet();
+        RecordSet rs3 = new RecordSet();
+        String mainTable = WorkflowUtil.getMainTable(requestId);
+        String mainId = "";
+        String sql = " select id  from " + mainTable + " where requestid='" + requestId + "'";
+        rs.execute(sql);
+        while (rs.next()) {
+            mainId = Util.null2String(rs.getString("id"));
+        }
+
+        StringBuilder message = new StringBuilder();
+        
+
+        //查询是否有发票被多行分摊
+        sql="select fphm  from " + mainTable + "_dt8  where fphm is not null and mainid="+mainId+" group by fphm having count(*)>1";
+        rs.execute(sql);
+        int row=rs.getCounts();
+        if(row>0){
+        	while(rs.next()){
+        		BigDecimal bd_temp=new BigDecimal("0");
+        		String fphm=Util.null2String(rs.getString("fphm"));//发票号码
+        		String sql2="select a.*,b.invoicecode,b.invoicenumber,b.taxincludedprice,b.tax from " + mainTable + "_dt8 a,fnainvoiceledger b where a.mainid="+mainId+" and a.fphm=b.id and a.fphm ='"+fphm+"'";
+        		rs2.execute(sql2);
+        		int row2=rs2.getCounts();
+        		int temp2=0;
+        		while(rs2.next()){
+        			String id=Util.null2String(rs2.getString("id"));//主键ID
+                	String je=Util.null2o(rs2.getString("je"));//付款金额
+                	String sl=Util.null2o(rs2.getString("sl"));//税率
+                	String tax=Util.null2o(rs2.getString("tax"));//发票税金
+                	BigDecimal bd_tax=new BigDecimal(tax);
+                	//税额=总金额/(1+税率)*税率
+                	BigDecimal bd_se=new BigDecimal(je).divide(new BigDecimal("100").add(new BigDecimal(sl)), 10, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(sl)).setScale(2, RoundingMode.HALF_UP);
+                	
+                	bd_temp=bd_temp.add(bd_se);
+                	temp2++;
+                	
+                	if(row2==temp2){//最后一行
+                		//可能存在相除有差额的情况
+                		if(bd_temp.compareTo(bd_tax)!=0){
+                			//两者相差多少
+                			BigDecimal bd_xe=bd_temp.subtract(bd_tax);
+                			log.writeLog("bd_temp=【"+bd_temp+"】、bd_tax=【"+bd_tax+"】，两者相差的税额bd_xe------------>"+bd_xe);
+                			//当相差低于0.2元时,则将差额算在最后一行上面
+                			if(bd_xe.compareTo(new BigDecimal("0.2"))<=0&&bd_xe.compareTo(new BigDecimal("-0.2"))>=0){
+                				bd_se=bd_se.subtract(bd_xe).setScale(2, RoundingMode.HALF_UP);
+                			}
+                		}
+                	}
+                	//不含税金额=付款金额-税额
+                	BigDecimal bhsje=new BigDecimal(je).subtract(bd_se).setScale(2, RoundingMode.HALF_UP);
+                	
+                	//一张发票是否被多个明细行引用时，将此行的税额和不含税金额刷新，其中税额=总金额/(1+税率)*税率
+                    sql = "update " + mainTable + "_dt8 set se="+bd_se+",bhsje="+bhsje+"  where mainid= "+mainId+" and id= "+id;
+                    log.writeLog("一张发票被多个明细行引用刷新其税额和不含税金额sql------------>"+sql);
+                    rs3.execute(sql);
+        		}
+        	}
+        }
+        
+        //判断不含税金额是否小于等于0
+        sql="select * from  " + mainTable + "_dt8 where bhsje<=0 and mainId="+mainId;
+        rs.execute(sql);
+        while (rs.next()) {
+        	message.append("报销明细表中报销金额【"+Util.null2String(rs.getString("je"))+"】-税额【"+Util.null2String(rs.getString("se"))+"】=不含税金额【"+Util.null2String(rs.getString("bhsje"))+"】须大于0</br>");
+        }
+        
+        //查询报销金额合计是否超出发票金额，报销税额合计是否超出发票税金
+        sql = " select a.*,b.invoicecode,b.invoicenumber,b.taxincludedprice,b.tax,"
+        		+ "(case when a.je-b.taxincludedprice>0 then 'yes' else 'no' end) as bxjesfcc,"
+        		+ "(case when a.se-b.tax>0 then 'yes' else 'no' end) as sjsfcc from ( ";
+        sql+=" select fphm,sum(je) as je,sum(se) as se  from " + mainTable + "_dt8  where fphm is not null and mainid="+mainId+" group by fphm";
+        sql+=" ) a ,fnainvoiceledger b where a.fphm=b.id  and (a.je>b.taxincludedprice or a.se>b.tax) ";
+        log.writeLog("查询报销金额合计是否超出发票金额，报销税额合计是否超出发票税金sql------------>"+sql);
+        rs.execute(sql);
+        while (rs.next()) {
+        	String bxjesfcc=Util.null2String(rs.getString("bxjesfcc"));//报销是否已超出
+        	String sjsfcc=Util.null2String(rs.getString("sjsfcc"));//税金是否已超出
+        	String invoiceNumber=Util.null2String(rs.getString("invoicenumber"));//发票号码
+        	String je=Util.null2String(rs.getString("je"));//报销金额
+        	String se=Util.null2String(rs.getString("se"));//报销税金
+        	String taxincludedprice=Util.null2String(rs.getString("taxincludedprice"));//发票金额
+        	String tax=Util.null2String(rs.getString("tax"));//发票税金
+        	if("yes".equals(bxjesfcc)){
+        		message.append("报销明细表中发票号【").append(invoiceNumber).append("】的明细行报销金额合计【"+je+"】元超出发票金额【"+taxincludedprice+"】元！</br>");
+        	}
+        	if("yes".equals(sjsfcc)){
+        		//可能存在相除有差额的情况，当相差低于0.2元时可以正常通过
+        		if(new BigDecimal(se).subtract(new BigDecimal(tax)).compareTo(new BigDecimal("0.2"))>0){
+        			message.append("报销明细表中发票号【").append(invoiceNumber).append("】的明细行税额合计【"+se+"】元超出发票税金【"+tax+"】元！</br>");
+        		}
+        	}
+        }
+        if (!"".equals(message.toString())) {
+            requestInfo.getRequestManager().setMessagecontent(message.toString());
+            return Action.FAILURE_AND_CONTINUE;
+        }
+
+        log.writeLog("--------报销单数据校验完毕----requestId值为：" + requestId);
+        return Action.SUCCESS;
+    }
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/action/ReimbursementOrderAction.java b/src/main/youhong_ai_jitu_src/jntchina/action/ReimbursementOrderAction.java
new file mode 100644
index 0000000..9fb6155
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/action/ReimbursementOrderAction.java
@@ -0,0 +1,316 @@
+package jntchina.action;
+
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.serializer.SerializerFeature;
+import com.working.util.WorkflowUtil;
+import jntchina.entity.ReimbursementOrder;
+import jntchina.entity.ReimbursementOrderBody;
+import jntchina.util.DataBaseUtils;
+import jntchina.util.HttpClientToDC;
+import selfdev.util.base.BaseUtil;
+import selfdev.util.base.TimeCommonUtil;
+import selfdev.util.log.LogTool;
+import weaver.conn.RecordSet;
+import weaver.file.Prop;
+import weaver.general.Util;
+import weaver.hrm.resource.ResourceComInfo;
+import weaver.interfaces.workflow.action.Action;
+import weaver.interfaces.workflow.action.BaseAction;
+import weaver.soa.workflow.request.RequestInfo;
+
+import java.util.*;
+
+/**
+ * @Author Administrator
+ * @Description 报销单数据传入NCC生成单据
+ * @Date 2021/1/8  12:14
+ */
+public class ReimbursementOrderAction extends BaseAction {
+    @Override
+    public String execute(RequestInfo requestInfo) {
+        String src = requestInfo.getRequestManager().getSrc();//获取操作方式
+        if (!"submit".equals(src)) { // 只有submit才执行接口
+            return SUCCESS;
+        }
+        LogTool log = new LogTool("/log/selfdev/action", false);
+        String requestId = requestInfo.getRequestid(); // 获取requestid
+        //获取当前用户的登录账号（即工号）
+        String loginid=requestInfo.getRequestManager().getUser().getLoginid();
+        log.writeLog("--------报销单数据传入中台开始----requestId值为：" + requestId);
+        //获取配置文件中的参数
+    	String mode = Prop.getPropValue("DevToDC_jntchina","mode");
+        // 服务器ip：port
+        String baseUrl = Prop.getPropValue("DevToDC_jntchina", mode+"_baseUrl");
+        //String url = baseUrl+ "/dcoaapi/claimForm/receiveData";
+        String url = baseUrl+ "/dcnccapi/claimForm/receiveData";
+//        List<ReimbursementOrder> reimbursementList=new ArrayList<ReimbursementOrder>();
+        ReimbursementOrder reimbursementOrder = new ReimbursementOrder();
+
+        String mainTable = WorkflowUtil.getMainTable(requestId);
+        String mainId = "";
+        String isShowErrorMsg = "";//写入NCC失败时是否显示报错信息
+        String pk_org = ""; // 报销单位 JTSDCN0001
+        String total = ""; // 报销金额   金额由表体相应字段汇总得出
+        String deptid = ""; // 报销人部门   传输编码--------------SD3300201
+        String djlxbm = "264X-Cxx-DSBXD"; // 单据类型编码   对私报销单:264X-Cxx-DSBXD  对公报销单:264X-Cxx-DGBXD，此处固定传【264X-Cxx-DSBXD】
+        String djrq = TimeCommonUtil.obtainDate(0); // 单据日期   yyyy-mm-dd hh:mm:ss
+        String payflag = ""; // 支付状态
+        String paytarget = "0"; // 收款对象   0=员工，1=供应商，2=客户，默认为员工
+        String receiver = ""; // 收款人
+        String skyhzh = ""; // 收款人银行账号
+        String jkbxr = ""; // 借款报销人   传输编码
+        String operator = ""; // 录入人
+        String jsfs = ""; // 结算方式 3 网银
+        String fkyhzh = ""; // 单位银行账户 传输编码
+        String jobid = ""; // 项目
+        String zy = ""; // 报销事由
+        String kjqj = ""; // 会计期间
+        String kjnd = ""; // 会计年度
+        String fjzs = ""; // 附件张数   需业务人员在OA上传附件同时填写附件张数后传数据到NCC
+        String zyx1 = ""; // OA单据号   OA传过来，用于联查单据
+        String zyx2 = ""; // 提交人    提交人姓名
+        String zyx3 = ""; // OA核销单号
+        String zyx5 = ""; // OARequestID
+
+        String xm="";//申请人
+        String bxrbm="";//报销人部门
+        String bxr="";//报销人
+        String zyx8="";//银行付款备注
+        String zyx9=requestInfo.getRequestManager().getRequestname();//标题
+        
+        RecordSet rs = new RecordSet();
+        try {
+            String sql = " select *  from " + mainTable + " where requestid='" + requestId + "'";
+            rs.execute(sql);
+            while (rs.next()) {
+                mainId = Util.null2String(rs.getString("id"));
+                isShowErrorMsg = Util.null2String(rs.getString("xrnccsbcsfts"));
+                pk_org = Util.null2String(rs.getString("gsmc")); // 报销单位
+                xm = Util.null2String(rs.getString("xm")); // 申请人
+                bxr = Util.null2String(rs.getString("bxr")); // 报销人
+                total = Util.null2String(rs.getString("bxje")); // 报销金额   金额由表体相应字段汇总得出
+//                djrq = Util.null2String(rs.getString("cjrq")); // 单据日期   yyyy-mm-dd hh:mm:ss
+                payflag = Util.null2String(rs.getString("")); // 支付状态
+                bxrbm = Util.null2String(rs.getString("bxrbm")); //报销人部门
+                zyx8 = Util.null2String(rs.getString("yxfkbz")); //银行付款备注
+                jsfs = Util.null2String(rs.getString("bxfs")); //付款方式
+                skyhzh = Util.null2String(rs.getString("skkh")).replace(" ", ""); //收款人银行账号（中间若有空格过滤）
+                fkyhzh = Util.null2String(rs.getString("")); // 付款银行账户 传输编码
+                jobid = Util.null2String(rs.getString("")); // 项目
+                zy = Util.null2String(rs.getString("bxsm")); // 报销事由
+                
+                fjzs = Util.null2String(rs.getString("fjzs")); // 附件张数   需业务人员在OA上传附件同时填写附件张数后传数据到NCC
+                zyx1 = Util.null2String(rs.getString("lcbh")); // OA单据号   OA传过来，用于联查单据
+                zyx2 = new ResourceComInfo().getLastname(xm); // 提交人    提交人姓名
+                zyx5 = requestId; // OARequestID
+            }
+            kjqj = djrq.substring(5,7); //  会计期间
+            kjnd = djrq.substring(0,4); // 会计年度
+            //查询冲抵明细
+            sql = " select *  from " + mainTable + "_dt2 where mainid='" + mainId + "'";
+            rs.execute(sql);
+            while (rs.next()) {
+            	zyx3+=Util.null2String(rs.getString("jklcbh"))+",";
+            }
+            //将借款单号赋值到zyx3字段中
+            if(!"".equals(zyx3)){
+            	zyx3=zyx3.substring(0,zyx3.length()-1);
+            }
+            //根据部门ID查询部门编码
+            deptid=BaseUtil.getBaseInfoByParm("departmentcode", "hrmdepartment", "id", bxrbm, "");
+            
+            operator = loginid;//当前节点操作者
+            receiver = new ResourceComInfo().getWorkcode(bxr); //收款人,与报销人一致
+            jkbxr = receiver; // 报销人,与报销人一致
+            //截取前150位
+            if(zy.length()>120){
+            	zy=zy.substring(0,120);
+            }
+            //结算方式
+            if("0".equals(jsfs)){
+            	jsfs = "3"; //网银
+            }else{
+            	jsfs = "0"; //现金
+            }
+            //获取UUID
+            String uuid=UUID.randomUUID().toString().replace("-", "").toUpperCase();
+            
+            reimbursementOrder.setUuid(uuid);
+            reimbursementOrder.setPk_org(pk_org);
+            reimbursementOrder.setTotal(total);
+            reimbursementOrder.setDeptid(deptid);
+            reimbursementOrder.setDjlxbm(djlxbm);
+            reimbursementOrder.setDjrq(djrq);
+            reimbursementOrder.setPayflag(payflag);
+            reimbursementOrder.setPaytarget(paytarget);
+            reimbursementOrder.setReceiver(receiver);
+            reimbursementOrder.setSkyhzh(skyhzh);
+            reimbursementOrder.setJkbxr(jkbxr);
+            reimbursementOrder.setOperator(operator);
+            reimbursementOrder.setJsfs(jsfs);
+            reimbursementOrder.setFkyhzh(fkyhzh);
+            reimbursementOrder.setJobid(jobid);
+            reimbursementOrder.setZy(zy);
+            reimbursementOrder.setKjqj(kjqj);
+            reimbursementOrder.setKjnd(kjnd);
+            reimbursementOrder.setFjzs(fjzs);
+            reimbursementOrder.setZyx1(zyx1);
+            reimbursementOrder.setZyx2(zyx2);
+            reimbursementOrder.setZyx3(zyx3);
+            reimbursementOrder.setZyx5(zyx5);
+            reimbursementOrder.setZyx8(zyx8);
+            reimbursementOrder.setZyx9(zyx9);
+            log.writeLog("【header数据准备完毕...】");
+
+            //获取OA-NCC发票映射关系表
+            Map<String,String> map_oafplx_nccfplcx=BaseUtil.getMapKeyValueInfoByParm("uf_oafplx_nccfplx", "", "oafplxid", "nccfplxbm");
+            List<ReimbursementOrderBody> reimbursementOrderBodyList = new ArrayList<ReimbursementOrderBody>();
+            String tablecode = "arap_bxbusitem"; // 默认固定值 arap_bxbusitem
+            int rowno = 10;
+            rs.execute(" select b.bm as szxmbm,c.INVOICECODE,c.INVOICENUMBER,c.invoicetype,a.* from " + mainTable + "_dt8 a "
+            		+ "left join uf_fylx b on to_char(a.bxlx,'9999')=to_char(b.id,'9999') "
+            		+ "left join fnainvoiceledger c on a.fphm=c.id "
+            		+ "where a.mainid = " + mainId);
+            log.writeLog("查询报销明细sql------>"+sql);
+            while (rs.next()) {
+            	rowno++;//行号
+                ReimbursementOrderBody body = new ReimbursementOrderBody();
+                String jobid1 = Util.null2String(rs.getString("")); // 项目
+                String amount = Util.null2o(rs.getString("je")); // 报销金额
+                String tax_rate = Util.null2o(rs.getString("sl")); // 税率 3%
+                String tax_amount = Util.null2o(rs.getString("se")); // 税额
+                String tni_amount = Util.null2String(rs.getString("bhsje")); // 无税金额
+                String szxmid = Util.null2String(rs.getString("szxmbm")); // 收支项目  0101 汽车费用
+                String fpdm = Util.null2String(rs.getString("INVOICECODE")); // 发票代码
+                String fphm = Util.null2String(rs.getString("INVOICENUMBER")); // 发票号码
+                String defitem46 = Util.null2String(rs.getString("wd")); // 网点（成本中心）
+                String defitem45 = Util.null2String(rs.getString("gj")); // 国家
+                String defitem44 = Util.null2String(rs.getString("ck")); // 仓库
+                String defitem43 = Util.null2String(rs.getString("cph")); //车牌号
+                String defitem42 = Util.null2String(rs.getString("id")); // OA明细行ID
+                String defitem36 = Util.null2o(rs.getString("fpje")); // 发票金额
+                String invoicetype = Util.null2String(rs.getString("invoicetype")); // OA发票类型
+                
+                String  fygsbm = Util.null2String(rs.getString("fygsbm")); // 费用承担部门
+                //根据部门ID查询部门编码
+                String fygsbm_NCC=BaseUtil.getBaseInfoByParm("departmentcode", "hrmdepartment", "id", fygsbm, "");
+                //发票金额为空时，默认等于付款金额
+                if(Double.parseDouble(defitem36)==0){
+                	defitem36=amount;
+                }
+
+                //NCC发票类型
+                String fplxpk=Util.null2String(map_oafplx_nccfplcx.get(invoicetype));
+                log.writeLog("----amount:" + amount);
+                log.writeLog("----tax_rate:" + tax_rate);
+                log.writeLog("----tax_amount:" + tax_amount);
+                log.writeLog("----tni_amount:" + tni_amount);
+                log.writeLog("----fygsbm_NCC:" + fygsbm_NCC);
+                log.writeLog("----defitem36:" + defitem36);
+
+                body.setJobid(jobid1);
+                body.setDeptid(fygsbm_NCC);
+                body.setAmount(amount);
+                body.setTax_rate(tax_rate);
+                body.setTax_amount(tax_amount);
+                body.setTni_amount(tni_amount);
+                body.setTablecode(tablecode);
+                body.setRowno(rowno+"");
+                body.setSzxmid(szxmid);
+                body.setFpdm(fpdm);
+                body.setFphm(fphm);
+                body.setFplxpk(fplxpk);
+                body.setDefitem46(defitem46);
+                body.setDefitem45(defitem45);
+                body.setDefitem44(defitem44);
+                body.setDefitem43(defitem43);
+                body.setDefitem42(defitem42);
+                //body.setDefitem48(fygsbm_NCC);
+                body.setDefitem36(defitem36);
+                reimbursementOrderBodyList.add(body);
+            }
+            reimbursementOrder.setEr_busitem(reimbursementOrderBodyList);
+//            reimbursementList.add(reimbursementOrder);
+            String parm=JSONObject.toJSONString(reimbursementOrder, SerializerFeature.DisableCircularReferenceDetect);
+            log.writeLog("报销单准备传入NCC的数据为------>" + parm);
+
+            //获取TOKEN
+            String token = HttpClientToDC.getToken();
+            log.writeLog("获取数据中台的token------>" + token);
+            if ("".equals(Util.null2String(token))) {
+                String tokenMsg="流程提交失败，未获取到数据中台接口TOKEN，请联系管理员处理！";
+            	//将NCC返回结果回写至OA流程表单
+                rs.execute(" update " + mainTable + " set sfcgscnccfkd = 1 ,nccfhxx='" + tokenMsg.replace("'", "''") + "'  where requestid = " + requestId); 
+                //是否需要显示报错信息
+                if("yes".equals(isShowErrorMsg)){
+                	requestInfo.getRequestManager().setMessagecontent(tokenMsg);
+                    return Action.FAILURE_AND_CONTINUE;
+                }else{
+                	return SUCCESS;
+                }
+            }
+
+
+
+            log.writeLog("param:"+parm);
+            
+
+            //调用NCC接口，将数据传给NCC
+            String returndata = HttpClientToDC.sendPostApi(url,token, parm);
+            log.writeLog("【调用数据中台报销接口返回结果result:】" + returndata);
+            if (!"".equals(returndata) && returndata != null) {
+                JSONObject jsonObject = JSONObject.parseObject(returndata);
+                String success = Util.null2String(jsonObject.get("succ"));
+                log.writeLog("--------发送请求返回的success值为：" + success);
+                if ("true".equals(success)) {
+                	JSONObject data = jsonObject.getJSONObject("data");
+                    String billno = Util.null2String(data.get("billno"));//NCC单号
+                    log.writeLog("--------发送请求返回的billno值为：" + billno);
+                    //将NCC返回结果回写至OA流程表单
+                    rs.execute(" update " + mainTable + " set sfcgscnccfkd = 0 , nccfkdh = '" + billno + "',nccfhxx=''  where requestid = " + requestId); 
+                } else {
+                	String message = Util.null2String(jsonObject.get("msg"));
+                	String message2=message.replace("'", "''");
+                	//超出1333个字符，则只截取前面这部分
+                	if(message2.length()>1334){
+                		message2=message2.substring(0,1333);
+                	}
+                	//将NCC返回结果回写至OA流程表单
+                    rs.execute(" update " + mainTable + " set sfcgscnccfkd = 1 ,nccfhxx='" + message2 + "'  where requestid = " + requestId); 
+                    //是否需要显示报错信息
+                    if("yes".equals(isShowErrorMsg)){
+                    	requestInfo.getRequestManager().setMessagecontent("流程数据写入NCC对私报销单失败,失败信息：<br/>"+message);
+                        return Action.FAILURE_AND_CONTINUE;
+                    }else{
+                    	return SUCCESS;
+                    }
+                }
+            } else {
+                String ermsg="流程数据写入NCC对私报销单失败,未获取到接口返回结果，请联系系统管理员处理！";
+            	//将NCC返回结果回写至OA流程表单
+                rs.execute(" update " + mainTable + " set sfcgscnccfkd = 1 ,nccfhxx='" + ermsg.replace("'", "''") + "'  where requestid = " + requestId); 
+                //是否需要显示报错信息
+                if("yes".equals(isShowErrorMsg)){
+                	requestInfo.getRequestManager().setMessagecontent(ermsg);
+                    return Action.FAILURE_AND_CONTINUE;
+                }else{
+                	return SUCCESS;
+                }
+            }
+
+        } catch (Exception e) {
+            String ermsg="流程数据生成NCC对私报销单失败！" + e.toString();
+        	//将NCC返回结果回写至OA流程表单
+            rs.execute(" update " + mainTable + " set sfcgscnccfkd = 1 ,nccfhxx='" + ermsg.replace("'", "''") + "'  where requestid = " + requestId); 
+            //是否需要显示报错信息
+            if("yes".equals(isShowErrorMsg)){
+            	requestInfo.getRequestManager().setMessagecontent(ermsg);
+                return Action.FAILURE_AND_CONTINUE;
+            }else{
+            	return SUCCESS;
+            }
+        }
+        log.writeLog("--------报销单数据传入NCC完毕----requestId值为：" + requestId);
+        return Action.SUCCESS;
+    }
+}
\ No newline at end of file
diff --git a/src/main/youhong_ai_jitu_src/jntchina/action/ReimbursementOrderActionAddCD.java b/src/main/youhong_ai_jitu_src/jntchina/action/ReimbursementOrderActionAddCD.java
new file mode 100644
index 0000000..84b67c3
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/action/ReimbursementOrderActionAddCD.java
@@ -0,0 +1,335 @@
+package jntchina.action;
+
+import java.util.*;
+
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.serializer.SerializerFeature;
+import com.working.util.WorkflowUtil;
+
+import jntchina.entity.ReimbursementOrder;
+import jntchina.entity.ReimbursementOrderBody;
+import jntchina.util.DataBaseUtils;
+import jntchina.util.HttpClientToDC;
+import selfdev.util.base.BaseUtil;
+import selfdev.util.base.TimeCommonUtil;
+import selfdev.util.log.LogTool;
+import weaver.conn.RecordSet;
+import weaver.file.Prop;
+import weaver.general.Util;
+import weaver.hrm.resource.ResourceComInfo;
+import weaver.interfaces.workflow.action.Action;
+import weaver.interfaces.workflow.action.BaseAction;
+import weaver.soa.workflow.request.RequestInfo;
+
+/**
+ * @Author Administrator
+ * @Description 报销单数据传入NCC生成单据
+ * @Date 2021/1/8  12:14
+ */
+    public class ReimbursementOrderActionAddCD extends BaseAction {
+    @Override
+    public String execute(RequestInfo requestInfo) {
+        String src = requestInfo.getRequestManager().getSrc();//获取操作方式
+        if (!"submit".equals(src)) { // 只有submit才执行接口
+            return SUCCESS;
+        }
+        LogTool log = new LogTool("/log/selfdev/action", false);
+        String requestId = requestInfo.getRequestid(); // 获取requestid
+        //获取当前用户的登录账号（即工号）
+        String loginid=requestInfo.getRequestManager().getUser().getLoginid();
+        log.writeLog("--------报销单数据传入中台开始----requestId值为：" + requestId);
+        //获取配置文件中的参数
+    	String mode = Prop.getPropValue("DevToDC_jntchina","mode");
+        // 服务器ip：port
+        String baseUrl = Prop.getPropValue("DevToDC_jntchina", mode+"_baseUrl");
+        //String url = baseUrl+ "/dcoaapi/claimForm/receiveData";
+        String url = baseUrl+ "/dcnccapi/claimForm/receiveData";
+//        List<ReimbursementOrder> reimbursementList=new ArrayList<ReimbursementOrder>();
+        ReimbursementOrder reimbursementOrder = new ReimbursementOrder();
+
+        String mainTable = WorkflowUtil.getMainTable(requestId);
+        String mainId = "";
+        String isShowErrorMsg = "";//写入NCC失败时是否显示报错信息
+        String pk_org = ""; // 报销单位 JTSDCN0001
+        String total = ""; // 报销金额   金额由表体相应字段汇总得出
+        String deptid = ""; // 报销人部门   传输编码--------------SD3300201
+        String djlxbm = "264X-Cxx-DSBXD"; // 单据类型编码   对私报销单:264X-Cxx-DSBXD  对公报销单:264X-Cxx-DGBXD，此处固定传【264X-Cxx-DSBXD】
+        String djrq = TimeCommonUtil.obtainDate(0); // 单据日期   yyyy-mm-dd hh:mm:ss
+        String payflag = ""; // 支付状态
+        String paytarget = "0"; // 收款对象   0=员工，1=供应商，2=客户，默认为员工
+        String receiver = ""; // 收款人
+        String skyhzh = ""; // 收款人银行账号
+        String jkbxr = ""; // 借款报销人   传输编码
+        String operator = ""; // 录入人
+        String jsfs = ""; // 结算方式 3 网银
+        String fkyhzh = ""; // 单位银行账户 传输编码
+        String jobid = ""; // 项目
+        String zy = ""; // 报销事由
+        String kjqj = ""; // 会计期间
+        String kjnd = ""; // 会计年度
+        String fjzs = ""; // 附件张数   需业务人员在OA上传附件同时填写附件张数后传数据到NCC
+        String zyx1 = ""; // OA单据号   OA传过来，用于联查单据
+        String zyx2 = ""; // 提交人    提交人姓名
+        String zyx3 = ""; // OA核销单号
+        String zyx5 = ""; // OARequestID
+
+        String xm="";//申请人
+        String bxrbm="";//报销人部门
+        String bxr="";//报销人
+        String zyx8="";//银行付款备注
+//        String zyx9=requestInfo.getRequestManager().getRequestname();//标题
+        String zyx9=requestInfo.getRequestManager().getRequestname().length()>140?requestInfo.getRequestManager().getRequestname().substring(0,140):requestInfo.getRequestManager().getRequestname();//标题
+
+        RecordSet rs = new RecordSet();
+        try {
+            String sql = " select *  from " + mainTable + " where requestid='" + requestId + "'";
+            rs.execute(sql);
+            while (rs.next()) {
+                mainId = Util.null2String(rs.getString("id"));
+                isShowErrorMsg = Util.null2String(rs.getString("xrnccsbcsfts"));
+                pk_org = Util.null2String(rs.getString("gsmc")); // 报销单位
+                xm = Util.null2String(rs.getString("xm")); // 申请人
+                bxr = Util.null2String(rs.getString("bxr")); // 报销人
+                total = Util.null2String(rs.getString("bxje")); // 报销金额   金额由表体相应字段汇总得出
+//                djrq = Util.null2String(rs.getString("cjrq")); // 单据日期   yyyy-mm-dd hh:mm:ss
+                payflag = Util.null2String(rs.getString("")); // 支付状态
+                bxrbm = Util.null2String(rs.getString("bxrbm")); //报销人部门
+                zyx8 = Util.null2String(rs.getString("yxfkbz")); //银行付款备注
+                jsfs = Util.null2String(rs.getString("bxfs")); //付款方式
+                skyhzh = Util.null2String(rs.getString("skkh")).replace(" ", ""); //收款人银行账号（中间若有空格过滤）
+                fkyhzh = Util.null2String(rs.getString("")); // 付款银行账户 传输编码
+                jobid = Util.null2String(rs.getString("")); // 项目
+                zy = Util.null2String(rs.getString("bxsm")); // 报销事由
+                
+                fjzs = Util.null2String(rs.getString("fjzs")); // 附件张数   需业务人员在OA上传附件同时填写附件张数后传数据到NCC
+                zyx1 = Util.null2String(rs.getString("lcbh")); // OA单据号   OA传过来，用于联查单据
+                zyx2 = new ResourceComInfo().getLastname(xm); // 提交人    提交人姓名
+                zyx5 = requestId; // OARequestID
+            }
+            kjqj = djrq.substring(5,7); //  会计期间
+            kjnd = djrq.substring(0,4); // 会计年度
+            //查询冲抵明细
+            sql = " select *  from " + mainTable + "_dt2 where mainid='" + mainId + "'";
+            rs.execute(sql);
+            while (rs.next()) {
+            	zyx3+=Util.null2String(rs.getString("jklcbh"))+",";
+            }
+            //将借款单号赋值到zyx3字段中
+            if(!"".equals(zyx3)){
+            	zyx3=zyx3.substring(0,zyx3.length()-1);
+            }
+            //根据部门ID查询部门编码
+            deptid=BaseUtil.getBaseInfoByParm("departmentcode", "hrmdepartment", "id", bxrbm, "");
+            
+            operator = loginid;//当前节点操作者
+            receiver = new ResourceComInfo().getWorkcode(bxr); //收款人,与报销人一致
+            jkbxr = receiver; // 报销人,与报销人一致
+            //截取前150位
+            if(zy.length()>120){
+            	zy=zy.substring(0,120);
+            }
+            //结算方式
+            if("0".equals(jsfs)){
+            	jsfs = "3"; //网银
+            }else{
+            	jsfs = "0"; //现金
+            }
+            //获取UUID
+            String uuid=UUID.randomUUID().toString().replace("-", "").toUpperCase();
+            
+            reimbursementOrder.setUuid(uuid);
+            reimbursementOrder.setPk_org(pk_org);
+            reimbursementOrder.setTotal(total);
+            reimbursementOrder.setDeptid(deptid);
+            reimbursementOrder.setDjlxbm(djlxbm);
+            reimbursementOrder.setDjrq(djrq);
+            reimbursementOrder.setPayflag(payflag);
+            reimbursementOrder.setPaytarget(paytarget);
+            reimbursementOrder.setReceiver(receiver);
+            reimbursementOrder.setSkyhzh(skyhzh);
+            reimbursementOrder.setJkbxr(jkbxr);
+            reimbursementOrder.setOperator(operator);
+            reimbursementOrder.setJsfs(jsfs);
+            reimbursementOrder.setFkyhzh(fkyhzh);
+            reimbursementOrder.setJobid(jobid);
+            reimbursementOrder.setZy(zy);
+            reimbursementOrder.setKjqj(kjqj);
+            reimbursementOrder.setKjnd(kjnd);
+            reimbursementOrder.setFjzs(fjzs);
+            reimbursementOrder.setZyx1(zyx1);
+            reimbursementOrder.setZyx2(zyx2);
+            reimbursementOrder.setZyx3(zyx3);
+            reimbursementOrder.setZyx5(zyx5);
+            reimbursementOrder.setZyx8(zyx8);
+            reimbursementOrder.setZyx9(zyx9);
+            log.writeLog("【header数据准备完毕...】");
+
+            //获取OA-NCC发票映射关系表
+            Map<String,String> map_oafplx_nccfplcx=BaseUtil.getMapKeyValueInfoByParm("uf_oafplx_nccfplx", "", "oafplxid", "nccfplxbm");
+            List<ReimbursementOrderBody> reimbursementOrderBodyList = new ArrayList<ReimbursementOrderBody>();
+            String tablecode = "arap_bxbusitem"; // 默认固定值 arap_bxbusitem
+            int rowno = 10;
+            rs.execute(" select b.bm as szxmbm,c.INVOICECODE,c.INVOICENUMBER,c.invoicetype,a.* from " + mainTable + "_dt8 a "
+            		+ "left join uf_fylx b on to_char(a.bxlx)=to_char(b.id) "
+            		+ "left join fnainvoiceledger c on a.fphm=c.id "
+            		+ "where a.mainid = " + mainId);
+            log.writeLog("查询报销明细sql------>"+sql);
+            while (rs.next()) {
+            	rowno++;//行号
+                ReimbursementOrderBody body = new ReimbursementOrderBody();
+                String jobid1 = Util.null2String(rs.getString("")); // 项目
+                String amount = Util.null2o(rs.getString("je")); // 报销金额
+                String tax_rate = Util.null2o(rs.getString("sl")); // 税率 3%
+                String tax_amount = Util.null2o(rs.getString("se")); // 税额
+                String tni_amount = Util.null2String(rs.getString("bhsje")); // 无税金额
+                String szxmid = Util.null2String(rs.getString("szxmbm")); // 收支项目  0101 汽车费用
+                String fpdm = Util.null2String(rs.getString("INVOICECODE")); // 发票代码
+                String fphm = Util.null2String(rs.getString("INVOICENUMBER")); // 发票号码
+                String defitem46 = Util.null2String(rs.getString("wd")); // 网点（成本中心）
+                String defitem45 = Util.null2String(rs.getString("gj")); // 国家
+                String defitem44 = Util.null2String(rs.getString("ck")); // 仓库
+                String defitem43 = Util.null2String(rs.getString("cph")); //车牌号
+                String defitem42 = Util.null2String(rs.getString("id")); // OA明细行ID
+                String defitem36 = Util.null2o(rs.getString("fpje")); // 发票金额
+                String invoicetype = Util.null2String(rs.getString("invoicetype")); // OA发票类型
+                
+                String  fygsbm = Util.null2String(rs.getString("fygsbm")); // 费用承担部门
+                //根据部门ID查询部门编码
+                String fygsbm_NCC=BaseUtil.getBaseInfoByParm("departmentcode", "hrmdepartment", "id", fygsbm, "");
+                //发票金额为空时，默认等于付款金额
+                if(Double.parseDouble(defitem36)==0){
+                	defitem36=amount;
+                }
+
+                //NCC发票类型
+                String fplxpk=Util.null2String(map_oafplx_nccfplcx.get(invoicetype));
+                log.writeLog("----amount:" + amount);
+                log.writeLog("----tax_rate:" + tax_rate);
+                log.writeLog("----tax_amount:" + tax_amount);
+                log.writeLog("----tni_amount:" + tni_amount);
+                log.writeLog("----fygsbm_NCC:" + fygsbm_NCC);
+                log.writeLog("----defitem36:" + defitem36);
+
+                body.setJobid(jobid1);
+                body.setDeptid(fygsbm_NCC);
+                body.setAmount(amount);
+                body.setTax_rate(tax_rate);
+                body.setTax_amount(tax_amount);
+                body.setTni_amount(tni_amount);
+                body.setTablecode(tablecode);
+                body.setRowno(rowno+"");
+                body.setSzxmid(szxmid);
+                body.setFpdm(fpdm);
+                body.setFphm(fphm);
+                body.setFplxpk(fplxpk);
+                body.setDefitem46(defitem46);
+                body.setDefitem45(defitem45);
+                body.setDefitem44(defitem44);
+                body.setDefitem43(defitem43);
+                body.setDefitem42(defitem42);
+                //body.setDefitem48(fygsbm_NCC);
+                body.setDefitem36(defitem36);
+                reimbursementOrderBodyList.add(body);
+            }
+            reimbursementOrder.setEr_busitem(reimbursementOrderBodyList);
+//            reimbursementList.add(reimbursementOrder);
+            String parm=JSONObject.toJSONString(reimbursementOrder, SerializerFeature.DisableCircularReferenceDetect);
+            log.writeLog("报销单准备传入NCC的数据为------>" + parm);
+
+            //获取TOKEN
+            String token = HttpClientToDC.getToken();
+            log.writeLog("获取数据中台的token------>" + token);
+            if ("".equals(Util.null2String(token))) {
+                String tokenMsg="流程提交失败，未获取到数据中台接口TOKEN，请联系管理员处理！";
+            	//将NCC返回结果回写至OA流程表单
+                rs.execute(" update " + mainTable + " set sfcgscnccfkd = 1 ,nccfhxx='" + tokenMsg.replace("'", "''") + "'  where requestid = " + requestId); 
+                //是否需要显示报错信息
+                if("yes".equals(isShowErrorMsg)){
+                	requestInfo.getRequestManager().setMessagecontent(tokenMsg);
+                    return Action.FAILURE_AND_CONTINUE;
+                }else{
+                	return SUCCESS;
+                }
+            }
+
+
+            {
+                //新增代码
+                JSONObject jsonObject1 = JSONObject.parseObject(parm);
+                ArrayList<Map<String,String>> list = new ArrayList<>();
+                ArrayList<Map<String, String>> dt2List = DataBaseUtils.getProcessData(requestInfo, 2);
+                for (Map<String, String> dtmap : dt2List) {
+                    HashMap<String, String> map = new HashMap<>();
+                    map.put("jkbillcode", dtmap.get("NCCJKDH"));
+                    map.put("szxmid", "901038");
+                    map.put("cxmny", dtmap.get("CDJE"));
+                    list.add(map);
+                }
+
+                jsonObject1.put("er_bxcontrast", list);
+                parm = jsonObject1.toJSONString();
+            }
+
+
+            log.writeLog("param:"+parm);
+            
+
+            //调用NCC接口，将数据传给NCC
+            String returndata = HttpClientToDC.sendPostApi(url,token, parm);
+            log.writeLog("【调用数据中台报销接口返回结果result:】" + returndata);
+            if (!"".equals(returndata) && returndata != null) {
+                JSONObject jsonObject = JSONObject.parseObject(returndata);
+                String success = Util.null2String(jsonObject.get("succ"));
+                log.writeLog("--------发送请求返回的success值为：" + success);
+                if ("true".equals(success)) {
+                	JSONObject data = jsonObject.getJSONObject("data");
+                    String billno = Util.null2String(data.get("billno"));//NCC单号
+                    log.writeLog("--------发送请求返回的billno值为：" + billno);
+                    //将NCC返回结果回写至OA流程表单
+                    rs.execute(" update " + mainTable + " set sfcgscnccfkd = 0 , nccfkdh = '" + billno + "',nccfhxx=''  where requestid = " + requestId); 
+                } else {
+                	String message = Util.null2String(jsonObject.get("msg"));
+                	String message2=message.replace("'", "''");
+                	//超出1333个字符，则只截取前面这部分
+                	if(message2.length()>1334){
+                		message2=message2.substring(0,1333);
+                	}
+                	//将NCC返回结果回写至OA流程表单
+                    rs.execute(" update " + mainTable + " set sfcgscnccfkd = 1 ,nccfhxx='" + message2 + "'  where requestid = " + requestId); 
+                    //是否需要显示报错信息
+                    if("yes".equals(isShowErrorMsg)){
+                    	requestInfo.getRequestManager().setMessagecontent("流程数据写入NCC对私报销单失败,失败信息：<br/>"+message);
+                        return Action.FAILURE_AND_CONTINUE;
+                    }else{
+                    	return SUCCESS;
+                    }
+                }
+            } else {
+                String ermsg="流程数据写入NCC对私报销单失败,未获取到接口返回结果，请联系系统管理员处理！";
+            	//将NCC返回结果回写至OA流程表单
+                rs.execute(" update " + mainTable + " set sfcgscnccfkd = 1 ,nccfhxx='" + ermsg.replace("'", "''") + "'  where requestid = " + requestId); 
+                //是否需要显示报错信息
+                if("yes".equals(isShowErrorMsg)){
+                	requestInfo.getRequestManager().setMessagecontent(ermsg);
+                    return Action.FAILURE_AND_CONTINUE;
+                }else{
+                	return SUCCESS;
+                }
+            }
+
+        } catch (Exception e) {
+            String ermsg="流程数据生成NCC对私报销单失败！" + e.toString();
+        	//将NCC返回结果回写至OA流程表单
+            rs.execute(" update " + mainTable + " set sfcgscnccfkd = 1 ,nccfhxx='" + ermsg.replace("'", "''") + "'  where requestid = " + requestId); 
+            //是否需要显示报错信息
+            if("yes".equals(isShowErrorMsg)){
+            	requestInfo.getRequestManager().setMessagecontent(ermsg);
+                return Action.FAILURE_AND_CONTINUE;
+            }else{
+            	return SUCCESS;
+            }
+        }
+        log.writeLog("--------报销单数据传入NCC完毕----requestId值为：" + requestId);
+        return Action.SUCCESS;
+    }
+}
\ No newline at end of file
diff --git a/src/main/youhong_ai_jitu_src/jntchina/action/ReimbursementOrderActionYY.java b/src/main/youhong_ai_jitu_src/jntchina/action/ReimbursementOrderActionYY.java
new file mode 100644
index 0000000..9ace62a
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/action/ReimbursementOrderActionYY.java
@@ -0,0 +1,341 @@
+package jntchina.action;
+
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.serializer.SerializerFeature;
+import com.working.util.WorkflowUtil;
+import jntchina.entity.ReimbursementOrderYY;
+import jntchina.entity.ReimbursementOrderBodyYY;
+import jntchina.util.DataBaseUtils;
+import jntchina.util.HttpClientToDC;
+import selfdev.util.base.BaseUtil;
+import selfdev.util.base.TimeCommonUtil;
+import selfdev.util.log.LogTool;
+import weaver.conn.RecordSet;
+import weaver.file.Prop;
+import weaver.general.Util;
+import weaver.hrm.resource.ResourceComInfo;
+import weaver.interfaces.workflow.action.Action;
+import weaver.interfaces.workflow.action.BaseAction;
+import weaver.soa.workflow.request.RequestInfo;
+
+import java.util.*;
+
+/**
+ * @Author Administrator
+ * @Description 报销单数据传入NCC生成单据（紜毅）2
+ * @Date 2021/1/8  12:14
+ */
+public class ReimbursementOrderActionYY extends BaseAction {
+    @Override
+    public String execute(RequestInfo requestInfo) {
+        String src = requestInfo.getRequestManager().getSrc();//获取操作方式
+        if (!"submit".equals(src)) { // 只有submit才执行接口
+            return SUCCESS;
+        }
+        LogTool log = new LogTool("/log/selfdev/action", false);
+        String requestId = requestInfo.getRequestid(); // 获取requestid
+        //获取当前用户的登录账号（即工号）
+        String loginid=requestInfo.getRequestManager().getUser().getLoginid();
+        log.writeLog("--------报销单数据传入中台开始----requestId值为：" + requestId);
+        //获取配置文件中的参数
+    	String mode = Prop.getPropValue("DevToDC_jntchina","mode");
+        // 服务器ip：port
+        String baseUrl = Prop.getPropValue("DevToDC_jntchina", mode+"_baseUrl");
+        //String url = baseUrl+ "/dcoaapi/claimForm/receiveData";
+        String url = baseUrl+ "/dcnccapi/claimForm/receiveData";
+//        List<ReimbursementOrder> reimbursementList=new ArrayList<ReimbursementOrder>();
+        ReimbursementOrderYY reimbursementOrder = new ReimbursementOrderYY();
+
+        String mainTable = WorkflowUtil.getMainTable(requestId);
+        String mainId = "";
+        String isShowErrorMsg = "";//写入NCC失败时是否显示报错信息
+        String pk_org = ""; // 报销单位 JTSDCN0001
+        String total = ""; // 报销金额   金额由表体相应字段汇总得出
+        String deptid = ""; // 报销人部门   传输编码--------------SD3300201
+        String djlxbm = "264X-Cxx-DSBXD"; // 单据类型编码   对私报销单:264X-Cxx-DSBXD  对公报销单:264X-Cxx-DGBXD，此处固定传【264X-Cxx-DSBXD】
+        String djrq = TimeCommonUtil.obtainDate(0); // 单据日期   yyyy-mm-dd hh:mm:ss
+        String payflag = ""; // 支付状态
+        String paytarget = "0"; // 收款对象   0=员工，1=供应商，2=客户，默认为员工
+        String receiver = ""; // 收款人
+        String skyhzh = ""; // 收款人银行账号
+        String jkbxr = ""; // 借款报销人   传输编码
+        String operator = ""; // 录入人
+        String jsfs = ""; // 结算方式 3 网银
+        String fkyhzh = ""; // 单位银行账户 传输编码
+        String jobid = ""; // 项目
+        String zy = ""; // 报销事由
+        String kjqj = ""; // 会计期间
+        String kjnd = ""; // 会计年度
+        String fjzs = ""; // 附件张数   需业务人员在OA上传附件同时填写附件张数后传数据到NCC
+        String zyx1 = ""; // OA单据号   OA传过来，用于联查单据
+        String zyx2 = ""; // 提交人    提交人姓名
+        String zyx3 = ""; // OA核销单号
+        String zyx5 = ""; // OARequestID
+
+        String xm="";//申请人
+        String bxrbm="";//报销人部门
+        String bxr="";//报销人
+        String zyx8="";//银行付款备注
+//        String zyx9=requestInfo.getRequestManager().getRequestname();//标题
+        String zyx9=requestInfo.getRequestManager().getRequestname().length()>140?requestInfo.getRequestManager().getRequestname().substring(0,140):requestInfo.getRequestManager().getRequestname();//标题
+
+        RecordSet rs = new RecordSet();
+        try {
+            String sql = " select *  from " + mainTable + " where requestid='" + requestId + "'";
+            rs.execute(sql);
+            while (rs.next()) {
+                mainId = Util.null2String(rs.getString("id"));
+                isShowErrorMsg = Util.null2String(rs.getString("xrnccsbcsfts"));
+                pk_org = Util.null2String(rs.getString("gsmc")); // 报销单位
+                xm = Util.null2String(rs.getString("xm")); // 申请人
+                bxr = Util.null2String(rs.getString("bxr")); // 报销人
+                total = Util.null2String(rs.getString("bxje")); // 报销金额   金额由表体相应字段汇总得出
+//                djrq = Util.null2String(rs.getString("cjrq")); // 单据日期   yyyy-mm-dd hh:mm:ss
+                payflag = Util.null2String(rs.getString("")); // 支付状态
+                bxrbm = Util.null2String(rs.getString("bxrbm")); //报销人部门
+                zyx8 = Util.null2String(rs.getString("yxfkbz")); //银行付款备注
+                jsfs = Util.null2String(rs.getString("bxfs")); //付款方式
+                skyhzh = Util.null2String(rs.getString("skkh")).replace(" ", ""); //收款人银行账号（中间若有空格过滤）
+                fkyhzh = Util.null2String(rs.getString("")); // 付款银行账户 传输编码
+                jobid = Util.null2String(rs.getString("")); // 项目
+                zy = Util.null2String(rs.getString("bxsm")); // 报销事由
+                
+                fjzs = Util.null2String(rs.getString("fjzs")); // 附件张数   需业务人员在OA上传附件同时填写附件张数后传数据到NCC
+                zyx1 = Util.null2String(rs.getString("lcbh")); // OA单据号   OA传过来，用于联查单据
+                zyx2 = new ResourceComInfo().getLastname(xm); // 提交人    提交人姓名
+                zyx5 = requestId; // OARequestID
+            }
+            kjqj = djrq.substring(5,7); //  会计期间
+            kjnd = djrq.substring(0,4); // 会计年度
+            //查询冲抵明细
+            sql = " select *  from " + mainTable + "_dt2 where mainid='" + mainId + "'";
+            rs.execute(sql);
+            while (rs.next()) {
+            	zyx3+=Util.null2String(rs.getString("jklcbh"))+",";
+            }
+            //将借款单号赋值到zyx3字段中
+            if(!"".equals(zyx3)){
+            	zyx3=zyx3.substring(0,zyx3.length()-1);
+            }
+            //根据部门ID查询部门编码
+            deptid=BaseUtil.getBaseInfoByParm("departmentcode", "hrmdepartment", "id", bxrbm, "");
+//            deptid=BaseUtil.getBaseInfoByParm("BM", "uf_dept_ncc", "id", bxrbm, "");
+
+            operator = loginid;//当前节点操作者
+            receiver = new ResourceComInfo().getWorkcode(bxr); //收款人,与报销人一致
+            jkbxr = receiver; // 报销人,与报销人一致
+            //截取前150位
+            if(zy.length()>120){
+            	zy=zy.substring(0,120);
+            }
+            //结算方式
+            if("0".equals(jsfs)){
+            	jsfs = "3"; //网银
+            }else{
+            	jsfs = "0"; //现金
+            }
+            //获取UUID
+            String uuid=UUID.randomUUID().toString().replace("-", "").toUpperCase();
+            
+            reimbursementOrder.setUuid(uuid);
+            reimbursementOrder.setPk_org(pk_org);
+            reimbursementOrder.setTotal(total);
+            reimbursementOrder.setDeptid(deptid);
+            reimbursementOrder.setDjlxbm(djlxbm);
+            reimbursementOrder.setDjrq(djrq);
+            reimbursementOrder.setPayflag(payflag);
+            reimbursementOrder.setPaytarget(paytarget);
+            reimbursementOrder.setReceiver(receiver);
+            reimbursementOrder.setSkyhzh(skyhzh);
+            reimbursementOrder.setJkbxr(jkbxr);
+            reimbursementOrder.setOperator(operator);
+            reimbursementOrder.setJsfs(jsfs);
+            reimbursementOrder.setFkyhzh(fkyhzh);
+            reimbursementOrder.setJobid(jobid);
+            reimbursementOrder.setZy(zy);
+            reimbursementOrder.setKjqj(kjqj);
+            reimbursementOrder.setKjnd(kjnd);
+            reimbursementOrder.setFjzs(fjzs);
+            reimbursementOrder.setZyx1(zyx1);
+            reimbursementOrder.setZyx2(zyx2);
+            reimbursementOrder.setZyx3(zyx3);
+            reimbursementOrder.setZyx5(zyx5);
+            reimbursementOrder.setZyx8(zyx8);
+            reimbursementOrder.setZyx9(zyx9);
+//            reimbursementOrder.setDeptidIsNeedConvert("no");
+
+            log.writeLog("【header数据准备完毕...】");
+
+            //获取OA-NCC发票映射关系表
+            Map<String,String> map_oafplx_nccfplcx=BaseUtil.getMapKeyValueInfoByParm("uf_oafplx_nccfplx", "", "oafplxid", "nccfplxbm");
+            List<ReimbursementOrderBodyYY> reimbursementOrderBodyList = new ArrayList<ReimbursementOrderBodyYY>();
+            String tablecode = "arap_bxbusitem"; // 默认固定值 arap_bxbusitem
+            int rowno = 10;
+            rs.execute(" select b.bm as szxmbm,c.INVOICECODE,c.INVOICENUMBER,c.invoicetype,a.* from " + mainTable + "_dt8 a "
+            		+ "left join uf_fylx b on to_char(a.bxlx)=to_char(b.id) "
+            		+ "left join fnainvoiceledger c on a.fphm=c.id "
+            		+ "where a.mainid = " + mainId);
+            log.writeLog("查询报销明细sql------>"+sql);
+            while (rs.next()) {
+            	rowno++;//行号
+                ReimbursementOrderBodyYY body = new ReimbursementOrderBodyYY();
+                String jobid1 = Util.null2String(rs.getString("")); // 项目
+                String amount = Util.null2o(rs.getString("je")); // 报销金额
+                String tax_rate = Util.null2o(rs.getString("sl")); // 税率 3%
+                String tax_amount = Util.null2o(rs.getString("se")); // 税额
+                String tni_amount = Util.null2String(rs.getString("bhsje")); // 无税金额
+                String szxmid = Util.null2String(rs.getString("fylx")); // 收支项目  0101 汽车费用
+                szxmid = DataBaseUtils.getFirstValue("select bm from uf_fylx where id = " + szxmid);
+                String fpdm = Util.null2String(rs.getString("INVOICECODE")); // 发票代码
+                String fphm = Util.null2String(rs.getString("INVOICENUMBER")); // 发票号码
+                String defitem46 = Util.null2String(rs.getString("wd")); // 网点（成本中心）
+                String defitem45 = Util.null2String(rs.getString("gj")); // 国家
+                String defitem44 = Util.null2String(rs.getString("ck")); // 仓库
+                String defitem43 = Util.null2String(rs.getString("cph")); //车牌号
+                String defitem42 = Util.null2String(rs.getString("id")); // OA明细行ID
+                String defitem36 = Util.null2o(rs.getString("fpje")); // 发票金额
+                String invoicetype = Util.null2String(rs.getString("invoicetype")); // OA发票类型
+                
+                String  fygsbm = Util.null2String(rs.getString("fygsbm")); // 费用承担部门
+                //根据部门ID查询部门编码
+//                String fygsbm_NCC=BaseUtil.getBaseInfoByParm("bm", "uf_dept_ncc", "id", fygsbm, "");
+                String fygsbm_NCC = fygsbm;
+                //发票金额为空时，默认等于付款金额
+                if(Double.parseDouble(defitem36)==0){
+                	defitem36=amount;
+                }
+
+                //NCC发票类型
+                String fplxpk=Util.null2String(map_oafplx_nccfplcx.get(invoicetype));
+                log.writeLog("----amount:" + amount);
+                log.writeLog("----tax_rate:" + tax_rate);
+                log.writeLog("----tax_amount:" + tax_amount);
+                log.writeLog("----tni_amount:" + tni_amount);
+                log.writeLog("----fygsbm_NCC:" + fygsbm_NCC);
+                log.writeLog("----defitem36:" + defitem36);
+
+                body.setJobid(jobid1);
+                body.setDeptid(fygsbm_NCC);
+                body.setAmount(amount);
+                body.setTax_rate(tax_rate);
+                body.setTax_amount(tax_amount);
+                body.setTni_amount(tni_amount);
+                body.setTablecode(tablecode);
+                body.setRowno(rowno+"");
+                body.setSzxmid(szxmid);
+                body.setFpdm(fpdm);
+                body.setFphm(fphm);
+                body.setFplxpk(fplxpk);
+                body.setDefitem46(defitem46);
+                body.setDefitem45(defitem45);
+                body.setDefitem44(defitem44);
+                body.setDefitem43(defitem43);
+                body.setDefitem42(defitem42);
+                body.setDeptidIsNeedConvert("no");
+                //body.setDefitem48(fygsbm_NCC);
+                body.setDefitem36(defitem36);
+                reimbursementOrderBodyList.add(body);
+            }
+            reimbursementOrder.setEr_busitem(reimbursementOrderBodyList);
+//            reimbursementList.add(reimbursementOrder);
+            String parm=JSONObject.toJSONString(reimbursementOrder, SerializerFeature.DisableCircularReferenceDetect);
+            log.writeLog("报销单准备传入NCC的数据为------>" + parm);
+
+            //获取TOKEN
+            String token = HttpClientToDC.getToken();
+            log.writeLog("获取数据中台的token------>" + token);
+            if ("".equals(Util.null2String(token))) {
+                String tokenMsg="流程提交失败，未获取到数据中台接口TOKEN，请联系管理员处理！";
+            	//将NCC返回结果回写至OA流程表单
+                rs.execute(" update " + mainTable + " set sfcgscnccfkd = 1 ,nccfhxx='" + tokenMsg.replace("'", "''") + "'  where requestid = " + requestId); 
+                //是否需要显示报错信息
+                if("yes".equals(isShowErrorMsg)){
+                	requestInfo.getRequestManager().setMessagecontent(tokenMsg);
+                    return Action.FAILURE_AND_CONTINUE;
+                }else{
+                	return SUCCESS;
+                }
+            }
+
+            JSONObject jsonObject1 = JSONObject.parseObject(parm);
+            ArrayList<Map<String,String>> list = new ArrayList<>();
+            ArrayList<Map<String, String>> dt2List = DataBaseUtils.getProcessData(requestInfo, 2);
+            for (Map<String, String> dtmap : dt2List) {
+                HashMap<String, String> map = new HashMap<>();
+                map.put("jkbillcode", dtmap.get("NCCJKDH"));
+                map.put("szxmid", "901038");
+                map.put("cxmny", dtmap.get("CDJE"));
+                list.add(map);
+            }
+
+
+
+
+
+            jsonObject1.put("er_bxcontrast", list);
+            parm = jsonObject1.toJSONString();
+
+
+            log.writeLog("url2:"+url);
+            log.writeLog("token2:"+token);
+            log.writeLog("param2:"+parm);
+
+            //调用NCC接口，将数据传给NCC
+            String returndata = HttpClientToDC.sendPostApi(url,token, parm);
+            log.writeLog("【调用数据中台报销接口返回结果result:】" + returndata);
+            if (!"".equals(returndata) && returndata != null) {
+                JSONObject jsonObject = JSONObject.parseObject(returndata);
+                String success = Util.null2String(jsonObject.get("succ"));
+                log.writeLog("--------发送请求返回的success值为：" + success);
+                if ("true".equals(success)) {
+                	JSONObject data = jsonObject.getJSONObject("data");
+                    String billno = Util.null2String(data.get("billno"));//NCC单号
+                    log.writeLog("--------发送请求返回的billno值为：" + billno);
+                    //将NCC返回结果回写至OA流程表单
+                    rs.execute(" update " + mainTable + " set sfcgscnccfkd = 0 , nccfkdh = '" + billno + "',nccfhxx=''  where requestid = " + requestId); 
+                } else {
+                	String message = Util.null2String(jsonObject.get("msg"));
+                	String message2=message.replace("'", "''");
+                	//超出1333个字符，则只截取前面这部分
+                	if(message2.length()>1334){
+                		message2=message2.substring(0,1333);
+                	}
+                	//将NCC返回结果回写至OA流程表单
+                    rs.execute(" update " + mainTable + " set sfcgscnccfkd = 1 ,nccfhxx='" + message2 + "'  where requestid = " + requestId); 
+                    //是否需要显示报错信息
+                    if("yes".equals(isShowErrorMsg)){
+                    	requestInfo.getRequestManager().setMessagecontent("流程数据写入NCC对私报销单失败,失败信息：<br/>"+message);
+                        return Action.FAILURE_AND_CONTINUE;
+                    }else{
+                    	return SUCCESS;
+                    }
+                }
+            } else {
+                String ermsg="流程数据写入NCC对私报销单失败,未获取到接口返回结果，请联系系统管理员处理！";
+            	//将NCC返回结果回写至OA流程表单
+                rs.execute(" update " + mainTable + " set sfcgscnccfkd = 1 ,nccfhxx='" + ermsg.replace("'", "''") + "'  where requestid = " + requestId); 
+                //是否需要显示报错信息
+                if("yes".equals(isShowErrorMsg)){
+                	requestInfo.getRequestManager().setMessagecontent(ermsg);
+                    return Action.FAILURE_AND_CONTINUE;
+                }else{
+                	return SUCCESS;
+                }
+            }
+
+        } catch (Exception e) {
+            String ermsg="流程数据生成NCC对私报销单失败！" + e.toString();
+        	//将NCC返回结果回写至OA流程表单
+            rs.execute(" update " + mainTable + " set sfcgscnccfkd = 1 ,nccfhxx='" + ermsg.replace("'", "''") + "'  where requestid = " + requestId); 
+            //是否需要显示报错信息
+            if("yes".equals(isShowErrorMsg)){
+            	requestInfo.getRequestManager().setMessagecontent(ermsg);
+                return Action.FAILURE_AND_CONTINUE;
+            }else{
+            	return SUCCESS;
+            }
+        }
+        log.writeLog("--------报销单数据传入NCC完毕----requestId值为：" + requestId);
+        return Action.SUCCESS;
+    }
+}
\ No newline at end of file
diff --git a/src/main/youhong_ai_jitu_src/jntchina/action/ReimbursementOrderActionYYSJ.java b/src/main/youhong_ai_jitu_src/jntchina/action/ReimbursementOrderActionYYSJ.java
new file mode 100644
index 0000000..3192053
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/action/ReimbursementOrderActionYYSJ.java
@@ -0,0 +1,331 @@
+package jntchina.action;
+
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.serializer.SerializerFeature;
+import com.working.util.WorkflowUtil;
+import jntchina.entity.ReimbursementOrderBodyYY;
+import jntchina.entity.ReimbursementOrderYY;
+import jntchina.util.HttpClientToDC;
+import selfdev.util.base.BaseUtil;
+import selfdev.util.base.TimeCommonUtil;
+import selfdev.util.log.LogTool;
+import weaver.conn.RecordSet;
+import weaver.file.Prop;
+import weaver.general.Util;
+import weaver.hrm.resource.ResourceComInfo;
+import weaver.interfaces.workflow.action.Action;
+import weaver.interfaces.workflow.action.BaseAction;
+import weaver.soa.workflow.request.RequestInfo;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+
+/**
+ * @Author Administrator
+ * @Description 报销单数据传入NCC生成单据（紜毅）2
+ * @Date 2021/1/8  12:14
+ */
+public class ReimbursementOrderActionYYSJ extends BaseAction {
+    @Override
+    public String execute(RequestInfo requestInfo) {
+        String src = requestInfo.getRequestManager().getSrc();//获取操作方式
+        if (!"submit".equals(src)) { // 只有submit才执行接口
+            return SUCCESS;
+        }
+        LogTool log = new LogTool("/log/selfdev/action", false);
+        String requestId = requestInfo.getRequestid(); // 获取requestid
+        //获取当前用户的登录账号（即工号）
+        String loginid=requestInfo.getRequestManager().getUser().getLoginid();
+        log.writeLog("--------报销单数据传入中台开始----requestId值为：" + requestId);
+        //获取配置文件中的参数
+    	String mode = Prop.getPropValue("DevToDC_jntchina","mode");
+        // 服务器ip：port
+        String baseUrl = Prop.getPropValue("DevToDC_jntchina", mode+"_baseUrl");
+        //String url = baseUrl+ "/dcoaapi/claimForm/receiveData";
+        String url = baseUrl+ "/dcnccapi/claimForm/receiveData";
+//        List<ReimbursementOrder> reimbursementList=new ArrayList<ReimbursementOrder>();
+        ReimbursementOrderYY reimbursementOrder = new ReimbursementOrderYY();
+
+        String mainTable = WorkflowUtil.getMainTable(requestId);
+        String mainId = "";
+        String isShowErrorMsg = "";//写入NCC失败时是否显示报错信息
+        String pk_org = ""; // 报销单位 JTSDCN0001
+        String total = ""; // 报销金额   金额由表体相应字段汇总得出
+        String deptid = ""; // 报销人部门   传输编码--------------SD3300201
+        String djlxbm = "264X-Cxx-DSBXD"; // 单据类型编码   对私报销单:264X-Cxx-DSBXD  对公报销单:264X-Cxx-DGBXD，此处固定传【264X-Cxx-DSBXD】
+        String djrq = TimeCommonUtil.obtainDate(0); // 单据日期   yyyy-mm-dd hh:mm:ss
+        String payflag = ""; // 支付状态
+        String paytarget = "0"; // 收款对象   0=员工，1=供应商，2=客户，默认为员工
+        String receiver = ""; // 收款人
+        String skyhzh = ""; // 收款人银行账号
+        String jkbxr = ""; // 借款报销人   传输编码
+        String operator = ""; // 录入人
+        String jsfs = ""; // 结算方式 3 网银
+        String fkyhzh = ""; // 单位银行账户 传输编码
+        String jobid = ""; // 项目
+        String zy = ""; // 报销事由
+        String kjqj = ""; // 会计期间
+        String kjnd = ""; // 会计年度
+        String fjzs = ""; // 附件张数   需业务人员在OA上传附件同时填写附件张数后传数据到NCC
+        String zyx1 = ""; // OA单据号   OA传过来，用于联查单据
+        String zyx2 = ""; // 提交人    提交人姓名
+        String zyx3 = ""; // OA核销单号
+        String zyx5 = ""; // OARequestID
+        String sqrbm = "";
+        String bm = "";
+
+        String xm="";//申请人
+        String bxrbm="";//报销人部门
+        String bxr="";//报销人
+        String zyx8="";//银行付款备注
+//        String zyx9=requestInfo.getRequestManager().getRequestname();//标题
+        String zyx9=requestInfo.getRequestManager().getRequestname().length()>140?requestInfo.getRequestManager().getRequestname().substring(0,140):requestInfo.getRequestManager().getRequestname();//标题
+
+        RecordSet rs = new RecordSet();
+        try {
+            String sql = " select *  from " + mainTable + " where requestid='" + requestId + "'";
+            rs.execute(sql);
+            while (rs.next()) {
+                mainId = Util.null2String(rs.getString("id"));
+                isShowErrorMsg = Util.null2String(rs.getString("xrnccsbcsfts"));
+                pk_org = Util.null2String(rs.getString("gsmc")); // 报销单位
+                xm = Util.null2String(rs.getString("xm")); // 申请人
+                bxr = Util.null2String(rs.getString("sjbm")); // 报销人
+                total = Util.null2String(rs.getString("bxje")); // 报销金额   金额由表体相应字段汇总得出
+//                djrq = Util.null2String(rs.getString("cjrq")); // 单据日期   yyyy-mm-dd hh:mm:ss
+                payflag = Util.null2String(rs.getString("")); // 支付状态
+                bxrbm = Util.null2String(rs.getString("bxrbm")); //报销人部门
+                zyx8 = Util.null2String(rs.getString("yxfkbz")); //银行付款备注
+                jsfs = Util.null2String(rs.getString("bxfs")); //付款方式
+                skyhzh = Util.null2String(rs.getString("skkh")).replace(" ", ""); //收款人银行账号（中间若有空格过滤）
+                fkyhzh = Util.null2String(rs.getString("")); // 付款银行账户 传输编码
+                jobid = Util.null2String(rs.getString("")); // 项目
+                zy = Util.null2String(rs.getString("bxsm")); // 报销事由
+                sqrbm = Util.null2String(rs.getString("bm")); // 申请人部门
+
+                fjzs = Util.null2String(rs.getString("fjzs")); // 附件张数   需业务人员在OA上传附件同时填写附件张数后传数据到NCC
+                zyx1 = Util.null2String(rs.getString("lcbh")); // OA单据号   OA传过来，用于联查单据
+                zyx2 = new ResourceComInfo().getLastname(xm); // 提交人    提交人姓名
+                zyx5 = requestId; // OARequestID
+            }
+            kjqj = djrq.substring(5,7); //  会计期间
+            kjnd = djrq.substring(0,4); // 会计年度
+            //查询冲抵明细
+            sql = " select *  from " + mainTable + "_dt2 where mainid='" + mainId + "'";
+            rs.execute(sql);
+            while (rs.next()) {
+            	zyx3+=Util.null2String(rs.getString("jklcbh"))+",";
+            }
+            //将借款单号赋值到zyx3字段中
+            if(!"".equals(zyx3)){
+            	zyx3=zyx3.substring(0,zyx3.length()-1);
+            }
+            //根据部门ID查询部门编码
+            deptid=BaseUtil.getBaseInfoByParm("departmentcode", "hrmdepartment", "id", sqrbm, "");
+//            deptid=BaseUtil.getBaseInfoByParm("BM", "uf_dept_ncc", "id", bxrbm, "");
+
+            operator = loginid;//当前节点操作者
+            receiver = bxr; //收款人,与报销人一致
+            jkbxr = bxr; // 报销人,与报销人一致
+            //截取前150位
+            if(zy.length()>120){
+            	zy=zy.substring(0,120);
+            }
+            //结算方式
+            if("0".equals(jsfs)){
+            	jsfs = "3"; //网银
+            }else{
+            	jsfs = "0"; //现金
+            }
+            //获取UUID
+            String uuid=UUID.randomUUID().toString().replace("-", "").toUpperCase();
+            
+            reimbursementOrder.setUuid(uuid);
+            reimbursementOrder.setPk_org(pk_org);
+            reimbursementOrder.setTotal(total);
+            reimbursementOrder.setDeptid(deptid);
+            reimbursementOrder.setDjlxbm(djlxbm);
+            reimbursementOrder.setDjrq(djrq);
+            reimbursementOrder.setPayflag(payflag);
+            reimbursementOrder.setPaytarget(paytarget);
+            reimbursementOrder.setReceiver(receiver);
+            reimbursementOrder.setSkyhzh(skyhzh);
+            reimbursementOrder.setJkbxr(jkbxr);
+            reimbursementOrder.setOperator(operator);
+            reimbursementOrder.setJsfs(jsfs);
+            reimbursementOrder.setFkyhzh(fkyhzh);
+            reimbursementOrder.setJobid(jobid);
+            reimbursementOrder.setZy(zy);
+            reimbursementOrder.setKjqj(kjqj);
+            reimbursementOrder.setKjnd(kjnd);
+            reimbursementOrder.setFjzs(fjzs);
+            reimbursementOrder.setZyx1(zyx1);
+            reimbursementOrder.setZyx2(zyx2);
+            reimbursementOrder.setZyx3(zyx3);
+            reimbursementOrder.setZyx5(zyx5);
+            reimbursementOrder.setZyx8(zyx8);
+            reimbursementOrder.setZyx9(zyx9);
+//            reimbursementOrder.setDeptidIsNeedConvert("no");
+
+            log.writeLog("【header数据准备完毕...】");
+
+            //获取OA-NCC发票映射关系表
+            Map<String,String> map_oafplx_nccfplcx=BaseUtil.getMapKeyValueInfoByParm("uf_oafplx_nccfplx", "", "oafplxid", "nccfplxbm");
+            List<ReimbursementOrderBodyYY> reimbursementOrderBodyList = new ArrayList<ReimbursementOrderBodyYY>();
+            String tablecode = "arap_bxbusitem"; // 默认固定值 arap_bxbusitem
+            int rowno = 10;
+            rs.execute(" select b.bm as szxmbm,c.INVOICECODE,c.INVOICENUMBER,c.invoicetype,a.* from " + mainTable + "_dt8 a "
+            		+ "left join uf_fylx b on to_char(a.bxlx)=to_char(b.id) "
+            		+ "left join fnainvoiceledger c on a.fphm=c.id "
+            		+ "where a.mainid = " + mainId);
+            log.writeLog("查询报销明细sql------>"+sql);
+            while (rs.next()) {
+            	rowno++;//行号
+                ReimbursementOrderBodyYY body = new ReimbursementOrderBodyYY();
+                String jobid1 = Util.null2String(rs.getString("")); // 项目
+                String amount = Util.null2o(rs.getString("fkje")); // 报销金额
+                String tax_rate = Util.null2o(rs.getString("sl")); // 税率 3%
+                String tax_amount = Util.null2o(rs.getString("se")); // 税额
+//                String tni_amount = Util.null2String(rs.getString("bhsje")); // 无税金额
+                String tni_amount = amount; // 无税金额-----表体含税金额等于税金加不含税金额
+                String szxmid =BaseUtil.getBaseInfoByParm("bm", "uf_fylx", "id", Util.null2String(rs.getString("fylx")), "") ; // 收支项目  0101 汽车费用
+                String fpdm = Util.null2String(rs.getString("INVOICECODE")); // 发票代码
+                String fphm = Util.null2String(rs.getString("INVOICENUMBER")); // 发票号码
+                String defitem46 = Util.null2String(rs.getString("cbzx")); // 网点（成本中心）
+                String defitem45 = Util.null2String(rs.getString("gj")); // 国家
+                String defitem44 = Util.null2String(rs.getString("ck")); // 仓库
+                String defitem43 = Util.null2String(rs.getString("cph")); //车牌号
+                String defitem42 = Util.null2String(rs.getString("id")); // OA明细行ID
+                String defitem36 = Util.null2o(rs.getString("fpje")); // 发票金额
+                String invoicetype = Util.null2String(rs.getString("invoicetype")); // OA发票类型
+                
+                String  fygsbm = Util.null2String(rs.getString("fygsbm")); // 费用承担部门
+                //根据部门ID查询部门编码
+                String fygsbm_NCC=fygsbm;
+                //发票金额为空时，默认等于付款金额
+//                if(Double.parseDouble(defitem36)==0){
+                	defitem36=amount;
+//                }
+
+                //NCC发票类型
+                String fplxpk=Util.null2String(map_oafplx_nccfplcx.get(invoicetype));
+                log.writeLog("----amount:" + amount);
+                log.writeLog("----tax_rate:" + tax_rate);
+                log.writeLog("----tax_amount:" + tax_amount);
+                log.writeLog("----tni_amount:" + tni_amount);
+                log.writeLog("----fygsbm_NCC:" + fygsbm_NCC);
+                log.writeLog("----defitem36:" + defitem36);
+
+                body.setJobid(jobid1);
+                body.setDeptid(fygsbm_NCC);
+                body.setAmount(amount);
+                body.setTax_rate(tax_rate);
+                body.setTax_amount(tax_amount);
+                body.setTni_amount(tni_amount);
+                body.setTablecode(tablecode);
+                body.setRowno(rowno+"");
+                body.setSzxmid(szxmid);
+                body.setFpdm(fpdm);
+                body.setFphm(fphm);
+                body.setFplxpk(fplxpk);
+                body.setDefitem46(defitem46);
+                body.setDefitem45(defitem45);
+                body.setDefitem44(defitem44);
+                body.setDefitem43(defitem43);
+                body.setDefitem42(defitem42);
+                body.setDeptidIsNeedConvert("no");
+                //body.setDefitem48(fygsbm_NCC);
+                body.setDefitem36(defitem36);
+                reimbursementOrderBodyList.add(body);
+            }
+            reimbursementOrder.setEr_busitem(reimbursementOrderBodyList);
+//            reimbursementList.add(reimbursementOrder);
+            String parm=JSONObject.toJSONString(reimbursementOrder, SerializerFeature.DisableCircularReferenceDetect);
+            log.writeLog("报销单准备传入NCC的数据为------>" + parm);
+
+            //获取TOKEN
+            String token = HttpClientToDC.getToken();
+            log.writeLog("获取数据中台的token------>" + token);
+            if ("".equals(Util.null2String(token))) {
+                String tokenMsg="流程提交失败，未获取到数据中台接口TOKEN，请联系管理员处理！";
+            	//将NCC返回结果回写至OA流程表单
+                rs.execute(" update " + mainTable + " set sfcgscnccfkd = 1 ,nccfhxx='" + tokenMsg.replace("'", "''") + "'  where requestid = " + requestId); 
+                //是否需要显示报错信息
+                if("yes".equals(isShowErrorMsg)){
+                	requestInfo.getRequestManager().setMessagecontent(tokenMsg);
+                    return Action.FAILURE_AND_CONTINUE;
+                }else{
+                	return SUCCESS;
+                }
+            }
+
+            JSONObject jsonObject1 = JSONObject.parseObject(parm);
+            jsonObject1.put("zyx30", "批量");
+            parm = jsonObject1.toJSONString();
+
+
+            log.writeLog("url2:"+url);
+            log.writeLog("token2:"+token);
+            log.writeLog("param2:"+parm);
+
+            //调用NCC接口，将数据传给NCC
+            String returndata = HttpClientToDC.sendPostApi(url,token, parm);
+            log.writeLog("【调用数据中台报销接口返回结果result:】" + returndata);
+            if (!"".equals(returndata) && returndata != null) {
+                JSONObject jsonObject = JSONObject.parseObject(returndata);
+                String success = Util.null2String(jsonObject.get("succ"));
+                log.writeLog("--------发送请求返回的success值为：" + success);
+                if ("true".equals(success)) {
+                	JSONObject data = jsonObject.getJSONObject("data");
+                    String billno = Util.null2String(data.get("billno"));//NCC单号
+                    log.writeLog("--------发送请求返回的billno值为：" + billno);
+                    //将NCC返回结果回写至OA流程表单
+                    rs.execute(" update " + mainTable + " set sfcgscnccfkd = 0 , nccfkdh = '" + billno + "',nccfhxx=''  where requestid = " + requestId); 
+                } else {
+                	String message = Util.null2String(jsonObject.get("msg"));
+                	String message2=message.replace("'", "''");
+                	//超出1333个字符，则只截取前面这部分
+                	if(message2.length()>1334){
+                		message2=message2.substring(0,1333);
+                	}
+                	//将NCC返回结果回写至OA流程表单
+                    rs.execute(" update " + mainTable + " set sfcgscnccfkd = 1 ,nccfhxx='" + message2 + "'  where requestid = " + requestId); 
+                    //是否需要显示报错信息
+                    if("yes".equals(isShowErrorMsg)){
+                    	requestInfo.getRequestManager().setMessagecontent("流程数据写入NCC对私报销单失败,失败信息：<br/>"+message);
+                        return Action.FAILURE_AND_CONTINUE;
+                    }else{
+                    	return SUCCESS;
+                    }
+                }
+            } else {
+                String ermsg="流程数据写入NCC对私报销单失败,未获取到接口返回结果，请联系系统管理员处理！";
+            	//将NCC返回结果回写至OA流程表单
+                rs.execute(" update " + mainTable + " set sfcgscnccfkd = 1 ,nccfhxx='" + ermsg.replace("'", "''") + "'  where requestid = " + requestId); 
+                //是否需要显示报错信息
+                if("yes".equals(isShowErrorMsg)){
+                	requestInfo.getRequestManager().setMessagecontent(ermsg);
+                    return Action.FAILURE_AND_CONTINUE;
+                }else{
+                	return SUCCESS;
+                }
+            }
+
+        } catch (Exception e) {
+            String ermsg="流程数据生成NCC对私报销单失败！" + e.toString();
+        	//将NCC返回结果回写至OA流程表单
+            rs.execute(" update " + mainTable + " set sfcgscnccfkd = 1 ,nccfhxx='" + ermsg.replace("'", "''") + "'  where requestid = " + requestId); 
+            //是否需要显示报错信息
+            if("yes".equals(isShowErrorMsg)){
+            	requestInfo.getRequestManager().setMessagecontent(ermsg);
+                return Action.FAILURE_AND_CONTINUE;
+            }else{
+            	return SUCCESS;
+            }
+        }
+        log.writeLog("--------报销单数据传入NCC完毕----requestId值为：" + requestId);
+        return Action.SUCCESS;
+    }
+}
\ No newline at end of file
diff --git a/src/main/youhong_ai_jitu_src/jntchina/action/ResignationFormWriteBackAction.bak b/src/main/youhong_ai_jitu_src/jntchina/action/ResignationFormWriteBackAction.bak
new file mode 100644
index 0000000..88bdd12
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/action/ResignationFormWriteBackAction.bak
@@ -0,0 +1,240 @@
+package jntchina.action;
+
+import com.alibaba.fastjson.JSONObject;
+import jntchina.util.HttpClientToDC;
+import selfdev.util.base.BaseUtil;
+import selfdev.util.log.LogTool;
+import weaver.conn.RecordSet;
+import weaver.file.Prop;
+import weaver.general.Util;
+import weaver.hrm.resource.ResourceComInfo;
+import weaver.interfaces.workflow.action.Action;
+import weaver.soa.workflow.request.RequestInfo;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 离职申请单写入中台(HR系统)
+ */
+public class ResignationFormWriteBackAction implements Action {
+    
+    public String execute(RequestInfo requestInfo) {
+
+        LogTool log=new LogTool("/log/selfdev/action/hrm", false);
+
+        String requestId = requestInfo.getRequestid();
+        String workflowid=requestInfo.getWorkflowid();
+        String workflowname= BaseUtil.getBaseInfoByParm("workflowname", "workflow_base", "id", workflowid, "");
+        log.writeLog("---------------"+workflowname+"开始写入HR-------------requestId:" + requestId);
+
+        //获取配置文件中的参数
+        String mode = Prop.getPropValue("DevToDC_jntchina","mode");
+        // 服务器ip：port
+        String baseUrl = Prop.getPropValue("DevToDC_jntchina", mode+"_baseUrl");
+        String url = baseUrl+"/dcoaapi/hr/resignation";
+        //获取OA表名称
+        String tablename=BaseUtil.getBaseInfoByParm("tablename", "workflow_bill", "1", "1", " and id in (select formid from workflow_base where id="+workflowid+")");
+
+
+        String sql = " select C_APP_SEQ," +
+                "C_APP_DT," +
+                "XM EMPLID," +
+                "EMPLID2," +
+                "DESCR254," +
+                "lzyyACT_REASON_SUB2 ACT_REASON_SUB," +
+                "lzyyACT_REASON_SUB1 ACTION_REASON," +
+                "LAST_WORK_DAY," +
+                "C_BLACKLIST," +
+                "hmdlx C_BCKST_VTN_TPYE," +
+                "C_BLACKLIST_REASON," +
+                "EMPLID3," +
+                "C_DEPT_MANAGER," +
+                "MANAGER_ID," +
+                "C_SUPERVISOR1," +
+                "SUPERVISOR_ID," +
+                "C_DEPT_MANAGER1," +
+                "C_DEPT_EXPAND1," +
+                "EXPAND_EMPLID," +
+                "MANAGER_ID1 " +
+                "from "+tablename+" where requestid = "+requestId+" ";
+        log.writeLog("---------------sql------------->" + sql);
+        RecordSet rs = new RecordSet();
+
+        try {
+            rs.executeQuery(sql);
+
+            Map<String,Object> map = new HashMap<String,Object>();
+            String[] columnName = rs.getColumnName();
+            rs.next();
+            for (int i = 0; i < columnName.length; i++) {
+                map.put(columnName[i], Util.null2String(rs.getString(columnName[i])));
+            }
+
+            //是否部门负责人
+            if (map.get("C_DEPT_MANAGER").equals("0")){
+                map.put("C_DEPT_MANAGER","Y");
+                String MANAGER_ID = new ResourceComInfo().getWorkcode(map.get("MANAGER_ID").toString());
+                map.put("MANAGER_ID",MANAGER_ID);//变更部门负责人
+            }else{
+                map.put("C_DEPT_MANAGER","N");
+                map.put("MANAGER_ID","");//变更部门负责人
+            }
+
+            //是否变更直接上级
+            if (map.get("C_SUPERVISOR1").equals("0")){
+                map.put("C_SUPERVISOR1","Y");
+                String SUPERVISOR_ID = new ResourceComInfo().getWorkcode(map.get("SUPERVISOR_ID").toString());
+                map.put("SUPERVISOR_ID",SUPERVISOR_ID);//变更直接上级
+            }else{
+                map.put("C_SUPERVISOR1","N");
+                map.put("SUPERVISOR_ID","");//变更直接上级
+            }
+
+            //是否变更分管领导
+            if (map.get("C_DEPT_MANAGER1").equals("0")){
+                map.put("C_DEPT_MANAGER1","Y");
+                String MANAGER_ID1 = new ResourceComInfo().getWorkcode(map.get("MANAGER_ID1").toString());
+                map.put("MANAGER_ID1",MANAGER_ID1);//变更分管领导
+            }else{
+                map.put("C_DEPT_MANAGER1","N");
+                map.put("MANAGER_ID1","");//变更分管领导
+            }
+
+
+            log.writeLog("是否为部门拓展者角色map.get(C_DEPT_EXPAND1)-------->"+map.get("C_DEPT_EXPAND1"));
+            //是否为部门拓展者角色
+            if (map.get("C_DEPT_EXPAND1").equals("0")){
+                map.put("C_DEPT_EXPAND1","Y");//是否为部门拓展者角色
+                String EXPAND_EMPLID = new ResourceComInfo().getWorkcode(map.get("EXPAND_EMPLID").toString());
+                map.put("EXPAND_EMPLID",EXPAND_EMPLID);//变更拓展者角色
+            }else{
+                map.put("C_DEPT_EXPAND1","N");//是否为部门拓展者角色
+                log.writeLog("拓展者角色map.get(EXPAND_EMPLID)-------->"+map.get("EXPAND_EMPLID"));
+                map.put("EXPAND_EMPLID","");//变更拓展者角色
+            }
+
+            //申请人工号
+            String EMPLID = new ResourceComInfo().getWorkcode(map.get("EMPLID").toString());
+            map.put("EMPLID",EMPLID);
+
+            //离职详细说明
+            String DESCR254=Util.null2String(map.get("DESCR254"));
+            if(DESCR254.length()>250){//长度超过250，则截取前250位
+            	DESCR254=DESCR254.substring(0,250);
+            }
+            map.put("DESCR254",DESCR254);
+
+            //离职类别
+            if (!map.get("ACTION_REASON").equals("")){
+                String itemName = getItemName2("lzyyACT_REASON_SUB1", map.get("ACTION_REASON").toString(),workflowid);
+                log.writeLog("----------lzyyACT_REASON_SUB1-----------转显示值："+itemName);
+                String[] ACTION_REASON_arr = itemName.split("-");
+                map.put("ACTION_REASON",ACTION_REASON_arr[0]);
+            }else{
+                map.put("ACT_REASON_SUB","");
+            }
+            //离职原因
+            if (!map.get("ACT_REASON_SUB").equals("")){
+                String itemName = getItemName2("lzyyACT_REASON_SUB2", map.get("ACT_REASON_SUB").toString(),workflowid);
+                String[] ACT_REASON_SUB_arr = itemName.split("-");
+                map.put("ACT_REASON_SUB",ACT_REASON_SUB_arr[0]);
+            }else{
+                map.put("ACT_REASON_SUB","");
+            }
+
+            map.put("C_APPLI_RS","3");//审批状态 默认为3
+
+            if (map.get("C_BLACKLIST").equals("0")){ //0为是
+                map.put("C_BLACKLIST","Y");//是否加入黑名单
+                if (map.get("C_BCKST_VTN_TPYE").equals("")){ //存在历史问题 所以加判断
+                    map.put("C_BCKST_VTN_TPYE","4");//黑名单类型
+                }
+            }else{
+                map.put("C_BLACKLIST","N");//是否加入黑名单
+                map.put("C_BCKST_VTN_TPYE","");//黑名单类型
+                map.put("C_BLACKLIST_REASON","");//加入黑名单原因
+                map.put("EMPLID3","");//加入黑名单发起人
+            }
+
+
+            String strParm = JSONObject.toJSONString(map);
+            log.writeLog("离职单准备传入数据中台的数据为------>" + strParm);
+
+            String token = HttpClientToDC.getToken();
+            log.writeLog("离职单token------>" + token);
+            log.writeLog("离职单url------>" + url);
+
+            String returndata = HttpClientToDC.sendPostApi(url,token, strParm);
+            log.writeLog("离职单返回数据returndata------>" + returndata);
+            if (!"".equals(returndata) && returndata != null) {
+                JSONObject jsonObject = JSONObject.parseObject(returndata);
+                String code = Util.null2String(jsonObject.get("code"));
+                log.writeLog("--------发送请求返回的code值为：" + code);
+                if (code.equals("1")){
+                    return SUCCESS;
+                }else{
+                    String msg = Util.null2String(jsonObject.get("msg"));
+                    requestInfo.getRequestManager().setMessageid("111100");
+                    requestInfo.getRequestManager().setMessagecontent(msg);
+                    return "0";
+                }
+            }else{
+                String ermsg="流程数据写入HR调动申请单失败,未获取到接口返回结果，请联系系统管理员处理！";
+                requestInfo.getRequestManager().setMessageid("111100");
+                requestInfo.getRequestManager().setMessagecontent(ermsg);
+                return "0";
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            requestInfo.getRequestManager().setMessageid("111100");
+            requestInfo.getRequestManager().setMessagecontent("流程发生错误,错误信息："+e.toString());
+            return "0";
+        }
+    }
+
+    /**
+     * 根据用户id获取用户工号
+     * @param uid
+     * @return
+     */
+    public static String getWorkcodeByUid(String uid){
+        RecordSet rs = new RecordSet();
+        String sql = "select workcode from hrmresource where id = "+uid+" ";
+        rs.executeQuery(sql);
+        rs.next();
+        return rs.getString("workcode");
+    }
+
+    /**
+     * 根据下拉框字段名以及值获取显示名称
+     *
+     * 废弃
+     *
+     * @param fieldName
+     * @param selectVle
+     * @return
+     */
+    public static String getItemName(String fieldName,String selectVle){
+        RecordSet rs = new RecordSet();
+        String sql = "select wkf_slt.selectname from workflow_billfield wkf_bi INNER JOIN WORKFLOW_SELECTITEM  wkf_slt on wkf_bi.id = wkf_slt.fieldid " +
+                "where wkf_bi.fieldname = '"+fieldName+"' and wkf_slt.selectvalue = "+selectVle+"";
+        rs.executeQuery(sql);
+        rs.next();
+        return Util.null2String(rs.getString("selectname"));
+    }
+
+    /**
+     * 根据下拉框字段名以及值获取显示名称
+     * @param fieldName
+     * @param selectVle
+     * @param workflowid
+     * @return
+     */
+    public static String getItemName2(String fieldName,String selectVle,String workflowid){
+        String code=BaseUtil.getBaseInfoByParm("selectname", "workflow_selectitem", "selectvalue", selectVle,
+                " and fieldid in (select id from workflow_billfield where billid in (select formid from workflow_base where id="+workflowid+") and fieldname='"+fieldName+"' and viewtype=0)");
+        String SelectName = Util.formatMultiLang(code, "7");
+        return SelectName;
+    }
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/action/ResignationFormWriteBackAction.java b/src/main/youhong_ai_jitu_src/jntchina/action/ResignationFormWriteBackAction.java
new file mode 100644
index 0000000..4d6c89c
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/action/ResignationFormWriteBackAction.java
@@ -0,0 +1,257 @@
+package jntchina.action;
+
+import com.alibaba.fastjson.JSONObject;
+import jntchina.util.HttpClientToDC;
+import selfdev.util.base.BaseUtil;
+import selfdev.util.log.LogTool;
+import weaver.conn.RecordSet;
+import weaver.file.Prop;
+import weaver.general.StringUtil;
+import weaver.general.Util;
+import weaver.hrm.resource.ResourceComInfo;
+import weaver.interfaces.workflow.action.Action;
+import weaver.soa.workflow.request.RequestInfo;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 离职申请单写入中台(HR系统)
+ */
+public class ResignationFormWriteBackAction implements Action {
+
+    public String execute(RequestInfo requestInfo) {
+
+        LogTool log = new LogTool("/log/selfdev/action/hrm", false);
+
+        String requestId = requestInfo.getRequestid();
+        String workflowid = requestInfo.getWorkflowid();
+        String workflowname = BaseUtil.getBaseInfoByParm("workflowname", "workflow_base", "id", workflowid, "");
+        log.writeLog("---------------" + workflowname + "开始写入HR-------------requestId:" + requestId);
+
+        //获取配置文件中的参数
+        String mode = Prop.getPropValue("DevToDC_jntchina", "mode");
+        // 服务器ip：port
+        String baseUrl = Prop.getPropValue("DevToDC_jntchina", mode + "_baseUrl");
+        String url = baseUrl + "/dcoaapi/hr/resignation";
+        //获取OA表名称
+        String tablename = BaseUtil.getBaseInfoByParm("tablename", "workflow_bill", "1", "1", " and id in (select formid from workflow_base where id=" + workflowid + ")");
+
+        String sql = " select C_APP_SEQ," +
+                "C_APP_DT," +
+                "XM EMPLID," +
+                "EMPLID2," +
+                "DESCR254," +
+                "lzyyACT_REASON_SUB2 ACT_REASON_SUB," +
+                "lzyyACT_REASON_SUB1 ACTION_REASON," +
+                "LAST_WORK_DAY," +
+                "C_BLACKLIST," +
+                "C_BCKST_VTN_TPYE," +
+                "C_BLACKLIST_REASON," +
+                "EMPLID3," +
+                "C_DEPT_MANAGER," +
+                "MANAGER_ID," +
+                "C_SUPERVISOR1," +
+                "SUPERVISOR_ID," +
+                "C_DEPT_MANAGER1," +
+                "C_DEPT_EXPAND1," +
+                "EXPAND_EMPLID," +
+                "MANAGER_ID1 " +
+                "from " + tablename + " where requestid = " + requestId + " ";
+        log.writeLog("---------------sql------------->" + sql);
+        RecordSet rs = new RecordSet();
+
+        try {
+            rs.executeQuery(sql);
+
+            Map<String, Object> map = new HashMap<String, Object>();
+            String[] columnName = rs.getColumnName();
+            rs.next();
+            for (int i = 0; i < columnName.length; i++) {
+                map.put(columnName[i], Util.null2String(rs.getString(columnName[i])));
+            }
+
+            //是否部门负责人
+            if (map.get("C_DEPT_MANAGER").equals("0")) {
+                map.put("C_DEPT_MANAGER", "Y");
+                String MANAGER_ID = new ResourceComInfo().getWorkcode(map.get("MANAGER_ID").toString());
+                map.put("MANAGER_ID", MANAGER_ID);//变更部门负责人
+            } else {
+                map.put("C_DEPT_MANAGER", "N");
+                map.put("MANAGER_ID", "");//变更部门负责人
+            }
+
+            //是否变更直接上级
+            if (map.get("C_SUPERVISOR1").equals("0")) {
+                map.put("C_SUPERVISOR1", "Y");
+                String SUPERVISOR_ID = new ResourceComInfo().getWorkcode(map.get("SUPERVISOR_ID").toString());
+                map.put("SUPERVISOR_ID", SUPERVISOR_ID);//变更直接上级
+            } else {
+                map.put("C_SUPERVISOR1", "N");
+                map.put("SUPERVISOR_ID", "");//变更直接上级
+            }
+
+            //是否变更分管领导
+            if (map.get("C_DEPT_MANAGER1").equals("0")) {
+                map.put("C_DEPT_MANAGER1", "Y");
+                String MANAGER_ID1 = new ResourceComInfo().getWorkcode(map.get("MANAGER_ID1").toString());
+                map.put("MANAGER_ID1", MANAGER_ID1);//变更分管领导
+            } else {
+                map.put("C_DEPT_MANAGER1", "N");
+                map.put("MANAGER_ID1", "");//变更分管领导
+            }
+
+
+            log.writeLog("是否为部门拓展者角色map.get(C_DEPT_EXPAND1)-------->" + map.get("C_DEPT_EXPAND1"));
+            //是否为部门拓展者角色
+            if (map.get("C_DEPT_EXPAND1").equals("0")) {
+                map.put("C_DEPT_EXPAND1", "Y");//是否为部门拓展者角色
+                String EXPAND_EMPLID = new ResourceComInfo().getWorkcode(map.get("EXPAND_EMPLID").toString());
+                map.put("EXPAND_EMPLID", EXPAND_EMPLID);//变更拓展者角色
+            } else {
+                map.put("C_DEPT_EXPAND1", "N");//是否为部门拓展者角色
+                log.writeLog("拓展者角色map.get(EXPAND_EMPLID)-------->" + map.get("EXPAND_EMPLID"));
+                map.put("EXPAND_EMPLID", "");//变更拓展者角色
+            }
+
+            //申请人工号
+            String EMPLID = new ResourceComInfo().getWorkcode(map.get("EMPLID").toString());
+            map.put("EMPLID", EMPLID);
+
+            //离职详细说明
+            String DESCR254 = Util.null2String(map.get("DESCR254"));
+            if (DESCR254.length() > 250) {//长度超过250，则截取前250位
+                DESCR254 = DESCR254.substring(0, 250);
+            }
+            map.put("DESCR254", DESCR254);
+
+            //离职类别
+            if (!map.get("ACTION_REASON").equals("")) {
+                String itemName = getItemName2("lzyyACT_REASON_SUB1", map.get("ACTION_REASON").toString(), workflowid);
+                log.writeLog("----------lzyyACT_REASON_SUB1-----------转显示值：" + itemName);
+                String[] ACTION_REASON_arr = itemName.split("-");
+                map.put("ACTION_REASON", ACTION_REASON_arr[0]);
+            } else {
+                map.put("ACT_REASON_SUB", "");
+            }
+            //离职原因
+            if (!map.get("ACT_REASON_SUB").equals("")) {
+                String itemName = getItemName2("lzyyACT_REASON_SUB2", map.get("ACT_REASON_SUB").toString(), workflowid);
+                String[] ACT_REASON_SUB_arr = itemName.split("-");
+                map.put("ACT_REASON_SUB", ACT_REASON_SUB_arr[0]);
+            } else {
+                map.put("ACT_REASON_SUB", "");
+            }
+
+            map.put("C_APPLI_RS", "3");//审批状态 默认为3
+
+            if (map.get("C_BLACKLIST").equals("0")) { //0为是
+                map.put("C_BLACKLIST", "Y");//是否加入黑名单
+                String emplid3 = (String) map.get("EMPLID3");
+                RecordSet recordSet = new RecordSet();
+                String sqlUser = "select workcode from hrmresource where id = ?";
+                if (StringUtil.isEmpty(emplid3)) {//如果提报人为空 默认传当前节点操作人，也就是当前操作这条流程的user
+                    int userId = requestInfo.getRequestManager().getUserId();
+                    if (recordSet.executeQuery(sqlUser, userId) && recordSet.next()) {
+                        map.put("EMPLID3", recordSet.getString("workcode"));
+                    }
+                } else {
+                    recordSet.executeQuery(sqlUser, emplid3);
+                    if (recordSet.next()) {
+                        map.put("EMPLID3", recordSet.getString("workcode"));
+                    }
+                }
+                if (StringUtil.isEmpty(Util.null2String(map.get("C_BCKST_VTN_TPYE")))) {
+                    map.put("C_BCKST_VTN_TPYE", "");//黑名单类型
+                } else {
+                    map.put("C_BCKST_VTN_TPYE", "" + ((Util.getIntValue(map.get("C_BCKST_VTN_TPYE").toString())) + 1));//黑名单类型
+                }
+            } else {
+                map.put("C_BLACKLIST", "N");//是否加入黑名单
+                map.put("C_BCKST_VTN_TPYE", "");//黑名单类型
+                map.put("C_BLACKLIST_REASON", "");//加入黑名单原因
+                map.put("EMPLID3", "");//加入黑名单发起人
+            }
+
+            String strParm = JSONObject.toJSONString(map);
+            log.writeLog("离职单准备传入数据中台的数据为------>" + strParm);
+
+            String token = HttpClientToDC.getToken();
+            log.writeLog("离职单token------>" + token);
+            log.writeLog("离职单url------>" + url);
+
+            String returndata = HttpClientToDC.sendPostApi(url, token, strParm);
+            log.writeLog("离职单返回数据returndata------>" + returndata);
+            if (!"".equals(returndata) && returndata != null) {
+                JSONObject jsonObject = JSONObject.parseObject(returndata);
+                String code = Util.null2String(jsonObject.get("code"));
+                log.writeLog("--------发送请求返回的code值为：" + code);
+                if (code.equals("1")) {
+                    return SUCCESS;
+                } else {
+                    String msg = Util.null2String(jsonObject.get("msg"));
+                    requestInfo.getRequestManager().setMessageid("111100");
+                    requestInfo.getRequestManager().setMessagecontent(msg);
+                    return "0";
+                }
+            } else {
+                String ermsg = "流程数据写入HR调动申请单失败,未获取到接口返回结果，请联系系统管理员处理！";
+                requestInfo.getRequestManager().setMessageid("111100");
+                requestInfo.getRequestManager().setMessagecontent(ermsg);
+                return "0";
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            requestInfo.getRequestManager().setMessageid("111100");
+            requestInfo.getRequestManager().setMessagecontent("流程发生错误,错误信息：" + e.toString());
+            return "0";
+        }
+    }
+
+    /**
+     * 根据用户id获取用户工号
+     *
+     * @param uid
+     * @return
+     */
+    public static String getWorkcodeByUid(String uid) {
+        RecordSet rs = new RecordSet();
+        String sql = "select workcode from hrmresource where id = " + uid + " ";
+        rs.executeQuery(sql);
+        rs.next();
+        return rs.getString("workcode");
+    }
+
+    /**
+     * 根据下拉框字段名以及值获取显示名称
+     * <p>
+     * 废弃
+     *
+     * @param fieldName
+     * @param selectVle
+     * @return
+     */
+    public static String getItemName(String fieldName, String selectVle) {
+        RecordSet rs = new RecordSet();
+        String sql = "select wkf_slt.selectname from workflow_billfield wkf_bi INNER JOIN WORKFLOW_SELECTITEM  wkf_slt on wkf_bi.id = wkf_slt.fieldid " +
+                "where wkf_bi.fieldname = '" + fieldName + "' and wkf_slt.selectvalue = " + selectVle + "";
+        rs.executeQuery(sql);
+        rs.next();
+        return Util.null2String(rs.getString("selectname"));
+    }
+
+    /**
+     * 根据下拉框字段名以及值获取显示名称
+     *
+     * @param fieldName
+     * @param selectVle
+     * @param workflowid
+     * @return
+     */
+    public static String getItemName2(String fieldName, String selectVle, String workflowid) {
+        String code = BaseUtil.getBaseInfoByParm("selectname", "workflow_selectitem", "selectvalue", selectVle,
+                " and fieldid in (select id from workflow_billfield where billid in (select formid from workflow_base where id=" + workflowid + ") and fieldname='" + fieldName + "' and viewtype=0)");
+        String SelectName = Util.formatMultiLang(code, "7");
+        return SelectName;
+    }
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/action/ReturnBiaoShuAuditResultAction.java b/src/main/youhong_ai_jitu_src/jntchina/action/ReturnBiaoShuAuditResultAction.java
new file mode 100644
index 0000000..c1a7b8c
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/action/ReturnBiaoShuAuditResultAction.java
@@ -0,0 +1,133 @@
+package jntchina.action;
+
+import com.alibaba.fastjson.JSONObject;
+import weaver.file.Prop;
+import jntchina.util.HttpClientToDC;
+import org.apache.http.util.EntityUtils;
+import selfdev.util.base.BaseUtil;
+import selfdev.util.log.LogTool;
+import weaver.conn.RecordSet;
+import weaver.general.Util;
+import weaver.interfaces.workflow.action.Action;
+import weaver.soa.workflow.request.RequestInfo;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+/**
+ * 极兔->  OA标书审核完毕状态回传接口
+ * @title: ReturnBiaoShuAuditResultAction
+ * @Author LJL
+ * @Date: 2021/9/28 10:19
+ * @Version 1.0
+ */
+
+public class ReturnBiaoShuAuditResultAction implements Action {
+    @Override
+    public String execute(RequestInfo requestInfo) {
+        String state = "";
+        LogTool log = new LogTool("/log/selfdev/action", false);
+        SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd");
+
+
+        //封装参数
+        JSONObject date = new JSONObject();
+        String requestid = requestInfo.getRequestid();
+        String workflowid = requestInfo.getWorkflowid();
+        String tablename = BaseUtil.getBaseInfoByParm("tablename", "workflow_bill", "1", "1", " and id in (select formid from workflow_base where id=" + workflowid + ")");
+
+        String src = requestInfo.getRequestManager().getSrc();//获取流程是提交还是驳回
+        log.writeLog("状态是 "+src);
+        String name=requestInfo.getRequestManager().getUser().getLastname();//获取当前审批人
+        name=Util.formatMultiLang(name,"7");//增加多语言过滤 7代表简体中文 8英文 9繁体中文
+
+
+        if("".equals(src)){
+
+            requestInfo.getRequestManager().setMessagecontent("审批状态为空");
+            return FAILURE_AND_CONTINUE;
+        }
+        if("reject".equals(src)){
+            state="1";
+
+        }else if("submit".equals(src)){
+            state="2";
+        }
+        log.writeLog("表名是"+tablename);
+
+        //连接数据库
+        RecordSet rs = new RecordSet();
+
+        rs.execute("select * from "+tablename+" "+"where requestid="+requestid);
+        log.writeLog("查表Sql是"+"select * from "+tablename+" where requestid="+requestid);
+        String biddingType ="";
+        while(rs.next()){
+            date.put("tenderCode", Util.null2String(rs.getString("bsbm")));//获取标书编码
+            if("0".equals(Util.null2String(rs.getString("biddingType")))){
+                biddingType= "1";
+            }else if("1".equals(Util.null2String(rs.getString("biddingType")))){
+                biddingType= "2";
+            }else{
+                return FAILURE_AND_CONTINUE;
+            }
+            date.put("biddingType",biddingType);//获取标书类型
+            date.put("auditStatus", state);//获取审批状态
+            date.put("auditName", name);//获取审批人
+            date.put("auditTime", df.format(new Date()));//获取审批时间
+            date.put("remark", Util.null2String(rs.getString("remark")));//获取审批备注
+        }
+        String s = date.toString();
+        if("".equals(s)){
+            return FAILURE_AND_CONTINUE+" 传入参数为空 请仔细检查传入参数";
+        }
+        String uri = "";
+        String mode = Prop.getPropValue("DevToDC_jntchina", "mode");
+        String url = Prop.getPropValue("DevToDC_jntchina", mode + "_baseUrl");
+
+
+        if("2".equals(biddingType)){
+//            uri = "http://vpm.sinoservices.com/srm-web/srmweb/oaConventionTenderAuditresultController/auditResult.shtml";
+            uri = url+"/dcoaapi/srm/auditResult";//传数据到中台(标书申请运力)
+        }else if ("1".equals(biddingType)){
+            uri =url+"/dcoaapi/srm/materialTenderAuditResult";
+//            uri = "http://dev-jtdcapi.jms.com/dcoaapi/srm/";//传数据到中台(标书申请物资)
+        }
+
+        //获取TOKEN
+        String token = HttpClientToDC.getToken();
+        log.writeLog("获取数据中台的token------>" + token+" uri:"+uri);
+        try {
+            String s1 = HttpClientToDC.sendPostApi(uri, token, s);
+            log.writeLog("传过去的数据是:==>   " + s+"返回参数是==>" + s1);
+            JSONObject jsonObject = JSONObject.parseObject(s1);
+            log.writeLog("接口执行之后回传的参数====>" + jsonObject);
+            Object msg = jsonObject.get("data");
+            if (!"success".equals(msg)){
+                requestInfo.getRequestManager().setMessagecontent("接口执行失败 原因为:"+jsonObject.get("msg"));
+                return FAILURE_AND_CONTINUE + "请联系后台管理员";
+            }
+
+
+            return SUCCESS;
+        }catch (Exception e){
+            e.printStackTrace();
+            requestInfo.getRequestManager().setMessagecontent("后台出现异常:::"+e);
+            return FAILURE_AND_CONTINUE;
+        }
+//        try {
+//            httpPost.addHeader("Content-Type", "application/json; charset=utf-8");
+//            httpPost.setEntity(new StringEntity(s, StandardCharsets.UTF_8));
+//            CloseableHttpResponse response = httpClient.execute(httpPost);
+//            if (response != null && response.getEntity() != null) {
+//                String resultString = EntityUtils.toString(response.getEntity());
+//                log.writeLog("返回的结果信息为：" + resultString);
+//                return "1";
+//            } else {
+//                return "0 获取数据失败 请查看日志";
+//            }
+//        } catch (Exception var16) {
+//            return "0  请求失败";
+//        }
+
+    }
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/action/ReturnFeiYongAuditResultAction.java b/src/main/youhong_ai_jitu_src/jntchina/action/ReturnFeiYongAuditResultAction.java
new file mode 100644
index 0000000..61ab167
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/action/ReturnFeiYongAuditResultAction.java
@@ -0,0 +1,102 @@
+package jntchina.action;
+
+import com.alibaba.fastjson.JSONObject;
+import weaver.file.Prop;
+import jntchina.util.HttpClientToDC;
+import selfdev.util.base.BaseUtil;
+import selfdev.util.log.LogTool;
+import weaver.conn.RecordSet;
+import weaver.general.Util;
+import weaver.interfaces.workflow.action.Action;
+import weaver.soa.workflow.request.RequestInfo;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+
+/**
+ * @title: ReturnFeiYongAuditResultAction
+ * @Author LJL
+ * @Date: 2021/9/28 10:19
+ * @Version 1.0
+ * 备注:  用于费用审核流程  OA审批完毕数据回传给SRM
+ *
+ */
+
+public class ReturnFeiYongAuditResultAction implements Action {
+    @Override
+    public String execute(RequestInfo requestInfo) {
+        String state = "";
+        LogTool log = new LogTool("/log/selfdev/action", false);//上传日志
+        SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd");
+
+
+        //封装参数
+        JSONObject date = new JSONObject();
+
+        //获取表名 和唯一标识
+        String requestid = requestInfo.getRequestid();
+        String workflowid = requestInfo.getWorkflowid();
+        String tablename = BaseUtil.getBaseInfoByParm("tablename", "workflow_bill", "1", "1", " and id in (select formid from workflow_base where id=" + workflowid + ")");
+        log.writeLog("表名是"+tablename);
+
+        //连接数据库
+        RecordSet rs = new RecordSet();
+
+        //获取流程状态
+        String src = requestInfo.getRequestManager().getSrc();
+        String name=requestInfo.getRequestManager().getUser().getLastname();//获取当前审批人
+        name=Util.formatMultiLang(name,"7");//增加多语言过滤 7代表简体中文 8英文 9繁体中文
+
+        if("reject".equals(src)){
+            state="1";
+
+        }else if("submit".equals(src)){
+            state="2";
+        }
+
+        //从配置文件动态获取url
+        String mode = Prop.getPropValue("DevToDC_jntchina", "mode");
+        String url = Prop.getPropValue("DevToDC_jntchina", mode + "_baseUrl");
+        String uri = url +"/dcoaapi/srm/paymentAuditResult";//待定
+
+        rs.execute("select * from " + tablename + " " + "where requestid=" + requestid);
+            log.writeLog("查表Sql是" + "select * from " + tablename + "where requestid=" + requestid);
+            while (rs.next()) {
+                date.put("payNo", Util.null2String(rs.getString("payNo")));//缴纳单号
+                date.put("auditStatus", state);//审批状态
+                date.put("auditName", name);//审批人
+                date.put("auditTime", df.format(new Date()));//审批时间
+                date.put("remark", Util.null2String(rs.getString("spbz")));//审批备注
+            }
+            String s = date.toString();
+            log.writeLog("传过去的JSON数据是:==>   " + s+" uri"+uri);
+        String token = HttpClientToDC.getToken();
+
+        try {
+            String s1 = HttpClientToDC.sendPostApi(uri, token, s);
+            if(s1!=null&&s1!=""){
+                log.writeLog("回传数据成功  回传的状态是:   " + s1);
+
+                JSONObject jsonObject = JSONObject.parseObject(s1);
+                log.writeLog("接口执行之后回传的参数====>" + jsonObject);
+                Object msg = jsonObject.get("data");
+                if (!"success".equals(msg)){
+                    requestInfo.getRequestManager().setMessagecontent("接口执行失败 原因为:"+jsonObject.get("msg"));
+                    return FAILURE_AND_CONTINUE + "请联系后台管理员";
+                }
+
+                return SUCCESS;
+            }else{
+                log.writeLog("回传数据失败");
+                return FAILURE_AND_CONTINUE;
+            }
+
+
+        } catch (Exception e) {
+                return FAILURE_AND_CONTINUE + "  请求失败";
+            }
+
+
+    }
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/action/ReturnHeTongStatusAction.java b/src/main/youhong_ai_jitu_src/jntchina/action/ReturnHeTongStatusAction.java
new file mode 100644
index 0000000..21dab94
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/action/ReturnHeTongStatusAction.java
@@ -0,0 +1,88 @@
+package jntchina.action;
+
+import com.alibaba.fastjson.JSONObject;
+import weaver.file.Prop;
+import weaver.general.Util;
+import jntchina.util.HttpClientToDC;
+import selfdev.util.base.BaseUtil;
+import selfdev.util.log.LogTool;
+import weaver.conn.RecordSet;
+import weaver.interfaces.workflow.action.Action;
+import weaver.soa.workflow.request.RequestInfo;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Hashtable;
+
+/**
+ * @title: ReturnHeTongStatusAction
+ * @Author LJL
+ * @Date: 2021/10/27 10:02
+ * @Version 1.0
+ *
+ *    /合同审批数据回传至中台至SRM/
+ */
+public class ReturnHeTongStatusAction implements Action {
+    LogTool log = new LogTool("/log/selfdev/action", false);
+    @Override
+    public String execute(RequestInfo requestInfo) {
+        log.writeLog("合同审批流程开始");
+        JSONObject date = new JSONObject();
+        String requestid = requestInfo.getRequestid();
+        String workflowid = requestInfo.getWorkflowid();
+        String tablename = BaseUtil.getBaseInfoByParm("tablename", "workflow_bill", "1", "1", " and id in (select formid from workflow_base where id=" + workflowid + ")");
+        String state = "2";
+
+        String name=requestInfo.getRequestManager().getUser().getLastname();
+        name=Util.formatMultiLang(name,"7");//增加多语言过滤 7代表简体中文 8英文 9繁体中文
+        String bz = "";
+        String src = requestInfo.getRequestManager().getSrc();//获取流程是提交还是驳回
+        if("reject".equals(src)){
+            state="1";
+            bz="被退回";
+        }else if("submit".equals(src)){
+            state="2";
+            bz="审批通过!";
+        }
+        RecordSet rs = new RecordSet();
+
+        String SQL = "select * from "+tablename+" "+"where requestid="+requestid;
+        log.writeLog("查表Sql是"+SQL);
+        rs.execute(SQL);
+        while (rs.next()) {
+            date.put("contractCode", Util.null2String(rs.getString("lcbh")));//合同编号
+            date.put("auditStatus",state);
+            date.put("auditName",name);//审批人
+            date.put("auditTime",new SimpleDateFormat("yyyy-MM-dd HH:mm:ss ").format(new Date(System.currentTimeMillis())));//审批时间
+            date.put("remark",bz);//备注
+        }
+        log.writeLog("数据已获取===>"+date);
+        String mode = Prop.getPropValue("DevToDC_jntchina", "mode");
+        String url = Prop.getPropValue("DevToDC_jntchina", mode + "_baseUrl")+"/dcoaapi/srm/contractAuditResult";
+        String token = HttpClientToDC.getToken();
+        log.writeLog("url:"+url);
+        try {
+            String s1 = HttpClientToDC.sendPostApi(url, token, date.toString());
+            if(s1.equals("")){
+                requestInfo.getRequestManager().setMessagecontent("接口未成功访问");
+                return FAILURE_AND_CONTINUE;
+            }else{
+                JSONObject jsonObject = JSONObject.parseObject(s1);
+                log.writeLog("接口执行之后回传的参数====>" + jsonObject+"返回结果是:"+s1);
+                Object msg = jsonObject.get("data");
+                if (!"success".equals(msg)){
+                    requestInfo.getRequestManager().setMessagecontent("接口执行失败 原因为:"+jsonObject.get("msg"));
+                    return FAILURE_AND_CONTINUE + "请联系后台管理员";
+                }
+            }
+
+
+        }catch (Exception e){
+            requestInfo.getRequestManager().setMessagecontent("后台出现异常"+e);
+            return FAILURE_AND_CONTINUE;
+        }
+
+        return SUCCESS;
+
+    }
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/action/ReturnWuZiAuditResultAction.java b/src/main/youhong_ai_jitu_src/jntchina/action/ReturnWuZiAuditResultAction.java
new file mode 100644
index 0000000..45508fc
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/action/ReturnWuZiAuditResultAction.java
@@ -0,0 +1,163 @@
+package jntchina.action;
+
+import com.alibaba.fastjson.JSONObject;
+import com.weaver.file.Prop;
+import jntchina.util.HttpClientToDC;
+import selfdev.util.base.BaseUtil;
+import weaver.conn.RecordSet;
+import weaver.general.Util;
+import weaver.interfaces.workflow.action.Action;
+import weaver.soa.workflow.request.RequestInfo;
+
+import java.nio.charset.StandardCharsets;
+
+/**
+ * @title: ReturnWuZiAuditResultAction
+ * @Author LJL
+ * @Date: 2021/9/28 10:19
+ * @Version 1.0
+ * 备注:  用物资审核流程  OA审批完毕数据回传给SRM
+ *
+ */
+
+public class ReturnWuZiAuditResultAction implements Action {
+    @Override
+    public String execute(RequestInfo requestInfo) {
+        String applicantPerson = "";//流程申请人
+        String applicantTime = "";//申请时间
+        String applicantDep = "";//申请部门
+        String orderQuantity = "";//订购数量
+        String demandAllocation = "";//需求分配
+        String applicantReason = "";//申请理由
+        String processCode = "";//流程编码
+        String materialCode = "";//物料编码
+        String materialName = "";//物料名称
+        String spec = "";//规格型号
+        String quantity = "";//数量
+        String categoryCode = "";//物料大类
+        String description = "";//品名
+        String creatorName = "";//使用者
+        String demand = "";//需求部门
+        String price = "";//单价
+        String totalPrice = "";//总价
+        String invoiceHead = "";//开票抬头
+        String demandReason = "";//需求原因
+
+        String s = "[";
+        String mode = Prop.getPropValue("DevToDC_jntchina", "mode");
+        String url = Prop.getPropValue("DevToDC_jntchina", mode + "_baseUrl");
+        String uri =url + "/dcoaapi/srm/synMaterialTender";//
+
+        String requestid = requestInfo.getRequestid();
+        String workflowid = requestInfo.getWorkflowid();
+        String tablename = BaseUtil.getBaseInfoByParm("tablename", "workflow_bill", "1", "1", " and id in (select formid from workflow_base where id=" + workflowid + ")");
+        String SQl = "select t1.xm,t1.sqsj,t1.bmdm,t1.dgsl,t1.xqfp,t1.sqly,t1.lcbm,t2.zcbh,t2.wpmc,t2.ggxh,t2.sl,t2.lx,t2.pm,t2.jsr,t2.xqbm,t2.dj," +
+                "t2.zje,t2.kpfktt,t2.bz from formtable_main_727 t1 left join formtable_main_727_dt1 t2 on t1.id = t2.mainid where t1.requestid = "+requestid;
+        RecordSet rs = new RecordSet();
+        rs.execute(SQl);
+        while (rs.next()) {
+            applicantPerson = Util.null2String(rs.getString("xm"));
+            applicantTime = Util.null2String(rs.getString("sqsj"));
+            applicantDep = Util.null2String(rs.getString("bmdm"));
+            orderQuantity = Util.null2String(rs.getString("dgsl"));
+            demandAllocation = Util.null2String(rs.getString("xqfp"));
+            applicantReason = Util.null2String(rs.getString("sqly"));
+            processCode = Util.null2String(rs.getString("lcbm"));
+            materialCode = Util.null2String(rs.getString("zcbh"));
+            materialName = Util.null2String(rs.getString("wpmc"));
+            spec = Util.null2String(rs.getString("ggxh"));
+            quantity = Util.null2String(rs.getString("sl"));
+            categoryCode = Util.null2String(rs.getString("wzlx"));
+            description = Util.null2String(rs.getString("pm"));
+            creatorName = Util.null2String(rs.getString("jsr"));
+            demand = Util.null2String(rs.getString("xqbm"));
+            price = Util.null2String(rs.getString("dj"));
+            totalPrice = Util.null2String(rs.getString("zje"));
+            invoiceHead = Util.null2String(rs.getString("kpfktt"));
+            demandReason = Util.null2String(rs.getString("bz"));
+            JSONObject date = new JSONObject();
+            date.put("applicantTime",applicantTime);
+            date.put("orderQuantity",orderQuantity);
+            date.put("processCode",processCode);
+            date.put("applicantReason",applicantReason);
+            date.put("materialCode",materialCode);
+            date.put("quantity",quantity);
+            date.put("description",description);
+            date.put("price",price);
+            date.put("totalPrice",totalPrice);
+            date.put("demandReason",demandReason);
+
+            materialName= BaseUtil.getBaseInfoByParm("selectname", "workflow_selectitem", "selectvalue", materialName,
+                    " and fieldid in (select id from workflow_billfield where billid in (select formid from workflow_base where id="+workflowid+") and fieldname='wpmc' and viewtype=1)");
+            date.put("materialName",materialName);
+
+            spec=BaseUtil.getBaseInfoByParm("selectname", "workflow_selectitem", "selectvalue", spec,
+                    " and fieldid in (select id from workflow_billfield where billid in (select formid from workflow_base where id="+workflowid+") and fieldname='ggxh' and viewtype=1)");
+            date.put("spec",spec);
+
+            categoryCode=BaseUtil.getBaseInfoByParm("selectname", "workflow_selectitem", "selectvalue", categoryCode,
+                    " and fieldid in (select id from workflow_billfield where billid in (select formid from workflow_base where id="+workflowid+") and fieldname='wzlx' and viewtype=1)");
+            date.put("categoryCode",categoryCode);
+
+            invoiceHead=BaseUtil.getBaseInfoByParm("selectname", "workflow_selectitem", "selectvalue", invoiceHead,
+                    " and fieldid in (select id from workflow_billfield where billid in (select formid from workflow_base where id="+workflowid+") and fieldname='kpfktt' and viewtype=1)");
+            date.put("invoiceHead",invoiceHead);
+
+
+
+            String SQL2 = "select * from hrmdepartment where id = "+applicantDep;
+            RecordSet rs2 = new RecordSet();
+            rs2.execute(SQL2);
+            if (rs2.next()) {
+                applicantDep = rs2.getString("DEPARTMENTNAME");
+            }
+            date.put("applicantDep",applicantDep);
+
+            String SQL3 = "select * from hrmdepartment where id = "+demand;
+            RecordSet rs3 = new RecordSet();
+            rs3.execute(SQL3);
+            if (rs3.next()) {
+                demand = rs3.getString("DEPARTMENTNAME");
+            }
+            date.put("demand",demand);
+
+            String SQL4 = "select * from hrmresource where id = "+applicantPerson;
+            RecordSet rs4 = new RecordSet();
+            rs4.execute(SQL4);
+            if (rs4.next()) {
+                applicantPerson = rs4.getString("LASTNAME");
+            }
+            date.put("applicantPerson",applicantPerson);
+
+            String SQL5 = "select * from hrmresource where id = "+creatorName;
+            RecordSet rs5 = new RecordSet();
+            rs5.execute(SQL5);
+            if (rs5.next()) {
+                creatorName = rs5.getString("LASTNAME");
+            }
+            date.put("creatorName",creatorName);
+
+            String SQL6 = "select * from hrmresource where id = "+demandAllocation;
+            RecordSet rs6 = new RecordSet();
+            rs6.execute(SQL6);
+            if (rs6.next()) {
+                demandAllocation = rs6.getString("LASTNAME");
+            }
+            date.put("demandAllocation",demandAllocation);
+
+            s=s+date+",";
+
+        }
+        s=s.substring(0,s.length()-1)+"]";
+        String token = HttpClientToDC.getToken();
+        try{
+            String s1 = HttpClientToDC.sendPostApi(uri, token, s);
+        }catch(Exception e){
+
+            return FAILURE_AND_CONTINUE + " 请求失败 因为: "+e+"  具体请看日志";
+        }
+
+
+        return SUCCESS;
+    }
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/action/ReturnZhongBiaoAuditResultAction.java b/src/main/youhong_ai_jitu_src/jntchina/action/ReturnZhongBiaoAuditResultAction.java
new file mode 100644
index 0000000..dd20627
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/action/ReturnZhongBiaoAuditResultAction.java
@@ -0,0 +1,104 @@
+package jntchina.action;
+
+import com.alibaba.fastjson.JSONObject;
+import weaver.file.Prop;
+import jntchina.util.HttpClientToDC;
+import selfdev.util.base.BaseUtil;
+import selfdev.util.log.LogTool;
+import weaver.conn.RecordSet;
+import weaver.general.Util;
+import weaver.interfaces.workflow.action.Action;
+import weaver.soa.workflow.request.RequestInfo;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+/**
+ * @title: ReturnZhongBiaoAuditResultAction
+ * @Author LJL
+ * @Date: 2021/9/28 10:19
+ * @Version 1.0
+ * 备注:  用于中标审核流程  OA审批完毕数据回传给SRM
+ *
+ */
+public class ReturnZhongBiaoAuditResultAction implements Action {
+    @Override
+    public String execute(RequestInfo requestInfo) {
+        String state = "";
+        LogTool log = new LogTool("/log/selfdev/action", false);
+        SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd");
+        //封装参数
+        JSONObject date = new JSONObject();
+        String requestid = requestInfo.getRequestid();
+        String workflowid = requestInfo.getWorkflowid();
+        String tablename = BaseUtil.getBaseInfoByParm("tablename", "workflow_bill", "1", "1", " and id in (select formid from workflow_base where id=" + workflowid + ")");
+        String src = requestInfo.getRequestManager().getSrc();//获取流程是提交还是驳回
+        String name=requestInfo.getRequestManager().getUser().getLastname();//获取当前审批人
+        name= Util.formatMultiLang(name,"7");//增加多语言过滤 7代表简体中文 8英文 9繁体中文
+        if("reject".equals(src)){
+            state="1";
+
+        }else if("submit".equals(src)){
+            state="2";
+        }
+        log.writeLog("表名是"+tablename);
+
+        RecordSet rs = new RecordSet();
+        rs.execute("select * from "+tablename+" "+"where requestid="+requestid);
+        log.writeLog("查表Sql是"+"select * from "+tablename+" "+"where requestid="+requestid);
+        String biddingType="";
+
+        while(rs.next()){
+
+            date.put("tenderCode", Util.null2String(rs.getString("bsbm")));//获取标书编码
+            if ("0".equals(Util.null2String(rs.getString("biddingType")))) {
+                biddingType = "1";
+            } else if("1".equals(Util.null2String(rs.getString("biddingType")))) {
+                biddingType = "2";
+            }
+            date.put("biddingType",biddingType );//获取标书类型
+            date.put("auditStatus", state);//获取审批状态
+            date.put("auditName", name);//获取审批人
+            date.put("auditTime", df.format(new Date()));//获取审批时间
+            date.put("remark", Util.null2String(rs.getString("remark")));//获取审批备注
+        }
+
+        String uri = "";
+        String mode = Prop.getPropValue("DevToDC_jntchina", "mode");
+        String url = Prop.getPropValue("DevToDC_jntchina", mode + "_baseUrl");
+        log.writeLog(mode+"  "+url+"   "+biddingType);
+        if ("1".equals(biddingType)){
+            uri = url+"/dcoaapi/srm/materialWinResult";//中台传入数据(物料)
+
+        }else if("2".equals(biddingType)){
+            uri = url+"/dcoaapi/srm/conventionWinResult";
+//            uri = "http://dev-jtdcapi.jms.com/dcoaapi/srm/  //中标中台接口
+
+        }else{
+            return FAILURE_AND_CONTINUE;
+        }
+        String s = date.toString();
+        log.writeLog(s);
+        String token = HttpClientToDC.getToken();
+        log.writeLog(token);
+        log.writeLog("获取数据中台的token------>" + token);
+        log.writeLog("传过去的数据是:==>   "+s+" url:"+uri);
+        try {
+            String s1 = HttpClientToDC.sendPostApi(uri, token, s);
+            log.writeLog("传过去的数据是:==>   " + s+"返回参数是==>" + s1);
+            JSONObject jsonObject = JSONObject.parseObject(s1);
+            log.writeLog("接口执行之后回传的参数====>" + jsonObject);
+            Object msg = jsonObject.get("data");
+            if (!"success".equals(msg)){
+                requestInfo.getRequestManager().setMessagecontent("接口执行失败 原因为:"+jsonObject.get("msg"));
+                return FAILURE_AND_CONTINUE + "请联系后台管理员";
+            }
+            return SUCCESS;
+        }catch (Exception e){
+            log.writeLog(e);
+            return FAILURE_AND_CONTINUE;
+        }
+
+
+    }
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/action/RewardAndPunishmentAction.java b/src/main/youhong_ai_jitu_src/jntchina/action/RewardAndPunishmentAction.java
new file mode 100644
index 0000000..f17f74f
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/action/RewardAndPunishmentAction.java
@@ -0,0 +1,162 @@
+package jntchina.action;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import jntchina.util.HttpClientToDC;
+import selfdev.util.base.BaseUtil;
+import selfdev.util.log.LogTool;
+import weaver.conn.RecordSet;
+import weaver.file.Prop;
+import weaver.general.Util;
+import weaver.interfaces.workflow.action.BaseAction;
+import weaver.soa.workflow.request.RequestInfo;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @title: 奖惩申请数据传HR系统
+ * @Author ycf
+ * @Date: 2022/1/6 15:14
+ * @Version 1.0
+ */
+public class RewardAndPunishmentAction extends BaseAction {
+    @Override
+    public String execute(RequestInfo requestInfo) {
+        LogTool log = new LogTool("/log/selfdev/action/hrm", false);
+        String requestId = requestInfo.getRequestid(); // 获取requestid
+        String workflowid = requestInfo.getWorkflowid(); // 获取workflowid
+        //获取工作流名称
+        String workflowname = BaseUtil.getBaseInfoByParm("workflowname", "workflow_base", "id", workflowid, "");
+        log.writeLog("---------------工作流名称-----------workflowname为：" + workflowname);
+        log.writeLog("--------奖惩申请单数据传入中台开始----requestId值为：" + requestId);
+
+        //获取配置文件中的参数，到时候URL路径
+        String mode = Prop.getPropValue("DevToDC_jntchina", "mode");
+        // 服务器ip：port
+        String baseUrl = Prop.getPropValue("DevToDC_jntchina", mode + "_baseUrl");
+        //访问路径拼接
+        String url = baseUrl + "/dcoaapi/hr/rewardInfoResult";
+
+
+        //根据流程id获取主表名称
+        String mainTable = RegularizationApplyForAction.getMainTable(requestId);
+        log.writeLog("--------获取到的表名为----：" + mainTable);
+
+
+        RecordSet recordSet = new RecordSet();
+        String sql = "";
+        Map<String, Object> map = new HashMap<String, Object>();
+        ArrayList<Map<String,String>> list = new ArrayList<Map<String,String>>();
+        HashMap<String, String> hashMap = new HashMap<String, String>();
+
+        try {
+            //获取部门和日期
+            sql = "select LCBH    C_APP_SEQ, bjcrgh  EMPLID, '1'     C_SEQUENCE_NUM,  jcrq    C_RWD_DATE,  jclb    C_REWARD_CATEGORY, \n" +
+                    "       jcdw C_RWDPNS_UNIT,\n" +
+                    "       jclx  C_RWDPNS_TYP, jcyy C_RWD_REASON,  (select WORKCODE from HrmResource a where a.ID = b.tbr) C_INFORM_PERSON,\n" +
+                    "       sflzxc C_SALARY_TRANSFER,  jcfs C_RWDPNS_SCORE, jcje C_RWDPNS_AMOUNT , bz  C_RWD_COMMENT from "+mainTable+" b where requestid = "+requestId;
+            log.writeLog("获取奖惩信息的SQL:"+sql);
+
+            recordSet.execute(sql);
+            recordSet.next();
+            //C_APP_SEQ流程编号
+            map.put("C_APP_SEQ", Util.null2String(recordSet.getString("C_APP_SEQ")));
+            //EMPLID员工ID
+            map.put("EMPLID", Util.null2String(recordSet.getString("EMPLID")));
+            //C_SEQUENCE_NUM序号
+            hashMap.put("C_SEQUENCE_NUM", Util.null2String(recordSet.getString("C_SEQUENCE_NUM")));
+
+            //C_RWD_DATE奖惩日期
+            hashMap.put("C_RWD_DATE", Util.null2String(recordSet.getString("C_RWD_DATE")).replace("-","/"));
+            //C_RWDPNS_UNIT提报人单位
+            hashMap.put("C_RWDPNS_UNIT", Util.null2String(recordSet.getString("C_RWDPNS_UNIT")));
+
+
+            //C_REWARD_CATEGORY奖惩类别
+//            hashMap.put("C_REWARD_CATEGORY", Util.null2String(recordSet.getString("C_REWARD_CATEGORY")).equals("0")?"10":"20");
+
+            String jclb = BaseUtil.getBaseInfoByParm("selectname", "workflow_selectitem", "selectvalue", Util.null2String(recordSet.getString("C_REWARD_CATEGORY")),
+                    " and fieldid in (select id from workflow_billfield where billid in (select formid from workflow_base where id="+requestInfo.getWorkflowid()+") and  fieldname='jclb' and viewtype=0)");
+            log.writeLog("获取的奖惩类别中文名:"+jclb);
+
+            hashMap.put("C_REWARD_CATEGORY", getType(jclb,"C_REWARD_CATEGORY"));
+
+
+            String jclx = BaseUtil.getBaseInfoByParm("selectname", "workflow_selectitem", "selectvalue", Util.null2String(recordSet.getString("C_RWDPNS_TYP")),
+                    " and fieldid in (select id from workflow_billfield where billid in (select formid from workflow_base where id="+requestInfo.getWorkflowid()+") and fieldname='jclx' and viewtype=0)");
+            log.writeLog("获取的奖惩类别中文名:"+jclx);
+
+            //奖惩原因
+            String C_RWD_REASON=Util.null2String(recordSet.getString("C_RWD_REASON"));
+            if(C_RWD_REASON.length()>84){//长度超过250时，截取前250位
+                C_RWD_REASON=C_RWD_REASON.substring(0,84);
+            }
+            //备注
+            String C_RWD_COMMENT=Util.null2String(recordSet.getString("C_RWD_COMMENT"));
+            if(C_RWD_COMMENT.length()>84){//长度超过250时，截取前250位
+                C_RWD_COMMENT=C_RWD_COMMENT.substring(0,84);
+            }
+            //C_RWDPNS_TYP奖惩类型
+            hashMap.put("C_RWDPNS_TYP", getType(jclx,"C_RWDPNS_TYP"));
+            //C_RWD_REASON奖惩原因
+            hashMap.put("C_RWD_REASON", C_RWD_REASON);
+            //C_INFORM_PERSON提报人
+            hashMap.put("C_INFORM_PERSON", Util.null2String(recordSet.getString("C_INFORM_PERSON")));
+            //C_SALARY_TRANSFER是否薪资流转,如果为  是：0->"Y"
+            hashMap.put("C_SALARY_TRANSFER", "0".equals(Util.null2String(recordSet.getString("C_SALARY_TRANSFER")))?"Y":"N");
+            //C_RWDPNS_SCORE奖惩分数
+            hashMap.put("C_RWDPNS_SCORE", Util.null2String(recordSet.getString("C_RWDPNS_SCORE")));
+            //C_RWDPNS_AMOUNT奖惩金额
+            hashMap.put("C_RWDPNS_AMOUNT", "0".equals(Util.null2String(recordSet.getString("C_SALARY_TRANSFER")))?Util.null2String(recordSet.getString("C_RWDPNS_AMOUNT")):"");
+            //C_RWD_COMMENT备注
+            hashMap.put("C_RWD_COMMENT", C_RWD_COMMENT);
+            list.add(hashMap);
+            map.put("C_RW_INFO_ARRAY", list);
+
+
+            String param = JSON.toJSONString(map);
+            log.writeLog("map-----------》json:"+param);
+
+            String token = HttpClientToDC.getToken();
+            log.writeLog("奖惩token------>" + token);
+            log.writeLog("奖惩url------>" + url);
+            String rdata = HttpClientToDC.sendPostApi(url,token, param);
+            log.writeLog("请求的结果:"+rdata);
+
+            if (!"".equals(rdata) && rdata != null) {
+                JSONObject jsonObject = JSONObject.parseObject(rdata);
+                String code = Util.null2String(jsonObject.getString("code"));
+                log.writeLog("--------发送请求返回的code值为：" + code);
+                if (code.equals("1")){
+                    return SUCCESS;
+                }else{
+                    String msg = Util.null2String(jsonObject.getString("msg"));
+                    requestInfo.getRequestManager().setMessageid("111100");
+                    requestInfo.getRequestManager().setMessagecontent(msg);
+                    return "0";
+                }
+            }else{
+                String ermsg="流程数据写入HR失败,未获取到接口返回结果，请联系系统管理员处理！";
+                requestInfo.getRequestManager().setMessageid("111100");
+                requestInfo.getRequestManager().setMessagecontent(ermsg);
+                return "0";
+            }
+        } catch (Exception e) {
+            log.writeLog("奖惩数据写入HR失败，错误信息："+e.toString());
+            requestInfo.getRequestManager().setMessageid("111100");
+            requestInfo.getRequestManager().setMessagecontent("奖惩数据写入HR失败，错误信息："+e.toString());
+            return "0";
+        }
+    }
+
+    private String getType(String value,String type) {
+        RecordSet recordSet = new RecordSet();
+        recordSet.execute("select FIELDVALUE from uf_fieldvalue where FIELDNAME = '" + type + "' and XlADLONGNAME like '%" + value + "%' ");
+        //获取值
+        recordSet.next();
+
+        return Util.null2String(recordSet.getString("FIELDVALUE"));
+    }
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/action/SellOffAction.java b/src/main/youhong_ai_jitu_src/jntchina/action/SellOffAction.java
new file mode 100644
index 0000000..6bc320d
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/action/SellOffAction.java
@@ -0,0 +1,125 @@
+package jntchina.action;
+
+
+import com.alibaba.fastjson.JSONObject;
+import jntchina.util.HttpClientToDC;
+import selfdev.util.base.BaseUtil;
+import selfdev.util.log.LogTool;
+import weaver.conn.RecordSet;
+import weaver.file.Prop;
+import weaver.general.Util;
+import weaver.interfaces.workflow.action.BaseAction;
+import weaver.soa.workflow.request.RequestInfo;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @title: 销假(作废)
+ * @author: ycf
+ * @date: 2021/01/11
+ **/
+public class SellOffAction extends BaseAction {
+
+    @Override
+    public String execute(RequestInfo requestInfo) {
+        LogTool log = new LogTool("/log/selfdev/action", true);
+        String requestId = requestInfo.getRequestid(); // 获取requestid
+        String workflowid = requestInfo.getWorkflowid(); // 获取workflowid
+        //获取工作流名称
+        String workflowname = BaseUtil.getBaseInfoByParm("workflowname", "workflow_base", "id", workflowid, "");
+        log.writeLog("---------------工作流名称-----------workflowname为：" + workflowname);
+        log.writeLog("--------加班申请单数据传入中台开始----requestId值为：" + requestId);
+
+        //获取配置文件中的参数，到时候URL路径
+        String mode = Prop.getPropValue("DevToDC_jntchina", "mode");
+        // 服务器ip：port
+        String baseUrl = Prop.getPropValue("DevToDC_jntchina", mode + "_baseUrl");
+        //访问路径拼接
+        String url = baseUrl + "/dcoaapi/hr/work";
+        //String url = "http://121.37.156.206:21005/PSIGW/RESTListeningConnector/PSFT_HR/C_WORK_APPLY.v1/";
+
+
+        //根据流程id获取主表名称
+        String mainTable = RegularizationApplyForAction.getMainTable(requestId);
+        log.writeLog("--------获取到的表名为----：" + mainTable);
+
+        //{
+        //加班数据
+        List<Map<String,String>> list = new ArrayList<>();
+
+
+
+        RecordSet rs = new RecordSet();
+        try {
+            String sql = "select * from " + mainTable + " where requestid='" + requestId + "'";
+            rs.execute(sql);
+            log.writeLog("查询sql语句---------------->"+sql);
+            Map<String,Object> map = new HashMap<>();
+            String id = "";
+
+            while (rs.next()) {
+                id = rs.getString("ID");
+
+                map.put("C_LEAVE_NUM",Util.null2String(rs.getString("leaverequestid")));//请假流程
+                map.put("EMPLID",Util.null2String(rs.getString("gh")));//工号
+                map.put("C_OA_NUM",Util.null2String(rs.getString("LCBH")));//流程编号
+            }
+            sql = "select b.*,   from " + mainTable + "_dt1 b where mainid = " + id;
+            log.writeLog("查找销假明细:"+sql);
+            rs.execute(sql);
+            while (rs.next()) {
+                HashMap<String, String> map2 = new HashMap<>();
+                //C_FLAG是否销假
+                map2.put("C_FLAG", "Y");
+                //员工编码
+                map2.put("EMPLID", Util.null2String(rs.getString("jbksrq")));
+                //请假日期
+                map2.put("C_START_DT", Util.null2String(rs.getString("jbkssj")));
+                //请假开始时间
+                map2.put("C_START_DTM", Util.null2String(rs.getString("jbjssj")));
+                //请假结束时间
+                map2.put("C_END_DTM", Util.null2String(rs.getString("jbjssj")));
+                list.add(map2);
+            }
+            map.put("LINES",list);
+
+            String strParm = JSONObject.toJSONString(map);
+            log.writeLog("---------------加班打印的Map数据为：-----------------："+strParm);
+
+            //获取Token
+            String token = HttpClientToDC.getToken();
+            log.writeLog("加班申请单token------>" + token);
+            log.writeLog("加班申请单url------>" + url);
+
+
+            //调用NCC接口，将数据传给NCC
+            String returndata = HttpClientToDC.sendPostApi(url,token, strParm);
+            log.writeLog("【调用数据中台出差申请单接口返回结果result:】" + returndata);
+            if (!"".equals(returndata) && returndata != null) {
+                JSONObject jsonObject = JSONObject.parseObject(returndata);
+                String code = Util.null2String(jsonObject.getString("code"));
+                log.writeLog("--------发送请求返回的code值为：" + code);
+                if (code.equals("1")){
+                    return SUCCESS;
+                }else{
+                    String msg = Util.null2String(jsonObject.getString("msg"));
+                    requestInfo.getRequestManager().setMessageid("111100");
+                    requestInfo.getRequestManager().setMessagecontent(msg);
+                    return "0";
+                }
+            }else{
+                String ermsg="流程数据写入NCC调动申请单失败,未获取到接口返回结果，请联系系统管理员处理！";
+                requestInfo.getRequestManager().setMessageid("111100");
+                requestInfo.getRequestManager().setMessagecontent(ermsg);
+                return "0";
+            }
+        }catch (Exception e){
+            //返回0，调用失败
+            log.writeLog("------------------------捕获到的异常是：" + e.toString());
+            return "0";
+        }
+    }
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/action/SignHelper.java b/src/main/youhong_ai_jitu_src/jntchina/action/SignHelper.java
new file mode 100644
index 0000000..84bc0f2
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/action/SignHelper.java
@@ -0,0 +1,144 @@
+package jntchina.action;
+
+import io.jsonwebtoken.Jwts;
+import io.jsonwebtoken.SignatureAlgorithm;
+import io.jsonwebtoken.impl.compression.CompressionCodecs;
+import weaver.file.Prop;
+
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.security.*;
+import java.security.cert.CertificateException;
+import java.security.interfaces.RSAPrivateKey;
+import java.util.Map;
+
+/**
+ * @program: yesfp-demo
+ * @description:
+ * @author: kw
+ * @create: 2020/05/21 12:37
+ */
+public class SignHelper {
+
+    /**
+     * 签名
+     *
+     * @param paramsMap 表单参数
+     * @return 签名值
+     * @throws Exception
+     */
+    public static String sign(Map<String, String> paramsMap) throws Exception {
+        //读取证书私钥
+        PrivateKey privateKey = loadPrivateKeyOfCA();
+        Map<String, Object> claims =
+                JwtParamBuilder.build().setSubject("tester").setIssuer("einvoice").setAudience("einvoice")
+                        .addJwtId().addIssuedAt().setExpirySeconds(3600).setNotBeforeSeconds(3600).getClaims();
+        // 需要将表单参数requestdatas的数据进行md5加密，然后放到签名数据的requestdatas中。
+        // 此签名数据必须存在，否则在验证签名时会不通过。
+        if (paramsMap.containsKey("requestdatas")) {
+            String value = paramsMap.get("requestdatas");
+            claims.put("requestdatas", getMD5(value));
+        }
+        else if (paramsMap.containsKey("nsrsbh")) {
+            String value = paramsMap.get("nsrsbh");
+            claims.put("nsrsbh", getMD5(value));
+        } else {
+            //throw new Exception("签名错误");
+        }
+////        String value = paramsMap.get("nsrsbh");
+////        claims.put("nsrsbh", getMD5(value));
+//        String value = paramsMap.get("requestdatas");
+//        System.out.println("============requestdatas=========="+value);
+//        claims.put("requestdatas", getMD5(value));
+        // 使用jdk1.6版本时，删除下面代码的中.compressWith(CompressionCodecs.DEFLATE)
+        String compactJws = Jwts.builder().signWith(SignatureAlgorithm.RS512, privateKey)
+                .setClaims(claims).compressWith(CompressionCodecs.DEFLATE).compact();
+        return compactJws;
+    }
+
+//    /**
+//     * 当在linux环境下运行代码，签名方法报空指针异常的时候，采用该签名方法可以避免这个问题
+//     * 使用该方法需要添加新的maven依赖，如下：
+//     * <dependency>
+//     *     <groupId>com.auth0</groupId>
+//     *     <artifactId>java-jwt</artifactId>
+//     *     <version>3.3.0</version>
+//     * </dependency>
+//     * @param paramsMap
+//     * @return
+//     * @throws Exception
+//     */
+//    private String sign(Map<String, String> paramsMap) throws Exception {
+//
+//        RSAPrivateKey privateKey = loadPrivateKeyOfCA();
+//        Map<String, Object> claims =
+//                JwtParamBuilder.build().setSubject("tester").setIssuer("einvoice").setAudience("einvoice")
+//                        .addJwtId().addIssuedAt().setExpirySeconds(300).setNotBeforeSeconds(300).getClaims();
+//        String token;
+//        try {
+//            Algorithm algorithm = Algorithm.RSA512(null, privateKey);
+//            token = JWT.create()
+//                    .withClaim("requestdatas",getMD5(paramsMap.get("requestdatas")))
+//                    .withHeader(claims)
+//                    .sign(algorithm);
+//        } catch (JWTCreationException exception){
+//            //Invalid Signing configuration / Couldn't convert Claims.
+//            return null;
+//        }
+//
+//        return token;
+//    }
+
+    /**
+     * 读取证书私钥
+     *
+     * @return
+     * @throws UnrecoverableKeyException
+     * @throws KeyStoreException
+     * @throws NoSuchAlgorithmException
+     * @throws CertificateException
+     * @throws IOException
+     */
+    protected static RSAPrivateKey loadPrivateKeyOfCA() throws UnrecoverableKeyException, KeyStoreException,
+            NoSuchAlgorithmException, CertificateException, IOException {
+        //获取配置文件中的参数
+        String mode = Prop.getPropValue("DevToTaxCould_jntchina","mode");
+        //证书路径
+        String certpath = Prop.getPropValue("DevToTaxCould_jntchina",mode+"_certpath");
+        //证书密码
+        String PASSWORD = Prop.getPropValue("DevToTaxCould_jntchina",mode+"_certpassword");
+        
+        FileInputStream in = new FileInputStream(certpath);
+        KeyStore ks = KeyStore.getInstance("pkcs12");
+        ks.load(in, PASSWORD.toCharArray());
+        String alias = ks.aliases().nextElement();
+        RSAPrivateKey caprk = (RSAPrivateKey) ks.getKey(alias, PASSWORD.toCharArray());
+        return caprk;
+    }
+
+    /**
+     * 计算参数MD5
+     *
+     * @param str
+     * @return
+     * @throws UnsupportedEncodingException
+     * @throws NoSuchAlgorithmException
+     */
+    private static String getMD5(String str) throws UnsupportedEncodingException,
+            NoSuchAlgorithmException {
+        byte[] buf;
+        buf = str.getBytes("utf-8");
+        MessageDigest md5 = null;
+        md5 = MessageDigest.getInstance("MD5");
+        md5.update(buf);
+        byte[] tmp = md5.digest();
+        StringBuilder sb = new StringBuilder();
+        for (byte b : tmp) {
+            sb.append(String.format("%02x", b & 0xff));
+        }
+        return sb.toString();
+    }
+
+
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/action/StaBookBuildParam.java b/src/main/youhong_ai_jitu_src/jntchina/action/StaBookBuildParam.java
new file mode 100644
index 0000000..11c6cc1
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/action/StaBookBuildParam.java
@@ -0,0 +1,373 @@
+package jntchina.action;
+
+
+import jntchina.util.Base64Util;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 台账
+ */
+public class StaBookBuildParam {
+    /**
+     * OCR识别
+     * @return
+     */
+    public static Map<String, Object> buildRecognisePostParam() {
+        Map<String, Object> paramsMap = new HashMap<String, Object>();
+        paramsMap.put("nsrsbh", "201609140000001");
+      //  paramsMap.put("nsrsbh", "91110105MA0084MW37");
+        paramsMap.put("orgcode", "20160914001");
+      //  paramsMap.put("orgcode", "91110105MA0084MW37");
+        //注意 base64编码不能有换行  选择BASE64Encoder需要将换行处理  用Base64比较好
+        //paramsMap.put("file", Base64Util.imageToBase64("D:\\3.jpg"));
+        paramsMap.put("file", Base64Util.NetImageToBase64("https://ss0.bdstatic.com/94oJfD_bAAcT8t7mm9GUKT-xh_/timg?image&quality=100&size=b4000_4000&sec=1590057248&di=a298d5f9728d9ded45906a643d8b8b2d&src=http://5b0988e595225.cdn.sohucs.com/images/20180810/75d14550cff44cf4bcc0346dd50c3aae.jpeg"));//ImageToBase64("D:\\1.png"));
+        return paramsMap;
+    }
+    /**
+     * 识别结果保存台帐
+     */
+    public static Map<String,Object> OCR_Save(){
+        Map<String, Object> paramsMap = new HashMap<String, Object>();
+        paramsMap.put("nsrsbh", "201609140000001");
+        paramsMap.put("orgcode", "20160914001");
+        paramsMap.put("bills",OCR_SaveBills());
+
+        return paramsMap;
+    }
+
+
+    /**
+     * 保存报销票据明细
+     */
+    public static List<Object> OCR_SaveBills(){
+        List<Object> bills = new ArrayList<Object>();
+        Map<String, Object> datas = new HashMap<String, Object>();
+        datas.put("imageId","60214");
+        datas.put("billType","train");
+        datas.put("data", OCR_SaveTrainData());
+        bills.add(datas);
+        return bills;
+    }
+    /**
+     * 机打发票data
+     */
+    public static Map<String,Object> OCR_SaveMachineData(){
+        Map<String, Object> data = new HashMap<String, Object>();
+        //开票日期"yyyyMMdd"
+        data.put("date","20200610");
+        //消费类型
+        data.put("kind","交通");
+        data.put("sellerName","销方名称");
+        data.put("buyerName","购方名称");
+        //发票代码
+        data.put("invoiceCode","211001111013");
+        //发票号码
+        data.put("invoiceNum","87650531");
+        //购方税号
+        data.put("buyerTaxId","1234");
+        //校验码
+        data.put("checkCode","");
+        //合计金额BigDecimal
+        data.put("totalAmount",9);
+        //报销状态
+        data.put("purchaserStatus","");
+        //买方税号
+        data.put("sellerTaxId",12345);
+        data.put("time","");
+
+        return data;
+    }
+    /**
+     * 增值税发票data
+     *//*
+
+    public static  Map<String, Object> OCR_SaveInvoiceData(){
+        Map<String, Object> data = new HashMap<String, Object>();
+        data.put("hasExist",false);
+        data.put("hjje",5000);
+        data.put("xsfMc","成都郫县希望职业学校");
+        data.put("gmfNsrsbh","");
+        data.put("gmfMc","吴星君计算机应用");
+        //售方纳税人识别号
+        data.put("xsfNsrsbh","52510124551090719U");
+        //发票id
+        data.put("pkInvoice","0");
+        data.put("jshj","5600");
+        //作废标志
+        data.put("zfbz","N");
+        //发票代码
+        data.put("fpDm","211001111012");
+        //发票类型
+        data.put("fplx","9");
+        //报销状态
+        data.put("purchaserStatus",0);
+        data.put("hasattache",false);
+        //开票日期
+        data.put("kprq","20171018");
+        //发票号码
+        data.put("fpHm","87650531");
+        //校验码
+        data.put("jym","557129");
+        //征税方式
+        data.put("zsfs","0");
+        //表体明细行
+        data.put("items",items());
+        return data;
+    }
+    public static List<Object>items(){
+        List<Object> items = new ArrayList<Object>();
+        Map<String, Object> item = new HashMap<String, Object>();
+        //项目名称
+        item.put("xmmc","服务费");
+        //项目数量
+        item.put("xmsl",1);
+        //项目金额
+        item.put("xmje","100");
+        //税率
+        item.put("sl",0.06);
+        items.add(item);
+        return items;
+    }*/
+    /**
+     * 航空电子行程单DATA
+     */
+    public static  Map<String, Object> OCR_SaveAirData(){
+        Map<String, Object> data = new HashMap<String, Object>();
+        //开票日期"yyyyMMdd"
+        data.put("date","20200610");
+        data.put("id","20200610");
+        data.put("fare",4444);
+
+        data.put("agentCode","HKK068,08688003");
+        data.put("issueBy","成都携程旅行社有限公司北京分社");
+        //消费类型
+        data.put("kind","交通");
+        data.put("userName","www");
+        data.put("userId","371102198004020527");
+        data.put("caacDevelopFund",50);
+        //校验码
+        data.put("checkCode","");
+        //合计金额BigDecimal
+        data.put("totalAmount",9);
+        data.put("ticketNum","8802175000276");
+        //发票代码
+        data.put("itemList",itemList());
+        //发票号码
+        data.put("fuelSurcharge",30);
+        return data;
+    }
+    public static List<Object>itemList(){
+        List<Object> items = new ArrayList<Object>();
+        Map<String, Object> item = new HashMap<String, Object>();
+        //项目名称
+        item.put("id","111");
+        //项目数量
+        item.put("airId","123");
+        item.put("date","20200610");
+        //项目金额
+        item.put("seat","Y");
+        //税率
+        item.put("carrier","海航");
+        item.put("from","杭州");
+        item.put("time","19:23");
+        item.put("to","北京");
+        item.put("flightNumber","HU7678");
+
+
+        items.add(item);
+        return items;
+    }
+
+    /**
+     * 火车票台账data
+     */
+    public static  Map<String, Object> OCR_SaveTrainData(){
+        Map<String, Object> data = new HashMap<String, Object>();
+        //开票日期"yyyyMMdd"
+        data.put("date","20200610");
+        data.put("id","20200610");
+        //消费类型
+        data.put("kind","交通");
+        data.put("origin","北京南");
+        data.put("destination","北京北");
+        data.put("number","P026491");
+        //合计金额BigDecimal
+        data.put("totalAmount",9);
+        data.put("trainNum","G9");
+        data.put("name","XXX");
+        data.put("time","12:00");
+        data.put("seatNo","二等座");
+
+        return data;
+    }
+
+    /**
+     * 出租车保存报销data
+     * @return
+     */
+
+    public static  Map<String, Object> OCR_SaveTaxiData(){
+        Map<String, Object> data = new HashMap<String, Object>();
+        //发票代码
+        data.put("invoiceCode","211001111012");
+        //发票号码
+        data.put("invoiceNum","87650531");
+        //开票日期"yyyyMMdd"
+        data.put("date","20200610");
+        data.put("id","20200610");
+        //消费类型
+        data.put("kind","交通");
+        //合计金额BigDecimal
+        data.put("totalAmount",9);
+        //里程
+        data.put("mileage",8);
+        //上车时间
+        data.put("startTime","13:23");
+        //结束时间
+        data.put("endTime","13:25");
+        //发票所在地
+        data.put("place","黑龙江省哈尔滨市");
+        return data;
+    }
+
+
+
+    /**
+     * 台账报销
+     */
+    public static Map<String,Object> reimbursed(){
+        Map<String, Object> paramsMap = new HashMap<String, Object>();
+//        paramsMap.put("nsrsbh", "201609140000001");
+//        paramsMap.put("orgcode", "20160914001");
+//        paramsMap.put("bills",reimbursedBills());
+        paramsMap.put("nsrsbh", "91340122MA2U7J5C88");
+        paramsMap.put("orgcode", "JTSDCN0019");
+        paramsMap.put("bills",reimbursedBills());
+        return paramsMap;
+
+    }
+    public static List<Object>  reimbursedBills(){
+        List<Object> datas = new ArrayList<Object>();
+        Map<String, Object> data = new HashMap<String, Object>();
+//        //发票代码
+//        data.put("invoiceCode","211001111012");
+//        //发票号码
+//        data.put("invoiceNum","87650531");
+//        data.put("billType","taxi");
+//        data.put("reimburseUser","XXX");
+        //发票代码
+        data.put("invoiceCode","3400211130");
+        //发票号码
+        data.put("invoiceNum","08871435");
+        data.put("billType","invoice");
+        data.put("reimburseUser","时海盟");
+        datas.add(data);
+        return datas;
+    }
+    /**
+     * 台账取消报销
+     */
+    public static Map<String,Object> cancelReimbursed(){
+        Map<String, Object> paramsMap = new HashMap<String, Object>();
+        paramsMap.put("nsrsbh", "201609140000001");
+        paramsMap.put("orgcode", "20160914001");
+        paramsMap.put("bills",reimbursedBills());
+        return paramsMap;
+
+    }
+    /**
+     * 台账记账
+     */
+    public  static Map<String, Object> account(){
+        Map<String, Object> paramsMap = new HashMap<String, Object>();
+        paramsMap.put("nsrsbh", "201609140000001");
+        paramsMap.put("orgcode", "20160914001");
+        paramsMap.put("bills",accountBills());
+        return paramsMap;
+    }
+    /**
+     * 台账记账Bills
+     */
+    public  static List<Object> accountBills(){
+        List<Object> datas = new ArrayList<Object>();
+        Map<String, Object> data = new HashMap<String, Object>();
+        //发票代码
+        data.put("invoiceCode","211001111012");
+        //发票号码
+        data.put("invoiceNum","87650531");
+        data.put("billType","taxi");
+        data.put("accountUser","记账人");
+        data.put("accountNote","记账人备注");
+        datas.add(data);
+        return datas;
+    }
+    /**
+     * 台账取消记账
+     */
+    public  static Map<String, Object> cancelAccount(){
+        Map<String, Object> paramsMap = new HashMap<String, Object>();
+        paramsMap.put("nsrsbh", "201609140000001");
+        paramsMap.put("orgcode", "20160914001");
+        paramsMap.put("bills",accountBills());
+        return paramsMap;
+    }
+    /**
+     * 报销台账删除
+     */
+    public  static Map<String, Object> delete(){
+        Map<String, Object> paramsMap = new HashMap<String, Object>();
+        paramsMap.put("nsrsbh", "201609140000001");
+        paramsMap.put("orgcode", "20160914001");
+        paramsMap.put("bills",accountBills());
+        return paramsMap;
+    }
+    /**
+     * 飞机票、火车票，出租车台账查询
+     */
+    public static Map<String,Object> find(){
+        Map<String, Object> paramsMap = new HashMap<String, Object>();
+        paramsMap.put("orgcode", "20160914001");
+        paramsMap.put("submitDate_begin","2000-07-05");
+        paramsMap.put("submitDate_end","2020-06-11");
+        return paramsMap;
+    }
+
+    /**
+     * 个人票夹提交发票到报销台账_全票种
+     * @return
+     */
+    public static Map<String,Object> commit(){
+        Map<String, Object> paramsMap = new HashMap<String, Object>();
+        paramsMap.put("usermobile", "15011181852");
+        paramsMap.put("useremail", "wangyer@yonyou.com");
+        paramsMap.put("orgcode", "20160914001");
+        paramsMap.put("nsrsbh", "201609140000001");
+        paramsMap.put("submitter", "提交人");
+        paramsMap.put("srcBillCode", "23456789");
+        paramsMap.put("srcBillType", "taxi");
+        paramsMap.put("reimburseUser", "测试报销人1");
+        paramsMap.put("returnEnclosure", "Y");
+        paramsMap.put("busiOp", "1");
+        paramsMap.put("summarys", summarys());
+        return paramsMap;
+    }
+    public  static List<Object> summarys(){
+    List<Object> datas = new ArrayList<Object>();
+    Map<String, Object> data1 = new HashMap<String, Object>();
+    Map<String, Object> data2 = new HashMap<String, Object>();
+        data1.put("invoiceNum","68706393");
+        data1.put("invoiceCode","042001700107");
+        data1.put("billType","invoice");
+        data2.put("invoiceNum","51266661");
+        data2.put("invoiceCode","111001881002");
+        data2.put("billType","taxi");
+        datas.add(data1);
+        datas.add(data2);
+      return datas;
+    }
+
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/action/TeamBuildingExpensesReturnAction.java b/src/main/youhong_ai_jitu_src/jntchina/action/TeamBuildingExpensesReturnAction.java
new file mode 100644
index 0000000..4316cc1
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/action/TeamBuildingExpensesReturnAction.java
@@ -0,0 +1,117 @@
+package jntchina.action;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import jntchina.util.HttpClientToDC;
+import selfdev.util.base.BaseUtil;
+import selfdev.util.log.LogTool;
+import weaver.conn.RecordSet;
+import weaver.file.Prop;
+import weaver.general.Util;
+import weaver.interfaces.workflow.action.BaseAction;
+import weaver.soa.workflow.request.RequestInfo;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @title: 团建费用报销数据写入HR
+ * @Author ycf
+ * @Date: 2022/1/6 15:14
+ * @Version 1.0
+ */
+public class TeamBuildingExpensesReturnAction extends BaseAction {
+    @Override
+    public String execute(RequestInfo requestInfo) {
+        LogTool log = new LogTool("/log/selfdev/action/hrm", false);
+        String requestId = requestInfo.getRequestid(); // 获取requestid
+        String workflowid = requestInfo.getWorkflowid(); // 获取workflowid
+        //获取工作流名称
+        String workflowname = BaseUtil.getBaseInfoByParm("workflowname", "workflow_base", "id", workflowid, "");
+        log.writeLog("---------------工作流名称-----------workflowname为：" + workflowname);
+        log.writeLog("--------团建申请单数据传入中台开始----requestId值为：" + requestId);
+
+        //获取配置文件中的参数，到时候URL路径
+        String mode = Prop.getPropValue("DevToDC_jntchina", "mode");
+        // 服务器ip：port
+        String baseUrl = Prop.getPropValue("DevToDC_jntchina", mode + "_baseUrl");
+        //访问路径拼接
+        String url = baseUrl + "/dcoaapi/hr/groupResult";
+
+
+        //根据流程id获取主表名称
+        String mainTable = RegularizationApplyForAction.getMainTable(requestId);
+        log.writeLog("--------获取到的表名为----：" + mainTable);
+
+
+        RecordSet recordSet = new RecordSet();
+        String sql = "";
+        Map<String, String> map = new HashMap<String, String>();
+
+        try {
+            //获取部门和日期
+            sql = "select (select OUTKEY from hrmdepartment a where a.ID= b.bxrbm) outkey, " +
+                    "fyfsrq,lcbh,cjrq, (select WORKCODE " +
+                    "from HrmResource a where a.ID = b.bxr) sqrgh,bxje,sfcgxrhr " +
+                    "from " + mainTable + " b where REQUESTID =  "+requestId;
+            log.writeLog("获取团建信息的SQL:"+sql);
+
+            recordSet.execute(sql);
+            recordSet.next();
+            //是否成功写入HR
+            String sfcgxrhr=Util.null2String(recordSet.getString("sfcgxrhr"));
+            if("0".equals(sfcgxrhr)){
+                log.writeLog("*************requestid=【"+requestId+"】之前已成功写入HR，本次不再重复写入*************");
+                return SUCCESS;
+            }
+            //申请单号
+            map.put("C_APP_SEQ", Util.null2String(recordSet.getString("lcbh")));
+            //申请日期
+            map.put("C_APP_DT", Util.null2String(recordSet.getString("cjrq")).replace("-","/"));
+            //申请人工号
+            map.put("EMPLID", Util.null2String(recordSet.getString("sqrgh")));
+            //部门
+            map.put("DEPTID", Util.null2String(recordSet.getString("outkey")));
+            //金额
+            map.put("AMOUNT", Util.null2String(recordSet.getString("bxje")));
+            map.put("C_APPLI_RS", "3");
+            //发生日期
+            map.put("OCCURRENCE_DT", Util.null2String(recordSet.getString("fyfsrq")).replace("-","/"));
+
+
+
+            String params = JSON.toJSONString(map);
+            log.writeLog("团建费用报销传入参数JSON----------->"+params);
+
+            String token = HttpClientToDC.getToken();
+            log.writeLog("团建token------>" + token);
+            log.writeLog("团建url------>" + url);
+            String rdata = HttpClientToDC.sendPostApi(url,token, params);
+            log.writeLog("请求的结果:"+rdata);
+
+            if (!"".equals(rdata) && rdata != null) {
+                JSONObject jsonObject = JSONObject.parseObject(rdata);
+                String code = Util.null2String(jsonObject.getString("code"));
+                log.writeLog("--------发送请求返回的code值为：" + code);
+                if (code.equals("1")){
+                    return SUCCESS;
+                }else{
+                    String msg = Util.null2String(jsonObject.getString("msg"));
+                    requestInfo.getRequestManager().setMessageid("111100");
+                    requestInfo.getRequestManager().setMessagecontent(msg);
+                    return "0";
+                }
+            }else{
+                String ermsg="流程数据写入HR失败,未获取到接口返回结果，请联系系统管理员处理！";
+                requestInfo.getRequestManager().setMessageid("111100");
+                requestInfo.getRequestManager().setMessagecontent(ermsg);
+                return "0";
+            }
+        } catch (Exception e) {
+            log.writeLog("团建报销数据写入HR失败，错误信息："+e.toString());
+            requestInfo.getRequestManager().setMessageid("111100");
+            requestInfo.getRequestManager().setMessagecontent("团建报销数据写入HR失败，错误信息："+e.toString());
+            return "0";
+        }
+    }
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/action/TransferWriteBackAction.java b/src/main/youhong_ai_jitu_src/jntchina/action/TransferWriteBackAction.java
new file mode 100644
index 0000000..bf8196a
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/action/TransferWriteBackAction.java
@@ -0,0 +1,229 @@
+package jntchina.action;
+
+import com.alibaba.fastjson.JSONObject;
+import jntchina.util.HttpClientToDC;
+import selfdev.util.base.BaseUtil;
+import selfdev.util.log.LogTool;
+import weaver.conn.RecordSet;
+import weaver.file.Prop;
+import weaver.general.Util;
+import weaver.hrm.resource.ResourceComInfo;
+import weaver.interfaces.workflow.action.Action;
+import weaver.soa.workflow.request.RequestInfo;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 调动申请单写入中台(HR系统)
+ */
+public class TransferWriteBackAction implements Action {
+    
+    public String execute(RequestInfo requestInfo) {
+        LogTool log=new LogTool("/log/selfdev/action/hrm", false);
+
+        String requestId = requestInfo.getRequestid();
+        String workflowid=requestInfo.getWorkflowid();
+        String workflowname= BaseUtil.getBaseInfoByParm("workflowname", "workflow_base", "id", workflowid, "");
+        log.writeLog("---------------"+workflowname+"开始写入HR-------------requestId:" + requestId);
+
+        //获取配置文件中的参数
+        String mode = Prop.getPropValue("DevToDC_jntchina","mode");
+        // 服务器ip：port
+        String baseUrl = Prop.getPropValue("DevToDC_jntchina", mode+"_baseUrl");
+        String url = baseUrl+"/dcoaapi/hr/callApplication";
+        //获取OA表名称
+        String tablename=BaseUtil.getBaseInfoByParm("tablename", "workflow_bill", "1", "1", " and id in (select formid from workflow_base where id="+workflowid+")");
+
+        try {
+            RecordSet rs = new RecordSet();
+            String sql = " select C_APP_SEQ," +
+                    "C_APP_DT," +
+                    "EMPLID," +
+                    "EMPLID2," +
+                    "ddsxrq as ACTION_DT," +
+                    "POSITION_NBR2,"+
+                    "drzj C_POSN_GRDE_ID1," +
+                    "drxzz GP_PAYGROUP2," +
+                    "C_SB_LOC_ID1," +
+                    "SUPERVISOR_ID2," +
+                    "C_JOB_INSP_DT," +
+                    "IS_DEPT_MANAGER," +
+                    "IS_EMPL_SUPER_VISOR," +
+                    "IS_DEPT_BRCH_LEADER," +
+                    "MANAGER_ID," +
+                    "SUPERVISOR_ID3," +
+                    "IS_DEPT_EXPAND," +
+                    "C_EXPAND_EMPLID," +
+                    "ddlx1 ACTION_REASON," +
+                    "ddzlx ACT_REASON_SUB," +
+                    "C_BRCH_LEADR_ID," +
+                    "C_SB_LOC_COMPANY," +
+                    "C_SB_LOC_RULE," +
+                    "C_ENDO_INSU," +
+                    "C_ENDO_INSU1," +
+                    "C_GJJ_RULE_ID," +
+                    "C_HOUS_FUND," +
+                    "C_HOUS_FUND1," +
+                    "C_SB_EFFDT,sbgjjsfbg from "+tablename+" where requestid = "+requestId+"  ";
+            //添加查询【社保公积金是否变更】 sbgjjsfbg   -N
+            log.writeLog("调动申请单OA查询sql："+sql);
+            rs.executeQuery(sql);
+
+            Map<String,Object> map = new HashMap<String,Object>();
+            String[] columnName = rs.getColumnName();
+            rs.next();
+            for (int i = 0; i < columnName.length; i++) {
+                map.put(columnName[i], Util.null2String(rs.getString(columnName[i])));
+            }
+            //获取【社保公积金是否变更】的数据 -N
+            String sbgjjsfbg=Util.null2String(rs.getString("sbgjjsfbg"));
+
+
+            map.put("C_APPLI_RS","3");//审批状态 默认为3
+
+            //是否为部门负责人
+            if (map.get("IS_DEPT_MANAGER").equals("0")){
+                map.put("IS_DEPT_MANAGER","Y");
+            }else{
+                map.put("IS_DEPT_MANAGER","N");
+            }
+
+            //是否为部门分管领导
+            if (map.get("IS_DEPT_BRCH_LEADER").equals("0")){
+                map.put("IS_DEPT_BRCH_LEADER","Y");
+            }else{
+                map.put("IS_DEPT_BRCH_LEADER","N");
+            }
+            
+            //是否为员工直接上级
+            if (map.get("IS_EMPL_SUPER_VISOR").equals("0")){
+                map.put("IS_EMPL_SUPER_VISOR","Y");
+            }else{
+                map.put("IS_EMPL_SUPER_VISOR","N");
+            }
+            //是否为部门拓展者角色
+            if (map.get("IS_DEPT_EXPAND").equals("0")){
+                map.put("IS_DEPT_EXPAND","Y");
+            }else{
+                map.put("IS_DEPT_EXPAND","N");
+            }
+
+            //变更拓展者角色
+            if (map.get("C_EXPAND_EMPLID").equals("")){
+                map.put("C_EXPAND_EMPLID","");
+            }else{
+                String C_EXPAND_EMPLID = new ResourceComInfo().getWorkcode(map.get("C_EXPAND_EMPLID").toString());
+                map.put("C_EXPAND_EMPLID",C_EXPAND_EMPLID);
+            }
+            //分管领导接替人
+            if (map.get("C_BRCH_LEADR_ID").equals("")){
+                map.put("C_BRCH_LEADR_ID","");
+            }else{
+                String C_BRCH_LEADR_ID = new ResourceComInfo().getWorkcode(map.get("C_BRCH_LEADR_ID").toString());
+                map.put("C_BRCH_LEADR_ID",C_BRCH_LEADR_ID);
+            }
+            //直接上级接替人
+            if (map.get("SUPERVISOR_ID3").equals("")){
+                map.put("SUPERVISOR_ID3","");
+            }else{
+                String SUPERVISOR_ID3 = new ResourceComInfo().getWorkcode(map.get("SUPERVISOR_ID3").toString());
+                map.put("SUPERVISOR_ID3",SUPERVISOR_ID3);
+            }
+            
+            //部门负责人接替人
+            if (map.get("MANAGER_ID").equals("")){
+                map.put("MANAGER_ID","");
+            }else{
+                String MANAGER_ID = new ResourceComInfo().getWorkcode(map.get("MANAGER_ID").toString());
+                map.put("MANAGER_ID",MANAGER_ID);
+            }
+            
+            //调入直属领导
+            if (map.get("SUPERVISOR_ID2").equals("")){
+                map.put("SUPERVISOR_ID2","");
+            }else{
+                String SUPERVISOR_ID2 = new ResourceComInfo().getWorkcode(map.get("SUPERVISOR_ID2").toString());
+                map.put("SUPERVISOR_ID2",SUPERVISOR_ID2);
+            }
+            //操作原因	  X01-部门内调动  X02-跨部门调动  X03-跨公司调动
+            //根据下拉框的值获取对应的描述
+			String ddlx1Name=BaseUtil.getBaseInfoByParm("selectname", "workflow_selectitem", "selectvalue", map.get("ACTION_REASON").toString(),
+					" and fieldid in (select id from workflow_billfield where billid in (select formid from workflow_base where id="+workflowid+") and fieldname='ddlx1' and viewtype=0)");
+			//过滤多语言
+			ddlx1Name=Util.formatMultiLang(ddlx1Name,"7");
+            
+            String[] ACTION_REASON = ddlx1Name.split("-");
+            map.put("ACTION_REASON",ACTION_REASON[0]);//调动类型
+
+            //操作子原因	  10-晋级  20-降职  30-平调
+            //根据下拉框的值获取对应的描述
+			String ddzlxName=BaseUtil.getBaseInfoByParm("selectname", "workflow_selectitem", "selectvalue", map.get("ACT_REASON_SUB").toString(),
+					" and fieldid in (select id from workflow_billfield where billid in (select formid from workflow_base where id="+workflowid+") and fieldname='ddzlx' and viewtype=0)");
+			//过滤多语言
+			ddzlxName=Util.formatMultiLang(ddzlxName,"7");
+            String[] ACT_REASON_SUB = ddzlxName.split("-");//截取横线前面的编码
+            map.put("ACT_REASON_SUB",ACT_REASON_SUB[0]);//调动原因
+
+
+            if (map.get("C_POSN_GRDE_ID1").equals("")){//存在历史问题 所以加判断 调入职级
+                map.put("C_POSN_GRDE_ID1","101");//调入职级
+            }
+
+            if (map.get("GP_PAYGROUP2").equals("")){//存在历史问题 所以加判断
+                map.put("GP_PAYGROUP2","100");//调入薪资组 默认100 G0
+            }
+            //sbgjjsfbg  【社保公积金是否变更】如果为否的话，清空数据 -N
+            if("1".equals(sbgjjsfbg)){
+            //否为：	1
+                map.put("C_SB_LOC_COMPANY","");//社保缴纳公司
+                map.put("C_SB_LOC_RULE","");//社保缴纳规则
+                map.put("C_ENDO_INSU","");//个人缴费基数及比例
+                map.put("C_ENDO_INSU1","");//单位缴费基数及比例
+                map.put("C_GJJ_RULE_ID","");//公积金缴费规则
+                map.put("C_HOUS_FUND","");//个人公积金基数
+                map.put("C_HOUS_FUND1","");//公司公积金基数
+                map.put("C_SB_EFFDT","");//社保公积金生效日期
+                map.put("C_SB_LOC_ID1","");//调入社保缴纳地
+            }
+            //清除【sbgjjsfbg】
+            map.remove("sbgjjsfbg");
+
+
+            String strParm = JSONObject.toJSONString(map);
+            log.writeLog("调动申请单准备传入数据中台的数据为------>" + strParm);
+
+            String token = HttpClientToDC.getToken();
+            log.writeLog("调动申请单token------>" + token);
+            log.writeLog("调动申请单url------>" + url);
+
+            String returndata = HttpClientToDC.sendPostApi(url,token, strParm);
+            log.writeLog("调动流程HR接口返回结果returndata-------->" + returndata);
+            if (!"".equals(returndata) && returndata != null) {
+                JSONObject jsonObject = JSONObject.parseObject(returndata);
+                String code = Util.null2String(jsonObject.get("code"));
+                log.writeLog("--------发送请求返回的code值为：" + code);
+                if (code.equals("1")){
+                    return SUCCESS;
+                }else{
+                    String msg = Util.null2String(jsonObject.get("msg"));
+                    requestInfo.getRequestManager().setMessageid("111100");
+                    requestInfo.getRequestManager().setMessagecontent(msg);
+                    return "0";
+                }
+            }else{
+                String ermsg="流程数据写入NCC调动申请单失败,未获取到接口返回结果，请联系系统管理员处理！";
+                requestInfo.getRequestManager().setMessageid("111100");
+                requestInfo.getRequestManager().setMessagecontent(ermsg);
+                return "0";
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            requestInfo.getRequestManager().setMessageid("111100");
+            requestInfo.getRequestManager().setMessagecontent("流程发生错误！");
+            return "0";
+        }
+    }
+
+    
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/action/XiaojiaAction.java b/src/main/youhong_ai_jitu_src/jntchina/action/XiaojiaAction.java
new file mode 100644
index 0000000..a979a23
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/action/XiaojiaAction.java
@@ -0,0 +1,134 @@
+package jntchina.action;
+
+import com.alibaba.fastjson.JSONObject;
+import jntchina.util.HttpClientToDC;
+import selfdev.util.base.BaseUtil;
+import selfdev.util.log.LogTool;
+import weaver.conn.RecordSet;
+import weaver.file.Prop;
+import weaver.general.Util;
+import weaver.interfaces.workflow.action.BaseAction;
+import weaver.soa.workflow.request.RequestInfo;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @description: 销假数据传入HR
+ * @author: KangMD
+ * @date: 2022-02-11
+ **/
+public class XiaojiaAction extends BaseAction {
+
+    @Override
+    public String execute(RequestInfo requestInfo) {
+        LogTool log = new LogTool("/log/selfdev/action/hrm", true);
+        String requestId = requestInfo.getRequestid(); // 获取requestid
+        String workflowid = requestInfo.getWorkflowid(); // 获取workflowid
+
+        //获取工作流名称
+        String workflowname = BaseUtil.getBaseInfoByParm("workflowname", "workflow_base", "id", workflowid, "");
+        log.writeLog("--------【"+workflowname+"】数据传入中台开始----requestId值为：" + requestId);
+        //获取配置文件中的参数，到时候URL路径
+        String mode = Prop.getPropValue("DevToDC_jntchina", "mode");
+        //服务器ip：port
+        String baseUrl = Prop.getPropValue("DevToDC_jntchina", mode + "_baseUrl");
+        //访问路径拼接
+        String url = baseUrl + "/dcoaapi/hr/leaveOff";
+        //根据流程id获取主表名称
+        String mainTable = RegularizationApplyForAction.getMainTable(requestId);
+        log.writeLog("-------------获取到的表名为-------------：" + mainTable);
+        String mainid="";
+        //销假单号
+        String C_OA_NUM = "";
+        //请假单号
+        String C_LEAVE_NUM = "";
+        //员工编码
+        String EMPLID = "";
+        //销假list
+        List<Map<String,String>> list = new ArrayList<Map<String,String>>();
+
+        RecordSet rs = new RecordSet();
+        try {
+            String sql = "select a.* from "+mainTable+" a where a.requestid = '" + requestId + "'";
+            rs.execute(sql);
+            log.writeLog("查询主表数据sql语句---------------->"+sql);
+            while (rs.next()) {
+            	mainid = Util.null2String(rs.getString("id"));//主表主键ID
+            	C_OA_NUM = Util.null2String(rs.getString("lcbh"));//OA销假单号
+                EMPLID = Util.null2String(rs.getString("gh"));//OA提单人工号
+                C_LEAVE_NUM = Util.null2String(rs.getString("qjlcbh"));//OA请假单号
+            }
+            log.writeLog("C_OA_NUM---------------->"+C_OA_NUM);
+            log.writeLog("C_LEAVE_NUM---------------->"+C_LEAVE_NUM);
+            log.writeLog("EMPLID---------------->"+EMPLID);
+            //查询明细数据
+            sql = "select * from "+mainTable+"_dt1 a where a.mainid = '" + mainid + "'";
+            rs.execute(sql);
+            log.writeLog("查询sql语句---------------->"+sql);
+            while (rs.next()) {
+            	String sfxj=Util.null2String(rs.getString("sfxj"));
+                String C_FLAG = "1".equals(sfxj)?"Y":"N";//是否销假    Y：是；N：否
+                String C_START_DT = Util.null2String(rs.getString("detail_leavefromDate"));//请假日期
+                String C_START_DTM = Util.null2String(rs.getString("detail_leavefromTime"));//请假开始时间
+                String C_END_DTM = Util.null2String(rs.getString("detail_leavetoTime"));//请假结束时间
+                if(C_START_DTM.length()==5){
+                	C_START_DTM=C_START_DTM+":00";
+                }
+                if(C_END_DTM.length()==5){
+                	C_END_DTM=C_END_DTM+":00";
+                }
+                
+                //将签卡数据进行包装
+                Map<String,String> maps= new HashMap<String,String>();
+                maps.put("EMPLID",EMPLID);
+                maps.put("C_FLAG",C_FLAG);
+                maps.put("C_START_DT",C_START_DT);
+                maps.put("C_START_DTM",C_START_DTM);
+                maps.put("C_END_DTM",C_END_DTM);
+                list.add(maps);
+            }
+            //最后再将数据全部打包
+            Map<String,Object> map = new HashMap<String,Object>();
+            map.put("C_OA_NUM",C_OA_NUM);
+            map.put("C_LEAVE_NUM",C_LEAVE_NUM);
+            map.put("EMPLID",EMPLID);
+            map.put("LINES",list);
+            String strParm = JSONObject.toJSONString(map);
+            log.writeLog("销假传入参数JSON----------------->"+strParm);
+
+            //获取Token
+            String token = HttpClientToDC.getToken();
+            log.writeLog("销假申请token------>" + token);
+            log.writeLog("销假申请url------>" + url);
+
+            //调用NCC接口，将数据传给NCC
+            String returndata = HttpClientToDC.sendPostApi(url,token, strParm);
+            log.writeLog("【调用数据中台销假单接口返回结果result:】" + returndata);
+            if (!"".equals(returndata) && returndata != null) {
+                JSONObject jsonObject = JSONObject.parseObject(returndata);
+                String code = Util.null2String(jsonObject.get("code"));
+                log.writeLog("--------发送请求返回的code值为：" + code);
+                if (code.equals("1")){
+                    return SUCCESS;
+                }else{
+                    String msg = Util.null2String(jsonObject.get("msg"));
+                    requestInfo.getRequestManager().setMessageid("111100");
+                    requestInfo.getRequestManager().setMessagecontent(msg);
+                    return "0";
+                }
+            }else{
+                String ermsg="流程数据调用HR销假接口失败,未获取到接口返回结果，请联系系统管理员处理！";
+                requestInfo.getRequestManager().setMessageid("111100");
+                requestInfo.getRequestManager().setMessagecontent(ermsg);
+                return "0";
+            }
+        }catch (Exception e){
+            //返回0，调用失败
+            log.writeLog("------------------------捕获到的异常是：" + e.toString());
+            return "0";
+        }
+    }
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/action/XiaojiaForceDrawBackAction.java b/src/main/youhong_ai_jitu_src/jntchina/action/XiaojiaForceDrawBackAction.java
new file mode 100644
index 0000000..99f2dd2
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/action/XiaojiaForceDrawBackAction.java
@@ -0,0 +1,38 @@
+package jntchina.action;
+
+import selfdev.util.base.BaseUtil;
+import selfdev.util.log.LogTool;
+import weaver.interfaces.workflow.action.BaseAction;
+import weaver.soa.workflow.request.RequestInfo;
+
+/**
+ * @description: 销假强制收回时的节点附加操作
+ * @author: KangMD
+ * @date: 2022-02-11
+ **/
+public class XiaojiaForceDrawBackAction extends BaseAction {
+
+    public static LogTool log=new LogTool("/log/selfdev/action/hrm", false);
+    public String execute(RequestInfo requestInfo){
+        String requestId = requestInfo.getRequestid(); // 获取requestid
+        String workflowid = requestInfo.getWorkflowid(); // 获取workflowid
+
+        //获取工作流名称
+        String workflowname = BaseUtil.getBaseInfoByParm("workflowname", "workflow_base", "id", workflowid, "");
+        log.writeLog("--------【"+workflowname+"】强制收回时的节点附加操作----requestId值为：" + requestId);
+        try{
+        	XiaojiaForceDrawBackThread forceDrawBackThread=new XiaojiaForceDrawBackThread();
+   		 	//设置参数
+        	forceDrawBackThread.setRequestInfo(requestInfo);
+   		 	Thread thread = new Thread(forceDrawBackThread);
+   		 	//启动线程
+   		 	thread.start();
+   		 	log.writeLog("--------【"+workflowname+"】强制收回时启用线程--------");
+        }catch (Exception e){
+            //返回0，调用失败
+            log.writeLog("------------------------捕获到的异常是：" + e.toString());
+            return "0";
+        }
+        return SUCCESS;
+    }
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/action/XiaojiaForceDrawBackThread.java b/src/main/youhong_ai_jitu_src/jntchina/action/XiaojiaForceDrawBackThread.java
new file mode 100644
index 0000000..f8a62a8
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/action/XiaojiaForceDrawBackThread.java
@@ -0,0 +1,125 @@
+package jntchina.action;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import com.alibaba.fastjson.JSONObject;
+
+import jntchina.util.HttpClientToDC;
+import selfdev.util.base.BaseUtil;
+import selfdev.util.log.LogTool;
+import weaver.conn.RecordSet;
+import weaver.file.Prop;
+import weaver.general.Util;
+import weaver.soa.workflow.request.RequestInfo;
+
+/**
+ * @description: 销假强制收回时的节点附加操作
+ * @author: KangMD
+ * @date: 2022-02-11
+ **/
+public class XiaojiaForceDrawBackThread implements Runnable {
+
+    public static LogTool log=new LogTool("/log/selfdev/action/hrm", false);
+    public RequestInfo requestInfo;
+
+	public RequestInfo getRequestInfo() {
+		return requestInfo;
+	}
+
+	public void setRequestInfo(RequestInfo requestInfo) {
+		this.requestInfo = requestInfo;
+	}
+
+	public void run(){
+		String requestId = requestInfo.getRequestid(); // 获取requestid
+		try {
+			log.writeLog("----------1.5秒后再启动【requestId:" + requestId+"】-------------");
+			Thread.sleep(1500);//延迟执行
+		} catch (InterruptedException e1) {
+			// TODO Auto-generated catch block
+			e1.printStackTrace();
+		}
+		log.writeLog("----------1.5秒结束，开启执行代码【requestId:" +requestId+"】-------------");
+		
+		String workflowid = requestInfo.getWorkflowid(); // 获取workflowid
+        //获取工作流名称
+        String workflowname = BaseUtil.getBaseInfoByParm("workflowname", "workflow_base", "id", workflowid, "");
+        log.writeLog("--------【"+workflowname+"】强制收回时的节点附加操作----requestId值为：" + requestId);
+
+        try{
+        	//流程当前状态
+        	String currentnodetype="";
+        	RecordSet rs = new RecordSet();
+            String sql = "select * from workflow_requestbase where requestid = "+requestId+"";
+            rs.execute(sql);
+            while (rs.next()) {
+            	currentnodetype = Util.null2String(rs.getString("currentnodetype"));//当前流程状态
+            }
+            log.writeLog("currentnodetype---------------->"+currentnodetype);
+            //流程当前处于申请节点，才需要调用HR接口
+            if(!"0".equals(currentnodetype)){
+            	log.writeLog("*************流程不是强制收回到申请节点，不需要调用HR接口*************");
+            	return;
+            }
+            //获取配置文件中的参数，到时候URL路径
+            String mode = Prop.getPropValue("DevToDC_jntchina", "mode");
+            // 服务器ip：port
+            String baseUrl = Prop.getPropValue("DevToDC_jntchina", mode + "_baseUrl");
+            //访问路径拼接
+            String url = baseUrl + "/dcoaapi/hr/attendance";
+
+            //根据流程id获取主表名称
+            String mainTable = RegularizationApplyForAction.getMainTable(requestId);
+            log.writeLog("--------获取到的表名为----：" + mainTable);
+            //申请单号
+            String C_OA_NUM = "";
+            //单据来源：默认OA
+            String C_APPLY_SOURCE = "OA";
+            //流程名称：销假流程为：50
+            String C_WORKFLOW = "50";
+            //审批状态：已通过：3，驳回：5
+            String C_STATUS = "5";
+
+            sql = "select * from "+mainTable+" where requestid = "+requestId+"";
+            rs.execute(sql);
+            log.writeLog("查询主表sql---------------->"+sql);
+            while (rs.next()) {
+                C_OA_NUM = Util.null2String(rs.getString("lcbh"));//申请单号
+            }
+
+            Map<String,Object> map = new HashMap<String,Object>();
+            map.put("C_OA_NUM",C_OA_NUM);
+            map.put("C_APPLY_SOURCE",C_APPLY_SOURCE);
+            map.put("C_WORKFLOW",C_WORKFLOW);
+            map.put("C_STATUS",C_STATUS);
+            String strParm = JSONObject.toJSONString(map);
+            log.writeLog("销假状态回传JSON----------------->"+strParm);
+
+            //获取Token
+            String token = HttpClientToDC.getToken();
+            log.writeLog("销假申请单token------>" + token);
+            log.writeLog("销假申请单url------>" + url);
+
+            //调用NCC接口，将数据传给NCC
+            String returndata = HttpClientToDC.sendPostApi(url,token,strParm);
+            log.writeLog("【销假强制收回时的节点附加操作调用数据中台销假申请单接口返回结果:】" + returndata);
+            if (!"".equals(returndata) && returndata != null) {
+                JSONObject jsonObject = JSONObject.parseObject(returndata);
+                String code = Util.null2String(jsonObject.get("code"));
+                log.writeLog("--------发送请求返回的code值为：" + code);
+                if ("1".equals(code)) {
+                	
+                }else {
+                	String msg = Util.null2String(jsonObject.get("msg"));
+                    log.writeLog("调用HR接口返回错误信息----->" + msg);
+                }
+            }else {
+            	log.writeLog("调用HR接口返回为空----->");
+            }
+        }catch (Exception e){
+            //返回0，调用失败
+            log.writeLog("------------------------捕获到的异常是：" + e.toString());
+        }
+	}
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/action/XiaojiaHuiChuanReturnAction.java b/src/main/youhong_ai_jitu_src/jntchina/action/XiaojiaHuiChuanReturnAction.java
new file mode 100644
index 0000000..c6ab042
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/action/XiaojiaHuiChuanReturnAction.java
@@ -0,0 +1,100 @@
+package jntchina.action;
+
+import com.alibaba.fastjson.JSONObject;
+import jntchina.util.HttpClientToDC;
+import selfdev.util.base.BaseUtil;
+import selfdev.util.log.LogTool;
+import weaver.conn.RecordSet;
+import weaver.file.Prop;
+import weaver.general.Util;
+import weaver.interfaces.workflow.action.BaseAction;
+import weaver.soa.workflow.request.RequestInfo;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @description: 销假流程退回至申请节点时将驳回状态回传HR
+ * @author: KangMD
+ * @date: 2022-02-11
+ **/
+public class XiaojiaHuiChuanReturnAction extends BaseAction{
+    public static LogTool log=new LogTool("/log/selfdev/action/hrm", true);
+    public String execute(RequestInfo requestInfo){
+        String requestId = requestInfo.getRequestid(); // 获取requestid
+        String workflowid = requestInfo.getWorkflowid(); // 获取workflowid
+
+        //获取工作流名称
+        String workflowname = BaseUtil.getBaseInfoByParm("workflowname", "workflow_base", "id", workflowid, "");
+        log.writeLog("---------------工作流名称-----------workflowname为：" + workflowname);
+        log.writeLog("--------【"+workflowname+"】退回到申请节点时数据传入中台开始----requestId值为：" + requestId);
+
+        try{
+            //获取配置文件中的参数，到时候URL路径
+            String mode = Prop.getPropValue("DevToDC_jntchina", "mode");
+            // 服务器ip：port
+            String baseUrl = Prop.getPropValue("DevToDC_jntchina", mode + "_baseUrl");
+            //访问路径拼接
+            String url = baseUrl + "/dcoaapi/hr/attendance";
+
+            //根据流程id获取主表名称
+            String mainTable = RegularizationApplyForAction.getMainTable(requestId);
+            log.writeLog("--------获取到的表名为----：" + mainTable);
+            //申请单号
+            String C_OA_NUM = "";
+            //单据来源：默认OA
+            String C_APPLY_SOURCE = "OA";
+            //流程名称：销假流程为：50
+            String C_WORKFLOW = "50";
+            //审批状态：已通过：3，驳回：5
+            String C_STATUS = "5";
+
+            RecordSet rs = new RecordSet();
+            String sql = "select * from "+mainTable+" where requestid = "+requestId+"";
+            log.writeLog("查询主表sql---------------->"+sql);
+            rs.execute(sql);
+            while (rs.next()) {
+                C_OA_NUM = Util.null2String(rs.getString("lcbh"));//申请单号
+            }
+
+            Map<String,Object> map = new HashMap<String,Object>();
+            map.put("C_OA_NUM",C_OA_NUM);
+            map.put("C_APPLY_SOURCE",C_APPLY_SOURCE);
+            map.put("C_WORKFLOW",C_WORKFLOW);
+            map.put("C_STATUS",C_STATUS);
+            String strParm = JSONObject.toJSONString(map);
+            log.writeLog("销假状态回传JSON----------------->"+strParm);
+
+            //获取Token
+            String token = HttpClientToDC.getToken();
+            log.writeLog("销假申请单token------>" + token);
+            log.writeLog("销假申请单url------>" + url);
+
+            //调用接口
+            String returndata = HttpClientToDC.sendPostApi(url,token,strParm);
+            log.writeLog("【调用数据中台销假申请单接口返回结果:】" + returndata);
+            if (!"".equals(returndata) && returndata != null) {
+                JSONObject jsonObject = JSONObject.parseObject(returndata);
+                String code = Util.null2String(jsonObject.get("code"));
+                log.writeLog("--------发送请求返回的code值为：" + code);
+                if ("1".equals(code)) {
+                    return SUCCESS;
+                } else {
+                    String msg = Util.null2String(jsonObject.get("msg"));
+                    requestInfo.getRequestManager().setMessageid("111100");
+                    requestInfo.getRequestManager().setMessagecontent(msg);
+                    return "0";
+                }
+            }else {
+                String ermsg = "流程数据已审批状态提交至中台失败，请联系系统管理员处理！";
+                requestInfo.getRequestManager().setMessageid("111100");
+                requestInfo.getRequestManager().setMessagecontent(ermsg);
+                return "0";
+            }
+        }catch (Exception e){
+            //返回0，调用失败
+            log.writeLog("------------------------捕获到的异常是：" + e.toString());
+            return "0";
+        }
+    }
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/action/XiaojiaHuiChuanSuccessAction.java b/src/main/youhong_ai_jitu_src/jntchina/action/XiaojiaHuiChuanSuccessAction.java
new file mode 100644
index 0000000..db5b205
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/action/XiaojiaHuiChuanSuccessAction.java
@@ -0,0 +1,100 @@
+package jntchina.action;
+
+import com.alibaba.fastjson.JSONObject;
+import jntchina.util.HttpClientToDC;
+import selfdev.util.base.BaseUtil;
+import selfdev.util.log.LogTool;
+import weaver.conn.RecordSet;
+import weaver.file.Prop;
+import weaver.general.Util;
+import weaver.interfaces.workflow.action.BaseAction;
+import weaver.soa.workflow.request.RequestInfo;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+     * @description: 销假流程归档时将已通过状态回传HR
+ * @author: KangMD
+ * @date: 2021-02-11
+ **/
+public class XiaojiaHuiChuanSuccessAction extends BaseAction {
+
+        public static LogTool log=new LogTool("/log/selfdev/action/hrm", true);
+        public String execute(RequestInfo requestInfo){
+            String requestId = requestInfo.getRequestid(); // 获取requestid
+            String workflowid = requestInfo.getWorkflowid(); // 获取workflowid
+
+            //获取工作流名称
+            String workflowname = BaseUtil.getBaseInfoByParm("workflowname", "workflow_base", "id", workflowid, "");
+            log.writeLog("--------【"+workflowname+"】数据传入中台开始----requestId值为：" + requestId);
+
+            try{
+	            //获取配置文件中的参数，到时候URL路径
+	            String mode = Prop.getPropValue("DevToDC_jntchina", "mode");
+	            // 服务器ip：port
+	            String baseUrl = Prop.getPropValue("DevToDC_jntchina", mode + "_baseUrl");
+	            //访问路径拼接
+	            String url = baseUrl + "/dcoaapi/hr/attendance";
+	
+	            //根据流程id获取主表名称
+	            String mainTable = RegularizationApplyForAction.getMainTable(requestId);
+	            log.writeLog("--------获取到的表名为----：" + mainTable);
+	            //申请单号
+	            String C_OA_NUM = "";
+	            //单据来源：默认OA
+	            String C_APPLY_SOURCE = "OA";
+	            //流程名称：销假流程为：50
+	            String C_WORKFLOW = "50";
+	            //审批状态：已通过：3，驳回：5
+	            String C_STATUS = "3";
+	
+	            RecordSet rs = new RecordSet();
+	            String sql = "select * from "+mainTable+" where requestid = "+requestId+"";
+	            rs.execute(sql);
+	            log.writeLog("查询主表sql---------------->"+sql);
+	            while (rs.next()) {
+	                C_OA_NUM = Util.null2String(rs.getString("lcbh"));//申请单号
+	            }
+
+                Map<String,Object> map = new HashMap<String,Object>();
+                map.put("C_OA_NUM",C_OA_NUM);
+                map.put("C_APPLY_SOURCE",C_APPLY_SOURCE);
+                map.put("C_WORKFLOW",C_WORKFLOW);
+                map.put("C_STATUS",C_STATUS);
+                String strParm = JSONObject.toJSONString(map);
+                log.writeLog("销假状态回传JSON----------------->"+strParm);
+
+                //获取Token
+                String token = HttpClientToDC.getToken();
+                log.writeLog("销假申请单token------>" + token);
+                log.writeLog("销假申请单url------>" + url);
+
+                //调用接口
+                String returndata = HttpClientToDC.sendPostApi(url,token,strParm);
+                log.writeLog("【调用数据中台销假申请单接口返回结果:】" + returndata);
+                if (!"".equals(returndata) && returndata != null) {
+                    JSONObject jsonObject = JSONObject.parseObject(returndata);
+                    String code = Util.null2String(jsonObject.get("code"));
+                    log.writeLog("--------发送请求返回的code值为：" + code);
+                    if ("1".equals(code)) {
+                        return SUCCESS;
+                    } else {
+                        String msg = Util.null2String(jsonObject.get("msg"));
+                        requestInfo.getRequestManager().setMessageid("111100");
+                        requestInfo.getRequestManager().setMessagecontent(msg);
+                        return "0";
+                    }
+                }else {
+                    String ermsg = "流程数据已审批状态提交至中台失败，请联系系统管理员处理！";
+                    requestInfo.getRequestManager().setMessageid("111100");
+                    requestInfo.getRequestManager().setMessagecontent(ermsg);
+                    return "0";
+                }
+            }catch (Exception e){
+                //返回0，调用失败
+                log.writeLog("------------------------捕获到的异常是：" + e.toString());
+                return "0";
+        }
+    }
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/action/hrm/BranchAddAction.java b/src/main/youhong_ai_jitu_src/jntchina/action/hrm/BranchAddAction.java
new file mode 100644
index 0000000..ac1fb15
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/action/hrm/BranchAddAction.java
@@ -0,0 +1,181 @@
+package jntchina.action.hrm;
+
+import com.alibaba.fastjson.JSONObject;
+import com.working.util.WorkflowUtil;
+import jntchina.util.HttpClientToJT;
+import jntchina.util.JTHrmApiUtil;
+
+import selfdev.util.base.BaseUtil;
+import selfdev.util.log.LogTool;
+import weaver.conn.RecordSet;
+import weaver.general.Util;
+import weaver.interfaces.workflow.action.BaseAction;
+import weaver.soa.workflow.request.RequestInfo;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 网点新增Action
+ * CYQ
+ * @date 2021年7月7日 02:18:38
+ */
+public class BranchAddAction  extends BaseAction {
+
+    private LogTool log = new LogTool("/log/hrmAction/", false);
+
+    @Override
+    public String execute(RequestInfo requestInfo) {
+
+        //todo  流程与字段映射
+
+        //C_APP_SEQ		申请单号
+        //C_APP_DT		申请日期
+        //C_APPLI_RS		审批状态
+        //EMPLID		申请人工号
+        //C_ORG_TYPE		组织类别
+        //C_ORG_COMPANY		组织所在公司
+        //C_ORG_EFFDT		组织生效日期
+        //C_ORG_DESCR		组织描述
+        //C_ORG_SHORTDESCR		组织短描述
+        //C_PARENT_ORG		上级组织
+        //C_LOCATION		地点
+        //C_ORG_GENRE		组织类型
+        //C_POSITION_SET_ID		岗位集
+        //C_ORG_LEVEL		组织层级
+        //C_DEPT_CODE		组织代码
+        //C_ORG_GRADE		组织等级
+        //C_COST_CENTER_ID		成本中心
+        //C_MANAGER_ID		组织负责人
+        //C_BRCH_LEADR_ID		分管领导
+        //C_CEO_ID		CEO	CEO
+        //C_CONTRACT_M_ID		合同管理员
+        //C_MAX_RANK		部门最高职级
+        //主表 formtable_main_1581
+        Map<String, String> userCodeIdMap = getUserCodeIdMap();
+        RecordSet rs = new RecordSet();
+        RecordSet rs1 = new RecordSet();
+        String requestId = requestInfo.getRequestid(); //获取requestid
+        log.writeLog("------------requestId值为：" + requestId);
+        String mainTable = WorkflowUtil.getMainTable(requestId);
+        String sql = " select *  from " + mainTable + " where requestid='" + requestId + "'";
+        rs.executeQuery(sql);
+        Map<String, Object> paramMap = new HashMap<>();
+        if(rs.next()){
+
+            String C_APP_SEQ = rs.getString("lcbh");//流程编号
+            log.writeLog("------------C_APP_SEQ：" + C_APP_SEQ);
+            String C_APP_DT = rs.getString("C_APP_DT");//申请时间
+            String C_APPLI_RS = "3";
+            String EMPLID = Util.null2String(rs.getString("EMPLID")); //需要处理 - 姓名
+            String C_ORG_TYPE = Util.null2String(rs.getString("C_ORG_TYPE"));//未找到
+            String C_ORG_COMPANY = Util.null2String(rs.getString("C_ORG_COMPANY"));// 需要处理
+            String C_ORG_EFFDT = Util.null2String(rs.getString("C_ORG_EFFDT"));// 系统开通时间
+            String C_ORG_DESCR = Util.null2String(rs.getString("wdmc"));// 网点名称
+            String C_ORG_SHORTDESCR = Util.null2String(rs.getString("wdjc"));// 网点简称
+            String C_PARENT_ORG = Util.null2String(rs.getString("C_PARENT_ORG"));//上级组织
+            String C_JMS_ORG_LEVEL = Util.null2String(rs.getString("jmszzcj"));//JMS组织层级
+            
+            //HR最多只能10位，判断长度超出10，则截取前10位
+            if(C_ORG_SHORTDESCR.length()>10){
+            	C_ORG_SHORTDESCR=C_ORG_SHORTDESCR.substring(0,10);
+            }
+            
+            if(!"".equals(C_JMS_ORG_LEVEL)){
+                //根据下拉框的值获取对应的描述
+            	C_JMS_ORG_LEVEL=BaseUtil.getBaseInfoByParm("selectname", "workflow_selectitem", "selectvalue", C_JMS_ORG_LEVEL,
+    					" and fieldid in (select id from workflow_billfield where billid in (select formid from workflow_base where id="+requestInfo.getWorkflowid()+") and fieldname='jmszzcj' and viewtype=0)");
+            	log.writeLog("------------C_JMS_ORG_LEVEL2：" + C_JMS_ORG_LEVEL);
+            	//过滤多语言
+    			C_JMS_ORG_LEVEL=Util.formatMultiLang(C_JMS_ORG_LEVEL,"7").split("-")[0];
+    			log.writeLog("------------C_JMS_ORG_LEVEL3：" + C_JMS_ORG_LEVEL);
+            }else{
+            	C_JMS_ORG_LEVEL="60";
+            }
+            
+            if(!"".equals(C_PARENT_ORG)){
+                sql = "select outkey,id from hrmsubcompany where id = " +C_PARENT_ORG;
+                rs1.executeQuery(sql);
+                rs1.next();
+                C_PARENT_ORG = Util.null2String(rs1.getString("outkey"));
+            }else{
+                requestInfo.getRequestManager().setMessagecontent("上级组织C_PARENT_ORG必传！");
+                return FAILURE_AND_CONTINUE;
+            }
+            String C_LOCATION = rs.getString("C_LOCATION"); // 网点地址
+            String C_ORG_GENRE = rs.getString("C_ORG_GENRE");
+            String C_POSITION_SET_ID = "100041";//岗位集
+            String C_ORG_LEVEL = rs.getString("C_ORG_LEVEL1"); // 未找到
+            String C_DEPT_CODE = rs.getString("wdbh"); // 网点编号
+            String C_ORG_GRADE = Util.null2String(rs.getString("C_ORG_GRADE"));
+//            String C_COST_CENTER_ID = Util.null2String(rs.getString("C_COST_CENTER_ID")); //成本中心
+            String C_COST_CENTER_ID = ""; //成本中心
+            String C_MANAGER_ID = Util.null2String(userCodeIdMap.get(rs.getString("C_MANAGER_ID")));// 负责人
+//            String C_BRCH_LEADR_ID = rs.getString("sqsj");// 未找到
+//            String C_CEO_ID = rs.getString("sqsj");// 未找到
+//            String C_CONTRACT_M_ID = rs.getString("sqsj");// 未找到
+//            String C_MAX_RANK = rs.getString("sqsj");// 未找到
+            paramMap.put("C_APP_SEQ",C_APP_SEQ);
+            paramMap.put("C_APP_DT",C_APP_DT);
+            paramMap.put("C_APPLI_RS",C_APPLI_RS);
+            paramMap.put("EMPLID",EMPLID);
+            paramMap.put("C_ORG_TYPE",C_ORG_TYPE);
+            paramMap.put("C_ORG_COMPANY",C_ORG_COMPANY);
+            paramMap.put("C_ORG_EFFDT",C_ORG_EFFDT);
+            paramMap.put("C_ORG_DESCR",C_ORG_DESCR);
+            paramMap.put("C_ORG_SHORTDESCR",C_ORG_SHORTDESCR);
+            paramMap.put("C_PARENT_ORG",C_PARENT_ORG);
+            paramMap.put("C_LOCATION",C_LOCATION);
+            paramMap.put("C_ORG_GENRE",C_ORG_GENRE);
+            paramMap.put("C_POSITION_SET_ID",C_POSITION_SET_ID);
+            paramMap.put("C_ORG_LEVEL",C_ORG_LEVEL);
+            paramMap.put("C_DEPT_CODE",C_DEPT_CODE);
+            paramMap.put("C_ORG_GRADE",C_ORG_GRADE);
+            paramMap.put("C_COST_CENTER_ID",C_COST_CENTER_ID);
+            paramMap.put("C_MANAGER_ID",C_MANAGER_ID);
+            paramMap.put("C_JMS_ORG_LEVEL", C_JMS_ORG_LEVEL);//JMS组织层级
+            paramMap.put("C_BRCH_LEADR_ID","");
+//            paramMap.put("C_CEO_ID","");
+//            paramMap.put("C_CONTRACT_M_ID","");
+            
+            paramMap.put("C_MAX_RANK", new ArrayList<>());
+            paramMap.put("C_EXPAND", new ArrayList<>());
+            paramMap.put("C_COMP_SUB", new ArrayList<>());
+            paramMap.put("MULT_LANGUAGE",new ArrayList<>());
+            
+            //主表 formtable_main_1581
+
+
+            String token = HttpClientToJT.getToken();
+            String paramStr = JSONObject.toJSONString(paramMap);
+            log.writeLog("---------开始添加网点------参数："+paramStr+"------------");
+            JSONObject  json= JTHrmApiUtil.deptAddOrEdit(token, paramStr);
+            log.writeLog("---------结束添加网点-----返回结果："+json.toJSONString()+"------------");
+            if (json.getInteger("code").equals(1)) {
+                JSONObject data = json.getJSONObject("data");
+                String deptid = data.getString("DEPTID");
+                log.writeLog("HR deptid------------>"+deptid);
+                //将HR部门ID插入流程表单中
+                rs1.execute("update "+mainTable+" set hrbmid='"+deptid+"' where requestid='"+requestId+"'");//               
+            }else{
+            	requestInfo.getRequestManager().setMessageid("111100");
+                requestInfo.getRequestManager().setMessagecontent(json.getString("msg"));
+                return FAILURE_AND_CONTINUE;
+            }
+
+            return SUCCESS;
+        }
+        return FAILURE_AND_CONTINUE;
+    }
+
+    public Map<String, String> getUserCodeIdMap() {
+        RecordSet rs = new RecordSet();
+        Map<String, String> map = new HashMap<>();
+        rs.executeQuery("select outkey,loginid,id from hrmresource where loginid is not null ");
+        while (rs.next()) {
+            map.put(rs.getString("id"),rs.getString("loginid"));
+        }
+        return map;
+    }
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/action/hrm/BranchInvalidAction.java b/src/main/youhong_ai_jitu_src/jntchina/action/hrm/BranchInvalidAction.java
new file mode 100644
index 0000000..9a573a9
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/action/hrm/BranchInvalidAction.java
@@ -0,0 +1,96 @@
+package jntchina.action.hrm;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.working.util.WorkflowUtil;
+import jntchina.util.HttpClientToJT;
+import jntchina.util.JTHrmApiUtil;
+import selfdev.util.base.BaseUtil;
+import selfdev.util.log.LogTool;
+import weaver.conn.RecordSet;
+import weaver.interfaces.workflow.action.BaseAction;
+import weaver.soa.workflow.request.RequestInfo;
+
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 网点退网失效Action
+ * CYQ
+ * @date 2021年7月17日 02:18:38
+ */
+public class BranchInvalidAction extends BaseAction {
+
+    private LogTool log = new LogTool("/log/hrmAction/", false);
+
+    @Override
+    public String execute(RequestInfo requestInfo) {
+        RecordSet rs = new RecordSet();
+        String requestId = requestInfo.getRequestid(); //获取requestid
+        log.writeLog("------------requestId值为：" + requestId);
+        String mainTable = WorkflowUtil.getMainTable(requestId);
+        String sql = " select *  from " + mainTable + " where requestid='" + requestId + "'";
+        rs.executeQuery(sql);
+        Map<String, Object> paramMap = new HashMap<>();
+        //C_APP_SEQ		申请单号
+        //C_APP_DT		申请日期
+        //C_APPLI_RS		审批状态
+        //EMPLID		申请人工号
+        //C_INVALID_EFFDT		组织失效日期
+        //C_INVALID_DEPTID	 数组， C_DEPTID: 部门编码
+        List<String> detps = new ArrayList<>();
+        if(rs.next()){
+            String C_APP_SEQ =  rs.getString("lcbh");
+            String C_APP_DT =  rs.getString("sqsj");
+            String C_APPLI_RS =  "3";
+            String EMPLID =  rs.getString("EMPLID");// 需要处理
+            String C_INVALID_EFFDT =  rs.getString("C_INVALID_EFFDT");
+            //String C_INVALID_DEPTID =  rs.getString("wdbm");
+            String C_INVALID_DEPTID =  rs.getString("C_DEPTID");//失效网点/集散点
+            log.writeLog("C_INVALID_DEPTID转换前--------->"+C_INVALID_DEPTID);
+            //根据部门ID获取outkey
+            C_INVALID_DEPTID=BaseUtil.getBaseInfoByParm("outkey", "hrmdepartment", "id", C_INVALID_DEPTID, "");
+            log.writeLog("C_INVALID_DEPTID转换后--------->"+C_INVALID_DEPTID);
+            paramMap.put("C_APP_SEQ", C_APP_SEQ);
+            paramMap.put("C_APP_DT", getDateTime(C_APP_DT));
+            paramMap.put("C_APPLI_RS",C_APPLI_RS);
+            paramMap.put("EMPLID", EMPLID);
+            paramMap.put("C_INVALID_EFFDT", C_INVALID_EFFDT);
+            //失效部门列表
+            JSONArray jsonArray = new JSONArray();
+            detps.add(C_INVALID_DEPTID);
+            detps.forEach(x->{
+                JSONObject xx = new JSONObject();
+                xx.put("C_DEPTID",x);
+                jsonArray.add(xx);
+            });
+            paramMap.put("C_INVALID_DEPTID", jsonArray);
+            String token = HttpClientToJT.getToken();
+            String paramStr = JSONObject.toJSONString(paramMap);
+            log.writeLog("---------开始网点退网------参数："+paramStr+"------------");
+            JSONObject  json= JTHrmApiUtil.deptInvalid(token, paramStr);
+            log.writeLog("---------结束网点退网-----返回结果："+json.toJSONString()+"------------");
+            if (json.getInteger("code").equals(1)) {
+                
+            }else{
+                requestInfo.getRequestManager().setMessagecontent(json.getString("msg"));
+                return FAILURE_AND_CONTINUE;
+            }
+            return SUCCESS;
+        }
+        return FAILURE_AND_CONTINUE;
+    }
+
+    public String getDateTime(String date){
+        DateTimeFormatter fmt = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm");
+        DateTimeFormatter fmt1 = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+        LocalDateTime localDate = LocalDateTime.parse(date,fmt);
+        String dateStr = localDate.format(fmt1);
+        return dateStr;
+    }
+
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/action/hrm/ContracRenewtAction.java b/src/main/youhong_ai_jitu_src/jntchina/action/hrm/ContracRenewtAction.java
new file mode 100644
index 0000000..5b5df93
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/action/hrm/ContracRenewtAction.java
@@ -0,0 +1,95 @@
+package jntchina.action.hrm;
+
+import com.alibaba.fastjson.JSONObject;
+import com.working.util.WorkflowUtil;
+import jntchina.util.HttpClientToJT;
+import jntchina.util.JTHrmApiUtil;
+import selfdev.util.log.LogTool;
+import weaver.conn.RecordSet;
+import weaver.general.Util;
+import weaver.interfaces.workflow.action.BaseAction;
+import weaver.soa.workflow.request.RequestInfo;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 合同续签Action
+ * CYQ
+ *
+ * @date 2021年7月7日 02:18:38
+ */
+public class ContracRenewtAction extends BaseAction {
+
+    private LogTool log = new LogTool("/log/hrmAction/", false);
+
+    @Override
+    public String execute(RequestInfo requestInfo) {
+        Map<String, String> userCodeIdMap = getUserCodeIdMap();
+        RecordSet rs = new RecordSet();
+        String requestId = requestInfo.getRequestid(); //获取requestid
+        log.writeLog("------------requestId值为：" + requestId);
+        String mainTable = WorkflowUtil.getMainTable(requestId);
+        String sql = " select *  from " + mainTable + " where requestid='" + requestId + "'";
+        rs.executeQuery(sql);
+        //todo  流程与字段映射
+        Map<String, String> paramMap = new HashMap<String, String>();
+        if (rs.next()) {
+//            C_APP_SEQ		申请单号
+//            C_APP_DT		申请日期
+//            C_APPLI_RS		审批状态
+//            EMPLID		申请人
+//            EMPLID2		合同续签员工
+//            CONTRACT_TYPE		续签合同类型
+//            CONTRACT_SUB_TYPE		续签合同子类
+//            COMPANY		续签合同法人主体
+//            CONTRACT_BEGIN_DT		续签合同开始日期
+//            CONTRACT_END_DT		续签合同结束日期
+            String C_APP_SEQ = rs.getString("C_APP_SEQ");//流程编号
+            String C_APP_DT = rs.getString("C_APP_DT");//申请日期
+            String C_APPLI_RS = "3";//审批状态
+            String EMPLID = rs.getString("EMPLID");//申请人
+            String EMPLID2 = rs.getString("EMPLID2");//合同续签员工
+            String CONTRACT_TYPE = rs.getString("CONTRACT_TYPE");//续签合同类型
+            String CONTRACT_SUB_TYPE = rs.getString("CONTRACT_SUB_TYPE");//续签合同子类
+            String COMPANY = rs.getString("COMPANY");//续签合同法人主体
+            String CONTRACT_BEGIN_DT = rs.getString("htzzrq");//续签合同开始日期
+            String CONTRACT_END_DT = rs.getString("htjsrq");//续签合同结束日期
+
+            paramMap.put("C_APP_SEQ", C_APP_SEQ);
+            paramMap.put("C_APP_DT", C_APP_DT);
+            paramMap.put("C_APPLI_RS", C_APPLI_RS);
+            paramMap.put("EMPLID", EMPLID);
+            paramMap.put("EMPLID2", EMPLID2);
+            paramMap.put("CONTRACT_TYPE", CONTRACT_TYPE);
+            paramMap.put("CONTRACT_SUB_TYPE", CONTRACT_SUB_TYPE);
+            paramMap.put("COMPANY", COMPANY);
+            paramMap.put("CONTRACT_BEGIN_DT", CONTRACT_BEGIN_DT);
+            paramMap.put("CONTRACT_END_DT", CONTRACT_END_DT);
+
+            String token = HttpClientToJT.getToken();
+            String paramStr = JSONObject.toJSONString(paramMap);
+            log.writeLog("---------开始添加合同续签------参数：" + paramStr + "------------");
+            JSONObject result = JTHrmApiUtil.contracRenewt(token, paramStr);
+            log.writeLog("---------结束合同续签-----返回结果："+result+"------------");
+            if (result.getInteger("code").equals(1)) {
+                JSONObject data = result.getJSONObject("data");
+            }else{
+                requestInfo.getRequestManager().setMessagecontent(result.getString("msg"));
+                return FAILURE_AND_CONTINUE;
+            }
+
+            return SUCCESS;
+        }
+        return FAILURE_AND_CONTINUE;
+    }
+    public Map<String, String> getUserCodeIdMap() {
+        RecordSet rs = new RecordSet();
+        Map<String, String> map = new HashMap<>();
+        rs.executeQuery("select outkey,loginid,id from hrmresource where loginid is not null ");
+        while (rs.next()) {
+            map.put(rs.getString("id"),rs.getString("loginid"));
+        }
+        return map;
+    }
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/action/hrm/DepartmentAddOrEditAction.java b/src/main/youhong_ai_jitu_src/jntchina/action/hrm/DepartmentAddOrEditAction.java
new file mode 100644
index 0000000..d950a9c
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/action/hrm/DepartmentAddOrEditAction.java
@@ -0,0 +1,195 @@
+package jntchina.action.hrm;
+
+import com.alibaba.fastjson.JSONObject;
+import com.working.util.WorkflowUtil;
+import jntchina.util.HttpClientToJT;
+import jntchina.util.JTHrmApiUtil;
+
+import selfdev.util.base.BaseUtil;
+import selfdev.util.log.LogTool;
+import weaver.conn.RecordSet;
+import weaver.general.Util;
+import weaver.interfaces.workflow.action.BaseAction;
+import weaver.soa.workflow.request.RequestInfo;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 部门新增Action
+ * CYQ
+ *
+ * @date 2021年7月17日 02:18:38
+ */
+public class DepartmentAddOrEditAction extends BaseAction {
+
+    private LogTool log = new LogTool("/log/hrmAction/", false);
+
+
+    @Override
+    public String execute(RequestInfo requestInfo) {
+
+        Map<String, String> userCodeIdMap = getUserCodeIdMap();
+        //todo 流程与字段映射 新增和修改在同一个表单
+        //主表 formtable_main_1581
+        RecordSet rs = new RecordSet();
+        RecordSet rs1 = new RecordSet();
+        String requestId = requestInfo.getRequestid(); //获取requestid
+        log.writeLog("------------requestId值为：" + requestId);
+        String mainTable = WorkflowUtil.getMainTable(requestId);
+        String sql = " select C_APP_SEQ," +
+                "C_APP_DT," +
+                "EMPLID," +
+                "C_ORG_EFFDT," +
+                "C_ORG_TYPE," +
+                "C_ORG_COMPANY," +
+                "C_ORG_DESCR," +
+                "C_ORG_SHORTDESCR," +
+                "C_PARENT_ORG," +
+                "C_LOCATION," +
+                "C_ORG_GENRE," +
+                "C_ORG_LEVEL1," +
+                "C_DEPT_CODE," +
+                "C_ORG_GRADE," +
+                "C_COST_CENTER_ID," +
+                "C_MANAGER_ID," +
+                "C_BRCH_LEADR_ID," +
+                "JMSZZCJ," +
+                "C_POSITION_SET_ID " +
+                "from " + mainTable + " where requestid = " + requestId + "  ";
+        log.writeLog("------------sql：" + sql);
+        rs.executeQuery(sql);
+        Map<String, Object> paramMap = new HashMap<>();
+        if (rs.next()) {
+
+            //C_APP_SEQ		申请单号
+            //C_APP_DT		申请日期
+            //C_APPLI_RS		审批状态
+            //EMPLID		申请人工号
+            //C_ORG_TYPE		组织类别
+            //C_ORG_COMPANY		组织所在公司
+            //C_ORG_EFFDT		组织生效日期
+            //C_ORG_DESCR		组织描述
+            //C_ORG_SHORTDESCR		组织短描述
+            //C_PARENT_ORG		上级组织
+            //C_LOCATION		地点
+            //C_ORG_GENRE		组织类型
+            //C_POSITION_SET_ID		岗位集
+            //C_ORG_LEVEL		组织层级
+            //C_DEPT_CODE		组织代码
+            //C_ORG_GRADE		组织等级
+            //C_COST_CENTER_ID		成本中心
+            //C_MANAGER_ID		组织负责人
+            //C_BRCH_LEADR_ID		分管领导
+            //C_CEO_ID		CEO	CEO
+            //C_CONTRACT_M_ID		合同管理员
+            //C_MAX_RANK		部门最高职级
+
+
+            String[] columnName = rs.getColumnName();
+            rs.next();
+            for (int i = 0; i < columnName.length; i++) {
+                paramMap.put(columnName[i], Util.null2String(rs.getString(columnName[i])));
+            }
+            paramMap.remove("C_ORG_LEVEL1");
+            paramMap.remove("JMSZZCJ");
+            //需要转换字段
+            String C_PARENT_ORG = Util.null2String(rs.getString("C_PARENT_ORG"));//上级组织 现在是分部
+            String C_JMS_ORG_LEVEL = Util.null2String(rs.getString("JMSZZCJ"));//JMS组织层级
+            String C_ORG_SHORTDESCR = Util.null2String(rs.getString("C_ORG_SHORTDESCR"));//组织名称
+            log.writeLog("------------C_PARENT_ORG：" + C_PARENT_ORG);
+            log.writeLog("------------C_JMS_ORG_LEVEL：" + C_JMS_ORG_LEVEL);
+            log.writeLog("------------C_ORG_SHORTDESCR：" + C_ORG_SHORTDESCR);
+
+            //HR最多只能10位，判断长度超出10，则截取前10位
+            if (C_ORG_SHORTDESCR.length() > 10) {
+                C_ORG_SHORTDESCR = C_ORG_SHORTDESCR.substring(0, 10);
+                paramMap.put("C_ORG_SHORTDESCR", C_ORG_SHORTDESCR);
+            }
+
+            if (!"".equals(C_PARENT_ORG)) {
+                sql = "select outkey,id from hrmsubcompany where id = " + C_PARENT_ORG;
+                rs1.executeQuery(sql);
+                rs1.next();
+                C_PARENT_ORG = Util.null2String(rs1.getString("outkey"));
+            } else {
+                requestInfo.getRequestManager().setMessagecontent("上级组织C_PARENT_ORG必传！");
+                return FAILURE_AND_CONTINUE;
+            }
+
+            if (!"".equals(C_JMS_ORG_LEVEL)) {
+                //根据下拉框的值获取对应的描述
+                C_JMS_ORG_LEVEL = BaseUtil.getBaseInfoByParm("selectname", "workflow_selectitem", "selectvalue", C_JMS_ORG_LEVEL,
+                        " and fieldid in (select id from workflow_billfield where billid in (select formid from workflow_base where id=" + requestInfo.getWorkflowid() + ") and fieldname='jmszzcj' and viewtype=0)");
+                log.writeLog("------------C_JMS_ORG_LEVEL2：" + C_JMS_ORG_LEVEL);
+                //过滤多语言
+                C_JMS_ORG_LEVEL = Util.formatMultiLang(C_JMS_ORG_LEVEL, "7").split("-")[0];
+                log.writeLog("------------C_JMS_ORG_LEVEL3：" + C_JMS_ORG_LEVEL);
+            } else {
+                C_JMS_ORG_LEVEL = "10";
+            }
+
+            String C_ORG_LEVEL = Util.null2String(rs.getString("C_ORG_LEVEL1"));
+            log.writeLog("------------C_PARENT_ORG：" + C_PARENT_ORG);
+            //成本中心
+//            String C_COST_CENTER_ID = Util.null2String(rs.getString("C_COST_CENTER_ID"));
+            String C_COST_CENTER_ID = "";
+            String C_MANAGER_ID = Util.null2String(userCodeIdMap.get(rs.getString("C_MANAGER_ID")));
+            log.writeLog("------------C_MANAGER_ID：" + C_MANAGER_ID);
+            String C_BRCH_LEADR_ID = Util.null2String(userCodeIdMap.get(rs.getString("C_BRCH_LEADR_ID")));
+            log.writeLog("------------C_BRCH_LEADR_ID：" + C_BRCH_LEADR_ID);
+            //字段取消，不要
+//            String C_CEO_ID = Util.null2String(userCodeIdMap.get(rs.getString("C_CEO_ID")));
+//            String C_CONTRACT_M_ID = Util.null2String(userCodeIdMap.get(rs.getString("C_CONTRACT_M_ID")));
+//            log.writeLog("------------C_CONTRACT_M_ID：" + C_CONTRACT_M_ID);
+
+
+            paramMap.put("C_ORG_LEVEL", C_ORG_LEVEL);//上级组织 现在是分部
+            paramMap.put("C_PARENT_ORG", C_PARENT_ORG);//上级组织 现在是分部
+            paramMap.put("C_COST_CENTER_ID", C_COST_CENTER_ID);
+            paramMap.put("C_MANAGER_ID", C_MANAGER_ID);
+            paramMap.put("C_BRCH_LEADR_ID", C_BRCH_LEADR_ID);
+            paramMap.put("C_JMS_ORG_LEVEL", C_JMS_ORG_LEVEL);//JMS组织层级
+//            paramMap.put("C_CEO_ID", C_CEO_ID);
+//            paramMap.put("C_CONTRACT_M_ID", C_CONTRACT_M_ID);
+            paramMap.put("C_MAX_RANK", new ArrayList<>());
+            paramMap.put("C_EXPAND", new ArrayList<>());
+            paramMap.put("C_COMP_SUB", new ArrayList<>());
+            paramMap.put("MULT_LANGUAGE", new ArrayList<>());
+            paramMap.put("C_APPLI_RS", "3");
+
+            String token = HttpClientToJT.getToken();
+            String paramStr = JSONObject.toJSONString(paramMap);
+            log.writeLog("---------开始部门------参数：" + paramStr + "------------");
+            JSONObject json = JTHrmApiUtil.deptAddOrEdit(token, paramStr);
+            log.writeLog("---------部门新增返回结果：" + json.toJSONString() + "------------");
+            if (json.getInteger("code").equals(1)) {
+                JSONObject data = json.getJSONObject("data");
+                String deptid = data.getString("DEPTID");
+                log.writeLog("HR deptid------------>" + deptid);
+                //将HR部门ID插入流程表单中
+                rs1.execute("update " + mainTable + " set hrbmid='" + deptid + "' where requestid='" + requestId + "'");
+            } else {
+                requestInfo.getRequestManager().setMessageid("111100");
+                requestInfo.getRequestManager().setMessagecontent(json.getString("msg"));
+                return FAILURE_AND_CONTINUE;
+            }
+            return SUCCESS;
+        }
+        return FAILURE_AND_CONTINUE;
+    }
+
+
+    public Map<String, String> getUserCodeIdMap() {
+        RecordSet rs = new RecordSet();
+        Map<String, String> map = new HashMap<>();
+        rs.executeQuery("select outkey,loginid,id from hrmresource where loginid is not null ");
+        while (rs.next()) {
+            map.put(rs.getString("id"), rs.getString("loginid"));
+        }
+        return map;
+    }
+
+
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/action/hrm/DepartmentInvalidAction.java b/src/main/youhong_ai_jitu_src/jntchina/action/hrm/DepartmentInvalidAction.java
new file mode 100644
index 0000000..1f356c7
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/action/hrm/DepartmentInvalidAction.java
@@ -0,0 +1,132 @@
+package jntchina.action.hrm;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.working.util.WorkflowUtil;
+import jntchina.util.HttpClientToJT;
+import jntchina.util.JTHrmApiUtil;
+import selfdev.util.base.BaseUtil;
+import selfdev.util.log.LogTool;
+import weaver.conn.RecordSet;
+import weaver.interfaces.workflow.action.BaseAction;
+import weaver.soa.workflow.request.RequestInfo;
+
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 部门失效Action
+ * CYQ
+ *
+ * @date 2021年7月17日 02:18:38
+ */
+public class DepartmentInvalidAction extends BaseAction {
+
+    //日志类（/log/hrmAction/可自定义）
+    private LogTool log = new LogTool("/log/hrmAction/", false);
+
+    @Override
+    public String execute(RequestInfo requestInfo) {
+        RecordSet rs = new RecordSet();//数据库连接类（OA自身数据库）
+        String requestId = requestInfo.getRequestid(); //获取requestid
+        log.writeLog("------------requestId值为：" + requestId);
+        //取流程表名
+        String mainTable = WorkflowUtil.getMainTable(requestId);
+        String sql = " select *  from " + mainTable + " where requestid='" + requestId + "'";
+        rs.executeQuery(sql);
+        Map<String, Object> paramMap = new HashMap<>();
+        //C_APP_SEQ		申请单号
+        //C_APP_DT		申请日期
+        //C_APPLI_RS	审批状态
+        //EMPLID		申请人工号
+        //C_INVALID_EFFDT		组织失效日期
+        //C_INVALID_DEPTID	 数组， C_DEPTID: 部门编码
+        List<String> detps = new ArrayList<>();
+        if (rs.next()) {
+            String C_APP_SEQ = rs.getString("lcbh");
+            String C_APP_DT = rs.getString("sqsj");
+            String C_APPLI_RS = "3";
+            String EMPLID = rs.getString("EMPLID");// 需要处理
+            String C_INVALID_EFFDT = rs.getString("C_INVALID_EFFDT");
+            //String C_INVALID_DEPTID =  rs.getString("wdbm");
+            String C_INVALID_DEPTID = rs.getString("C_DEPTID");//失效网点/集散点
+
+            //通过 , 号截取字符串
+            for (String s : C_INVALID_DEPTID.split(",")) {
+                detps.add(s);
+
+            }
+            log.writeLog("C_INVALID_DEPTID转换前--------->" + C_INVALID_DEPTID);
+
+            ArrayList arrayList = new ArrayList();
+            for (String s : C_INVALID_DEPTID.split(",")) {
+                //根据部门ID获取outkey
+                C_INVALID_DEPTID = BaseUtil.getBaseInfoByParm("outkey", "hrmdepartment", "id", s, "");
+
+                arrayList.add(C_INVALID_DEPTID);
+            }
+
+            //list集合转换为String字符串
+            C_INVALID_DEPTID = String.join(",",arrayList);
+
+
+            //C_INVALID_DEPTID = BaseUtil.getBaseInfoByParm("outkey", "hrmdepartment", "id", C_INVALID_DEPTID, "");
+            log.writeLog("C_INVALID_DEPTID转换后--------->" + C_INVALID_DEPTID);
+
+            paramMap.put("C_APP_SEQ", C_APP_SEQ);
+            paramMap.put("C_APP_DT", getDateTime(C_APP_DT));
+            paramMap.put("C_APPLI_RS", C_APPLI_RS);
+            paramMap.put("EMPLID", EMPLID);
+            paramMap.put("C_INVALID_EFFDT", C_INVALID_EFFDT);
+
+            //失效部门列表
+            JSONArray jsonArray = new JSONArray();
+            arrayList.forEach(x -> {
+                JSONObject jsonObject = new JSONObject();
+                jsonObject.put("C_DEPTID", x);
+                jsonArray.add(jsonObject);
+            });
+            /*//失效部门列表
+            JSONArray jsonArray = new JSONArray();
+            detps.add(C_INVALID_DEPTID);
+            detps.forEach(x->{
+                JSONObject xx = new JSONObject();
+                xx.put("C_DEPTID",x);
+                jsonArray.add(xx);
+            });*/
+
+            paramMap.put("C_INVALID_DEPTID", jsonArray);
+
+            //获取token
+            String token = HttpClientToJT.getToken();
+            //将MAP转成JSON字符串
+            String paramStr = JSONObject.toJSONString(paramMap);
+            log.writeLog("---------开始部门失效------参数：" + paramStr + "------------");
+            //调用接口将数据传
+            JSONObject json = JTHrmApiUtil.deptInvalid(token, paramStr);
+            log.writeLog("---------结束部门失效-----返回结果：" + json.toJSONString() + "------------");
+            if (json.getInteger("code").equals(1)) {
+
+            } else {
+                requestInfo.getRequestManager().setMessagecontent(json.getString("msg"));
+                return FAILURE_AND_CONTINUE;
+            }
+            return SUCCESS;
+        }
+        return FAILURE_AND_CONTINUE;
+    }
+
+    public String getDateTime(String date) {
+        DateTimeFormatter fmt = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm");
+        DateTimeFormatter fmt1 = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+        LocalDateTime localDate = LocalDateTime.parse(date, fmt);
+        String dateStr = localDate.format(fmt1);
+        return dateStr;
+    }
+
+
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/action/hrm/FranchiseeAddAction.java b/src/main/youhong_ai_jitu_src/jntchina/action/hrm/FranchiseeAddAction.java
new file mode 100644
index 0000000..476751a
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/action/hrm/FranchiseeAddAction.java
@@ -0,0 +1,261 @@
+package jntchina.action.hrm;
+
+import com.alibaba.fastjson.JSONObject;
+import com.working.util.WorkflowUtil;
+import jntchina.util.HttpClientToJT;
+import jntchina.util.JTHrmApiUtil;
+import selfdev.util.base.BaseUtil;
+import selfdev.util.log.LogTool;
+import weaver.conn.RecordSet;
+import weaver.general.Util;
+import weaver.interfaces.workflow.action.BaseAction;
+import weaver.soa.workflow.request.RequestInfo;
+
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 加盟商新增Action
+ * CYQ
+ *
+ * @date 2021年7月7日 02:18:38
+ */
+public class FranchiseeAddAction extends BaseAction {
+
+    private LogTool log = new LogTool("/log/hrmAction/", false);
+
+    @Override
+    public String execute(RequestInfo requestInfo) {
+        RecordSet rs = new RecordSet();
+        RecordSet rs1 = new RecordSet();
+//        Map<String, String> userCodeIdMap = getUserCodeIdMap();
+        String requestId = requestInfo.getRequestid(); //获取requestid
+        log.writeLog("------------requestId值为：" + requestId);
+        String mainTable = WorkflowUtil.getMainTable(requestId);
+        String sql = " select *  from " + mainTable + " where requestid='" + requestId + "'";
+        rs.executeQuery(sql);
+        Map<String, Object> paramMap = new HashMap<String, Object>();
+        if (rs.next()) {
+            //todo  流程与字段映射
+//            C_APP_SEQ		申请单号
+//            C_APP_DT		申请日期
+//            C_APPLI_RS		审批状态
+//            EMPLID		申请人工号
+//            C_ORG_TYPE		组织类别
+//            C_ORG_COMPANY		组织所在公司
+//            C_ORG_EFFDT		组织生效日期
+//            C_ORG_DESCR		组织描述
+//            C_ORG_SHORTDESCR		组织短描述
+//            C_PARENT_ORG		上级组织
+//            C_LOCATION		地点
+//            C_ORG_GENRE		组织类型
+//            C_POSITION_SET_ID		岗位集
+//            C_ORG_LEVEL		组织层级
+//            C_DEPT_CODE		组织代码
+//            C_ORG_GRADE		组织等级
+//            C_COST_CENTER_ID		成本中心
+//            C_MANAGER_ID		组织负责人
+//            C_BRCH_LEADR_ID		分管领导
+//            C_CEO_ID		CEO	CEO
+//            C_CONTRACT_M_ID		合同管理员
+//            C_MAX_RANK		部门最高职级
+            String C_APP_SEQ = Util.null2String(rs.getString("lcbh"));//流程编号
+            String C_APP_DT = Util.null2String(rs.getString("C_APP_DT"));//申请时间
+            String C_APPLI_RS = "3";
+            String EMPLID = Util.null2String(rs.getString("EMPLID")); //需要处理 - 姓名
+
+            //生产环境和测试环境的差异字段
+            String C_ORG_TYPE = Util.null2String(rs.getString("C_ORG_TYPE1"));//生产
+//            String C_ORG_TYPE = Util.null2String(rs.getString("C_ORG_TYPE"));//测试
+            String C_ORG_GENRE = Util.null2String(rs.getString("C_ORG_GENRE1")); //生产
+//            String C_ORG_GENRE = Util.null2String(rs.getString("C_ORG_GENRE")); //测试
+
+//            String C_ORG_COMPANY = Util.null2String(rs.getString("C_ORG_COMPANY"));//组织所在公司
+            String C_ORG_EFFDT = Util.null2String(rs.getString("C_ORG_EFFDT"));// 系统开通时间
+            String C_ORG_DESCR = Util.null2String(rs.getString("jmsmc"));// 加盟商名称
+//            String C_ORG_SHORTDESCR = Util.null2String(rs.getString("jmsmc"));// 加盟商简称
+            String C_PARENT_ORG = Util.null2String(rs.getString("C_PARENT_ORG"));// /上级组织
+            if (!"".equals(C_PARENT_ORG)) {
+                sql = "select outkey,id from hrmsubcompany where id = " + C_PARENT_ORG;
+                rs1.executeQuery(sql);
+                rs1.next();
+                C_PARENT_ORG = Util.null2String(rs1.getString("outkey"));
+            } else {
+                requestInfo.getRequestManager().setMessagecontent("上级组织C_PARENT_ORG必传！");
+                return FAILURE_AND_CONTINUE;
+            }
+            log.writeLog("------------C_PARENT_ORGoutkey：" + C_PARENT_ORG);
+
+            String C_JMS_ORG_LEVEL = Util.null2String(rs.getString("jmszzcj"));//JMS组织层级
+            if (!"".equals(C_JMS_ORG_LEVEL)) {
+                //根据下拉框的值获取对应的描述
+                C_JMS_ORG_LEVEL = BaseUtil.getBaseInfoByParm("selectname", "workflow_selectitem", "selectvalue", C_JMS_ORG_LEVEL,
+                        " and fieldid in (select id from workflow_billfield where billid in (select formid from workflow_base where id=" + requestInfo.getWorkflowid() + ") and fieldname='jmszzcj' and viewtype=0)");
+                log.writeLog("------------C_JMS_ORG_LEVEL2：" + C_JMS_ORG_LEVEL);
+                //过滤多语言
+                C_JMS_ORG_LEVEL = Util.formatMultiLang(C_JMS_ORG_LEVEL, "7").split("-")[0];
+                log.writeLog("------------C_JMS_ORG_LEVEL3：" + C_JMS_ORG_LEVEL);
+            } else {
+                C_JMS_ORG_LEVEL = "50";
+            }
+
+
+            String C_LOCATION = Util.null2String(rs.getString("C_LOCATION")); //结算目的地
+            String C_POSITION_SET_ID = "";// 未找到
+            String C_ORG_LEVEL = Util.null2String(rs.getString("C_ORG_LEVEL1")); // 未找到
+            String C_DEPT_CODE = Util.null2String(rs.getString("jmsbm")); // 加盟商编码
+            String C_ORG_GRADE = Util.null2String(rs.getString("C_ORG_GRADE"));// 未找到
+            log.writeLog("------------C_ORG_GRADE：" + C_ORG_GRADE);
+//            String C_COST_CENTER_ID = Util.null2String(rs.getString("C_COST_CENTER_ID")); //所属财务中心公司编码
+            String C_COST_CENTER_ID = ""; //所属财务中心公司编码
+//            String C_MANAGER_ID = weaver.general.Util.null2String(userCodeIdMap.get(rs.getString("C_MANAGER_ID")));// 负责人
+//            String C_MANAGER_ID = "";// 负责人
+            String C_BRCH_LEADR_ID = "";// 未找到
+//            String C_CEO_ID = "";// 未找到
+//            String C_CONTRACT_M_ID = "";// 未找到
+//            String C_MAX_RANK = rs.getString("sqsj");// 未找到
+            paramMap.put("C_APP_SEQ", C_APP_SEQ);
+            paramMap.put("C_APP_DT", C_APP_DT);
+            paramMap.put("C_APPLI_RS", C_APPLI_RS);
+            paramMap.put("EMPLID", EMPLID);
+            paramMap.put("C_ORG_TYPE", C_ORG_TYPE);
+//            paramMap.put("C_ORG_COMPANY",C_ORG_COMPANY);//不从字段取，从查询或者公司创建接口取
+            paramMap.put("C_ORG_EFFDT", C_ORG_EFFDT);
+            paramMap.put("C_ORG_DESCR", C_ORG_DESCR);
+//            paramMap.put("C_ORG_SHORTDESCR",C_ORG_SHORTDESCR);
+            paramMap.put("C_ORG_SHORTDESCR", "");
+            paramMap.put("C_PARENT_ORG", C_PARENT_ORG);
+            paramMap.put("C_LOCATION", C_LOCATION);
+            paramMap.put("C_ORG_GENRE", C_ORG_GENRE);
+            paramMap.put("C_POSITION_SET_ID", C_POSITION_SET_ID);
+            paramMap.put("C_ORG_LEVEL", C_ORG_LEVEL);
+            paramMap.put("C_DEPT_CODE", C_DEPT_CODE);
+            paramMap.put("C_ORG_GRADE", C_ORG_GRADE);
+            paramMap.put("C_COST_CENTER_ID", C_COST_CENTER_ID);
+            paramMap.put("C_MANAGER_ID", "");
+//            paramMap.put("C_CEO_ID", C_CEO_ID);
+//            paramMap.put("C_CONTRACT_M_ID",C_CONTRACT_M_ID);
+            paramMap.put("C_BRCH_LEADR_ID", C_BRCH_LEADR_ID);
+            paramMap.put("C_MAX_RANK", new ArrayList<>());
+            paramMap.put("C_EXPAND", new ArrayList<>());
+            paramMap.put("C_COMP_SUB", new ArrayList<>());
+            paramMap.put("MULT_LANGUAGE", new ArrayList<>());
+            paramMap.put("C_JMS_ORG_LEVEL", C_JMS_ORG_LEVEL);
+
+
+            String token = HttpClientToJT.getToken();
+
+            //查询法人公司 存在就直接取，不存在先新增
+            Map<String, Object> comQueryParamMap = new HashMap<>();
+            comQueryParamMap.put("COMPANY_DESCR", Util.null2String(rs.getString("gsmc")));
+            String comParamStr = JSONObject.toJSONString(comQueryParamMap);
+            log.writeLog("---------开始查询公司------参数：" + comParamStr + "------------");
+            JSONObject comJson = JTHrmApiUtil.companyQuery(token, comParamStr);
+            log.writeLog("---------结束查询公司-----返回结果：" + comJson.toJSONString() + "------------");
+            if (comJson.getInteger("code").equals(1)) {
+                JSONObject comData = comJson.getJSONObject("data");
+                String companyCode = comData.getString("COMPANY");
+                paramMap.put("C_ORG_COMPANY", companyCode);
+            } else {
+                Map<String, Object> comAddParamMap = new HashMap<>();
+                comAddParamMap.put("C_APP_SEQ", "gs-" + C_APP_SEQ);
+                comAddParamMap.put("C_APP_DT", C_APP_DT);
+                comAddParamMap.put("C_APPLI_RS", C_APPLI_RS);
+                comAddParamMap.put("EMPLID", EMPLID);
+                comAddParamMap.put("EFFDT", C_ORG_EFFDT);
+                comAddParamMap.put("DEFAULT_SETID", "JTSD");
+                comAddParamMap.put("COMPANY_DESCR", Util.null2String(rs.getString("gsmc")));
+                comAddParamMap.put("DESCRLONG", Util.null2String(rs.getString("gsmc")));
+                comAddParamMap.put("DESCRSHORT", Util.null2String(rs.getString("gsmc")));
+                comAddParamMap.put("COUNTRY", "CHN");
+                comAddParamMap.put("BUSINESS_UNIT", Util.null2String(rs.getString("ywdw")));//生产
+//                comAddParamMap.put("BUSINESS_UNIT", Util.null2String(rs.getString("BUSINESS_UNIT")));//测试
+                comAddParamMap.put("LOCATION", C_LOCATION);
+                comAddParamMap.put("C_DIRECTLY_FLAG", "0".equals(rs.getString("C_DIRECTLY_FLAG")) ? "Y" : "N");
+                comAddParamMap.put("C_UFSC_CODE", Util.null2String(rs.getString("sh")));
+                comAddParamMap.put("C_COMPANY_LEVEL", "");
+                comAddParamMap.put("C_COMP_SB", new ArrayList<>());
+                comAddParamMap.put("MULT_LANGUAGE", new ArrayList<>());
+                String comAddParamStr = JSONObject.toJSONString(comAddParamMap);
+                log.writeLog("---------开始添加公司------参数：" + comAddParamStr + "------------");
+                JSONObject comAddJson = JTHrmApiUtil.addCompany(token, comAddParamStr);
+                log.writeLog("---------结束添加公司-----返回结果：" + comAddJson.toJSONString() + "------------");
+                if (comAddJson.getInteger("code").equals(1)) {
+                    JSONObject data = comAddJson.getJSONObject("data");
+                    String companyCode = data.getString("COMPANY");
+                    paramMap.put("C_ORG_COMPANY", companyCode);
+                } else {
+                    requestInfo.getRequestManager().setMessagecontent(comAddJson.getString("msg"));
+                    return FAILURE_AND_CONTINUE;
+                }
+            }
+
+
+            String paramStr = JSONObject.toJSONString(paramMap);
+            log.writeLog("---------开始添加加盟商------参数：" + paramStr + "------------");
+            JSONObject json = JTHrmApiUtil.deptAddOrEdit(token, paramStr);
+            log.writeLog("---------添加加盟商返回结果------结果:" + json.toJSONString() + "------------");
+            //添加成功继续添加子部门【职能人员】，固定
+            if (json.getInteger("code").equals(1)) {
+                JSONObject data = json.getJSONObject("data");
+                String deptid = data.getString("DEPTID");
+                log.writeLog("---------加盟商添加成功-----返回加盟商编码：" + deptid + "------------");
+                log.writeLog("---------开始添加职能人员部门----------------");
+                paramMap.put("C_APP_SEQ", C_APP_SEQ + "-01");
+                paramMap.put("C_ORG_TYPE", "20");
+                paramMap.put("C_ORG_GENRE", "20");
+                paramMap.put("C_ORG_LEVEL", "230");
+                paramMap.put("C_ORG_DESCR", "职能人员");
+                paramMap.put("C_DEPT_CODE", "JM01");
+                paramMap.put("C_PARENT_ORG", deptid);
+                paramMap.put("C_POSITION_SET_ID", "100021");//职能人员落地时，岗位集默认100021
+                String paramStr1 = JSONObject.toJSONString(paramMap);
+                log.writeLog("---------开始添加加盟商【职能人员】------参数：" + paramStr1 + "------------");
+                JSONObject json1 = JTHrmApiUtil.deptAddOrEdit(token, paramStr1);
+                log.writeLog("---------开始添加加盟商【职能人员】------参数：" + json1.toJSONString() + "------------");
+                if (!json1.getInteger("code").equals(1)) {
+                    requestInfo.getRequestManager().setMessagecontent(json1.getString("msg"));
+                    return FAILURE_AND_CONTINUE;
+                }
+                JSONObject data1 = json1.getJSONObject("data");
+                String znid = data1.getString("DEPTID");
+                log.writeLog("---------职能人员添加成功-----返回职能人员编码：" + znid + "------------");
+                //将HR部门ID插入流程表单中
+                rs1.execute("update " + mainTable + " set hrbmid='" + znid + "' where requestid='" + requestId + "'");
+            } else {
+                requestInfo.getRequestManager().setMessagecontent(json.getString("msg"));
+                return FAILURE_AND_CONTINUE;
+            }
+            log.writeLog("---------结束添加加盟商-----返回结果：" + json.toJSONString() + "------------");
+            return SUCCESS;
+        }
+        return FAILURE_AND_CONTINUE;
+    }
+
+    public Map<String, String> getUserCodeIdMap() {
+        RecordSet rs = new RecordSet();
+        Map<String, String> map = new HashMap<>();
+        rs.executeQuery("select outkey,loginid,id from hrmresource where loginid is not null ");
+        while (rs.next()) {
+            map.put(rs.getString("id"), rs.getString("loginid"));
+        }
+        return map;
+    }
+
+    public static String getDateTime(String date) {
+        DateTimeFormatter fmt = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm");
+        DateTimeFormatter fmt1 = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+        LocalDateTime localDate = LocalDateTime.parse(date, fmt);
+        String dateStr = localDate.format(fmt1);
+        return dateStr;
+    }
+
+    public static void main(String[] args) {
+        String dateTime = FranchiseeAddAction.getDateTime("2021-08-01 13:22");
+        System.out.println(dateTime);
+    }
+}
+
diff --git a/src/main/youhong_ai_jitu_src/jntchina/action/hrm/JsdAddAction.java b/src/main/youhong_ai_jitu_src/jntchina/action/hrm/JsdAddAction.java
new file mode 100644
index 0000000..01a7b06
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/action/hrm/JsdAddAction.java
@@ -0,0 +1,179 @@
+package jntchina.action.hrm;
+
+import com.alibaba.fastjson.JSONObject;
+import com.working.util.WorkflowUtil;
+import jntchina.util.HttpClientToJT;
+import jntchina.util.JTHrmApiUtil;
+
+import selfdev.util.base.BaseUtil;
+import selfdev.util.log.LogTool;
+import weaver.conn.RecordSet;
+import weaver.general.Util;
+import weaver.interfaces.workflow.action.BaseAction;
+import weaver.soa.workflow.request.RequestInfo;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 新开集散点Action
+ * CYQ
+ *
+ * @date 2021年7月7日 02:18:38
+ */
+public class JsdAddAction extends BaseAction {
+
+    private LogTool log = new LogTool("/log/hrmAction/", false);
+
+    @Override
+    public String execute(RequestInfo requestInfo) {
+        Map<String, String> userCodeIdMap = getUserCodeIdMap();
+        RecordSet rs = new RecordSet();
+        RecordSet rs1 = new RecordSet();
+        String requestId = requestInfo.getRequestid(); //获取requestid
+        log.writeLog("------------requestId值为：" + requestId);
+        String mainTable = WorkflowUtil.getMainTable(requestId);
+        String sql = " select *  from " + mainTable + " where requestid='" + requestId + "'";
+        rs.executeQuery(sql);
+
+        //todo  流程与字段映射
+
+        //C_APP_SEQ		申请单号
+        //C_APP_DT		申请日期
+        //C_APPLI_RS		审批状态
+        //EMPLID		申请人工号
+        //C_ORG_TYPE		组织类别
+        //C_ORG_COMPANY		组织所在公司
+        //C_ORG_EFFDT		组织生效日期
+        //C_ORG_DESCR		组织描述
+        //C_ORG_SHORTDESCR		组织短描述
+        //C_PARENT_ORG		上级组织
+        //C_LOCATION		地点
+        //C_ORG_GENRE		组织类型
+        //C_POSITION_SET_ID		岗位集
+        //C_ORG_LEVEL		组织层级
+        //C_DEPT_CODE		组织代码
+        //C_ORG_GRADE		组织等级
+        //C_COST_CENTER_ID		成本中心
+        //C_MANAGER_ID		组织负责人
+        //C_BRCH_LEADR_ID		分管领导
+        //C_CEO_ID		CEO	CEO
+        //C_CONTRACT_M_ID		合同管理员
+        //C_MAX_RANK		部门最高职级
+//        String sqdh = "";
+        Map<String, Object> paramMap = new HashMap<>();
+        if (rs.next()) {
+            String C_APP_SEQ = rs.getString("lcbh");//流程编号
+            String C_APP_DT = rs.getString("C_APP_DT");//申请时间
+            String C_APPLI_RS = "3";
+            String EMPLID = rs.getString("EMPLID"); //需要处理 - 姓名
+            String C_ORG_TYPE = Util.null2String(rs.getString("C_ORG_TYPE"));//未找到
+            String C_ORG_COMPANY = Util.null2String(rs.getString("C_ORG_COMPANY"));// 未找到
+            String C_ORG_EFFDT = Util.null2String(rs.getString("C_ORG_EFFDT"));//生效日期
+
+            String C_ORG_DESCR = Util.null2String(rs.getString("jsdmc"));// 集散点名称
+            String C_ORG_SHORTDESCR = Util.null2String(rs.getString("jsdjc"));// 集散点简称
+            String C_PARENT_ORG = Util.null2String(rs.getString("C_PARENT_ORG"));// 需要处理 所属代理区
+            //HR最多只能10位，判断长度超出10，则截取前10位
+            if (C_ORG_SHORTDESCR.length() > 10) {
+                C_ORG_SHORTDESCR = C_ORG_SHORTDESCR.substring(0, 10);
+            }
+            if (!"".equals(C_PARENT_ORG)) {
+                sql = "select outkey,id from hrmsubcompany where id = " + C_PARENT_ORG;
+                rs1.executeQuery(sql);
+                rs1.next();
+                C_PARENT_ORG = Util.null2String(rs1.getString("outkey"));
+            } else {
+                requestInfo.getRequestManager().setMessagecontent("上级组织C_PARENT_ORG必传！");
+                return FAILURE_AND_CONTINUE;
+            }
+
+            String C_JMS_ORG_LEVEL = Util.null2String(rs.getString("jmszzcj"));//JMS组织层级
+            log.writeLog("------------C_JMS_ORG_LEVEL：" + C_JMS_ORG_LEVEL);
+            if (!"".equals(C_JMS_ORG_LEVEL)) {
+                //根据下拉框的值获取对应的描述
+                C_JMS_ORG_LEVEL = BaseUtil.getBaseInfoByParm("selectname", "workflow_selectitem", "selectvalue", C_JMS_ORG_LEVEL,
+                        " and fieldid in (select id from workflow_billfield where billid in (select formid from workflow_base where id=" + requestInfo.getWorkflowid() + ") and fieldname='jmszzcj' and viewtype=0)");
+                log.writeLog("------------C_JMS_ORG_LEVEL2：" + C_JMS_ORG_LEVEL);
+                //过滤多语言
+                C_JMS_ORG_LEVEL = Util.formatMultiLang(C_JMS_ORG_LEVEL, "7").split("-")[0];
+                log.writeLog("------------C_JMS_ORG_LEVEL3：" + C_JMS_ORG_LEVEL);
+            } else {
+                C_JMS_ORG_LEVEL = "60";
+            }
+
+
+            String C_LOCATION = Util.null2String(rs.getString("C_LOCATION")); // 详细地址
+            String C_ORG_GENRE = Util.null2String(rs.getString("C_ORG_GENRE"));
+            String C_POSITION_SET_ID = "100042";
+            String C_ORG_LEVEL = Util.null2String(rs.getString("C_ORG_LEVEL1")); // 未找到
+            String C_DEPT_CODE = Util.null2String(rs.getString("jsdbh")); // 集散点编号
+            String C_ORG_GRADE = Util.null2String(rs.getString("C_ORG_GRADE"));// 未找到
+            String C_COST_CENTER_ID = ""; //所属财务中心公司编码
+            String C_MANAGER_ID = Util.null2String(userCodeIdMap.get(rs.getString("C_MANAGER_ID")));// 负责人
+//            String C_MANAGER_ID = "";// 负责人
+            String C_BRCH_LEADR_ID = "";// 未找到
+//            String C_CEO_ID = "";// 未找到
+//            String C_CONTRACT_M_ID = "";// 未找到
+//            String C_MAX_RANK = "";// 未找到
+
+            paramMap.put("C_APP_SEQ", C_APP_SEQ);
+            paramMap.put("C_APP_DT", C_APP_DT);
+            paramMap.put("C_APPLI_RS", C_APPLI_RS);
+            paramMap.put("EMPLID", EMPLID);
+            paramMap.put("C_ORG_TYPE", C_ORG_TYPE);
+            paramMap.put("C_ORG_COMPANY", C_ORG_COMPANY);
+            paramMap.put("C_ORG_EFFDT", C_ORG_EFFDT);
+            paramMap.put("C_ORG_DESCR", C_ORG_DESCR);
+            paramMap.put("C_ORG_SHORTDESCR", C_ORG_SHORTDESCR);
+            paramMap.put("C_PARENT_ORG", C_PARENT_ORG);
+            paramMap.put("C_LOCATION", C_LOCATION);
+            paramMap.put("C_ORG_GENRE", C_ORG_GENRE);
+            paramMap.put("C_POSITION_SET_ID", C_POSITION_SET_ID);
+            paramMap.put("C_ORG_LEVEL", C_ORG_LEVEL);
+            paramMap.put("C_DEPT_CODE", C_DEPT_CODE);
+            paramMap.put("C_ORG_GRADE", C_ORG_GRADE);
+            paramMap.put("C_COST_CENTER_ID", C_COST_CENTER_ID);
+            paramMap.put("C_MANAGER_ID", C_MANAGER_ID);
+            paramMap.put("C_BRCH_LEADR_ID", C_BRCH_LEADR_ID);
+            paramMap.put("C_JMS_ORG_LEVEL", C_JMS_ORG_LEVEL);//JMS组织层级;
+//            paramMap.put("C_CEO_ID",C_CEO_ID);
+//            paramMap.put("C_CONTRACT_M_ID",C_CONTRACT_M_ID);
+            paramMap.put("C_MAX_RANK", new ArrayList<>());
+            paramMap.put("C_EXPAND", new ArrayList<>());
+            paramMap.put("C_COMP_SUB", new ArrayList<>());
+            paramMap.put("MULT_LANGUAGE", new ArrayList<>());
+            String token = HttpClientToJT.getToken();
+            String paramStr = JSONObject.toJSONString(paramMap);
+            log.writeLog("---------开始添加集散点------参数：" + paramStr + "------------");
+            JSONObject json = JTHrmApiUtil.deptAddOrEdit(token, paramStr);
+            log.writeLog("---------结束添加集散点-----返回结果：" + json.toJSONString() + "------------");
+            if (json.getInteger("code").equals(1)) {
+                JSONObject data = json.getJSONObject("data");
+                String deptid = data.getString("DEPTID");
+                log.writeLog("HR deptid------------>" + deptid);
+                //将HR部门ID插入流程表单中
+                rs1.execute("update " + mainTable + " set hrbmid='" + deptid + "' where requestid='" + requestId + "'");
+            } else {
+                requestInfo.getRequestManager().setMessageid("111100");
+                requestInfo.getRequestManager().setMessagecontent(json.getString("msg"));
+                return FAILURE_AND_CONTINUE;
+            }
+
+            return SUCCESS;
+        }
+        return FAILURE_AND_CONTINUE;
+    }
+
+    public Map<String, String> getUserCodeIdMap() {
+        RecordSet rs = new RecordSet();
+        Map<String, String> map = new HashMap<>();
+        rs.executeQuery("select outkey,loginid,id from hrmresource where loginid is not null ");
+        while (rs.next()) {
+            map.put(rs.getString("id"), rs.getString("loginid"));
+        }
+        return map;
+    }
+
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/action/hrm/OnetimeSalaryPayAction.java b/src/main/youhong_ai_jitu_src/jntchina/action/hrm/OnetimeSalaryPayAction.java
new file mode 100644
index 0000000..313a2c3
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/action/hrm/OnetimeSalaryPayAction.java
@@ -0,0 +1,138 @@
+package jntchina.action.hrm;
+
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.serializer.SerializerFeature;
+import com.working.util.WorkflowUtil;
+import jntchina.util.HttpClientToDC;
+import jntchina.util.HttpClientToJT;
+import jntchina.util.JTHrmApiUtil;
+import selfdev.util.base.BaseUtil;
+import selfdev.util.log.LogTool;
+import weaver.conn.RecordSet;
+import weaver.general.Util;
+import weaver.soa.workflow.request.RequestInfo;
+import weaver.workflow.action.BaseAction;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 一次性薪资发放数据传入HR系统
+ * @author KangMD
+ * 2022-04-09
+ */
+public class OnetimeSalaryPayAction extends BaseAction {
+
+    @Override
+    public String execute(RequestInfo requestInfo) {
+        LogTool log = new LogTool("/log/selfdev/action/hrm", false);
+        String requestId = requestInfo.getRequestid(); //获取requestid
+        log.writeLog("--------一次性薪资发放数据传入HR----requestId值为：" + requestId);
+        RecordSet rs = new RecordSet();
+        //获取表名
+        String mainTable = WorkflowUtil.getMainTable(requestId);
+        try{
+
+            String mainid = ""; //
+            String sqdh = ""; //申请单号
+            String sqrxm = ""; //申请人姓名
+            String sqrgh = ""; //申请人工号
+            String sqrq = ""; //申请日期
+            String sqsm = ""; //申请说明
+
+            String sql = " select *  from " + mainTable + " where requestid='" + requestId + "'";
+            rs.execute(sql);
+            while (rs.next()) {
+                mainid=Util.null2String(rs.getString("id"));
+                sqdh=Util.null2String(rs.getString("sqdh"));
+                sqrxm=Util.null2String(rs.getString("sqrxm"));
+                sqrgh=Util.null2String(rs.getString("sqrgh"));
+                sqrq=Util.null2String(rs.getString("sqrq"));
+                sqsm=Util.null2String(rs.getString("sqsm"));
+            }
+            //若工号为空（例如字段联动未生效时），则根据姓名再次查询
+            if("".equals(sqrgh)){
+                sqrgh= BaseUtil.getBaseInfoByParm("workcode","hrmresource","id",sqrxm,"");
+            }
+            //明细数据list
+            List<Map<String,String>> list=new ArrayList<Map<String,String>>();
+            //查询明细
+            sql = " select *  from " + mainTable + "_dt1 where mainid='" + mainid + "'";
+            rs.execute(sql);
+            while (rs.next()) {
+                Map<String, String> detailMap=new HashMap<String, String>();
+                String yggh=Util.null2String(rs.getString("yggh"));//员工工号
+                String jclx=Util.null2String(rs.getString("jclx"));//奖惩类型
+                String rlid=Util.null2String(rs.getString("rlid"));//日历ID
+                String xzzid=Util.null2String(rs.getString("xzzid"));//薪资组ID
+                String jcje=Util.null2o(rs.getString("jcje"));//奖惩金额
+                detailMap.put("EMPLID2",yggh);//奖惩员工编码
+                detailMap.put("CAL_ID",rlid);//日历ID
+                detailMap.put("C_PI_CODE",jclx);//奖惩类型编码
+                detailMap.put("C_PI_AMOUNT",jcje);//奖惩金额
+                detailMap.put("GP_PAYGROUP",xzzid);//薪资组ID
+                list.add(detailMap);
+            }
+            Map<String, Object> map=new HashMap<String, Object>();
+            map.put("C_APP_OA_SEQ",sqdh);//OA单据审批单号
+            map.put("C_APP_DT",sqrq);//单据申请日期
+            map.put("C_APPLI_RS","3");//单据状态；3-审批通过；4-审批拒绝
+            map.put("EMPLID",sqrgh);//申请人编码
+            map.put("DESCRLONG",sqsm);//说明
+            map.put("DATA",list);//明细数据
+            //将传入参数map转成字符串
+            String strParm = JSONObject.toJSONString(map, SerializerFeature.DisableCircularReferenceDetect);
+            log.writeLog("传入参数----------------->"+strParm);
+            //获取URL地址
+            String url = HttpClientToJT.baseUrl + JTHrmApiUtil.oneTimeSalaryPayUrl;
+            //获取Token
+            String token = HttpClientToDC.getToken();
+            log.writeLog("一次性薪资发放token------>" + token);
+            log.writeLog("一次性薪资发放url------>" + url);
+            //调用接口
+            String returndata = HttpClientToDC.sendPostApi(url,token,strParm);
+            log.writeLog("【调用数据中台一次性薪资发放接口返回结果:】" + returndata);
+            String sfcgxrhr="0";//是否成功写入HR
+            String hrdh="";//HR单号
+            String jkfhxx="";//接口返回信息
+            if (!"".equals(returndata) && returndata != null) {
+                JSONObject jsonObject = JSONObject.parseObject(returndata);
+                String code = Util.null2String(jsonObject.get("code"));//接口状态码
+                if ("1".equals(code)) {
+                    JSONObject data = jsonObject.getJSONObject("data");
+                    hrdh = Util.null2String(data.get("C_APP_SEQ"));//HR单号
+                    jkfhxx = Util.null2String(data.get("msg"));//接口返回信息
+                }else{
+                    sfcgxrhr="1";
+                    jkfhxx = Util.null2String(jsonObject.get("msg"));//接口状态码
+                }
+                log.writeLog("--------发送请求返回的code值为：" + code);
+                log.writeLog("--------发送请求返回的hrdh值为：" + hrdh);
+                log.writeLog("--------发送请求返回的msg值为：" + jkfhxx);
+            }else {
+                sfcgxrhr="1";
+                jkfhxx="调用接口返回值为空";
+            }
+            //将返回结果回写至OA流程表单
+            sql=" update " + mainTable + " set sfcgxrhr = "+sfcgxrhr+" ,hrdh = '"+hrdh+"' ,jkfhxx='" + jkfhxx.replace("'", "''") + "'  where requestid = " + requestId;
+            log.writeLog("将返回结果回写至OA流程表单SQL------>"+sql);
+
+            rs.execute(sql);
+            if("1".equals(sfcgxrhr)){
+                requestInfo.getRequestManager().setMessageid("111100");
+                requestInfo.getRequestManager().setMessagecontent("数据传HR失败，错误信息："+jkfhxx);
+                return "0";
+            }
+        }catch (Exception e){
+            String ermsg="流程数据生成中台借款单失败,失败信息：<br/>" + e.toString();
+            //将返回结果回写至OA流程表单
+            rs.execute(" update " + mainTable + " set sfcgxrhr = 1 ,hrdh = '',jkfhxx='" + ermsg.replace("'", "''") + "'  where requestid = " + requestId);
+            requestInfo.getRequestManager().setMessageid("111100");
+            requestInfo.getRequestManager().setMessagecontent(ermsg);
+            return "0";
+        }
+        return SUCCESS;
+    }
+}
\ No newline at end of file
diff --git a/src/main/youhong_ai_jitu_src/jntchina/action/hrm/OrganizationAddAction.java b/src/main/youhong_ai_jitu_src/jntchina/action/hrm/OrganizationAddAction.java
new file mode 100644
index 0000000..56da9a1
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/action/hrm/OrganizationAddAction.java
@@ -0,0 +1,116 @@
+package jntchina.action.hrm;
+
+import com.alibaba.fastjson.JSONObject;
+import com.working.util.WorkflowUtil;
+import jntchina.util.HttpClientToJT;
+import jntchina.util.JTHrmApiUtil;
+import selfdev.util.log.LogTool;
+import weaver.conn.RecordSet;
+import weaver.general.Util;
+import weaver.interfaces.workflow.action.BaseAction;
+import weaver.soa.workflow.request.RequestInfo;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 组织新增Action
+ * CYQ
+ *
+ * @date 2021年7月7日 02:18:38
+ */
+public class OrganizationAddAction extends BaseAction {
+
+    private LogTool log = new LogTool("/log/hrmAction/", false);
+
+    private final static Map<String, String> C_COMPANY_LEVEL_MAP = new HashMap<>();
+
+    static {
+        C_COMPANY_LEVEL_MAP.put("0", "10");
+        C_COMPANY_LEVEL_MAP.put("1", "20");
+        C_COMPANY_LEVEL_MAP.put("2", "30");
+        C_COMPANY_LEVEL_MAP.put("3", "40");
+        C_COMPANY_LEVEL_MAP.put("4", "50");
+    }
+
+    @Override
+    public String execute(RequestInfo requestInfo) {
+
+        //todo  流程与字段映射
+        RecordSet rs = new RecordSet();
+        String requestId = requestInfo.getRequestid(); //获取requestid
+        log.writeLog("------------requestId值为：" + requestId);
+        String mainTable = WorkflowUtil.getMainTable(requestId);
+        String sql = " select *  from " + mainTable + " where requestid='" + requestId + "'";
+        rs.executeQuery(sql);
+        Map<String, Object> paramMap = new HashMap<String, Object>();
+        if (rs.next()) {
+//            C_APP_SEQ		申请单号
+//            C_APP_DT		申请日期
+//            C_APPLI_RS		审批状态
+//            EMPLID		申请人工号
+//            EFFDT		生效日期
+//            DEFAULT_SETID		默认集合ID
+//            COMPANY_DESCR		公司名称
+//            DESCRLONG		公司名称详细描述
+//            DESCRSHORT		公司简短描述
+//            COUNTRY		国家地区
+//            BUSINESS_UNIT		业务单位代码
+//            LOCATION		地点代码
+//            C_DIRECTLY_FLAG		是否自营
+//            C_UFSC_CODE		统一社会信用代码
+//            C_COMPANY_LEVEL		公司级别
+            String C_APP_SEQ = Util.null2String(rs.getString("C_APP_SEQ"));//申请单号
+            String C_APP_DT = Util.null2String(rs.getString("C_APP_DT"));//申请日期
+            String C_APPLI_RS = "3";//审批状态
+            String EMPLID = Util.null2String(rs.getString("EMPLID"));//申请人工号
+            String EFFDT = Util.null2String(rs.getString("EFFDT"));//生效日期
+            String DEFAULT_SETID = "JT01";//默认集合ID
+            String COMPANY_DESCR = Util.null2String(rs.getString("COMPANY_DESCR"));//公司名称
+            String DESCRLONG = Util.null2String(rs.getString("COMPANY_DESCR"));//公司名称详细描述
+            String DESCRSHORT = Util.null2String(rs.getString("DESCRSHORT"));//公司简短描述
+            String COUNTRY = Util.null2String(rs.getString("COUNTRY"));//国家地区
+            String BUSINESS_UNIT = Util.null2String(rs.getString("BUSINESS_UNIT"));//业务单位代码
+            String LOCATION = Util.null2String(rs.getString("LOCATION"));//地点代码
+            String C_DIRECTLY_FLAG = "0".equals(rs.getString("C_DIRECTLY_FLAG")) ? "Y" : "N";//是否自营
+            String C_UFSC_CODE = Util.null2String(rs.getString("C_UFSC_CODE"));//统一社会信用代码
+            String C_COMPANY_LEVEL = Util.null2String(C_COMPANY_LEVEL_MAP.get(rs.getString("C_COMPANY_LEVEL")));//下拉框-公司级别
+//            String C_SB_LOC_ID = Util.null2String(rs.getString("C_SB_LOC_ID"));// 社保缴纳地ID
+
+            //主表 formtable_main_1581
+            paramMap.put("C_APP_SEQ", C_APP_SEQ);
+            paramMap.put("C_APP_DT", C_APP_DT);
+            paramMap.put("C_APPLI_RS", C_APPLI_RS);
+            paramMap.put("EMPLID", EMPLID);
+            paramMap.put("EFFDT", EFFDT);
+            paramMap.put("DEFAULT_SETID", DEFAULT_SETID);
+            paramMap.put("COMPANY_DESCR", COMPANY_DESCR);
+            paramMap.put("DESCRLONG", DESCRLONG);
+            paramMap.put("DESCRSHORT", DESCRSHORT);
+            paramMap.put("COUNTRY", COUNTRY);
+            paramMap.put("BUSINESS_UNIT", BUSINESS_UNIT);
+            paramMap.put("LOCATION", LOCATION);
+            paramMap.put("C_DIRECTLY_FLAG", C_DIRECTLY_FLAG);
+            paramMap.put("C_UFSC_CODE", C_UFSC_CODE);
+            paramMap.put("C_COMPANY_LEVEL", C_COMPANY_LEVEL);
+            paramMap.put("C_COMP_SB", new ArrayList<>());
+            paramMap.put("MULT_LANGUAGE", new ArrayList<>());
+
+            String token = HttpClientToJT.getToken();
+            String paramStr = JSONObject.toJSONString(paramMap);
+            log.writeLog("---------开始添加公司------参数：" + paramStr + "------------");
+            JSONObject json = JTHrmApiUtil.addCompany(token, paramStr);
+            log.writeLog("---------结束添加公司-----返回结果：" + json.toJSONString() + "------------");
+            if (json.getInteger("code").equals(1)) {
+                JSONObject data = json.getJSONObject("data");
+            } else {
+                requestInfo.getRequestManager().setMessagecontent(json.getString("msg"));
+                return FAILURE_AND_CONTINUE;
+            }
+
+            return SUCCESS;
+        }
+        return FAILURE_AND_CONTINUE;
+    }
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/action/hrm/postAddAction.java b/src/main/youhong_ai_jitu_src/jntchina/action/hrm/postAddAction.java
new file mode 100644
index 0000000..dca1b2b
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/action/hrm/postAddAction.java
@@ -0,0 +1,147 @@
+package jntchina.action.hrm;
+
+import com.alibaba.fastjson.JSONObject;
+import com.working.util.WorkflowUtil;
+import jntchina.util.HttpClientToJT;
+import jntchina.util.JTHrmApiUtil;
+import org.apache.commons.lang3.StringUtils;
+import selfdev.util.log.LogTool;
+import weaver.conn.RecordSet;
+import weaver.interfaces.workflow.action.BaseAction;
+import weaver.soa.workflow.request.RequestInfo;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 岗位新增Action
+ * CYQ
+ *
+ * @date 2021年7月17日 02:18:38
+ */
+public class postAddAction extends BaseAction {
+
+    private LogTool log = new LogTool("/log/hrmAction/", false);
+
+    @Override
+    public String execute(RequestInfo requestInfo) {
+        RecordSet rs = new RecordSet();
+        String requestId = requestInfo.getRequestid(); //获取requestid
+        log.writeLog("------------requestId值为：" + requestId);
+        String mainTable = WorkflowUtil.getMainTable(requestId);
+        String sql = " select *  from " + mainTable + " where requestid='" + requestId + "'";
+        rs.executeQuery(sql);
+        Map<String, String> standardParamMap = new HashMap<String, String>();
+        Map<String, String> paramMap = new HashMap<String, String>();
+
+        if (rs.next()) {
+            //1.先添加 标准岗位
+//        C_APP_SEQ 		申请单号
+//        C_APP_DT		申请日期
+//        EMPLID		申请人工号
+//        EFFDT		生效日期
+//        DESCR		标准岗位描述
+//        DESCRSHORT		标准岗位短描述
+//        C_POSITION_ID		岗编码 默认
+//        C_RANK_TYPE		职级类型
+//        C_POSN_GRDE_ID_MAX		最高职级
+//        C_POSN_GRDE_ID_MIN		最低职级
+//        C_POSN_PROPERTY		岗属性
+//        C_POSN_DUTY		岗位职责
+//        C_JOB_REQMENT		任职要求
+//        C_APP_RESOAN		申请原因
+//        DEPTID		部门ID
+//        REG_REGION		管理区域
+            String C_APP_SEQ = rs.getString("C_APP_SEQ");//流程编号
+            String C_APP_DT = rs.getString("C_APP_DT");//申请日期
+            String EMPLID = rs.getString("EMPLID");//申请人工号
+            String EFFDT = rs.getString("EFFDT");//生效日期
+            String DESCR = rs.getString("DESCR");//标准岗位描述
+            String DESCRSHORT = rs.getString("DESCRSHORT");//标准岗位短描述
+            String C_POSITION_ID = rs.getString("C_APP_SEQ");//岗编码-默认
+            String C_RANK_TYPE = rs.getString("C_RANK_TYPE");//职级类型
+            String C_POSN_GRDE_ID_MAX = rs.getString("C_POSN_GRDE_ID_MAX");//最高职级
+            String C_POSN_GRDE_ID_MIN = rs.getString("C_POSN_GRDE_ID_MIN");//最低职级
+            String C_POSN_PROPERTY = rs.getString("C_POSN_PROPERTY");//岗属性
+            String C_POSN_DUTY = rs.getString("C_POSN_DUTY");//岗位职责
+            String C_JOB_REQMENT = rs.getString("C_JOB_REQMENT");//任职要求
+            String C_APP_RESOAN = rs.getString("C_APP_RESOAN");//申请原因
+            String DEPTID = rs.getString("DEPTID");//部门ID
+            String REG_REGION = rs.getString("REG_REGION");//需要处理-管理区域
+
+            standardParamMap.put("C_APP_SEQ", C_APP_SEQ);
+            standardParamMap.put("C_APP_DT", C_APP_DT);
+            standardParamMap.put("EMPLID", EMPLID);
+            standardParamMap.put("EFFDT", EFFDT);
+            standardParamMap.put("DESCR", DESCR);
+            standardParamMap.put("DESCRSHORT", DESCRSHORT);
+            standardParamMap.put("C_POSITION_ID", C_POSITION_ID);
+            standardParamMap.put("C_RANK_TYPE", C_RANK_TYPE);
+            standardParamMap.put("C_POSN_GRDE_ID_MAX", C_POSN_GRDE_ID_MAX);
+            standardParamMap.put("C_POSN_GRDE_ID_MIN", C_POSN_GRDE_ID_MIN);
+            standardParamMap.put("C_POSN_PROPERTY", C_POSN_PROPERTY);
+            standardParamMap.put("C_POSN_DUTY", C_POSN_DUTY);
+            standardParamMap.put("C_JOB_REQMENT", C_JOB_REQMENT);
+            standardParamMap.put("C_APP_RESOAN", C_APP_RESOAN);
+            standardParamMap.put("DEPTID", DEPTID);
+            standardParamMap.put("REG_REGION", REG_REGION);
+
+
+            //2.再添加 岗位
+            //C_APP_SEQ		申请单号
+            //C_APP_DT		申请日期
+            //C_APPLI_RS		审批状态
+            //EMPLID		申请人工号
+            //EFFDT		生效日期
+            //C_STD_POSN_ID		标准岗位编码
+            //DESCR		岗位描述
+            //DESCRSHORT		岗位短描述
+            //C_POSN_DUTY		岗位职责
+            //C_JOB_REQMENT		任职要求
+            //C_APP_RESOAN		申请原因
+            //DEPTID		部门ID
+            //REG_REGION		管理区域
+            String C_APPLI_RS = "3";//审批状态
+            String C_STD_POSN_ID = rs.getString("C_STD_POSN_ID");//标准岗位编码
+
+            paramMap.put("C_APP_SEQ", C_APP_SEQ);
+            paramMap.put("C_APP_DT", C_APP_DT);
+            paramMap.put("C_APPLI_RS", C_APPLI_RS);
+            paramMap.put("EMPLID", EMPLID);
+            paramMap.put("EFFDT", EFFDT);
+            paramMap.put("DESCR", DESCR);
+            paramMap.put("DESCRSHORT", DESCRSHORT);
+            paramMap.put("C_POSITION_ID", C_POSITION_ID);
+            paramMap.put("C_STD_POSN_ID", C_STD_POSN_ID);
+            paramMap.put("C_RANK_TYPE", C_RANK_TYPE);
+            paramMap.put("C_POSN_GRDE_ID_MAX", C_POSN_GRDE_ID_MAX);
+            paramMap.put("C_POSN_GRDE_ID_MIN", C_POSN_GRDE_ID_MIN);
+            paramMap.put("C_POSN_PROPERTY", C_POSN_PROPERTY);
+            paramMap.put("C_POSN_DUTY", C_POSN_DUTY);
+            paramMap.put("C_JOB_REQMENT", C_JOB_REQMENT);
+            paramMap.put("C_APP_RESOAN", C_APP_RESOAN);
+            paramMap.put("DEPTID", DEPTID);
+            paramMap.put("REG_REGION", REG_REGION);
+
+            String token = HttpClientToJT.getToken();
+            String standardParamStr = JSONObject.toJSONString(standardParamMap);
+            log.writeLog("---------开始标准岗位------参数：" + standardParamStr + "------------");
+            JSONObject json = JTHrmApiUtil.stdPostApply(token, standardParamStr);
+            if (json.getInteger("code").equals(1)) {
+                JSONObject data = json.getJSONObject("data");
+            } else {
+                requestInfo.getRequestManager().setMessagecontent(json.getString("msg"));
+                return FAILURE_AND_CONTINUE;
+            }
+            log.writeLog("---------结束标准岗位-----返回结果：" + json.toJSONString() + "------------");
+            String paramStr = JSONObject.toJSONString(paramMap);
+            log.writeLog("---------开始添加岗位------参数：" + paramStr + "------------");
+            JSONObject companyCode = JTHrmApiUtil.postApplication(token, paramStr);
+            log.writeLog("---------结束添加岗位-----返回结果：" + companyCode + "------------");
+
+            return SUCCESS;
+        }
+        return FAILURE_AND_CONTINUE;
+    }
+
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/action/ncc/CDUpdateToModelAction.java b/src/main/youhong_ai_jitu_src/jntchina/action/ncc/CDUpdateToModelAction.java
new file mode 100644
index 0000000..029661b
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/action/ncc/CDUpdateToModelAction.java
@@ -0,0 +1,62 @@
+package jntchina.action.ncc;
+
+import jntchina.util.DataBaseUtils;
+import selfdev.util.log.LogTool;
+import weaver.conn.RecordSet;
+import weaver.interfaces.workflow.action.BaseAction;
+import weaver.soa.workflow.request.RequestInfo;
+
+import java.util.ArrayList;
+import java.util.Map;
+
+/**
+ * @title: 冲抵更新到建模台账
+ * @Author ycf
+ * @Date: 2022/4/7 11:51
+ * @Version 1.0
+ */
+public class CDUpdateToModelAction extends BaseAction {
+    LogTool log = new LogTool("/log/action/NCC", false);
+
+    @Override
+    public String execute(RequestInfo requestInfo) {
+        try {
+            log.writeLog("--------------------------------冲抵金额更新到建模---------------------------------------");
+            RecordSet recordSet = new RecordSet();
+            String requestid = requestInfo.getRequestid();
+            //判断当前流程是否存在
+            String sql = "select id from uf_jktz_dt1 where xglc = " + requestid;
+            String value = DataBaseUtils.getFirstValue(sql);
+            if ("".equals(value)) {
+                ArrayList<Map<String, String>> dtList = DataBaseUtils.getProcessData(requestInfo, 2);
+                //明细表循环校验
+                for (Map<String, String> dtmap : dtList) {
+                    log.writeLog("本次冲抵金额【" + dtmap.get("CDJE") + "】剩余未还款金额【" + dtmap.get("SYWHKJE") + "】");
+                    //借款台账ID
+                    String tzId = dtmap.get("JKLC");
+                    //更新本次还款金额
+                    sql = "update uf_jktz set YCDJE = (nvl(YCDJE,0) + " + dtmap.get("CDJE") + ") where id = '" + tzId + "'";
+                    recordSet.execute(sql);
+                    log.writeLog("更新本次还款金额:" + sql);
+
+
+                    //更新剩余未还款金额
+                    sql = "update UF_JKTZ set WHKJE = nvl(JKJE, 0) - nvl(YHKJE, 0) - nvl(YCDJE, 0) where id='" + tzId + "' ";
+                    recordSet.execute(sql);
+                    log.writeLog("更新剩余未还款金额:" + sql);
+
+                    //插入到台账明细中
+                    sql = "insert into UF_JKTZ_DT1 ( mainid, xglc, hkje,  bz) values " +
+                            "(" + tzId + ",'" + requestid + "','" + dtmap.get("CDJE") + "','" + dtmap.get("BZ") + "')";
+                    recordSet.execute(sql);
+                    log.writeLog("插入台账明细:" + sql);
+                }
+            }
+            return SUCCESS;
+        } catch (Exception e) {
+            log.writeLog("错误信息:" + DataBaseUtils.getExceptionDetail(e));
+            requestInfo.getRequestManager().setMessagecontent("错误信息" + e);
+            return FAILURE_AND_CONTINUE;
+        }
+    }
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/action/ncc/CheckChongdiJinEAction.java b/src/main/youhong_ai_jitu_src/jntchina/action/ncc/CheckChongdiJinEAction.java
new file mode 100644
index 0000000..96a765f
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/action/ncc/CheckChongdiJinEAction.java
@@ -0,0 +1,66 @@
+package jntchina.action.ncc;
+
+import jntchina.util.DataBaseUtils;
+import selfdev.util.log.LogTool;
+import weaver.general.Util;
+import weaver.interfaces.workflow.action.BaseAction;
+import weaver.soa.workflow.request.RequestInfo;
+
+import java.util.ArrayList;
+import java.util.Map;
+
+/**
+ * @title: 检查冲抵金额
+ * @Author ycf
+ * @Date: 2022/4/7 11:16
+ * @Version 1.0
+ */
+public class CheckChongdiJinEAction extends BaseAction {
+    LogTool log = new LogTool("/log/action/NCC", false);
+
+    @Override
+    public String execute(RequestInfo requestInfo) {
+        try {
+            log.writeLog("--------------------------------检查冲抵金额---------------------------------------");
+            ArrayList<Map<String, String>> dtList = DataBaseUtils.getProcessData(requestInfo, 2);
+            Map<String, String> mainMap = DataBaseUtils.getProcessData(requestInfo);
+
+            if (!"".equals(Util.null2String(mainMap.get("CDJE"))) && !"".equals(Util.null2String(mainMap.get("BXJE")))) {
+
+                double cdje = Double.parseDouble(Util.null2String(mainMap.get("CDJE")));
+                double bxje = Double.parseDouble(Util.null2String(mainMap.get("BXJE")));
+                if (cdje > bxje) {
+                    requestInfo.getRequestManager().setMessagecontent("本次冲抵金额【" + cdje + "】不能大于报销金额【" + bxje + "】");
+                    return FAILURE_AND_CONTINUE;
+                }
+
+            }
+
+            ArrayList<String> list = new ArrayList<>();
+            //明细表循环校验
+            for (Map<String, String> dtmap : dtList) {
+                //校验是否存在多行明细引用一条流程
+                if (list.contains(dtmap.get("JKLC"))) {
+                    requestInfo.getRequestManager().setMessagecontent("冲抵明细中请勿选择重复的借款流程");
+                    return FAILURE_AND_CONTINUE;
+                }
+                list.add(dtmap.get("JKLC"));
+
+                log.writeLog("冲抵明细借款流程编号【" + dtmap.get("JKLCBH") + "】中本次冲抵金额【" + dtmap.get("CDJE") + "】剩余未还款金额【" + dtmap.get("SYWHKJE") + "】");
+                if (Double.parseDouble(dtmap.get("CDJE")) < 0) {
+                    requestInfo.getRequestManager().setMessagecontent("冲抵明细借款流程编号【" + dtmap.get("JKLCBH") + "】中本次冲抵金额【" + dtmap.get("CDJE") + "】不能小于或等于0");
+                    return FAILURE_AND_CONTINUE;
+                }
+                if (Double.parseDouble(dtmap.get("CDJE")) > Double.parseDouble(dtmap.get("SYWHKJE"))) {
+                    requestInfo.getRequestManager().setMessagecontent("冲抵明细借款流程编号【" + dtmap.get("JKLCBH") + "】中本次冲抵金额【" + dtmap.get("CDJE") + "】不能大于剩余未还款金额【" + dtmap.get("SYWHKJE") + "】");
+                    return FAILURE_AND_CONTINUE;
+                }
+            }
+            return SUCCESS;
+        } catch (Exception e) {
+            log.writeLog("错误信息:" + DataBaseUtils.getExceptionDetail(e));
+            requestInfo.getRequestManager().setMessagecontent("错误信息" + e);
+            return FAILURE_AND_CONTINUE;
+        }
+    }
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/action/ncc/CheckHuanKuanJineAction.java b/src/main/youhong_ai_jitu_src/jntchina/action/ncc/CheckHuanKuanJineAction.java
new file mode 100644
index 0000000..e7bbacb
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/action/ncc/CheckHuanKuanJineAction.java
@@ -0,0 +1,52 @@
+package jntchina.action.ncc;
+
+import jntchina.util.DataBaseUtils;
+import selfdev.util.log.LogTool;
+import weaver.interfaces.workflow.action.BaseAction;
+import weaver.soa.workflow.request.RequestInfo;
+
+import java.util.ArrayList;
+import java.util.Map;
+
+/**
+ * @title: 检查还款金额
+ * @Author ycf
+ * @Date: 2022/4/7 11:16
+ * @Version 1.0
+ */
+public class CheckHuanKuanJineAction  extends BaseAction {
+    LogTool log = new LogTool("/log/action/NCC", false);
+    @Override
+    public String execute(RequestInfo requestInfo) {
+        try {
+            log.writeLog("--------------------------------检查还款金额---------------------------------------");
+            ArrayList<Map<String, String>> dtList = DataBaseUtils.getProcessData(requestInfo, 1);
+
+            ArrayList<String> list = new ArrayList<>();
+            //明细表循环校验
+            for (Map<String, String> dtmap : dtList) {
+                //校验是否存在多行明细引用一条流程
+                if (list.contains(dtmap.get("XGJKLC"))) {
+                    requestInfo.getRequestManager().setMessagecontent("相关借款流程还款重复");
+                    return FAILURE_AND_CONTINUE;
+                }
+                list.add(dtmap.get("XGJKLC"));
+
+                log.writeLog("本次还款金额【"+dtmap.get("BCHKJE")+"】剩余未还款金额【"+dtmap.get("SYJE")+"】");
+                if (Double.parseDouble(dtmap.get("BCHKJE")) < 0) {
+                    requestInfo.getRequestManager().setMessagecontent("本次还款金额【"+dtmap.get("BCHKJE")+"】不能小于或等于0");
+                    return FAILURE_AND_CONTINUE;
+                }
+                if (Double.parseDouble(dtmap.get("BCHKJE")) > Double.parseDouble(dtmap.get("SYJE"))) {
+                    requestInfo.getRequestManager().setMessagecontent("本次还款金额【"+dtmap.get("BCHKJE")+"】不能大于剩余未还款金额【"+dtmap.get("SYJE")+"】");
+                    return FAILURE_AND_CONTINUE;
+                }
+            }
+            return SUCCESS;
+        } catch (Exception e) {
+            log.writeLog("错误信息:"+ DataBaseUtils.getExceptionDetail(e));
+            requestInfo.getRequestManager().setMessagecontent("错误信息"+e);
+            return FAILURE_AND_CONTINUE;
+        }
+    }
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/action/ncc/CheckHxJeAction.java b/src/main/youhong_ai_jitu_src/jntchina/action/ncc/CheckHxJeAction.java
new file mode 100644
index 0000000..416ac4b
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/action/ncc/CheckHxJeAction.java
@@ -0,0 +1,37 @@
+package jntchina.action.ncc;
+
+import jntchina.util.DataBaseUtils;
+import weaver.interfaces.workflow.action.BaseAction;
+import weaver.soa.workflow.request.RequestInfo;
+
+import java.util.ArrayList;
+import java.util.Map;
+
+/**
+ * @title: CheckHxJeAction
+ * @Author ycf
+ * @Date: 2022/5/30 13:56
+ * @Version 1.0
+ */
+public class CheckHxJeAction extends BaseAction {
+    @Override
+    public String execute(RequestInfo requestInfo) {
+
+        try {
+            ArrayList<Map<String, String>> processData = DataBaseUtils.getProcessData(requestInfo, 1);
+            for (Map<String, String> map : processData) {
+                double bchxje = Double.parseDouble(map.get("BCHXJE"));
+                double fpje = Double.parseDouble(map.get("FPJE").equals("") ? "0" : map.get("FPJE"));
+                if (fpje > 0 && bchxje > fpje) {
+                    requestInfo.getRequestManager().setMessagecontent("本次核销金额【" + bchxje + "】需<=发票金额【" + fpje + "】");
+                    return FAILURE_AND_CONTINUE;
+                }
+            }
+        } catch (Exception e) {
+            System.out.println(DataBaseUtils.getExceptionDetail(e));
+            requestInfo.getRequestManager().setMessagecontent("错误信息" + e);
+            return FAILURE_AND_CONTINUE;
+        }
+        return SUCCESS;
+    }
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/action/ncc/CheckSjAction.java b/src/main/youhong_ai_jitu_src/jntchina/action/ncc/CheckSjAction.java
new file mode 100644
index 0000000..7150d43
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/action/ncc/CheckSjAction.java
@@ -0,0 +1,58 @@
+package jntchina.action.ncc;
+
+import jntchina.util.DataBaseUtils;
+import selfdev.util.log.LogTool;
+import weaver.conn.RecordSet;
+import weaver.interfaces.workflow.action.BaseAction;
+import weaver.soa.workflow.request.RequestInfo;
+
+import java.util.ArrayList;
+import java.util.Map;
+
+/**
+ * @title: 检查司机是否重复
+ * @Author ycf
+ * @Date: 2022/5/18 09:57
+ * @Version 1.0
+ */
+public class CheckSjAction  extends BaseAction {
+    LogTool log = new LogTool("/log/action/NCC", false);
+    @Override
+    public String execute(RequestInfo requestInfo) {
+
+        try {
+
+            //获取主表数据
+            Map<String, String> mainMap = DataBaseUtils.getProcessData(requestInfo);
+            //获取明细表数据
+            ArrayList<Map<String, String>> dt5List = DataBaseUtils.getProcessData(requestInfo, 5);
+            //用于校验的list
+            ArrayList<String> list = new ArrayList<>();
+            //判断司机编码是否重复存在
+            for (Map<String, String> map : dt5List) {
+                if (list.contains(map.get("SJBM"))) {
+                    requestInfo.getRequestManager().setMessagecontent("报销明细中请勿选择重复【"+map.get("SJBM")+"】司机编码");
+                    return FAILURE_AND_CONTINUE;
+                } else {
+                    list.add(map.get("SJBM"));
+                }
+            }
+
+            //费用类型赋值给明细表，用于生成批量
+            String tableName = requestInfo.getRequestManager().getBillTableName();
+            String sql = "update " + tableName + "_dt5 set fylx = " + mainMap.get("FYLX") + " where mainid = " + mainMap.get("ID");
+            log.writeLog("更新明细:" + sql);
+            boolean execute = new RecordSet().execute(sql);
+            log.writeLog("成功？:"+execute);
+
+            return SUCCESS;
+        } catch (Exception e) {
+
+            log.writeLog("错误信息:"+ DataBaseUtils.getExceptionDetail(e));
+            requestInfo.getRequestManager().setMessagecontent("错误信息"+e);
+
+            return FAILURE_AND_CONTINUE;
+        }
+
+    }
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/action/ncc/CheckTheWriteOffAmountAction.java b/src/main/youhong_ai_jitu_src/jntchina/action/ncc/CheckTheWriteOffAmountAction.java
new file mode 100644
index 0000000..febea47
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/action/ncc/CheckTheWriteOffAmountAction.java
@@ -0,0 +1,73 @@
+package jntchina.action.ncc;
+
+import jntchina.util.DataBaseUtils;
+import selfdev.util.base.BaseUtil;
+import selfdev.util.log.LogTool;
+import weaver.conn.RecordSet;
+import weaver.interfaces.workflow.action.BaseAction;
+import weaver.soa.workflow.request.RequestInfo;
+
+import java.util.ArrayList;
+import java.util.Map;
+
+/**
+ * @title: 检查核销金额
+ * @Author ycf
+ * @Date: 2022/3/16 10:34
+ * @Version 1.0
+ */
+public class CheckTheWriteOffAmountAction  extends BaseAction {
+    @Override
+    public String execute(RequestInfo requestInfo) {
+        try {
+            LogTool log = new LogTool("/log/action/NCC", false);
+            String requestId = requestInfo.getRequestid(); // 获取requestid
+            String workflowid = requestInfo.getWorkflowid(); // 获取workflowid
+            //获取工作流名称
+            String workflowname = BaseUtil.getBaseInfoByParm("workflowname", "workflow_base", "id", workflowid, "");
+            log.writeLog("---------------工作流名称-----------workflowname为：" + workflowname);
+            log.writeLog("--------检查核销开始----requestId值为：" + requestId);
+            String mainTable = requestInfo.getRequestManager().getBillTableName();
+
+            String sql = "select * from "+mainTable+" where requestid = '"+requestId+"'";
+            Map<String, String> mainMap = DataBaseUtils.getDataMap(sql);
+            log.writeLog("获取主表的数据:"+sql);
+
+            sql = "select * from "+mainTable+"_dt1 where mainid = "+mainMap.get("ID")+" order by id ";
+            log.writeLog("获取明细:"+sql);
+            ArrayList<Map<String, String>> dtList = DataBaseUtils.getDataList(sql);
+
+
+
+            RecordSet recordSet = new RecordSet();
+            log.writeLog("mainMap:"+mainMap);
+            log.writeLog("mainMap:"+dtList);
+            for (Map<String, String> dtMap : dtList) {
+
+                String whxje = DataBaseUtils.strNull(dtMap.get("WHXJE")).equals("") ? "0.00" : DataBaseUtils.strNull(dtMap.get("WHXJE"));
+                //本次核销金额
+                String bchxje = DataBaseUtils.strNull(dtMap.get("BCHXJE")).equals("") ? "0.00" : DataBaseUtils.strNull(dtMap.get("BCHXJE"));
+                log.writeLog("未核销"+Float.parseFloat(whxje));
+                log.writeLog("本次核销"+Float.parseFloat(bchxje));
+
+
+                //如果本次核销金额大于为核销金额
+                if (Float.parseFloat(whxje) < Float.parseFloat(bchxje)) {
+
+                    log.writeLog("本次核销金额大于未核销金额");
+                    requestInfo.getRequestManager().setMessageid("1111000");
+                    requestInfo.getRequestManager().setMessagecontent("核销明细中采购订单号【"+dtMap.get("CGDDHOA")+"】行明细中本次核销金额【"+ dtMap.get("BCHXJE")+"】不可大于未核销金额【"+ dtMap.get("WHXJE")+"】");
+                    return FAILURE_AND_CONTINUE;
+
+                }
+
+            }
+        } catch (Exception e) {
+            requestInfo.getRequestManager().setMessagecontent("错误信息"+e);
+            return FAILURE_AND_CONTINUE;
+        }
+        return SUCCESS;
+
+
+    }
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/action/ncc/CreateNewProcessAction.java b/src/main/youhong_ai_jitu_src/jntchina/action/ncc/CreateNewProcessAction.java
new file mode 100644
index 0000000..4eae0a0
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/action/ncc/CreateNewProcessAction.java
@@ -0,0 +1,401 @@
+package jntchina.action.ncc;
+
+import jntchina.util.DataBaseUtils;
+import selfdev.util.base.BaseUtil;
+import selfdev.util.log.LogTool;
+import weaver.conn.RecordSet;
+import weaver.file.Prop;
+import weaver.general.Util;
+import weaver.hrm.company.DepartmentComInfo;
+import weaver.interfaces.workflow.action.Action;
+import weaver.soa.workflow.request.*;
+import weaver.workflow.request.SetNewRequestTitle;
+import weaver.workflow.workflow.WorkflowVersion;
+
+import java.time.LocalDate;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Map;
+
+/**
+ * @title: 创建子流程
+ * @Author ycf
+ * @Date: 2022/3/11 14:23
+ * @Version 1.0
+ */
+public class CreateNewProcessAction implements Action {
+    public static LogTool log = new LogTool("/log/selfdev/action", true);
+
+    @Override
+    public String execute(RequestInfo requestInfo) {
+
+        try {
+            String requestId = requestInfo.getRequestid(); // 获取requestid
+            String workflowid = requestInfo.getWorkflowid(); // 获取workflowid
+
+            String mode = Prop.getPropValue("YunYiSJ", "mode");
+            // 服务器ip：port
+            String workflowidNew = Prop.getPropValue("YunYiSJ", mode + "_workflowid");
+//            String workflowidNew = "551521";
+
+            //获取工作流名称
+            String workflowname = BaseUtil.getBaseInfoByParm("workflowname", "workflow_base", "id", workflowid, "");
+            log.writeLog("--------【" + workflowname + "】数据传入中台开始----requestId值为：" + requestId);
+            String mainTable = getMainTable(requestId);
+            String sql = "select * from " + mainTable + " where requestid = '" + requestId + "'";
+            Map<String, String> mainMap = DataBaseUtils.getDataMap(sql);
+
+            sql = "select * from " + mainTable + "_dt5 where mainid = '" + mainMap.get("ID") + "'";
+            log.writeLog("获取明细表:" + sql);
+
+            ArrayList<Map<String, String>> dataList = DataBaseUtils.getDataList(sql);
+
+            String lcbh = mainMap.get("LCBH");
+            String sqr = mainMap.get("XM");
+            String sqrq = mainMap.get("CJRQ");
+            String sqbm = mainMap.get("FYGSBM");
+            String sqfb = mainMap.get("SQFB");
+            String qy = mainMap.get("QY");
+
+
+            RequestService service = new RequestService();
+            RequestInfo ri = new RequestInfo();
+            //创建人id
+            ri.setCreatorid(mainMap.get("XM"));
+            log.writeLog("流程创建人id:" + mainMap.get("XM"));
+
+//            String workflowid_zxqy=BaseUtil.getBaseInfoByParm("activeVersionID", "workflow_base", "id", workflowid, "");
+//            log.writeLog("workflowid_zxqy------->"+workflowid_zxqy);
+            WorkflowVersion workflowVersion = new WorkflowVersion(workflowidNew);
+            log.writeLog("新版本workflowid:" + workflowVersion.getActiveVersionWFID());
+
+
+            //流程Workflowid---------------------
+            ri.setWorkflowid(workflowVersion.getActiveVersionWFID());
+            //提醒    默认0
+            ri.setRemindtype("0");
+            //紧急程度
+            ri.setRequestlevel("0");
+            //流程是否自动提交到下一个节点  1表示自动提交到下一个节点，0表示停留在创建节点
+            ri.setIsNextFlow("0");
+
+
+            log.writeLog("明细表的长度:" + dataList.size());
+            log.writeLog("list:" + dataList);
+
+            int i = 0;
+            for (Map<String, String> map : dataList) {
+                i++;
+                //流程标题
+                ri.setDescription("支付司机" + map.get("SJMC") + "费用报销-" + LocalDate.now());
+
+
+                //设置主表个字段数据
+                Property[] p = new Property[0];
+
+                //流程编号
+                p = Arrays.copyOf(p, (p.length + 1));
+                p[p.length - 1] = new Property();
+                p[p.length - 1].setName("lcbh");
+                p[p.length - 1].setValue(lcbh + "_" + i);
+
+                //申请人
+                p = Arrays.copyOf(p, (p.length + 1));
+                p[p.length - 1] = new Property();
+                p[p.length - 1].setName("xm");
+                p[p.length - 1].setValue(sqr);
+//
+//                //申请人部门
+                p = Arrays.copyOf(p, (p.length + 1));
+                p[p.length - 1] = new Property();
+                p[p.length - 1].setName("bm");
+                p[p.length - 1].setValue(sqbm);
+
+                p = Arrays.copyOf(p, (p.length + 1));
+                p[p.length - 1] = new Property();
+                p[p.length - 1].setName("bxrbm");
+                p[p.length - 1].setValue(mainMap.get("FYCDBM"));
+
+                //相关流程
+                p = Arrays.copyOf(p, (p.length + 1));
+                p[p.length - 1] = new Property();
+                p[p.length - 1].setName("xglc");
+                p[p.length - 1].setValue(requestId);
+
+                //6、主表中的“报销说明”默认取批量流程中的备注
+                //7、付款银行备注默认为：付款司机张三报销款
+                //报销说明
+                p = Arrays.copyOf(p, (p.length + 1));
+                p[p.length - 1] = new Property();
+                p[p.length - 1].setName("bxsm");
+                p[p.length - 1].setValue(map.get("BZ"));
+
+
+                //报销备注
+                p = Arrays.copyOf(p, (p.length + 1));
+                p[p.length - 1] = new Property();
+                p[p.length - 1].setName("yxfkbz");
+                p[p.length - 1].setValue("付款司机" + map.get("SJMC") + "报销款");
+
+
+                //申请日期
+                p = Arrays.copyOf(p, (p.length + 1));
+                p[p.length - 1] = new Property();
+                p[p.length - 1].setName("cjrq");
+                p[p.length - 1].setValue(sqrq);
+
+                //
+                p = Arrays.copyOf(p, (p.length + 1));
+                p[p.length - 1] = new Property();
+                p[p.length - 1].setName("fysslx");
+                p[p.length - 1].setValue(mainMap.get("FYSSLX"));
+
+                if (!"".equals(qy)) {
+                    //区域
+                    p = Arrays.copyOf(p, (p.length + 1));
+                    p[p.length - 1] = new Property();
+                    p[p.length - 1].setName("qy");
+                    p[p.length - 1].setValue(qy);
+                }
+
+
+                if (!"".equals(mainMap.get("GSMC"))) {
+                    //付款公司名称
+                    p = Arrays.copyOf(p, (p.length + 1));
+                    p[p.length - 1] = new Property();
+                    p[p.length - 1].setName("gsmc");
+                    p[p.length - 1].setValue(mainMap.get("GSMC"));
+                }
+
+
+                //付款方式
+                p = Arrays.copyOf(p, (p.length + 1));
+                p[p.length - 1] = new Property();
+                p[p.length - 1].setName("bxfs");
+                p[p.length - 1].setValue("0");
+
+                if (!"".equals(map.get("SJMC"))) {
+                    //司机名称
+                    p = Arrays.copyOf(p, (p.length + 1));
+                    p[p.length - 1] = new Property();
+                    p[p.length - 1].setName("sjmc");
+                    p[p.length - 1].setValue(map.get("SJMC"));
+                }
+                if (!"".equals(map.get("SJBM"))) {
+                    //司机编码
+                    p = Arrays.copyOf(p, (p.length + 1));
+                    p[p.length - 1] = new Property();
+                    p[p.length - 1].setName("sjbm");
+                    p[p.length - 1].setValue(map.get("SJBM"));
+                }
+                if (!"".equals(map.get("ZHMC"))) {
+                    //账户名称
+                    p = Arrays.copyOf(p, (p.length + 1));
+                    p[p.length - 1] = new Property();
+                    p[p.length - 1].setName("zhmc");
+                    p[p.length - 1].setValue(map.get("ZHMC"));
+                }
+                if (!"".equals(map.get("YXZH"))) {
+                    //银行账号
+                    p = Arrays.copyOf(p, (p.length + 1));
+                    p[p.length - 1] = new Property();
+                    p[p.length - 1].setName("skkh");
+                    p[p.length - 1].setValue(map.get("YXZH"));
+                }
+                if (!"".equals(map.get("KHX"))) {
+                    //开户行
+                    p = Arrays.copyOf(p, (p.length + 1));
+                    p[p.length - 1] = new Property();
+                    p[p.length - 1].setName("skyxjkhx");
+                    p[p.length - 1].setValue(map.get("KHX"));
+                }
+
+                //报销金额
+                p = Arrays.copyOf(p, (p.length + 1));
+                p[p.length - 1] = new Property();
+                p[p.length - 1].setName("bxje");
+                p[p.length - 1].setValue(map.get("FKJE"));
+
+                if (!"".equals(map.get("FJSC"))) {
+                    //开户行
+                    p = Arrays.copyOf(p, (p.length + 1));
+                    p[p.length - 1] = new Property();
+                    p[p.length - 1].setName("fj");
+                    p[p.length - 1].setValue(map.get("FJSC"));
+                }
+
+
+                //添加主表数据
+                MainTableInfo mti = new MainTableInfo();
+                mti.setProperty(p);
+                ri.setMainTableInfo(mti);
+                //####################################主表字段  stop###########################################//
+
+
+                //####################################明细表字段  start###########################################//
+                //添加明细表数据
+                DetailTableInfo dti = new DetailTableInfo();
+                //明细表
+                DetailTable[] dt = new DetailTable[0];//一个明细表一个对象
+                //添加行数据
+                Row[] row = new Row[0];
+                row = Arrays.copyOf(row, (row.length + 1));
+                row[row.length - 1] = new Row();
+                row[row.length - 1].setId("100");
+                //添加单元格到行
+                Cell[] c = new Cell[0];
+
+                //费用承担部门
+                c = Arrays.copyOf(c, (c.length + 1));
+                c[c.length - 1] = new Cell();
+                c[c.length - 1].setName("fygsbm");
+                c[c.length - 1].setValue(mainMap.get("FYCDBM"));
+
+                //费用类型
+                c = Arrays.copyOf(c, (c.length + 1));
+                c[c.length - 1] = new Cell();
+                c[c.length - 1].setName("fylx");
+                c[c.length - 1].setValue(map.get("FYLX"));
+                log.writeLog("map.get(\"FYLX\"):" + map.get("FYLX"));
+
+
+                if (!"".equals(map.get("FKJE"))) {
+                    //付款金额
+                    c = Arrays.copyOf(c, (c.length + 1));
+                    c[c.length - 1] = new Cell();
+                    c[c.length - 1].setName("fkje");
+                    c[c.length - 1].setValue(map.get("FKJE"));
+                }
+
+
+                if (!"".equals(map.get("CPH"))) {
+                    //车牌号
+                    c = Arrays.copyOf(c, (c.length + 1));
+                    c[c.length - 1] = new Cell();
+                    c[c.length - 1].setName("cph");
+                    c[c.length - 1].setValue(map.get("CPH"));
+                }
+
+
+                if (!"".equals(map.get("CBZX"))) {
+                    //成本中心
+                    c = Arrays.copyOf(c, (c.length + 1));
+                    c[c.length - 1] = new Cell();
+                    c[c.length - 1].setName("cbzx");
+                    c[c.length - 1].setValue(map.get("CBZX"));
+                }
+
+                //国家
+                c = Arrays.copyOf(c, (c.length + 1));
+                c[c.length - 1] = new Cell();
+                c[c.length - 1].setName("GJ");
+                c[c.length - 1].setValue("CN");
+
+                if (!"".equals(map.get("BZ"))) {
+
+                    //备注
+                    c = Arrays.copyOf(c, (c.length + 1));
+                    c[c.length - 1] = new Cell();
+                    c[c.length - 1].setName("bz");
+                    c[c.length - 1].setValue(map.get("BZ"));
+                }
+
+
+                //添加一行
+                row[row.length - 1].setCell(c);
+                dt = Arrays.copyOf(dt, (dt.length + 1));
+                //添加第一个明细表
+                dt[dt.length - 1] = new DetailTable();
+                dt[dt.length - 1].setId("8");//明细表  dt1  后面的1
+                dt[dt.length - 1].setRow(row);
+                //明细表添加完毕
+                dti.setDetailTable(dt);
+                ri.setDetailTableInfo(dti);
+
+                String msg_n = "";
+
+                log.writeLog("ri:" + ri.toString());
+
+
+                //创建流程
+                String requestid_new = service.createRequest(ri);
+                log.writeLog("requestid_new------>" + requestid_new);
+                if (Integer.parseInt(requestid_new) > 0) {
+                    msg_n = "成功触发子流程，requestid=" + requestid_new;
+                    //更新到父节点的子流程
+                    sql = "update " + mainTable + "_dt5 set cfxgzlc = '" + requestid_new + "' where id = " + map.get("ID");
+                    log.writeLog("更新到父流程的明细:" + sql);
+
+                    new RecordSet().execute(sql);
+                    log.writeLog(msg_n);
+                    //让流程提交到下一节点
+                    try {
+                        RequestService requestService = new RequestService();
+                        boolean flag2 = requestService.nextNodeBySubmit(null, Integer.parseInt(requestid_new), Integer.parseInt(sqr), "");
+
+                    } catch (Exception e) {
+                        log.writeLog("流程自动流转到下一节点失败错误信息:" + DataBaseUtils.getExceptionDetail(e));
+
+                    }
+
+                } else {
+                    switch (requestid_new) {
+                        case "-1":
+                            msg_n = "创建流程失败！";
+                            break;
+                        case "-2":
+                            msg_n = "用户没有流程创建权限！";
+                            break;
+                        case "-3":
+                            msg_n = "流程基本信息失败！";
+                            break;
+                        case "-4":
+                            msg_n = "流程表单主表信息失败！";
+                            break;
+                        case "-5":
+                            msg_n = "流程紧急程度失败！";
+                            break;
+                        case "-6":
+                            msg_n = "流程操作者失效！";
+                            break;
+                        case "-7":
+                            msg_n = "流转至下一节点失败！";
+                            break;
+                        case "-8":
+                            msg_n = "流程节点附加操作失败！";
+                            break;
+                    }
+
+                    msg_n = "触发子流程失败，错误编码为：" + requestid_new + ",错误信息为：" + msg_n;
+                    log.writeLog(msg_n);
+
+                    requestInfo.getRequestManager().setMessagecontent("触发生成付款子流程失败，详细见明细中每行的接口返回信息！");
+                    return "0";
+                }
+            }
+
+            return SUCCESS;
+        } catch (Exception e) {
+            log.writeLog("错误信息1:" + DataBaseUtils.getExceptionDetail(e));
+            log.writeLog("错误信息2:" + DataBaseUtils.getThrowableDetail(e));
+
+            requestInfo.getRequestManager().setMessage("异常" + e);
+            return FAILURE_AND_CONTINUE;
+        }
+
+    }
+
+
+    public static String getMainTable(String requestid) {
+        String tablename = "";
+        RecordSet rs = new RecordSet();
+        rs.executeQuery("select * from workflow_requestbase a,workflow_base b,workflow_bill c "
+                + "where a.requestid=? and a.workflowid = b.id and b.formid = c.id", requestid);
+        while (rs.next()) {
+            tablename = Util.null2String(rs.getString("tablename"));
+        }
+        return tablename;
+    }
+
+
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/action/ncc/HKUpdateToModelAction.java b/src/main/youhong_ai_jitu_src/jntchina/action/ncc/HKUpdateToModelAction.java
new file mode 100644
index 0000000..6e6e5db
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/action/ncc/HKUpdateToModelAction.java
@@ -0,0 +1,61 @@
+package jntchina.action.ncc;
+
+import jntchina.util.DataBaseUtils;
+import selfdev.util.log.LogTool;
+import weaver.conn.RecordSet;
+import weaver.interfaces.workflow.action.BaseAction;
+import weaver.soa.workflow.request.RequestInfo;
+
+import java.util.ArrayList;
+import java.util.Map;
+
+/**
+ * @title: 还款更新到建模台账
+ * @Author ycf
+ * @Date: 2022/4/7 11:51
+ * @Version 1.0
+ */
+public class HKUpdateToModelAction extends BaseAction {
+    LogTool log = new LogTool("/log/action/NCC", false);
+
+    @Override
+    public String execute(RequestInfo requestInfo) {
+        try {
+            log.writeLog("--------------------------------还款金额更新到建模---------------------------------------");
+            RecordSet recordSet = new RecordSet();
+            String requestid = requestInfo.getRequestid();
+            //判断当前流程是否存在
+            String sql = "select id from uf_jktz_dt1 where xglc = "+requestid;
+            String value = DataBaseUtils.getFirstValue(sql);
+            if ("".equals(value)) {
+                ArrayList<Map<String, String>> dtList = DataBaseUtils.getProcessData(requestInfo, 1);
+                //明细表循环校验
+                for (Map<String, String> dtmap : dtList ) {
+                    log.writeLog("本次还款金额【"+dtmap.get("BCHKJE")+"】剩余未还款金额【"+dtmap.get("SYJE")+"】");
+                    //更新本次还款金额
+                    sql = "update uf_jktz set YHKJE = (nvl(YHKJE,0) + "+dtmap.get("BCHKJE")+") where id = '"+dtmap.get("XGJKLC")+"'";
+                    recordSet.execute(sql);
+                    log.writeLog("更新本次还款金额:"+sql);
+
+                    //更新剩余未还款金额
+                    sql = "update UF_JKTZ set WHKJE = nvl(JKJE, 0) - nvl(YHKJE, 0) - nvl(YCDJE, 0) where id='"+dtmap.get("XGJKLC")+"' ";
+                    recordSet.execute(sql);
+                    log.writeLog("更新剩余未还款金额:"+sql);
+
+//                    //获取当前核销的台账的mainid
+//                    sql = "select id from uf_jktz where xglc = '" + dtmap.get("XGJKLC") + "' ";
+//                    String mainid = DataBaseUtils.getFirstValue(sql);
+
+                    //插入到台账明细中
+                    sql = "insert into UF_JKTZ_DT1 ( mainid, xglc, hkje,  bz) values " +
+                            "("+dtmap.get("XGJKLC")+",'"+requestid+"','"+dtmap.get("BCHKJE")+"','"+dtmap.get("BZ")+"')";
+                    recordSet.execute(sql);
+                    log.writeLog("插入台账明细:"+sql);
+                }
+            }
+            return SUCCESS;
+        } catch (Exception e) {
+            return FAILURE_AND_CONTINUE;
+        }
+    }
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/action/ncc/HkToNCCAction.java b/src/main/youhong_ai_jitu_src/jntchina/action/ncc/HkToNCCAction.java
new file mode 100644
index 0000000..02dd26e
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/action/ncc/HkToNCCAction.java
@@ -0,0 +1,155 @@
+package jntchina.action.ncc;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.serializer.SerializerFeature;
+import jntchina.util.DataBaseUtils;
+import jntchina.util.HttpClientToDC;
+import selfdev.util.log.LogTool;
+import weaver.conn.RecordSet;
+import weaver.file.Prop;
+import weaver.general.Util;
+import weaver.interfaces.workflow.action.BaseAction;
+import weaver.soa.workflow.request.RequestInfo;
+
+import java.time.LocalDate;
+import java.time.LocalTime;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @title: 还款传入NCC
+ * @Author ycf
+ * @Date: 2022/4/12 10:25
+ * @Version 1.0
+ */
+public class HkToNCCAction extends BaseAction {
+
+
+    LogTool log = new LogTool("/log/action/NCC", false);
+
+    @Override
+    public String execute(RequestInfo requestInfo) {
+        try {
+
+            Map<String, String> mainMap = DataBaseUtils.getProcessData(requestInfo);
+            ArrayList<Map<String, String>> dtList = DataBaseUtils.getProcessData(requestInfo, 1);
+            HashMap<String, Object> params = new HashMap<>();
+            //NCC组织编码
+            params.put("pk_org", Util.null2String(mainMap.get("GSMC")));
+            //币种编码
+            params.put("bzbm", "CNY");
+            //单据类型
+            params.put("billtypecode", "2647");
+            //申请日期
+            params.put("dbilldate", Util.null2String(mainMap.get("SQRQ")));
+            //还款金额
+            params.put("totalmny", Util.null2String(mainMap.get("HKJE")));
+            //申请人工号
+            params.put("billmaker", Util.null2String(mainMap.get("SQRGH")));
+            //费用承担部门
+            params.put("fydeptid", DataBaseUtils.getFirstValue("select DEPARTMENTCODE from HRMDEPARTMENT where id = " + Util.null2String(mainMap.get("SQBM"))));
+            //默认：0
+            params.put("paytarget", "0");
+            //收款单位
+            params.put("payorg", Util.null2String(mainMap.get("GSMC")));
+            //结算方式
+            params.put("payment", "3");
+            //还款人
+            params.put("pk_psndoc", Util.null2String(DataBaseUtils.getFirstValue("select WORKCODE from HRMRESOURCE where id =" + mainMap.get("HKR"))));
+            //还款人银行账户
+            params.put("psnaccnum", "");
+            //收款单位银行账户
+            params.put("orgaccnum", "");
+            //OArequestID
+            params.put("oarequestid", Util.null2String(mainMap.get("REQUESTID")));
+            //流程编号
+            params.put("oavbillcode", Util.null2String(mainMap.get("LCBH")));
+            //费用承担部门
+            params.put("fydwbm", Util.null2String(mainMap.get("GSMC")));
+            //收款单位银行账户
+            params.put("zy", "");
+            ArrayList<Map<String, String>> arrayList = new ArrayList<>();
+            for (Map<String, String> dtMap : dtList) {
+                HashMap<String, String> map = new HashMap<>();
+                map.put("jkbillcode", Util.null2String(dtMap.get("NCCJKDH")));
+                map.put("inoutbusiclass", "901038");
+                map.put("hkmny", Util.null2String(dtMap.get("BCHKJE")));
+
+                arrayList.add(map);
+            }
+            params.put("er_bxcontrast", arrayList);
+
+            //成功传入ncc如果为0，则以前传入过ncc且成功
+            if ("0".equals(mainMap.get("SFCRNCC"))) {
+                return SUCCESS;
+
+            }
+
+            String mode = Prop.getPropValue("DevToDC_jntchina", "mode");
+            // 服务器ip：port
+            String baseUrl = Prop.getPropValue("DevToDC_jntchina", mode + "_baseUrl");
+            String url = baseUrl + "/dcoaapi/ncc/repaymentBill";
+
+            String token = HttpClientToDC.getToken();
+
+
+            String json = JSON.toJSONString(params, SerializerFeature.DisableCircularReferenceDetect);
+
+            log.writeLog("url:" + url);
+            log.writeLog("token:" + token);
+            log.writeLog("param:" + json);
+
+            String rdata = HttpClientToDC.sendPostApi(url, token, json);
+            log.writeLog("【调用数据中台报销接口返回结果result:】" + rdata);
+            if (!"".equals(rdata) && rdata != null) {
+                JSONObject jsonObject = JSONObject.parseObject(rdata);
+                String sql;
+                RecordSet recordSet = new RecordSet();
+                String modeid = DataBaseUtils.getModelIdByName("uf_dynccjkrzb");
+                if (jsonObject.getBooleanValue("succ")) {
+                    log.writeLog("传入ncc成功:");
+
+                    String pkBill = jsonObject.getJSONObject("data").getString("pk_bill");
+                    sql = "update " + requestInfo.getRequestManager().getBillTableName() +
+                            " set SFCRNCC =0 ,NCCFHDXX = '" + jsonObject.getString("msg") + "',NCCDJID='" + pkBill + "' ";
+                    recordSet.execute(sql);
+                    log.writeLog("调用ncc状态存入本地:" + sql);
+
+                    sql = "insert into uf_dynccjkrzb (dyjk,cdcs,fhcs,sfcg,lcid,formmodeid,MODEDATACREATEDATE,MODEDATACREATETIME) values " +
+                            "('还款接口','" + json + "','" + rdata + "','1','" + requestInfo.getRequestid() + "','" + modeid + "','" + LocalDate.now() + "','" + LocalTime.now().toString().substring(0, 8) + "')";
+                    ;
+                    log.writeLog("插入日志SQL:" + sql + recordSet.execute(sql));
+
+                    return SUCCESS;
+                } else {
+                    log.writeLog("传入ncc失败:");
+                    sql = "update " + requestInfo.getRequestManager().getBillTableName() +
+                            " set SFCRNCC =1,NCCFHDXX  ='" + jsonObject.getString("msg") + "' where requestid = " + requestInfo.getRequestid();
+                    ;
+                    log.writeLog("调用ncc状态存入本地:" + sql + recordSet.execute(sql));
+
+
+                    sql = "insert into uf_dynccjkrzb (dyjk,cdcs,fhcs,sfcg,lcid,formmodeid,MODEDATACREATEDATE,MODEDATACREATETIME) values " +
+                            "('还款接口','" + json + "','" + rdata + "','0','" + requestInfo.getRequestid() + "','" + modeid + "','" + LocalDate.now() + "','" + LocalTime.now().toString().substring(0, 8) + "')";
+                    log.writeLog("插入日志SQL:" + sql);
+                    recordSet.execute(sql);
+
+                    requestInfo.getRequestManager().setMessagecontent("提交流程失败，错误信息" + jsonObject.getString("msg"));
+                    return FAILURE_AND_CONTINUE;
+                }
+            } else {
+                requestInfo.getRequestManager().setMessagecontent("提交流程失败，中台返回数据为空");
+                return FAILURE_AND_CONTINUE;
+            }
+        } catch (Exception e) {
+            log.writeLog("异常:" + DataBaseUtils.getExceptionDetail(e));
+            requestInfo.getRequestManager().setMessagecontent("错误信息" + e);
+            return FAILURE_AND_CONTINUE;
+        }
+
+
+//        return SUCCESS;
+    }
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/action/ncc/PrepaidWriteOffAction.java b/src/main/youhong_ai_jitu_src/jntchina/action/ncc/PrepaidWriteOffAction.java
new file mode 100644
index 0000000..45d90fd
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/action/ncc/PrepaidWriteOffAction.java
@@ -0,0 +1,191 @@
+package jntchina.action.ncc;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.serializer.SerializerFeature;
+import jntchina.util.HttpClientToDC;
+import jntchina.util.NCCUtils;
+import selfdev.util.base.BaseUtil;
+import selfdev.util.log.LogTool;
+import weaver.conn.RecordSet;
+import weaver.file.Prop;
+import weaver.general.Util;
+import weaver.interfaces.workflow.action.BaseAction;
+import weaver.soa.workflow.request.RequestInfo;
+import jntchina.util.DataBaseUtils;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @title: 审批完成后将数据传入NCC生成预付核销单，并且更新到台账
+ * @Author ycf
+ * @Date: 2022/2/28 09:25
+ * @Version 1.0
+ */
+public class PrepaidWriteOffAction extends BaseAction {
+
+
+    @Override
+    public String execute(RequestInfo requestInfo) {
+        LogTool log = new LogTool("/log/action/NCC", false);
+        String requestId = requestInfo.getRequestid(); // 获取requestid
+        String workflowid = requestInfo.getWorkflowid(); // 获取workflowid
+        //获取工作流名称
+        String workflowname = BaseUtil.getBaseInfoByParm("workflowname", "workflow_base", "id", workflowid, "");
+        log.writeLog("---------------工作流名称-----------workflowname为：" + workflowname);
+        log.writeLog("--------核销数据传入中台->NCC 开始----requestId值为：" + requestId);
+        String mainTable = getMainTable(requestId);
+
+        //获取配置文件中的参数
+        String mode = Prop.getPropValue("DevToDC_jntchina", "mode");
+        // 服务器ip：port
+        String baseUrl = Prop.getPropValue("DevToDC_jntchina", mode + "_baseUrl");
+        //String url = baseUrl+ "/dcoaapi/claimForm/receiveData";
+        String url = baseUrl + "/dcoaapi/ncc/preBillVerification";
+
+
+        String sql = "select * from " + mainTable + " where requestid = '" + requestId + "'";
+        Map<String, String> mainMap = DataBaseUtils.getDataMap(sql);
+        log.writeLog("获取主表的数据:" + sql);
+
+        sql = "select * from " + mainTable + "_dt1 where mainid = " + mainMap.get("ID") + " order by id ";
+        log.writeLog("获取明细:" + sql);
+        ArrayList<Map<String, String>> dtList = DataBaseUtils.getDataList(sql);
+
+        RecordSet recordSet = new RecordSet();
+        log.writeLog("mainMap:" + mainMap);
+        log.writeLog("mainMap:" + dtList);
+
+
+        try {
+//数据回传NCC
+            HashMap<String, Object> map = new HashMap<>();
+            map.put("pk_org", mainMap.get("GSMC"));
+            map.put("pk_verify_fa", "核销方案");
+            map.put("operator", DataBaseUtils.getFirstValue("select WORKCODE from HRMRESOURCE where id = " + mainMap.get("SQR")));
+            map.put("oarequestid", requestId);
+            map.put("oavbillcode", mainMap.get("LCBH"));
+
+
+            ArrayList<Map<String, Object>> payableitems = new ArrayList<>();
+            ArrayList<Map<String, Object>> payitems = new ArrayList<>();
+            for (Map<String, String> dtMap : dtList) {
+
+                //唯一id
+                String wyjhid = DataBaseUtils.getFirstValue("select FKJHWYID\n" +
+                        "from uf_gylyfxxb_dt1 where id = " + dtMap.get("DDMAINID"));
+
+                //付款明细id
+                String fkmxid = DataBaseUtils.getFirstValue("select fkdmxid \n" +
+                        "from uf_gylyfxxb_dt1 where id = " + dtMap.get("DDMAINID"));
+                //应付
+                HashMap<String, Object> payable = new HashMap<>();
+                //采购明细id
+                payable.put("pk_payableitem", wyjhid);
+                //预付款金额
+                payable.put("payablemny", dtMap.get("YFKJE"));
+                payable.put("def1", "自定义项");
+                payableitems.add(payable);
+
+                //预付
+                HashMap<String, Object> pay = new HashMap<>();
+                //付款单明细id
+                pay.put("pk_payitem", fkmxid);
+                //本次报销金额
+                pay.put("paymny", dtMap.get("BCHXJE"));
+                pay.put("def1", "自定义项");
+                payitems.add(pay);
+            }
+            map.put("payableitems", payableitems);
+            map.put("payitems", payitems);
+
+            String json = JSON.toJSONString(map, SerializerFeature.DisableCircularReferenceDetect);
+//            String url = "http://180.169.229.37:8080/nccloud/api/jitu/arap/wobill/writeoff";
+
+            boolean success;
+
+            if (!mainMap.get("ISWRITENCC").equals("0")) {
+                //获取TOKEN
+                String token = HttpClientToDC.getToken();
+
+                log.writeLog("请求的json:" + json);
+                log.writeLog("请求的token:" + token);
+                log.writeLog("请求的url:" + url);
+
+                String rdata = HttpClientToDC.sendPostApi(url, token, json);
+
+                log.writeLog("写到uf_dynccjkrzb 日志表中:");
+
+                String modeid = DataBaseUtils.getModelIdByName("uf_dynccjkrzb");
+
+
+                JSONObject jsonObject = JSONObject.parseObject(rdata);
+                success = jsonObject.getBooleanValue("succ");
+
+                log.writeLog("请求的返回结果:" + rdata);
+
+                log.writeLog("success:" + success);
+
+                if (!success) {
+
+                    sql = "update  " + mainTable + " set iswritencc  = 1,NCCMsg = '" + jsonObject.getString("msg") + "' where id = " + mainMap.get("ID");
+                    log.writeLog("写入ncc失败:" + sql);
+
+                    recordSet.execute(sql);
+
+                    sql = "insert into uf_dynccjkrzb (dyjk,cdcs,fhcs,sfcg,lcid,formmodeid,MODEDATACREATEDATE,MODEDATACREATETIME) values " +
+                            "('预付核销接口','" + json + "','" + rdata + "','1','" + requestId + "','" + modeid + "','" + LocalDate.now() + "','" + LocalTime.now().toString().substring(0, 8) + "')";
+                    log.writeLog("插入日志SQL:" + sql);
+                    recordSet.execute(sql);
+
+                    log.writeLog("err:" + jsonObject.getString("msg"));
+
+                    requestInfo.getRequestManager().setMessageid("1111000");
+                    requestInfo.getRequestManager().setMessagecontent("数据写入NCC失败，NCC错误信息：" + jsonObject.getString("msg"));
+                    return FAILURE_AND_CONTINUE;
+                } else {
+                    sql = "update  " + mainTable + " set iswritencc  = 0,NCCMsg = '" + jsonObject.getString("msg") + "' where id = " + mainMap.get("ID");
+                    log.writeLog("写入ncc字段成功:" + sql);
+
+                    recordSet.execute(sql);
+
+                    sql = "insert into uf_dynccjkrzb (dyjk,cdcs,fhcs,sfcg,lcid,formmodeid,MODEDATACREATEDATE,MODEDATACREATETIME) values " +
+                            "('预付核销接口','" + json + "','" + rdata + "','0','" + requestId + "','" + modeid + "','" + LocalDate.now() + "','" + LocalTime.now().toString().substring(0, 8) + "')";
+                    log.writeLog("插入日志SQL:" + sql);
+
+                    recordSet.execute(sql);
+
+                }
+            } else {
+                log.writeLog("流程requestid【:" + requestId + "】传入给ncc，本次跳过");
+
+            }
+
+        } catch (Exception e) {
+            requestInfo.getRequestManager().setMessageid("1111000");
+            requestInfo.getRequestManager().setMessagecontent("系统内部发生异常，错误信息：" + e.toString());
+            return FAILURE_AND_CONTINUE;
+        }
+
+        return SUCCESS;
+    }
+
+
+    public static String getMainTable(String requestid) {
+        String tablename = "";
+        RecordSet rs = new RecordSet();
+        rs.executeQuery("select * from workflow_requestbase a,workflow_base b,workflow_bill c "
+                + "where a.requestid=? and a.workflowid = b.id and b.formid = c.id", requestid);
+        while (rs.next()) {
+            tablename = Util.null2String(rs.getString("tablename"));
+        }
+        return tablename;
+    }
+
+
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/action/ncc/UpdateToModelAction.java b/src/main/youhong_ai_jitu_src/jntchina/action/ncc/UpdateToModelAction.java
new file mode 100644
index 0000000..3c9e0a8
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/action/ncc/UpdateToModelAction.java
@@ -0,0 +1,109 @@
+package jntchina.action.ncc;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import jntchina.util.DataBaseUtils;
+import jntchina.util.NCCUtils;
+import selfdev.util.base.BaseUtil;
+import selfdev.util.log.LogTool;
+import weaver.conn.RecordSet;
+import weaver.interfaces.workflow.action.BaseAction;
+import weaver.soa.workflow.request.RequestInfo;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @title: 数据更新到建模
+ * @Author ycf
+ * @Date: 2022/3/22 10:13
+ * @Version 1.0
+ */
+public class UpdateToModelAction extends BaseAction {
+
+    @Override
+    public String execute(RequestInfo requestInfo) {
+        LogTool log = new LogTool("/log/action/NCC", false);
+        String requestId = requestInfo.getRequestid(); // 获取requestid
+        String workflowid = requestInfo.getWorkflowid(); // 获取workflowid
+        //获取工作流名称
+        String workflowname = BaseUtil.getBaseInfoByParm("workflowname", "workflow_base", "id", workflowid, "");
+        log.writeLog("---------------工作流名称-----------workflowname为：" + workflowname);
+        log.writeLog("--------核销金额写入建模开始----requestId值为：" + requestId);
+        String mainTable = requestInfo.getRequestManager().getBillTableName();
+
+        String sql = "select * from " + mainTable + " where requestid = '" + requestId + "'";
+        Map<String, String> mainMap = DataBaseUtils.getDataMap(sql);
+        log.writeLog("获取主表的数据:" + sql);
+
+        sql = "select * from " + mainTable + "_dt1 where mainid = " + mainMap.get("ID") + " order by id ";
+        log.writeLog("获取明细:" + sql);
+        ArrayList<Map<String, String>> dtList = DataBaseUtils.getDataList(sql);
+
+        RecordSet recordSet = new RecordSet();
+        log.writeLog("mainMap:" + mainMap);
+        log.writeLog("mainMap:" + dtList);
+
+        try {
+            //如果当前流程存在，，不更新到台账
+            sql = "select id from uf_gylyfxxb_dt2 where lc = '" + requestId + "' ";
+            String firstValue = DataBaseUtils.getFirstValue(sql);
+            if (firstValue.equals("")) {
+                for (Map<String, String> dtMap : dtList) {
+                    //更新到建模
+                    String dtId = dtMap.get("WYJHID");
+                    //建模的核销金额 = 本次核销金额+已核销金额
+                    String yhxje = DataBaseUtils.strNull(dtMap.get("YHXJE")).equals("") ? "0.00" : DataBaseUtils.strNull(dtMap.get("YHXJE"));
+                    String bchxje = DataBaseUtils.strNull(dtMap.get("BCHXJE")).equals("") ? "0.00" : DataBaseUtils.strNull(dtMap.get("BCHXJE"));
+                    log.writeLog("已核销金额:" + yhxje);
+                    log.writeLog("本次核销金额:" + bchxje);
+
+                    float sum = Float.parseFloat(yhxje) + Float.parseFloat(bchxje);
+                    log.writeLog("合计:" + sum);
+
+                    sql = "select mainid from uf_gylyfxxb_dt1 where id = " + dtMap.get("DDMAINID");
+                    String mainid = DataBaseUtils.getFirstValue(sql);
+
+                    sql = "update uf_gylyfxxb_dt1 set YHXJE = " + sum + " where id = " + dtId;
+                    log.writeLog("明细表已核销金额更新到建模台账的sql:" + sql);
+                    recordSet.execute(sql);
+
+                    sql = "update uf_gylyfxxb_dt1 set SYWFJE = (to_number(nvl(bcfkje,0)) - to_number(nvl(YHXJE,0))) where id =  " + dtId;
+                    log.writeLog("明细表剩余核销金额更新到建模台账的sql:" + sql);
+                    recordSet.execute(sql);
+
+                    sql = "update UF_GYLYFXXB\n" +
+                            "set YHXJE = to_number((select nvl(yhxje,0)\n" +
+                            "from UF_GYLYFXXB where id = " + mainid + ")) + to_number((select sum(YHXJE)\n" +
+                            "from uf_gylyfxxb_dt1 where mainid = " + mainid + "))\n" +
+                            "where id = " + mainid + "";
+                    recordSet.execute(sql);
+                    log.writeLog("更新主表已核销金额:" + sql);
+
+                    sql = "update UF_GYLYFXXB\n" +
+                            "set SYWHXJE = to_number(nvl(FKJE, 0)) - to_number(nvl(yhxje, 0))\n" +
+                            "where id = " + mainid;
+                    recordSet.execute(sql);
+                    log.writeLog("更新主表剩余未核销金额:" + sql);
+
+                    sql = "insert into uf_gylyfxxb_dt2 (yfhxbh,lc,mainid) values ('" + mainMap.get("LCBH") + "','" + requestId + "'," + mainid + ") ";
+                    recordSet.execute(sql);
+                    log.writeLog("插入流程数据:" + sql);
+                }
+            } else {
+                log.writeLog("当前编号已存在不更新建模:" + requestId);
+
+            }
+
+        } catch (Exception e) {
+            log.writeLog("err:" + DataBaseUtils.getExceptionDetail(e));
+
+            requestInfo.getRequestManager().setMessageid("1111000");
+            requestInfo.getRequestManager().setMessagecontent("数据写入NCC失败，错误信息：" + e.toString());
+            return FAILURE_AND_CONTINUE;
+        }
+
+        return SUCCESS;
+    }
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/certificate/JTSD.pfx b/src/main/youhong_ai_jitu_src/jntchina/certificate/JTSD.pfx
new file mode 100644
index 0000000..5d6895b
Binary files /dev/null and b/src/main/youhong_ai_jitu_src/jntchina/certificate/JTSD.pfx differ
diff --git a/src/main/youhong_ai_jitu_src/jntchina/certificate/pro22.pfx b/src/main/youhong_ai_jitu_src/jntchina/certificate/pro22.pfx
new file mode 100644
index 0000000..77f77b7
Binary files /dev/null and b/src/main/youhong_ai_jitu_src/jntchina/certificate/pro22.pfx differ
diff --git a/src/main/youhong_ai_jitu_src/jntchina/entity/BorrowOrder.java b/src/main/youhong_ai_jitu_src/jntchina/entity/BorrowOrder.java
new file mode 100644
index 0000000..168faff
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/entity/BorrowOrder.java
@@ -0,0 +1,283 @@
+package jntchina.entity;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * @Author Administrator
+ * @Description 借款单
+ * @Date 2021/1/16  11:23
+ */
+public class BorrowOrder implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private String uuid; //主键
+    private String pk_org; // JTSDCN0001 //借款单位编码
+    private String total; // 1000.00 //合计金额
+    private String deptid; // SD3300101 //借款人部门
+    private String djlxbm; // 263X-Cxx-DSJKD", //交易类型编码 263X-Cxx-DSJKD:对私借款单    263X-Cxx-DGJKD:对公预付/借款单
+    private String djrq; // 2021-03-05 10:17:10", //单据日期
+    private String payflag; //1", //支付状态
+    private String paytarget; // 0" //收款对象（0=员工，1=供应商）
+    private String hbbm; // 供应商编码
+    private String receiver; // yonyou88", //收款人
+    private String jkbxr; // yonyou88  //借款报销人
+    private String operator; // yonyou88  //录入人
+    private String jsfs; // 3 //结算方式 3 网银 。。。
+    private String fkyhzh; //付款银行账户
+    private String skyhzh; //收款银行账户（员工）
+    private String custaccount; //收款银行账户（供应商）
+    private String jobid; //项目
+    private String zy; //借款测试", //事由
+    private String djzt; // 1", //单据状态 1 保存
+    private String kjqj; // 03", //会计期间
+    private String kjnd; // 2021", //会计年度
+    private String zyx1; // CSBX21020501", //OA单据号
+    private String zyx2; // 提交人
+    private String zyx3; // OA核销单号
+    private String zyx5; // CSBX21020501", // OARequestID
+    private String zyx8; // 银行付款备注
+    private String zyx9; // OA流程标题
+    private List<BorrowOrderBody> jk_busitem;
+
+    public String getPk_org() {
+        return pk_org;
+    }
+
+    public String getCustaccount() {
+		return custaccount;
+	}
+
+	public String getZyx9() {
+		return zyx9;
+	}
+
+	public void setZyx9(String zyx9) {
+		this.zyx9 = zyx9;
+	}
+
+	public void setCustaccount(String custaccount) {
+		this.custaccount = custaccount;
+	}
+
+	public String getHbbm() {
+		return hbbm;
+	}
+
+	public String getUuid() {
+		return uuid;
+	}
+
+	public void setUuid(String uuid) {
+		this.uuid = uuid;
+	}
+
+	public void setHbbm(String hbbm) {
+		this.hbbm = hbbm;
+	}
+
+	public void setPk_org(String pk_org) {
+        this.pk_org = pk_org;
+    }
+
+    public String getTotal() {
+        return total;
+    }
+
+    public void setTotal(String total) {
+        this.total = total;
+    }
+
+    public String getDeptid() {
+        return deptid;
+    }
+
+    public String getZyx8() {
+		return zyx8;
+	}
+
+	public void setZyx8(String zyx8) {
+		this.zyx8 = zyx8;
+	}
+
+	public void setDeptid(String deptid) {
+        this.deptid = deptid;
+    }
+
+    public String getDjlxbm() {
+        return djlxbm;
+    }
+
+    public void setDjlxbm(String djlxbm) {
+        this.djlxbm = djlxbm;
+    }
+
+    public String getDjrq() {
+        return djrq;
+    }
+
+    public void setDjrq(String djrq) {
+        this.djrq = djrq;
+    }
+
+    public String getPayflag() {
+        return payflag;
+    }
+
+    public void setPayflag(String payflag) {
+        this.payflag = payflag;
+    }
+
+    public String getPaytarget() {
+        return paytarget;
+    }
+
+    public void setPaytarget(String paytarget) {
+        this.paytarget = paytarget;
+    }
+
+    public String getReceiver() {
+        return receiver;
+    }
+
+    public void setReceiver(String receiver) {
+        this.receiver = receiver;
+    }
+
+    public String getJkbxr() {
+        return jkbxr;
+    }
+
+    public void setJkbxr(String jkbxr) {
+        this.jkbxr = jkbxr;
+    }
+
+    public String getOperator() {
+        return operator;
+    }
+
+    public void setOperator(String operator) {
+        this.operator = operator;
+    }
+
+    public String getJsfs() {
+        return jsfs;
+    }
+
+    public void setJsfs(String jsfs) {
+        this.jsfs = jsfs;
+    }
+
+    public String getFkyhzh() {
+        return fkyhzh;
+    }
+
+    public void setFkyhzh(String fkyhzh) {
+        this.fkyhzh = fkyhzh;
+    }
+
+    public String getJobid() {
+        return jobid;
+    }
+
+    public void setJobid(String jobid) {
+        this.jobid = jobid;
+    }
+
+    public String getZy() {
+        return zy;
+    }
+
+    public void setZy(String zy) {
+        this.zy = zy;
+    }
+
+    public String getDjzt() {
+        return djzt;
+    }
+
+    public void setDjzt(String djzt) {
+        this.djzt = djzt;
+    }
+
+    public String getKjqj() {
+        return kjqj;
+    }
+
+    public void setKjqj(String kjqj) {
+        this.kjqj = kjqj;
+    }
+
+    public String getKjnd() {
+        return kjnd;
+    }
+
+    public void setKjnd(String kjnd) {
+        this.kjnd = kjnd;
+    }
+
+    public String getZyx1() {
+        return zyx1;
+    }
+
+    public void setZyx1(String zyx1) {
+        this.zyx1 = zyx1;
+    }
+
+    public String getZyx2() {
+        return zyx2;
+    }
+
+    public void setZyx2(String zyx2) {
+        this.zyx2 = zyx2;
+    }
+
+    public String getZyx3() {
+        return zyx3;
+    }
+
+    public void setZyx3(String zyx3) {
+        this.zyx3 = zyx3;
+    }
+
+    public String getZyx5() {
+        return zyx5;
+    }
+
+    public void setZyx5(String zyx5) {
+        this.zyx5 = zyx5;
+    }
+
+    public List<BorrowOrderBody> getJk_busitem() {
+        return jk_busitem;
+    }
+
+    public void setJk_busitem(List<BorrowOrderBody> jk_busitem) {
+        this.jk_busitem = jk_busitem;
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(pk_org, total, deptid, djlxbm, djrq, payflag, paytarget, receiver, jkbxr, operator, jsfs, fkyhzh, jobid, zy, djzt, kjqj, kjnd, zyx1, zyx2, zyx3, zyx5, jk_busitem);
+    }
+
+    public String getSkyhzh() {
+		return skyhzh;
+	}
+
+	public void setSkyhzh(String skyhzh) {
+		this.skyhzh = skyhzh;
+	}
+
+	@Override
+	public String toString() {
+		return "BorrowOrder [uuid=" + uuid + ", pk_org=" + pk_org + ", total=" + total + ", deptid=" + deptid
+				+ ", djlxbm=" + djlxbm + ", djrq=" + djrq + ", payflag=" + payflag + ", paytarget=" + paytarget
+				+ ", hbbm=" + hbbm + ", receiver=" + receiver + ", jkbxr=" + jkbxr + ", operator=" + operator
+				+ ", jsfs=" + jsfs + ", fkyhzh=" + fkyhzh + ", skyhzh=" + skyhzh + ", jobid=" + jobid + ", zy=" + zy
+				+ ", djzt=" + djzt + ", kjqj=" + kjqj + ", kjnd=" + kjnd + ", zyx1=" + zyx1 + ", zyx2=" + zyx2
+				+ ", zyx3=" + zyx3 + ", zyx5=" + zyx5 + ", zyx8=" + zyx8 + ", jk_busitem=" + jk_busitem + "]";
+	}
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/entity/BorrowOrderBody.java b/src/main/youhong_ai_jitu_src/jntchina/entity/BorrowOrderBody.java
new file mode 100644
index 0000000..08ea3a8
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/entity/BorrowOrderBody.java
@@ -0,0 +1,146 @@
+package jntchina.entity;
+
+import java.io.Serializable;
+import java.util.Objects;
+
+/**
+ * @Author Administrator
+ * @Description 借款单表体（明细表）
+ * @Date 2021/1/8  12:14
+ */
+public class BorrowOrderBody implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private String amount; // 1000.00 //金额
+    private String tablecode; // jk_busitem
+    private String rowno; // 10
+    private String szxmid; // 收支项目  101005 电子面单号段费
+    private String defitem50; // 发票类型
+    private String defitem49; // 发票号码
+    private String defitem42; // OA明细ID
+    private String defitem43; // 车牌号
+    private String defitem44; // 仓库
+    private String defitem45; // 国家
+    private String defitem46; // 网点（成本中心）
+    private String defitem48; // SD3300301" //分摊部门
+
+    public String getAmount() {
+        return amount;
+    }
+
+    public void setAmount(String amount) {
+        this.amount = amount;
+    }
+
+    public String getTablecode() {
+        return tablecode;
+    }
+
+    public void setTablecode(String tablecode) {
+        this.tablecode = tablecode;
+    }
+
+    public String getRowno() {
+        return rowno;
+    }
+
+    public void setRowno(String rowno) {
+        this.rowno = rowno;
+    }
+
+    public String getSzxmid() {
+        return szxmid;
+    }
+
+    public void setSzxmid(String szxmid) {
+        this.szxmid = szxmid;
+    }
+
+    public String getDefitem50() {
+        return defitem50;
+    }
+
+    public void setDefitem50(String defitem50) {
+        this.defitem50 = defitem50;
+    }
+
+    public String getDefitem49() {
+        return defitem49;
+    }
+
+    public void setDefitem49(String defitem49) {
+        this.defitem49 = defitem49;
+    }
+
+    public String getDefitem42() {
+        return defitem42;
+    }
+
+    public void setDefitem42(String defitem42) {
+        this.defitem42 = defitem42;
+    }
+
+    public String getDefitem43() {
+        return defitem43;
+    }
+
+    public void setDefitem43(String defitem43) {
+        this.defitem43 = defitem43;
+    }
+
+    public String getDefitem44() {
+        return defitem44;
+    }
+
+    public void setDefitem44(String defitem44) {
+        this.defitem44 = defitem44;
+    }
+
+    public String getDefitem45() {
+        return defitem45;
+    }
+
+    public void setDefitem45(String defitem45) {
+        this.defitem45 = defitem45;
+    }
+
+    public String getDefitem46() {
+        return defitem46;
+    }
+
+    public void setDefitem46(String defitem46) {
+        this.defitem46 = defitem46;
+    }
+
+    public String getDefitem48() {
+        return defitem48;
+    }
+
+    public void setDefitem48(String defitem48) {
+        this.defitem48 = defitem48;
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(amount, tablecode, rowno, szxmid, defitem50, defitem49, defitem42, defitem43, defitem44, defitem45, defitem46, defitem48);
+    }
+
+    @Override
+    public String toString() {
+        return "{" +
+                "amount='" + amount + '\'' +
+                ", tablecode='" + tablecode + '\'' +
+                ", rowno='" + rowno + '\'' +
+                ", szxmid='" + szxmid + '\'' +
+                ", defitem50='" + defitem50 + '\'' +
+                ", defitem49='" + defitem49 + '\'' +
+                ", defitem42='" + defitem42 + '\'' +
+                ", defitem43='" + defitem43 + '\'' +
+                ", defitem44='" + defitem44 + '\'' +
+                ", defitem45='" + defitem45 + '\'' +
+                ", defitem46='" + defitem46 + '\'' +
+                ", defitem48='" + defitem48 + '\'' +
+                '}';
+    }
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/entity/BorrowOrderBodyYY.java b/src/main/youhong_ai_jitu_src/jntchina/entity/BorrowOrderBodyYY.java
new file mode 100644
index 0000000..da43c82
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/entity/BorrowOrderBodyYY.java
@@ -0,0 +1,167 @@
+package jntchina.entity;
+
+import java.io.Serializable;
+import java.util.Objects;
+
+/**
+ * @Author Administrator
+ * @Description 借款单表体（明细表）
+ * @Date 2021/1/8  12:14
+ */
+public class BorrowOrderBodyYY implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private String amount; // 1000.00 //金额
+    private String tablecode; // jk_busitem
+    private String rowno; // 10
+    private String szxmid; // 收支项目  101005 电子面单号段费
+    private String defitem50; // 发票类型
+    private String defitem49; // 发票号码
+    private String defitem42; // OA明细ID
+    private String defitem43; // 车牌号
+    private String defitem44; // 仓库
+    private String defitem45; // 国家
+    private String defitem46; // 网点（成本中心）
+    private String defitem48; // SD3300301" //分摊部门
+    private String deptidIsNeedConvert ;
+    private String defitem48IsNeedConvert;
+
+    @Override
+    public String toString() {
+        return "BorrowOrderBodyYY{" +
+                "amount='" + amount + '\'' +
+                ", tablecode='" + tablecode + '\'' +
+                ", rowno='" + rowno + '\'' +
+                ", szxmid='" + szxmid + '\'' +
+                ", defitem50='" + defitem50 + '\'' +
+                ", defitem49='" + defitem49 + '\'' +
+                ", defitem42='" + defitem42 + '\'' +
+                ", defitem43='" + defitem43 + '\'' +
+                ", defitem44='" + defitem44 + '\'' +
+                ", defitem45='" + defitem45 + '\'' +
+                ", defitem46='" + defitem46 + '\'' +
+                ", defitem48='" + defitem48 + '\'' +
+                ", deptidIsNeedConvert='" + deptidIsNeedConvert + '\'' +
+                ", defitem48IsNeedConvert='" + defitem48IsNeedConvert + '\'' +
+                '}';
+    }
+
+    public String getDefitem48IsNeedConvert() {
+        return defitem48IsNeedConvert;
+    }
+
+    public void setDefitem48IsNeedConvert(String defitem48IsNeedConvert) {
+        this.defitem48IsNeedConvert = defitem48IsNeedConvert;
+    }
+
+    public String getDeptidIsNeedConvert() {
+        return deptidIsNeedConvert;
+    }
+
+    public void setDeptidIsNeedConvert(String deptidIsNeedConvert) {
+        this.deptidIsNeedConvert = deptidIsNeedConvert;
+    }
+
+    public String getAmount() {
+        return amount;
+    }
+
+    public void setAmount(String amount) {
+        this.amount = amount;
+    }
+
+    public String getTablecode() {
+        return tablecode;
+    }
+
+    public void setTablecode(String tablecode) {
+        this.tablecode = tablecode;
+    }
+
+    public String getRowno() {
+        return rowno;
+    }
+
+    public void setRowno(String rowno) {
+        this.rowno = rowno;
+    }
+
+    public String getSzxmid() {
+        return szxmid;
+    }
+
+    public void setSzxmid(String szxmid) {
+        this.szxmid = szxmid;
+    }
+
+    public String getDefitem50() {
+        return defitem50;
+    }
+
+    public void setDefitem50(String defitem50) {
+        this.defitem50 = defitem50;
+    }
+
+    public String getDefitem49() {
+        return defitem49;
+    }
+
+    public void setDefitem49(String defitem49) {
+        this.defitem49 = defitem49;
+    }
+
+    public String getDefitem42() {
+        return defitem42;
+    }
+
+    public void setDefitem42(String defitem42) {
+        this.defitem42 = defitem42;
+    }
+
+    public String getDefitem43() {
+        return defitem43;
+    }
+
+    public void setDefitem43(String defitem43) {
+        this.defitem43 = defitem43;
+    }
+
+    public String getDefitem44() {
+        return defitem44;
+    }
+
+    public void setDefitem44(String defitem44) {
+        this.defitem44 = defitem44;
+    }
+
+    public String getDefitem45() {
+        return defitem45;
+    }
+
+    public void setDefitem45(String defitem45) {
+        this.defitem45 = defitem45;
+    }
+
+    public String getDefitem46() {
+        return defitem46;
+    }
+
+    public void setDefitem46(String defitem46) {
+        this.defitem46 = defitem46;
+    }
+
+    public String getDefitem48() {
+        return defitem48;
+    }
+
+    public void setDefitem48(String defitem48) {
+        this.defitem48 = defitem48;
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(amount, tablecode, rowno, szxmid, defitem50, defitem49, defitem42, defitem43, defitem44, defitem45, defitem46, defitem48);
+    }
+
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/entity/BorrowOrderYY.java b/src/main/youhong_ai_jitu_src/jntchina/entity/BorrowOrderYY.java
new file mode 100644
index 0000000..8dd0ec4
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/entity/BorrowOrderYY.java
@@ -0,0 +1,319 @@
+package jntchina.entity;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * @Author Administrator
+ * @Description 借款单
+ * @Date 2021/1/16  11:23
+ */
+public class BorrowOrderYY implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private String uuid; //主键
+    private String pk_org; // JTSDCN0001 //借款单位编码
+    private String total; // 1000.00 //合计金额
+    private String deptid; // SD3300101 //借款人部门
+    private String djlxbm; // 263X-Cxx-DSJKD", //交易类型编码 263X-Cxx-DSJKD:对私借款单    263X-Cxx-DGJKD:对公预付/借款单
+    private String djrq; // 2021-03-05 10:17:10", //单据日期
+    private String payflag; //1", //支付状态
+    private String paytarget; // 0" //收款对象（0=员工，1=供应商）
+    private String hbbm; // 供应商编码
+    private String receiver; // yonyou88", //收款人
+    private String jkbxr; // yonyou88  //借款报销人
+    private String operator; // yonyou88  //录入人
+    private String jsfs; // 3 //结算方式 3 网银 。。。
+    private String fkyhzh; //付款银行账户
+    private String skyhzh; //收款银行账户（员工）
+    private String custaccount; //收款银行账户（供应商）
+    private String jobid; //项目
+    private String zy; //借款测试", //事由
+    private String djzt; // 1", //单据状态 1 保存
+    private String kjqj; // 03", //会计期间
+    private String kjnd; // 2021", //会计年度
+    private String zyx1; // CSBX21020501", //OA单据号
+    private String zyx2; // 提交人
+    private String zyx3; // OA核销单号
+    private String zyx5; // CSBX21020501", // OARequestID
+    private String zyx8; // 银行付款备注
+    private String zyx9; // OA流程标题
+    private List<BorrowOrderBodyYY> jk_busitem;
+
+    @Override
+    public String toString() {
+        return "BorrowOrderYY{" +
+                "uuid='" + uuid + '\'' +
+                ", pk_org='" + pk_org + '\'' +
+                ", total='" + total + '\'' +
+                ", deptid='" + deptid + '\'' +
+                ", djlxbm='" + djlxbm + '\'' +
+                ", djrq='" + djrq + '\'' +
+                ", payflag='" + payflag + '\'' +
+                ", paytarget='" + paytarget + '\'' +
+                ", hbbm='" + hbbm + '\'' +
+                ", receiver='" + receiver + '\'' +
+                ", jkbxr='" + jkbxr + '\'' +
+                ", operator='" + operator + '\'' +
+                ", jsfs='" + jsfs + '\'' +
+                ", fkyhzh='" + fkyhzh + '\'' +
+                ", skyhzh='" + skyhzh + '\'' +
+                ", custaccount='" + custaccount + '\'' +
+                ", jobid='" + jobid + '\'' +
+                ", zy='" + zy + '\'' +
+                ", djzt='" + djzt + '\'' +
+                ", kjqj='" + kjqj + '\'' +
+                ", kjnd='" + kjnd + '\'' +
+                ", zyx1='" + zyx1 + '\'' +
+                ", zyx2='" + zyx2 + '\'' +
+                ", zyx3='" + zyx3 + '\'' +
+                ", zyx5='" + zyx5 + '\'' +
+                ", zyx8='" + zyx8 + '\'' +
+                ", zyx9='" + zyx9 + '\'' +
+                ", jk_busitem=" + jk_busitem +
+                ", deptidIsNeedConvert='" + deptidIsNeedConvert + '\'' +
+                '}';
+    }
+
+    public String getDeptidIsNeedConvert() {
+        return deptidIsNeedConvert;
+    }
+
+    public void setDeptidIsNeedConvert(String deptidIsNeedConvert) {
+        this.deptidIsNeedConvert = deptidIsNeedConvert;
+    }
+
+    private String deptidIsNeedConvert ;
+
+    public String getPk_org() {
+        return pk_org;
+    }
+
+    public String getCustaccount() {
+		return custaccount;
+	}
+
+	public String getZyx9() {
+		return zyx9;
+	}
+
+	public void setZyx9(String zyx9) {
+		this.zyx9 = zyx9;
+	}
+
+	public void setCustaccount(String custaccount) {
+		this.custaccount = custaccount;
+	}
+
+	public String getHbbm() {
+		return hbbm;
+	}
+
+	public String getUuid() {
+		return uuid;
+	}
+
+	public void setUuid(String uuid) {
+		this.uuid = uuid;
+	}
+
+	public void setHbbm(String hbbm) {
+		this.hbbm = hbbm;
+	}
+
+	public void setPk_org(String pk_org) {
+        this.pk_org = pk_org;
+    }
+
+    public String getTotal() {
+        return total;
+    }
+
+    public void setTotal(String total) {
+        this.total = total;
+    }
+
+    public String getDeptid() {
+        return deptid;
+    }
+
+    public String getZyx8() {
+		return zyx8;
+	}
+
+	public void setZyx8(String zyx8) {
+		this.zyx8 = zyx8;
+	}
+
+	public void setDeptid(String deptid) {
+        this.deptid = deptid;
+    }
+
+    public String getDjlxbm() {
+        return djlxbm;
+    }
+
+    public void setDjlxbm(String djlxbm) {
+        this.djlxbm = djlxbm;
+    }
+
+    public String getDjrq() {
+        return djrq;
+    }
+
+    public void setDjrq(String djrq) {
+        this.djrq = djrq;
+    }
+
+    public String getPayflag() {
+        return payflag;
+    }
+
+    public void setPayflag(String payflag) {
+        this.payflag = payflag;
+    }
+
+    public String getPaytarget() {
+        return paytarget;
+    }
+
+    public void setPaytarget(String paytarget) {
+        this.paytarget = paytarget;
+    }
+
+    public String getReceiver() {
+        return receiver;
+    }
+
+    public void setReceiver(String receiver) {
+        this.receiver = receiver;
+    }
+
+    public String getJkbxr() {
+        return jkbxr;
+    }
+
+    public void setJkbxr(String jkbxr) {
+        this.jkbxr = jkbxr;
+    }
+
+    public String getOperator() {
+        return operator;
+    }
+
+    public void setOperator(String operator) {
+        this.operator = operator;
+    }
+
+    public String getJsfs() {
+        return jsfs;
+    }
+
+    public void setJsfs(String jsfs) {
+        this.jsfs = jsfs;
+    }
+
+    public String getFkyhzh() {
+        return fkyhzh;
+    }
+
+    public void setFkyhzh(String fkyhzh) {
+        this.fkyhzh = fkyhzh;
+    }
+
+    public String getJobid() {
+        return jobid;
+    }
+
+    public void setJobid(String jobid) {
+        this.jobid = jobid;
+    }
+
+    public String getZy() {
+        return zy;
+    }
+
+    public void setZy(String zy) {
+        this.zy = zy;
+    }
+
+    public String getDjzt() {
+        return djzt;
+    }
+
+    public void setDjzt(String djzt) {
+        this.djzt = djzt;
+    }
+
+    public String getKjqj() {
+        return kjqj;
+    }
+
+    public void setKjqj(String kjqj) {
+        this.kjqj = kjqj;
+    }
+
+    public String getKjnd() {
+        return kjnd;
+    }
+
+    public void setKjnd(String kjnd) {
+        this.kjnd = kjnd;
+    }
+
+    public String getZyx1() {
+        return zyx1;
+    }
+
+    public void setZyx1(String zyx1) {
+        this.zyx1 = zyx1;
+    }
+
+    public String getZyx2() {
+        return zyx2;
+    }
+
+    public void setZyx2(String zyx2) {
+        this.zyx2 = zyx2;
+    }
+
+    public String getZyx3() {
+        return zyx3;
+    }
+
+    public void setZyx3(String zyx3) {
+        this.zyx3 = zyx3;
+    }
+
+    public String getZyx5() {
+        return zyx5;
+    }
+
+    public void setZyx5(String zyx5) {
+        this.zyx5 = zyx5;
+    }
+
+    public List<BorrowOrderBodyYY> getJk_busitem() {
+        return jk_busitem;
+    }
+
+    public void setJk_busitem(List<BorrowOrderBodyYY> jk_busitem) {
+        this.jk_busitem = jk_busitem;
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(pk_org, total, deptid, djlxbm, djrq, payflag, paytarget, receiver, jkbxr, operator, jsfs, fkyhzh, jobid, zy, djzt, kjqj, kjnd, zyx1, zyx2, zyx3, zyx5, jk_busitem);
+    }
+
+    public String getSkyhzh() {
+		return skyhzh;
+	}
+
+	public void setSkyhzh(String skyhzh) {
+		this.skyhzh = skyhzh;
+	}
+
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/entity/ChangeInfo.java b/src/main/youhong_ai_jitu_src/jntchina/entity/ChangeInfo.java
new file mode 100644
index 0000000..ad0ee2b
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/entity/ChangeInfo.java
@@ -0,0 +1,98 @@
+package jntchina.entity;
+
+import java.io.Serializable;
+
+/**
+ * @title: ChangeInfo
+ * @Author ycf
+ * @Date: 2021/10/28 14:41
+ * @Version 1.0
+ */
+public class ChangeInfo implements Serializable {
+    //企业id
+    private String mainid;
+    //日期
+    private String rq;
+    //变更项目
+    private String bgxm;
+    //变更前
+    private String bgq;
+    //变更后
+    private String bgh;
+    //附件
+    private String fj;
+    //备注
+    private String bz;
+
+    public ChangeInfo() {
+    }
+
+    @Override
+    public String toString() {
+        return "ChangeInfo{" +
+                "mainid='" + mainid + '\'' +
+                ", rq='" + rq + '\'' +
+                ", bgxm='" + bgxm + '\'' +
+                ", bgq='" + bgq + '\'' +
+                ", bgh='" + bgh + '\'' +
+                ", fj='" + fj + '\'' +
+                ", bz='" + bz + '\'' +
+                '}';
+    }
+
+    public String getMainid() {
+        return mainid;
+    }
+
+    public void setMainid(String mainid) {
+        this.mainid = mainid;
+    }
+
+    public String getRq() {
+        return rq;
+    }
+
+    public void setRq(String rq) {
+        this.rq = rq;
+    }
+
+    public String getBgxm() {
+        return bgxm;
+    }
+
+    public void setBgxm(String bgxm) {
+        this.bgxm = bgxm;
+    }
+
+    public String getBgq() {
+        return bgq;
+    }
+
+    public void setBgq(String bgq) {
+        this.bgq = bgq;
+    }
+
+    public String getBgh() {
+        return bgh;
+    }
+
+    public void setBgh(String bgh) {
+        this.bgh = bgh;
+    }
+
+    public String getFj() {
+        return fj;
+    }
+
+    public void setFj(String fj) {
+        this.fj = fj;
+    }
+
+    public String getBz() {
+        return bz;
+    }
+
+    public void setBz(String bz) {
+        this.bz = bz;
+    }
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/entity/EnterInfo.java b/src/main/youhong_ai_jitu_src/jntchina/entity/EnterInfo.java
new file mode 100644
index 0000000..6f7f7e5
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/entity/EnterInfo.java
@@ -0,0 +1,93 @@
+//package jntchina.entity;
+//
+///**
+// * @title: EnterInfo
+// * @Author ycf
+// * @Date: 2021/11/5 09:07
+// * @Version 1.0
+// */
+//public class EnterInfo {
+//    //企业id
+//    private String mainid;
+//    //日期
+//    private String rq;
+//    //变更项目
+//    private String bgxm;
+//    //变更前
+//    private String bgq;
+//    //变更后
+//    private String bgh;
+//    //附件
+//    private String fj;
+//    //备注
+//    private String bz;
+//
+//    @Override
+//    public String toString() {
+//        return "EnterInfo{" +
+//                "mainid='" + mainid + '\'' +
+//                ", rq='" + rq + '\'' +
+//                ", bgxm='" + bgxm + '\'' +
+//                ", bgq='" + bgq + '\'' +
+//                ", bgh='" + bgh + '\'' +
+//                ", fj='" + fj + '\'' +
+//                ", bz='" + bz + '\'' +
+//                '}';
+//    }
+//
+//    public String getMainid() {
+//        return mainid;
+//    }
+//
+//    public void setMainid(String mainid) {
+//        this.mainid = mainid;
+//    }
+//
+//    public String getRq() {
+//        return rq;
+//    }
+//
+//    public void setRq(String rq) {
+//        this.rq = rq;
+//    }
+//
+//    public String getBgxm() {
+//        return bgxm;
+//    }
+//
+//    public void setBgxm(String bgxm) {
+//        this.bgxm = bgxm;
+//    }
+//
+//    public String getBgq() {
+//        return bgq;
+//    }
+//
+//    public void setBgq(String bgq) {
+//        this.bgq = bgq;
+//    }
+//
+//    public String getBgh() {
+//        return bgh;
+//    }
+//
+//    public void setBgh(String bgh) {
+//        this.bgh = bgh;
+//    }
+//
+//    public String getFj() {
+//        return fj;
+//    }
+//
+//    public void setFj(String fj) {
+//        this.fj = fj;
+//    }
+//
+//    public String getBz() {
+//        return bz;
+//    }
+//
+//    public void setBz(String bz) {
+//        this.bz = bz;
+//    }
+//}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/entity/ErBxcontrast.java b/src/main/youhong_ai_jitu_src/jntchina/entity/ErBxcontrast.java
new file mode 100644
index 0000000..9e851f9
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/entity/ErBxcontrast.java
@@ -0,0 +1,82 @@
+package jntchina.entity;
+
+
+/**
+ * @ClassName ErBxcontrast
+ * @Description 冲借款信息
+ * @Author louh
+ * @Date 2022/5/5 15:04
+ * @Version 1.0
+ */
+public class ErBxcontrast {
+    private String jkbillcode;  //ncc借款单号
+    private String szxmid; //收支项目编码, 为空默认901017--团队活动费.
+    private String cxmny; //冲销金额
+    private String jkitemid; //借款单明细id
+    private String fkitemid; //NC付款单明细id
+
+    public ErBxcontrast(String jkbillcode,
+                        String szxmid,
+                        String cxmny,
+                        String jkitemid,
+                        String fkitemid) {
+        this.jkbillcode = jkbillcode;
+        this.szxmid = szxmid == "" ? "901017" : szxmid;
+        this.cxmny = cxmny;
+        this.jkitemid = jkitemid;
+        this.fkitemid = fkitemid;
+    }
+
+    private ErBxcontrast(){}
+
+    public String getJkbillcode() {
+        return jkbillcode;
+    }
+
+    public void setJkbillcode(String jkbillcode) {
+        this.jkbillcode = jkbillcode;
+    }
+
+    public String getSzxmid() {
+        return szxmid;
+    }
+
+    public void setSzxmid(String szxmid) {
+        this.szxmid = szxmid == "" ? "901017" : szxmid;
+    }
+
+    public String getCxmny() {
+        return cxmny;
+    }
+
+    public void setCxmny(String cxmny) {
+        this.cxmny = cxmny;
+    }
+
+    public String getJkitemid() {
+        return jkitemid;
+    }
+
+    public void setJkitemid(String jkitemid) {
+        this.jkitemid = jkitemid;
+    }
+
+    public String getFkitemid() {
+        return fkitemid;
+    }
+
+    public void setFkitemid(String fkitemid) {
+        this.fkitemid = fkitemid;
+    }
+
+    @Override
+    public String toString() {
+        return "ErBxcontrast{" +
+                "jkbillcode='" + jkbillcode + '\'' +
+                ", szxmid='" + szxmid + '\'' +
+                ", cxmny='" + cxmny + '\'' +
+                ", jkitemid='" + jkitemid + '\'' +
+                ", fkitemid='" + fkitemid + '\'' +
+                '}';
+    }
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/entity/ReimbursementOrder.java b/src/main/youhong_ai_jitu_src/jntchina/entity/ReimbursementOrder.java
new file mode 100644
index 0000000..7291bfc
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/entity/ReimbursementOrder.java
@@ -0,0 +1,377 @@
+package jntchina.entity;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * @Author Administrator
+ * @Description 报销单
+ * @Date 2021/1/16  11:23
+ */
+public class ReimbursementOrder implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private String uuid; //主键
+    private String pk_org; // 报销单位 JTSDCN0001
+    private String total; // 报销金额   金额由表体相应字段汇总得出
+    private String deptid; // 部门   传输编码
+    private String djlxbm; // 单据类型编码   对私报销单:264X-Cxx-DSBXD  对公报销单:264X-Cxx-DGBXD
+    private String djrq; // 单据日期   yyyy-mm-dd hh:mm:ss
+    private String payflag; // 支付状态
+    private String paytarget; // 受款对象   0=员工，1=供应商，2=客户
+    private String hbbm; // 收款人(供应商)
+    private String receiver; // 收款人(员工)
+    private String skyhzh; //收款银行账户（员工）
+    private String custaccount; //收款银行账户（供应商）
+    private String jkbxr; // 借款报销人   传输编码
+    private String operator; // 录入人
+    private String jsfs; // 结算方式 3 网银
+    private String fkyhzh; // 单位银行账户 传输编码
+    private String jobid; // 项目
+    private String zy; // 报销事由
+    private String kjqj; // 会计期间
+    private String kjnd; // 会计年度
+    private String fjzs; // 附件张数   需业务人员在OA上传附件同时填写附件张数后传数据到NCC
+    private String zyx1; // OA单据号   OA传过来，用于联查单据
+    private String zyx2; // 提交人    提交人姓名
+	private String zyx3; // OA核销单号
+    private String zyx5; // OARequestID
+
+    private String zyx8; // 银行付款备注
+    private String zyx9; // OA流程标题
+
+
+
+    private List<ReimbursementOrderBody> er_busitem;
+    private List<ErBxcontrast> er_bxcontrast;
+
+    public String getPk_org() {
+        return pk_org;
+    }
+
+    public String getHbbm() {
+		return hbbm;
+	}
+
+	public void setHbbm(String hbbm) {
+		this.hbbm = hbbm;
+	}
+
+	public void setPk_org(String pk_org) {
+        this.pk_org = pk_org;
+    }
+
+    public String getZyx9() {
+		return zyx9;
+	}
+
+	public void setZyx9(String zyx9) {
+		this.zyx9 = zyx9;
+	}
+
+	public String getZyx8() {
+		return zyx8;
+	}
+    public String getSkyhzh() {
+		return skyhzh;
+	}
+
+	public void setSkyhzh(String skyhzh) {
+		this.skyhzh = skyhzh;
+	}
+	public String getCustaccount() {
+		return custaccount;
+	}
+
+	public void setCustaccount(String custaccount) {
+		this.custaccount = custaccount;
+	}
+
+	public String getUuid() {
+		return uuid;
+	}
+
+	public void setUuid(String uuid) {
+		this.uuid = uuid;
+	}
+
+	public void setZyx8(String zyx8) {
+		this.zyx8 = zyx8;
+	}
+
+	public String getTotal() {
+        return total;
+    }
+
+    public void setTotal(String total) {
+        this.total = total;
+    }
+
+    public String getDeptid() {
+        return deptid;
+    }
+
+    public void setDeptid(String deptid) {
+        this.deptid = deptid;
+    }
+
+    public String getDjlxbm() {
+        return djlxbm;
+    }
+
+    public void setDjlxbm(String djlxbm) {
+        this.djlxbm = djlxbm;
+    }
+
+    public String getDjrq() {
+        return djrq;
+    }
+
+    public void setDjrq(String djrq) {
+        this.djrq = djrq;
+    }
+
+    public String getPayflag() {
+        return payflag;
+    }
+
+    public void setPayflag(String payflag) {
+        this.payflag = payflag;
+    }
+
+    public String getPaytarget() {
+        return paytarget;
+    }
+
+    public void setPaytarget(String paytarget) {
+        this.paytarget = paytarget;
+    }
+
+    public String getReceiver() {
+        return receiver;
+    }
+
+    public void setReceiver(String receiver) {
+        this.receiver = receiver;
+    }
+
+    public String getJkbxr() {
+        return jkbxr;
+    }
+
+    public void setJkbxr(String jkbxr) {
+        this.jkbxr = jkbxr;
+    }
+
+    public String getOperator() {
+        return operator;
+    }
+
+    public void setOperator(String operator) {
+        this.operator = operator;
+    }
+
+    public String getJsfs() {
+        return jsfs;
+    }
+
+    public void setJsfs(String jsfs) {
+        this.jsfs = jsfs;
+    }
+
+    public String getFkyhzh() {
+        return fkyhzh;
+    }
+
+    public void setFkyhzh(String fkyhzh) {
+        this.fkyhzh = fkyhzh;
+    }
+
+    public String getJobid() {
+        return jobid;
+    }
+
+    public void setJobid(String jobid) {
+        this.jobid = jobid;
+    }
+
+    public String getZy() {
+        return zy;
+    }
+
+    public void setZy(String zy) {
+        this.zy = zy;
+    }
+
+    public String getKjqj() {
+        return kjqj;
+    }
+
+    public void setKjqj(String kjqj) {
+        this.kjqj = kjqj;
+    }
+
+    public String getKjnd() {
+        return kjnd;
+    }
+
+    public void setKjnd(String kjnd) {
+        this.kjnd = kjnd;
+    }
+
+    public String getFjzs() {
+        return fjzs;
+    }
+
+    public void setFjzs(String fjzs) {
+        this.fjzs = fjzs;
+    }
+
+    public String getZyx1() {
+        return zyx1;
+    }
+
+    public void setZyx1(String zyx1) {
+        this.zyx1 = zyx1;
+    }
+
+    public String getZyx2() {
+        return zyx2;
+    }
+
+    public void setZyx2(String zyx2) {
+        this.zyx2 = zyx2;
+    }
+
+    public String getZyx3() {
+        return zyx3;
+    }
+
+    public void setZyx3(String zyx3) {
+        this.zyx3 = zyx3;
+    }
+
+    public String getZyx5() {
+        return zyx5;
+    }
+
+    public void setZyx5(String zyx5) {
+        this.zyx5 = zyx5;
+    }
+
+    public List<ReimbursementOrderBody> getEr_busitem() {
+        return er_busitem;
+    }
+
+    public void setEr_busitem(List<ReimbursementOrderBody> er_busitem) {
+        this.er_busitem = er_busitem;
+    }
+
+    public List<ErBxcontrast> getEr_bxcontrast() {
+        return er_bxcontrast;
+    }
+
+    public void setEr_bxcontrast(List<ErBxcontrast> er_bxcontrast) {
+        this.er_bxcontrast = er_bxcontrast;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        ReimbursementOrder that = (ReimbursementOrder) o;
+        return Objects.equals(pk_org, that.pk_org) &&
+                Objects.equals(total, that.total) &&
+                Objects.equals(deptid, that.deptid) &&
+                Objects.equals(djlxbm, that.djlxbm) &&
+                Objects.equals(djrq, that.djrq) &&
+                Objects.equals(payflag, that.payflag) &&
+                Objects.equals(paytarget, that.paytarget) &&
+                Objects.equals(receiver, that.receiver) &&
+                Objects.equals(jkbxr, that.jkbxr) &&
+                Objects.equals(operator, that.operator) &&
+                Objects.equals(jsfs, that.jsfs) &&
+                Objects.equals(fkyhzh, that.fkyhzh) &&
+                Objects.equals(jobid, that.jobid) &&
+                Objects.equals(zy, that.zy) &&
+                Objects.equals(kjqj, that.kjqj) &&
+                Objects.equals(kjnd, that.kjnd) &&
+                Objects.equals(fjzs, that.fjzs) &&
+                Objects.equals(zyx1, that.zyx1) &&
+                Objects.equals(zyx2, that.zyx2) &&
+                Objects.equals(zyx3, that.zyx3) &&
+                Objects.equals(zyx5, that.zyx5) &&
+                Objects.equals(er_busitem, that.er_busitem);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(pk_org, total, deptid, djlxbm, djrq, payflag, paytarget, receiver, jkbxr, operator, jsfs, fkyhzh, jobid, zy, kjqj, kjnd, fjzs, zyx1, zyx2, zyx3, zyx5, er_busitem);
+    }
+
+//    @Override
+//    public String toString() {
+//        return "{" +
+//                "pk_org='" + pk_org + '\'' +
+//                ", total='" + total + '\'' +
+//                ", deptid='" + deptid + '\'' +
+//                ", djlxbm='" + djlxbm + '\'' +
+//                ", djrq='" + djrq + '\'' +
+//                ", payflag='" + payflag + '\'' +
+//                ", paytarget='" + paytarget + '\'' +
+//                ", receiver='" + receiver + '\'' +
+//                ", jkbxr='" + jkbxr + '\'' +
+//                ", operator='" + operator + '\'' +
+//                ", jsfs='" + jsfs + '\'' +
+//                ", fkyhzh='" + fkyhzh + '\'' +
+//                ", jobid='" + jobid + '\'' +
+//                ", zy='" + zy + '\'' +
+//                ", kjqj='" + kjqj + '\'' +
+//                ", kjnd='" + kjnd + '\'' +
+//                ", fjzs='" + fjzs + '\'' +
+//                ", zyx1='" + zyx1 + '\'' +
+//                ", zyx2='" + zyx2 + '\'' +
+//                ", zyx3='" + zyx3 + '\'' +
+//                ", zyx5='" + zyx5 + '\'' +
+//                ", er_busitem=" + er_busitem +
+//                '}';
+//    }
+
+
+    @Override
+    public String toString() {
+        return "ReimbursementOrder{" +
+                "uuid='" + uuid + '\'' +
+                ", pk_org='" + pk_org + '\'' +
+                ", total='" + total + '\'' +
+                ", deptid='" + deptid + '\'' +
+                ", djlxbm='" + djlxbm + '\'' +
+                ", djrq='" + djrq + '\'' +
+                ", payflag='" + payflag + '\'' +
+                ", paytarget='" + paytarget + '\'' +
+                ", hbbm='" + hbbm + '\'' +
+                ", receiver='" + receiver + '\'' +
+                ", skyhzh='" + skyhzh + '\'' +
+                ", custaccount='" + custaccount + '\'' +
+                ", jkbxr='" + jkbxr + '\'' +
+                ", operator='" + operator + '\'' +
+                ", jsfs='" + jsfs + '\'' +
+                ", fkyhzh='" + fkyhzh + '\'' +
+                ", jobid='" + jobid + '\'' +
+                ", zy='" + zy + '\'' +
+                ", kjqj='" + kjqj + '\'' +
+                ", kjnd='" + kjnd + '\'' +
+                ", fjzs='" + fjzs + '\'' +
+                ", zyx1='" + zyx1 + '\'' +
+                ", zyx2='" + zyx2 + '\'' +
+                ", zyx3='" + zyx3 + '\'' +
+                ", zyx5='" + zyx5 + '\'' +
+                ", zyx8='" + zyx8 + '\'' +
+                ", zyx9='" + zyx9 + '\'' +
+                ", er_busitem=" + er_busitem +
+                ", er_bxcontrast=" + er_bxcontrast +
+                '}';
+    }
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/entity/ReimbursementOrderBody.java b/src/main/youhong_ai_jitu_src/jntchina/entity/ReimbursementOrderBody.java
new file mode 100644
index 0000000..117c1d0
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/entity/ReimbursementOrderBody.java
@@ -0,0 +1,238 @@
+package jntchina.entity;
+
+import java.io.Serializable;
+import java.util.Objects;
+
+/**
+ * @Author Administrator
+ * @Description 报销单表体（明细表）
+ * @Date 2021/1/8  12:14
+ */
+public class ReimbursementOrderBody implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private String jobid; // 项目
+    private String deptid; // 报销部门
+    private String amount; // 含税金额
+    private String tax_rate; // 税率 3%
+    private String tax_amount; // 税额
+    private String tni_amount; // 无税金额
+    private String defitem36; // 发票金额
+    private String tablecode; // 默认固定值 arap_bxbusitem
+    private String rowno;
+    private String szxmid; // 收支项目  0101 汽车费用
+    private String fpdm; //发票代码
+    private String fphm; //发票号码
+    private String fplxpk; //发票类型
+    private String defitem46; // 网点（成本中心）
+    private String defitem45; // 国家
+    private String defitem44; // 仓库
+    private String defitem43; // 车牌号
+    private String defitem42; // OA明细行ID
+    private String defitem48; // 分摊部门 
+
+    public String getJobid() {
+        return jobid;
+    }
+
+    public void setJobid(String jobid) {
+        this.jobid = jobid;
+    }
+
+    public String getDeptid() {
+        return deptid;
+    }
+
+    public void setDeptid(String deptid) {
+        this.deptid = deptid;
+    }
+
+    public String getFplxpk() {
+		return fplxpk;
+	}
+
+	public void setFplxpk(String fplxpk) {
+		this.fplxpk = fplxpk;
+	}
+
+	public String getAmount() {
+        return amount;
+    }
+
+    public void setAmount(String amount) {
+        this.amount = amount;
+    }
+
+    public String getDefitem36() {
+		return defitem36;
+	}
+
+	public void setDefitem36(String defitem36) {
+		this.defitem36 = defitem36;
+	}
+
+	public String getTax_rate() {
+        return tax_rate;
+    }
+
+    public void setTax_rate(String tax_rate) {
+        this.tax_rate = tax_rate;
+    }
+
+    public String getTax_amount() {
+        return tax_amount;
+    }
+
+    public void setTax_amount(String tax_amount) {
+        this.tax_amount = tax_amount;
+    }
+
+    public String getTni_amount() {
+        return tni_amount;
+    }
+
+    public void setTni_amount(String tni_amount) {
+        this.tni_amount = tni_amount;
+    }
+
+    public String getTablecode() {
+        return tablecode;
+    }
+
+    public void setTablecode(String tablecode) {
+        this.tablecode = tablecode;
+    }
+
+    public String getRowno() {
+        return rowno;
+    }
+
+    public void setRowno(String rowno) {
+        this.rowno = rowno;
+    }
+
+    public String getSzxmid() {
+        return szxmid;
+    }
+
+    public void setSzxmid(String szxmid) {
+        this.szxmid = szxmid;
+    }
+
+    public String getDefitem46() {
+        return defitem46;
+    }
+
+    public void setDefitem46(String defitem46) {
+        this.defitem46 = defitem46;
+    }
+
+    public String getDefitem45() {
+        return defitem45;
+    }
+
+    public void setDefitem45(String defitem45) {
+        this.defitem45 = defitem45;
+    }
+
+    public String getDefitem44() {
+        return defitem44;
+    }
+
+    public void setDefitem44(String defitem44) {
+        this.defitem44 = defitem44;
+    }
+
+    public String getDefitem43() {
+        return defitem43;
+    }
+
+    public void setDefitem43(String defitem43) {
+        this.defitem43 = defitem43;
+    }
+
+    public String getDefitem42() {
+        return defitem42;
+    }
+
+    public void setDefitem42(String defitem42) {
+        this.defitem42 = defitem42;
+    }
+
+    public String getFpdm() {
+        return fpdm;
+    }
+
+    public void setFpdm(String fpdm) {
+        this.fpdm = fpdm;
+    }
+
+    public String getFphm() {
+        return fphm;
+    }
+
+    public void setFphm(String fphm) {
+        this.fphm = fphm;
+    }
+
+    public String getDefitem48() {
+        return defitem48;
+    }
+
+    public void setDefitem48(String defitem48) {
+        this.defitem48 = defitem48;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        ReimbursementOrderBody that = (ReimbursementOrderBody) o;
+        return Objects.equals(jobid, that.jobid) &&
+                Objects.equals(deptid, that.deptid) &&
+                Objects.equals(amount, that.amount) &&
+                Objects.equals(tax_rate, that.tax_rate) &&
+                Objects.equals(tax_amount, that.tax_amount) &&
+                Objects.equals(tni_amount, that.tni_amount) &&
+                Objects.equals(tablecode, that.tablecode) &&
+                Objects.equals(rowno, that.rowno) &&
+                Objects.equals(szxmid, that.szxmid) &&
+                Objects.equals(fpdm, that.fpdm) &&
+                Objects.equals(fphm, that.fphm) &&
+                Objects.equals(defitem46, that.defitem46) &&
+                Objects.equals(defitem45, that.defitem45) &&
+                Objects.equals(defitem44, that.defitem44) &&
+                Objects.equals(defitem43, that.defitem43) &&
+                Objects.equals(defitem42, that.defitem42) &&
+                Objects.equals(defitem48, that.defitem48);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(jobid, deptid, amount, tax_rate, tax_amount, tni_amount, tablecode, rowno, szxmid, fpdm, fphm, defitem46, defitem45, defitem44, defitem43, defitem42, defitem48);
+    }
+
+    @Override
+    public String toString() {
+        return "{" +
+                "jobid='" + jobid + '\'' +
+                ", deptid='" + deptid + '\'' +
+                ", amount='" + amount + '\'' +
+                ", tax_rate='" + tax_rate + '\'' +
+                ", tax_amount='" + tax_amount + '\'' +
+                ", tni_amount='" + tni_amount + '\'' +
+                ", tablecode='" + tablecode + '\'' +
+                ", rowno='" + rowno + '\'' +
+                ", szxmid='" + szxmid + '\'' +
+                ", fpdm='" + fpdm + '\'' +
+                ", fphm='" + fphm + '\'' +
+                ", defitem46='" + defitem46 + '\'' +
+                ", defitem45='" + defitem45 + '\'' +
+                ", defitem44='" + defitem44 + '\'' +
+                ", defitem43='" + defitem43 + '\'' +
+                ", defitem42='" + defitem42 + '\'' +
+                ", defitem48='" + defitem48 + '\'' +
+                '}';
+    }
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/entity/ReimbursementOrderBodyYY.java b/src/main/youhong_ai_jitu_src/jntchina/entity/ReimbursementOrderBodyYY.java
new file mode 100644
index 0000000..06ef61c
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/entity/ReimbursementOrderBodyYY.java
@@ -0,0 +1,252 @@
+package jntchina.entity;
+
+import java.io.Serializable;
+import java.util.Objects;
+
+/**
+ * @Author Administrator
+ * @Description 报销单表体（明细表）
+ * @Date 2021/1/8  12:14
+ */
+public class ReimbursementOrderBodyYY implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private String jobid; // 项目
+    private String deptid; // 报销部门
+    private String amount; // 含税金额
+    private String tax_rate; // 税率 3%
+    private String tax_amount; // 税额
+    private String tni_amount; // 无税金额
+    private String defitem36; // 发票金额
+    private String tablecode; // 默认固定值 arap_bxbusitem
+    private String rowno;
+    private String szxmid; // 收支项目  0101 汽车费用
+    private String fpdm; //发票代码
+    private String fphm; //发票号码
+    private String fplxpk; //发票类型
+    private String defitem46; // 网点（成本中心）
+    private String defitem45; // 国家
+    private String defitem44; // 仓库
+    private String defitem43; // 车牌号
+    private String defitem42; // OA明细行ID
+    private String defitem48; // 分摊部门 
+
+    @Override
+    public String toString() {
+        return "ReimbursementOrderBodyYY{" +
+                "jobid='" + jobid + '\'' +
+                ", deptid='" + deptid + '\'' +
+                ", amount='" + amount + '\'' +
+                ", tax_rate='" + tax_rate + '\'' +
+                ", tax_amount='" + tax_amount + '\'' +
+                ", tni_amount='" + tni_amount + '\'' +
+                ", defitem36='" + defitem36 + '\'' +
+                ", tablecode='" + tablecode + '\'' +
+                ", rowno='" + rowno + '\'' +
+                ", szxmid='" + szxmid + '\'' +
+                ", fpdm='" + fpdm + '\'' +
+                ", fphm='" + fphm + '\'' +
+                ", fplxpk='" + fplxpk + '\'' +
+                ", defitem46='" + defitem46 + '\'' +
+                ", defitem45='" + defitem45 + '\'' +
+                ", defitem44='" + defitem44 + '\'' +
+                ", defitem43='" + defitem43 + '\'' +
+                ", defitem42='" + defitem42 + '\'' +
+                ", defitem48='" + defitem48 + '\'' +
+                ", deptidIsNeedConvert='" + deptidIsNeedConvert + '\'' +
+                '}';
+    }
+
+    public String getDeptidIsNeedConvert() {
+        return deptidIsNeedConvert;
+    }
+
+    public void setDeptidIsNeedConvert(String deptidIsNeedConvert) {
+        this.deptidIsNeedConvert = deptidIsNeedConvert;
+    }
+
+    private String deptidIsNeedConvert ;
+
+    public String getJobid() {
+        return jobid;
+    }
+
+    public void setJobid(String jobid) {
+        this.jobid = jobid;
+    }
+
+    public String getDeptid() {
+        return deptid;
+    }
+
+    public void setDeptid(String deptid) {
+        this.deptid = deptid;
+    }
+
+    public String getFplxpk() {
+		return fplxpk;
+	}
+
+	public void setFplxpk(String fplxpk) {
+		this.fplxpk = fplxpk;
+	}
+
+	public String getAmount() {
+        return amount;
+    }
+
+    public void setAmount(String amount) {
+        this.amount = amount;
+    }
+
+    public String getDefitem36() {
+		return defitem36;
+	}
+
+	public void setDefitem36(String defitem36) {
+		this.defitem36 = defitem36;
+	}
+
+	public String getTax_rate() {
+        return tax_rate;
+    }
+
+    public void setTax_rate(String tax_rate) {
+        this.tax_rate = tax_rate;
+    }
+
+    public String getTax_amount() {
+        return tax_amount;
+    }
+
+    public void setTax_amount(String tax_amount) {
+        this.tax_amount = tax_amount;
+    }
+
+    public String getTni_amount() {
+        return tni_amount;
+    }
+
+    public void setTni_amount(String tni_amount) {
+        this.tni_amount = tni_amount;
+    }
+
+    public String getTablecode() {
+        return tablecode;
+    }
+
+    public void setTablecode(String tablecode) {
+        this.tablecode = tablecode;
+    }
+
+    public String getRowno() {
+        return rowno;
+    }
+
+    public void setRowno(String rowno) {
+        this.rowno = rowno;
+    }
+
+    public String getSzxmid() {
+        return szxmid;
+    }
+
+    public void setSzxmid(String szxmid) {
+        this.szxmid = szxmid;
+    }
+
+    public String getDefitem46() {
+        return defitem46;
+    }
+
+    public void setDefitem46(String defitem46) {
+        this.defitem46 = defitem46;
+    }
+
+    public String getDefitem45() {
+        return defitem45;
+    }
+
+    public void setDefitem45(String defitem45) {
+        this.defitem45 = defitem45;
+    }
+
+    public String getDefitem44() {
+        return defitem44;
+    }
+
+    public void setDefitem44(String defitem44) {
+        this.defitem44 = defitem44;
+    }
+
+    public String getDefitem43() {
+        return defitem43;
+    }
+
+    public void setDefitem43(String defitem43) {
+        this.defitem43 = defitem43;
+    }
+
+    public String getDefitem42() {
+        return defitem42;
+    }
+
+    public void setDefitem42(String defitem42) {
+        this.defitem42 = defitem42;
+    }
+
+    public String getFpdm() {
+        return fpdm;
+    }
+
+    public void setFpdm(String fpdm) {
+        this.fpdm = fpdm;
+    }
+
+    public String getFphm() {
+        return fphm;
+    }
+
+    public void setFphm(String fphm) {
+        this.fphm = fphm;
+    }
+
+    public String getDefitem48() {
+        return defitem48;
+    }
+
+    public void setDefitem48(String defitem48) {
+        this.defitem48 = defitem48;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        ReimbursementOrderBodyYY that = (ReimbursementOrderBodyYY) o;
+        return Objects.equals(jobid, that.jobid) &&
+                Objects.equals(deptid, that.deptid) &&
+                Objects.equals(amount, that.amount) &&
+                Objects.equals(tax_rate, that.tax_rate) &&
+                Objects.equals(tax_amount, that.tax_amount) &&
+                Objects.equals(tni_amount, that.tni_amount) &&
+                Objects.equals(tablecode, that.tablecode) &&
+                Objects.equals(rowno, that.rowno) &&
+                Objects.equals(szxmid, that.szxmid) &&
+                Objects.equals(fpdm, that.fpdm) &&
+                Objects.equals(fphm, that.fphm) &&
+                Objects.equals(defitem46, that.defitem46) &&
+                Objects.equals(defitem45, that.defitem45) &&
+                Objects.equals(defitem44, that.defitem44) &&
+                Objects.equals(defitem43, that.defitem43) &&
+                Objects.equals(defitem42, that.defitem42) &&
+                Objects.equals(defitem48, that.defitem48);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(jobid, deptid, amount, tax_rate, tax_amount, tni_amount, tablecode, rowno, szxmid, fpdm, fphm, defitem46, defitem45, defitem44, defitem43, defitem42, defitem48);
+    }
+
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/entity/ReimbursementOrderYY.java b/src/main/youhong_ai_jitu_src/jntchina/entity/ReimbursementOrderYY.java
new file mode 100644
index 0000000..167aa79
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/entity/ReimbursementOrderYY.java
@@ -0,0 +1,358 @@
+package jntchina.entity;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * @Author Administrator
+ * @Description 报销单
+ * @Date 2021/1/16  11:23
+ */
+public class ReimbursementOrderYY implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private String uuid; //主键
+    private String pk_org; // 报销单位 JTSDCN0001
+    private String total; // 报销金额   金额由表体相应字段汇总得出
+    private String deptid; // 部门   传输编码
+    private String djlxbm; // 单据类型编码   对私报销单:264X-Cxx-DSBXD  对公报销单:264X-Cxx-DGBXD
+    private String djrq; // 单据日期   yyyy-mm-dd hh:mm:ss
+    private String payflag; // 支付状态
+    private String paytarget; // 受款对象   0=员工，1=供应商，2=客户
+    private String hbbm; // 收款人(供应商)
+    private String receiver; // 收款人(员工)
+    private String skyhzh; //收款银行账户（员工）
+    private String custaccount; //收款银行账户（供应商）
+    private String jkbxr; // 借款报销人   传输编码
+    private String operator; // 录入人
+    private String jsfs; // 结算方式 3 网银
+    private String fkyhzh; // 单位银行账户 传输编码
+    private String jobid; // 项目
+    private String zy; // 报销事由
+    private String kjqj; // 会计期间
+    private String kjnd; // 会计年度
+    private String fjzs; // 附件张数   需业务人员在OA上传附件同时填写附件张数后传数据到NCC
+    private String zyx1; // OA单据号   OA传过来，用于联查单据
+    private String zyx2; // 提交人    提交人姓名
+	private String zyx3; // OA核销单号
+    private String zyx5; // OARequestID
+
+    private String zyx8; // 银行付款备注
+    private String zyx9; // OA流程标题
+    private String deptidIsNeedConvert;
+
+
+
+    private List<ReimbursementOrderBodyYY> er_busitem;
+    private List<ErBxcontrast> er_bxcontrast;
+
+    public List<ErBxcontrast> getEr_bxcontrast() {
+        return er_bxcontrast;
+    }
+
+    public void setEr_bxcontrast(List<ErBxcontrast> er_bxcontrast) {
+        this.er_bxcontrast = er_bxcontrast;
+    }
+
+    public String getPk_org() {
+        return pk_org;
+    }
+
+    @Override
+    public String toString() {
+        return "ReimbursementOrderYY{" +
+                "uuid='" + uuid + '\'' +
+                ", pk_org='" + pk_org + '\'' +
+                ", total='" + total + '\'' +
+                ", deptid='" + deptid + '\'' +
+                ", djlxbm='" + djlxbm + '\'' +
+                ", djrq='" + djrq + '\'' +
+                ", payflag='" + payflag + '\'' +
+                ", paytarget='" + paytarget + '\'' +
+                ", hbbm='" + hbbm + '\'' +
+                ", receiver='" + receiver + '\'' +
+                ", skyhzh='" + skyhzh + '\'' +
+                ", custaccount='" + custaccount + '\'' +
+                ", jkbxr='" + jkbxr + '\'' +
+                ", operator='" + operator + '\'' +
+                ", jsfs='" + jsfs + '\'' +
+                ", fkyhzh='" + fkyhzh + '\'' +
+                ", jobid='" + jobid + '\'' +
+                ", zy='" + zy + '\'' +
+                ", kjqj='" + kjqj + '\'' +
+                ", kjnd='" + kjnd + '\'' +
+                ", fjzs='" + fjzs + '\'' +
+                ", zyx1='" + zyx1 + '\'' +
+                ", zyx2='" + zyx2 + '\'' +
+                ", zyx3='" + zyx3 + '\'' +
+                ", zyx5='" + zyx5 + '\'' +
+                ", zyx8='" + zyx8 + '\'' +
+                ", zyx9='" + zyx9 + '\'' +
+                ", deptidIsNeedConvert='" + deptidIsNeedConvert + '\'' +
+                ", er_busitem=" + er_busitem +
+                '}';
+    }
+
+    public String getDeptidIsNeedConvert() {
+        return deptidIsNeedConvert;
+    }
+
+    public void setDeptidIsNeedConvert(String deptidIsNeedConvert) {
+        this.deptidIsNeedConvert = deptidIsNeedConvert;
+    }
+
+    public String getHbbm() {
+		return hbbm;
+	}
+
+	public void setHbbm(String hbbm) {
+		this.hbbm = hbbm;
+	}
+
+	public void setPk_org(String pk_org) {
+        this.pk_org = pk_org;
+    }
+
+    public String getZyx9() {
+		return zyx9;
+	}
+
+	public void setZyx9(String zyx9) {
+		this.zyx9 = zyx9;
+	}
+
+	public String getZyx8() {
+		return zyx8;
+	}
+    public String getSkyhzh() {
+		return skyhzh;
+	}
+
+	public void setSkyhzh(String skyhzh) {
+		this.skyhzh = skyhzh;
+	}
+	public String getCustaccount() {
+		return custaccount;
+	}
+
+	public void setCustaccount(String custaccount) {
+		this.custaccount = custaccount;
+	}
+
+	public String getUuid() {
+		return uuid;
+	}
+
+	public void setUuid(String uuid) {
+		this.uuid = uuid;
+	}
+
+	public void setZyx8(String zyx8) {
+		this.zyx8 = zyx8;
+	}
+
+	public String getTotal() {
+        return total;
+    }
+
+    public void setTotal(String total) {
+        this.total = total;
+    }
+
+    public String getDeptid() {
+        return deptid;
+    }
+
+    public void setDeptid(String deptid) {
+        this.deptid = deptid;
+    }
+
+    public String getDjlxbm() {
+        return djlxbm;
+    }
+
+    public void setDjlxbm(String djlxbm) {
+        this.djlxbm = djlxbm;
+    }
+
+    public String getDjrq() {
+        return djrq;
+    }
+
+    public void setDjrq(String djrq) {
+        this.djrq = djrq;
+    }
+
+    public String getPayflag() {
+        return payflag;
+    }
+
+    public void setPayflag(String payflag) {
+        this.payflag = payflag;
+    }
+
+    public String getPaytarget() {
+        return paytarget;
+    }
+
+    public void setPaytarget(String paytarget) {
+        this.paytarget = paytarget;
+    }
+
+    public String getReceiver() {
+        return receiver;
+    }
+
+    public void setReceiver(String receiver) {
+        this.receiver = receiver;
+    }
+
+    public String getJkbxr() {
+        return jkbxr;
+    }
+
+    public void setJkbxr(String jkbxr) {
+        this.jkbxr = jkbxr;
+    }
+
+    public String getOperator() {
+        return operator;
+    }
+
+    public void setOperator(String operator) {
+        this.operator = operator;
+    }
+
+    public String getJsfs() {
+        return jsfs;
+    }
+
+    public void setJsfs(String jsfs) {
+        this.jsfs = jsfs;
+    }
+
+    public String getFkyhzh() {
+        return fkyhzh;
+    }
+
+    public void setFkyhzh(String fkyhzh) {
+        this.fkyhzh = fkyhzh;
+    }
+
+    public String getJobid() {
+        return jobid;
+    }
+
+    public void setJobid(String jobid) {
+        this.jobid = jobid;
+    }
+
+    public String getZy() {
+        return zy;
+    }
+
+    public void setZy(String zy) {
+        this.zy = zy;
+    }
+
+    public String getKjqj() {
+        return kjqj;
+    }
+
+    public void setKjqj(String kjqj) {
+        this.kjqj = kjqj;
+    }
+
+    public String getKjnd() {
+        return kjnd;
+    }
+
+    public void setKjnd(String kjnd) {
+        this.kjnd = kjnd;
+    }
+
+    public String getFjzs() {
+        return fjzs;
+    }
+
+    public void setFjzs(String fjzs) {
+        this.fjzs = fjzs;
+    }
+
+    public String getZyx1() {
+        return zyx1;
+    }
+
+    public void setZyx1(String zyx1) {
+        this.zyx1 = zyx1;
+    }
+
+    public String getZyx2() {
+        return zyx2;
+    }
+
+    public void setZyx2(String zyx2) {
+        this.zyx2 = zyx2;
+    }
+
+    public String getZyx3() {
+        return zyx3;
+    }
+
+    public void setZyx3(String zyx3) {
+        this.zyx3 = zyx3;
+    }
+
+    public String getZyx5() {
+        return zyx5;
+    }
+
+    public void setZyx5(String zyx5) {
+        this.zyx5 = zyx5;
+    }
+
+    public List<ReimbursementOrderBodyYY> getEr_busitem() {
+        return er_busitem;
+    }
+
+    public void setEr_busitem(List<ReimbursementOrderBodyYY> er_busitem) {
+        this.er_busitem = er_busitem;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        ReimbursementOrderYY that = (ReimbursementOrderYY) o;
+        return Objects.equals(pk_org, that.pk_org) &&
+                Objects.equals(total, that.total) &&
+                Objects.equals(deptid, that.deptid) &&
+                Objects.equals(djlxbm, that.djlxbm) &&
+                Objects.equals(djrq, that.djrq) &&
+                Objects.equals(payflag, that.payflag) &&
+                Objects.equals(paytarget, that.paytarget) &&
+                Objects.equals(receiver, that.receiver) &&
+                Objects.equals(jkbxr, that.jkbxr) &&
+                Objects.equals(operator, that.operator) &&
+                Objects.equals(jsfs, that.jsfs) &&
+                Objects.equals(fkyhzh, that.fkyhzh) &&
+                Objects.equals(jobid, that.jobid) &&
+                Objects.equals(zy, that.zy) &&
+                Objects.equals(kjqj, that.kjqj) &&
+                Objects.equals(kjnd, that.kjnd) &&
+                Objects.equals(fjzs, that.fjzs) &&
+                Objects.equals(zyx1, that.zyx1) &&
+                Objects.equals(zyx2, that.zyx2) &&
+                Objects.equals(zyx3, that.zyx3) &&
+                Objects.equals(zyx5, that.zyx5) &&
+                Objects.equals(er_busitem, that.er_busitem);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(pk_org, total, deptid, djlxbm, djrq, payflag, paytarget, receiver, jkbxr, operator, jsfs, fkyhzh, jobid, zy, kjqj, kjnd, fjzs, zyx1, zyx2, zyx3, zyx5, er_busitem);
+    }
+
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/schedule/JieKuanBuLu.java b/src/main/youhong_ai_jitu_src/jntchina/schedule/JieKuanBuLu.java
new file mode 100644
index 0000000..abf2cf3
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/schedule/JieKuanBuLu.java
@@ -0,0 +1,127 @@
+package jntchina.schedule;
+
+import selfdev.util.base.BaseUtil;
+import selfdev.util.log.LogTool;
+import weaver.conn.RecordSet;
+import weaver.general.Util;
+import weaver.interfaces.schedule.BaseCronJob;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 借款台账补录同步器 (仅同步主表)
+ * @title: JieKuanBuLu
+ * @Author LJL
+ * @Date: 2022/6/8 16:14
+ * @Version 1.0
+ */
+public class JieKuanBuLu extends BaseCronJob {
+    @Override
+    public void execute() {
+        try {
+            LogTool log = new LogTool("/log/schedule/", false);
+            String sql = "";
+            log.writeLog("借款同步台账! START!");
+            List<String> lcbhArr = new ArrayList<>();
+            RecordSet rs = new RecordSet();
+            rs.execute("select lcbh from uf_jktz");
+            while (rs.next()) {
+                lcbhArr.add(rs.getString("lcbh"));
+            }
+            rs.execute("select lcbh,yhkje,ycdje,whkje,jkje from uf_ygjktz_lsk");
+            while (rs.next()) {
+                String lcbh = rs.getString("lcbh");
+                String yhkje = Util.null2String(rs.getString("yhkje"));//已还款金额
+                String ycdje = Util.null2String(rs.getString("ycdje"));//已冲抵金额
+                String whkje = Util.null2String(rs.getString("whkje"));//未还款金额
+                String jkje = Util.null2String(rs.getString("jkje"));//未还款金额
+
+                boolean contains = lcbhArr.contains(lcbh);
+                if (contains) {
+                    continue;
+                } else {
+                    String tablenem = BaseUtil.getBaseInfoByParm("TABLENAME", "workflow_bill", "1", "1", " and id in (select formid from workflow_base where id=(select WORKFLOWID from workflow_requestbase  where REQUESTMARK='" + lcbh + "'))");
+                    if (tablenem.equals("")) {
+                        RecordSet updateRs = new RecordSet();
+                        updateRs.executeUpdate("update uf_ygjktz_lsk set sjsfcggxzzsk = '1',gxzskstsxx = '未能通过流程编号找到对应表名,请检查编号是否正确' where lcbh = '" + lcbh + "'");
+                        continue;
+                    } else {
+                        RecordSet rs2 = new RecordSet();
+                        sql = "select t1.*,t2.REQUESTNAME from " + tablenem + " t1 left join workflow_requestbase t2 on t1.requestid = t2.requestid where lcbh = '" + lcbh + "'";
+                        rs2.execute(sql);
+                        if (rs2.next()) {
+                            String xm = rs2.getString("xm");//姓名
+                            String bm = rs2.getString("bm");//部门
+                            String cjrq = rs2.getString("cjrq");//申请日期
+//                    String jkje = rs2.getString("jkje");//借款金额
+                            String fb = rs2.getString("fb");//分部
+                            String xglc = rs2.getString("requestid");//相关流程
+//                    String yhkje = "0.00";//已还款金额
+//                    String ycdje = "0.00";//已冲抵金额
+//                    String whkje = rs2.getString("jkje");//未还款金额
+                            String yjhksj = rs2.getString("yjhkrq");//预计还款日期
+                            String gsmc = rs2.getString("gsmc");//付款公司名称
+                            String lcbt = rs2.getString("REQUESTNAME");//流程标题
+                            String nccjkdh = rs2.getString("nccfkdh");//NCC单号
+                            sql = "insert into uf_jktz(xm,lcbh,bm,cjrq,jkje,fb,xglc,yhkje,ycdje,whkje,yjhksj,gsmc,lcbt,nccjkdh,FORMMODEID) values(" +
+                                    "'" + xm + "'," +
+                                    "'" + lcbh + "'," +
+                                    "'" + bm + "'," +
+                                    "'" + cjrq + "'," +
+                                    "'" + jkje + "'," +
+                                    "'" + fb + "'," +
+                                    "'" + xglc + "'," +
+                                    "'" + yhkje + "'," +
+                                    "'" + ycdje + "'," +
+                                    "'" + whkje + "'," +
+                                    "'" + yjhksj + "'," +
+                                    "'" + gsmc + "'," +
+                                    "'" + lcbt + "'," +
+                                    "'" + nccjkdh + "'," +
+                                    "'" + 53001 + "'" +
+                                    ")";
+                            log.writeLog("insertMain sql:" + sql);
+                            RecordSet insertRS = new RecordSet();
+                            boolean b = insertRS.executeUpdate(sql);
+                            if (!b) {
+                                log.writeLog("insert Error!");
+                                continue;
+                            }
+                            String mainId = BaseUtil.getBaseInfoByParm("id", "uf_jktz", "lcbh", lcbh, "");
+                            if(!ycdje.equals("")&&!ycdje.equals("0.00")){
+                                String insertDT = "insert into uf_jktz_dt1(mainid,hkje,bz) values(" +
+                                        "'" +mainId+"',"+
+                                        "'" +ycdje+"',"+
+                                        "'期初初始化导入')";
+                                boolean b1 = insertRS.executeUpdate(insertDT);
+                                log.writeLog("借款明细插入"+insertDT+" "+b1);
+                            }
+                            if (!yhkje.equals("")&&!yhkje.equals("0.00")){
+                                String insertDT = "insert into uf_jktz_dt1(mainid,hkje,bz) values(" +
+                                        "'" +mainId+"',"+
+                                        "'" +yhkje+"',"+
+                                        "'期初初始化导入')";
+                                boolean b1 = insertRS.executeUpdate(insertDT);
+                                log.writeLog("借款明细插入"+insertDT+" "+b1);
+                            }
+
+
+                            RecordSet updateRs = new RecordSet();
+                            updateRs.executeUpdate("update uf_ygjktz_lsk set sjsfcggxzzsk = '0',gxzskstsxx = '' where lcbh = '" + lcbh + "'");
+                            lcbhArr.add(lcbh);
+                        }
+
+
+                    }
+                }
+
+
+            }
+        }catch (Exception e){
+
+        }
+
+
+    }
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/schedule/QianPianBuLu.java b/src/main/youhong_ai_jitu_src/jntchina/schedule/QianPianBuLu.java
new file mode 100644
index 0000000..099a49f
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/schedule/QianPianBuLu.java
@@ -0,0 +1,168 @@
+package jntchina.schedule;
+
+import selfdev.util.base.BaseUtil;
+import selfdev.util.log.LogTool;
+import weaver.conn.RecordSet;
+import weaver.general.Util;
+import weaver.interfaces.schedule.BaseCronJob;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @title: QianPianBuLu
+ * @Author LJL
+ * @Date: 2022/6/8 16:17
+ * @Version 1.0
+ */
+public class QianPianBuLu extends BaseCronJob {
+    @Override
+    public void execute() {
+        LogTool log = new LogTool("/log/schedule/", false);
+        List<String> lcbhArr = new ArrayList<>();
+        String sql = "";
+        try{
+            RecordSet rs = new RecordSet();
+            rs.execute("select lcbh from uf_fksqyfb");
+            while (rs.next()) {
+                lcbhArr.add(rs.getString("lcbh"));
+            }
+            log.writeLog("流程编号总共有"+lcbhArr.size());
+            rs.execute("select lcbh,yhxje,sywhxje from uf_gysqptz_lsk");
+            while (rs.next()) {
+                String lcbh = rs.getString("lcbh");
+                String yhxje = Util.null2String(rs.getString("yhxje"));//已核销金额
+                String sywhxje = Util.null2String(rs.getString("sywhxje"));//剩余未核销金额
+
+                if(lcbhArr.contains(lcbh)){
+                    continue;
+                }else {
+                    String tablenem = BaseUtil.getBaseInfoByParm("TABLENAME", "workflow_bill", "1", "1", " and id in (select formid from workflow_base where id=(select WORKFLOWID from workflow_requestbase  where REQUESTMARK='" + lcbh + "'))");
+                    if (tablenem.equals("")) {
+                        RecordSet updateRs = new RecordSet();
+                        updateRs.executeUpdate("update uf_gysqptz_lsk set sjsfcggxzzsk = '1',gxzskstsxx = '未能通过流程编号找到对应表名,请检查编号是否正确' where lcbh = '" + lcbh + "'");
+                        continue;
+                    } else {
+                        RecordSet rs2 = new RecordSet();
+                        sql = "select t1.*,t2.REQUESTNAME from " + tablenem + " t1 left join workflow_requestbase t2 on t1.requestid = t2.requestid where lcbh = '" + lcbh + "'";
+                        rs2.execute(sql);
+                        if (rs2.next()) {
+                            String mainid = rs2.getString("id");//主表id
+                            RecordSet rs3 = new RecordSet();
+                            rs3.execute("select * from " + tablenem + "_dt2 where mainid = '" + mainid + "'");
+                            int counts = rs3.getCounts();
+
+                            String sqrgh = BaseUtil.getBaseInfoByParm("workcode", "hrmresource", "id", rs2.getString("id"), "");//申请人工号
+                            String sqbmbm = rs2.getString("fygsbm");//申请部门编码
+                            String fkgsbm = rs2.getString("gsmc");//付款公司编码
+                            String gysbm = rs2.getString("gysmc");//供应商编码
+                            String fbbm = rs2.getString("zz");//分部编码
+                            String sqfb = rs2.getString("zz");//申请分部
+                            String ncclcdh = rs2.getString("nccfkdh");//NCC付款单号
+                            String fkje = rs2.getString("jshjje");//付款金额
+                            if (counts>1){
+                                yhxje =  "0.00";//已核销金额
+                                sywhxje = rs2.getString("jshjje");//剩余未核销金额
+                            }
+
+                            String gsmc = rs2.getString("gsmc");//公司名称
+                            String gysmc = rs2.getString("gysmc");//供应商名称
+                            String sqbm = rs2.getString("fygsbm");//申请部门
+                            String qy = rs2.getString("qy");//区域
+                            String sqr = rs2.getString("xm");//申请人
+                            String bt = rs2.getString("REQUESTNAME");//标题
+                            String sqrq = rs2.getString("cjrq");//申请日期
+                            String qqid = rs2.getString("requestid");//相关流程
+                            String fksm = rs2.getString("fkxx");//付款说明
+                            sql = "insert into uf_fksqyfb(sqrgh,sqbmbm,fkgsbm,gysbm,fbbm,sqfb,ncclcdh,fkje,yhxje,sywhxje,gsmc,gysmc,sqbm,qy,lcbh,sqr,bt,sqrq,qqid,fksm,FORMMODEID) values(" +
+                                    "'" + sqrgh + "'," +
+                                    "'" + sqbmbm + "'," +
+                                    "'" + fkgsbm + "'," +
+                                    "'" + gysbm + "'," +
+                                    "'" + fbbm + "'," +
+                                    "'" + sqfb + "'," +
+                                    "'" + ncclcdh + "'," +
+                                    "'" + fkje + "'," +
+                                    "'" + yhxje + "'," +
+                                    "'" + sywhxje + "'," +
+                                    "'" + gsmc + "'," +
+                                    "'" + gysmc + "'," +
+                                    "'" + sqbm + "'," +
+                                    "'" + qy + "'," +
+                                    "'" + lcbh + "'," +
+                                    "'" + sqr + "'," +
+                                    "'" + bt + "'," +
+                                    "'" + sqrq + "'," +
+                                    "'" + qqid + "'," +
+                                    "'" + fksm + "'," +
+                                    "'" + 52501 + "'" +
+                                    ")";
+                            log.writeLog("insertMain sql:" + sql);
+                            RecordSet insertRS = new RecordSet();
+                            boolean b = insertRS.executeUpdate(sql);
+                            if (!b) {
+                                log.writeLog("insert Error!");
+                                continue;
+                            }
+
+
+                            String mainId = BaseUtil.getBaseInfoByParm("id", "uf_fksqyfb", "lcbh", lcbh, "");
+                            while (rs3.next()) {
+                                String fycdbm = rs3.getString("fycdbm");//费用承担部门
+                                String fylx = rs3.getString("fylx");//费用类型
+                                String fkje2 = rs3.getString("je");//预付款金额
+                                String bz = rs3.getString("bz");//备注
+                                String cph = rs3.getString("cph");//车牌号
+                                String cbzx = rs3.getString("wd");//成本中心
+                                String ck = rs3.getString("ck");//仓库
+                                String gj = rs3.getString("gj");//国家
+                                String oamxxid = rs3.getString("id");//明细行id
+                                String xghxlc = rs3.getString("");//相关核销流程
+
+                                String yhxje2 = yhxje;//已核销金额
+                                String sywhxje2 = sywhxje;//剩余未核销金额
+                                //如果明细行数超过1行 则不触发变更核销金额的逻辑 默认为0
+                                if (counts>1) {
+                                    yhxje2 = rs3.getString("0.00");//已核销金额
+                                    sywhxje2 = rs3.getString("je");//剩余未核销金额
+                                }
+
+                                sql = "insert into uf_fksqyfb_dt1(mainid,fycdbm,fylx,fkje,bz,cph,cbzx,ck,gj,oamxxid,xghxlc,yhxje,sywhxje) values(" +
+                                        "'" + mainId + "'," +
+                                        "'" + fycdbm + "'," +
+                                        "'" + fylx + "'," +
+                                        "'" + fkje2 + "'," +
+                                        "'" + bz + "'," +
+                                        "'" + cph + "'," +
+                                        "'" + cbzx + "'," +
+                                        "'" + ck + "'," +
+                                        "'" + gj + "'," +
+                                        "'" + oamxxid + "'," +
+                                        "'" + xghxlc + "'," +
+                                        "'" + yhxje2 + "'," +
+                                        "'" + sywhxje2 + "'" +
+                                        ")";
+                                RecordSet insertDtRS = new RecordSet();
+                                log.writeLog("Insert DT sql:" + sql);
+                                boolean b1 = insertDtRS.executeUpdate(sql);
+                                if(!b1){
+                                    log.writeLog("insert DT Error!");
+                                    continue;
+                                }
+                            }
+                        }
+                        RecordSet updateRs = new RecordSet();
+                        updateRs.executeUpdate("update uf_gysqptz_lsk set sjsfcggxzzsk = '0',gxzskstsxx = '' where lcbh = '" + lcbh + "'");
+                        lcbhArr.add(lcbh);
+                    }
+
+                }
+
+            }
+
+        }catch (Exception e){
+            log.writeLog("Error:"+e);
+
+        }
+    }
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/schedule/hrm/HRCompanySync.java b/src/main/youhong_ai_jitu_src/jntchina/schedule/hrm/HRCompanySync.java
new file mode 100644
index 0000000..b912dbc
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/schedule/hrm/HRCompanySync.java
@@ -0,0 +1,14 @@
+package jntchina.schedule.hrm;
+
+import weaver.interfaces.schedule.BaseCronJob;
+
+
+public class HRCompanySync extends BaseCronJob {
+
+    @Override
+    public void execute() {
+        SyncHrmcompanyToOA hrmresource = new SyncHrmcompanyToOA();
+        hrmresource.companySynJob();
+    }
+
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/schedule/hrm/HRSynOc.java b/src/main/youhong_ai_jitu_src/jntchina/schedule/hrm/HRSynOc.java
new file mode 100644
index 0000000..858f161
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/schedule/hrm/HRSynOc.java
@@ -0,0 +1,43 @@
+package jntchina.schedule.hrm;
+
+import weaver.conn.RecordSet;
+import weaver.interfaces.schedule.BaseCronJob;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.format.DateTimeFormatter;
+
+/**
+ * 同步海外定时任务
+ */
+public class HRSynOc extends BaseCronJob {
+
+
+    @Override
+    public void execute() {
+        LocalDateTime today_start = LocalDateTime.of(LocalDate.now(), LocalTime.MIN);//当天零点
+        String today = today_start.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+        String allDay = "2022-03-21 00:00:00";
+        SynHrmdepartmentToOAOc dept = new SynHrmdepartmentToOAOc();
+        SyncHrmjobtitlesToOAOc job = new SyncHrmjobtitlesToOAOc();
+        SyncHrmresourceToOAOc user = new SyncHrmresourceToOAOc();
+
+
+        RecordSet rs = new RecordSet();
+        rs.executeQuery("select * from controltask");
+        if(!rs.next()){
+            rs.executeUpdate("insert into controltask(task) values(?)",0);
+        }
+        rs.executeQuery("select * from controltask where task = ?",0);
+        if(rs.next()) {
+            rs.executeUpdate("update controltask set task = ?",1);
+            dept.execute(allDay);
+            job.execute(allDay);
+            user.execute(allDay);
+            rs.executeUpdate("update controltask set task = ?",0);
+        }
+    }
+
+
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/schedule/hrm/HRSync.java b/src/main/youhong_ai_jitu_src/jntchina/schedule/hrm/HRSync.java
new file mode 100644
index 0000000..87339c0
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/schedule/hrm/HRSync.java
@@ -0,0 +1,78 @@
+package jntchina.schedule.hrm;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+import com.api.formmode.page.util.Util;
+
+import weaver.conn.RecordSet;
+import weaver.interfaces.schedule.BaseCronJob;
+
+public class HRSync extends BaseCronJob {
+
+    @Override
+    public void execute() {
+        SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
+        //当天零点
+        String today = sdf.format(new Date())+" 00:00:00";
+
+        // 取上次更新时间,默认值当天零点。
+        String deptUpdateTime = today;
+        String postUpdateTime = today;
+        String employeeUpdateTime = today;
+        int size_dept=5000;//接口每页同步最大量
+        int size_job=5000;
+        int size_user=5000;
+        RecordSet rs = new RecordSet();
+        String jkbs="";//接口标识
+        String jkm_dept="";//部门接口地址后缀
+        String jkm_job="";//岗位接口地址后缀
+        String jkm_user="";//人员接口地址后缀
+        String sql = "select * from uf_HRRestDate";
+        rs.executeQuery(sql);
+        while (rs.next()){
+
+        	//接口标识
+            jkbs=Util.null2String(rs.getString("jkbs"));
+            if("dept".equals(jkbs)){//同步部门
+                deptUpdateTime = rs.getString("sctbsj");
+                size_dept=rs.getInt("jkmyzdl");
+                //接口地址后缀
+                jkm_dept=Util.null2String(rs.getString("jkm"));
+            }else if("post".equals(jkbs)){//同步岗位
+                postUpdateTime = rs.getString("sctbsj");
+                size_job=rs.getInt("jkmyzdl");
+                //接口地址后缀
+                jkm_job=Util.null2String(rs.getString("jkm"));
+            }else if("user".equals(jkbs)){//同步员工
+                employeeUpdateTime = rs.getString("sctbsj");
+                size_user=rs.getInt("jkmyzdl");
+                //接口地址后缀
+                jkm_user=Util.null2String(rs.getString("jkm"));
+            }
+        }
+        //执行部门同步
+        SyncHrmdepartmentToOA hrmdepartment = new SyncHrmdepartmentToOA();
+        hrmdepartment.setSize(size_dept);
+        hrmdepartment.setJkhzurl(jkm_dept);
+        hrmdepartment.execute(deptUpdateTime);
+        
+        //执行岗位同步
+        //SyncHrmjobtitlesToOA hrmjobtitles = new SyncHrmjobtitlesToOA();
+        SyncHrmJobTitlesToOANew hrmjobtitles = new SyncHrmJobTitlesToOANew();
+        hrmjobtitles.setSize(size_job);
+        hrmjobtitles.setJkhzurl(jkm_job);
+        hrmjobtitles.execute(postUpdateTime);
+        
+        //执行员工同步
+        SyncHrmresourceToOA hrmresource = new SyncHrmresourceToOA();
+        hrmresource.setJkhzurl(jkm_user);
+        hrmresource.setSize(size_user);
+        hrmresource.execute(employeeUpdateTime);
+        
+        //更新同步时间到中间表
+        String sql1 = "update uf_HRRestDate set sctbsj ='"+today+"' ";
+        rs.execute(sql1);
+    }
+
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/schedule/hrm/HRSync1.java b/src/main/youhong_ai_jitu_src/jntchina/schedule/hrm/HRSync1.java
new file mode 100644
index 0000000..d6ff0f2
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/schedule/hrm/HRSync1.java
@@ -0,0 +1,23 @@
+package jntchina.schedule.hrm;
+
+import weaver.interfaces.schedule.BaseCronJob;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.format.DateTimeFormatter;
+
+public class HRSync1 extends BaseCronJob {
+
+    @Override
+    public void execute() {
+//        SyncHrmsubcompanyToOA hrmsubcompany = new SyncHrmsubcompanyToOA();
+//        hrmsubcompany.execute();
+        LocalDateTime today_start = LocalDateTime.of(LocalDate.now(), LocalTime.MIN);//当天零点
+        String today = today_start.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+        SyncHrmdepartmentToOA hrmdepartment = new SyncHrmdepartmentToOA();
+        String allDay = "2018-03-21 00:00:00";
+        hrmdepartment.execute(allDay);
+    }
+
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/schedule/hrm/HRSync2.java b/src/main/youhong_ai_jitu_src/jntchina/schedule/hrm/HRSync2.java
new file mode 100644
index 0000000..8c0aa45
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/schedule/hrm/HRSync2.java
@@ -0,0 +1,21 @@
+package jntchina.schedule.hrm;
+
+import weaver.interfaces.schedule.BaseCronJob;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.format.DateTimeFormatter;
+
+public class HRSync2 extends BaseCronJob {
+
+    @Override
+    public void execute() {
+        LocalDateTime today_start = LocalDateTime.of(LocalDate.now(), LocalTime.MIN);//当天零点
+        String today = today_start.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+        String allDay = "2018-03-21 00:00:00";
+        SyncHrmresourceToOA hrmresource = new SyncHrmresourceToOA();
+        hrmresource.execute(allDay);
+    }
+
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/schedule/hrm/HRSyncAll.java b/src/main/youhong_ai_jitu_src/jntchina/schedule/hrm/HRSyncAll.java
new file mode 100644
index 0000000..fedb51f
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/schedule/hrm/HRSyncAll.java
@@ -0,0 +1,20 @@
+package jntchina.schedule.hrm;
+
+import weaver.interfaces.schedule.BaseCronJob;
+
+public class HRSyncAll extends BaseCronJob {
+
+    @Override
+    public void execute() {
+        String allDay = "2018-03-21 00:00:00";
+//        SyncHrmsubcompanyToOA hrmsubcompany = new SyncHrmsubcompanyToOA();
+//        hrmsubcompany.execute();
+        SyncHrmdepartmentToOA hrmdepartment = new SyncHrmdepartmentToOA();
+        hrmdepartment.execute(allDay);
+        SyncHrmjobtitlesToOA hrmjobtitles = new SyncHrmjobtitlesToOA();
+        hrmjobtitles.execute(allDay);
+        SyncHrmresourceToOA hrmresource = new SyncHrmresourceToOA();
+        hrmresource.execute(allDay);
+    }
+
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/schedule/hrm/SynComGroupData.java b/src/main/youhong_ai_jitu_src/jntchina/schedule/hrm/SynComGroupData.java
new file mode 100644
index 0000000..b8ed678
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/schedule/hrm/SynComGroupData.java
@@ -0,0 +1,207 @@
+package jntchina.schedule.hrm;
+
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import jntchina.schedule.hrm.entity.ResoutDate;
+
+import jntchina.util.HttpClientToJT;
+import selfdev.util.log.LogTool;
+import weaver.conn.RecordSet;
+import weaver.file.Prop;
+import weaver.general.TimeUtil;
+import weaver.general.Util;
+import weaver.interfaces.schedule.BaseCronJob;
+
+
+import java.util.*;
+
+
+/**
+ * @title: 同步Hr薪酬组到建模表
+ * @Author ycf
+ * @Date: 2021/9/28 10:20
+ * @Version 1.0
+ */
+public class SynComGroupData extends BaseCronJob {
+
+    private final LogTool log = new LogTool("/log/hrm/xinchouzu/", false);
+
+    @Override
+    public void execute() {
+        this.getConversionValue();
+
+    }
+
+    /**
+     * 获取所有公司的code
+     *
+     * @return List
+     * @hidden 从hr公司表uf_hrmcompany中获取所有公司信息
+     */
+
+    public List<String> getCompanyList() {
+        List<String> list = new ArrayList<>();
+        RecordSet recordSet = new RecordSet();
+        recordSet.executeQuery("select company_code from uf_hrmcompany");
+        while (recordSet.next()) {
+            list.add(recordSet.getString("company_code"));
+        }
+        log.writeLog("listSize:"+list.size());
+        //日志
+
+        return list;
+    }
+
+    /**
+     * 获取资源表
+     *
+     * @return list
+     */
+
+    public List<String> getField() {
+
+        List<String> list = new ArrayList<>();
+        RecordSet recordSet = new RecordSet();
+        recordSet.executeQuery("select FIELDNAME from uf_fieldname_glgs");
+        while (recordSet.next()) {
+            list.add(recordSet.getString("FIELDNAME"));
+        }
+
+        return list;
+    }
+
+
+    /**
+     * 请求url 获取资源组，保存到中台HR字段转换值（关联公司）uf_fieldvalue_glgs
+     */
+    public void getConversionValue() {
+        //hr字段表，uf_fieldname_glgs
+        List<String> field = this.getField();
+        log.writeLog("field资源表长度：" + field.size());
+
+        String token = HttpClientToJT.getToken();
+        //获取token
+//            String token = "DbS4EAxWjsseV14AqnepwzYkaBPhHXlpwQg8TQrM3jIrIByV6g6Yvw==";
+        log.writeLog("获取的token为：" + token);
+        //所有的字段数据
+        List<ResoutDate> resoutDates = new ArrayList<>();
+        String mode = Prop.getPropValue("DevToDC_jntchina", "mode");
+        // 服务器ip：port
+        String baseUrl = Prop.getPropValue("DevToDC_jntchina", mode + "_baseUrl");
+        String url = baseUrl+"/dcoaapi/hr/translateValue";
+
+
+        for (String s : field) {
+
+            RecordSet recordSet = new RecordSet();
+            recordSet.execute("select id from modeinfo where formid = (select id from workflow_bill where tablename = 'uf_fieldvalue_glgs')");
+            recordSet.next();
+
+            String FORMMODEID = recordSet.getString("ID");
+            log.writeLog("FORMMODEID:"+FORMMODEID);
+
+
+            List<String> companyList = this.getCompanyList();
+            log.writeLog("companyList的长度：" + companyList.size());
+
+            for (String assetGroup : companyList) {
+                log.writeLog("公司code："+assetGroup);
+                //设置参数
+
+                String param = "{\"LANGUAGE_CD\":\"ZHS\",\"FIELDNAME\":\"" + s + "_" + assetGroup + "\"}";
+                log.writeLog("请求的json：" + param);
+                log.writeLog("请求的url：" + url);
+                //获取请求返回的数据
+                String rDate = HttpClientToJT.sendPost(url, token, param);
+                log.writeLog("请求结果" + rDate);
+
+                log.writeLog("请求的url返回的code" + JSONObject.parseObject(rDate).getString("code"));
+
+                //判断是否请求成功
+                if ("1".equals(JSONObject.parseObject(rDate).getString("code"))) {
+                    log.writeLog("请求成功");
+                    JSONObject json = JSONObject.parseObject(rDate);
+                    //获取json数组
+                    JSONArray array = json.getJSONArray("data");
+                    log.writeLog("请求的数组长度" + array.size());
+                    for (int i = 0; i < array.size(); i++) {
+                        //把从url中获取到的json字符串解析，保存到List<resoutDate>中，
+                        JSONObject jo = array.getJSONObject(i);
+                        jo.getString("media_id");
+                        ResoutDate resoutDate = new ResoutDate();
+                        resoutDate.setFIELDVALUE(Util.null2String(jo.getString("FIELDVALUE")));
+                        resoutDate.setXlADLONGNAME(Util.null2String(jo.getString("XlADLONGNAME")));
+                        resoutDate.setFIELDNAME(Util.null2String(s));
+                        resoutDate.setXLADSHORTNAME(Util.null2String(jo.getString("XLADSHORTNAME")));
+                        resoutDate.setGs(Util.null2String(assetGroup));
+                        log.writeLog(resoutDate.toString());
+                        resoutDates.add(resoutDate);
+                    }
+                } else {
+                    log.writeLog("请求的错误信息：" + JSONObject.parseObject(rDate).getString("msg"));
+                }
+            }
+
+
+            log.writeLog("字段数据的长度：" + resoutDates.size());
+            for (ResoutDate resoutDate : resoutDates) {
+                //数据库中查询转换值是否存在,   条件为公司名和字段
+
+                recordSet.execute("select count(*) from uf_fieldvalue_glgs where FIELDNAME = '" + resoutDate.getFIELDNAME() + "' and  gs = '" + resoutDate.getGs() + "' and FIELDVALUE = '"+resoutDate.getFIELDVALUE()+"'");
+                log.writeLog("select count(*) from uf_fieldvalue_glgs where FIELDNAME = '" + resoutDate.getFIELDNAME() + "' and  gs = '" + resoutDate.getGs() + "' and FIELDVALUE = '"+resoutDate.getFIELDVALUE()+"'");
+                int a = 0;
+                    /*
+                    获取符合条件的行数
+                    当数据存在时 recordSet.getInt(1)的值大于0行,
+                    当数据不存在时 recordSet.getInt(1)=0
+                     */
+                while (recordSet.next()) {
+                    a = recordSet.getInt(1);
+                }
+                //数据不存在时，执行插入数据操作
+                if (a == 0) {
+                    String sql = "insert into uf_fieldvalue_glgs " +
+                            "(FIELDVALUE,XlADLONGNAME,XLADSHORTNAME,FIELDNAME,gs,FORMMODEID,MODEDATACREATEDATE,MODEDATACREATETIME) VALUES  ('" + resoutDate.getFIELDVALUE() + "'," +
+                            "'" + resoutDate.getXlADLONGNAME() + "','" + resoutDate.getXLADSHORTNAME() + "" +
+                            "','" + resoutDate.getFIELDNAME() + "','" + resoutDate.getGs() + "','" + FORMMODEID + "','" + TimeUtil.getDateString(new Date()) + "','" + TimeUtil.getOnlyCurrentTimeString() + "')";
+
+                    boolean i = recordSet.executeUpdate(sql);
+                    if (i) {
+                        log.writeLog("插入成功" + sql);
+                    } else {
+                        log.writeLog("插入失败" + sql);
+                    }
+                } else {
+                    //如果存在时,判断长描述和短描述是否一致，不一致就更新
+                    String sql = "select count(*) nums from uf_fieldvalue_glgs " +
+                            "where FIELDNAME = '" + resoutDate.getFIELDNAME() + "' " +
+                            "and  gs = '" + resoutDate.getGs() + "' " +
+                            "and FIELDVALUE = '"+resoutDate.getFIELDVALUE()+"' " +
+                            "and XlADLONGNAME = '"+resoutDate.getXlADLONGNAME()+"' " +
+                            "and XLADSHORTNAME = '"+resoutDate.getXLADSHORTNAME()+"' ";
+                    recordSet.execute(sql);
+
+                    int b = 0;
+                    while (recordSet.next()) {
+                        b = recordSet.getInt(1);
+                    }
+                    //数据不存在时，执行更新数据操作
+                    if (b == 0) {
+                        sql = "update uf_fieldvalue_glgs " +
+                                "set  XlADLONGNAME = '"+resoutDate.getXlADLONGNAME()+"' " +
+                                ",XLADSHORTNAME = '"+resoutDate.getXLADSHORTNAME()+"' " +
+                                "where FIELDNAME = '" + resoutDate.getFIELDNAME() + "' " +
+                                "and  gs = '" + resoutDate.getGs() + "' " +
+                                "and FIELDVALUE = '"+resoutDate.getFIELDVALUE()+"' " ;
+                        recordSet.execute(sql);
+                        log.writeLog("长描述和端描述有更改，执行更新操作:"+sql);
+
+                    }
+
+
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/main/youhong_ai_jitu_src/jntchina/schedule/hrm/SynGjjAndSbToOA.java b/src/main/youhong_ai_jitu_src/jntchina/schedule/hrm/SynGjjAndSbToOA.java
new file mode 100644
index 0000000..c534690
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/schedule/hrm/SynGjjAndSbToOA.java
@@ -0,0 +1,168 @@
+package jntchina.schedule.hrm;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import jntchina.util.HttpClientToJT;
+import selfdev.util.log.LogTool;
+import weaver.conn.RecordSet;
+import weaver.file.Prop;
+import weaver.general.Util;
+import weaver.interfaces.schedule.BaseCronJob;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @title: 同步公积金和社保到OA
+ * @Author ycf
+ * @Date: 2021/12/29 13:29
+ * @Version 1.0
+ */
+public class SynGjjAndSbToOA  extends BaseCronJob {
+    private final LogTool log = new LogTool("/log/hrm/shebao/", false);
+
+
+
+    @Override
+    public void execute() {
+
+        List<String> list = this.getAddressByGs();
+        synGjjAndSbByAddress("C_SB_RULE_ID",list);
+        log.writeLog("---------------------社保同步完-----------------------");
+        synGjjAndSbByAddress("C_GJJ_RULE_ID",list);
+        log.writeLog("------------------公积金同步完成-----------------");
+    }
+
+    /**
+     * 同步公积金和社保
+     * @param ruleField  规则字段
+     */
+    public void synGjjAndSbByAddress(String ruleField,List<String> list) {
+
+        //记录插入长度
+        int size = 0;
+        int size2 = 0;
+        ArrayList<Map<String, String>> maps = new ArrayList<>();
+        log.writeLog("获取社保缴纳地的长度:"+list.size());
+        //获取的token
+        String token = HttpClientToJT.getToken();
+        //获取的url
+        String mode = Prop.getPropValue("DevToDC_jntchina", "mode");
+        String baseUrl = Prop.getPropValue("DevToDC_jntchina", mode + "_baseUrl");
+        String url = baseUrl + "/dcoaapi/hr/translateValue";
+
+        //获取的模块id
+        RecordSet recordSet = new RecordSet();
+        recordSet.execute("select id from modeinfo where formid = (select id from workflow_bill where tablename = 'uf_sbandgjj')");
+        recordSet.next();
+        String modelId = recordSet.getString("ID");
+
+        log.writeLog("开始请求:");
+        log.writeLog("请求的url:"+url);
+        log.writeLog("请求的token:"+token);
+
+
+        for (String dq : list) {
+            //发请求
+            String param = "{\"LANGUAGE_CD\":\"ZHS\",\"FIELDNAME\":\""+ ruleField +"_"+ dq + "\"}";
+            log.writeLog("获取规则的参数:"+param);
+
+            String json = HttpClientToJT.sendPost(url, token, param);
+            log.writeLog("获取规则返回的json:"+json);
+            //取出json的值
+            JSONArray data = JSONObject.parseObject(json).getJSONArray("data");
+            for (int i = 0; i < data.size(); i++) {
+                JSONObject jsoni = data.getJSONObject(i);
+                log.writeLog("jsoni:"+jsoni);
+                
+                Map<String, String> map = new HashMap<>();
+                map.put("FIELDVALUE",jsoni.getString("FIELDVALUE"));
+                map.put("XlADLONGNAME",jsoni.getString("XlADLONGNAME"));
+                map.put("FIELDNAME",jsoni.getString("FIELDNAME"));
+                map.put("XLADSHORTNAME",jsoni.getString("XLADSHORTNAME"));
+                map.put("DESCR1",jsoni.getString("DESCR1"));
+                map.put("DESCR2",jsoni.getString("DESCR2"));
+                map.put("DESCR3",jsoni.getString("DESCR3"));
+                map.put("DESCR4",jsoni.getString("DESCR4"));
+                map.put("DESCR5",jsoni.getString("DESCR5"));
+                map.put("DESCR6",jsoni.getString("DESCR6"));
+
+                maps.add(map);
+            }
+        }
+        log.writeLog("值的长度:"+maps);
+
+
+        String sql = "";
+
+
+        //所有集合存在list中，用于判断值是否存在
+        sql = "select * from uf_sbandgjj ";
+        ArrayList<Map<String, String>> arrayList = new ArrayList<>();
+        recordSet.execute(sql);
+        while (recordSet.next()) {
+            HashMap<String, String> map1 = new HashMap<>();
+            for (String s : recordSet.getColumnName()) {
+                map1.put(s, recordSet.getString(s));
+            }
+            arrayList.add(map1);
+        }
+        log.writeLog("arrayList.size:"+arrayList.size());
+
+        for (Map<String, String> map : maps) {
+            String jnd = (map.get("FIELDNAME")).replace(ruleField,"").replace("_","");
+
+            sql = "select count(*) num from uf_sbandgjj " +
+                    "where FIELDVALUE = '"+Util.null2String(map.get("FIELDVALUE"))+"' " +
+                    "and XlADLONGNAME = '"+Util.null2String(map.get("XlADLONGNAME"))+"' " +
+                    "and XLADSHORTNAME = '"+Util.null2String(map.get("XLADSHORTNAME"))+"' " +
+                    "and FIELDNAME = '"+ ruleField +"' " +
+                    "and jnd = '"+jnd+"'  ";
+            log.writeLog("找到当前值是否存在:"+sql);
+
+            recordSet.execute(sql);
+            recordSet.next();
+
+            if (recordSet.getString("num").equals("0")) {
+                //直接插入
+                    sql = "insert into uf_sbandgjj (FIELDVALUE,XlADLONGNAME,XLADSHORTNAME,FIELDNAME,DESCR1,DESCR2,DESCR3," +
+                        "DESCR4,DESCR5,DESCR6,FORMMODEID,jnd) values ('" + map.get("FIELDVALUE") + "','" + map.get("XlADLONGNAME") + "'," +
+                        "'" + map.get("XLADSHORTNAME") + "','" + ruleField + "'," +
+                        "'" + map.get("DESCR1") + "','" + map.get("DESCR2") + "','" + map.get("DESCR3") + "'," +
+                        "'" + map.get("DESCR4") + "','" + map.get("DESCR5") + "','" + map.get("DESCR6") + "'," + modelId + " ,'"+jnd+"')";
+                size++;
+                log.writeLog("1插入sql:" + sql);
+                boolean b = recordSet.executeUpdate(sql);
+                size2 = b ? size2 + 1 : size2;
+                log.writeLog("1插入SQL:" + (b ? "成功" : "失败"));
+            }
+
+
+        }
+        log.writeLog("本次插入条数:"+size);
+        log.writeLog("本次成功插入条数:"+size2);
+
+    }
+
+
+
+    /**
+     * 通过公司获取 社保缴纳地
+     * @return list->地区(string)
+     */
+    public List<String> getAddressByGs() {
+
+        //社保缴纳地
+        ArrayList<String> addressList = new ArrayList<>();
+        RecordSet recordSet = new RecordSet();
+        recordSet.execute("select FIELDVALUE from uf_fieldvalue_glgs where FIELDNAME = 'C_SB_LOC_ID' ");
+        while (recordSet.next()) {
+            addressList.add(Util.null2String(recordSet.getString("FIELDVALUE")));
+        }
+        log.writeLog("通过公司获取 社保缴纳地的长度:"+addressList.size());
+        return addressList;
+    }
+
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/schedule/hrm/SynHrmdepartmentToOAOc.java b/src/main/youhong_ai_jitu_src/jntchina/schedule/hrm/SynHrmdepartmentToOAOc.java
new file mode 100644
index 0000000..795d978
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/schedule/hrm/SynHrmdepartmentToOAOc.java
@@ -0,0 +1,767 @@
+package jntchina.schedule.hrm;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.api.integration.util.JavaUtil;
+import jntchina.schedule.hrm.entity.DepartmentDto;
+import jntchina.schedule.hrm.util.OrganizationUtil;
+import jntchina.util.HttpClientToJT;
+import selfdev.util.base.TimeCommonUtil;
+import selfdev.util.log.LogTool;
+import weaver.conn.RecordSet;
+import weaver.general.Util;
+import weaver.hrm.company.DepartmentComInfo;
+import weaver.matrix.MatrixUtil;
+
+import java.io.BufferedWriter;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.util.*;
+import java.util.stream.Collectors;
+
+public class SynHrmdepartmentToOAOc {
+
+    Map<String, Object> deptMap = new HashMap<>();
+
+
+    //分页接口参数
+    String maxPoint = "1";
+    //接口是否有下一页 默认为有
+    boolean ifPage = true;
+
+
+    //部门编码和id  map
+    Map<String, String> map_dept_code_id = new HashMap<>();
+    private final LogTool log = new LogTool("/log/hrm/deptOc/", false);
+
+    //60里面是否还有分部
+    boolean ifExistenceSub = true;
+
+    /**
+     * 所有 organizationClass = 10 的组织上级编码存储List集合
+     */
+    List<String> subList = new ArrayList<>();
+
+
+    //存放60分部
+    /**
+     * 存放60
+     */
+    List<String> list60 = new ArrayList<>();
+
+    /**
+     *
+     * 对 organizationClass = 60 的记录进行分析
+     * @param supSubMap <组织编码,上级组织编码> organizationClass = 60 组织记录信息集合
+     * @param oaSubCompanyMap <分部编码,分部ID> 当前OA库中已存在的分部
+     */
+    public void ScreenSub(Map<String, String> supSubMap,Map<String,String> oaSubCompanyMap) {
+        try {
+            boolean ifSub = false;
+            Set<String> keySet = supSubMap.keySet();
+            for (String deptCode : keySet) {
+                //获取上级组织编码
+                String supDeptCode = supSubMap.get(deptCode);
+
+                //60的key
+                if (subList.contains(supDeptCode) || oaSubCompanyMap.containsKey(supDeptCode) || oaSubCompanyMap.containsKey(deptCode)) {
+                    ifSub = true;
+
+                    list60.add(deptCode);
+                    subList.add(supDeptCode);
+                    supSubMap.remove(deptCode);
+                }
+            }
+            ifExistenceSub = ifSub;
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+
+    /**
+     * 同步分部、部门数据
+     * 注：对方整个组织数不区分部门和分部，全部用部门接口数据，用类型区分
+     */
+    @SuppressWarnings("unchecked")
+    public Map<String, List<DepartmentDto>> execute(String date) {
+        log.writeLog("-----------------execute");
+        log.writeLog("-----------------date:" + date);
+        Map<String, List<DepartmentDto>> rtMap = new HashMap<>();
+        try {
+
+            String now = TimeCommonUtil.obtainDate(0);
+            log.writeLog("-----------------now:" + now);
+            //匹配部门id，关联的上级部门，所属分部 map
+            Map<String, Map<String, String>> map_dept_id_data = new HashMap<>();
+            map_dept_id_data = getDeptDataMap();
+            map_dept_code_id = getDepartmentCodeIdMap();
+            SyncHrmsubcompanyToOAOC syncHrmsubcompanyToOAOC = new SyncHrmsubcompanyToOAOC();
+            SyncHrmresourceToOA hrmresource = new SyncHrmresourceToOA();
+            //人员map,用于匹配上级领导
+            Map<String, String> map_user_code_id = hrmresource.getUserCodeIdMap();
+            //拆分数据、organizationClass 10类型是组织，其他类型当部门,【代理区】在对方那是虚拟部门，特殊处理划分为OA   分部
+            //JSONArray data = getDepartments(date);
+            //JSONArray ocData = getOcDepartments(date);
+
+            //获取当前OA中已存在的分部信息
+            Map<String,String> oaSubCompanyMap = OrganizationUtil.getEffectiveSubCompanyCodeIdMap();
+
+            log.writeLog("-----------------apiSta");
+            JSONArray ocData = new JSONArray();
+            while (ifPage) {
+                ocData.addAll(getOcDepartments(date, maxPoint));
+            }
+            log.writeLog("-----------------apiEnd");
+            log.writeLog("-----------------size:" + ocData.size());
+
+            //key为60自己，value为上级
+            Map<String, String> supSubMap = new HashMap<>();
+
+            Object directSales = ocData.stream().filter(item -> {
+                JSONObject itemJson = JSONObject.parseObject(JSON.toJSONString(item));
+                if ("10".equals(itemJson.getString("organizationClass"))) {
+                    subList.add(itemJson.getString("superiorDepartment"));
+                }
+                if ("60".equals(itemJson.getString("organizationClass"))) {
+                    //key为60自己，value为上级
+                    supSubMap.put(itemJson.getString("departmentCode"), itemJson.getString("superiorDepartment"));
+                }
+                return !"10".equals(itemJson.getString("organizationClass"));
+            }).collect(Collectors.toList());
+
+            //对 organizationClass = 60 的组织进行分析
+            ScreenSub(supSubMap,oaSubCompanyMap);
+
+
+            List<DepartmentDto> dataList = JSONArray.parseArray(ocData.toJSONString(), DepartmentDto.class);
+            log.writeLog("-----------------全部长度：" + dataList.size());
+
+            //分部数据
+            List<DepartmentDto> subcompanys = dataList.stream().filter(item -> {
+                return "10".equals(item.getOrganizationClass()) || "60".equals(item.getOrganizationClass());
+                // return "10".equals(item.getOrganizationClass()) || ("60".equals(item.getOrganizationClass()) && list60.contains(item.getDepartmentCode()));
+            }).collect(Collectors.toList());
+            //部门数据  注意：10000300代理区编码
+            List<DepartmentDto> departments = dataList.stream().filter(item -> {
+                return "20".equals(item.getOrganizationClass())
+                        || "30".equals(item.getOrganizationClass())
+                        || "40".equals(item.getOrganizationClass())
+                        || "50".equals(item.getOrganizationClass());
+                       // || ("60".equals(item.getOrganizationClass()) && !list60.contains(item.getDepartmentCode()));
+            }).collect(Collectors.toList());
+            log.writeLog("-----------------分部长度：" + subcompanys.size());
+            log.writeLog("-----------------部门长度：" + departments.size());
+            //处理分部同步逻辑
+            List<DepartmentDto> execute = syncHrmsubcompanyToOAOC.execute(subcompanys, departments);
+            rtMap.put("department", departments);
+            //rtMap.put("subcompany",subcompanys);
+            //departments = execute;
+            //Map<String, String> map_subcompany_code_id = hrmsubcompany.getSubCodeIdMap();
+
+
+
+            //处理部门同步逻辑
+            RecordSet rs = new RecordSet();
+            int skipNum = 0, insertNum = 0, updateNum = 0;
+            List<DepartmentDto> skipList = new ArrayList<>();
+            log.writeLog("----------开始同步部门，条数:" + departments.size());
+            //log.writeLog("----------同步部门源数据：" + JSON.toJSONString(departments));
+            // 处理部门同步逻辑 1.未匹配到分部，不新增，
+            for (int i = 0; i < departments.size(); i++) {
+                DepartmentDto row = departments.get(i);
+                String countryCode = Util.null2String(row.getCountryCode());//国家
+                String departmentCode = Util.null2String(row.getDepartmentCode());//部门编码
+                String departmentName = Util.null2String(row.getDepartmentName());//部门全称
+                String shortName = Util.null2String(row.getDepartmentAbbreviation());//部门简称
+                String superiorDepartment = Util.null2String(row.getSuperiorDepartment());//上级部门编码
+                String departmentOrder = Util.null2String(row.getDepartmentOrder());//排序
+                String deptManager = Util.null2String(row.getDeptManager());//部门负责人code
+                String brchLeader = Util.null2String(row.getBrchLeader());//分管领导code
+                Integer canceled = Util.null2String(row.getStatus()).equals("3") ? 1 : null;//1 新增  2 修改  3作废
+                String companyCode = Util.null2String(row.getCompanyCode());// 公司
+//            String companyName = Util.null2String(row.getCompanyName());//公司名称
+                if ("".equals(superiorDepartment)) {
+                    skipList.add(row);
+                    log.writeLog("cylnb superiorDepartment is null:" + superiorDepartment);
+                    skipNum++;
+                    deptMap.put(departmentCode, superiorDepartment);
+                    // continue;
+                }
+                //各种code转id
+                String bmfzr = Util.null2String(map_user_code_id.get(deptManager));//部门负责人
+                String bmfgld = Util.null2String(map_user_code_id.get(brchLeader));//分管领导
+                String subcompanyid1 = Util.null2String(oaSubCompanyMap.get(superiorDepartment));//分部ID
+                String supdepid = Util.null2String(map_dept_code_id.get(superiorDepartment));//获取上级ID
+                log.writeLog("------------subcompanyid1：" + subcompanyid1 + "-----deptCode：" + departmentCode + ",status:" + row.getStatus() + ",canceled:" + canceled + "-------");
+                log.writeLog("------------supdepid：" + supdepid + "----deptCode：" + departmentCode + ",status:" + row.getStatus() + ",canceled:" + canceled + "--------");
+                //如果上级编码为空、所属分部，上级部门都找不到，不作处理
+                if ("".equals(superiorDepartment) || ("".equals(subcompanyid1) && "".equals(supdepid))) {
+                    skipList.add(row);
+                    skipNum++;
+                    log.writeLog("cylnb 上级编码为空、所属分部，上级部门都找不到，不作处理deptcode:" + departmentCode + ";supcode:" + superiorDepartment);
+                    deptMap.put(departmentCode, superiorDepartment);
+                    //continue;
+                }
+                String sql = "";
+                //判断HR部门ID是否已经存在
+
+                // 、 • 7中°~^8英文、心‘9繁体、• ~‘14 越南°~17泰国°~‘21 葡萄牙‘～‘22 印尼
+                log.writeLog("第" + (i + 1) + "条，取数据完成！");
+
+                String status = row.getStatus();
+
+                if (!"3".equals(status)) {
+                    log.writeLog("---------------国家：" + countryCode);
+                    departmentName = getDepartmentName(date, countryCode, departmentCode, departmentName);
+                } else {
+                    log.writeLog("----------------状态为3");
+                }
+
+                if ("".equals(departmentName)) {
+                    log.writeLog("----------------多语言为空");
+                    departmentName = row.getDepartmentName();
+                }
+
+                log.writeLog("-----------------countryCode:" + countryCode);
+                log.writeLog("-----------------departmentName:" + departmentName);
+                // departmentName = "~`~`7 " + departmentName + "`~`8 " + engDepartmentName + "`~`13 5`~`~";
+                if (!map_dept_code_id.containsKey(departmentCode)) {//部门不存在则插入生成新部门
+                    rs.executeQuery("select id from hrmdepartment where outkey = ?", departmentCode);
+                    if (rs.next()) {
+                        String id = rs.getString("id");
+                        //如果找到subcompanyid1不为空，说明是顶级部门，
+                        //String deptid = Util.null2String(map_dept_code_id.get(departmentCode));//OA部门ID
+                        String deptid = id;//OA部门ID
+                        if ("".equals(deptid)) {
+                            skipNum++;
+                            log.writeLog("cylnb deptid is null");
+                            deptMap.put(departmentCode, superiorDepartment);
+                            //continue;
+                        }
+                        if (!"".equals(subcompanyid1)) {
+                            supdepid = "0";
+                        }
+                        if (!"".equals(supdepid) && "".equals(subcompanyid1)) {
+                            log.writeLog("开始取部门" + departmentCode + "上级分部id：" + supdepid + "。");
+                            subcompanyid1 = getSubId(map_dept_id_data, supdepid);
+                            log.writeLog("结束取部门" + departmentCode + "上级分部id：" + supdepid + "。取到的分部id：" + subcompanyid1);
+                            if ("".equals(subcompanyid1)) {
+                                log.writeLog("----------------分部id找不到");
+                                deptMap.put(departmentCode, superiorDepartment);
+                            }
+                        }
+                        String updateStr = "";
+                        //只有有值才覆盖
+                        updateStr += !"".equals(subcompanyid1) ? "subcompanyid1 = '" + subcompanyid1 + "', " : "";
+                        updateStr += !"".equals(supdepid) ? "supdepid = '" + supdepid + "', " : "";
+                        updateStr += !"".equals(bmfzr) ? "bmfzr = '" + bmfzr + "', " : "";
+                        updateStr += !"".equals(bmfgld) ? "bmfgld = '" + bmfgld + "', " : "";
+                        sql = "update HrmDepartment set " +
+                                "departmentname = '" + departmentName + "', " +
+                                "departmentmark = '" + departmentName + "', " +
+                                updateStr +
+                                "canceled = " + canceled + ", " +
+                                "modified = to_date('" + now + "','yyyy-mm-dd hh24:mi:ss'), " +
+                                "modifier = '1', " +
+                                "showorder = '" + departmentOrder + "' " +
+                                "where  id= '" + deptid + "'";
+                        log.writeLog("更新部门表中数据sql--------->" + sql);
+                        boolean b1 = rs.executeUpdate(sql);
+                        log.writeLog("deptid " + deptid + " ---------是否成功：" + b1);
+                        updateNum++;
+                        //处理部门矩阵
+                        sql = "select deptid,bmfzr,bmfgld,sfzy from HrmDepartmentDefined where deptid ='" + deptid + "'";
+                        rs.executeQuery(sql);
+                        if (rs.next()) {
+                            bmfzr = !"".equals(bmfzr) ? bmfzr : Util.null2String(rs.getString("bmfzr"));
+                            bmfgld = !"".equals(bmfgld) ? bmfgld : Util.null2String(rs.getString("bmfgld"));
+                            sql = "update HrmDepartmentDefined set " +
+                                    "bmfzr = '" + bmfzr + "' " +
+                                    ",sfzy = '" + row.getIsDirectSales() + "' " +
+                                    ",frgs= '" + companyCode + "'" +
+                                    ",bmfgld= '" + bmfgld + "'" +
+                                    ",guojia = '" + countryCode + "' " +
+                                    " where deptid = '" + deptid + "'";
+                            boolean b = rs.executeUpdate(sql);
+                            log.writeLog("更新部门自定义表中数据sql--------->" + sql);
+                            log.writeLog("deptid " + deptid + " ---------是否成功：" + b);
+                        } else {
+                            sql = "insert into HrmDepartmentDefined(deptid,sfzy,frgs,bmfzr,bmfgld,guojia) " +
+                                    "values('" + deptid + "'," +
+                                    "'" + row.getIsDirectSales() + "'," +
+                                    "'" + companyCode + "'," +
+                                    "'" + bmfzr + "'," +
+                                    "'" + bmfgld + "'," +
+                                    "'" + countryCode + "')";
+                            boolean b = rs.executeUpdate(sql);
+                            log.writeLog("插入部门自定义表中数据sql--------->" + sql);
+                            log.writeLog("deptid " + deptid + " ---------是否成功：" + b);
+                        }
+                        //同步部门矩阵信息
+                        MatrixUtil.updateDepartmentData(deptid);
+                        continue;
+                    }
+
+                    //如果找到subcompanyid1不为空，说明是顶级部门，
+                    if (!"".equals(subcompanyid1)) {
+                        supdepid = "0";
+                    }
+                    if (!"".equals(supdepid) && "".equals(subcompanyid1)) {
+                        log.writeLog("开始取部门:" + departmentCode + ",上级分部id:" + supdepid + "。" + "部门负责人code：" + deptManager + "部门负责人ID：" + bmfzr);
+                        subcompanyid1 = getSubId(map_dept_id_data, supdepid);
+                        log.writeLog("结束取部门:" + departmentCode + ",上级分部id:" + supdepid + ",取到的分部id:" + subcompanyid1);
+                        if ("".equals(subcompanyid1)) {
+                            log.writeLog("---------------分部id找不到:");
+                            deptMap.put(departmentCode, superiorDepartment);
+                        }
+                    }
+                    sql = "insert into HrmDepartment (departmentname,departmentcode,departmentmark,outkey," +
+                            "supdepid,canceled,created,creater,modified,modifier," +
+                            "showorder,subcompanyid1,bmfzr,bmfgld) values("
+                            + "'" + departmentName + "',"
+                            + "'" + departmentCode + "',"
+                            + "'" + departmentName + "',"
+                            + "'" + departmentCode + "',"
+                            + "'" + supdepid + "',"
+                            + "" + canceled + ","
+                            + "to_date('" + now + "','yyyy-mm-dd hh24:mi:ss'),"
+                            + "'1',"
+                            + "to_date('" + now + "','yyyy-mm-dd hh24:mi:ss'),"
+                            + "'1',"
+                            + "'" + departmentOrder + "',"
+                            + "'" + subcompanyid1 + "', "
+                            + "'" + bmfzr + "', "
+                            + "'" + bmfgld + "')";
+                    log.writeLog("插入部门表生成新数据sql--------->" + sql);
+                    rs.executeUpdate(sql);
+                    insertNum++;
+                    rs.executeQuery("select id from HrmDepartment where departmentcode = ?", departmentCode);
+                    int maxDeptID = 0;//新插入数据的部门ID
+                    if (rs.next()) {
+                        maxDeptID = rs.getInt("id");
+                        //将新增加的部门加入至MAP中
+                        map_dept_code_id.put(departmentCode, maxDeptID + "");
+                        Map<String, String> map1 = new HashMap<>();
+                        map1.put("outkey", departmentCode);
+                        map1.put("supdepid", supdepid);
+                        map1.put("subcompanyid1", subcompanyid1);
+                        log.writeLog("maxDeptID--------->" + maxDeptID + ",size:" + map_dept_id_data.size());
+                        map_dept_id_data.put(maxDeptID + "", map1);
+                    }
+                    //新增数据,插入到部门自定义表HrmDepartmentDefined中
+                    sql = "insert into HrmDepartmentDefined(deptid,sfzy,frgs,bmfzr,bmfgld,guojia) " +
+                            "values('" + maxDeptID + "'," +
+                            "'" + row.getIsDirectSales() + "'," +
+                            "'" + companyCode + "'," +
+                            "'" + bmfzr + "'," +
+                            "'" + bmfgld + "'," +
+                            "'" + countryCode + "')";
+                    boolean b = rs.executeUpdate(sql);
+                    log.writeLog("插入部门自定义表中数据sql--------->" + sql);
+                    log.writeLog("deptid " + maxDeptID + " ---------是否成功：" + b);
+                    //同步部门矩阵信息
+                    MatrixUtil.updateDepartmentData(maxDeptID + "");
+//                //将新增加的人员自定义信息加入至MAP中
+//                map_dept_id_defined.put(maxDeptID + "", maxDeptID + "");
+//                //将部门与所属分部对应关系放到map中
+//                map_deptid_subcompanyid.put(maxDeptID + "", subcompanyid1);
+                } else {//部门存在则更新
+                    //如果找到subcompanyid1不为空，说明是顶级部门，
+                    String deptid = Util.null2String(map_dept_code_id.get(departmentCode));//OA部门ID
+                    if ("".equals(deptid)) {
+                        skipNum++;
+                        log.writeLog("cylnb deptid is null");
+                        deptMap.put(departmentCode, superiorDepartment);
+                        //continue;
+                    }
+                    if (!"".equals(subcompanyid1)) {
+                        supdepid = "0";
+                    }
+                    if (!"".equals(supdepid) && "".equals(subcompanyid1)) {
+                        log.writeLog("开始取部门" + departmentCode + "上级分部id：" + supdepid + "。");
+                        subcompanyid1 = getSubId(map_dept_id_data, supdepid);
+                        log.writeLog("结束取部门" + departmentCode + "上级分部id：" + supdepid + "。取到的分部id：" + subcompanyid1);
+                        if ("".equals(subcompanyid1)) {
+                            log.writeLog("----------------分部id找不到");
+                            deptMap.put(departmentCode, superiorDepartment);
+                        }
+                    }
+                    String updateStr = "";
+                    //只有有值才覆盖
+                    updateStr += !"".equals(subcompanyid1) ? "subcompanyid1 = '" + subcompanyid1 + "', " : "";
+                    updateStr += !"".equals(supdepid) ? "supdepid = '" + supdepid + "', " : "";
+                    updateStr += !"".equals(bmfzr) ? "bmfzr = '" + bmfzr + "', " : "";
+                    updateStr += !"".equals(bmfgld) ? "bmfgld = '" + bmfgld + "', " : "";
+                    sql = "update HrmDepartment set " +
+                            "departmentname = '" + departmentName + "', " +
+                            "departmentmark = '" + departmentName + "', " +
+                            updateStr +
+                            "canceled = " + canceled + ", " +
+                            "modified = to_date('" + now + "','yyyy-mm-dd hh24:mi:ss'), " +
+                            "modifier = '1', " +
+                            "showorder = '" + departmentOrder + "' " +
+                            "where  id= '" + deptid + "'";
+                    log.writeLog("更新部门表中数据sql--------->" + sql);
+                    boolean b1 = rs.executeUpdate(sql);
+                    log.writeLog("deptid " + deptid + " ---------是否成功：" + b1);
+                    updateNum++;
+                    //处理部门矩阵
+                    sql = "select deptid,bmfzr,bmfgld,sfzy from HrmDepartmentDefined where deptid ='" + deptid + "'";
+                    rs.executeQuery(sql);
+                    if (rs.next()) {
+                        bmfzr = !"".equals(bmfzr) ? bmfzr : Util.null2String(rs.getString("bmfzr"));
+                        bmfgld = !"".equals(bmfgld) ? bmfgld : Util.null2String(rs.getString("bmfgld"));
+                        sql = "update HrmDepartmentDefined set " +
+                                "bmfzr = '" + bmfzr + "' " +
+                                ",sfzy = '" + row.getIsDirectSales() + "' " +
+                                ",frgs= '" + companyCode + "'" +
+                                ",bmfgld= '" + bmfgld + "'" +
+                                ",guojia = '" + countryCode + "' " +
+                                " where deptid = '" + deptid + "'";
+                        boolean b = rs.executeUpdate(sql);
+                        log.writeLog("更新部门自定义表中数据sql--------->" + sql);
+                        log.writeLog("deptid " + deptid + " ---------是否成功：" + b);
+                    } else {
+                        sql = "insert into HrmDepartmentDefined(deptid,sfzy,frgs,bmfzr,bmfgld,guojia) " +
+                                "values('" + deptid + "'," +
+                                "'" + row.getIsDirectSales() + "'," +
+                                "'" + companyCode + "'," +
+                                "'" + bmfzr + "'," +
+                                "'" + bmfgld + ",'" +
+                                "'" + countryCode + "')";
+                        boolean b = rs.executeUpdate(sql);
+                        log.writeLog("插入部门自定义表中数据sql--------->" + sql);
+                        log.writeLog("deptid " + deptid + " ---------是否成功：" + b);
+                    }
+                    //人员信息伴随部门信息变化
+                    if (!"".equals(subcompanyid1) && !"".equals(deptid)) {
+                        sql = "update hrmResource set subCompanyId1='" + subcompanyid1 + "' where departmentId = '" + deptid + "' ";
+                        rs.executeUpdate(sql);
+                    }
+                    //同步部门矩阵信息
+                    MatrixUtil.updateDepartmentData(deptid);
+                }
+            }
+
+
+//        for (int i = 0; i < departments.size(); i++) {
+//            DepartmentDto row = departments.get(i);
+//            String departmentCode = Util.null2String(row.getDepartmentCode());//部门编码
+//            String superiorDepartment = Util.null2String(row.getSuperiorDepartment());//上级部门编码
+//            String parId = "";
+//            rs.executeQuery("select * from HRMDEPARTMENT where outkey = ?",superiorDepartment);
+//            if(rs.next()){
+//                parId = rs.getString("id");
+//            }
+//            rs.executeUpdate("update HRMDEPARTMENT set supdepid = ? where outkey = ?",parId,departmentCode);
+//        }
+
+            log.writeLog("此次同步部门总数为：" + departments.size() + ",新增部门数为：" + insertNum +
+                    ",更新部门数为：" + updateNum + ",跳出处理部门数为：" + skipNum);
+            log.writeLog("此次同步部门跳过是数据为：" + JSON.toJSONString(skipList));
+
+
+            log.writeLog("----sta:" + deptMap.size());
+
+            int size = deptMap.size();
+            int lastCount = deptMap.size();
+            for (int i = 0; i < size; i++) {
+                if (deptMap.size() == 0) {
+                    break;
+                }
+                log.writeLog("---------------当前正在执行第" + i + "次，本次剩余" + deptMap.size() + "条部门待处理");
+                setSup();
+                if (lastCount <= deptMap.size()) {
+                    log.writeLog("---------------异常，有" + deptMap.size() + "条部门无分部的数据异常");
+                    break;
+                } else {
+                    lastCount = deptMap.size();
+                }
+            }
+            log.writeLog("----end");
+
+
+            //更新部门缓存
+            DepartmentComInfo dci = new DepartmentComInfo();
+            dci.removeCompanyCache();
+
+            //释放map内存
+            map_dept_id_data.clear();
+            map_dept_code_id.clear();
+            map_user_code_id.clear();
+
+            //更新同步时间到中间表
+            String sql1 = "update uf_HRRestDate set sctbsj ='" + now + "' where jkm = '/dcopenedi/hrDept/pageByUpdateTime'";
+            rs.executeUpdate(sql1);
+
+        } catch (Exception e) {
+            log.writeLog("--------------------Exception：" + JavaUtil.getExceptionDetail(e));
+            e.printStackTrace();
+        }
+        return rtMap;
+    }
+
+
+    public void setSup() {
+        RecordSet rss = new RecordSet();
+        Set keySet = deptMap.keySet();
+        Iterator it = keySet.iterator();
+        while (it.hasNext()) {
+            try {
+                String deptCode = (String) it.next();
+                String supCode = String.valueOf(deptMap.get(deptCode));
+                String SUPDEPID = "";
+                String SUBCOMPANYID1 = "";
+                rss.executeQuery("select * from hrmdepartment where departmentcode = ?", supCode);
+                if (rss.next()) {
+                    SUPDEPID = rss.getString("id");
+                    SUBCOMPANYID1 = rss.getString("SUBCOMPANYID1");
+                    if (SUBCOMPANYID1 != null && !"".equals(SUBCOMPANYID1)) {
+                        rss.executeUpdate("update hrmdepartment set SUPDEPID = ? ,SUBCOMPANYID1 = ? where departmentcode = ? ", SUPDEPID, SUBCOMPANYID1, deptCode);
+                        it.remove();
+                    }
+                    log.writeLog("-----------------已补处理部门code：" + deptCode + "，分部id：" + SUBCOMPANYID1);
+                }
+            } catch (Exception e) {
+                log.writeLog("--------------------Exception：" + JavaUtil.getExceptionDetail(e));
+            }
+        }
+
+    }
+
+
+    /**
+     * 匹配部门id，关联的上级部门，所属分部 map
+     *
+     * @return
+     */
+    private Map<String, Map<String, String>> getDeptDataMap() {
+        RecordSet rs = new RecordSet();
+        Map<String, Map<String, String>> map = new HashMap<>();
+        rs.executeQuery("select id, outkey,supdepid,subcompanyid1 from HrmDepartment where (CANCELED!=1 or CANCELED is null)");
+        while (rs.next()) {
+            Map<String, String> map1 = new HashMap<>();
+            map1.put("outkey", rs.getString("outkey"));
+            map1.put("supdepid", rs.getString("supdepid"));
+            map1.put("subcompanyid1", rs.getString("subcompanyid1"));
+            map.put(rs.getString("id"), map1);
+        }
+        return map;
+    }
+
+    /**
+     * 根据部门id匹配所属分部
+     *
+     * @return
+     */
+    public String getSubId(Map<String, Map<String, String>> map_dept_id_data, String deptId) {
+        String subcompanyid = "";
+        if (!map_dept_id_data.containsKey(deptId)) {
+            return "";
+        }
+        Map<String, String> map = map_dept_id_data.get(deptId);
+        subcompanyid = map.get("subcompanyid1");
+        return subcompanyid;
+    }
+
+    public Map<String, String> getDepartmentCodeIdMap() {
+        RecordSet rs = new RecordSet();
+        Map<String, String> map = new HashMap<>();
+        rs.executeQuery("select departmentcode,outkey,id from HrmDepartment where outkey is not null  and (CANCELED!=1 or CANCELED is null)");
+        while (rs.next()) {
+            map.put(rs.getString("outkey"), rs.getString("id"));
+        }
+        return map;
+    }
+
+
+    /**
+     * 获取海外部门数据
+     *
+     * @param date  时间
+     * @param point
+     * @return
+     */
+    public JSONArray getOcDepartments(String date, String point) {
+        log.writeLog("--------------getOcDepartments");
+        int current = 1, size = 5000, pages = 2;
+        String url = HttpClientToJT.baseUrl + "/dcopenedi/hrDept/pageNewHrDeptByUpdateTime";
+        String token = HttpClientToJT.getToken();
+        log.writeLog("-------token--------->" + token);
+        Map<String, Object> params = new HashMap<>();
+        List list1 = new ArrayList();
+        list1.add("ZHS");
+        params.put("languageCds", list1);
+        params.put("updateTime", date);
+        params.put("point", point);
+        params.put("size", size);
+        log.writeLog("传入JSON--------------->" + JSON.toJSONString(params));
+        String s = HttpClientToJT.sendPost(url, token, JSONObject.toJSONString(params));
+        JSONObject jsonObject = JSONObject.parseObject(s);
+        JSONArray jsonArray = new JSONArray();
+
+        String code = Util.null2String(jsonObject.getString("code"));
+        log.writeLog("code------>" + code);
+        if ("1".equals(code)) {
+            JSONObject result = jsonObject.getJSONObject("data");
+            JSONArray records = result.getJSONArray("records");
+            Object hasNextPage = result.get("hasNextPage");
+            jsonArray.addAll(records);
+            //下次继续传
+            maxPoint = result.get("maxPoint").toString();
+            if ("false".equals(hasNextPage.toString())) {
+                ifPage = false;
+            }
+
+            Object directSales = jsonArray.stream().filter(item -> {
+                JSONObject itemJson = JSONObject.parseObject(JSON.toJSONString(item));
+                return !"CHN".equals(itemJson.getString("countryCode")) && !"IDN".equals(itemJson.getString("countryCode"));
+            }).collect(Collectors.toList());
+            jsonArray = JSONArray.parseArray(JSON.toJSONString(directSales));
+        }
+
+        return jsonArray;
+    }
+
+
+    /**
+     * 获取海外某个部门对应国家语言的数据
+     *
+     * @param date  时间
+     * @param point 页码
+     * @return 返回接口返回信息
+     */
+    public JSONArray getOcDepartmentsGUOJIA(String date, String point, String guojia, String departmentCode) {
+        int size = 5000;
+        String url = HttpClientToJT.baseUrl + "/dcopenedi/hrDept/pageNewHrDeptByUpdateTime";
+        String token = HttpClientToJT.getToken();
+        log.writeLog("-------token--------->" + token);
+        Map<String, Object> params = new HashMap<>();
+        List<String> list1 = new ArrayList<>();
+        list1.add(guojia);
+        params.put("languageCds", list1);
+        params.put("updateTime", date);
+        params.put("point", point);
+        params.put("size", size);
+        params.put("deptCode", departmentCode);
+        log.writeLog("传入JSON--------------->" + JSON.toJSONString(params));
+        String s = HttpClientToJT.sendPost(url, token, JSONObject.toJSONString(params));
+        JSONObject jsonObject = JSONObject.parseObject(s);
+        JSONArray jsonArray = new JSONArray();
+
+        String code = Util.null2String(jsonObject.getString("code"));
+        log.writeLog("code------>" + code);
+        if ("1".equals(code)) {
+            JSONObject result = jsonObject.getJSONObject("data");
+            JSONArray records = result.getJSONArray("records");
+            Object hasNextPage = result.get("hasNextPage");
+            jsonArray.addAll(records);
+//            //下次继续传
+//            maxPoint = result.get("maxPoint").toString();
+//            if ("false".equals(hasNextPage.toString())) {
+//                ifPage = false;
+//            }
+
+            Object directSales = jsonArray.stream().filter(item -> {
+                JSONObject itemJson = JSONObject.parseObject(JSON.toJSONString(item));
+                return !"CHN".equals(itemJson.getString("countryCode"));
+            }).collect(Collectors.toList());
+            jsonArray = JSONArray.parseArray(JSON.toJSONString(directSales));
+        }
+
+        return jsonArray;
+    }
+
+
+    private void writeFile(JSONArray jsonArray) {
+        BufferedWriter bw = null;
+        try {
+            bw = new BufferedWriter(new FileWriter("D:\\2.txt"));
+            //一次写一行
+            bw.write(jsonArray.toJSONString());
+            bw.newLine();  //换行用
+            //关闭流
+            bw.close();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        System.out.println("写入成功");
+    }
+
+
+    /**
+     * 获取多语言
+     *
+     * @param date           时间
+     * @param countryCode    国家code
+     * @param departmentCode 部门code
+     * @param deptName       部门中文名称
+     * @return 多语言名称
+     */
+    public String getDepartmentName(String date, String countryCode, String departmentCode, String deptName) {
+        String retName = "";
+        boolean existence = true;
+        String language = "";
+        String cdIndex = "";
+        try {
+            if ("CHN".equals(countryCode)) {
+                language = "ZHS";
+            }
+            if ("BRA".equals(countryCode)) {
+                language = "POR";
+                cdIndex = "21";
+            }
+            if ("SAU".equals(countryCode) || "ARE".equals(countryCode)
+                    || "EGY".equals(countryCode)
+                    || "MEX".equals(countryCode)
+                    || "SGP".equals(countryCode)
+                    || "PHL".equals(countryCode)
+                    || "MYS".equals(countryCode)
+                    || "KHM".equals(countryCode)
+            ) {
+                existence = false;
+                language = "ENG";
+            }
+            // 、 • 7中°~^8英文、心‘9繁体、• ~‘14 越南°~17泰国°~‘21 葡萄牙‘～‘22 印尼
+            if ("IDN".equals(countryCode)) {
+                language = "IDN";
+                cdIndex = "22";
+            }
+            if ("THA".equals(countryCode)) {
+                //language = "THA";
+                language = "ENG";
+                cdIndex = "17";
+            }
+            if ("VNM".equals(countryCode)) {
+                language = "VIE";
+                cdIndex = "14";
+            }
+
+            String country = "";
+            // 日期  位置  国家  部门code
+            JSONArray ocDepartmentsGUOJIA = getOcDepartmentsGUOJIA(date, "1", language, departmentCode);
+            log.writeLog("--------------多语言是否拿到数据：" + ocDepartmentsGUOJIA.size());
+            List<DepartmentDto> countryList = JSONArray.parseArray(ocDepartmentsGUOJIA.toJSONString(), DepartmentDto.class);
+            DepartmentDto countryDto = countryList.get(0);
+            //对应国家的语言名称（对应国家标签里面）
+            String countryDepartmentName = countryDto.getDepartmentName();
+            log.writeLog("---------------对应国家语言名称：" + countryDepartmentName);
+
+            //departmentName =
+            if (existence) {
+                //需要3个标签
+                retName = "~`~`7 " + deptName + "`~`8 " + countryDepartmentName + "`~`" + cdIndex + " " + countryDepartmentName + "`~`~";
+            } else {
+                //只需要中文和英文
+                retName = "~`~`7 " + deptName + "`~`8 " + countryDepartmentName + "`~`~";
+            }
+
+            log.writeLog("---------------多语言名称：" + retName);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return retName;
+    }
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/schedule/hrm/SynHrmdepartmentToOAOcOld.java b/src/main/youhong_ai_jitu_src/jntchina/schedule/hrm/SynHrmdepartmentToOAOcOld.java
new file mode 100644
index 0000000..022595c
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/schedule/hrm/SynHrmdepartmentToOAOcOld.java
@@ -0,0 +1,791 @@
+package jntchina.schedule.hrm;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.api.integration.util.JavaUtil;
+import jntchina.schedule.hrm.entity.DepartmentDto;
+import jntchina.util.HttpClientToJT;
+import selfdev.util.base.TimeCommonUtil;
+import selfdev.util.log.LogTool;
+import weaver.conn.RecordSet;
+import weaver.general.Util;
+import weaver.hrm.company.DepartmentComInfo;
+import weaver.matrix.MatrixUtil;
+
+import java.io.BufferedWriter;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.util.*;
+import java.util.stream.Collectors;
+
+public class SynHrmdepartmentToOAOcOld {
+
+    Map<String, Object> deptMap = new HashMap<>();
+
+
+    //分页接口参数
+    String maxPoint = "1";
+    //接口是否有下一页 默认为有
+    boolean ifPage = true;
+
+
+    //部门编码和id  map
+    Map<String, String> map_dept_code_id = new HashMap<String, String>();
+    private LogTool log = new LogTool("/log/hrm/deptOc/", false);
+
+    //60里面是否还有分部
+    boolean ifExistenceSub = true;
+
+    //所有10分部的上级
+    List subList = new ArrayList();
+
+
+    //存放60分部
+    List list60 = new ArrayList();
+
+
+    public void ScreenSub(Map<String, Object> supSubMap) {
+        try {
+            boolean ifSub = false;
+            Set keySet = supSubMap.keySet();
+            Iterator it = keySet.iterator();
+            while (it.hasNext()) {
+                //60的key
+                String deptCode = (String) it.next();
+                if (subList.contains(deptCode)) {
+                    ifSub = true;
+                    String supDeptCode = String.valueOf(supSubMap.get(deptCode));
+                    //60的value
+                    list60.add(deptCode);
+                    subList.add(supDeptCode);
+                    supSubMap.remove(deptCode);
+                }
+            }
+            ifExistenceSub = ifSub;
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+
+    /**
+     * 同步分部、部门数据
+     * 注：对方整个组织数不区分部门和分部，全部用部门接口数据，用类型区分
+     */
+    public Map<String, List<DepartmentDto>> execute(String date) {
+        log.writeLog("-----------------execute");
+        log.writeLog("-----------------date:" + date);
+        Map<String, List<DepartmentDto>> rtMap = new HashMap<>();
+        try {
+
+            String now = TimeCommonUtil.obtainDate(0);
+            log.writeLog("-----------------now:" + now);
+            //匹配部门id，关联的上级部门，所属分部 map
+            Map<String, Map<String, String>> map_dept_id_data = new HashMap<>();
+            map_dept_id_data = getDeptDataMap();
+//        log.writeLog("字典："+JSON.toJSONString(map_dept_id_data));
+            map_dept_code_id = getDepartmentCodeIdMap();
+            SyncHrmsubcompanyToOAOC hrmsubcompany = new SyncHrmsubcompanyToOAOC();
+            SyncHrmresourceToOA hrmresource = new SyncHrmresourceToOA();
+            //人员map,用于匹配上级领导
+            Map<String, String> map_user_code_id = hrmresource.getUserCodeIdMap();
+            //拆分数据、organizationClass 10类型是组织，其他类型当部门,【代理区】在对方那是虚拟部门，特殊处理划分为OA   分部
+            //JSONArray data = getDepartments(date);
+            //JSONArray ocData = getOcDepartments(date);
+
+            log.writeLog("-----------------apiSta");
+            JSONArray ocData = new JSONArray();
+            while (ifPage) {
+                ocData.addAll(getOcDepartments(date, maxPoint));
+            }
+            log.writeLog("-----------------apiEnd");
+            log.writeLog("-----------------size:" + ocData.size());
+
+            //key为60自己，value为上级
+            Map<String, Object> supSubMap = new HashMap<>();
+
+            Object directSales = ocData.stream().filter(item -> {
+                JSONObject itemJson = JSONObject.parseObject(JSON.toJSONString(item));
+                if ("10".equals(itemJson.getString("organizationClass"))) {
+                    subList.add(itemJson.getString("superiorDepartment"));
+                }
+                if ("60".equals(itemJson.getString("organizationClass"))) {
+                    //key为60自己，value为上级
+                    supSubMap.put(itemJson.getString("departmentCode"), itemJson.getString("superiorDepartment"));
+                }
+                return !"10".equals(itemJson.getString("organizationClass"));
+            }).collect(Collectors.toList());
+
+            while (ifExistenceSub) {
+                ScreenSub(supSubMap);
+            }
+
+            List<DepartmentDto> dataList = JSONArray.parseArray(ocData.toJSONString(), DepartmentDto.class);
+            log.writeLog("-----------------全部长度：" + dataList.size());
+
+            //分部数据
+            List<DepartmentDto> subcompanys = dataList.stream().filter(item -> {
+                //return "10".equals(item.getOrganizationClass()) || "60".equals(item.getOrganizationClass());
+                return "10".equals(item.getOrganizationClass()) || ("60".equals(item.getOrganizationClass()) && list60.contains(item.getDepartmentCode()));
+            }).collect(Collectors.toList());
+            //部门数据  注意：10000300代理区编码
+            List<DepartmentDto> departments = dataList.stream().filter(item -> {
+                return "20".equals(item.getOrganizationClass())
+                        || "30".equals(item.getOrganizationClass())
+                        || "40".equals(item.getOrganizationClass())
+                        || "50".equals(item.getOrganizationClass())
+                        || ("60".equals(item.getOrganizationClass()) && !list60.contains(item.getDepartmentCode()));
+            }).collect(Collectors.toList());
+            log.writeLog("-----------------分部长度：" + subcompanys.size());
+            log.writeLog("-----------------部门长度：" + departments.size());
+            //处理分部同步逻辑
+            List<DepartmentDto> execute = hrmsubcompany.execute(subcompanys, departments);
+            rtMap.put("department", departments);
+            //rtMap.put("subcompany",subcompanys);
+            //departments = execute;
+            Map<String, String> map_subcompany_code_id = hrmsubcompany.getSubCodeIdMap();
+            //处理部门同步逻辑
+            RecordSet rs = new RecordSet();
+            int skipNum = 0, insertNum = 0, updateNum = 0;
+            List<DepartmentDto> skipList = new ArrayList<>();
+            log.writeLog("----------开始同步部门，条数:" + departments.size());
+            //log.writeLog("----------同步部门源数据：" + JSON.toJSONString(departments));
+            // 处理部门同步逻辑 1.未匹配到分部，不新增，
+            for (int i = 0; i < departments.size(); i++) {
+                DepartmentDto row = departments.get(i);
+                String countryCode = Util.null2String(row.getCountryCode());//国家
+                String departmentCode = Util.null2String(row.getDepartmentCode());//部门编码
+                String departmentName = Util.null2String(row.getDepartmentName());//部门全称
+                String shortName = Util.null2String(row.getDepartmentAbbreviation());//部门简称
+                String superiorDepartment = Util.null2String(row.getSuperiorDepartment());//上级部门编码
+                String departmentOrder = Util.null2String(row.getDepartmentOrder());//排序
+                String deptManager = Util.null2String(row.getDeptManager());//部门负责人code
+                String brchLeader = Util.null2String(row.getBrchLeader());//分管领导code
+                Integer canceled = Util.null2String(row.getStatus()).equals("3") ? 1 : null;//1 新增  2 修改  3作废
+                String companyCode = Util.null2String(row.getCompanyCode());// 公司
+//            String companyName = Util.null2String(row.getCompanyName());//公司名称
+                if ("".equals(superiorDepartment)) {
+                    skipList.add(row);
+                    log.writeLog("cylnb superiorDepartment is null:" + superiorDepartment);
+                    skipNum++;
+                    deptMap.put(departmentCode, superiorDepartment);
+                    // continue;
+                }
+                //各种code转id
+                String bmfzr = Util.null2String(map_user_code_id.get(deptManager));//部门负责人
+                String bmfgld = Util.null2String(map_user_code_id.get(brchLeader));//分管领导
+                String subcompanyid1 = Util.null2String(map_subcompany_code_id.get(superiorDepartment));//分部ID
+                String supdepid = Util.null2String(map_dept_code_id.get(superiorDepartment));//获取上级ID
+                log.writeLog("------------subcompanyid1：" + subcompanyid1 + "-----deptCode：" + departmentCode + ",status:" + row.getStatus() + ",canceled:" + canceled + "-------");
+                log.writeLog("------------supdepid：" + supdepid + "----deptCode：" + departmentCode + ",status:" + row.getStatus() + ",canceled:" + canceled + "--------");
+                //如果上级编码为空、所属分部，上级部门都找不到，不作处理
+                if ("".equals(superiorDepartment) || ("".equals(subcompanyid1) && "".equals(supdepid))) {
+                    skipList.add(row);
+                    skipNum++;
+                    log.writeLog("cylnb 上级编码为空、所属分部，上级部门都找不到，不作处理deptcode:" + departmentCode + ";supcode:" + superiorDepartment);
+                    deptMap.put(departmentCode, superiorDepartment);
+                    //continue;
+                }
+                String sql = "";
+                //判断HR部门ID是否已经存在
+
+                // 、 • 7中°~^8英文、心‘9繁体、• ~‘14 越南°~17泰国°~‘21 葡萄牙‘～‘22 印尼
+
+                log.writeLog("第" + (i + 1) + "条，取数据完成！");
+
+                String status = row.getStatus();
+
+                if (!"3".equals(status)) {
+                    log.writeLog("---------------国家：" + countryCode);
+                    departmentName = getDepartmentName(date, countryCode, departmentCode, departmentName);
+                } else {
+                    log.writeLog("----------------状态为3");
+                }
+
+                if ("".equals(departmentName)) {
+                    log.writeLog("----------------多语言为空");
+                    departmentName = row.getDepartmentName();
+                }
+
+                log.writeLog("-----------------countryCode:" + countryCode);
+                log.writeLog("-----------------departmentName:" + departmentName);
+                // departmentName = "~`~`7 " + departmentName + "`~`8 " + engDepartmentName + "`~`13 5`~`~";
+                if (!map_dept_code_id.containsKey(departmentCode)) {//部门不存在则插入生成新部门
+                    rs.executeQuery("select id from hrmdepartment where outkey = ?", departmentCode);
+                    if (rs.next()) {
+                        String id = rs.getString("id");
+                        //如果找到subcompanyid1不为空，说明是顶级部门，
+                        //String deptid = Util.null2String(map_dept_code_id.get(departmentCode));//OA部门ID
+                        String deptid = id;//OA部门ID
+                        if ("".equals(deptid)) {
+                            skipNum++;
+                            log.writeLog("cylnb deptid is null");
+                            deptMap.put(departmentCode, superiorDepartment);
+                            //continue;
+                        }
+                        if (!"".equals(subcompanyid1)) {
+                            supdepid = "0";
+                        }
+                        if (!"".equals(supdepid) && "".equals(subcompanyid1)) {
+                            log.writeLog("开始取部门" + departmentCode + "上级分部id：" + supdepid + "。");
+                            subcompanyid1 = getSubId(map_dept_id_data, supdepid);
+                            log.writeLog("结束取部门" + departmentCode + "上级分部id：" + supdepid + "。取到的分部id：" + subcompanyid1);
+                            if ("".equals(subcompanyid1)) {
+                                log.writeLog("----------------分部id找不到");
+                                deptMap.put(departmentCode, superiorDepartment);
+                            }
+                        }
+                        String updateStr = "";
+                        //只有有值才覆盖
+                        updateStr += !"".equals(subcompanyid1) ? "subcompanyid1 = '" + subcompanyid1 + "', " : "";
+                        updateStr += !"".equals(supdepid) ? "supdepid = '" + supdepid + "', " : "";
+                        updateStr += !"".equals(bmfzr) ? "bmfzr = '" + bmfzr + "', " : "";
+                        updateStr += !"".equals(bmfgld) ? "bmfgld = '" + bmfgld + "', " : "";
+                        sql = "update HrmDepartment set " +
+                                "departmentname = '" + departmentName + "', " +
+                                "departmentmark = '" + departmentName + "', " +
+                                updateStr +
+                                "canceled = " + canceled + ", " +
+                                "modified = to_date('" + now + "','yyyy-mm-dd hh24:mi:ss'), " +
+                                "modifier = '1', " +
+                                "showorder = '" + departmentOrder + "' " +
+                                "where  id= '" + deptid + "'";
+                        log.writeLog("更新部门表中数据sql--------->" + sql);
+                        boolean b1 = rs.executeUpdate(sql);
+                        log.writeLog("deptid " + deptid + " ---------是否成功：" + b1);
+                        updateNum++;
+                        //处理部门矩阵
+                        sql = "select deptid,bmfzr,bmfgld,sfzy from HrmDepartmentDefined where deptid ='" + deptid + "'";
+                        rs.executeQuery(sql);
+                        if (rs.next()) {
+                            bmfzr = !"".equals(bmfzr) ? bmfzr : Util.null2String(rs.getString("bmfzr"));
+                            bmfgld = !"".equals(bmfgld) ? bmfgld : Util.null2String(rs.getString("bmfgld"));
+                            sql = "update HrmDepartmentDefined set " +
+                                    "bmfzr = '" + bmfzr + "' " +
+                                    ",sfzy = '" + row.getIsDirectSales() + "' " +
+                                    ",frgs= '" + companyCode + "'" +
+                                    ",bmfgld= '" + bmfgld + "'" +
+                                    ",guojia = '" + countryCode + "' " +
+                                    " where deptid = '" + deptid + "'";
+                            boolean b = rs.executeUpdate(sql);
+                            log.writeLog("更新部门自定义表中数据sql--------->" + sql);
+                            log.writeLog("deptid " + deptid + " ---------是否成功：" + b);
+                        } else {
+                            sql = "insert into HrmDepartmentDefined(deptid,sfzy,frgs,bmfzr,bmfgld,guojia) " +
+                                    "values('" + deptid + "'," +
+                                    "'" + row.getIsDirectSales() + "'," +
+                                    "'" + companyCode + "'," +
+                                    "'" + bmfzr + "'," +
+                                    "'" + bmfgld + "'," +
+                                    "'" + countryCode + "')";
+                            boolean b = rs.executeUpdate(sql);
+                            log.writeLog("插入部门自定义表中数据sql--------->" + sql);
+                            log.writeLog("deptid " + deptid + " ---------是否成功：" + b);
+                        }
+                        //同步部门矩阵信息
+                        MatrixUtil.updateDepartmentData(deptid);
+                        continue;
+                    }
+
+                    //如果找到subcompanyid1不为空，说明是顶级部门，
+                    if (!"".equals(subcompanyid1)) {
+                        supdepid = "0";
+                    }
+                    if (!"".equals(supdepid) && "".equals(subcompanyid1)) {
+                        log.writeLog("开始取部门:" + departmentCode + ",上级分部id:" + supdepid + "。" + "部门负责人code：" + deptManager + "部门负责人ID：" + bmfzr);
+                        subcompanyid1 = getSubId(map_dept_id_data, supdepid);
+                        log.writeLog("结束取部门:" + departmentCode + ",上级分部id:" + supdepid + ",取到的分部id:" + subcompanyid1);
+                        if ("".equals(subcompanyid1)) {
+                            log.writeLog("---------------分部id找不到:");
+                            deptMap.put(departmentCode, superiorDepartment);
+                        }
+                    }
+                    sql = "insert into HrmDepartment (departmentname,departmentcode,departmentmark,outkey," +
+                            "supdepid,canceled,created,creater,modified,modifier," +
+                            "showorder,subcompanyid1,bmfzr,bmfgld) values("
+                            + "'" + departmentName + "',"
+                            + "'" + departmentCode + "',"
+                            + "'" + departmentName + "',"
+                            + "'" + departmentCode + "',"
+                            + "'" + supdepid + "',"
+                            + "" + canceled + ","
+                            + "to_date('" + now + "','yyyy-mm-dd hh24:mi:ss'),"
+                            + "'1',"
+                            + "to_date('" + now + "','yyyy-mm-dd hh24:mi:ss'),"
+                            + "'1',"
+                            + "'" + departmentOrder + "',"
+                            + "'" + subcompanyid1 + "', "
+                            + "'" + bmfzr + "', "
+                            + "'" + bmfgld + "')";
+                    log.writeLog("插入部门表生成新数据sql--------->" + sql);
+                    rs.executeUpdate(sql);
+                    insertNum++;
+                    rs.executeQuery("select id from HrmDepartment where departmentcode = ?", departmentCode);
+                    int maxDeptID = 0;//新插入数据的部门ID
+                    if (rs.next()) {
+                        maxDeptID = rs.getInt("id");
+                        //将新增加的部门加入至MAP中
+                        map_dept_code_id.put(departmentCode, maxDeptID + "");
+                        Map<String, String> map1 = new HashMap<>();
+                        map1.put("outkey", departmentCode);
+                        map1.put("supdepid", supdepid);
+                        map1.put("subcompanyid1", subcompanyid1);
+                        log.writeLog("maxDeptID--------->" + maxDeptID + ",size:" + map_dept_id_data.size());
+                        map_dept_id_data.put(maxDeptID + "", map1);
+                    }
+                    //新增数据,插入到部门自定义表HrmDepartmentDefined中
+                    sql = "insert into HrmDepartmentDefined(deptid,sfzy,frgs,bmfzr,bmfgld,guojia) " +
+                            "values('" + maxDeptID + "'," +
+                            "'" + row.getIsDirectSales() + "'," +
+                            "'" + companyCode + "'," +
+                            "'" + bmfzr + "'," +
+                            "'" + bmfgld + "'," +
+                            "'" + countryCode + "')";
+                    boolean b = rs.executeUpdate(sql);
+                    log.writeLog("插入部门自定义表中数据sql--------->" + sql);
+                    log.writeLog("deptid " + maxDeptID + " ---------是否成功：" + b);
+                    //同步部门矩阵信息
+                    MatrixUtil.updateDepartmentData(maxDeptID + "");
+//                //将新增加的人员自定义信息加入至MAP中
+//                map_dept_id_defined.put(maxDeptID + "", maxDeptID + "");
+//                //将部门与所属分部对应关系放到map中
+//                map_deptid_subcompanyid.put(maxDeptID + "", subcompanyid1);
+                } else {//部门存在则更新
+                    //如果找到subcompanyid1不为空，说明是顶级部门，
+                    String deptid = Util.null2String(map_dept_code_id.get(departmentCode));//OA部门ID
+                    if ("".equals(deptid)) {
+                        skipNum++;
+                        log.writeLog("cylnb deptid is null");
+                        deptMap.put(departmentCode, superiorDepartment);
+                        //continue;
+                    }
+                    if (!"".equals(subcompanyid1)) {
+                        supdepid = "0";
+                    }
+                    if (!"".equals(supdepid) && "".equals(subcompanyid1)) {
+                        log.writeLog("开始取部门" + departmentCode + "上级分部id：" + supdepid + "。");
+                        subcompanyid1 = getSubId(map_dept_id_data, supdepid);
+                        log.writeLog("结束取部门" + departmentCode + "上级分部id：" + supdepid + "。取到的分部id：" + subcompanyid1);
+                        if ("".equals(subcompanyid1)) {
+                            log.writeLog("----------------分部id找不到");
+                            deptMap.put(departmentCode, superiorDepartment);
+                        }
+                    }
+                    String updateStr = "";
+                    //只有有值才覆盖
+                    updateStr += !"".equals(subcompanyid1) ? "subcompanyid1 = '" + subcompanyid1 + "', " : "";
+                    updateStr += !"".equals(supdepid) ? "supdepid = '" + supdepid + "', " : "";
+                    updateStr += !"".equals(bmfzr) ? "bmfzr = '" + bmfzr + "', " : "";
+                    updateStr += !"".equals(bmfgld) ? "bmfgld = '" + bmfgld + "', " : "";
+                    sql = "update HrmDepartment set " +
+                            "departmentname = '" + departmentName + "', " +
+                            "departmentmark = '" + departmentName + "', " +
+                            updateStr +
+                            "canceled = " + canceled + ", " +
+                            "modified = to_date('" + now + "','yyyy-mm-dd hh24:mi:ss'), " +
+                            "modifier = '1', " +
+                            "showorder = '" + departmentOrder + "' " +
+                            "where  id= '" + deptid + "'";
+                    log.writeLog("更新部门表中数据sql--------->" + sql);
+                    boolean b1 = rs.executeUpdate(sql);
+                    log.writeLog("deptid " + deptid + " ---------是否成功：" + b1);
+                    updateNum++;
+                    //处理部门矩阵
+                    sql = "select deptid,bmfzr,bmfgld,sfzy from HrmDepartmentDefined where deptid ='" + deptid + "'";
+                    rs.executeQuery(sql);
+                    if (rs.next()) {
+                        bmfzr = !"".equals(bmfzr) ? bmfzr : Util.null2String(rs.getString("bmfzr"));
+                        bmfgld = !"".equals(bmfgld) ? bmfgld : Util.null2String(rs.getString("bmfgld"));
+                        sql = "update HrmDepartmentDefined set " +
+                                "bmfzr = '" + bmfzr + "' " +
+                                ",sfzy = '" + row.getIsDirectSales() + "' " +
+                                ",frgs= '" + companyCode + "'" +
+                                ",bmfgld= '" + bmfgld + "'" +
+                                ",guojia = '" + countryCode + "' " +
+                                " where deptid = '" + deptid + "'";
+                        boolean b = rs.executeUpdate(sql);
+                        log.writeLog("更新部门自定义表中数据sql--------->" + sql);
+                        log.writeLog("deptid " + deptid + " ---------是否成功：" + b);
+                    } else {
+                        sql = "insert into HrmDepartmentDefined(deptid,sfzy,frgs,bmfzr,bmfgld,guojia) " +
+                                "values('" + deptid + "'," +
+                                "'" + row.getIsDirectSales() + "'," +
+                                "'" + companyCode + "'," +
+                                "'" + bmfzr + "'," +
+                                "'" + bmfgld + ",'" +
+                                "'" + countryCode + "')";
+                        boolean b = rs.executeUpdate(sql);
+                        log.writeLog("插入部门自定义表中数据sql--------->" + sql);
+                        log.writeLog("deptid " + deptid + " ---------是否成功：" + b);
+                    }
+                    //人员信息伴随部门信息变化
+                    if (!"".equals(subcompanyid1) && !"".equals(deptid)) {
+                        sql = "update hrmResource set subCompanyId1='" + subcompanyid1 + "' where departmentId = '" + deptid + "' ";
+                        rs.executeUpdate(sql);
+                    }
+                    //同步部门矩阵信息
+                    MatrixUtil.updateDepartmentData(deptid);
+                }
+            }
+
+
+//        for (int i = 0; i < departments.size(); i++) {
+//            DepartmentDto row = departments.get(i);
+//            String departmentCode = Util.null2String(row.getDepartmentCode());//部门编码
+//            String superiorDepartment = Util.null2String(row.getSuperiorDepartment());//上级部门编码
+//            String parId = "";
+//            rs.executeQuery("select * from HRMDEPARTMENT where outkey = ?",superiorDepartment);
+//            if(rs.next()){
+//                parId = rs.getString("id");
+//            }
+//            rs.executeUpdate("update HRMDEPARTMENT set supdepid = ? where outkey = ?",parId,departmentCode);
+//        }
+
+            log.writeLog("此次同步部门总数为：" + departments.size() + ",新增部门数为：" + insertNum +
+                    ",更新部门数为：" + updateNum + ",跳出处理部门数为：" + skipNum);
+            log.writeLog("此次同步部门跳过是数据为：" + JSON.toJSONString(skipList));
+
+
+            log.writeLog("----sta:" + deptMap.size());
+
+            int size = deptMap.size();
+            int lastCount = deptMap.size();
+            for (int i = 0; i < size; i++) {
+                if (deptMap.size() == 0) {
+                    break;
+                }
+                log.writeLog("---------------当前正在执行第" + i + "次，本次剩余" + deptMap.size() + "条部门待处理");
+                setSup();
+                if (lastCount <= deptMap.size()) {
+                    log.writeLog("---------------异常，有" + deptMap.size() + "条部门无分部的数据异常");
+                    break;
+                } else {
+                    lastCount = deptMap.size();
+                }
+            }
+            log.writeLog("----end");
+
+
+            //更新部门缓存
+            DepartmentComInfo dci = new DepartmentComInfo();
+            dci.removeCompanyCache();
+
+            //释放map内存
+            map_dept_id_data.clear();
+            map_dept_id_data = null;
+            map_dept_code_id.clear();
+            map_dept_code_id = null;
+            map_user_code_id.clear();
+            map_user_code_id = null;
+
+            //更新同步时间到中间表
+            String sql1 = "update uf_HRRestDate set sctbsj ='" + now + "' where jkm = '/dcopenedi/hrDept/pageByUpdateTime'";
+            rs.executeUpdate(sql1);
+
+        } catch (Exception e) {
+            log.writeLog("--------------------Exception：" + JavaUtil.getExceptionDetail(e));
+            e.printStackTrace();
+        }
+        return rtMap;
+    }
+
+
+    public void setSup() {
+        RecordSet rss = new RecordSet();
+        Set keySet = deptMap.keySet();
+        Iterator it = keySet.iterator();
+        while (it.hasNext()) {
+            try {
+                String deptCode = (String) it.next();
+                String supCode = String.valueOf(deptMap.get(deptCode));
+                String SUPDEPID = "";
+                String SUBCOMPANYID1 = "";
+                rss.executeQuery("select * from hrmdepartment where departmentcode = ?", supCode);
+                if (rss.next()) {
+                    SUPDEPID = rss.getString("id");
+                    SUBCOMPANYID1 = rss.getString("SUBCOMPANYID1");
+                    if (SUBCOMPANYID1 != null && !"".equals(SUBCOMPANYID1)) {
+                        rss.executeUpdate("update hrmdepartment set SUPDEPID = ? ,SUBCOMPANYID1 = ? where departmentcode = ? ", SUPDEPID, SUBCOMPANYID1, deptCode);
+                        it.remove();
+                    }
+                    log.writeLog("-----------------已补处理部门code：" + deptCode + "，分部id：" + SUBCOMPANYID1);
+                }
+            } catch (Exception e) {
+                log.writeLog("--------------------Exception：" + JavaUtil.getExceptionDetail(e));
+            }
+        }
+
+    }
+
+
+    /**
+     * 匹配部门id，关联的上级部门，所属分部 map
+     *
+     * @return
+     */
+    private Map<String, Map<String, String>> getDeptDataMap() {
+        RecordSet rs = new RecordSet();
+        Map<String, Map<String, String>> map = new HashMap<>();
+        rs.executeQuery("select id, outkey,supdepid,subcompanyid1 from HrmDepartment where (CANCELED!=1 or CANCELED is null)");
+        while (rs.next()) {
+            Map<String, String> map1 = new HashMap<>();
+            map1.put("outkey", rs.getString("outkey"));
+            map1.put("supdepid", rs.getString("supdepid"));
+            map1.put("subcompanyid1", rs.getString("subcompanyid1"));
+            map.put(rs.getString("id"), map1);
+        }
+        return map;
+    }
+
+    /**
+     * 根据部门id匹配所属分部
+     *
+     * @return
+     */
+    public String getSubId(Map<String, Map<String, String>> map_dept_id_data, String deptId) {
+        String subcompanyid = "";
+        if (!map_dept_id_data.containsKey(deptId)) {
+            return "";
+        }
+        Map<String, String> map = map_dept_id_data.get(deptId);
+        subcompanyid = map.get("subcompanyid1");
+        return subcompanyid;
+    }
+//    /**
+//     * 获取部门编码和上级分部的集合
+//     *
+//     * @return
+//     */
+//    public Map<String, String> getDeptComMap() {
+//        RecordSet rs = new RecordSet();
+//        Map<String, String> map = new HashMap<>();
+//        rs.executeQuery("select outkey,supdepid from HrmDepartment where outkey is not null  and (CANCELED!=1 or CANCELED is null)");
+//        while (rs.next()) {
+//            map.put(rs.getString("outkey"), rs.getString("supdepid"));
+//        }
+//        return map;
+//    }
+
+    public Map<String, String> getDepartmentCodeIdMap() {
+        RecordSet rs = new RecordSet();
+        Map<String, String> map = new HashMap<>();
+        rs.executeQuery("select departmentcode,outkey,id from HrmDepartment where outkey is not null  and (CANCELED!=1 or CANCELED is null)");
+        while (rs.next()) {
+            map.put(rs.getString("outkey"), rs.getString("id"));
+        }
+        return map;
+    }
+
+
+    /**
+     * 获取海外部门数据
+     *
+     * @param date  时间
+     * @param point
+     * @return
+     */
+    public JSONArray getOcDepartments(String date, String point) {
+        log.writeLog("--------------getOcDepartments");
+        int current = 1, size = 5000, pages = 2;
+        String url = HttpClientToJT.baseUrl + "/dcopenedi/hrDept/pageNewHrDeptByUpdateTime";
+        String token = HttpClientToJT.getToken();
+        log.writeLog("-------token--------->" + token);
+        Map<String, Object> params = new HashMap<>();
+        List list1 = new ArrayList();
+        list1.add("ZHS");
+        params.put("languageCds", list1);
+        params.put("updateTime", date);
+        params.put("point", point);
+        params.put("size", size);
+        log.writeLog("传入JSON--------------->" + JSON.toJSONString(params));
+        String s = HttpClientToJT.sendPost(url, token, JSONObject.toJSONString(params));
+        JSONObject jsonObject = JSONObject.parseObject(s);
+        JSONArray jsonArray = new JSONArray();
+
+        String code = Util.null2String(jsonObject.getString("code"));
+        log.writeLog("code------>" + code);
+        if ("1".equals(code)) {
+            JSONObject result = jsonObject.getJSONObject("data");
+            JSONArray records = result.getJSONArray("records");
+            Object hasNextPage = result.get("hasNextPage");
+            jsonArray.addAll(records);
+            //下次继续传
+            maxPoint = result.get("maxPoint").toString();
+            if ("false".equals(hasNextPage.toString())) {
+                ifPage = false;
+            }
+
+            Object directSales = jsonArray.stream().filter(item -> {
+                JSONObject itemJson = JSONObject.parseObject(JSON.toJSONString(item));
+                return !"CHN".equals(itemJson.getString("countryCode")) && !"IDN".equals(itemJson.getString("countryCode"));
+            }).collect(Collectors.toList());
+            jsonArray = JSONArray.parseArray(JSON.toJSONString(directSales));
+        }
+
+        return jsonArray;
+    }
+
+
+    /**
+     * 获取海外部门国家数据
+     *
+     * @param date  时间
+     * @param point
+     * @return
+     */
+    public JSONArray getOcDepartmentsGUOJIA(String date, String point, String guojia, String departmentCode) {
+        int current = 1, size = 5000, pages = 2;
+        String url = HttpClientToJT.baseUrl + "/dcopenedi/hrDept/pageNewHrDeptByUpdateTime";
+        String token = HttpClientToJT.getToken();
+        log.writeLog("-------token--------->" + token);
+        Map<String, Object> params = new HashMap<>();
+        List list1 = new ArrayList();
+        list1.add(guojia);
+        params.put("languageCds", list1);
+        params.put("updateTime", date);
+        params.put("point", point);
+        params.put("size", size);
+        params.put("deptCode", departmentCode);
+        log.writeLog("传入JSON--------------->" + JSON.toJSONString(params));
+        String s = HttpClientToJT.sendPost(url, token, JSONObject.toJSONString(params));
+        JSONObject jsonObject = JSONObject.parseObject(s);
+        JSONArray jsonArray = new JSONArray();
+
+        String code = Util.null2String(jsonObject.getString("code"));
+        log.writeLog("code------>" + code);
+        if ("1".equals(code)) {
+            JSONObject result = jsonObject.getJSONObject("data");
+            JSONArray records = result.getJSONArray("records");
+            Object hasNextPage = result.get("hasNextPage");
+            jsonArray.addAll(records);
+//            //下次继续传
+//            maxPoint = result.get("maxPoint").toString();
+//            if ("false".equals(hasNextPage.toString())) {
+//                ifPage = false;
+//            }
+
+            Object directSales = jsonArray.stream().filter(item -> {
+                JSONObject itemJson = JSONObject.parseObject(JSON.toJSONString(item));
+                return !"CHN".equals(itemJson.getString("countryCode"));
+            }).collect(Collectors.toList());
+            jsonArray = JSONArray.parseArray(JSON.toJSONString(directSales));
+        }
+
+        return jsonArray;
+    }
+
+
+    private void writeFile(JSONArray jsonArray) {
+        BufferedWriter bw = null;
+        try {
+            bw = new BufferedWriter(new FileWriter("D:\\2.txt"));
+            //一次写一行
+            bw.write(jsonArray.toJSONString());
+            bw.newLine();  //换行用
+            //关闭流
+            bw.close();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        System.out.println("写入成功");
+    }
+
+
+    /**
+     * 获取多语言
+     *
+     * @param date           时间
+     * @param countryCode    国家code
+     * @param departmentCode 部门code
+     * @param deptName       部门中文名称
+     * @return 多语言名称
+     */
+    public String getDepartmentName(String date, String countryCode, String departmentCode, String deptName) {
+        String retName = "";
+        boolean existence = true;
+        String language = "";
+        String cdIndex = "";
+        try {
+            if ("CHN".equals(countryCode)) {
+                language = "ZHS";
+            }
+            if ("BRA".equals(countryCode)) {
+                language = "POR";
+                cdIndex = "21";
+            }
+            if ("SAU".equals(countryCode) || "ARE".equals(countryCode)
+                    || "EGY".equals(countryCode)
+                    || "MEX".equals(countryCode)
+                    || "SGP".equals(countryCode)
+                    || "PHL".equals(countryCode)
+                    || "MYS".equals(countryCode)
+                    || "KHM".equals(countryCode)
+            ) {
+                existence = false;
+                language = "ENG";
+            }
+            // 、 • 7中°~^8英文、心‘9繁体、• ~‘14 越南°~17泰国°~‘21 葡萄牙‘～‘22 印尼
+            if ("IDN".equals(countryCode)) {
+                language = "IDN";
+                cdIndex = "22";
+            }
+            if ("THA".equals(countryCode)) {
+                //language = "THA";
+                language = "ENG";
+                cdIndex = "17";
+            }
+            if ("VNM".equals(countryCode)) {
+                language = "VIE";
+                cdIndex = "14";
+            }
+
+            String country = "";
+            // 日期  位置  国家  部门code
+            JSONArray ocDepartmentsGUOJIA = getOcDepartmentsGUOJIA(date, "1", language, departmentCode);
+            log.writeLog("--------------多语言是否拿到数据：" + ocDepartmentsGUOJIA.size());
+            List<DepartmentDto> countryList = JSONArray.parseArray(ocDepartmentsGUOJIA.toJSONString(), DepartmentDto.class);
+            DepartmentDto countryDto = countryList.get(0);
+            //对应国家的语言名称（对应国家标签里面）
+            String countryDepartmentName = countryDto.getDepartmentName();
+            log.writeLog("---------------对应国家语言名称：" + countryDepartmentName);
+
+            //departmentName =
+            if (existence) {
+                //需要3个标签
+                retName = "~`~`7 " + deptName + "`~`8 " + countryDepartmentName + "`~`" + cdIndex + " " + countryDepartmentName + "`~`~";
+            } else {
+                //只需要中文和英文
+                retName = "~`~`7 " + deptName + "`~`8 " + countryDepartmentName + "`~`~";
+            }
+
+            log.writeLog("---------------多语言名称：" + retName);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return retName;
+    }
+
+
+    public static void main(String[] args) {
+//        String token = HttpClientToJT.getToken();
+//        SyncHrmsubcompanyToOA hrmsubcompany = new SyncHrmsubcompanyToOA();
+//        hrmsubcompany.getSubcompanys();
+        SyncHrmdepartmentToOA hrmdepartment = new SyncHrmdepartmentToOA();
+        JSONArray data = hrmdepartment.getDepartments("2018-08-01 00:00:00");
+        // hrmdepartment.writeFile(data);
+//        List<DepartmentDto> dataList = JSONArray.parseArray(data.toJSONString(), DepartmentDto.class);
+//        System.out.println(JSON.toJSONString(dataList));
+//        SyncHrmjobtitlesToOA hrmjobtitles = new SyncHrmjobtitlesToOA();
+//        hrmjobtitles.getJobtitles();
+//        SyncHrmresourceToOA hrmresource = new SyncHrmresourceToOA();
+//        JSONArray users = hrmresource.getUsers();
+//        System.out.println(users);
+//        System.out.println(JSON.toJSONString(users));
+//        JSONObject row =new JSONObject();
+//        Integer status = Util.null2String(row.getInteger("status"))== "3" ? 1 : null;
+//        System.out.println(status);
+    }
+
+
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/schedule/hrm/SynShangBiao.java b/src/main/youhong_ai_jitu_src/jntchina/schedule/hrm/SynShangBiao.java
new file mode 100644
index 0000000..d24b22d
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/schedule/hrm/SynShangBiao.java
@@ -0,0 +1,80 @@
+package jntchina.schedule.hrm;
+
+import jntchina.service.oa.ShangbiaoTemplate;
+
+import selfdev.util.log.LogTool;
+import weaver.conn.RecordSet;
+import weaver.docs.webservices.DocAttachment;
+import weaver.docs.webservices.DocInfo;
+import weaver.docs.webservices.DocServiceImpl;
+import weaver.hrm.User;
+import weaver.interfaces.schedule.BaseCronJob;
+
+/**
+ * @title: 同步商标
+ * @Author ycf
+ * @Date: 2022/1/4 14:27
+ * @Version 1.0
+ */
+public class SynShangBiao extends BaseCronJob {
+    private final LogTool log = new LogTool("/log/api/shangB/", false);
+
+    @Override
+    public void execute() {
+        RecordSet recordSet = new RecordSet();
+        String sql = "select id,by1 ,sbmc   from  uf_shangbiao where BY1 is null ";
+        recordSet.execute(sql);
+        log.writeLog("sql:" + sql);
+        while (recordSet.next()) {
+            log.writeLog("商标名称:" + recordSet.getString("sbmc"));
+
+            String id = recordSet.getString("id");
+            String sbmc = recordSet.getString("sbmc");
+
+            this.createDoc(sbmc,id);
+        }
+    }
+
+    public void createDoc(String sbmc,String id) {
+        log.writeLog("商标名称:"+sbmc);
+        log.writeLog("id:"+id);
+
+        RecordSet recordSet = new RecordSet();
+
+        DocServiceImpl docService = new DocServiceImpl();//OA知识接口
+        DocInfo docInfo = new DocInfo();    //知识文档实体bean
+        docInfo.setMaincategory(0);//文档主目录
+        docInfo.setSubcategory(0);//文档分目录
+        recordSet.execute("select id from docseccategory where CATEGORYNAME= '标样'");
+        recordSet.next();
+        docInfo.setSeccategory(recordSet.getInt("ID"));
+        docInfo.setDocSubject(sbmc + "商标");//文档标题
+        //附件(一个附件创建一篇文档)
+        DocAttachment[] da = new DocAttachment[1];
+        da[0] = new DocAttachment();
+        da[0].setDocid(0);
+        da[0].setImagefileid(0);
+        recordSet.execute("select needzip,needzipencrypt from systemset");
+        while (recordSet.next()) {
+            da[0].setIszip(recordSet.getInt("NEEDZIP"));//是否压缩
+            da[0].setIsencrype(recordSet.getInt("NEEDZIPENCRYPT"));//是否加密
+            log.writeLog("是否压缩:" + recordSet.getInt("NEEDZIP"));
+            log.writeLog("是否加密:" + recordSet.getInt("NEEDZIPENCRYPT"));
+        }
+        da[0].setFilename(sbmc + ".jpeg");//附件名
+        da[0].setFilecontent(new ShangbiaoTemplate().getBase64(sbmc));
+        //将附件添加到文档中
+        docInfo.setAttachments(da);
+        User localUser = User.getUser(1, 0);
+        //创建文档
+        int docid = 0;
+        try {
+            docid = docService.createDocByUser(docInfo, localUser);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        String sql2 = "update uf_shangbiao set by1 = " + docid + " where id = " + id;
+        log.writeLog("sql2:" + sql2);
+        recordSet.execute(sql2);
+    }
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/schedule/hrm/SyncHRBaseData.java b/src/main/youhong_ai_jitu_src/jntchina/schedule/hrm/SyncHRBaseData.java
new file mode 100644
index 0000000..6e19be8
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/schedule/hrm/SyncHRBaseData.java
@@ -0,0 +1,17 @@
+package jntchina.schedule.hrm;
+
+import weaver.interfaces.schedule.BaseCronJob;
+
+public class SyncHRBaseData extends BaseCronJob {
+
+    @Override
+    public void execute() {
+        //基础数据 HR转换值
+        SyncJTBaseData syncJTBaseData = new SyncJTBaseData();
+        syncJTBaseData.syncBaseData();
+        //公司数据
+        SyncHrmcompanyToOA xx = new SyncHrmcompanyToOA();
+        xx.getCompanys();
+    }
+
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/schedule/hrm/SyncHrmJobTitlesToOANew.java b/src/main/youhong_ai_jitu_src/jntchina/schedule/hrm/SyncHrmJobTitlesToOANew.java
new file mode 100644
index 0000000..73e68ac
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/schedule/hrm/SyncHrmJobTitlesToOANew.java
@@ -0,0 +1,491 @@
+package jntchina.schedule.hrm;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.serializer.SerializerFeature;
+import jntchina.schedule.hrm.util.OrganizationUtil;
+import jntchina.util.HttpClientToJT;
+import org.apache.commons.lang3.StringUtils;
+import selfdev.util.base.TimeCommonUtil;
+import selfdev.util.log.LogTool;
+import weaver.conn.RecordSet;
+import weaver.general.Util;
+import weaver.hrm.job.JobTitlesComInfo;
+
+import java.io.BufferedWriter;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * 定时同步岗位到OA中
+ * @author Cyq
+ * <p> 日期 2021年6月17日 02:01:51 </p>
+ * @version 2.0  Modify by bleach  修复内存溢出的问题
+ */
+public class SyncHrmJobTitlesToOANew {
+
+    //岗位编码和id  map
+    //Map<String, String> map_jobtitle_code_id = new HashMap<>();
+
+    private final LogTool log = new LogTool("/log/hrm/job/", false);
+    public int size;//接口同步每页数量
+    public boolean hasNextPage;//是否有下一页
+    public String point;//页标
+    public String jkhzurl;//接口URL后缀
+    public void execute(String today){
+        String now = TimeCommonUtil.obtainDate(0);
+        log.writeLog("--------------------同步岗位  start["+now+"]----------------------");
+
+        //为空时默认每页1000条数据
+        if("null".equals(String.valueOf(size))||"0".equals(String.valueOf(size))||size<=0){
+            setSize(1000);
+        }
+        //设置同步HR数据时是否有下一页为是
+        setHasNextPage(true);
+        setPoint("1");
+
+        SyncHrmdepartmentToOA hrmdepartment = new SyncHrmdepartmentToOA();
+        Map<String, String> map_dept_code_id = hrmdepartment.getDepartmentCodeIdMap();
+        //岗位自定义建模表中的ID和编码  map
+        //Map<String, String> map_jobtitledefined_id_code = BaseUtil.getMapKeyValueInfoByParm("uf_jobtitledefined", "", "positionid", "positioncode");
+        //map_jobtitle_code_id = getJobtitleCodeIdMap();
+        RecordSet rs = new RecordSet();
+        log.writeLog("----------开始同步岗位-------");
+        int count = 0;
+        int skipNum = 0,insertNum=0,updateNum = 0;
+//        int page = getPages(date);
+        int page = 5000;//默认为1万页
+        log.writeLog("size---------------------->"+size);
+        //查询条件
+        Map<String,Object> map_parm= new HashMap<>();
+        map_parm.put("beginTime", today);//时间戳
+        map_parm.put("size", size);//每页数量
+
+        //获取所有的岗位编码，同时将岗位编码存入List中
+        List<String> codeList = new ArrayList<>();
+        //当前库中已存在的记录集合 -- 系统岗位表
+        Map<String,String> sysExistMap = new HashMap<>();
+        //当前库中已存在的记录集合 -- 自定义岗位表
+        Map<String,String> definedExistMap = new HashMap<>();
+
+        for (int k = 1; k <= page; k++) {
+            if (!hasNextPage) {
+                log.writeLog("------------第【" + k + "】次循环获取数据不存在，跳出");
+                break;
+            }
+            map_parm.put("point", getPoint());//起始位置，第一次
+            //JSONArray jobtitles = getJobsByPage(k,date);
+            //调用接口获取数据
+            JSONArray jobtitles = getJobsByPoint_New(map_parm);
+            //未获取到数据,跳出循环
+            if(jobtitles==null||jobtitles.isEmpty()){
+                log.writeLog("------------第【" + k + "】调用接口未获取到数据，可能是语言languageCd!=ZHS，跳出本次循环，继续下次循环");
+                continue;
+            }
+
+            codeList.clear();
+            sysExistMap.clear();
+            definedExistMap.clear();
+            for(int m = 0 ; m < jobtitles.size();m++){
+                JSONObject row = jobtitles.getJSONObject(m);
+                String positionCode = Util.null2String(row.getString("positionCode"));//岗位编码
+                if(!"".equals(positionCode)){
+                    codeList.add(positionCode);
+                }
+            }
+
+            if(codeList.size() > 0){
+                sysExistMap = OrganizationUtil.getExitsData(codeList,0);
+                definedExistMap = OrganizationUtil.getExitsData(codeList,1);
+            }
+
+
+            count = count + jobtitles.size();
+            log.writeLog("----------同步岗位第" + k + "页，条数:" + jobtitles.size());
+            for (int i = 0; i < jobtitles.size(); i++) {
+                JSONObject row = jobtitles.getJSONObject(i);
+                String positionCode = Util.null2String(row.getString("positionCode"));//岗位编码
+                String positionName = Util.null2String(row.getString("positionName"));//岗位名称
+                Integer canceled =  "3".equals(Util.null2String(row.getString("status"))) ? 1 : null;//1 新增  2 修改  3作废
+                String deptCode = Util.null2String(row.getString("deptCode"));//部门编码
+                String jobdepartmentid = Util.null2String(map_dept_code_id.get(deptCode));//所属部门ID
+                String jobtitleid = Util.null2String(sysExistMap.get(positionCode));//OA岗位ID
+//                String jobactivityid ="1545";//默认职务ID
+                String positionabbreviation = Util.null2String(row.getString("positionAbbreviation"));//岗位简称
+                String positiontype = Util.null2String(row.getString("positionType"));//岗位类别
+                String positiontypehighest = Util.null2String(row.getString("positionTypeHighest"));//岗位类别最高
+                String positiontypelowest = Util.null2String(row.getString("positionTypeLowest"));//岗位类别最低
+                String positionpropecode = Util.null2String(row.getString("positionPropeCode"));//岗位属性编码
+                String positionpropename = Util.null2String(row.getString("positionPropeName"));//岗位属性名称
+                String companycode = Util.null2String(row.getString("companyCode"));//公司编码
+                String companyname = Util.null2String(row.getString("companyName"));//公司名称
+                String deptname = Util.null2String(row.getString("deptName"));//部门名称
+                String locationcode = Util.null2String(row.getString("locationCode"));//地点编码
+                String locationname = Util.null2String(row.getString("locationName"));//地点描述
+                String stdpositioncode = Util.null2String(row.getString("stdPositionCode"));//标准岗位编码
+                String stdpositionname = Util.null2String(row.getString("stdPositionName"));//标准岗位名称
+                String postcode = Util.null2String(row.getString("postCode"));//岗编码
+                String postname = Util.null2String(row.getString("postName"));//岗名称
+                String sequencecode = Util.null2String(row.getString("sequenceCode"));//序列编码
+                String sequencename = Util.null2String(row.getString("sequenceName"));//序列名称
+                String positiongroupcode = Util.null2String(row.getString("positionGroupCode"));//岗族编码
+                String positiongroupname = Util.null2String(row.getString("positionGroupName"));//岗族名称
+                String ethnicgroupcode = Util.null2String(row.getString("ethnicGroupCode"));//族群编码
+                String ethnicgroupname = Util.null2String(row.getString("ethnicGroupName"));//族群名称
+                
+                String sql;
+                //判断HR岗位ID是否已经存在
+                if("".equals(jobdepartmentid)){
+                    skipNum++;
+                    continue;
+                }
+
+                if ("".equals(Util.null2String(jobtitleid))) {//岗位不存在则插入生成新岗位
+                    //新增数据,插入到hrmjobtitles表中
+                    sql = "insert into hrmjobtitles (jobtitlename,jobtitlemark,outkey,jobdepartmentid," +
+                            "canceled,created,creater,modified,modifier) values("
+                            + "'" + positionName + "',"
+                            + "'" + positionName + "',"
+                            + "'" + positionCode + "',"
+                            + "'" + jobdepartmentid + "',"
+                            + "" + canceled  + ","
+                            + "to_date('" + now + "','yyyy-mm-dd hh24:mi:ss'),"
+                            + "'1',"
+                            + "to_date('" + now + "','yyyy-mm-dd hh24:mi:ss'),"
+                            + "'1')";
+                    log.writeLog("插入岗位表生成新数据sql--------->" + sql);
+                    if(rs.execute(sql)) {
+                        insertNum++;
+                        rs.execute("select max(id) from hrmjobtitles");
+                        int maxJobid = 0;//新插入数据的岗位ID
+                        if (rs.next()) {
+                            maxJobid = rs.getInt(1);
+                            //将新增加的岗位加入至MAP中
+                            //map_jobtitle_code_id.put(positionCode, maxJobid + "");
+                            sysExistMap.put(positionCode, maxJobid + "");//防止同一批记录中存在重复数据
+                        }
+                        //新增数据,插入到hrmjobtitles表中
+                        sql = "insert into uf_jobtitledefined (formmodeid,modedatacreater,modedatacreatertype,modedatacreatedate,modedatacreatetime,"
+                                + "positionid,positioncode,positionname,positionabbreviation,positiontype,positiontypehighest,positiontypelowest,"
+                                + "positionpropecode,positionpropename,companycode,companyname,deptcode,deptname,locationcode,locationname,stdpositioncode,"
+                                + "stdpositionname,postcode,postname,sequencecode,sequencename,positiongroupcode,positiongroupname,ethnicgroupcode,ethnicgroupname) values"
+                                + "(32501,1,0,to_char(sysdate, 'yyyy-MM-dd'),to_char(sysdate, 'HH24:mi:ss'),'" + maxJobid + "','" + positionCode + "','" + positionName + "',"
+                                + "'" + positionabbreviation + "','" + positiontype + "','" + positiontypehighest + "','" + positiontypelowest + "','" + positionpropecode + "',"
+                                + "'" + positionpropename + "','" + companycode + "','" + companyname + "','" + deptCode + "','" + deptname + "','" + locationcode + "'" + ","
+                                + "'" + locationname + "','" + stdpositioncode + "','" + stdpositionname + "','" + postcode + "','" + postname + "','" + sequencecode + "','" + sequencename + "',"
+                                + "'" + positiongroupcode + "','" + positiongroupname + "','" + ethnicgroupcode + "','" + ethnicgroupname + "')";
+                        log.writeLog("插入岗位建模自定义表生成新数据sql--------->" + sql);
+                        rs.execute(sql);
+                        //将新增加的岗位加入至MAP中
+                        definedExistMap.put(maxJobid + "", positionCode);
+                    }else{
+                        log.writeLog("该岗位信息写入失败！");
+                    }
+                    
+                } else {//岗位存在则更新
+                    sql = "update hrmjobtitles set " +
+                            "jobtitlename = '" + positionName + "', " +
+                            "jobtitlemark = '" + positionName + "', " +
+                            "jobtitlecode = '" + positionCode + "', " +
+                            "jobdepartmentid = '" + jobdepartmentid + "', " +
+                            "modified = to_date('" + now + "','yyyy-mm-dd hh24:mi:ss')," +
+                            "modifier = '1', " +
+                            "canceled = " + canceled + " " +
+                            "where  id= '" + jobtitleid + "'";
+                    log.writeLog("更新岗位表中数据sql--------->" + sql);
+                    rs.execute(sql);
+                    updateNum++;
+                    log.writeLog("更新岗位表---成功------>");
+                    
+                    
+                    if(definedExistMap.containsKey(jobtitleid)){//存在则更新岗位自定义表
+                    	sql = "update uf_jobtitledefined set " +
+                                "positionName = '" + positionName + "', " +
+                                "positionabbreviation = '" + positionabbreviation + "', " +
+                                "positiontype = '" + positiontype + "', " +
+                                "positiontypehighest = '" + positiontypehighest + "', " +
+                                "positiontypelowest = '" + positiontypelowest + "', " +
+                                "positionpropecode = '" + positionpropecode + "', " +
+                                "positionpropename = '" + positionpropename + "', " +
+                                "companycode = '" + companycode + "', " +
+                                "companyname = '" + companyname + "', " +
+                                "deptCode = '" + deptCode + "', " +
+                                "deptname = '" + deptname + "', " +
+                                "locationcode = '" + locationcode + "', " +
+                                "locationname = '" + locationname + "', " +
+                                "stdpositioncode = '" + stdpositioncode + "', " +
+                                "stdpositionname = '" + stdpositionname + "', " +
+                                "postcode = '" + postcode + "', " +
+                                "postname = '" + postname + "', " +
+                                "sequencecode = '" + sequencecode + "', " +
+                                "sequencename = '" + sequencename + "', " +
+                                "positiongroupcode = '" + positiongroupcode + "', " +
+                                "positiongroupname = '" + positiongroupname + "', " +
+                                "ethnicgroupcode = '" + ethnicgroupcode + "', " +
+                                "ethnicgroupname = '" + ethnicgroupname + "' " +
+                                "where positionid= '" + jobtitleid + "'";
+                        log.writeLog("更新岗位建模自定义表中数据sql--------->" + sql);
+                        rs.execute(sql);
+                    	
+                    }else{//不存在则插入岗位自定义表
+                    	//新增数据,插入到hrmjobtitles表中
+                        sql = "insert into uf_jobtitledefined (formmodeid,modedatacreater,modedatacreatertype,modedatacreatedate,modedatacreatetime,"
+                        		+ "positionid,positioncode,positionname,positionabbreviation,positiontype,positiontypehighest,positiontypelowest,"
+                        		+ "positionpropecode,positionpropename,companycode,companyname,deptcode,deptname,locationcode,locationname,stdpositioncode,"
+                        		+ "stdpositionname,postcode,postname,sequencecode,sequencename,positiongroupcode,positiongroupname,ethnicgroupcode,ethnicgroupname) values"
+                                    + "(32501,1,0,to_char(sysdate, 'yyyy-MM-dd'),to_char(sysdate, 'HH24:mi:ss'),'"+jobtitleid+"','"+positionCode+"','"+positionName+"',"
+                                    + "'"+positionabbreviation+"','"+positiontype+"','"+positiontypehighest+"','"+positiontypelowest+"','"+positionpropecode+"',"
+                                    + "'"+positionpropename+"','"+companycode+"','"+companyname+"','"+deptCode+"','"+deptname+"','"+locationcode+"'"+ ","
+                                    + "'"+locationname+"','"+stdpositioncode+"','"+stdpositionname+"','"+postcode+"','"+postname+"','"+sequencecode+"','"+sequencename+"',"
+                                    + "'"+positiongroupcode+"','"+positiongroupname+"','"+ethnicgroupcode+"','"+ethnicgroupname+"')";
+                        log.writeLog("插入岗位建模自定义表生成新数据sql--------->" + sql);
+                        rs.execute(sql);
+                        //将新增加的岗位加入至MAP中
+                        //map_jobtitledefined_id_code.put(jobtitleid + "",positionCode);
+                        definedExistMap.put(jobtitleid,positionCode);
+                    }
+                }
+            }
+            log.writeLog("----------同步结束岗位，第" + k + "页："+count+
+                    ",新增岗位数为："+insertNum+" ,更新岗位数为："+updateNum+",跳出处理岗位数为："+skipNum+"------------");
+            skipNum = 0;insertNum=0;updateNum = 0;
+        }
+        log.writeLog("----------同步结束岗位总数："+count+"------------");
+        //更新岗位缓存
+        JobTitlesComInfo jtci = new JobTitlesComInfo();
+        jtci.removeJobTitlesCache();
+
+        //释放map占用的内存
+        //map_jobtitledefined_id_code.clear();
+        map_dept_code_id.clear();
+        //map_jobtitle_code_id.clear();
+        //map_jobtitle_code_id=null;
+        
+        //更新同步时间到中间表
+        String sql1 = "update uf_HRRestDate set sctbsj ='"+now+"' where jkbs = 'post'";
+        rs.execute(sql1);
+
+    }
+    /**
+     * 获取当前库的岗位信息
+     * @deprecated 暂不使用
+     * @return 岗位信息集合
+     */
+    public Map<String, String> getJobtitleCodeIdMap() {
+        RecordSet rs = new RecordSet();
+        Map<String, String> map = new HashMap<>();
+        rs.executeQuery("select jobtitlecode,outkey,id from hrmjobtitles where outkey is not null  and (CANCELED!=1 or CANCELED is null)");
+        while (rs.next()) {
+            map.put(rs.getString("outkey"), rs.getString("id"));
+        }
+        return map;
+    }
+
+    /**
+     * 获取岗位信息(新方法)
+     * @param map 查询条件
+     * @return 返回岗位信息
+     */
+    @SuppressWarnings("unchecked")
+    public JSONArray getJobsByPoint_New(Map<String, Object> map) {
+        //新接口URL
+        String url = HttpClientToJT.baseUrl + getJkhzurl();
+        log.writeLog("获取岗位数据url-------->"+url);
+        LogTool log2 = new LogTool("/log/hrm/job/detail", false);
+        //获取token
+        String token = HttpClientToJT.getToken();
+        //将map转成字符串
+        String param=JSONObject.toJSONString(map, SerializerFeature.DisableCircularReferenceDetect);
+        log.writeLog("获取岗位数据传入参数param------------>"+param);
+        log2.writeLog("获取岗位数据传入参数param------------>"+param);
+        String s = HttpClientToJT.sendPost(url, token, param);
+        log2.writeLog("岗位数据返回结果------------>"+s);
+
+        JSONObject jsonObject = JSONObject.parseObject(s);
+        JSONArray jsonArray = new JSONArray();
+        String code=Util.null2String(jsonObject.getString("code"));
+        if ("1".equals(code)) {
+            JSONObject result = jsonObject.getJSONObject("data");
+            //是否有下一页
+            boolean sfyxyy=result.getBoolean("hasNextPage");//是否有下一页
+            String maxPoint=result.getString("maxPoint");//下一页开始
+            this.setHasNextPage(sfyxyy);
+            this.setPoint(maxPoint);
+            JSONArray records = result.getJSONArray("records");
+            //过滤未获取到数据
+            if(records!=null){
+                jsonArray.addAll(records);
+                Object directSales = jsonArray.stream().filter(item -> {
+                    JSONObject itemJson = JSONObject.parseObject(JSON.toJSONString(item));
+                    return "ZHS".equals(itemJson.getString("languageCd"));
+                }).collect(Collectors.toList());
+                jsonArray = JSONArray.parseArray(JSON.toJSONString(directSales));
+            }
+        }else{
+            this.setHasNextPage(false);
+        }
+
+
+        return jsonArray;
+    }
+
+    /**
+     * @deprecated 未使用到
+     * @param date 日期
+     * @return 整数
+     */
+    public int getPages(String date) {
+        int current = 1,pages=1;
+        String url = HttpClientToJT.baseUrl+"/dcopenedi/hrPost/pageByUpdateTime";
+        String token = HttpClientToJT.getToken();
+        Map<String, Object> params = new HashMap<>();
+        params.put("updateTime",date);
+        params.put("current",current);
+        params.put("size",size);
+        String s = HttpClientToJT.sendGet(url, token, params);
+        JSONObject jsonObject = JSONObject.parseObject(s);
+        String code=Util.null2String(jsonObject.getString("code"));
+        log.writeLog("code------>"+code);
+        if ("1".equals(code)) {
+            JSONObject result = jsonObject.getJSONObject("data");
+            pages = result.getInteger("pages");
+        }else{
+        	log.writeLog("获取页数返回结果------>"+s);
+        }
+        return pages;
+    }
+
+    /**
+     * @deprecated 未使用到
+     * @param pages 页数
+     * @param date 日期
+     * @return 岗位信息
+     */
+    @SuppressWarnings("unchecked")
+    public JSONArray getJobsByPage(int pages,String date) {
+        String url = HttpClientToJT.baseUrl+"/dcopenedi/hrPost/pageByUpdateTime";
+        String token = HttpClientToJT.getToken();
+        Map<String, Object> params = new HashMap<>();
+        params.put("updateTime",date);
+        params.put("current",pages);
+        params.put("size",size);
+        String s = HttpClientToJT.sendGet(url, token, params);
+        JSONObject jsonObject = JSONObject.parseObject(s);
+        JSONArray jsonArray = new JSONArray();
+        String code=Util.null2String(jsonObject.getString("code"));
+        if ("1".equals(code)) {
+            JSONObject result = jsonObject.getJSONObject("data");
+            JSONArray records = result.getJSONArray("records");
+            jsonArray.addAll(records);
+        }
+        Object directSales = jsonArray.stream().filter(item -> {
+            JSONObject itemJson = JSONObject.parseObject(JSON.toJSONString(item));
+            return "ZHS".equals(itemJson.getString("languageCd"));
+        }).collect(Collectors.toList());
+        jsonArray = JSONArray.parseArray(JSON.toJSONString(directSales));
+        return jsonArray;
+    }
+
+    /**
+     * 获取岗位信息
+     * @return JSONArray
+     */
+    @SuppressWarnings("unchecked")
+    public JSONArray getJobtitles() {
+        int current = 1,pages;
+        String url = HttpClientToJT.baseUrl+"/dcopenedi/hrPost/pageByUpdateTime";
+        String token = HttpClientToJT.getToken();
+        Map<String, Object> params = new HashMap<>();
+        params.put("updateTime", "2021-03-21 00:00:00");
+        params.put("current",current);
+        params.put("size",size);
+        String s = HttpClientToJT.sendGet(url, token, params);
+        JSONObject jsonObject = JSONObject.parseObject(s);
+        JSONArray jsonArray = new JSONArray();
+        String code=Util.null2String(jsonObject.getString("code"));
+        if ("1".equals(code)) {
+            JSONObject result = jsonObject.getJSONObject("data");
+            pages = result.getInteger("pages");
+            JSONArray records = result.getJSONArray("records");
+            jsonArray.addAll(records);
+            for (int i = 2; i <= pages; i++) {
+                System.out.println(i);
+                params.put("current", i);
+                String str = HttpClientToJT.sendGet(url, token, params);
+                JSONObject jsonObject1 = JSONObject.parseObject(str);
+                JSONObject jsonResult = jsonObject1.getJSONObject("data");
+                JSONArray records1 = jsonResult.getJSONArray("records");
+                jsonArray.addAll(records1);
+            }
+            Object directSales = jsonArray.stream().filter(item -> {
+                JSONObject itemJson = JSONObject.parseObject(JSON.toJSONString(item));
+                return "ZHS".equals(itemJson.getString("languageCd"));
+            }).collect(Collectors.toList());
+            jsonArray = JSONArray.parseArray(JSON.toJSONString(directSales));
+        }
+//        System.out.println(jsonArray.toJSONString());
+//        System.out.println(s);
+        //将写入转化为流的形式
+        writeFile(jsonArray);
+        return jsonArray;
+    }
+
+    private void writeFile(JSONArray jsonArray) {
+        BufferedWriter bw;
+        try {
+            bw = new BufferedWriter(new FileWriter("E:\\3.txt"));
+            //一次写一行
+            bw.write(jsonArray.toJSONString());
+            bw.newLine();  //换行用
+            //关闭流
+            bw.close();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        System.out.println("写入成功");
+    }
+
+    public static void main(String[] args) {
+        SyncHrmJobTitlesToOANew job = new SyncHrmJobTitlesToOANew();
+        JSONArray array = job.getJobtitles();
+        System.out.println(array.toJSONString());
+    }
+
+	public int getSize() {
+		return size;
+	}
+
+	public void setSize(int size) {
+		this.size = size;
+	}
+
+    public boolean isHasNextPage() {
+        return hasNextPage;
+    }
+
+    public void setHasNextPage(boolean hasNextPage) {
+        this.hasNextPage = hasNextPage;
+    }
+
+    public String getPoint() {
+        return point;
+    }
+
+    public String getJkhzurl() {
+        return jkhzurl;
+    }
+
+    public void setJkhzurl(String jkhzurl) {
+        this.jkhzurl = jkhzurl;
+    }
+
+    public void setPoint(String point) {
+        this.point = point;
+    }
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/schedule/hrm/SyncHrmcompanyToOA.java b/src/main/youhong_ai_jitu_src/jntchina/schedule/hrm/SyncHrmcompanyToOA.java
new file mode 100644
index 0000000..e512111
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/schedule/hrm/SyncHrmcompanyToOA.java
@@ -0,0 +1,187 @@
+package jntchina.schedule.hrm;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.weaver.formmodel.util.DateHelper;
+import jntchina.schedule.hrm.entity.CompanyDto;
+import jntchina.util.HttpClientToJT;
+import selfdev.util.log.LogTool;
+import weaver.conn.RecordSet;
+import weaver.file.Prop;
+import weaver.formmode.data.ModeDataIdUpdate;
+import weaver.formmode.setup.ModeRightInfo;
+import weaver.general.Util;
+
+import java.io.BufferedWriter;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * @author Cyq
+ * @date 2021年6月17日 02:01:51
+ */
+@SuppressWarnings("all")
+public class SyncHrmcompanyToOA {
+	
+	// 分部编码和id  map
+	Map<String, String> map_company_code_id = new HashMap<String, String>();
+	private LogTool log = new LogTool("/log/hrm/company/", false);
+	
+	/**
+	 * 同步HR的公司数据到uf_hrmcompany建模表，注意不是对应OA组织架构hrmsubcompany数据，仅为流程集成时使用
+	 */
+	public void companySynJob() {
+		// 获取中台所有公司数据
+		JSONArray subcompanys = getCompanys();
+		// 已有公司数据map
+		map_company_code_id = getAllCompanys();
+		List<CompanyDto> companyDtos = JSONArray.parseArray(subcompanys.toJSONString(), CompanyDto.class);
+		RecordSet rs = new RecordSet();
+		RecordSet rs2 = new RecordSet();
+		String sql = "";
+		// 建模表表名
+		String tablename = "uf_hrmcompany";
+		String mode = Prop.getPropValue("DevToHR_jntchina", "mode");
+		// 建模ID
+		String formmodeId_p = Prop.getPropValue("DevToHR_jntchina", mode + "_" + tablename + "_formmodeId");
+		log.writeLog("formmodeId_p---------->" + formmodeId_p);
+		// 建模ID
+		int modelId = Integer.parseInt(formmodeId_p);
+		// TODO 同步进表
+		log.writeLog("-----------同步HR公司开始----------");
+		for (int i = 0; i < companyDtos.size(); i++) {
+			CompanyDto companyDto = companyDtos.get(i);
+			// 不存在新增
+			if (!map_company_code_id.containsKey(companyDto.getCompanyCode())) {
+				String modeid_2 = "";
+				// 为解决同时手工执行点击了2次同步时多线程产生的问题，故还需要再次查询一遍数据库中是否已存在
+				rs2.execute("select * from " + tablename + " where company_code='" + companyDto.getCompanyCode() + "'");
+				while (rs2.next()) {
+					modeid_2 = Util.null2String(rs2.getString("id"));
+				}
+				// 若不存在则插入，若已存在则不做其他操作
+				if (!"".equals(modeid_2)) {
+					map_company_code_id.put(companyDto.getCompanyCode(), modeid_2);
+					continue;
+				}
+				// 建模插入数据
+				int id = ModeDataIdUpdate.getInstance().getModeDataNewIdByUUID(tablename, modelId, 1, 1, DateHelper.getCurrentDate(), DateHelper.getCurrentTime());
+				log.writeLog("-----------公司建模数据id----------" + id);
+				ModeRightInfo ModeRightInfo = new ModeRightInfo();
+				ModeRightInfo.setNewRight(true);
+				// 新建的时候添加共享
+				ModeRightInfo.editModeDataShare(1, modelId, id);
+				// 新建的时候添加文档共享
+				ModeRightInfo.addDocShare(1, modelId, id);
+				sql = "update " + tablename + " set " +
+						      "language_cd = '" + companyDto.getLanguageCd() + "', " +
+						      "company_code = '" + companyDto.getCompanyCode() + "', " +
+						      "company_name = '" + companyDto.getCompanyName() + "', " +
+						      "company_abbreviation = '" + companyDto.getCompanyAbbreviation() + "', " +
+						      "country_code = '" + companyDto.getCountryCode() + "', " +
+						      "country_name = '" + companyDto.getCountryName() + "', " +
+						      "company_level_code = '" + companyDto.getCompanyLevelCode() + "', " +
+						      "company_level_name = '" + companyDto.getCompanyLevelName() + "', " +
+						      "is_direct_sales = '" + companyDto.getIsDirectSales() + "', " +
+						      "unify_social_credit_code = '" + companyDto.getUnifySocialCreditCode() + "', " +
+						      "status = '" + companyDto.getStatus() + "' " +
+						      "where id = " + id;
+				log.writeLog("-----------公司新增sql:" + sql);
+				rs.executeUpdate(sql);
+				map_company_code_id.put(companyDto.getCompanyCode(), id + "");
+			} else {// 存在修改
+				sql = "update " + tablename + " set " +
+						      "company_name = '" + companyDto.getCompanyName() + "', " +
+						      "company_abbreviation = '" + companyDto.getCompanyAbbreviation() + "', " +
+						      "company_level_code = '" + companyDto.getCompanyLevelCode() + "', " +
+						      "company_level_name = '" + companyDto.getCompanyLevelName() + "', " +
+						      "unify_social_credit_code = '" + companyDto.getUnifySocialCreditCode() + "', " +
+						      "is_direct_sales = '" + companyDto.getIsDirectSales() + "', " +
+						      "status = '" + companyDto.getStatus() + "' " +
+						      "where  company_code = '" + companyDto.getCompanyCode() + "'";
+				log.writeLog("-----------公司更新sql:" + sql);
+				rs.executeUpdate(sql);
+			}
+			
+		}
+		log.writeLog("-----------公司同步结束----------");
+	}
+	
+	public Map<String, String> getAllCompanys() {
+		RecordSet rs = new RecordSet();
+		Map<String, String> map = new HashMap<>();
+		String sql = "select company_code,id from uf_hrmcompany";
+		rs.executeQuery(sql);
+		while (rs.next()) {
+			map.put(rs.getString("company_code"), rs.getString("id"));
+		}
+		return map;
+		
+	}
+	
+	public JSONArray getCompanys() {
+		int current = 1, size = 10000, pages = 2;
+		String url = HttpClientToJT.baseUrl + "/dcopenedi/hrCompany/pageByUpdateTime";
+		System.out.println(url);
+		String token = HttpClientToJT.getToken();
+		Map<String, Object> params = new HashMap<>();
+//        LocalDateTime today_start = LocalDateTime.of(LocalDate.now(), LocalTime.MIN);//当天零点
+//        String td_st_str = today_start.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+//        params.put("updateTime", td_st_str);
+		params.put("updateTime", "2018-03-21 00:00:00");
+		params.put("current", current);
+		params.put("size", size);
+		String s = HttpClientToJT.sendGet(url, token, params);
+		JSONObject jsonObject = JSONObject.parseObject(s);
+		JSONArray jsonArray = new JSONArray();
+		if (jsonObject.getInteger("code").equals(1)) {
+			JSONObject result = jsonObject.getJSONObject("data");
+			pages = result.getInteger("pages");
+			JSONArray records = result.getJSONArray("records");
+			jsonArray.addAll(records);
+			for (int i = 2; i <= pages; i++) {
+				params.put("current", i);
+				String str = HttpClientToJT.sendGet(url, token, params);
+				JSONObject jsonObject1 = JSONObject.parseObject(str);
+				JSONObject jsonResult = jsonObject1.getJSONObject("data");
+				JSONArray records1 = jsonResult.getJSONArray("records");
+				jsonArray.addAll(records1);
+			}
+			Object directSales = jsonArray.stream().filter(item -> {
+				JSONObject itemJson = JSONObject.parseObject(JSON.toJSONString(item));
+				return "CHN".equals(itemJson.getString("countryCode")) && "ZHS".equals(itemJson.getString("languageCd"));
+				// return "ZHS".equals(itemJson.getString("languageCd"));
+			}).collect(Collectors.toList());
+			jsonArray = JSONArray.parseArray(JSON.toJSONString(directSales));
+		}
+		System.out.println(jsonArray.toJSONString());
+		// 将写入转化为流的形式
+//        writeFile(jsonArray);
+		return jsonArray;
+	}
+	
+	private void writeFile(JSONArray jsonArray) {
+		BufferedWriter bw = null;
+		try {
+			bw = new BufferedWriter(new FileWriter("E:\\1.txt"));
+			// 一次写一行
+			bw.write(jsonArray.toJSONString());
+			bw.newLine();  // 换行用
+			// 关闭流
+			bw.close();
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+		System.out.println("写入成功");
+	}
+	
+	public static void main(String[] args) {
+		SyncHrmcompanyToOA xx = new SyncHrmcompanyToOA();
+		xx.getCompanys();
+	}
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/schedule/hrm/SyncHrmdepartmentToOA.java b/src/main/youhong_ai_jitu_src/jntchina/schedule/hrm/SyncHrmdepartmentToOA.java
new file mode 100644
index 0000000..e221a57
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/schedule/hrm/SyncHrmdepartmentToOA.java
@@ -0,0 +1,702 @@
+package jntchina.schedule.hrm;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.serializer.SerializerFeature;
+import com.api.integration.util.JavaUtil;
+import jntchina.schedule.hrm.entity.DepartmentDto;
+import jntchina.util.HttpClientToJT;
+import selfdev.util.base.TimeCommonUtil;
+import selfdev.util.log.LogTool;
+import weaver.conn.RecordSet;
+import weaver.general.Util;
+import weaver.hrm.company.DepartmentComInfo;
+import weaver.matrix.MatrixUtil;
+
+import java.io.BufferedWriter;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * 定时将HR系统中的组织同步至OA的部门中
+ *
+ * @author Cyq
+ * @date 2021年6月17日 02:01:51
+ */
+public class SyncHrmdepartmentToOA {
+
+    //部门编码和id  map
+    Map<String, String> map_dept_code_id = new HashMap<String, String>();
+    private LogTool log = new LogTool("/log/hrm/dept/", false);
+    public int size;//接口同步每页数量
+    public boolean hasNextPage;//是否有下一页
+    public String point;//页标
+    public String jkhzurl = "/dcopenedi/hrDept/pageNewHrDeptByUpdateTime";//接口URL后缀
+
+    /**
+     * 同步分部、部门数据
+     * 注：对方整个组织数不区分部门和分部，全部用部门接口数据，用类型区分
+     */
+    public void execute(String today) {
+        String now = TimeCommonUtil.obtainDate(0);
+        log.writeLog("--------------------同步组织  start[" + now + "]----------------------");
+        //为空时默认每页1000条数据
+        if ("null".equals(String.valueOf(size)) || "0".equals(String.valueOf(size)) || size <= 0) {
+            setSize(1000);
+        }
+        //设置同步HR数据时是否有下一页为是
+        setHasNextPage(true);
+        setPoint("1");
+        RecordSet rs = new RecordSet();
+        //处理部门同步逻辑
+        RecordSet rs2 = new RecordSet();
+        //匹配部门id，关联的上级部门，所属分部 map
+        Map<String, Map<String, String>> map_dept_id_data = new HashMap<>();
+        map_dept_id_data = getDeptDataMap();
+        map_dept_code_id = getDepartmentCodeIdMap();
+        SyncHrmsubcompanyToOA hrmsubcompany = new SyncHrmsubcompanyToOA();
+        SyncHrmresourceToOA hrmresource = new SyncHrmresourceToOA();
+        //人员map,用于匹配上级领导
+        Map<String, String> map_user_code_id = hrmresource.getUserCodeIdMap();
+        //分部List
+        List<DepartmentDto> subcompanys = new ArrayList<DepartmentDto>();
+        //部门List
+        List<DepartmentDto> departments = new ArrayList<DepartmentDto>();
+        log.writeLog("size---------------------->" + size);
+        //查询条件
+        Map<String, Object> map_parm = new HashMap<String, Object>();
+        map_parm.put("updateTime", today);//时间戳
+        map_parm.put("size", size);//每页数量
+//        List<String> languageCds_list=new ArrayList<String>();
+//        languageCds_list.add("ZHS");//语言默认为中文
+//        map_parm.put("languageCds", languageCds_list);//支持多语言
+        log.writeLog("----------hasNextPage------------>" + hasNextPage);
+        List<DepartmentDto> skipList = new ArrayList<>();
+        int skipNum = 0, insertNum = 0, updateNum = 0;
+        int page = 10000;//默认为1万页
+        for (int k = 1; k <= page; k++) {
+            if (!hasNextPage) {
+                log.writeLog("------------第【" + k + "】次循环获取数据不存在，跳出");
+                break;
+            }
+            map_parm.put("point", getPoint());//起始位置，第一次
+            //拆分数据、organizationClass 10类型是组织，其他类型当部门,【代理区】在对方那是虚拟部门，特殊处理划分为OA   分部
+            //JSONArray data = getDepartments(date);
+            //调用新接口获取组织数据
+            JSONArray data = getDepartmentsByPoint_New(map_parm);
+            //接口未获取到数据时，跳过当前循环，进入下一次
+            if (data == null || data.isEmpty()) {
+                log.writeLog("------------第【" + k + "】调用接口未获取到数据，可能是语言languageCd!=ZHS，或者部门国家!=CHN，跳出本次循环，继续下次循环");
+                continue;
+            }
+            List<DepartmentDto> dataList = JSONArray.parseArray(data.toJSONString(), DepartmentDto.class);
+            //分部数据
+            List<DepartmentDto> subcompanys_dt = dataList.stream().filter(item -> {
+                return "10".equals(item.getOrganizationClass()) || "代理区".equals(item.getDepartmentName())
+                        || "加盟商".equals(item.getDepartmentName()) || "中国J&T".equals(item.getDepartmentName())
+                        || "纭毅".equals(item.getDepartmentName()) || "云路科技".equals(item.getDepartmentName())||"区域管理".equals(item.getDepartmentName());
+            }).collect(Collectors.toList());
+            //部门数据  注意：10000300代理区编码
+            List<DepartmentDto> departments_dt = dataList.stream().filter(item -> {
+                return !"10".equals(item.getOrganizationClass()) && !"中国J&T".equals(item.getDepartmentName())
+                        && !"代理区".equals(item.getDepartmentName()) && !"加盟商".equals(item.getDepartmentName())
+                        && !"纭毅".equals(item.getDepartmentName()) && !"云路科技".equals(item.getDepartmentName())&&!"区域管理".equals(item.getDepartmentName())
+                        && !"10000300".equals(item.getSuperiorDepartment());
+            }).collect(Collectors.toList());
+            log.writeLog("----------同步分部第" + k + "页，条数:" + subcompanys_dt.size());
+            log.writeLog("----------同步分部第" + k + "页，具体数据：" + JSON.toJSONString(subcompanys_dt, SerializerFeature.DisableCircularReferenceDetect));
+            log.writeLog("----------同步部门第" + k + "页，条数:" + departments_dt.size());
+            log.writeLog("----------同步部门第" + k + "页，具体数据：" + JSON.toJSONString(departments_dt, SerializerFeature.DisableCircularReferenceDetect));
+
+            //将数据add到list中
+            subcompanys.addAll(subcompanys_dt);
+            departments.addAll(departments_dt);
+        }
+
+
+        //同步分部
+        hrmsubcompany.execute(subcompanys);
+        //获取分部code与ID的MAP映射关系
+        Map<String, String> map_subcompany_code_id = hrmsubcompany.getSubCodeIdMap();
+
+        // 处理部门同步逻辑 1.未匹配到分部，不新增，
+        for (int i = 0; i < departments.size(); i++) {
+            DepartmentDto row = departments.get(i);
+            String countryCode = Util.null2String(row.getCountryCode());//国家编码
+            String departmentCode = Util.null2String(row.getDepartmentCode());//部门编码
+            String departmentName = Util.null2String(row.getDepartmentName());//部门全称
+//            String shortName = Util.null2String(row.getDepartmentAbbreviation());//部门简称
+            String superiorDepartment = Util.null2String(row.getSuperiorDepartment());//上级部门编码
+            String departmentOrder = Util.null2String(row.getDepartmentOrder());//排序
+            String deptManager = Util.null2String(row.getDeptManager());//部门负责人code
+            String brchLeader = Util.null2String(row.getBrchLeader());//分管领导code
+            Integer canceled = Util.null2String(row.getStatus()).equals("3") ? 1 : null;//1 新增  2 修改  3作废
+            String companyCode = Util.null2String(row.getCompanyCode());// 公司
+//            String companyName = Util.null2String(row.getCompanyName());//公司名称
+            if ("".equals(superiorDepartment)) {//上级部门为空时，则跳过同步
+                skipList.add(row);
+                skipNum++;
+                log.writeLog("----------部门编码【" + departmentCode + "】、部门名称【" + departmentName + "】的上级部门为空，跳过同步----------");
+                continue;
+            }
+            //各种code转id
+            String bmfzr = Util.null2String(map_user_code_id.get(deptManager));//部门负责人
+            String bmfgld = Util.null2String(map_user_code_id.get(brchLeader));//分管领导
+            String subcompanyid1 = Util.null2String(map_subcompany_code_id.get(superiorDepartment));//分部ID
+            String supdepid = Util.null2String(map_dept_code_id.get(superiorDepartment));//获取上级ID
+            log.writeLog("------------subcompanyid1：" + subcompanyid1 + "-----deptCode：" + departmentCode + ",status:" + row.getStatus() + ",canceled:" + canceled + "-------");
+            log.writeLog("------------supdepid：" + supdepid + "----deptCode：" + departmentCode + ",status:" + row.getStatus() + ",canceled:" + canceled + "--------");
+            //如果上级编码为空、所属分部，上级部门都找不到，不作处理
+            if ("".equals(superiorDepartment) || ("".equals(subcompanyid1) && "".equals(supdepid))) {
+                skipList.add(row);
+                skipNum++;
+                log.writeLog("----------部门编码【" + departmentCode + "】、部门名称【" + departmentName + "】、上级部门编码【" + superiorDepartment + "】在OA中为匹配上上级部门，或者未找到所属分部，跳过同步----------");
+                continue;
+            }
+            String sql = "";
+            //判断HR部门ID是否已经存在
+
+//            //多语言
+//            departmentName = getDepartmentName(today,departmentCode,departmentName);
+//            if("".equals(departmentName)){
+//                log.writeLog("--------------多语言为空code:"+departmentCode);
+//                departmentName = row.getDepartmentName();
+//            }
+
+            //只需要中文和英文
+            departmentName = "~`~`7 " + departmentName + "`~`8  `~`~";
+            log.writeLog("-------------英语刷为空：" + departmentName);
+
+            log.writeLog("第" + (i + 1) + "条，取数据完成！");
+            if (!map_dept_code_id.containsKey(departmentCode)) {//部门不存在则插入生成新部门
+                //如果找到subcompanyid1不为空，说明是顶级部门，
+                if (!"".equals(subcompanyid1)) {
+                    supdepid = "0";
+                }
+                if (!"".equals(supdepid) && "".equals(subcompanyid1)) {
+                    log.writeLog("开始取部门:" + departmentCode + ",上级分部id:" + supdepid + "。");
+                    subcompanyid1 = getSubId(map_dept_id_data, supdepid);
+                    log.writeLog("结束取部门:" + departmentCode + ",上级分部id:" + supdepid + ",取到的分部id:" + subcompanyid1);
+                }
+                String deptid_2 = "";
+                //为解决同时手工执行点击了2次同步时多线程产生的问题，故还需要再次查询一遍数据库中是否已存在
+                rs2.execute("select id from HrmDepartment where outkey='" + departmentCode + "'");
+                while (rs2.next()) {
+                    deptid_2 = Util.null2String(rs2.getString("id"));
+                }
+                //若不存在则插入，若已存在则不做其他操作
+                if (!"".equals(deptid_2)) {
+                    log.writeLog("部门ID【" + deptid_2 + "】、部门编码【" + departmentCode + "】、部门outkey【" + departmentCode + "】已存在，当前跳过，进入下一次循环");
+                    map_dept_code_id.put(departmentCode, deptid_2);
+                    skipNum++;
+                    continue;
+                }
+                sql = "insert into HrmDepartment (departmentname,departmentcode,departmentmark,outkey," +
+                        "supdepid,canceled,created,creater,modified,modifier," +
+                        "showorder,subcompanyid1,bmfzr,bmfgld) values("
+                        + "'" + departmentName + "',"
+                        + "'" + departmentCode + "',"
+                        + "'" + departmentName + "',"
+                        + "'" + departmentCode + "',"
+                        + "'" + supdepid + "',"
+                        + "" + canceled + ","
+                        + "to_date('" + now + "','yyyy-mm-dd hh24:mi:ss'),"
+                        + "'1',"
+                        + "to_date('" + now + "','yyyy-mm-dd hh24:mi:ss'),"
+                        + "'1',"
+                        + "'" + departmentOrder + "',"
+                        + "'" + subcompanyid1 + "', "
+                        + "'" + bmfzr + "', "
+                        + "'" + bmfgld + "')";
+                log.writeLog("插入部门表生成新数据sql--------->" + sql);
+                rs.execute(sql);
+                insertNum++;
+                rs.execute("select max(id) from HrmDepartment");
+                int maxDeptID = 0;//新插入数据的部门ID
+                if (rs.next()) {
+                    maxDeptID = rs.getInt(1);
+                    //将新增加的部门加入至MAP中
+                    map_dept_code_id.put(departmentCode, maxDeptID + "");
+                    //将数据加入到MAP中
+                    Map<String, String> map2 = new HashMap<String, String>();
+                    map2.put("outkey", departmentCode);
+                    map2.put("subdepid", supdepid);
+                    map2.put("subcompanyid1", subcompanyid1);
+                    map_dept_id_data.put(maxDeptID + "", map2);
+                }
+                //新增数据,插入到部门自定义表HrmDepartmentDefined中
+                sql = "insert into HrmDepartmentDefined(deptid,sfzy,frgs,bmfzr,guojia,bmfgld) " +
+                        "values('" + maxDeptID + "'," +
+                        "'" + row.getIsDirectSales() + "'," +
+                        "'" + companyCode + "'," +
+                        "'" + bmfzr + "'," +
+                        "'" + countryCode + "'," +
+                        "'" + bmfgld + "')";
+                rs.execute(sql);
+                log.writeLog("插入部门自定义表中数据sql--------->" + sql);
+//                //将新增加的人员自定义信息加入至MAP中
+//                map_dept_id_defined.put(maxDeptID + "", maxDeptID + "");
+//                //将部门与所属分部对应关系放到map中
+//                map_deptid_subcompanyid.put(maxDeptID + "", subcompanyid1);
+                //同步部门矩阵信息
+                MatrixUtil.updateDepartmentData(maxDeptID + "");
+            } else {//部门存在则更新
+                //如果找到subcompanyid1不为空，说明是顶级部门，
+                String deptid = Util.null2String(map_dept_code_id.get(departmentCode));//OA部门ID
+                if ("".equals(deptid)) {
+                    skipNum++;
+                    continue;
+                }
+                if (!"".equals(subcompanyid1)) {
+                    supdepid = "0";
+                }
+                if (!"".equals(supdepid) && "".equals(subcompanyid1)) {
+                    log.writeLog("开始取部门" + departmentCode + "上级分部id：" + supdepid + "。");
+                    subcompanyid1 = getSubId(map_dept_id_data, supdepid);
+                    log.writeLog("结束取部门" + departmentCode + "上级分部id：" + supdepid + "。取到的分部id：" + subcompanyid1);
+                }
+                String updateStr = "";
+                //只有有值才覆盖
+                updateStr += !"".equals(subcompanyid1) ? "subcompanyid1 = '" + subcompanyid1 + "', " : "";
+                updateStr += !"".equals(supdepid) ? "supdepid = '" + supdepid + "', " : "";
+                updateStr += !"".equals(bmfzr) ? "bmfzr = '" + bmfzr + "', " : "";
+                updateStr += !"".equals(bmfgld) ? "bmfgld = '" + bmfgld + "', " : "";
+                sql = "update HrmDepartment set " +
+                        "departmentname = '" + departmentName + "', " +
+                        "departmentmark = '" + departmentName + "', " +
+                        updateStr +
+                        "canceled = " + canceled + ", " +
+                        "modified = to_date('" + now + "','yyyy-mm-dd hh24:mi:ss'), " +
+                        "modifier = '1', " +
+                        "showorder = '" + departmentOrder + "' " +
+                        "where  id= '" + deptid + "'";
+                log.writeLog("更新部门表中数据sql--------->" + sql);
+                rs.execute(sql);
+                updateNum++;
+                //处理部门矩阵
+                sql = "select deptid,bmfzr,bmfgld,sfzy from HrmDepartmentDefined where deptid ='" + deptid + "'";
+                rs.executeQuery(sql);
+                if (rs.next()) {
+                    bmfzr = !"".equals(bmfzr) ? bmfzr : Util.null2String(rs.getString("bmfzr"));
+                    bmfgld = !"".equals(bmfgld) ? bmfgld : Util.null2String(rs.getString("bmfgld"));
+                    sql = "update HrmDepartmentDefined set " +
+                            "bmfzr = '" + bmfzr + "' " +
+                            ",guojia = '" + countryCode + "' " +
+                            ",sfzy = '" + row.getIsDirectSales() + "' " +
+                            ",frgs= '" + companyCode + "'" +
+                            ",bmfgld= '" + bmfgld + "'" +
+                            "where deptid = '" + deptid + "'";
+                    rs.execute(sql);
+                    log.writeLog("更新部门自定义表中数据sql--------->" + sql);
+                } else {
+                    sql = "insert into HrmDepartmentDefined(deptid,sfzy,frgs,bmfzr,guojia,bmfgld) " +
+                            "values('" + deptid + "'," +
+                            "'" + row.getIsDirectSales() + "'," +
+                            "'" + companyCode + "'," +
+                            "'" + bmfzr + "'," +
+                            "'" + countryCode + "'," +
+                            "'" + bmfgld + "')";
+                    rs.execute(sql);
+                    log.writeLog("插入部门自定义表中数据sql--------->" + sql);
+                }
+                //人员信息伴随部门信息变化
+                if (!"".equals(subcompanyid1)) {
+                    sql = "update hrmResource set subCompanyId1='" + subcompanyid1 + "' where departmentId = '" + deptid + "' ";
+                    rs.executeUpdate(sql);
+
+                    //更新该部门的所有下级部门的所属分部
+                    sql = "update hrmdepartment set subCompanyId1 = '" + subcompanyid1 + "' where exists ( \n" +
+                            "   select 1 from (" +
+                            "       select id from hrmdepartment start with id = " + deptid + " connect by supdepid = prior id \n" +
+                            "   ) s where s.id = hrmdepartment.id \n" +
+                            ")";
+
+                    rs.executeUpdate(sql);
+                }
+                //同步部门矩阵信息
+                MatrixUtil.updateDepartmentData(deptid);
+            }
+        }
+        log.writeLog("此次同步部门总数为：" + departments.size() + ",新增部门数为：" + insertNum +
+                ",更新部门数为：" + updateNum + ",跳出处理部门数为：" + skipNum);
+        log.writeLog("此次同步部门跳过是数据为：" + JSON.toJSONString(skipList));
+        //更新部门缓存
+        DepartmentComInfo dci = new DepartmentComInfo();
+        dci.removeCompanyCache();
+        //释放map内存
+        map_dept_id_data.clear();
+        map_dept_id_data = null;
+        map_dept_code_id.clear();
+        map_dept_code_id = null;
+        map_user_code_id.clear();
+        map_user_code_id = null;
+
+        //将部门矩阵信息同步至矩阵表(20220118取消矩阵全量同步)
+        //MatrixUtil.sysDepartmentData();
+        //MatrixUtil.updateSubcompayData("");//同步分部矩阵数据
+        //更新同步时间到中间表
+        String sql1 = "update uf_HRRestDate set sctbsj ='" + now + "' where jkbs = 'dept'";
+        rs.execute(sql1);
+    }
+
+
+    /**
+     * 匹配部门id，关联的上级部门，所属分部 map
+     *
+     * @return
+     */
+    private Map<String, Map<String, String>> getDeptDataMap() {
+        RecordSet rs = new RecordSet();
+        Map<String, Map<String, String>> map = new HashMap<>();
+        //rs.executeQuery("select id, outkey,supdepid,subcompanyid1 from HrmDepartment where (CANCELED!=1 or CANCELED is null)");
+        rs.executeQuery("select id, outkey,supdepid,subcompanyid1 from HrmDepartment where outkey is not null");
+        while (rs.next()) {
+            Map<String, String> map1 = new HashMap<>();
+            map1.put("outkey", rs.getString("outkey"));
+            map1.put("supdepid", rs.getString("supdepid"));
+            map1.put("subcompanyid1", rs.getString("subcompanyid1"));
+            map.put(rs.getString("id"), map1);
+        }
+        return map;
+    }
+
+    /**
+     * 根据部门id匹配所属分部
+     *
+     * @return
+     */
+    public String getSubId(Map<String, Map<String, String>> map_dept_id_data, String deptId) {
+        String subcompanyid = "";
+        if (!map_dept_id_data.containsKey(deptId)) {
+            return "";
+        }
+        Map<String, String> map = map_dept_id_data.get(deptId);
+        subcompanyid = map.get("subcompanyid1");
+        return subcompanyid;
+    }
+//    /**
+//     * 获取部门编码和上级分部的集合
+//     *
+//     * @return
+//     */
+//    public Map<String, String> getDeptComMap() {
+//        RecordSet rs = new RecordSet();
+//        Map<String, String> map = new HashMap<>();
+//        rs.executeQuery("select outkey,supdepid from HrmDepartment where outkey is not null  and (CANCELED!=1 or CANCELED is null)");
+//        while (rs.next()) {
+//            map.put(rs.getString("outkey"), rs.getString("supdepid"));
+//        }
+//        return map;
+//    }
+
+    public Map<String, String> getDepartmentCodeIdMap() {
+        RecordSet rs = new RecordSet();
+        Map<String, String> map = new HashMap<>();
+        //rs.executeQuery("select departmentcode,outkey,id from HrmDepartment where outkey is not null  and (CANCELED!=1 or CANCELED is null)");
+        rs.executeQuery("select departmentcode,outkey,id from HrmDepartment where outkey is not null ");
+        while (rs.next()) {
+            map.put(rs.getString("outkey"), rs.getString("id"));
+        }
+        return map;
+    }
+
+
+    /**
+     * 获取组织信息(新方法)
+     *
+     * @param map 查询条件
+     * @return
+     */
+    public JSONArray getDepartmentsByPoint_New(Map<String, Object> map) {
+        //新接口URL
+        String url = HttpClientToJT.baseUrl + getJkhzurl();
+        log.writeLog("获取部门数据url-------->" + url);
+        LogTool log2 = new LogTool("/log/hrm/dept/detail", false);
+        JSONArray jsonArray = new JSONArray();
+        try {
+            //获取token
+            String token = HttpClientToJT.getToken();
+            //将map转成字符串
+            String param = JSONObject.toJSONString(map, SerializerFeature.DisableCircularReferenceDetect);
+            log.writeLog("获取组织数据传入参数param------------>" + param);
+            log2.writeLog("获取组织数据传入参数param------------>" + param);
+            String s = HttpClientToJT.sendPost(url, token, param);
+            log2.writeLog("组织数据返回结果------------>" + s);
+            JSONObject jsonObject = JSONObject.parseObject(s);
+            String code = Util.null2String(jsonObject.getString("code"));
+            log2.writeLog("code------------>" + code);
+            if ("1".equals(code)) {
+                JSONObject result = jsonObject.getJSONObject("data");
+                //是否有下一页
+                boolean sfyxyy = result.getBoolean("hasNextPage");//是否有下一页
+                log2.writeLog("sfyxyy------------>" + sfyxyy);
+                String maxPoint = Util.null2String(result.getString("maxPoint"));//下一页开始
+                log2.writeLog("maxPoint------------>" + maxPoint);
+                this.setHasNextPage(sfyxyy);
+                this.setPoint(maxPoint);
+                JSONArray records = result.getJSONArray("records");
+                //判断不为空
+                if (records != null) {
+                    jsonArray.addAll(records);
+                    Object directSales = jsonArray.stream().filter(item -> {
+                        JSONObject itemJson = JSONObject.parseObject(JSON.toJSONString(item));
+                        return "CHN".equals(itemJson.getString("countryCode")) && "ZHS".equals(itemJson.getString("languageCd"));
+                    }).collect(Collectors.toList());
+                    jsonArray = JSONArray.parseArray(JSON.toJSONString(directSales));
+                }
+            } else {
+                this.setHasNextPage(false);
+            }
+        } catch (Exception e) {
+            log2.writeLog("获取组织接口报错，错误信息：" + e.toString());
+        }
+        return jsonArray;
+    }
+
+
+    public JSONArray getDepartments(String date) {
+        int current = 1, pages = 2;
+        String url = HttpClientToJT.baseUrl + "/dcopenedi/hrDept/pageByUpdateTime";
+//        String token = "sBRQZP+HogxLDE0J3vlDRLZHNG5CBxmqT4w8QG/NFr5ejXb6D6la1w==";
+        String token = HttpClientToJT.getToken();
+        log.writeLog("-------token--------->" + token);
+//        String updateTime = DateUtil.formatDate(DateUtil.getCurrentDate(),DateUtil.FORMAT_FULL);
+        Map<String, Object> params = new HashMap<>();
+
+        params.put("updateTime", date);
+//        params.put("updateTime", "2018-03-21 00:00:00");
+        params.put("current", current);
+        params.put("size", size);
+        log.writeLog("传入JSON--------------->" + JSON.toJSONString(params));
+        String s = HttpClientToJT.sendGet(url, token, params);
+        JSONObject jsonObject = JSONObject.parseObject(s);
+        JSONArray jsonArray = new JSONArray();
+        String code = Util.null2String(jsonObject.getString("code"));
+        log.writeLog("code------>" + code);
+        if ("1".equals(code)) {
+            JSONObject result = jsonObject.getJSONObject("data");
+            pages = result.getInteger("pages");
+            JSONArray records = result.getJSONArray("records");
+            jsonArray.addAll(records);
+            for (int i = 2; i <= pages; i++) {
+                params.put("current", i);
+                String str = HttpClientToJT.sendGet(url, token, params);
+                JSONObject jsonObject1 = JSONObject.parseObject(str);
+                JSONObject jsonResult = jsonObject1.getJSONObject("data");
+                JSONArray records1 = jsonResult.getJSONArray("records");
+                jsonArray.addAll(records1);
+            }
+            Object directSales = jsonArray.stream().filter(item -> {
+                JSONObject itemJson = JSONObject.parseObject(JSON.toJSONString(item));
+//                "Y".equals(itemJson.getString("isDirectSales"))
+                return "CHN".equals(itemJson.getString("countryCode")) && "ZHS".equals(itemJson.getString("languageCd"));
+                //return "ZHS".equals(itemJson.getString("languageCd")) ;
+            }).collect(Collectors.toList());
+            jsonArray = JSONArray.parseArray(JSON.toJSONString(directSales));
+        } else {
+            log.writeLog("获取页数返回结果------>" + s);
+        }
+//        System.out.println(jsonArray.toJSONString());
+//        System.out.println(s);
+        //将写入转化为流的形式
+//        writeFile(jsonArray);
+        return jsonArray;
+    }
+
+    private void writeFile(JSONArray jsonArray) {
+        BufferedWriter bw = null;
+        try {
+            bw = new BufferedWriter(new FileWriter("D:\\2.txt"));
+            //一次写一行
+            bw.write(jsonArray.toJSONString());
+            bw.newLine();  //换行用
+            //关闭流
+            bw.close();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        System.out.println("写入成功");
+    }
+
+
+    public static void main(String[] args) {
+//        String token = HttpClientToJT.getToken();
+//        SyncHrmsubcompanyToOA hrmsubcompany = new SyncHrmsubcompanyToOA();
+//        hrmsubcompany.getSubcompanys();
+        SyncHrmdepartmentToOA hrmdepartment = new SyncHrmdepartmentToOA();
+//        JSONArray data = hrmdepartment.getDepartments("2018-08-01 00:00:00");
+//        hrmdepartment.writeFile(data);
+
+        JSONArray jsonArray = new JSONArray();
+
+        String s1="{\"size\":5000,\"updateTime\":\"2022-09-06 00:00:00\",\"point\":\"434632472047648783\"}";
+        String s = HttpClientToJT.sendPost("https://jtdcapi.jtexpress.com.cn/dcopenedi/hrDept/pageNewHrDeptByUpdateTime", "oRGUaD6svUYS6LR8q1XcrJnhkiPbNReg5Gn+WxbODT1cNwNsJg9PjA==", s1);
+
+        JSONObject jsonObject = JSONObject.parseObject(s);
+            String code = Util.null2String(jsonObject.getString("code"));
+            if ("1".equals(code)) {
+                JSONObject result = jsonObject.getJSONObject("data");
+                //是否有下一页
+                boolean sfyxyy = result.getBoolean("hasNextPage");//是否有下一页
+                String maxPoint = Util.null2String(result.getString("maxPoint"));//下一页开始
+                hrmdepartment.setHasNextPage(sfyxyy);
+                hrmdepartment.setPoint(maxPoint);
+                JSONArray records = result.getJSONArray("records");
+                //判断不为空
+                if (records != null) {
+                    jsonArray.addAll(records);
+                    Object directSales = jsonArray.stream().filter(item -> {
+                        JSONObject itemJson = JSONObject.parseObject(JSON.toJSONString(item));
+                        return "CHN".equals(itemJson.getString("countryCode")) && "ZHS".equals(itemJson.getString("languageCd"));
+                    }).collect(Collectors.toList());
+                    jsonArray = JSONArray.parseArray(JSON.toJSONString(directSales));
+                }
+            } else {
+                hrmdepartment.setHasNextPage(false);
+            }
+        System.out.println(jsonArray);
+        List<DepartmentDto> dataList = JSONArray.parseArray(jsonArray.toJSONString(), DepartmentDto.class);
+        //分部数据
+        List<DepartmentDto> subcompanys_dt = dataList.stream().filter(item -> {
+            return "10".equals(item.getOrganizationClass()) || "代理区".equals(item.getDepartmentName())
+                    || "加盟商".equals(item.getDepartmentName()) || "中国J&T".equals(item.getDepartmentName())
+                    || "纭毅".equals(item.getDepartmentName()) || "云路科技".equals(item.getDepartmentName())||"区域管理部".equals(item.getDepartmentName());
+        }).collect(Collectors.toList());
+        //部门数据  注意：10000300代理区编码
+        List<DepartmentDto> departments_dt = dataList.stream().filter(item -> {
+            return !"10".equals(item.getOrganizationClass()) && !"中国J&T".equals(item.getDepartmentName())
+                    && !"代理区".equals(item.getDepartmentName()) && !"加盟商".equals(item.getDepartmentName())
+                    && !"纭毅".equals(item.getDepartmentName()) && !"云路科技".equals(item.getDepartmentName())&&!"区域管理部".equals(item.getDepartmentName())
+                    && !"10000300".equals(item.getSuperiorDepartment());
+        }).collect(Collectors.toList());
+        System.out.println();
+        System.out.println("----------同步分部,具体数据：" + JSON.toJSONString(subcompanys_dt, SerializerFeature.DisableCircularReferenceDetect));
+        System.out.println("----------同步部门，具体数据：" + JSON.toJSONString(departments_dt, SerializerFeature.DisableCircularReferenceDetect));
+
+//        List<DepartmentDto> dataList = JSONArray.parseArray(data.toJSONString(), DepartmentDto.class);
+//        System.out.println(JSON.toJSONString(dataList));
+//        SyncHrmjobtitlesToOA hrmjobtitles = new SyncHrmjobtitlesToOA();
+//        hrmjobtitles.getJobtitles();
+//        SyncHrmresourceToOA hrmresource = new SyncHrmresourceToOA();
+//        JSONArray users = hrmresource.getUsers();
+//        System.out.println(users);
+//        System.out.println(JSON.toJSONString(users));
+//        JSONObject row =new JSONObject();
+//        Integer status = Util.null2String(row.getInteger("status"))== "3" ? 1 : null;
+//        System.out.println(status);
+    }
+
+
+    /**
+     * 获取多语言
+     *
+     * @param date           时间
+     * @param departmentCode 部门code
+     * @param deptName       部门中文名称
+     * @return 多语言名称
+     */
+    public String getDepartmentName(String date, String departmentCode, String deptName) {
+        String retName = "";
+        boolean existence = true;
+        String language = "ENG";
+        String cdIndex = "";
+        try {
+            String country = "";
+            // 日期  位置  国家  部门code
+            JSONArray ocDepartmentsGUOJIA = getOcDepartmentsGUOJIA(date, "1", language, departmentCode);
+            log.writeLog("--------------多语言是否拿到数据：" + ocDepartmentsGUOJIA.size());
+            List<DepartmentDto> countryList = JSONArray.parseArray(ocDepartmentsGUOJIA.toJSONString(), DepartmentDto.class);
+            DepartmentDto countryDto = countryList.get(0);
+            //对应国家的语言名称（对应国家标签里面）
+            String countryDepartmentName = countryDto.getDepartmentName();
+            log.writeLog("---------------英语名称：" + countryDepartmentName);
+
+            //只需要中文和英文
+            retName = "~`~`7 " + deptName + "`~`8 " + countryDepartmentName + "`~`~";
+
+            log.writeLog("---------------多语言名称：" + retName);
+        } catch (Exception e) {
+            log.writeLog("---------------getDepartmentNameException：" + JavaUtil.getExceptionDetail(e));
+            e.printStackTrace();
+        }
+        return retName;
+    }
+
+
+    /**
+     * 获取海外部门国家数据
+     *
+     * @param date  时间
+     * @param point
+     * @return
+     */
+    public JSONArray getOcDepartmentsGUOJIA(String date, String point, String guojia, String departmentCode) {
+        int current = 1, size = 5000, pages = 2;
+        String url = HttpClientToJT.baseUrl + "/dcopenedi/hrDept/pageNewHrDeptByUpdateTime";
+        String token = HttpClientToJT.getToken();
+        log.writeLog("-------token--------->" + token);
+        Map<String, Object> params = new HashMap<>();
+        List list1 = new ArrayList();
+        list1.add(guojia);
+        params.put("languageCds", list1);
+        params.put("updateTime", date);
+        params.put("point", point);
+        params.put("size", size);
+        params.put("deptCode", departmentCode);
+        log.writeLog("传入JSON--------------->" + JSON.toJSONString(params));
+        String s = HttpClientToJT.sendPost(url, token, JSONObject.toJSONString(params));
+        JSONObject jsonObject = JSONObject.parseObject(s);
+        JSONArray jsonArray = new JSONArray();
+
+        String code = Util.null2String(jsonObject.getString("code"));
+        log.writeLog("code------>" + code);
+        if ("1".equals(code)) {
+            JSONObject result = jsonObject.getJSONObject("data");
+            JSONArray records = result.getJSONArray("records");
+            // Object hasNextPage = result.get("hasNextPage");
+            jsonArray.addAll(records);
+        }
+
+        return jsonArray;
+    }
+
+
+
+    public boolean isHasNextPage() {
+        return hasNextPage;
+    }
+
+    public void setHasNextPage(boolean hasNextPage) {
+        this.hasNextPage = hasNextPage;
+    }
+
+    public String getPoint() {
+        return point;
+    }
+
+    public void setPoint(String point) {
+        this.point = point;
+    }
+
+    public int getSize() {
+        return size;
+    }
+
+    public void setSize(int size) {
+        this.size = size;
+    }
+
+    public String getJkhzurl() {
+        return jkhzurl;
+    }
+
+    public void setJkhzurl(String jkhzurl) {
+        this.jkhzurl = jkhzurl;
+    }
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/schedule/hrm/SyncHrmjobtitlesToOA.java b/src/main/youhong_ai_jitu_src/jntchina/schedule/hrm/SyncHrmjobtitlesToOA.java
new file mode 100644
index 0000000..f59acb9
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/schedule/hrm/SyncHrmjobtitlesToOA.java
@@ -0,0 +1,531 @@
+package jntchina.schedule.hrm;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.serializer.SerializerFeature;
+import jntchina.schedule.hrm.util.OrganizationUtil;
+import jntchina.schedule.hrmNew.JobTitleMultilingualUtil;
+import jntchina.util.HttpClientToJT;
+import selfdev.util.base.TimeCommonUtil;
+import selfdev.util.log.LogTool;
+import weaver.conn.RecordSet;
+import weaver.general.Util;
+import weaver.hrm.job.JobTitlesComInfo;
+
+import java.io.BufferedWriter;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * 定时同步岗位到OA中
+ *
+ * @author Cyq
+ * @date 2021年6月17日 02:01:51
+ */
+@SuppressWarnings("all")
+public class SyncHrmjobtitlesToOA {
+	
+	// 岗位编码和id  map
+	// Map<String, String> map_jobtitle_code_id = new HashMap<String, String>();
+	private LogTool log = new LogTool("/log/hrm/job/", false);
+	public int size;// 接口同步每页数量
+	public boolean hasNextPage;// 是否有下一页
+	public String point;// 页标
+	public String jkhzurl;// 接口URL后缀
+	private JSONArray allResult = new JSONArray();
+	
+	public void execute(String today) {
+		/* ******************* 清除所有岗位信息，释放内存空间 start youhong.ai ******************* */
+		allResult.clear();
+		/* ******************* 清除所有岗位信息，释放内存空间 end youhong.ai ******************* */
+		String now = TimeCommonUtil.obtainDate(0);
+		log.writeLog("--------------------同步岗位  start[" + now + "]----------------------");
+		
+		// 为空时默认每页1000条数据
+		if ("null".equals(String.valueOf(size)) || "0".equals(String.valueOf(size)) || size <= 0) {
+			setSize(1000);
+		}
+		// 设置同步HR数据时是否有下一页为是
+		setHasNextPage(true);
+		setPoint("1");
+		
+		SyncHrmdepartmentToOA hrmdepartment = new SyncHrmdepartmentToOA();
+		Map<String, String> map_dept_code_id = hrmdepartment.getDepartmentCodeIdMap();
+		// 岗位自定义建模表中的ID和编码  map
+		// Map<String, String> map_jobtitledefined_id_code = BaseUtil.getMapKeyValueInfoByParm("uf_jobtitledefined", "", "positionid", "positioncode");
+		// map_jobtitle_code_id = getJobtitleCodeIdMap();
+		
+		// 获取所有的岗位编码，同时将岗位编码存入List中
+		List<String> codeList = new ArrayList<>();
+		// 当前库中已存在的记录集合 -- 系统岗位表
+		Map<String, String> sysExistMap = new HashMap<>();
+		// 当前库中已存在的记录集合 -- 自定义岗位表
+		Map<String, String> definedExistMap = new HashMap<>();
+		
+		
+		RecordSet rs = new RecordSet();
+		log.writeLog("----------开始同步岗位-------");
+		int count = 0;
+		int skipNum = 0, insertNum = 0, updateNum = 0;
+//        int page = getPages(date);
+		int page = 5000;// 默认为1万页
+		log.writeLog("size---------------------->" + size);
+		// 查询条件
+		Map<String, Object> map_parm = new HashMap<String, Object>();
+		map_parm.put("beginTime", today);// 时间戳
+		map_parm.put("size", size);// 每页数量
+		/* ******************* 获取所有的岗位数据 start for youhong.ai ******************* */
+		
+		JSONArray filterResultList = new JSONArray();
+		for (int k = 1; k <= page; k++) {
+			map_parm.put("point", getPoint());// 起始位置，第一次
+			JSONArray jobtitles = getJobsByPoint_New(map_parm);
+			filterResultList.addAll(jobtitles);
+		}
+		JobTitleMultilingualUtil jobTitleMultilingualUtil = new JobTitleMultilingualUtil();
+		List<JSONArray> splitArray = new ArrayList<>();
+		
+		double size = 10_000;
+		int sizeInt = (int) size;
+		int totalResultSize = allResult.size();
+		int batchNum = (int) Math.ceil(totalResultSize / size);
+		for (int i = 0; i < batchNum; i++) {
+			int start = i * sizeInt;
+			int endIndex = start + sizeInt;
+			List sub = JobTitleMultilingualUtil.sub(allResult, start, endIndex);
+			JSONArray objects = JSONArray.parseArray(JSON.toJSONString(sub));
+			splitArray.add(objects);
+		}
+		/* ******************* 获取所有的杆位数据 end for youhong.ai ******************* */
+		/* ******************* 注释原来循环获取接口数据 start for youhong.ai ******************* */
+		/*for (int k = 1; k <= page; k++) {
+			if (!hasNextPage) {
+				log.writeLog("------------第【" + k + "】次循环获取数据不存在，跳出");
+				break;
+			}
+			map_parm.put("point", getPoint());// 起始位置，第一次
+			// JSONArray jobtitles = getJobsByPage(k,date);
+			// 调用接口获取数据
+			JSONArray jobtitles = getJobsByPoint_New(map_parm);*/
+		/* ******************* 注释原来循环获取接口数据 end for youhong.ai ******************* */
+		/* ******************* 添加循环 start for youhong.ai ******************* */
+		for (int k = 0; k < splitArray.size(); k++) {
+			
+			JSONArray jobtitles = splitArray.get(k);
+			
+			/* ******************* 添加循环 end for youhong.ai ******************* */
+			// 未获取到数据,跳出循环
+			if (jobtitles == null || jobtitles.isEmpty()) {
+				log.writeLog("------------第【" + k + "】调用接口未获取到数据，可能是语言languageCd!=ZHS，跳出本次循环，继续下次循环");
+				continue;
+			}
+			
+			codeList.clear();
+			sysExistMap.clear();
+			definedExistMap.clear();
+			for (int m = 0; m < jobtitles.size(); m++) {
+				JSONObject row = jobtitles.getJSONObject(m);
+				String positionCode = Util.null2String(row.getString("positionCode"));// 岗位编码
+				if (!"".equals(positionCode)) {
+					codeList.add(positionCode);
+				}
+			}
+			
+			if (codeList.size() > 0) {
+				sysExistMap = OrganizationUtil.getExitsData(codeList, 0);
+				definedExistMap = OrganizationUtil.getExitsData(codeList, 1);
+			}
+			
+			
+			count = count + jobtitles.size();
+			log.writeLog("----------同步岗位第" + k + "页，条数:" + jobtitles.size());
+			for (int i = 0; i < jobtitles.size(); i++) {
+				JSONObject row = jobtitles.getJSONObject(i);
+				String positionCode = Util.null2String(row.getString("positionCode"));// 岗位编码
+				/* ******************* 多语言岗位处理 start for youhong.ai ******************* */
+				String positionName = jobTitleMultilingualUtil.getMultilingual(allResult,
+						row,
+						item -> aiyh.utils.Util.null2String(item.get("positionCode")),
+						item -> aiyh.utils.Util.null2String(item.get("positionName")),
+						item -> aiyh.utils.Util.null2String(item.get("languageCd")));
+				if (JobTitleMultilingualUtil.isBlank(positionName)) {
+					positionName = Util.null2String(row.getString("positionName"));
+				}
+				/* ******************* 多语言岗位处理 end for youhong.ai ******************* */
+				// String positionName = Util.null2String(row.getString("positionName"));// 岗位名称
+				Integer canceled = "3".equals(Util.null2String(row.getString("status"))) ? 1 : null;// 1 新增  2 修改  3作废
+				String deptCode = Util.null2String(row.getString("deptCode"));// 部门编码
+				String jobdepartmentid = Util.null2String(map_dept_code_id.get(deptCode));// 所属部门ID
+				String jobtitleid = Util.null2String(sysExistMap.get(positionCode));// OA岗位ID
+//                String jobactivityid ="1545";//默认职务ID
+				String positionabbreviation = Util.null2String(row.getString("positionAbbreviation"));// 岗位简称
+				String positiontype = Util.null2String(row.getString("positionType"));// 岗位类别
+				String positiontypehighest = Util.null2String(row.getString("positionTypeHighest"));// 岗位类别最高
+				String positiontypelowest = Util.null2String(row.getString("positionTypeLowest"));// 岗位类别最低
+				String positionpropecode = Util.null2String(row.getString("positionPropeCode"));// 岗位属性编码
+				String positionpropename = Util.null2String(row.getString("positionPropeName"));// 岗位属性名称
+				String companycode = Util.null2String(row.getString("companyCode"));// 公司编码
+				String companyname = Util.null2String(row.getString("companyName"));// 公司名称
+				String deptname = Util.null2String(row.getString("deptName"));// 部门名称
+				String locationcode = Util.null2String(row.getString("locationCode"));// 地点编码
+				String locationname = Util.null2String(row.getString("locationName"));// 地点描述
+				String stdpositioncode = Util.null2String(row.getString("stdPositionCode"));// 标准岗位编码
+				String stdpositionname = Util.null2String(row.getString("stdPositionName"));// 标准岗位名称
+				String postcode = Util.null2String(row.getString("postCode"));// 岗编码
+				String postname = Util.null2String(row.getString("postName"));// 岗名称
+				String sequencecode = Util.null2String(row.getString("sequenceCode"));// 序列编码
+				String sequencename = Util.null2String(row.getString("sequenceName"));// 序列名称
+				String positiongroupcode = Util.null2String(row.getString("positionGroupCode"));// 岗族编码
+				String positiongroupname = Util.null2String(row.getString("positionGroupName"));// 岗族名称
+				String ethnicgroupcode = Util.null2String(row.getString("ethnicGroupCode"));// 族群编码
+				String ethnicgroupname = Util.null2String(row.getString("ethnicGroupName"));// 族群名称
+				
+				String sql = "";
+				// 判断HR岗位ID是否已经存在
+				if ("".equals(jobdepartmentid)) {
+					skipNum++;
+					continue;
+				}
+				
+				if ("".equals(Util.null2String(jobtitleid))) {// 岗位不存在则插入生成新岗位
+					// 新增数据,插入到hrmjobtitles表中
+					sql = "insert into hrmjobtitles (jobtitlename,jobtitlemark,outkey,jobdepartmentid," +
+							      "canceled,created,creater,modified,modifier) values("
+							      + "'" + positionName + "',"
+							      + "'" + positionName + "',"
+							      + "'" + positionCode + "',"
+							      + "'" + jobdepartmentid + "',"
+							      + "" + canceled + ","
+							      + "to_date('" + now + "','yyyy-mm-dd hh24:mi:ss'),"
+							      + "'1',"
+							      + "to_date('" + now + "','yyyy-mm-dd hh24:mi:ss'),"
+							      + "'1')";
+					log.writeLog("插入岗位表生成新数据sql--------->" + sql);
+					rs.execute(sql);
+					insertNum++;
+					rs.execute("select max(id) from hrmjobtitles");
+					int maxJobid = 0;// 新插入数据的岗位ID
+					if (rs.next()) {
+						maxJobid = rs.getInt(1);
+						// 将新增加的岗位加入至MAP中
+						sysExistMap.put(positionCode, maxJobid + "");
+					}
+					
+					// 新增数据,插入到hrmjobtitles表中
+					sql = "insert into uf_jobtitledefined (formmodeid,modedatacreater,modedatacreatertype,modedatacreatedate,modedatacreatetime,"
+							      + "positionid,positioncode,positionname,positionabbreviation,positiontype,positiontypehighest,positiontypelowest,"
+							      + "positionpropecode,positionpropename,companycode,companyname,deptcode,deptname,locationcode,locationname,stdpositioncode,"
+							      + "stdpositionname,postcode,postname,sequencecode,sequencename,positiongroupcode,positiongroupname,ethnicgroupcode,ethnicgroupname) values"
+							      + "(32501,1,0,to_char(sysdate, 'yyyy-MM-dd'),to_char(sysdate, 'HH24:mi:ss'),'" + maxJobid + "','" + positionCode + "','" + positionName + "',"
+							      + "'" + positionabbreviation + "','" + positiontype + "','" + positiontypehighest + "','" + positiontypelowest + "','" + positionpropecode + "',"
+							      + "'" + positionpropename + "','" + companycode + "','" + companyname + "','" + deptCode + "','" + deptname + "','" + locationcode + "'" + ","
+							      + "'" + locationname + "','" + stdpositioncode + "','" + stdpositionname + "','" + postcode + "','" + postname + "','" + sequencecode + "','" + sequencename + "',"
+							      + "'" + positiongroupcode + "','" + positiongroupname + "','" + ethnicgroupcode + "','" + ethnicgroupname + "')";
+					log.writeLog("插入岗位建模自定义表生成新数据sql--------->" + sql);
+					rs.execute(sql);
+					// 将新增加的岗位加入至MAP中
+					definedExistMap.put(maxJobid + "", positionCode);
+					
+				} else {// 岗位存在则更新
+					sql = "update hrmjobtitles set " +
+							      "jobtitlename = '" + positionName + "', " +
+							      "jobtitlemark = '" + positionName + "', " +
+							      "jobtitlecode = '" + positionCode + "', " +
+							      "jobdepartmentid = '" + jobdepartmentid + "', " +
+							      "modified = to_date('" + now + "','yyyy-mm-dd hh24:mi:ss')," +
+							      "modifier = '1', " +
+							      "canceled = " + canceled + " " +
+							      "where  id= '" + jobtitleid + "'";
+					log.writeLog("更新岗位表中数据sql--------->" + sql);
+					rs.execute(sql);
+					updateNum++;
+					log.writeLog("更新岗位表---成功------>");
+					
+					
+					if (definedExistMap.containsKey(jobtitleid)) {// 存在则更新岗位自定义表
+						sql = "update uf_jobtitledefined set " +
+								      "positionName = '" + positionName + "', " +
+								      "positionabbreviation = '" + positionabbreviation + "', " +
+								      "positiontype = '" + positiontype + "', " +
+								      "positiontypehighest = '" + positiontypehighest + "', " +
+								      "positiontypelowest = '" + positiontypelowest + "', " +
+								      "positionpropecode = '" + positionpropecode + "', " +
+								      "positionpropename = '" + positionpropename + "', " +
+								      "companycode = '" + companycode + "', " +
+								      "companyname = '" + companyname + "', " +
+								      "deptCode = '" + deptCode + "', " +
+								      "deptname = '" + deptname + "', " +
+								      "locationcode = '" + locationcode + "', " +
+								      "locationname = '" + locationname + "', " +
+								      "stdpositioncode = '" + stdpositioncode + "', " +
+								      "stdpositionname = '" + stdpositionname + "', " +
+								      "postcode = '" + postcode + "', " +
+								      "postname = '" + postname + "', " +
+								      "sequencecode = '" + sequencecode + "', " +
+								      "sequencename = '" + sequencename + "', " +
+								      "positiongroupcode = '" + positiongroupcode + "', " +
+								      "positiongroupname = '" + positiongroupname + "', " +
+								      "ethnicgroupcode = '" + ethnicgroupcode + "', " +
+								      "ethnicgroupname = '" + ethnicgroupname + "' " +
+								      "where positionid= '" + jobtitleid + "'";
+						log.writeLog("更新岗位建模自定义表中数据sql--------->" + sql);
+						rs.execute(sql);
+						
+					} else {// 不存在则插入岗位自定义表
+						// 新增数据,插入到hrmjobtitles表中
+						sql = "insert into uf_jobtitledefined (formmodeid,modedatacreater,modedatacreatertype,modedatacreatedate,modedatacreatetime,"
+								      + "positionid,positioncode,positionname,positionabbreviation,positiontype,positiontypehighest,positiontypelowest,"
+								      + "positionpropecode,positionpropename,companycode,companyname,deptcode,deptname,locationcode,locationname,stdpositioncode,"
+								      + "stdpositionname,postcode,postname,sequencecode,sequencename,positiongroupcode,positiongroupname,ethnicgroupcode,ethnicgroupname) values"
+								      + "(32501,1,0,to_char(sysdate, 'yyyy-MM-dd'),to_char(sysdate, 'HH24:mi:ss'),'" + jobtitleid + "','" + positionCode + "','" + positionName + "',"
+								      + "'" + positionabbreviation + "','" + positiontype + "','" + positiontypehighest + "','" + positiontypelowest + "','" + positionpropecode + "',"
+								      + "'" + positionpropename + "','" + companycode + "','" + companyname + "','" + deptCode + "','" + deptname + "','" + locationcode + "'" + ","
+								      + "'" + locationname + "','" + stdpositioncode + "','" + stdpositionname + "','" + postcode + "','" + postname + "','" + sequencecode + "','" + sequencename + "',"
+								      + "'" + positiongroupcode + "','" + positiongroupname + "','" + ethnicgroupcode + "','" + ethnicgroupname + "')";
+						log.writeLog("插入岗位建模自定义表生成新数据sql--------->" + sql);
+						rs.execute(sql);
+						// 将新增加的岗位加入至MAP中
+						definedExistMap.put(jobtitleid + "", positionCode);
+					}
+				}
+			}
+			log.writeLog("----------同步结束岗位，第" + k + "页：" + count +
+					             ",新增岗位数为：" + insertNum + " ,更新岗位数为：" + updateNum + ",跳出处理岗位数为：" + skipNum + "------------");
+			skipNum = 0;
+			insertNum = 0;
+			updateNum = 0;
+		}
+		log.writeLog("----------同步结束岗位总数：" + count + "------------");
+		// 更新岗位缓存
+		JobTitlesComInfo jtci = new JobTitlesComInfo();
+		jtci.removeJobTitlesCache();
+		
+		// 释放map占用的内存
+		// map_jobtitledefined_id_code.clear();
+		// map_jobtitledefined_id_code=null;
+		map_dept_code_id.clear();
+		map_dept_code_id = null;
+		// map_jobtitle_code_id.clear();
+		// map_jobtitle_code_id=null;
+		
+		// 更新同步时间到中间表
+		String sql1 = "update uf_HRRestDate set sctbsj ='" + now + "' where jkbs = 'post'";
+		rs.execute(sql1);
+		/* ******************* 清除所有岗位信息，释放内存空间 start youhong.ai ******************* */
+		allResult.clear();
+		/* ******************* 清除所有岗位信息，释放内存空间 end youhong.ai ******************* */
+		
+	}
+	
+	public Map<String, String> getJobtitleCodeIdMap() {
+		RecordSet rs = new RecordSet();
+		Map<String, String> map = new HashMap<>();
+		rs.executeQuery("select jobtitlecode,outkey,id from hrmjobtitles where outkey is not null  and (CANCELED!=1 or CANCELED is null)");
+		while (rs.next()) {
+			map.put(rs.getString("outkey"), rs.getString("id"));
+		}
+		return map;
+	}
+	
+	/**
+	 * 获取岗位信息(新方法)
+	 *
+	 * @param map 查询条件
+	 * @return
+	 */
+	public JSONArray getJobsByPoint_New(Map<String, Object> map) {
+		// 新接口URL
+		String url = HttpClientToJT.baseUrl + getJkhzurl();
+		log.writeLog("获取岗位数据url-------->" + url);
+		LogTool log2 = new LogTool("/log/hrm/job/detail", false);
+		// 获取token
+		String token = HttpClientToJT.getToken();
+		// 将map转成字符串
+		String param = JSONObject.toJSONString(map, SerializerFeature.DisableCircularReferenceDetect);
+		log.writeLog("获取岗位数据传入参数param------------>" + param);
+		log2.writeLog("获取岗位数据传入参数param------------>" + param);
+		String s = HttpClientToJT.sendPost(url, token, param);
+		log2.writeLog("岗位数据返回结果------------>" + s);
+		
+		JSONObject jsonObject = JSONObject.parseObject(s);
+		JSONArray jsonArray = new JSONArray();
+		String code = Util.null2String(jsonObject.getString("code"));
+		if ("1".equals(code)) {
+			JSONObject result = jsonObject.getJSONObject("data");
+			// 是否有下一页
+			boolean sfyxyy = result.getBoolean("hasNextPage");// 是否有下一页
+			String maxPoint = result.getString("maxPoint");// 下一页开始
+			this.setHasNextPage(sfyxyy);
+			this.setPoint(maxPoint);
+			JSONArray records = result.getJSONArray("records");
+			// 过滤未获取到数据
+			if (records != null) {
+				/* ******************* 收集所有岗位信息 start for youhong.ai ******************* */
+				allResult.addAll(records);
+				/* ******************* 收集所有岗位信息 end for youhong.ai ******************* */
+				jsonArray.addAll(records);
+				Object directSales = jsonArray.stream().filter(item -> {
+					JSONObject itemJson = JSONObject.parseObject(JSON.toJSONString(item));
+					return "ZHS".equals(itemJson.getString("languageCd"));
+				}).collect(Collectors.toList());
+				jsonArray = JSONArray.parseArray(JSON.toJSONString(directSales));
+			}
+		} else {
+			this.setHasNextPage(false);
+		}
+		
+		
+		return jsonArray;
+	}
+	
+	public int getPages(String date) {
+		int current = 1, pages = 1;
+		String url = HttpClientToJT.baseUrl + "/dcopenedi/hrPost/pageByUpdateTime";
+		String token = HttpClientToJT.getToken();
+		Map<String, Object> params = new HashMap<>();
+//        LocalDateTime today_start = LocalDateTime.of(LocalDate.now(), LocalTime.MIN);//当天零点
+//        String td_st_str = today_start.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+		params.put("updateTime", date);
+//        params.put("updateTime", "2018-03-21 00:00:00");
+		params.put("current", current);
+		params.put("size", size);
+		String s = HttpClientToJT.sendGet(url, token, params);
+		JSONObject jsonObject = JSONObject.parseObject(s);
+		String code = Util.null2String(jsonObject.getString("code"));
+		log.writeLog("code------>" + code);
+		if ("1".equals(code)) {
+			JSONObject result = jsonObject.getJSONObject("data");
+			pages = result.getInteger("pages");
+		} else {
+			log.writeLog("获取页数返回结果------>" + s);
+		}
+		return pages;
+	}
+	
+	public JSONArray getJobsByPage(int pages, String date) {
+		String url = HttpClientToJT.baseUrl + "/dcopenedi/hrPost/pageByUpdateTime";
+		String token = HttpClientToJT.getToken();
+		Map<String, Object> params = new HashMap<>();
+//        LocalDateTime today_start = LocalDateTime.of(LocalDate.now(), LocalTime.MIN);//当天零点
+//        String td_st_str = today_start.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+		params.put("updateTime", date);
+//        params.put("updateTime", "2018-03-21 00:00:00");
+		params.put("current", pages);
+		params.put("size", size);
+		String s = HttpClientToJT.sendGet(url, token, params);
+		JSONObject jsonObject = JSONObject.parseObject(s);
+		JSONArray jsonArray = new JSONArray();
+		String code = Util.null2String(jsonObject.getString("code"));
+		if ("1".equals(code)) {
+			JSONObject result = jsonObject.getJSONObject("data");
+			JSONArray records = result.getJSONArray("records");
+			jsonArray.addAll(records);
+		}
+		Object directSales = jsonArray.stream().filter(item -> {
+			JSONObject itemJson = JSONObject.parseObject(JSON.toJSONString(item));
+			return "ZHS".equals(itemJson.getString("languageCd"));
+		}).collect(Collectors.toList());
+		jsonArray = JSONArray.parseArray(JSON.toJSONString(directSales));
+		return jsonArray;
+	}
+	
+	public JSONArray getJobtitles() {
+		int current = 1, pages = 2;
+		String url = HttpClientToJT.baseUrl + "/dcopenedi/hrPost/pageByUpdateTime";
+		String token = HttpClientToJT.getToken();
+		Map<String, Object> params = new HashMap<>();
+//        LocalDateTime today_start = LocalDateTime.of(LocalDate.now(), LocalTime.MIN);//当天零点
+//        String td_st_str = today_start.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+//        params.put("updateTime",td_st_str);
+		params.put("updateTime", "2021-03-21 00:00:00");
+		params.put("current", current);
+		params.put("size", size);
+		String s = HttpClientToJT.sendGet(url, token, params);
+		JSONObject jsonObject = JSONObject.parseObject(s);
+		JSONArray jsonArray = new JSONArray();
+		String code = Util.null2String(jsonObject.getString("code"));
+		if ("1".equals(code)) {
+			JSONObject result = jsonObject.getJSONObject("data");
+			pages = result.getInteger("pages");
+			JSONArray records = result.getJSONArray("records");
+			jsonArray.addAll(records);
+			for (int i = 2; i <= pages; i++) {
+				System.out.println(i);
+				params.put("current", i);
+				String str = HttpClientToJT.sendGet(url, token, params);
+				JSONObject jsonObject1 = JSONObject.parseObject(str);
+				JSONObject jsonResult = jsonObject1.getJSONObject("data");
+				JSONArray records1 = jsonResult.getJSONArray("records");
+				jsonArray.addAll(records1);
+			}
+			Object directSales = jsonArray.stream().filter(item -> {
+				JSONObject itemJson = JSONObject.parseObject(JSON.toJSONString(item));
+				return "ZHS".equals(itemJson.getString("languageCd"));
+			}).collect(Collectors.toList());
+			jsonArray = JSONArray.parseArray(JSON.toJSONString(directSales));
+		}
+//        System.out.println(jsonArray.toJSONString());
+//        System.out.println(s);
+		// 将写入转化为流的形式
+		writeFile(jsonArray);
+		return jsonArray;
+	}
+	
+	private void writeFile(JSONArray jsonArray) {
+		BufferedWriter bw = null;
+		try {
+			bw = new BufferedWriter(new FileWriter("E:\\3.txt"));
+			// 一次写一行
+			bw.write(jsonArray.toJSONString());
+			bw.newLine();  // 换行用
+			// 关闭流
+			bw.close();
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+		System.out.println("写入成功");
+	}
+	
+	public static void main(String[] args) {
+		SyncHrmjobtitlesToOA job = new SyncHrmjobtitlesToOA();
+		job.getJobtitles();
+	}
+	
+	public int getSize() {
+		return size;
+	}
+	
+	public void setSize(int size) {
+		this.size = size;
+	}
+	
+	public boolean isHasNextPage() {
+		return hasNextPage;
+	}
+	
+	public void setHasNextPage(boolean hasNextPage) {
+		this.hasNextPage = hasNextPage;
+	}
+	
+	public String getPoint() {
+		return point;
+	}
+	
+	public String getJkhzurl() {
+		return jkhzurl;
+	}
+	
+	public void setJkhzurl(String jkhzurl) {
+		this.jkhzurl = jkhzurl;
+	}
+	
+	public void setPoint(String point) {
+		this.point = point;
+	}
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/schedule/hrm/SyncHrmjobtitlesToOAOc.java b/src/main/youhong_ai_jitu_src/jntchina/schedule/hrm/SyncHrmjobtitlesToOAOc.java
new file mode 100644
index 0000000..f97354c
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/schedule/hrm/SyncHrmjobtitlesToOAOc.java
@@ -0,0 +1,442 @@
+package jntchina.schedule.hrm;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import jntchina.schedule.hrm.util.OrganizationUtil;
+import jntchina.schedule.hrmNew.JobTitleMultilingualUtil;
+import jntchina.util.HttpClientToJT;
+import selfdev.util.base.TimeCommonUtil;
+import selfdev.util.log.LogTool;
+import weaver.conn.RecordSet;
+import weaver.general.Util;
+import weaver.hrm.job.JobTitlesComInfo;
+
+import java.io.BufferedWriter;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * @author Cyq
+ * @date 2021年6月17日 02:01:51
+ */
+public class SyncHrmjobtitlesToOAOc {
+	
+	
+	// 分页接口参数
+	static String maxPoint = "1";
+	// 接口是否有下一页 默认为有
+	static boolean ifPage = true;
+	
+	static int defaultPage = 0;
+	
+	// 岗位编码和id  map
+	// Map<String, String> map_jobtitle_code_id = new HashMap<String, String>();
+	
+	private final LogTool log = new LogTool("/log/hrm/jobOc/", false);
+	
+	// 岗位编码和id  map
+	// Map<String, String> map_jobtitle_code_id = new HashMap<String, String>();
+	private final JSONArray allResult = new JSONArray();
+	
+	
+	protected void execute(String date) {
+		/* ******************* 清除所有岗位信息，释放内存空间 start youhong.ai ******************* */
+		allResult.clear();
+		/* ******************* 清除所有岗位信息，释放内存空间 end youhong.ai ******************* */
+		String now = TimeCommonUtil.obtainDate(0);
+		SyncHrmdepartmentToOA hrmdepartment = new SyncHrmdepartmentToOA();
+		Map<String, String> map_dept_code_id = hrmdepartment.getDepartmentCodeIdMap();
+		// 岗位自定义建模表中的ID和编码  map
+		// Map<String, String> map_jobtitledefined_id_code = BaseUtil.getMapKeyValueInfoByParm("uf_jobtitledefined", "", "positionid", "positioncode");
+		// map_jobtitle_code_id = getJobtitleCodeIdMap();
+		RecordSet rs = new RecordSet();
+		log.writeLog("----------开始同步岗位-------");
+		int count = 0;
+		int skipNum = 0, insertNum = 0, updateNum = 0;
+		// int page = getPages(date);
+		
+		// 获取所有的岗位编码，同时将岗位编码存入List中
+		List<String> codeList = new ArrayList<>();
+		// 当前库中已存在的记录集合 -- 系统岗位表
+		Map<String, String> sysExistMap = new HashMap<>();
+		// 当前库中已存在的记录集合 -- 自定义岗位表
+		Map<String, String> definedExistMap = new HashMap<>();
+		/* ******************* 获取所有的岗位数据 start for youhong.ai ******************* */
+		
+		JSONArray filterResultList = new JSONArray();
+		while (ifPage) {
+			defaultPage++;
+			JSONArray jobtitles = getJobsByPage(maxPoint, date);
+			filterResultList.addAll(jobtitles);
+		}
+		JobTitleMultilingualUtil jobTitleMultilingualUtil = new JobTitleMultilingualUtil();
+		List<JSONArray> splitArray = new ArrayList<>();
+		double size = 10_000;
+		int sizeInt = (int) size;
+		int totalResultSize = allResult.size();
+		int batchNum = (int) Math.ceil(totalResultSize / size);
+		for (int i = 0; i < batchNum; i++) {
+			int start = i * sizeInt;
+			int endIndex = start + sizeInt;
+			List sub = JobTitleMultilingualUtil.sub(allResult, start, endIndex);
+			JSONArray objects = JSONArray.parseArray(JSON.toJSONString(sub));
+			splitArray.add(objects);
+		}
+		/* ******************* 获取所有的杆位数据 end for youhong.ai ******************* */
+		
+		/* ******************* 注释原来循环获取接口数据 start for youhong.ai ******************* */
+		/*while (ifPage) {
+			defaultPage++;
+			int k = defaultPage;
+			JSONArray jobtitles = getJobsByPage(maxPoint, date);*/
+		/* ******************* 注释原来循环获取接口数据 end for youhong.ai ******************* */
+		/* ******************* 添加循环 start for youhong.ai ******************* */
+		for (int k = 0; k < splitArray.size(); k++) {
+			JSONArray jobtitles = splitArray.get(k);
+			/* ******************* 添加循环 end for youhong.ai ******************* */
+			// 未获取到数据,跳出循环
+			if (jobtitles == null || jobtitles.isEmpty()) {
+				log.writeLog("------------第【" + k + "】调用接口未获取到数据，可能是语言languageCd!=ZHS，跳出本次循环，继续下次循环");
+				continue;
+			}
+			
+			codeList.clear();
+			sysExistMap.clear();
+			definedExistMap.clear();
+			for (int m = 0; m < jobtitles.size(); m++) {
+				JSONObject row = jobtitles.getJSONObject(m);
+				String positionCode = Util.null2String(row.getString("positionCode"));// 岗位编码
+				if (!"".equals(positionCode)) {
+					codeList.add(positionCode);
+				}
+			}
+			
+			if (codeList.size() > 0) {
+				sysExistMap = OrganizationUtil.getExitsData(codeList, 0);
+				definedExistMap = OrganizationUtil.getExitsData(codeList, 1);
+			}
+			
+			count = count + jobtitles.size();
+			log.writeLog("----------同步岗位第" + k + "页，条数:" + jobtitles.size());
+			for (int i = 0; i < jobtitles.size(); i++) {
+				JSONObject row = jobtitles.getJSONObject(i);
+				String positionCode = Util.null2String(row.getString("positionCode"));// 岗位编码
+				/* ******************* 多语言岗位处理 start for youhong.ai ******************* */
+				String positionName = jobTitleMultilingualUtil.getMultilingual(allResult,
+						row,
+						item -> aiyh.utils.Util.null2String(item.get("positionCode")),
+						item -> aiyh.utils.Util.null2String(item.get("positionName")),
+						item -> aiyh.utils.Util.null2String(item.get("languageCd")));
+				if (JobTitleMultilingualUtil.isBlank(positionName)) {
+					positionName = Util.null2String(row.getString("positionName"));
+				}
+				/* ******************* 多语言岗位处理 end for youhong.ai ******************* */
+				// String positionName = Util.null2String(row.getString("positionName"));// 岗位名称
+				log.writeLog("------------岗位名称:" + positionName);
+				log.writeLog("------------岗位编码:" + positionCode);
+				Integer canceled = "3".equals(Util.null2String(row.getString("status"))) ? 1 : 0;// 1 新增  2 修改  3作废
+				String deptCode = Util.null2String(row.getString("deptCode"));// 部门编码
+				String jobdepartmentid = Util.null2String(map_dept_code_id.get(deptCode));// 所属部门ID
+				String jobtitleid = Util.null2String(sysExistMap.get(positionCode));// OA岗位ID
+//                String jobactivityid ="1545";//默认职务ID
+				String positionabbreviation = Util.null2String(row.getString("positionAbbreviation"));// 岗位简称
+				String positiontype = Util.null2String(row.getString("positionType"));// 岗位类别
+				String positiontypehighest = Util.null2String(row.getString("positionTypeHighest"));// 岗位类别最高
+				String positiontypelowest = Util.null2String(row.getString("positionTypeLowest"));// 岗位类别最低
+				String positionpropecode = Util.null2String(row.getString("positionPropeCode"));// 岗位属性编码
+				String positionpropename = Util.null2String(row.getString("positionPropeName"));// 岗位属性名称
+				String companycode = Util.null2String(row.getString("companyCode"));// 公司编码
+				String companyname = Util.null2String(row.getString("companyName"));// 公司名称
+				String deptname = Util.null2String(row.getString("deptName"));// 部门名称
+				String locationcode = Util.null2String(row.getString("locationCode"));// 地点编码
+				String locationname = Util.null2String(row.getString("locationName"));// 地点描述
+				String stdpositioncode = Util.null2String(row.getString("stdPositionCode"));// 标准岗位编码
+				String stdpositionname = Util.null2String(row.getString("stdPositionName"));// 标准岗位名称
+				String postcode = Util.null2String(row.getString("postCode"));// 岗编码
+				String postname = Util.null2String(row.getString("postName"));// 岗名称
+				String sequencecode = Util.null2String(row.getString("sequenceCode"));// 序列编码
+				String sequencename = Util.null2String(row.getString("sequenceName"));// 序列名称
+				String positiongroupcode = Util.null2String(row.getString("positionGroupCode"));// 岗族编码
+				String positiongroupname = Util.null2String(row.getString("positionGroupName"));// 岗族名称
+				String ethnicgroupcode = Util.null2String(row.getString("ethnicGroupCode"));// 族群编码
+				String ethnicgroupname = Util.null2String(row.getString("ethnicGroupName"));// 族群名称
+				
+				String sql = "";
+				// 判断HR岗位ID是否已经存在
+//                if("".equals(jobdepartmentid)){
+//                    skipNum++;
+//                    continue;
+//                }
+
+//                if("".equals(canceled) || canceled == null){
+//                    canceled = 0;
+//                }
+				
+				if ("".equals(Util.null2String(jobtitleid))) {// 岗位不存在则插入生成新岗位
+					// 新增数据,插入到hrmjobtitles表中
+					sql = "insert into hrmjobtitles (jobtitlename,jobtitlemark,outkey,jobdepartmentid," +
+							      "canceled,created,creater,modified,modifier) values("
+							      + "'" + positionName + "',"
+							      + "'" + positionName + "',"
+							      + "'" + positionCode + "',"
+							      + "'" + jobdepartmentid + "',"
+							      + "" + canceled + ","
+							      + "to_date('" + now + "','yyyy-mm-dd hh24:mi:ss'),"
+							      + "'1',"
+							      + "to_date('" + now + "','yyyy-mm-dd hh24:mi:ss'),"
+							      + "'1')";
+					log.writeLog("插入岗位表生成新数据sql--------->" + sql);
+					boolean executeUpdate1 = rs.executeUpdate(sql);
+					log.writeLog("是否成功：" + executeUpdate1);
+					log.writeLog("原因：" + rs.getExceptionMsg());
+					insertNum++;
+					rs.execute("select max(id) from hrmjobtitles");
+					int maxJobid = 0;// 新插入数据的岗位ID
+					if (rs.next()) {
+						maxJobid = rs.getInt(1);
+						// 将新增加的岗位加入至MAP中
+						sysExistMap.put(positionCode, maxJobid + "");
+					}
+					
+					// 新增数据,插入到hrmjobtitles表中
+					sql = "insert into uf_jobtitledefined (formmodeid,modedatacreater,modedatacreatertype,modedatacreatedate,modedatacreatetime,"
+							      + "positionid,positioncode,positionname,positionabbreviation,positiontype,positiontypehighest,positiontypelowest,"
+							      + "positionpropecode,positionpropename,companycode,companyname,deptcode,deptname,locationcode,locationname,stdpositioncode,"
+							      + "stdpositionname,postcode,postname,sequencecode,sequencename,positiongroupcode,positiongroupname,ethnicgroupcode,ethnicgroupname) values"
+							      + "(32501,1,0,to_char(sysdate, 'yyyy-MM-dd'),to_char(sysdate, 'HH24:mi:ss'),'" + maxJobid + "','" + positionCode + "','" + positionName + "',"
+							      + "'" + positionabbreviation + "','" + positiontype + "','" + positiontypehighest + "','" + positiontypelowest + "','" + positionpropecode + "',"
+							      + "'" + positionpropename + "','" + companycode + "','" + companyname + "','" + deptCode + "','" + deptname + "','" + locationcode + "'" + ","
+							      + "'" + locationname + "','" + stdpositioncode + "','" + stdpositionname + "','" + postcode + "','" + postname + "','" + sequencecode + "','" + sequencename + "',"
+							      + "'" + positiongroupcode + "','" + positiongroupname + "','" + ethnicgroupcode + "','" + ethnicgroupname + "')";
+					log.writeLog("插入岗位建模自定义表生成新数据sql--------->" + sql);
+					boolean executeUpdate = rs.executeUpdate(sql);
+					log.writeLog("是否成功：" + executeUpdate);
+					log.writeLog("原因：" + rs.getExceptionMsg());
+					// 将新增加的岗位加入至MAP中
+					definedExistMap.put(maxJobid + "", positionCode);
+					
+				} else {// 岗位存在则更新
+					sql = "update hrmjobtitles set " +
+							      "jobtitlename = '" + positionName + "', " +
+							      "jobtitlemark = '" + positionName + "', " +
+							      "jobtitlecode = '" + positionCode + "', " +
+							      "jobdepartmentid = '" + jobdepartmentid + "', " +
+							      "modified = to_date('" + now + "','yyyy-mm-dd hh24:mi:ss')," +
+							      "modifier = '1', " +
+							      "canceled = " + canceled + " " +
+							      "where  id= '" + jobtitleid + "'";
+					log.writeLog("更新岗位表中数据sql--------->" + sql);
+					rs.executeUpdate(sql);
+					updateNum++;
+					log.writeLog("更新岗位表---成功------>");
+					
+					
+					if (definedExistMap.containsKey(jobtitleid)) {// 存在则更新岗位自定义表
+						sql = "update uf_jobtitledefined set " +
+								      "positionName = '" + positionName + "', " +
+								      "positionabbreviation = '" + positionabbreviation + "', " +
+								      "positiontype = '" + positiontype + "', " +
+								      "positiontypehighest = '" + positiontypehighest + "', " +
+								      "positiontypelowest = '" + positiontypelowest + "', " +
+								      "positionpropecode = '" + positionpropecode + "', " +
+								      "positionpropename = '" + positionpropename + "', " +
+								      "companycode = '" + companycode + "', " +
+								      "companyname = '" + companyname + "', " +
+								      "deptCode = '" + deptCode + "', " +
+								      "deptname = '" + deptname + "', " +
+								      "locationcode = '" + locationcode + "', " +
+								      "locationname = '" + locationname + "', " +
+								      "stdpositioncode = '" + stdpositioncode + "', " +
+								      "stdpositionname = '" + stdpositionname + "', " +
+								      "postcode = '" + postcode + "', " +
+								      "postname = '" + postname + "', " +
+								      "sequencecode = '" + sequencecode + "', " +
+								      "sequencename = '" + sequencename + "', " +
+								      "positiongroupcode = '" + positiongroupcode + "', " +
+								      "positiongroupname = '" + positiongroupname + "', " +
+								      "ethnicgroupcode = '" + ethnicgroupcode + "', " +
+								      "ethnicgroupname = '" + ethnicgroupname + "' " +
+								      "where positionid= '" + jobtitleid + "'";
+						log.writeLog("更新岗位建模自定义表中数据sql--------->" + sql);
+						rs.executeUpdate(sql);
+						
+					} else {// 不存在则插入岗位自定义表
+						// 新增数据,插入到hrmjobtitles表中
+						sql = "insert into uf_jobtitledefined (formmodeid,modedatacreater,modedatacreatertype,modedatacreatedate,modedatacreatetime,"
+								      + "positionid,positioncode,positionname,positionabbreviation,positiontype,positiontypehighest,positiontypelowest,"
+								      + "positionpropecode,positionpropename,companycode,companyname,deptcode,deptname,locationcode,locationname,stdpositioncode,"
+								      + "stdpositionname,postcode,postname,sequencecode,sequencename,positiongroupcode,positiongroupname,ethnicgroupcode,ethnicgroupname) values"
+								      + "(32501,1,0,to_char(sysdate, 'yyyy-MM-dd'),to_char(sysdate, 'HH24:mi:ss'),'" + jobtitleid + "','" + positionCode + "','" + positionName + "',"
+								      + "'" + positionabbreviation + "','" + positiontype + "','" + positiontypehighest + "','" + positiontypelowest + "','" + positionpropecode + "',"
+								      + "'" + positionpropename + "','" + companycode + "','" + companyname + "','" + deptCode + "','" + deptname + "','" + locationcode + "'" + ","
+								      + "'" + locationname + "','" + stdpositioncode + "','" + stdpositionname + "','" + postcode + "','" + postname + "','" + sequencecode + "','" + sequencename + "',"
+								      + "'" + positiongroupcode + "','" + positiongroupname + "','" + ethnicgroupcode + "','" + ethnicgroupname + "')";
+						log.writeLog("插入岗位建模自定义表生成新数据sql--------->" + sql);
+						rs.executeUpdate(sql);
+						// 将新增加的岗位加入至MAP中
+						definedExistMap.put(jobtitleid + "", positionCode);
+					}
+				}
+			}
+			log.writeLog("----------同步结束岗位，第" + k + "页：" + count +
+					             ",新增岗位数为：" + insertNum + " ,更新岗位数为：" + updateNum + ",跳出处理岗位数为：" + skipNum + "------------");
+			skipNum = 0;
+			insertNum = 0;
+			updateNum = 0;
+		}
+		log.writeLog("----------同步结束岗位总数：" + count + "------------");
+		// 更新岗位缓存
+		JobTitlesComInfo jtci = new JobTitlesComInfo();
+		jtci.removeJobTitlesCache();
+		
+		// 释放map占用的内存
+		map_dept_code_id.clear();
+		map_dept_code_id = null;
+		
+		// 更新同步时间到中间表
+		String sql1 = "update uf_HRRestDate set sctbsj ='" + now + "' where jkm = '/dcopenedi/hrPost/pageByUpdateTime'";
+		rs.executeUpdate(sql1);
+		/* ******************* 清除所有岗位信息，释放内存空间 start youhong.ai ******************* */
+		allResult.clear();
+		/* ******************* 清除所有岗位信息，释放内存空间 end youhong.ai ******************* */
+	}
+	
+	
+	public Map<String, String> getJobtitleCodeIdMap() {
+		RecordSet rs = new RecordSet();
+		Map<String, String> map = new HashMap<>();
+		rs.executeQuery("select jobtitlecode,outkey,id from hrmjobtitles where outkey is not null  and (CANCELED!=1 or CANCELED is null)");
+		while (rs.next()) {
+			map.put(rs.getString("outkey"), rs.getString("id"));
+		}
+		return map;
+	}
+	
+	public int getPages(String date) {
+		int current = 1, size = 10000, pages = 1;
+		String url = HttpClientToJT.baseUrl + "/dcopenedi/hrPost/pageByUpdateTime";
+		String token = HttpClientToJT.getToken();
+		Map<String, Object> params = new HashMap<>();
+//        LocalDateTime today_start = LocalDateTime.of(LocalDate.now(), LocalTime.MIN);//当天零点
+//        String td_st_str = today_start.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+		params.put("updateTime", date);
+//        params.put("updateTime", "2018-03-21 00:00:00");
+		params.put("current", current);
+		params.put("size", size);
+		String s = HttpClientToJT.sendGet(url, token, params);
+		JSONObject jsonObject = JSONObject.parseObject(s);
+		if (jsonObject.getInteger("code").equals(1)) {
+			JSONObject result = jsonObject.getJSONObject("data");
+			pages = result.getInteger("pages");
+		}
+		return pages;
+	}
+	
+	public JSONArray getJobsByPage(String pages, String date) {
+		int size = 5000;
+		String url = HttpClientToJT.baseUrl + "/dcopenedi/hrPost/pageByParam";
+		String token = HttpClientToJT.getToken();
+		Map<String, Object> params = new HashMap<>();
+		
+		params.put("beginTime", date);
+		params.put("point", pages);
+		params.put("size", size);
+		
+		String s = HttpClientToJT.sendPost(url, token, JSONObject.toJSONString(params));
+		JSONObject jsonObject = JSONObject.parseObject(s);
+		JSONArray jsonArray = new JSONArray();
+		if (jsonObject.getInteger("code").equals(1)) {
+			JSONObject result = jsonObject.getJSONObject("data");
+			JSONArray records = result.getJSONArray("records");
+			
+			// 是否有下一页
+			Object hasNextPage = result.get("hasNextPage");
+			// 下次继续传
+			maxPoint = result.get("maxPoint").toString();
+			if ("false".equals(hasNextPage.toString())) {
+				ifPage = false;
+			}
+			/* ******************* 收集所有岗位信息 start for youhong.ai ******************* */
+			allResult.addAll(records);
+			/* ******************* 收集所有岗位信息 end for youhong.ai ******************* */
+			jsonArray.addAll(records);
+		} else {
+			ifPage = false;
+		}
+		Object directSales = jsonArray.stream().filter(item -> {
+			JSONObject itemJson = JSONObject.parseObject(JSON.toJSONString(item));
+			return !"CHN".equals(itemJson.getString("countryCode"));
+		}).collect(Collectors.toList());
+		jsonArray = JSONArray.parseArray(JSON.toJSONString(directSales));
+		// log.writeLog("-------------------数据："+jsonArray);
+		return jsonArray;
+	}
+	
+	public JSONArray getJobtitles() {
+		int current = 1, size = 10000, pages = 2;
+		String url = HttpClientToJT.baseUrl + "/dcopenedi/hrPost/pageByUpdateTime";
+		// String url = "https://jtdcapi.jtexpress.com.cn/dcopenedi/hrPost/pageByUpdateTime";
+		String token = HttpClientToJT.getToken();
+		Map<String, Object> params = new HashMap<>();
+//        LocalDateTime today_start = LocalDateTime.of(LocalDate.now(), LocalTime.MIN);//当天零点
+//        String td_st_str = today_start.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+//        params.put("updateTime",td_st_str);
+		params.put("updateTime", "2021-03-21 00:00:00");
+		params.put("current", current);
+		params.put("size", size);
+		String s = HttpClientToJT.sendGet(url, token, params);
+		JSONObject jsonObject = JSONObject.parseObject(s);
+		JSONArray jsonArray = new JSONArray();
+		if (jsonObject.getInteger("code").equals(1)) {
+			JSONObject result = jsonObject.getJSONObject("data");
+			pages = result.getInteger("pages");
+			JSONArray records = result.getJSONArray("records");
+			jsonArray.addAll(records);
+			for (int i = 2; i <= pages; i++) {
+				System.out.println(i);
+				params.put("current", i);
+				String str = HttpClientToJT.sendGet(url, token, params);
+				JSONObject jsonObject1 = JSONObject.parseObject(str);
+				JSONObject jsonResult = jsonObject1.getJSONObject("data");
+				JSONArray records1 = jsonResult.getJSONArray("records");
+				jsonArray.addAll(records1);
+			}
+			Object directSales = jsonArray.stream().filter(item -> {
+				JSONObject itemJson = JSONObject.parseObject(JSON.toJSONString(item));
+				return !"ZHS".equals(itemJson.getString("languageCd"));
+			}).collect(Collectors.toList());
+			jsonArray = JSONArray.parseArray(JSON.toJSONString(directSales));
+		}
+//        System.out.println(jsonArray.toJSONString());
+//        System.out.println(s);
+		// 将写入转化为流的形式
+		writeFile(jsonArray);
+		return jsonArray;
+	}
+	
+	private void writeFile(JSONArray jsonArray) {
+		BufferedWriter bw = null;
+		try {
+			bw = new BufferedWriter(new FileWriter("E:\\3.txt"));
+			// 一次写一行
+			bw.write(jsonArray.toJSONString());
+			bw.newLine();  // 换行用
+			// 关闭流
+			bw.close();
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+		System.out.println("写入成功");
+	}
+	
+	public static void main(String[] args) {
+		SyncHrmjobtitlesToOA job = new SyncHrmjobtitlesToOA();
+		job.getJobtitles();
+	}
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/schedule/hrm/SyncHrmresourceToOA.java b/src/main/youhong_ai_jitu_src/jntchina/schedule/hrm/SyncHrmresourceToOA.java
new file mode 100644
index 0000000..5d1006d
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/schedule/hrm/SyncHrmresourceToOA.java
@@ -0,0 +1,633 @@
+package jntchina.schedule.hrm;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.serializer.SerializerFeature;
+import com.engine.common.service.impl.HrmCommonServiceImpl;
+import jntchina.schedule.hrm.entity.HrmUserDto;
+import jntchina.schedule.hrm.util.OrganizationUtil;
+import jntchina.util.HttpClientToJT;
+import selfdev.util.base.BaseUtil;
+import selfdev.util.base.TimeCommonUtil;
+import selfdev.util.log.LogTool;
+import weaver.conn.RecordSet;
+import weaver.general.Util;
+import weaver.hrm.resource.ResourceComInfo;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.format.DateTimeFormatter;
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * 定时将HR系统中的员工同步至OA的人员表中
+ * @author Cyq
+ * @date 2021年6月17日 02:01:51
+ */
+public class SyncHrmresourceToOA {
+
+    //人员编码和id  map
+    Map<String, String> map_user_code_id = new HashMap<>();
+    private final LogTool log = new LogTool("/log/hrm/user/", false);
+    public int size;//接口同步每页数量
+    public boolean hasNextPage;//是否有下一页
+    public String point;//页标
+	public String jkhzurl = "/dcopenedi/hrEmployee/pageByParam";//接口URL后缀
+
+    public void execute(String today) {
+    	String now = TimeCommonUtil.obtainDate(0);
+    	log.writeLog("--------------------同步人员  start["+now+"]----------------------");
+    	//为空时默认每页1000条数据
+    	if("null".equals(String.valueOf(size))||"0".equals(String.valueOf(size))||size<=0){
+    		setSize(1000);
+    	}
+    	//设置同步HR数据时是否有下一页为是
+    	setHasNextPage(true);
+    	setPoint("1");
+        
+        SyncHrmdepartmentToOA hrmdepartment = new SyncHrmdepartmentToOA();
+        SyncHrmjobtitlesToOA hrmjobtitles = new SyncHrmjobtitlesToOA();
+        
+        HrmCommonServiceImpl hrmCommonServiceImpl=new HrmCommonServiceImpl();
+        
+        Map<String, String> map_dept_code_id = hrmdepartment.getDepartmentCodeIdMap();
+        Map<String, String> map_jobtitle_code_id = hrmjobtitles.getJobtitleCodeIdMap();
+        //未获取到的上级的集合
+        Map<String, String> noFindManagerMap = new HashMap<>();
+        Map<String, String> map_user_id_defined = getUserIdDefinedMap();
+        map_user_code_id = getUserCodeIdMap();
+        //获取部门ID-->分部ID的MAP
+        Map<String,String> map_deptid_subcompanyid  = BaseUtil.getMapKeyValueInfoByParm("hrmdepartment", " where subcompanyid1 is not null", "id", "subcompanyid1");
+        //获取部门自定义字段信息map
+        Map<String,Map<String,String>> map_deptid_defined  = getDeptDefinedMap();
+        // 处理人员同步逻辑
+        RecordSet rs = new RecordSet();
+        RecordSet rs2 = new RecordSet();
+        String sql;
+        
+        int totalCount = 0,insertCount=0,updateCount=0,skipCount=0;
+        int skipNum = 0,insertNum=0,updateNum = 0;
+        int page = 1000;//默认为1千页
+        
+        log.writeLog("size---------------------->"+size);
+        //查询条件
+        Map<String,Object> map_parm= new HashMap<>();
+        map_parm.put("updateTime", today);//时间戳
+        map_parm.put("size", size);//每页数量
+        List<String> languageCds_list= new ArrayList<>();
+        languageCds_list.add("ZHS");//语言默认为中文
+        map_parm.put("languageCds", languageCds_list);//支持多语言
+        try {
+        	//从建模表中读取默认密码（默认密码Jitu@2021）
+        	String password = BaseUtil.getBaseInfoByParm("mrmm", "uf_tbygmrdllm", "1", "1", "");
+        	if("".equals(password)) {
+        		password="Jitu@2021";
+        	}
+        	log.writeLog("password----->"+password);
+        	password=BaseUtil.MD5(password);//MD5加密后的密码
+        	log.writeLog("password_md5----->"+password);
+        	//更新人员缓存
+            ResourceComInfo rci = new ResourceComInfo();
+	        log.writeLog("----------hasNextPage------------>"+hasNextPage);
+	        for (int k = 1; k <= page; k++) {
+	        	if(!hasNextPage){
+	        		log.writeLog("------------第【"+k+"】次循环获取数据不存在，跳出");
+	        		break;
+	        	}
+	        	map_parm.put("point", getPoint());//起始位置，第一次
+	        	//获取结果
+	            JSONArray data = getUsersByPoint_New(map_parm);
+				//接口未获取到数据时，跳过当前循环，进入下一次
+				if(data==null||data.isEmpty()){
+					continue;
+				}
+	            //将查询结果放到list对象中
+	            List<HrmUserDto> users = JSONArray.parseArray(data.toJSONString(), HrmUserDto.class);
+	            totalCount = totalCount+users.size();
+	            log.writeLog("----------同步人员第"+k+"页，条数:"+users.size());
+	            for (int i = 0; i < users.size(); i++) {
+	                HrmUserDto row = users.get(i);
+	                //昵称
+	                String field0 = Util.null2String(row.getEmployeeEnglishName());//员工code
+
+	                String employeeCode = Util.null2String(row.getEmployeeCode());//员工code
+	                String employeeName = Util.null2String(row.getEmployeeName());//姓名
+	                String employeeSexCode = Util.null2String(row.getEmployeeSexCode());//性别 M男 F女 对应 OA 0男 1女
+	                int sex = "M".equals(employeeSexCode) ? 0 : 1;
+	                String birthdate = Util.null2String(row.getEmployeeBirthdate());//出生年月
+	                String companyTel = Util.null2String(row.getCompanyTel());//办公电话
+	                String personalTel = Util.null2String(row.getPersonalTel());//手机号
+	                String email = Util.null2String(row.getCompanyEmail());//邮箱
+	                String idNumber = Util.null2String(row.getCertificateNum());//身份证号码
+	                String managerCode = Util.null2String(row.getSupervisorId());//上级次账号code
+	                //获取人员姓名的拼音
+	                String name_pinyin = hrmCommonServiceImpl.generateQuickSearchStr(employeeName);
+	                String EntryDate = Util.null2String(row.getEmplHireDate());//入职日期  无字段，暂用试用结束日期来替代
+	                String hrStatus = Util.null2String(row.getHrStatus());//状态A在职，I离职 对应OA的1正式 5离职
+	                int status = "A".equals(hrStatus) ? 1 : 5;//OA的在职状态
+	                String deptCode = Util.null2String(row.getDeptCode());//部门
+	                String positionCode = Util.null2String(row.getPositionCode());//岗位
+	                String bankBranchName = Util.null2String(row.getBankBranchName());//开户行
+	                String bankAccountId = Util.null2String(row.getBankAccountId());//银行卡号
+	                String bankName = Util.null2String(row.getBankName());//银行类型
+	                String action = Util.null2String(row.getAction());//操作编码
+	                String action_descr = Util.null2String(row.getActionDescr()).replace("'","''");//操作名称
+	                String departmentid,subcompanyid1;
+	                //根据员工code获取员工id
+	                String userId = Util.null2String(map_user_code_id.get(employeeCode));//员工ID
+					//员工离职
+					if(status==5&&!"".equals(userId)){
+						//清空账号信息
+						sql = "update hrmresource set " +
+								"loginid = '', " +
+								"account='', "+
+								"modified = to_date('" + now + "','yyyy-mm-dd hh24:mi:ss')," +
+								"modifier = '1', " +
+								"lastmoddate = '" + now.substring(0, 10) + "', " +
+								"lastmodid = '1', " +
+								"status = '5' " +
+								"where  id ='" + userId  +"' and workcode='"+employeeCode+"'";
+						log.writeLog("更新员工状态为离职sql--------->"+sql);
+						rs.execute(sql);
+						continue;
+					}
+
+	                //处理岗位id
+	                String jobtitleid = "";
+	                if (!"".equals(positionCode)) {
+	                    jobtitleid = Util.null2String(map_jobtitle_code_id.get(positionCode));//岗位ID
+	                }
+	                
+	                //如果部门编码为空，跳过不同步
+	                if("".equals(deptCode)){
+	                    skipNum++;
+	                    log.writeLog("员工编号【"+employeeCode+"】、员工姓名【"+employeeName+"】部门编码不存在，跳过同步");
+	                    continue;
+	                }else{
+	                    //处理所属部门编码对应的OA部门、分部。在分部表，部门表匹配
+	                    departmentid = Util.null2String(map_dept_code_id.get(deptCode));//部门ID
+	                    if("".equals(departmentid)){
+	                        skipNum++; 
+	                        log.writeLog("员工编号【"+employeeCode+"】、员工姓名【"+employeeName+"】、部门编码【"+deptCode+"】的部门编码对应部门ID在OA中未找到，跳过同步");
+	                        continue;
+	                    }else{
+	                    	subcompanyid1 = Util.null2o(map_deptid_subcompanyid.get(departmentid));//分部ID
+	                    	if("0".equals(subcompanyid1)){
+	                            skipNum++; 
+	                            log.writeLog("员工编号【"+employeeCode+"】、员工姓名【"+employeeName+"】、部门ID【"+departmentid+"】、部门编码【"+deptCode+"】的未找到对应的分部ID，跳过同步");
+	                            continue;
+	                        }
+	                    }
+	                }
+	                String managerid = "";//部门负责人
+	                Map<String,String> map_deptid_defined_detail=map_deptid_defined.get(departmentid);
+	                if(!map_deptid_defined_detail.isEmpty()){
+	                	//部门对应的国家
+	                	String guojia_bm=Util.null2String(map_deptid_defined_detail.get("guojia"));
+	                	//部门负责人
+	                	managerid=Util.null2String(map_deptid_defined_detail.get("bmfzr"));
+	                	//国家不为空，也不是中国CHN
+	                	if(!"".equals(guojia_bm)&&!"CHN".equals(guojia_bm)){
+	                		skipNum++; 
+	                        log.writeLog("员工编号【"+employeeCode+"】、员工姓名【"+employeeName+"】、部门ID【"+departmentid+"】、部门编码【"+deptCode+"】部门对应的国家是【"+guojia_bm+"】，跳过同步");
+	                        continue;
+	                	}
+	                }
+	                
+	                //若维护了上级次账号，则根据维护的数据找上级
+	                if (!"".equals(managerCode)) {
+	                    managerid = Util.null2String(map_user_code_id.get(managerCode));//直接上级
+	                }
+	                //从HR获取有上级，但是在OA中未找到，则说明可能上级是新入职还未同步到OA中
+	                if("".equals(managerid)&&!"".equals(managerCode)){
+	                    noFindManagerMap.put(employeeCode,managerCode);
+	                }
+	                log.writeLog("----人员code:"+employeeCode+",所属部门code:"+deptCode+",部门id："+departmentid+",部门领导code："+managerCode+",部门领导id："+managerid+"--------->");
+
+
+					String[] actionInfo = new String[] {action,action_descr};
+
+	                //判断人员ID是否已经存在,不存在则插入生成新人员
+	                if (!map_user_code_id.containsKey(employeeCode)) {
+	                	log.writeLog("查询员工【"+employeeCode+"】在数据库中是否存在需要多久 start--------->" + TimeCommonUtil.obtainDate(0));
+	                	String userid_2="";
+	                    //为解决同时手工执行点击了2次同步时多线程产生的问题，故还需要再次查询一遍数据库中是否已存在
+	                    rs2.execute("select id from hrmresource where workcode='"+employeeCode+"'");
+	                    while(rs2.next()){
+	                    	userid_2=Util.null2String(rs2.getString("id"));
+	                    }
+	                    //若不存在则插入，若已存在则不做其他操作
+	                    if(!"".equals(userid_2)){
+	                    	log.writeLog("员工ID【"+userid_2+"】、员工编号【"+employeeCode+"】在OA人员表中已存在，当前跳过，进入下一次循环");
+	                    	map_user_code_id.put(employeeCode,userid_2);
+	                    	skipNum++;
+	                    	continue;
+	                    }
+	                    log.writeLog("查询员工【"+employeeCode+"】在数据库中是否存在需要多久 end--------->" + TimeCommonUtil.obtainDate(0));
+	                    //获取即将插入的人员ID
+	                    rs.executeProc("HrmResourceMaxId_Get", "");
+	                    rs.next();
+	                    String maxUserId = "" + rs.getInt(1);
+	                    log.writeLog("查在数据库中查询人员最大ID需要多久 --------->" + maxUserId);
+	                    //新增数据,插入到人员基本信息表HrmResource中 seclevel
+	                    sql = "insert into hrmresource(id,loginid,password,lastname,workcode,sex, " +
+	                            "mobile,email,departmentid,jobtitle,birthday,certificatenum," +
+	                            "seclevel,outkey,status,systemlanguage,createrid,createdate," +
+	                            "companystartdate,telephone,ecology_pinyin_search,pinyinlastname," +
+	                            "created,creater,modified,modifier,managerid,subcompanyid1) values( "
+	                            + "'" + maxUserId + "',"
+	                            + "'" + employeeCode + "',"
+	                            + "'" + password + "',"
+	                            + "?,"
+	                            + "'" + employeeCode + "',"
+	                            + "'" + sex + "',"
+	                            + "'" + personalTel + "',"
+	                            + "'" + email + "',"
+	                            + "'" + departmentid + "',"
+	                            + "'" + jobtitleid + "',"
+	                            + "'" + birthdate + "',"
+	                            + "'" + idNumber + "',"
+	                            + "'" + 10 + "',"
+	                            + "'" + employeeCode + "',"
+	                            + "" + status + ","
+	                            + "'7',"
+	                            + "'1',"
+	                            + "'" + now.substring(0, 10) + "',"
+	                            + "'" + EntryDate + "',"
+	                            + "'" + companyTel + "',"
+	                            + "'" + name_pinyin + "',"
+	                            + "'" + name_pinyin + "',"
+	                            + "to_date('" + now + "','yyyy-mm-dd hh24:mi:ss'),"
+	                            + "'1',"
+	                            + "to_date('" + now + "','yyyy-mm-dd hh24:mi:ss'),"
+	                            + "'1',"
+	                            + "'" + managerid + "',"
+	                            + "'" + subcompanyid1 + "')";
+	                    rs.executeUpdate(sql,employeeName);
+	                    log.writeLog("插入人员表中数据sql--------->" + sql);
+	                    
+	                    insertNum++;
+	                    //将新增加的人员加入至MAP中
+	                    map_user_code_id.put(employeeCode,maxUserId);
+	                    //新增数据,插入到人员自定义表cus_fielddata中
+	                    if(!map_user_id_defined.containsKey(maxUserId)){
+	                        if("".equals(bankAccountId)){
+								OrganizationUtil.insertEmployeeCustomizePersonal(maxUserId,null,actionInfo,row);
+	                        }else{
+								String[] bankInfo = new String[] {bankBranchName,bankAccountId,bankName};
+								OrganizationUtil.insertEmployeeCustomizePersonal(maxUserId,bankInfo,actionInfo,row);
+	                        }
+	                        log.writeLog("插入人员自定义表中数据sql--------->" + sql);
+	                        rs.execute(sql);
+
+	                        //将新增加的人员自定义信息加入至MAP中
+	                        map_user_id_defined.put(maxUserId,employeeCode);
+	                    }
+
+						OrganizationUtil.dealEmployeeNickName(maxUserId,field0);
+
+	                    //刷新人员缓存
+	                    rci.addResourceInfoCache(maxUserId);
+	                    
+	                } else {//存在则更新
+	                    //根据工号获取人员ID
+	                    //userId = Util.null2String(map_user_code_id.get(employeeCode));//员工ID
+	                    String updateStr = "";
+	                    updateStr += "departmentid = '" + departmentid + "', ";
+	                    updateStr += !"".equals(jobtitleid)?"jobtitle = '" + jobtitleid + "', ":"";
+	                    updateStr += !"".equals(subcompanyid1)?"subcompanyid1 = '" + subcompanyid1 + "', ":"";
+	                    updateStr += !"".equals(managerid)?"managerid = '" + managerid + "', ":"";
+	                    sql = "update hrmresource set " +
+	                            "workcode = '" + employeeCode + "', " +
+	                            "lastname = ?, " +
+	                            "sex = '" + sex + "', " +
+	                            "mobile = '" + personalTel + "', " +
+	                            "ecology_pinyin_search = '" + name_pinyin + "', " +
+	                            "pinyinlastname = '" + name_pinyin + "', " +
+	                            "email = '" + email + "', " +
+	                            "telephone = '" + companyTel + "', " +
+	                            "status = " + status + ", " +
+	                            "birthday = '" + birthdate + "', " +
+	                            "certificatenum = '" + idNumber + "', " +
+	                            "companystartdate = '" + EntryDate + "', " +
+	                            "modified = to_date('" + now + "','yyyy-mm-dd hh24:mi:ss')," +
+	                            "modifier = '1', " +
+	                            "lastmoddate = '" + now.substring(0, 10) + "', " +
+	                            updateStr +
+	                            "lastmodid = '1' " +
+	                            "where  id ='" + userId + "'";
+	                    log.writeLog("更新人员基本信息表中数据sql--------->" + sql);
+	                    rs.executeUpdate(sql,employeeName);
+	                    updateNum++;
+
+						if(map_user_id_defined.containsKey(userId)){
+							String[] bankInfo = new String[] {bankBranchName,bankAccountId,bankName};
+							OrganizationUtil.updateEmployeeCustomizePersonal(userId,bankInfo,actionInfo,row);
+	                    } else {
+	                        //更新人员工作信息表数据
+	                        if("".equals(bankAccountId)){
+								OrganizationUtil.updateEmployeeCustomizePersonal(userId,null,actionInfo,row);
+	                        } else {
+								String[] bankInfo = new String[] {bankBranchName,bankAccountId,bankName};
+								OrganizationUtil.updateEmployeeCustomizePersonal(userId,bankInfo,actionInfo,row);
+	                        }
+	                    }
+	                    log.writeLog("更新/插入人员自定义表中数据sql--------->" + sql);
+	                    rs.execute(sql);
+
+						//基本信息处理
+						OrganizationUtil.dealEmployeeNickName(userId,field0);
+
+						//刷新人员缓存
+	                    rci.addResourceInfoCache(userId);
+	                    
+	                    //将新增加的人员自定义信息加入至MAP中
+	                    map_user_id_defined.put(userId, employeeCode);
+	                }
+	            }
+	            insertCount += insertNum;
+	            updateCount += updateNum;
+	            skipCount += skipNum;
+	            log.writeLog("----------同步结束人员，第" + k + "页："+totalCount+
+	                    ",新增人员数为："+insertNum+" ,更新人员数为："+updateNum+",跳过处理人员数为："+skipNum+"------------");
+	            skipNum = 0;insertNum=0;updateNum = 0;
+	        }
+	        log.writeLog("---------开始处理未更新的直属领导信息-------");
+	        //donotfinduser(noFindManagerMap);
+			OrganizationUtil.dealNoFindMangerEmployeeData(noFindManagerMap);
+	        log.writeLog("---------结束处理未更新的直属领导信息-------");
+	        log.writeLog("----------同步人员结束总人数："+totalCount+",新增人数："+insertCount+",更新人数："+updateCount+",跳过人数："+skipCount+"------------");
+            
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.writeLog("员工同步异常，错误信息-------->"+e.toString());
+        }
+
+        //清空map缓存
+        map_user_id_defined.clear();
+		map_user_code_id.clear();
+        map_user_code_id=null;
+        map_dept_code_id.clear();
+		map_jobtitle_code_id.clear();
+		noFindManagerMap.clear();
+		map_deptid_subcompanyid.clear();
+		map_deptid_defined.clear();
+
+		//更新同步时间到中间表
+        String sql1 = "update uf_HRRestDate set sctbsj ='"+now+"' where jkbs = 'user'";
+        rs.execute(sql1);
+        log.writeLog("--------------------同步人员  end["+TimeCommonUtil.obtainDate(0)+"]----------------------");
+    }
+
+
+    /**
+     * 获取人员信息(新方法)
+     * @param map 查询条件
+     * @return
+     */
+    public JSONArray getUsersByPoint_New(Map<String, Object> map) {
+    	//新接口URL
+        String url = HttpClientToJT.baseUrl + getJkhzurl();
+		log.writeLog("获取员工数据url-------->"+url);
+        LogTool log2 = new LogTool("/log/hrm/user/detail", false);
+        //获取token
+        String token = HttpClientToJT.getToken();
+        //将map转成字符串
+        String param=JSONObject.toJSONString(map, SerializerFeature.DisableCircularReferenceDetect);
+        log.writeLog("获取员工数据传入参数param------------>"+param);
+        log2.writeLog("获取员工数据传入参数param------------>"+param);
+        String s = HttpClientToJT.sendPost(url, token, param);
+        log2.writeLog("员工数据返回结果------------>"+s);
+        
+        JSONObject jsonObject = JSONObject.parseObject(s);
+        JSONArray jsonArray = new JSONArray();
+        String code=Util.null2String(jsonObject.getString("code"));
+        if ("1".equals(code)) {
+            JSONObject result = jsonObject.getJSONObject("data");
+            //是否有下一页
+            boolean sfyxyy=result.getBoolean("hasNextPage");//是否有下一页
+            String maxPoint=Util.null2String(result.getString("maxPoint"));//下一页开始
+            this.setHasNextPage(sfyxyy);
+            this.setPoint(maxPoint);
+            JSONArray records = result.getJSONArray("records");
+			//过滤未获取到数据
+			if(records!=null){
+				jsonArray.addAll(records);
+				Object directSales = jsonArray.stream().filter(item -> {
+					JSONObject itemJson = JSONObject.parseObject(JSON.toJSONString(item));
+					return "CHN".equals(itemJson.getString("deptCountryCode"))&&"ZHS".equals(itemJson.getString("languageCd"));
+				}).collect(Collectors.toList());
+				jsonArray = JSONArray.parseArray(JSON.toJSONString(directSales));
+			}
+        }else{
+        	this.setHasNextPage(false);
+        }
+
+        return jsonArray;
+    }
+    
+    /**
+     * 获取人员信息(旧方法，弃用)
+     * @param pages 第几页
+     * @param today 时间戳
+     * @return
+     */
+    public JSONArray getUsersByPage(int pages, String today) {
+        String url = HttpClientToJT.baseUrl + "/dcopenedi/hrEmployee/pageByUpdateTime";
+        String token = HttpClientToJT.getToken();
+        Map<String, Object> params = new HashMap<>();
+        params.put("updateTime", today);
+//        params.put("updateTime", "2018-03-21 00:00:00");
+        params.put("current", pages);
+        params.put("size", size);
+        String s = HttpClientToJT.sendGet(url, token, params);
+        JSONObject jsonObject = JSONObject.parseObject(s);
+        JSONArray jsonArray = new JSONArray();
+        String code=Util.null2String(jsonObject.getString("code"));
+        if ("1".equals(code)) {
+            JSONObject result = jsonObject.getJSONObject("data");
+            JSONArray records = result.getJSONArray("records");
+            jsonArray.addAll(records);
+        }
+        //-------modifier by KangMD  取消国家，全部同步  start-------//
+        Object directSales = jsonArray.stream().filter(item -> {
+            JSONObject itemJson = JSONObject.parseObject(JSON.toJSONString(item));
+            return "CHN".equals(itemJson.getString("countryCode"))&&"ZHS".equals(itemJson.getString("languageCd"));
+            //return "ZHS".equals(itemJson.getString("languageCd"));
+        }).collect(Collectors.toList());
+        jsonArray = JSONArray.parseArray(JSON.toJSONString(directSales));
+        //-------modifier by KangMD  取消国家，全部同步  end-------//
+        return jsonArray;
+    }
+    
+    /**
+     * 获取页数(旧方法，弃用)
+     * @param today 时间戳
+     * @return
+     */
+    public int getPage(String today){
+        int current = 1, pages = 1;
+        String url = HttpClientToJT.baseUrl + "/dcopenedi/hrEmployee/pageByUpdateTime";
+        String token = HttpClientToJT.getToken();
+        Map<String, Object> params = new HashMap<>();
+        params.put("updateTime", today);
+        params.put("current", current);
+        params.put("size", size);
+        log.writeLog("获取页数传入JSON--->"+JSON.toJSONString(params));
+        String s = HttpClientToJT.sendGet(url, token, params);
+        JSONObject jsonObject = JSONObject.parseObject(s);
+        String code=Util.null2String(jsonObject.getString("code"));
+        log.writeLog("code------>"+code);
+        if ("1".equals(code)) {
+            JSONObject result = jsonObject.getJSONObject("data");
+            pages = result.getInteger("pages");
+        }else{
+        	log.writeLog("获取页数返回结果------>"+s);
+        }
+        return pages;
+    }
+
+    /**
+     * 根据部门编号获取所属分部
+     * @return
+     */
+    public String getSubcomBydept(String deptId){
+        String subComid = "";
+        RecordSet rs = new RecordSet();
+        rs.executeQuery("select supdepid,subcompanyid1,outkey from HrmDepartment where id ='"+deptId+"'");
+        if(rs.next()) {
+            subComid = Util.null2String(rs.getString("subcompanyid1"));
+            String supdepid = Util.null2String(rs.getString("supdepid"));
+            //判断是一级部门或者无上级部门返回
+            if("0".equals(supdepid)||"".equals(supdepid)){
+                return subComid;
+            } else{
+                return getSubcomBydept(supdepid);
+            }
+        }
+        return subComid;
+    }
+
+    public JSONArray getUsers() {
+        int current = 1, pages = 2;
+        String url = HttpClientToJT.baseUrl + "/dcopenedi/hrEmployee/pageByUpdateTime";
+        String token = HttpClientToJT.getToken();
+        Map<String, Object> params = new HashMap<>();
+        LocalDateTime today_start = LocalDateTime.of(LocalDate.now(), LocalTime.MIN);//当天零点
+        String td_st_str = today_start.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+//        params.put("updateTime", td_st_str);
+        params.put("updateTime", "2021-07-09 00:00:00");
+        params.put("current", current);
+        params.put("size", size);
+        String s = HttpClientToJT.sendGet(url, token, params);
+        JSONObject jsonObject = JSONObject.parseObject(s);
+        JSONArray jsonArray = new JSONArray();
+        if (jsonObject.getInteger("code").equals(1)) {
+            JSONObject result = jsonObject.getJSONObject("data");
+            pages = result.getInteger("pages");
+            JSONArray records = result.getJSONArray("records");
+            jsonArray.addAll(records);
+            for (int i = 1; i <= pages; i++) {
+                params.put("current", i);
+                String str = HttpClientToJT.sendGet(url, token, params);
+                JSONObject jsonObject1 = JSONObject.parseObject(str);
+                JSONObject jsonResult = jsonObject1.getJSONObject("data");
+                JSONArray records1 = jsonResult.getJSONArray("records");
+                Optional first = records1.stream().filter(item -> {
+                    JSONObject itemJson = JSONObject.parseObject(JSON.toJSONString(item));
+                    return "00367587".equals(itemJson.getString("employeeCode"));
+                }).findFirst();
+                if(first.isPresent()){
+                    System.out.println(JSON.toJSONString(first.get()));
+                    return null;
+                }
+            }
+        }
+//        jsonArray = JSONArray.parseArray(JSON.toJSONString(directSales));
+//        System.out.println(jsonArray.toJSONString());
+//        System.out.println(s);
+//        //将写入转化为流的形式
+//        writeFile(jsonArray);
+        return jsonArray;
+    }
+
+    /**
+     * 获取人员自定义字段map id-->id
+     *
+     * @return
+     */
+    public Map<String, String> getUserIdDefinedMap() {
+
+        RecordSet rs = new RecordSet();
+        Map<String, String> map = new HashMap<>();
+        rs.executeQuery("select id,field15 from cus_fielddata where scopeid='1' and scope='HrmCustomFieldByInfoType'");
+        while (rs.next()) {
+            map.put(rs.getString("id"), rs.getString("field15"));
+        }
+        return map;
+
+    }
+
+    /**
+     * 获取部门自定义信息
+     * @return
+     */
+    public Map<String, Map<String, String>> getDeptDefinedMap() {
+        RecordSet rs = new RecordSet();
+        Map<String, Map<String, String>> map = new HashMap<>();
+        rs.execute("select * from hrmdepartmentdefined");
+        while (rs.next()) {
+        	Map<String, String> map_d=new HashMap<>();
+        	map_d.put("guojia", Util.null2String(rs.getString("guojia")));//国家
+        	map_d.put("bmfzr", Util.null2String(rs.getString("bmfzr")));//部门负责人
+        	map.put(Util.null2String(rs.getString("deptid")), map_d);
+        }
+        return map;
+
+    }
+
+    public Map<String, String> getUserCodeIdMap() {
+        RecordSet rs = new RecordSet();
+        Map<String, String> map = new HashMap<>();
+        rs.executeQuery("select workcode,outkey,id from hrmresource where outkey is not null ");
+        while (rs.next()) {
+            map.put(rs.getString("outkey"), rs.getString("id"));
+        }
+        return map;
+    }
+
+	public int getSize() {
+		return size;
+	}
+
+	public void setSize(int size) {
+		this.size = size;
+	}
+
+	public boolean isHasNextPage() {
+		return hasNextPage;
+	}
+
+	public void setHasNextPage(boolean hasNextPage) {
+		this.hasNextPage = hasNextPage;
+	}
+
+	public String getPoint() {
+		return point;
+	}
+
+	public void setPoint(String point) {
+		this.point = point;
+	}
+
+	public String getJkhzurl() {
+		return jkhzurl;
+	}
+
+	public void setJkhzurl(String jkhzurl) {
+		this.jkhzurl = jkhzurl;
+	}
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/schedule/hrm/SyncHrmresourceToOAOc.java b/src/main/youhong_ai_jitu_src/jntchina/schedule/hrm/SyncHrmresourceToOAOc.java
new file mode 100644
index 0000000..3cd09ad
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/schedule/hrm/SyncHrmresourceToOAOc.java
@@ -0,0 +1,438 @@
+package jntchina.schedule.hrm;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.api.integration.util.JavaUtil;
+import com.engine.common.service.impl.HrmCommonServiceImpl;
+import com.engine.common.service.impl.ThemeServiceImpl;
+import jntchina.schedule.hrm.entity.HrmUserDto;
+import jntchina.schedule.hrm.util.OrganizationUtil;
+import selfdev.util.base.TimeCommonUtil;
+import selfdev.util.log.LogTool;
+import weaver.conn.RecordSet;
+import weaver.general.Util;
+import weaver.hrm.resource.ResourceComInfo;
+
+import java.util.*;
+
+/**
+ * @author Cyq
+ * @date 2021年6月17日 02:01:51
+ */
+public class SyncHrmresourceToOAOc {
+
+    //是否有下一页
+    boolean isNext = true;
+
+    //国际编码集合
+    private final List<String> deptCountryCodesList = Arrays.asList("EGY","BRA","MEX","SAU","VNM","THA","MYS","SGP","KHM","PHL");
+
+    //页码
+    String current = "1";
+
+    private final LogTool log = new LogTool("/log/hrm/userOC/", false);
+
+    /**
+     * 执行同步操作
+     * @param today 当前日期
+     */
+    @SuppressWarnings("unchecked")
+    public void execute(String today) {
+        log.writeLog("---------进入海外人员同步------------");
+        try {
+
+            HrmCommonServiceImpl hrmCommonServiceImpl = new HrmCommonServiceImpl();
+
+            String now = TimeCommonUtil.obtainDate(0);
+            ThemeServiceImpl themeService = new ThemeServiceImpl();
+            //获取当前系统中未封存的分部信息 <外部主键,OA主键>
+            //Map<String, String> oaSubCompanyMap = OrganizationUtil.getEffectiveSubCompanyCodeIdMap();
+            //获取当前系统中未封存的部门信息 <外部主键,OA主键>
+            //Map<String, String> map_dept_code_id = OrganizationUtil.getEffectiveDepartmentCodeIdMap();
+            //获取当前OA系统中  未封存的部门和分部信息集合
+            Map<String, String> oaDeptAndComMap = OrganizationUtil.getEffectiveDeptAndCompany();
+
+            //用于存储 直接上级不存在的员工信息 <员工编码,直接上级编码>
+            Map<String, String> noFindManagerMap = new HashMap<>();
+
+            // 处理人员同步逻辑
+            RecordSet rs = new RecordSet();
+            String sql;
+            log.writeLog("----------海外 开始同步人员------------");
+            int totalCount = 0, insertCount = 0, updateCount = 0, skipCount = 0;
+            int skipNum = 0, insertNum = 0, updateNum = 0;
+
+            //更新人员缓存
+            ResourceComInfo rci = new ResourceComInfo();
+            //如果有下一页就会循环
+            int count = 0;
+
+            //部门与国家对应关系集合
+            Map<String,String> deptCountryMap = OrganizationUtil.getDeptCountryMap();
+
+            String password = "9F51B4682F92AB843B401218BF27C301";//默认密码Jitu@2021
+
+            while (isNext) {
+                count ++;
+                JSONArray data = getUsersByPage(current, today);
+                List<HrmUserDto> users = JSONArray.parseArray(data.toJSONString(), HrmUserDto.class);
+                totalCount = totalCount + users.size();
+                log.writeLog("----------同步人员第" + count + "页，条数:" + users.size());
+                for (HrmUserDto row : users) {
+                    try {
+                        String field0 = "";
+                        String employeeCode = Util.null2String(row.getEmployeeCode());//员工code
+                        String employeeName = Util.null2String(row.getEmployeeName());//姓名
+                        String employeeSexCode = Util.null2String(row.getEmployeeSexCode());//性别 M男 F女 对应 OA 0男 1女
+                        int sex = "M".equals(employeeSexCode) ? 0 : 1;
+                        String birthdate = Util.null2String(row.getEmployeeBirthdate());//出生年月
+                        String companyTel = Util.null2String(row.getCompanyTel());//办公电话
+                        String personalTel = Util.null2String(row.getPersonalTel());//手机号
+                        String email = Util.null2String(row.getCompanyEmail());//邮箱
+                        String idNumber = Util.null2String(row.getCertificateNum());//身份证号码
+                        String managerCode = Util.null2String(row.getSupervisorId());//上级次账号code
+                        //获取人员姓名的拼音
+                        String name_pinyin = hrmCommonServiceImpl.generateQuickSearchStr(employeeName);
+                        String EntryDate = Util.null2String(row.getEmplHireDate());//入职日期  无字段，暂用试用结束日期来替代
+                        String hrStatus = Util.null2String(row.getHrStatus());//状态A在职，I离职 对应OA的1正式 5离职
+                        int status = "A".equals(hrStatus) ? 1 : 5;//OA的在职状态
+                        String countryCode = Util.null2String(row.getCountryCode());//所属国家
+                        String deptCode = Util.null2String(row.getDeptCode());//部门
+                        String positionCode = Util.null2String(row.getPositionCode());//岗位
+                        log.writeLog("工号:[" + employeeCode + "],姓名:[" + employeeName + "],部门:[" + deptCode + "],领导:[" + managerCode + "],岗位:[" + positionCode + "],国家:[" + countryCode + "]");
+
+                        String bankBranchName = Util.null2String(row.getBankBranchName());//开户行
+                        String bankAccountId = Util.null2String(row.getBankAccountId());//银行卡号
+                        String bankName = Util.null2String(row.getBankName());//银行类型
+                        String managerId,departmentid, subcompanyid1;
+
+                        //处理岗位id
+                        String jobtitleId = OrganizationUtil.getJobtitleIdByOutKey(positionCode);
+
+                        //如果部门编码为空，跳过不同步
+                        if ("".equals(deptCode)) {
+                            skipNum++;
+                            log.writeLog("cylnb is dept null1:" + deptCode + "; userCode" + employeeCode);
+                            continue;
+                        } else {
+                            if(oaDeptAndComMap.containsKey(deptCode)){
+                                String mapValue = oaDeptAndComMap.get(deptCode);
+
+                                departmentid = Util.TokenizerString2(mapValue,"^_^")[0];
+                                subcompanyid1 = Util.TokenizerString2(mapValue,"^_^")[1];
+                            } else {
+                                log.writeLog("cylnb is dept and sub null Code:" + deptCode + "; userCode" + employeeCode);
+                                skipNum++;
+                                continue;
+                            }
+
+                            managerId = OrganizationUtil.getEmployeeManagerId(managerCode,departmentid);
+
+                            //从HR获取有上级，但是在OA中未找到，则说明可能上级是新入职还未同步到OA中
+                            if ("".equals(managerId) && !"".equals(managerCode)) {
+                                noFindManagerMap.put(employeeCode, managerCode);
+                            }
+                        }
+
+                        //是否排除昵称同步（人员所在部门为泰国时，排除昵称同步）
+                        boolean exSynNickName = true;
+                        if (deptCountryMap.containsKey(departmentid)) {
+                            String tempCountryCode = deptCountryMap.get(departmentid);
+
+                            if ("THA".equals(tempCountryCode)) {
+                                exSynNickName = false;
+                            }
+
+                            //当国家编码为 中国、印尼或是为空时 直接跳过
+                            if ("CHN".equals(tempCountryCode) || "IDN".equals(tempCountryCode) || "".equals(tempCountryCode)) {
+                                log.writeLog("cylnb continue user 部门是中国或没有国家字段:" + employeeCode + " 部门:" + deptCode);
+                                skipNum++;
+                                continue;
+                            }
+                        } else {
+                            log.writeLog("cylnb continue 找不到部门:" + employeeCode + " 部门:" + deptCode);
+                            skipNum++;
+                            continue;
+                        }
+
+                        //自定义表的昵称
+                        if ("CHN".equals(countryCode)) {
+                            field0 = row.getEmployeeEnglishName();
+                        } else {
+                            //海外
+                            String language = "";
+                            if ("BRA".equals(countryCode)) {
+                                language = "POR";
+                            }
+                            if ("SAU".equals(countryCode) || "ARE".equals(countryCode)
+                                    || "EGY".equals(countryCode)
+                                    || "MEX".equals(countryCode)
+                                    || "SGP".equals(countryCode)
+                                    || "PHL".equals(countryCode)
+                                    || "MYS".equals(countryCode)
+                                    || "KHM".equals(countryCode)
+                            ) {
+                                language = "ENG";
+                            }
+                            // 、 • 7中°~^8英文、心‘9繁体、• ~‘14 越南°~17泰国°~‘21 葡萄牙‘～‘22 印尼
+                            if ("IDN".equals(countryCode)) {
+                                language = "IDN";
+                            }
+                            if ("THA".equals(countryCode)) {
+                                language = "THA";
+                            }
+                            if ("VNM".equals(countryCode)) {
+                                language = "VIE";
+                            }
+                            try {
+                                JSONArray userGUOJIA = getUserGUOJIA("5000", today, language, employeeCode);
+                                List<HrmUserDto> country = JSONArray.parseArray(userGUOJIA.toJSONString(), HrmUserDto.class);
+                                HrmUserDto hrmUserDto = country.get(0);
+                                employeeName = hrmUserDto.getEmployeeName();
+                                field0 = hrmUserDto.getEmployeeEnglishName();
+                            } catch (Exception e) {
+                                log.writeLog("-------------获取多语言报错：" + employeeCode);
+                            }
+                        }
+                        log.writeLog("-----------------countryCode:" + countryCode);
+                        log.writeLog("-----------------field0:" + field0);
+                        log.writeLog("-----------------employeeName:" + employeeName);
+
+                        //判断人员ID是否已经存在,不存在则插入生成新人员
+                        rs.executeQuery("select id,lastname from hrmResource where workCode = ?", employeeCode);
+                        if (!rs.next()) {
+                            //获取即将插入的人员ID
+                            rs.executeProc("HrmResourceMaxId_Get", "");
+                            rs.next();
+                            String maxUserId = "" + rs.getInt(1);
+                            //新增数据,插入到人员基本信息表HrmResource中 seclevel
+                            sql = "insert into hrmResource(id,loginid,password,lastname,workcode,sex, " +
+                                    "mobile,email,departmentid,jobtitle,birthday,certificatenum," +
+                                    "seclevel,outkey,status,systemlanguage,createrid,createdate," +
+                                    "companystartdate,telephone,ecology_pinyin_search,pinyinlastname," +
+                                    "created,creater,modified,modifier,managerid,subcompanyid1) values( "
+                                    + "'" + maxUserId + "',"
+                                    + "'" + employeeCode + "',"
+                                    + "'" + password + "',"
+                                    + "?,"
+                                    + "'" + employeeCode + "',"
+                                    + "'" + sex + "',"
+                                    + "'" + personalTel + "',"
+                                    + "'" + email + "',"
+                                    + "'" + departmentid + "',"
+                                    + "'" + jobtitleId + "',"
+                                    + "'" + birthdate + "',"
+                                    + "'" + idNumber + "',"
+                                    + "'" + 10 + "',"
+                                    + "'" + employeeCode + "',"
+                                    + "" + status + ","
+                                    + "'7',"
+                                    + "'1',"
+                                    + "'" + now.substring(0, 10) + "',"
+                                    + "'" + EntryDate + "',"
+                                    + "'" + companyTel + "',"
+                                    + "?,"
+                                    + "?,"
+                                    + "to_date('" + now + "','yyyy-mm-dd hh24:mi:ss'),"
+                                    + "'1',"
+                                    + "to_date('" + now + "','yyyy-mm-dd hh24:mi:ss'),"
+                                    + "'1',"
+                                    + "'" + managerId + "',"
+                                    + "'" + subcompanyid1 + "')";
+                            boolean executeUpdate = rs.executeUpdate(sql, employeeName, name_pinyin, name_pinyin);
+                            log.writeLog("新增人员是否正确" + executeUpdate);
+                            log.writeLog("插入人员表中数据sql--------->" + sql);
+                            log.writeLog("msg：" + rs.getExceptionMsg());
+                            insertNum++;
+                            //新增数据,插入到人员自定义表cus_fielddata中
+                            rs.executeQuery("select id,field15 from cus_fielddata where scopeid='1' and scope='HrmCustomFieldByInfoType' and field15='" + employeeCode + "'");
+                            if (!rs.next()) {
+                                boolean b;
+                                if ("".equals(bankAccountId)) {
+                                    b = OrganizationUtil.insertEmployeeCustomizePersonal(maxUserId,null,null,row);
+                                } else {
+                                    String[] bankInfo = new String[] {bankBranchName,bankAccountId,bankName};
+                                    b = OrganizationUtil.insertEmployeeCustomizePersonal(maxUserId,bankInfo,null,row);
+                                }
+                                log.writeLog("-------------新增自定义信息个人信息是否成功：" + b);
+                            } else {
+                                //如果已经存在就修改
+                                log.writeLog("---------------已经存在但是信息不是自己");
+                            }
+
+                            if (exSynNickName) {//是否有昵称
+                                OrganizationUtil.dealEmployeeNickName(maxUserId,field0);
+                            }
+
+                            // log.writeLog("插入人员自定义表中数据sql--------->" + sql);
+                            themeService.createSubCompanyMenu(Integer.parseInt(maxUserId), Integer.parseInt(subcompanyid1));
+                            //刷新人员缓存
+                            rci.addResourceInfoCache(maxUserId);
+                        } else {//存在则更新
+                            String id = rs.getString("id");
+                            //系统中已存在的姓名
+                            String oldLastName = Util.null2String(rs.getString("lastname"));
+
+                          //  String newEmployeeName = OrganizationUtil.dealEmployeeName(oldLastName, employeeName);
+                            String newEmployeeName = employeeName;
+
+                            //更新人员基本信息表数据
+                            String updateStr = "";
+                            updateStr += !"".equals(departmentid) ? "departmentid = '" + departmentid + "', " : "";
+                            updateStr += !"".equals(jobtitleId) ? "jobtitle = '" + jobtitleId + "', " : "";
+                            updateStr += !"".equals(subcompanyid1) ? "subcompanyid1 = '" + subcompanyid1 + "', " : "";
+                            updateStr += !"".equals(managerId) ? "managerid = '" + managerId + "', " : "";
+                            sql = "update hrmresource set " +
+                                    "workcode = '" + employeeCode + "', " +
+                                    "lastname = ?, " +
+                                    "sex = '" + sex + "', " +
+                                    "mobile = '" + personalTel + "', " +
+                                    "ecology_pinyin_search = ?, " +
+                                    "pinyinlastname = ?, " +
+                                    "email = '" + email + "', " +
+                                    "telephone = '" + companyTel + "', " +
+                                    "status = " + status + ", " +
+                                    "birthday = '" + birthdate + "', " +
+                                    "certificatenum = '" + idNumber + "', " +
+                                    "companystartdate = '" + EntryDate + "', " +
+                                    "modified = to_date('" + now + "','yyyy-mm-dd hh24:mi:ss')," +
+                                    "modifier = '1', " +
+                                    "lastmoddate = '" + now.substring(0, 10) + "', " +
+                                    updateStr +
+                                    "lastmodid = '1' " +
+                                    "where  id ='" + id + "'";
+                            boolean executeUpdate = rs.executeUpdate(sql, newEmployeeName, name_pinyin, name_pinyin);
+                            log.writeLog("更新人员基本信息表中数据sql--------->" + sql);
+                            log.writeLog("更新人员是否正确：" + executeUpdate);
+                            log.writeLog("msg：" + rs.getExceptionMsg());
+                            updateNum++;
+
+
+                            boolean executeUpdate1;
+                            String[] bankInfo = new String[] {bankBranchName,bankAccountId,bankName};
+
+                            rs.executeQuery("select id,field15 from cus_fielddata where scopeid='1' and scope='HrmCustomFieldByInfoType' and id='" + id + "'");
+                            if (!rs.next()) {
+                                executeUpdate1 = OrganizationUtil.insertEmployeeCustomizePersonal(id,bankInfo,null,row);
+                            } else {
+                                //更新人员工作信息表数据
+                                if ("".equals(bankAccountId)) {
+                                    executeUpdate1 = OrganizationUtil.updateEmployeeCustomizePersonal(id,null,null,row);
+                                } else {
+                                    executeUpdate1 = OrganizationUtil.updateEmployeeCustomizePersonal(id,bankInfo,null,row);
+                                }
+                            }
+                            log.writeLog("是否正确--------->" + executeUpdate1);
+
+                            if (exSynNickName) {//是否有昵称
+                                OrganizationUtil.dealEmployeeNickName(id,field0);
+                            }
+
+                            //刷新人员缓存
+                            rci.addResourceInfoCache(id);
+                        }
+                    } catch (Exception e) {
+                        log.writeLog("--------------报错了：" + JavaUtil.getExceptionDetail(e));
+                    }
+                }
+                insertCount += insertNum;
+                updateCount += updateNum;
+                skipCount += skipNum;
+                log.writeLog("----------同步结束人员，第" + count + "页：" + totalCount +
+                        ",新增人员数为：" + insertNum + " ,更新人员数为：" + updateNum + ",跳过处理人员数为：" + skipNum + "------------");
+                skipNum = 0;
+                insertNum = 0;
+                updateNum = 0;
+            }
+            log.writeLog("---------开始处理未更新的直属领导信息-------");
+            OrganizationUtil.dealNoFindMangerEmployeeData(noFindManagerMap);
+            log.writeLog("---------结束处理未更新的直属领导信息-------");
+            log.writeLog("----------海外 同步人员结束总人数：" + totalCount + ",新增人数：" + insertCount + ",更新人数：" + updateCount + ",跳过人数：" + skipCount + "------------");
+
+            //更新同步时间到中间表
+            String sql1 = "update uf_HRRestDate set sctbsj ='" + now + "' where jkm = '/dcopenedi/hrEmployee/pageByUpdateTime'";
+            rs.executeUpdate(sql1);
+
+        } catch (Exception e) {
+            log.writeLog("---------Exception------------:" + JavaUtil.getExceptionDetail(e));
+            e.printStackTrace();
+        }
+
+    }
+
+    /**
+     * 分页获取人员信息
+     * @param pages 页码
+     * @param today 日期
+     * @return 返回人员信息JSONArray数组
+     */
+    private JSONArray getUsersByPage(String pages, String today) {
+        return callInterface(pages,today,"ENG","",true);
+    }
+
+
+    /**
+     * 根据固定人员对应国家编码的信息
+     * @param pages 页码
+     * @param today 日期
+     * @param countryCode 国家编码
+     * @param code 编码
+     * @return 国家信息数组
+     */
+    private JSONArray getUserGUOJIA(String pages, String today, String countryCode, String code) {
+        return callInterface(pages,today,countryCode,code,false);
+    }
+
+    /**
+     * 调用人员信息接口
+     * @param pages 对应的页码
+     * @param today 数据日期
+     * @param countryCode 国家编码
+     * @param code 人员编码
+     * @param needUpdate 是否需要更新全局变量
+     * @return 人员信息JSONArray数组
+     */
+    private JSONArray callInterface(String pages, String today, String countryCode, String code,boolean needUpdate) {
+        int size = 5000;
+
+        JSONArray jsonArray = new JSONArray();
+
+        List<String> languageCds = new ArrayList<>();
+        languageCds.add(countryCode);
+
+        String s = OrganizationUtil.callEmployeeInterface(size,pages,today,languageCds,deptCountryCodesList,code);
+
+        if (!"".equals(s) && null != s) {
+            log.writeLog("---------------接口返回空成功");
+        } else {
+            log.writeLog("---------------接口返回空");
+
+            return jsonArray;
+        }
+
+        JSONObject jsonObject = JSONObject.parseObject(s);
+
+        if(needUpdate){
+            if (jsonObject.getInteger("code").equals(1)) {
+                JSONObject result = jsonObject.getJSONObject("data");
+                if (result.get("hasNextPage").toString().equals("true")) {
+                    current = result.get("maxPoint").toString();
+                } else {
+                    isNext = false;
+                }
+            } else {
+                isNext = false;
+            }
+        }
+
+        if (jsonObject.getInteger("code").equals(1)) {
+            JSONObject result = jsonObject.getJSONObject("data");
+            JSONArray records = result.getJSONArray("records");
+            jsonArray.addAll(records);
+        }
+
+        return jsonArray;
+    }
+
+
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/schedule/hrm/SyncHrmsubcompanyToOA.java b/src/main/youhong_ai_jitu_src/jntchina/schedule/hrm/SyncHrmsubcompanyToOA.java
new file mode 100644
index 0000000..a36d9fe
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/schedule/hrm/SyncHrmsubcompanyToOA.java
@@ -0,0 +1,319 @@
+package jntchina.schedule.hrm;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.engine.common.service.impl.ThemeServiceImpl;
+
+import jntchina.schedule.hrm.entity.DepartmentDto;
+import jntchina.util.HttpClientToJT;
+import selfdev.util.base.TimeCommonUtil;
+import selfdev.util.log.LogTool;
+import weaver.conn.RecordSet;
+import weaver.general.Util;
+import weaver.hrm.company.SubCompanyComInfo;
+
+import java.io.BufferedWriter;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * 定时将HR系统中的组织同步至OA的分部中
+ * @author Cyq
+ * @date 2021年6月17日 02:01:51
+ */
+public class SyncHrmsubcompanyToOA {
+
+    //分部编码和id  map
+    Map<String, String> map_subcompany_code_id = new HashMap<String, String>();
+    private LogTool log = new LogTool("/log/hrm/subcompany/", false);
+
+    /**
+     * 同步分部信息
+     */
+    public void execute(List<DepartmentDto> subcompanys ) {
+        map_subcompany_code_id = getSubCodeIdMap();
+        RecordSet rs = new RecordSet();
+        RecordSet rs2 = new RecordSet();
+        log.writeLog("----------开始同步分部，条数:" + subcompanys.size());
+        ThemeServiceImpl themeService = new ThemeServiceImpl();
+        // 处理公司同步逻辑
+        for (int i = 0; i < subcompanys.size(); i++) {
+            DepartmentDto row = subcompanys.get(i);
+            String countryCode = Util.null2String(row.getCountryCode());//国家编码
+            String departmentCode = Util.null2String(row.getDepartmentCode());//分部编码
+            String departmentName = Util.null2String(row.getDepartmentName());//分部全称
+//            String ShortName = Util.null2String(row.getDepartmentAbbreviation());//部门简称
+            String superiorDepartment = Util.null2String(row.getSuperiorDepartment());//上级分部编码
+//            String departmentOrder = Util.null2String(row.getDepartmentOrder());//排序
+            Integer canceled = Util.null2String(row.getStatus()).equals("3") ? 1 : null;//1 新增  2 修改  3作废
+            String sql = "";
+            //判断HR分部ID是否已经存在
+            String now = TimeCommonUtil.obtainDate(0);
+            String supsubcomid = "0";
+            if(map_subcompany_code_id.containsKey(superiorDepartment)){
+                supsubcomid = map_subcompany_code_id.get(superiorDepartment);
+            }
+
+//            //多语言
+//            departmentName = getDepartmentName("2018-04-23 00:00:00",departmentCode,departmentName);
+//            if("".equals(departmentName)){
+//                log.writeLog("--------------多语言为空code:"+departmentCode);
+//                departmentName = row.getDepartmentName();
+//            }
+
+            //只需要中文和英文
+            departmentName = "~`~`7 " + departmentName + "`~`8  `~`~";
+            log.writeLog("-------------英语刷为空："+departmentName);
+
+            //分部不存在则插入生成新分部
+            if (!map_subcompany_code_id.containsKey(departmentCode)) {
+            	 String subconpanyid_2="";
+                 //为解决同时手工执行点击了2次同步时多线程产生的问题，故还需要再次查询一遍数据库中是否已存在
+                 rs2.execute("select * from hrmsubcompany where outkey='"+departmentCode+"'");
+                 while(rs2.next()){
+                	 subconpanyid_2=Util.null2String(rs2.getString("id"));
+                 }
+                 //若已存在则不做其他操作,跳过
+                 if(!"".equals(subconpanyid_2)){
+                	 log.writeLog("分部ID【"+subconpanyid_2+"】、分部编码【"+departmentCode+"】、分部outkey【"+departmentCode+"】、已存在，当前跳过，进入下一次循环");
+                	 map_subcompany_code_id.put(departmentCode, subconpanyid_2);
+                	 continue;
+                 }
+                 
+                //新增数据,插入到hrmsubcompany表中
+                sql = "insert into hrmsubcompany (companyid,supsubcomid,subcompanyname,subcompanydesc,outkey,subcompanycode," +
+                        "canceled,created,creater,modified,modifier) values("
+                        + "'1',"
+                        + "'" + supsubcomid + "',"
+                        + "'" + departmentName + "',"
+                        + "'" + departmentName + "',"
+                        + "'" + departmentCode + "',"
+                        + "'" + departmentCode + "',"
+                        + canceled + ","
+                        + "to_date('" + now + "','yyyy-mm-dd hh24:mi:ss'),"
+                        + "'1',"
+                        + "to_date('" + now + "','yyyy-mm-dd hh24:mi:ss'),"
+                        + "'1')";
+                log.writeLog("插入分部表生成新数据sql--------->" + sql);
+                rs.execute(sql);
+
+                rs.execute("select max(id) from hrmsubcompany");
+                int maxSubcompanyid = 0;//新插入数据的分部ID
+                if (rs.next()) {
+                    maxSubcompanyid = rs.getInt(1);
+                }
+                //将新增加的分部加入至MAP中
+                map_subcompany_code_id.put(departmentCode, maxSubcompanyid + "");
+//                rs.execute("select max(id) from hrmsubcompany");
+//                //新增数据,插入到部门自定义表HrmDepartmentDefined中
+//                int maxSubID = 0;//新插入数据的部门ID
+//                if (rs.next()) {
+//                    maxSubID = rs.getInt(1);
+//                }
+                sql = "insert into hrmsubcompanyDefined(SUBCOMID,guojia,sfzy) " +
+                        "values('" + maxSubcompanyid + "','" + countryCode + "'," +
+                            "'" + row.getIsDirectSales()+ "')";
+                rs.execute(sql);
+                log.writeLog("插入分部自定义表中数据sql--------->" + sql);
+
+                log.writeLog("初始化分部菜单需要多久 start--------->" + TimeCommonUtil.obtainDate(0));
+                //初始化人员分部菜单
+                themeService.createSubCompanyMenu(Integer.valueOf(maxSubcompanyid),Integer.valueOf(supsubcomid));
+                log.writeLog("初始化分部菜单需要多久 end--------->" + TimeCommonUtil.obtainDate(0));
+                
+            } else {//分部存在则更新
+                String updateStr = "";
+                updateStr += !"0".equals(supsubcomid)?"supsubcomid= '"+ supsubcomid + "', ":"" ;
+                sql = "update hrmsubcompany set " +
+                        updateStr +
+                        "subcompanyname = '" + departmentName + "', " +
+                        "subcompanydesc = '" + departmentName + "', " +
+                        "subcompanycode = '" + departmentCode + "', " +
+                        "modified = to_date('" + now + "','yyyy-mm-dd hh24:mi:ss')," +
+                        "modifier = '1', " +
+                        "canceled = " + canceled + " " +
+                        "where outkey= '" + departmentCode + "'";
+                log.writeLog("更新分部表中数据sql--------->" + sql);
+                rs.execute(sql);
+
+                //处理分部自定义表
+                String subcomid = map_subcompany_code_id.get(departmentCode);
+                rs.execute("select SUBCOMID from hrmsubcompanyDefined where SUBCOMID='"+subcomid+"'");
+                if(rs.next()){
+                    sql = "update hrmsubcompanyDefined set "+
+                            "sfzy = '"+row.getIsDirectSales()+"', "+
+                            "guojia = '"+countryCode+"' "+
+                            "where SUBCOMID = '"+subcomid+"'";
+                    rs.execute(sql);
+                    log.writeLog("更新分部自定义表中数据sql--------->" + sql);
+
+                }else{
+                    sql = "insert into hrmsubcompanyDefined(SUBCOMID,guojia,sfzy) " +
+                            "values('" + subcomid + "','" + countryCode + "','" + row.getIsDirectSales()+ "')";
+                    rs.execute(sql);
+                    log.writeLog("插入分部自定义表中数据sql--------->" + sql);
+                }
+            }
+        }
+        SubCompanyComInfo sccif = new SubCompanyComInfo();
+        sccif.removeCompanyCache();
+        
+        map_subcompany_code_id.clear();
+        map_subcompany_code_id=null;
+        
+    }
+
+    public Map<String, String> getSubCodeIdMap() {
+        RecordSet rs = new RecordSet();
+        Map<String, String> map = new HashMap<>();
+        //rs.executeQuery("select subcompanycode,outkey,id from HrmSubCompany where outkey is not null  and (CANCELED!=1 or CANCELED is null)");
+        rs.executeQuery("select subcompanycode,outkey,id from HrmSubCompany where outkey is not null");
+        while (rs.next()) {
+            map.put(rs.getString("outkey"), rs.getString("id"));
+        }
+        return map;
+    }
+
+
+    public JSONArray getSubcompanys() {
+        int current = 1, size = 10000, pages = 2;
+        String url = HttpClientToJT.baseUrl + "/dcopenedi/hrCompany/pageByUpdateTime";
+        String token = HttpClientToJT.getToken();
+        Map<String, Object> params = new HashMap<>();
+//        LocalDateTime today_start = LocalDateTime.of(LocalDate.now(), LocalTime.MIN);//当天零点
+//        String td_st_str = today_start.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+//        params.put("updateTime", td_st_str);
+        params.put("updateTime", "2018-03-21 00:00:00");
+        params.put("current", current);
+        params.put("size", size);
+        String s = HttpClientToJT.sendGet(url, token, params);
+        JSONObject jsonObject = JSONObject.parseObject(s);
+        JSONArray jsonArray = new JSONArray();
+        if (jsonObject.getInteger("code").equals(1)) {
+            JSONObject result = jsonObject.getJSONObject("data");
+            pages = result.getInteger("pages");
+            JSONArray records = result.getJSONArray("records");
+            jsonArray.addAll(records);
+            for (int i = 2; i <= pages; i++) {
+                params.put("current", i);
+                String str = HttpClientToJT.sendGet(url, token, params);
+                JSONObject jsonObject1 = JSONObject.parseObject(str);
+                JSONObject jsonResult = jsonObject1.getJSONObject("data");
+                JSONArray records1 = jsonResult.getJSONArray("records");
+                jsonArray.addAll(records1);
+            }
+            Object directSales = jsonArray.stream().filter(item -> {
+                JSONObject itemJson = JSONObject.parseObject(JSON.toJSONString(item));
+                return "Y".equals(itemJson.getString("isDirectSales"));
+            }).collect(Collectors.toList());
+            jsonArray = JSONArray.parseArray(JSON.toJSONString(directSales));
+        }
+        System.out.println(jsonArray.toJSONString());
+        //将写入转化为流的形式
+//        writeFile(jsonArray);
+        return jsonArray;
+    }
+
+    private void writeFile(JSONArray jsonArray) {
+        BufferedWriter bw = null;
+        try {
+            bw = new BufferedWriter(new FileWriter("D:\\1.txt"));
+            //一次写一行
+            bw.write(jsonArray.toJSONString());
+            bw.newLine();  //换行用
+            //关闭流
+            bw.close();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        System.out.println("写入成功");
+    }
+
+    public static void main(String[] args) {
+        SyncHrmsubcompanyToOA ss= new SyncHrmsubcompanyToOA();
+        ss.getSubcompanys();
+    }
+
+
+    /**
+     * 获取多语言
+     *
+     * @param date           时间
+     * @param departmentCode 部门code
+     * @param deptName       部门中文名称
+     * @return 多语言名称
+     */
+    public String getDepartmentName(String date, String departmentCode, String deptName) {
+        String retName = "";
+        boolean existence = true;
+        String language = "ENG";
+        String cdIndex = "";
+        try {
+            String country = "";
+            // 日期  位置  国家  部门code
+            JSONArray ocDepartmentsGUOJIA = getOcDepartmentsGUOJIA(date, "1", language, departmentCode);
+            log.writeLog("--------------多语言是否拿到数据："+ocDepartmentsGUOJIA.size());
+            List<DepartmentDto> countryList = JSONArray.parseArray(ocDepartmentsGUOJIA.toJSONString(), DepartmentDto.class);
+            DepartmentDto countryDto = countryList.get(0);
+            //对应国家的语言名称（对应国家标签里面）
+            String countryDepartmentName = countryDto.getDepartmentName();
+            log.writeLog("---------------英语名称：" + countryDepartmentName);
+
+            //只需要中文和英文
+            retName = "~`~`7 " + deptName + "`~`8 " + countryDepartmentName + "`~`~";
+
+            log.writeLog("---------------多语言名称：" + retName);
+        } catch (Exception e) {
+            log.writeLog("--------------拿多语言报错了");
+            return deptName;
+        }
+        return retName;
+    }
+
+
+    /**
+     * 获取海外部门国家数据
+     *
+     * @param date  时间
+     * @param point
+     * @return
+     */
+    public JSONArray getOcDepartmentsGUOJIA(String date, String point, String guojia, String departmentCode) {
+        int current = 1, size = 5000, pages = 2;
+        String url = HttpClientToJT.baseUrl + "/dcopenedi/hrDept/pageNewHrDeptByUpdateTime";
+        String token = HttpClientToJT.getToken();
+        log.writeLog("-------token--------->" + token);
+        Map<String, Object> params = new HashMap<>();
+        List list1 = new ArrayList();
+        list1.add(guojia);
+        params.put("languageCds", list1);
+        params.put("updateTime", date);
+        params.put("point", point);
+        params.put("size", size);
+        params.put("deptCode", departmentCode);
+        log.writeLog("传入JSON--------------->" + JSON.toJSONString(params));
+        String s = HttpClientToJT.sendPost(url, token, JSONObject.toJSONString(params));
+        JSONObject jsonObject = JSONObject.parseObject(s);
+        JSONArray jsonArray = new JSONArray();
+
+        String code = Util.null2String(jsonObject.getString("code"));
+        log.writeLog("code------>" + code);
+        if ("1".equals(code)) {
+            JSONObject result = jsonObject.getJSONObject("data");
+            JSONArray records = result.getJSONArray("records");
+          //  Object hasNextPage = result.get("hasNextPage");
+            jsonArray.addAll(records);
+        }
+
+        return jsonArray;
+    }
+
+
+
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/schedule/hrm/SyncHrmsubcompanyToOAOC.java b/src/main/youhong_ai_jitu_src/jntchina/schedule/hrm/SyncHrmsubcompanyToOAOC.java
new file mode 100644
index 0000000..8bcb4c1
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/schedule/hrm/SyncHrmsubcompanyToOAOC.java
@@ -0,0 +1,409 @@
+package jntchina.schedule.hrm;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.api.integration.util.JavaUtil;
+import jntchina.schedule.hrm.entity.DepartmentDto;
+import jntchina.util.HttpClientToJT;
+import selfdev.util.base.TimeCommonUtil;
+import selfdev.util.log.LogTool;
+import weaver.conn.RecordSet;
+import weaver.general.Util;
+import weaver.hrm.company.SubCompanyComInfo;
+
+import java.io.BufferedWriter;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.format.DateTimeFormatter;
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * @author Cyq
+ * @date 2021年6月17日 02:01:51
+ */
+public class SyncHrmsubcompanyToOAOC {
+
+
+    Map<String,Object> subMap = new HashMap<>();
+
+    //分部编码和id  map
+    Map<String, String> map_subcompany_code_id = new HashMap<String, String>();
+    private LogTool log = new LogTool("/log/hrm/subcompanyOc/", false);
+
+    /**
+     * 同步分部信息
+     */
+    public List<DepartmentDto> execute(List<DepartmentDto> subcompanys, List<DepartmentDto> departments) {
+        log.writeLog("----------开始同步分部，条数:" + subcompanys.size());
+        try {
+            RecordSet rss = new RecordSet();
+//        for (int i = 0; i < departments.size(); i++) {
+//            DepartmentDto row = departments.get(i);
+//            String departmentCode = Util.null2String(row.getDepartmentCode());//部门编码
+//            String departmentName = Util.null2String(row.getDepartmentName());//部门全称
+//            String ShortName = Util.null2String(row.getDepartmentAbbreviation());//部门简称
+//            String superiorDepartment = Util.null2String(row.getSuperiorDepartment());//上级部门编码
+//            log.writeLog("----------部门编码:" + departmentCode);
+//
+//            rss.executeQuery("select * from HrmDepartment where outkey = ? ",departmentCode);
+//            if(!rss.next()){
+//                boolean executeUpdate = rss.executeUpdate("insert into HrmDepartment(Departmentname,outkey,uuid) values(?,?,?) ", departmentName, departmentCode, superiorDepartment);
+//                log.writeLog("----------先把部门同步进去:" + executeUpdate);
+//                log.writeLog("----------msg:" + rss.getExceptionMsg());
+//            }else{
+//                log.writeLog("----------这个部门已经放进去了不用新增:" + departmentName);
+//            }
+//        }
+
+            map_subcompany_code_id = getSubCodeIdMap();
+            RecordSet rs = new RecordSet();
+//        log.writeLog("----------同步分部源数据：" + JSON.toJSONString(subcompanys));
+            // 处理公司同步逻辑
+            for (int i = 0; i < subcompanys.size(); i++) {
+                DepartmentDto row = subcompanys.get(i);
+                String countryCode = Util.null2String(row.getCountryCode());//国家编码
+                String departmentCode = Util.null2String(row.getDepartmentCode());//部门编码
+                String departmentName = Util.null2String(row.getDepartmentName());//部门全称
+                String ShortName = Util.null2String(row.getDepartmentAbbreviation());//部门简称
+                String superiorDepartment = Util.null2String(row.getSuperiorDepartment());//上级部门编码
+                String departmentOrder = Util.null2String(row.getDepartmentOrder());//排序
+                Integer canceled = Util.null2String(row.getStatus()).equals("3") ? 1 : null;//1 新增  2 修改  3作废
+                String sql = "";
+                //判断HR分部ID是否已经存在
+                log.writeLog("----------------分部编码：" + departmentCode);
+                log.writeLog("----------------国家：" + countryCode);
+                log.writeLog("----------------分部名称：" + departmentName);
+                log.writeLog("----------------上级分部编码：" + superiorDepartment);
+                log.writeLog("----------------canceled：" + canceled);
+                String now = TimeCommonUtil.obtainDate(0);
+                String supsubcomid = "0";
+                if (map_subcompany_code_id.containsKey(superiorDepartment)) {
+                    supsubcomid = map_subcompany_code_id.get(superiorDepartment);
+                }
+                if("0".equals(supsubcomid) && !"".equals(superiorDepartment)){
+                    subMap.put(departmentCode,superiorDepartment);
+                }
+
+                //分部不存在则插入生成新分部
+                if (!map_subcompany_code_id.containsKey(departmentCode)) {
+                    //新增数据,插入到hrmsubcompany表中
+                    sql = "insert into hrmsubcompany (companyid,supsubcomid,subcompanyname,subcompanydesc,outkey," +
+                            "canceled,created,creater,modified,modifier) values("
+                            + "'1',"
+                            + "'" + supsubcomid + "',"
+                            + "'" + departmentName + "',"
+                            + "'" + departmentName + "',"
+                            + "'" + departmentCode + "',"
+                            + canceled + ","
+                            + "to_date('" + now + "','yyyy-mm-dd hh24:mi:ss'),"
+                            + "'1',"
+                            + "to_date('" + now + "','yyyy-mm-dd hh24:mi:ss'),"
+                            + "'1')";
+                    log.writeLog("插入分部表生成新数据sql--------->" + sql);
+                    rs.executeUpdate(sql);
+
+                    rs.executeQuery("select id from hrmsubcompany  outkey = ?",departmentCode);
+                    int maxSubcompanyid = 0;//新插入数据的分部ID
+                    if (rs.next()) {
+                        maxSubcompanyid = rs.getInt("id");
+                    }
+                    //将新增加的分部加入至MAP中
+                    map_subcompany_code_id.put(departmentCode, maxSubcompanyid + "");
+                    rs.executeQuery("select id from hrmsubcompany outkey = ?",departmentCode);
+                    //新增数据,插入到部门自定义表HrmDepartmentDefined中
+                    int maxSubID = 0;//新插入数据的部门ID
+                    if (rs.next()) {
+                        maxSubID = rs.getInt("id");
+                    }
+                    sql = "insert into hrmsubcompanyDefined(SUBCOMID,guojia,sfzy) " +
+                            "values('" + maxSubID + "','" + countryCode + "','" + row.getIsDirectSales() + "')";
+                    rs.executeUpdate(sql);
+                    log.writeLog("插入分部自定义表中数据sql--------->" + sql);
+
+                } else {//分部存在则更新
+                    String updateStr = "";
+                    updateStr += !"0".equals(supsubcomid) ? "supsubcomid= '" + supsubcomid + "', " : "";
+                    sql = "update hrmsubcompany set " +
+                            updateStr +
+                            "subcompanyname = '" + departmentName + "', " +
+                            "subcompanydesc = '" + departmentName + "', " +
+                            "outkey = '" + departmentCode + "', " +
+                            "modified = to_date('" + now + "','yyyy-mm-dd hh24:mi:ss')," +
+                            "modifier = '1', " +
+                            "canceled = " + canceled + " " +
+                            "where outkey= '" + departmentCode + "'";
+                    log.writeLog("更新分部表中数据sql--------->" + sql );
+                    rs.executeUpdate(sql);
+
+                    //处理分部自定义表
+                    String subcomid = map_subcompany_code_id.get(departmentCode);
+                    rs.execute("select SUBCOMID from hrmsubcompanyDefined where SUBCOMID='" + subcomid + "'");
+                    if (rs.next()) {
+                        sql = "update hrmsubcompanyDefined set " +
+                                " sfzy = '" + row.getIsDirectSales() + "' ," +
+                                " guojia = '" + countryCode + "' " +
+                                " where SUBCOMID = '" + subcomid + "'";
+                        boolean b = rs.executeUpdate(sql);
+                        log.writeLog("更新部门自定义表中数据sql--------->" + sql+" ；结果"+b);
+
+                    } else {
+                        sql = "insert into hrmsubcompanyDefined(SUBCOMID,guojia,sfzy) " +
+                                "values('" + subcomid + "','" + countryCode + "','" + row.getIsDirectSales() + "')";
+                        boolean b = rs.executeUpdate(sql);
+                        log.writeLog("插入分部自定义表中数据sql--------->" + sql+" ；结果"+b);
+                    }
+                }
+            }
+
+            for (int i = 0; i < subcompanys.size(); i++) {
+                log.writeLog("---------分部上级查询--------->");
+                DepartmentDto row = subcompanys.get(i);
+                String departmentCode = Util.null2String(row.getDepartmentCode());//部门编码
+                String superiorDepartment = Util.null2String(row.getSuperiorDepartment());//上级部门编码
+                String parId = "";
+                log.writeLog("---------分部编码：" + departmentCode);
+                log.writeLog("---------上级分部编码：" + superiorDepartment);
+                rs.executeQuery("select * from HRMSUBCOMPANY where outkey = ?", superiorDepartment);
+                if (rs.next()) {
+                    log.writeLog("---------在HRMSUBCOMPANY表查到了上级");
+                    parId = rs.getString("id");
+                }
+//            else{
+//                String now = TimeCommonUtil.obtainDate(0);
+//                rs.executeQuery("select * from HrmDepartment where outkey = ? ",superiorDepartment);
+//                if(rs.next()){
+//                    log.writeLog("---------在HrmDepartment表查到了上级");
+//                    String departmentname = rs.getString("Departmentname");
+//                    String parCode = rs.getString("uuid");
+//                    String outkey = rs.getString("outkey");
+//                    String supid = "0";
+//                    rs.executeQuery("select * from HRMSUBCOMPANY where outkey = ?",parCode);
+//                    if(rs.next()) {
+//                        supid = rs.getString("id");
+//                    }
+//                    String sql = "insert into hrmsubcompany (companyid,supsubcomid,subcompanyname,subcompanydesc,outkey," +
+//                            "created,creater,modified,modifier) values("
+//                            + "'1',"
+//                            + "'" + supid + "',"
+//                            + "'" + departmentname + "',"
+//                            + "'" + departmentname + "',"
+//                            + "'" + outkey + "',"
+//                            + "to_date('" + now + "','yyyy-mm-dd hh24:mi:ss'),"
+//                            + "'1',"
+//                            + "to_date('" + now + "','yyyy-mm-dd hh24:mi:ss'),"
+//                            + "'1')";
+//                    boolean executeUpdate = rs.executeUpdate(sql);
+//                    log.writeLog("部门插入分部表生成新数据sql--------->" + sql);
+//                    log.writeLog("sql:" + executeUpdate);
+//                    log.writeLog("msg:" + rs.getExceptionMsg());
+//                    //删除部门
+//                    rs.executeUpdate("delete from HrmDepartment where outkey = ? ",outkey);
+//                    //数据里面清理
+//                    for (int j = 0; j < departments.size(); j++) {
+//                        DepartmentDto deptRow = departments.get(j);
+//                        String deptCode = Util.null2String(deptRow.getDepartmentCode());//部门编码
+//                        String deptName = Util.null2String(deptRow.getDepartmentName());//部门编码
+//                        //如果部门的编码等于分部的上级就把数据库这个部门删掉 新增到分部
+//                        if(deptCode.equals(superiorDepartment)) {
+//                            departments.remove(j);
+//                            log.writeLog("去除部门的第"+j+"条数据名称:"+deptName);
+//                        }
+//                    }
+//                    rs.executeQuery("select * from HRMSUBCOMPANY where outkey = ?",superiorDepartment);
+//                    if(rs.next()){
+//                        parId = rs.getString("id");
+//                    }
+//                }
+//            }
+                log.writeLog("---------拿到上级id：" + parId);
+                if (!"".equals(parId)) {
+                    boolean executeUpdate = rs.executeUpdate("update HRMSUBCOMPANY set supsubcomid = ? where outkey = ? ", parId, departmentCode);
+                    log.writeLog("---------sql：" + executeUpdate);
+                    log.writeLog("---------msg：" + rs.getExceptionMsg());
+                } else {
+                    boolean executeUpdate = rs.executeUpdate("delete from HRMSUBCOMPANY where outkey = ? ", departmentCode);
+                    log.writeLog("---------找不到上级就删除：" + executeUpdate);
+                    log.writeLog("---------msg：" + rs.getExceptionMsg());
+                }
+            }
+
+            log.writeLog("----sta:"+subMap.size());
+            setSup();
+            log.writeLog("----end");
+
+
+            SubCompanyComInfo sccif = new SubCompanyComInfo();
+            sccif.removeCompanyCache();
+
+            map_subcompany_code_id.clear();
+            map_subcompany_code_id = null;
+
+        } catch (Exception e) {
+            log.writeLog("----------Exception:" + JavaUtil.getExceptionDetail(e));
+            e.printStackTrace();
+        }
+
+        return departments;
+    }
+
+    public Map<String, String> getSubCodeIdMap() {
+        RecordSet rs = new RecordSet();
+        Map<String, String> map = new HashMap<>();
+        rs.executeQuery("select subcompanycode,outkey,id from HrmSubCompany where outkey is not null  and (CANCELED!=1 or CANCELED is null)");
+        while (rs.next()) {
+            map.put(rs.getString("outkey"), rs.getString("id"));
+        }
+        return map;
+    }
+
+
+    public void setSup() {
+        RecordSet rss = new RecordSet();
+        Set keySet = subMap.keySet();
+        Iterator it = keySet.iterator();
+        while (it.hasNext()) {
+            try {
+                String subCode = (String) it.next();
+                String supCode = String.valueOf(subMap.get(subCode));
+                String SUPSubID = "";
+                rss.executeQuery("select * from hrmsubcompany where SUBCOMPANYCODE = ?", supCode);
+                if (rss.next()) {
+                    SUPSubID = rss.getString("id");
+                    rss.executeUpdate("update hrmsubcompany set SUPSUBCOMID = ? where SUBCOMPANYCODE = ? ", SUPSubID, subCode);
+                    it.remove();
+                }
+            } catch (Exception e) {
+                log.writeLog("--------------------Exception：" + JavaUtil.getExceptionDetail(e));
+            }
+        }
+
+    }
+
+
+    public JSONArray getSubcompanys() {
+        int current = 1, size = 10000, pages = 2;
+        String url = HttpClientToJT.baseUrl + "/dcopenedi/hrCompany/pageByUpdateTime";
+        String token = HttpClientToJT.getToken();
+        Map<String, Object> params = new HashMap<>();
+        LocalDateTime today_start = LocalDateTime.of(LocalDate.now(), LocalTime.MIN);//当天零点
+        String td_st_str = today_start.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+//        params.put("updateTime", td_st_str);
+        params.put("updateTime", "2018-03-21 00:00:00");
+        params.put("current", current);
+        params.put("size", size);
+        String s = HttpClientToJT.sendGet(url, token, params);
+        JSONObject jsonObject = JSONObject.parseObject(s);
+        JSONArray jsonArray = new JSONArray();
+        if (jsonObject.getInteger("code").equals(1)) {
+            JSONObject result = jsonObject.getJSONObject("data");
+            pages = result.getInteger("pages");
+            JSONArray records = result.getJSONArray("records");
+            jsonArray.addAll(records);
+            for (int i = 2; i <= pages; i++) {
+                params.put("current", i);
+                String str = HttpClientToJT.sendGet(url, token, params);
+                JSONObject jsonObject1 = JSONObject.parseObject(str);
+                JSONObject jsonResult = jsonObject1.getJSONObject("data");
+                JSONArray records1 = jsonResult.getJSONArray("records");
+                jsonArray.addAll(records1);
+            }
+            Object directSales = jsonArray.stream().filter(item -> {
+                JSONObject itemJson = JSONObject.parseObject(JSON.toJSONString(item));
+                return "Y".equals(itemJson.getString("isDirectSales"));
+            }).collect(Collectors.toList());
+            jsonArray = JSONArray.parseArray(JSON.toJSONString(directSales));
+        }
+        System.out.println(jsonArray.toJSONString());
+        //将写入转化为流的形式
+//        writeFile(jsonArray);
+        return jsonArray;
+    }
+
+    private void writeFile(JSONArray jsonArray) {
+        BufferedWriter bw = null;
+        try {
+            bw = new BufferedWriter(new FileWriter("D:\\1.txt"));
+            //一次写一行
+            bw.write(jsonArray.toJSONString());
+            bw.newLine();  //换行用
+            //关闭流
+            bw.close();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        System.out.println("写入成功");
+    }
+
+    public static void main(String[] args) {
+        SyncHrmsubcompanyToOA ss = new SyncHrmsubcompanyToOA();
+        ss.getSubcompanys();
+    }
+
+//    /**
+//     * 此方法废弃
+//     */
+//    public void executeInvail() {
+//        JSONArray subcompanys = getSubcompanys();
+//        map_subcompany_code_id = getSubCodeIdMap();
+//        RecordSet rs = new RecordSet();
+//        log.writeLog("----------开始同步分部，条数:"+subcompanys.size());
+//        log.writeLog("----------同步分部源数据："+subcompanys.toJSONString());
+//        // 处理公司同步逻辑
+//        for (int i = 0; i < subcompanys.size(); i++) {
+//            JSONObject sub = subcompanys.getJSONObject(i);
+//            String Code = Util.null2String(sub.getString("companyCode"));//分部编码
+//            String Name = Util.null2String(sub.getString("companyName"));//分部全称
+//            String ShortName = Util.null2String(sub.getString("companyAbbreviation"));//分部简称
+//            String companyLevelCode = Util.null2String(sub.getString("companyLevelCode"));//公司级别编码
+//            String companyLevelName = Util.null2String(sub.getString("companyLevelName"));//公司级别描述
+//            String countryCode = Util.null2String(sub.getString("countryCode"));//国家代码
+//            String countryName = Util.null2String(sub.getString("countryName"));//国家名称
+//            Integer canceled = Util.null2String(sub.getString("status"))== "3"?1:null;//1 新增  2 修改  3作废
+//            String sql = "";
+//            //判断HR分部ID是否已经存在
+//            String now = TimeCommonUtil.obtainDate(0);
+//            if (!map_subcompany_code_id.containsKey(Code)) {//分部不存在则插入生成新分部
+//                //新增数据,插入到hrmsubcompany表中
+//                sql = "insert into hrmsubcompany (subcompanyname,subcompanydesc,outkey," +
+//                        "tlevel,canceled,created,creater,modified,modifier,companyid) values("
+//                        + "'" + ShortName + "',"
+//                        + "'" + Name + "',"
+//                        + "'" + Code + "',"
+//                        + "'" + companyLevelCode + "',"
+//                        + canceled + ","
+//                        + "to_date('" + now + "','yyyy-mm-dd hh24:mi:ss'),"
+//                        + "'1',"
+//                        + "to_date('" + now + "','yyyy-mm-dd hh24:mi:ss'),"
+//                        + "'1',"
+//                        + "'1')";
+//                log.writeLog("插入分部表生成新数据sql--------->" + sql);
+//                rs.execute(sql);
+//
+//                rs.execute("select max(id) from hrmsubcompany");
+//                int maxSubcompanyid = 0;//新插入数据的分部ID
+//                if (rs.next()) {
+//                    maxSubcompanyid = rs.getInt(1);
+//                }
+//                //将新增加的分部加入至MAP中
+//                map_subcompany_code_id.put(Code, maxSubcompanyid + "");
+//
+//            } else {//分部存在则更新
+//                sql = "update hrmsubcompany set " +
+//                        "subcompanyname = '" + ShortName + "', " +
+//                        "subcompanydesc = '" + Name + "', " +
+//                        "outkey = '" + Code + "', " +
+//                        "modified = to_date('" + now + "','yyyy-mm-dd hh24:mi:ss')," +
+//                        "modifier = '1', "+
+//                        "canceled = " + canceled + " "+
+//                        "where outkey= '" + Code + "'";
+//                log.writeLog("更新分部表中数据sql--------->" + sql);
+//                rs.execute(sql);
+//            }
+//        }
+//    }
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/schedule/hrm/SyncJTBaseData.java b/src/main/youhong_ai_jitu_src/jntchina/schedule/hrm/SyncJTBaseData.java
new file mode 100644
index 0000000..39d1242
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/schedule/hrm/SyncJTBaseData.java
@@ -0,0 +1,165 @@
+package jntchina.schedule.hrm;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.weaver.formmodel.util.DateHelper;
+import com.weaver.general.Util;
+
+import jntchina.util.HttpClientToJT;
+import jntchina.util.JTHrmApiUtil;
+import selfdev.util.base.BaseUtil;
+import selfdev.util.log.LogTool;
+import weaver.conn.RecordSet;
+import weaver.formmode.data.ModeDataIdUpdate;
+import weaver.formmode.setup.ModeRightInfo;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 同步基础数据到建模表里
+ */
+public class SyncJTBaseData {
+
+    private LogTool log = new LogTool("/log/hrm/baseData/", false);
+
+    public String syncBaseData(){
+        RecordSet rs1 = new RecordSet();
+        RecordSet rs = new RecordSet();
+        Map<String, List<String>> baseDataMap =getBaseDataMap();
+        //log.writeLog("---已有字典:"+JSON.toJSONString(baseDataMap));
+        //查询建模表维护了需要同步哪些基础数据
+        String sql = "select FIELDNAME,zdms from uf_fieldname";
+        rs.executeQuery(sql);
+        String token = HttpClientToJT.getToken();
+        //根据表面查询modeid
+        int modelId = Integer.parseInt(Util.null2o(BaseUtil.getBaseInfoByParm("id", "modeinfo", "1", "1", 
+        		" and formid in (select id from workflow_bill where tablename='uf_fieldvalue')")));
+        while (rs.next()){
+            //基础数据唯一标识字段名
+            String fieldname_s=rs.getString("FIELDNAME");
+            //Map<String, List<String>> baseDataMap = BaseUtil.getMapKeyValueInfoByParm("uf_fieldvalue","","FIELDVALUE","XLADLONGNAME");
+            Map<String,String> paramMap = new HashMap<>();
+            paramMap.put("LANGUAGE_CD", "ZHS");
+            paramMap.put("FIELDNAME", fieldname_s);
+            log.writeLog("获取【"+fieldname_s+"】基础数据传入参数paramMap------->"+JSON.toJSONString(paramMap));
+            //调用接口获取数据
+            JSONArray jsonArray = JTHrmApiUtil.translateValue(token, JSON.toJSONString(paramMap));
+            log.writeLog("获取【"+fieldname_s+"】基础数据返回结果--->"+JSON.toJSONString(jsonArray));
+            for (int i = 0; i < jsonArray.size(); i++) {
+                JSONObject jsonObject = jsonArray.getJSONObject(i);
+                String fieldvalue = jsonObject.getString("FIELDVALUE");//字段值
+                String fieldname = jsonObject.getString("FIELDNAME");//基础数据唯一标识字段名
+                String xlADLONGNAME = jsonObject.getString("XlADLONGNAME");//字段值
+                String xladshortname = jsonObject.getString("XLADSHORTNAME");//字段值
+                String descr1 = jsonObject.getString("DESCR1");
+                String descr2 = jsonObject.getString("DESCR2");
+                String descr3 = jsonObject.getString("DESCR3");
+                String descr4 = jsonObject.getString("DESCR4");
+                String descr5 = jsonObject.getString("DESCR5");
+                String descr6 = jsonObject.getString("DESCR6");
+
+
+                if(baseDataMap.containsKey(fieldname)){
+                    //不存在
+                    if(!baseDataMap.get(fieldname).contains(fieldvalue)){
+                        int id = ModeDataIdUpdate.getInstance().getModeDataNewIdByUUID("uf_fieldvalue", modelId, 1,  1, DateHelper.getCurrentDate(), DateHelper.getCurrentTime());
+                        ModeRightInfo ModeRightInfo = new ModeRightInfo();
+                        ModeRightInfo.setNewRight(true);
+                        // 新建的时候添加共享
+                        ModeRightInfo.editModeDataShare(1, modelId, id);
+                        // 新建的时候添加文档共享
+                        ModeRightInfo.addDocShare(1, modelId, id);
+                        sql = "update uf_fieldvalue set " +
+                                "FIELDVALUE = '" + fieldvalue + "', " +
+                                "XlADLONGNAME = '" + xlADLONGNAME + "', " +
+                                "FIELDNAME = '" + fieldname + "', " +
+                                "XLADSHORTNAME = '" + xladshortname + "', " +
+                                "DESCR1 = '" + descr1 + "', " +
+                                "DESCR2 = '" + descr2 + "', " +
+                                "DESCR3 = '" + descr3 + "', " +
+                                "DESCR4 = '" + descr4 + "', " +
+                                "DESCR5 = '" + descr5 + "', " +
+                                "DESCR6 = '" + descr6 + "' "+
+                                "where id = " +id ;
+                        log.writeLog("-----------基础数据新增sql:"+sql);
+                        rs1.executeUpdate(sql);
+                        //加入字典
+                        List<String> datas = baseDataMap.get(fieldname);
+                        datas.add(fieldvalue);
+                        baseDataMap.put(fieldname,datas);
+                    }else{
+                        //已存在，则更新
+                        sql = "update uf_fieldvalue set " +
+                                "XlADLONGNAME = '" + xlADLONGNAME + "', " +
+                                "XLADSHORTNAME = '" + xladshortname + "', " +
+                                "DESCR1 = '" + descr1 + "', " +
+                                "DESCR2 = '" + descr2 + "', " +
+                                "DESCR3 = '" + descr3 + "', " +
+                                "DESCR4 = '" + descr4 + "', " +
+                                "DESCR5 = '" + descr5 + "', " +
+                                "DESCR6 = '" + descr6 + "' "+
+                                "where FIELDVALUE = '" + fieldvalue + "' and FIELDNAME = '" + fieldname + "'";
+                        log.writeLog("-----------基础数据更新sql:"+sql);
+                        rs1.executeUpdate(sql);
+                    }
+                }else{
+                    // 建模插入数据
+                    int id = ModeDataIdUpdate.getInstance().getModeDataNewIdByUUID("uf_fieldvalue", modelId, 1,  1, DateHelper.getCurrentDate(), DateHelper.getCurrentTime());
+                    ModeRightInfo ModeRightInfo = new ModeRightInfo();
+                    ModeRightInfo.setNewRight(true);
+                    // 新建的时候添加共享
+                    ModeRightInfo.editModeDataShare(1, modelId, id);
+                    // 新建的时候添加文档共享
+                    ModeRightInfo.addDocShare(1, modelId, id);
+                    sql = "update uf_fieldvalue set " +
+                            "FIELDVALUE = '" + fieldvalue + "', " +
+                            "XlADLONGNAME = '" + xlADLONGNAME + "', " +
+                            "FIELDNAME = '" + fieldname + "', " +
+                            "XLADSHORTNAME = '" + xladshortname + "', " +
+                            "DESCR1 = '" + descr1 + "', " +
+                            "DESCR2 = '" + descr2 + "', " +
+                            "DESCR3 = '" + descr3 + "', " +
+                            "DESCR4 = '" + descr4 + "', " +
+                            "DESCR5 = '" + descr5 + "', " +
+                            "DESCR6 = '" + descr6 + "' "+
+                            "where id = " +id ;
+                    log.writeLog("-----------基础数据新增sql:"+sql);
+                    rs1.executeUpdate(sql);
+                    //加入字典
+                    List<String> datas = new ArrayList<>();
+                    datas.add(fieldvalue);
+                    baseDataMap.put(fieldname,datas);
+                }
+            }
+        }
+
+        return "success";
+    }
+
+
+
+    public Map<String,List<String>> getBaseDataMap(){
+        RecordSet rs = new RecordSet();
+        Map<String,List<String>> map = new HashMap<>();
+        String sql = "select FIELDVALUE,FIELDNAME from uf_fieldvalue";
+        rs.executeQuery(sql);
+        while (rs.next()){
+            if(map.containsKey(rs.getString("FIELDNAME"))){
+                List<String> list = map.get(rs.getString("FIELDNAME"));
+                list.add(rs.getString("FIELDVALUE"));
+                map.put(rs.getString("FIELDNAME"),list);
+            }else{
+                List<String> datas = new ArrayList<>();
+                datas.add(rs.getString("FIELDVALUE"));
+                map.put(rs.getString("FIELDNAME"),datas );
+            }
+
+        }
+        return map;
+    }
+
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/schedule/hrm/aiyh_synccompany/SyncOtherHrmCompanyMapper.java b/src/main/youhong_ai_jitu_src/jntchina/schedule/hrm/aiyh_synccompany/SyncOtherHrmCompanyMapper.java
new file mode 100644
index 0000000..9c77635
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/schedule/hrm/aiyh_synccompany/SyncOtherHrmCompanyMapper.java
@@ -0,0 +1,34 @@
+package jntchina.schedule.hrm.aiyh_synccompany;
+
+import aiyh.utils.annotation.recordset.Delete;
+import aiyh.utils.annotation.recordset.ParamMapper;
+import aiyh.utils.annotation.recordset.Select;
+import aiyh.utils.annotation.recordset.SqlMapper;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <h1>同步公司信息查询数据库文件</h1>
+ * <p>create 2022/7/7 16:19</p>
+ *
+ * @author ayh
+ */
+
+@SqlMapper
+public interface SyncOtherHrmCompanyMapper {
+    /**
+     * <h2>查询已经存在的公司信息数据</h2>
+     * @param tableName 查询的建模表
+     * @return 已存在的公司 id -> value , code -> code
+     */
+    @Select("select company_code,id from $t{table}")
+    List<Map<String, String>> selectExitsCompanyCodeList(@ParamMapper("table") String tableName);
+
+    /**
+     * <h2>删除由于批量更新或批量插入时，只生成ID未能正确插入的数据的记录，避免造成过多的冗余数据</h2>
+     * @param tableName 表名
+     */
+    @Delete("delete from $t{table} where company_code is null or company_code = ''")
+    void deleteRedundancyData(@ParamMapper("table") String tableName);
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/schedule/hrm/aiyh_synccompany/SyncOtherHrmcompanyToOA.java b/src/main/youhong_ai_jitu_src/jntchina/schedule/hrm/aiyh_synccompany/SyncOtherHrmcompanyToOA.java
new file mode 100644
index 0000000..901dfb0
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/schedule/hrm/aiyh_synccompany/SyncOtherHrmcompanyToOA.java
@@ -0,0 +1,536 @@
+package jntchina.schedule.hrm.aiyh_synccompany;
+
+import aiyh.utils.Util;
+import aiyh.utils.annotation.ActionDesc;
+import aiyh.utils.annotation.PrintParamMark;
+import aiyh.utils.annotation.RequiredMark;
+import aiyh.utils.excention.CustomerException;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.google.common.base.Strings;
+import jntchina.schedule.hrm.entity.CompanyOtherDto;
+import jntchina.util.HttpClientToJT;
+import lombok.AccessLevel;
+import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
+import org.apache.log4j.Logger;
+import weaver.conn.RecordSet;
+import weaver.file.Prop;
+import weaver.interfaces.schedule.BaseCronJob;
+
+import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Future;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+/**
+ * <h1>同步除Cyq过滤添加到uf_hrmcompany建模外的其他数据到其他建模</h1>
+ * <p>create 2022/7/7 15:11</p>
+ *
+ * @author ayh
+ */
+
+@Data
+@ActionDesc(value = "同步海外公司数据定时任务", author = "aiyh")
+public class SyncOtherHrmcompanyToOA extends BaseCronJob {
+
+    @RequiredMark("modeId 参数必填，请检查必填配置是否配置正确。")
+    @PrintParamMark
+    private String modeId;
+
+    @RequiredMark("tableName 参数必填，请检查必填配置是否配置正确。")
+    @PrintParamMark
+    private String tableName;
+
+    private String pageSize;
+
+    private static String ENG = "ENG";
+
+    private static String ZHS = "ZHS";
+
+    private String mode = "pro";
+
+    private final SyncOtherHrmCompanyMapper mapper = Util.getMapper(SyncOtherHrmCompanyMapper.class);
+
+    @Getter(AccessLevel.NONE)
+    @Setter(AccessLevel.NONE)
+    private Map<String, String> exitsCompanyCode;
+
+    @Getter(AccessLevel.NONE)
+    @Setter(AccessLevel.NONE)
+    private static final ThreadLocal<String> TASK_ID_MAP = new ThreadLocal<>();
+
+    @Getter(AccessLevel.NONE)
+    @Setter(AccessLevel.NONE)
+    private final Logger log = Util.getLogger();
+
+    @Override
+    public void execute() {
+        log.info(Util.logStr("start sync companies data!"));
+        long startTime = System.currentTimeMillis();
+        try {
+            Util.verifyRequiredField(this);
+        } catch (Exception e) {
+            throw new CustomerException("参数验证未通过！" + e.getMessage());
+        }
+        try {
+            JSONArray companies = this.getCompanies();
+            List<CompanyOtherDto> companyDtoList = JSONArray.parseArray(companies.toJSONString(), CompanyOtherDto.class);
+            exitsCompanyCode = this.getExitsCompanyCode();
+            List<CompanyOtherDto> upateList = new ArrayList<>();
+            List<CompanyOtherDto> insertList = new ArrayList<>();
+            for (CompanyOtherDto companyDto : companyDtoList) {
+                if (exitsCompanyCode.containsKey(companyDto.getCompanyCode())) {
+//                存在数据，需要更新数据到建模表
+                    companyDto.setId(String.valueOf(exitsCompanyCode.get(companyDto.getCompanyCode())));
+                    upateList.add(companyDto);
+                } else {
+                    insertList.add(companyDto);
+                }
+            }
+            this.updateDateToModeTableAll(upateList);
+            this.insertDateToModeTableByAll(insertList);
+            log.info(Util.logStr("sync companies data finish! update data [{}], insert data [{}], all data [{}], use time [{}]ms",
+                    upateList.size(), insertList.size(), companyDtoList.size(), System.currentTimeMillis() - startTime));
+        } catch (Exception e) {
+            log.error("sync companies data error, error message is :" + Util.getErrString(e));
+            throw e;
+        }
+    }
+
+
+    /**
+     * 将建模表中没有的数据全部插入到建模表中
+     *
+     * @param listData 带插入数据
+     */
+    private void insertDateToModeTableByAll(List<CompanyOtherDto> listData) {
+        if (listData.size() > 0) {
+            long startTime = System.currentTimeMillis();
+            List<Future<?>> futureList = new ArrayList<>();
+            Set<String> repetitionCheckSet = new HashSet<>(listData.size());
+            List<CompanyOtherDto> repetitionCompanies = new ArrayList<>(listData.size());
+            Map<String, List<CompanyOtherDto>> groupCompaniesMap = listData.stream()
+                    .peek(item -> {
+                        if (Strings.isNullOrEmpty(item.getLanguageCd())) {
+                            item.setLanguageCd(SyncOtherHrmcompanyToOA.ENG);
+                        }
+                    })
+                    .collect(Collectors.groupingBy(CompanyOtherDto::getLanguageCd));
+            List<CompanyOtherDto> companyDtoZhsList = groupCompaniesMap.get(SyncOtherHrmcompanyToOA.ZHS);
+            List<CompanyOtherDto> companyDtoEngList = groupCompaniesMap.get(SyncOtherHrmcompanyToOA.ENG);
+            // 一次1000条
+            int batchSize = 3_000;
+//            计算需要进行几次拆分，最低拆分一次
+            int limit = (listData.size() + batchSize - 1) / batchSize;
+//            每次加1，共执行limit次，即从 0 -> limit ，并将得到的数据遍历
+//            type 0 表示英文，其他表示中文
+            executeInsert(futureList, repetitionCheckSet, repetitionCompanies, companyDtoZhsList, batchSize, limit, 1);
+            futureList.clear();
+            executeInsert(futureList, repetitionCheckSet, repetitionCompanies, companyDtoEngList, batchSize, limit, 0);
+            if (!repetitionCompanies.isEmpty()) {
+//            等待其他子线程执行完，将重复数据重新添加
+//            将数据id放入到公司对象中，并更具中英文分组
+                SyncOtherHrmcompanyToOA.TASK_ID_MAP.set(UUID.randomUUID().toString());
+                Map<String, List<CompanyOtherDto>> groupByLanguage = repetitionCompanies.stream().
+                        peek(item -> item.setId(this.exitsCompanyCode.get(item.getCompanyCode())))
+                        .collect(Collectors.groupingBy(CompanyOtherDto::getLanguageCd));
+                this.updateDateToModeTableByGroup(groupByLanguage);
+            }
+            log.info(Util.logStr("insert companies data finish ! insert [{}] data, use time [{}]ms",
+                    listData.size() - repetitionCompanies.size(), System.currentTimeMillis() - startTime));
+        }
+    }
+
+    /**
+     * <h2>将数据分批次使用多线程插入到建模表中</h2>
+     *
+     * @param futureList          任务返回对象列表
+     * @param repetitionCheckSet  重复检验set
+     * @param repetitionCompanies 重复数据公司
+     * @param companyDtoList      分组待插入公司
+     * @param batchSize           分批次大小
+     * @param limit               分批次次数
+     */
+    private void executeInsert(List<Future<?>> futureList, Set<String> repetitionCheckSet, List<CompanyOtherDto> repetitionCompanies,
+                               List<CompanyOtherDto> companyDtoList, int batchSize, int limit,
+                               int type) {
+        if (null != companyDtoList && !companyDtoList.isEmpty()) {
+            Stream.iterate(0, n -> n + 1).limit(limit).forEach(a -> {
+                List<CompanyOtherDto> batchEngList = companyDtoList.stream().peek(item -> {
+                            if (Strings.isNullOrEmpty(item.getLanguageCd())) {
+                                item.setLanguageCd(SyncOtherHrmcompanyToOA.ENG);
+                            }
+                        }).skip((long) a * batchSize)
+                        .limit(batchSize)
+                        .filter(item -> {
+//                            判断当前集合中是否与之前的数据重复
+                            boolean contains = repetitionCheckSet.contains(item.getCompanyCode());
+                            if (contains) {
+//                                如果重复，添加到重复集合中，等最后在处理
+                                repetitionCompanies.add(item);
+                            } else {
+//                                不重复，将数据添加到重复检查集合中
+                                repetitionCheckSet.add(item.getCompanyCode());
+                            }
+                            return !contains;
+                        })
+                        .collect(Collectors.toList());
+                Future<?> submit = Util.threadPool.submit(() -> insertDateToModeTableByBatch(batchEngList, type));
+                futureList.add(submit);
+            });
+            for (Future<?> future : futureList) {
+                try {
+                    future.get();
+                } catch (InterruptedException | ExecutionException e) {
+                    log.error(Util.logStr("main thread wait other insert thread error!"));
+                }
+            }
+
+        }
+    }
+
+
+    /**
+     * 插入同步的公司信息数据，通过异步线程插入，提高插入效率。
+     *
+     * @param batchList 批量插入数据参数
+     */
+    private void insertDateToModeTableByBatch(List<CompanyOtherDto> batchList, int type) {
+        String taskId = UUID.randomUUID().toString();
+        log.info(Util.logStr("insert task start run, the taskId is [{}]", taskId));
+        SyncOtherHrmcompanyToOA.TASK_ID_MAP.set(taskId);
+//        将新增数据添加到缓存中
+        for (CompanyOtherDto companyOtherDto : batchList) {
+            companyOtherDto.setId(String.valueOf(Util.getModeDataId(this.tableName, Integer.parseInt(modeId), 1)));
+            exitsCompanyCode.put(companyOtherDto.getCompanyCode(), companyOtherDto.getId());
+        }
+        insertDateToModeTableByGroup(batchList, type);
+    }
+
+
+    private void insertDateToModeTableByGroup(List<CompanyOtherDto> companyDtoEngList, int type) {
+        long startTime = System.currentTimeMillis();
+        String taskId = SyncOtherHrmcompanyToOA.TASK_ID_MAP.get();
+        SyncOtherHrmcompanyToOA.TASK_ID_MAP.remove();
+        log.info(Util.logStr("taskId [{}] is running!", taskId));
+        RecordSet recordSet = new RecordSet();
+        // List<CompanyOtherDto> companyDtoZhsList = insertOrUpdateZhsCompanies(groupByLanguage, recordSet);
+//        获取英文分组
+//         List<CompanyOtherDto> companyDtoEngList = groupByLanguage.get(SyncOtherHrmcompanyToOA.ENG);
+        if (null != companyDtoEngList && !companyDtoEngList.isEmpty()) {
+//        获取英文分组中的建模id
+            List<Integer> companiesEngIdList = companyDtoEngList.stream().map(CompanyOtherDto::getId).map(Integer::parseInt).collect(Collectors.toList());
+//        将英文分组转为list，组装sql参数
+            List<List> companyDtoEngSqlArgs = companyDtoEngList.stream().map(this::companyDtoToList).collect(Collectors.toList());
+            String engSql = getInsertSql(type);
+            boolean b = recordSet.executeBatchSql(engSql, companyDtoEngSqlArgs);
+            if (!b) {
+                mapper.deleteRedundancyData(tableName);
+            }
+            Util.rebuildModeDataShareByAsyncList(1, Integer.parseInt((modeId)), companiesEngIdList);
+        }
+
+        log.info(Util.logStr("taskId [{}] execute finish! sync company datas [{}], use time [{}]",
+                taskId, (companyDtoEngList == null ? 0 : companyDtoEngList.size()),
+                System.currentTimeMillis() - startTime));
+    }
+
+    private String getInsertSql(int type) {
+        if (type == 0) {
+            // 英文
+            return "update " + tableName + " set " +
+                    "language_cd = ?, " +
+                    "company_code = ?, " +
+                    "company_english_name = ?, " +
+                    "company_abbreviation = ?, " +
+                    "country_code = ?, " +
+                    "country_name = ?, " +
+                    "company_level_code = ?, " +
+                    "company_level_name = ?, " +
+                    "is_direct_sales = ?, " +
+                    "unify_social_credit_code = ?, " +
+                    "status = ?, " +
+                    "modedatamodifier = ?," +
+                    "modedatamodifydatetime = ? " +
+                    "where id = ?";
+        } else {
+            return "update " + tableName + " set " +
+                    "language_cd = ?, " +
+                    "company_code = ?, " +
+                    "company_name = ?, " +
+                    "company_abbreviation = ?, " +
+                    "country_code = ?, " +
+                    "country_name = ?, " +
+                    "company_level_code = ?, " +
+                    "company_level_name = ?, " +
+                    "is_direct_sales = ?, " +
+                    "unify_social_credit_code = ?, " +
+                    "status = ?, " +
+                    "modedatamodifier = ?," +
+                    "modedatamodifydatetime = ? " +
+                    "where id = ?";
+        }
+    }
+
+    /**
+     * <h2>更新建模表中的数据</h2>
+     *
+     * @param listData 待更新的数据
+     */
+    private void updateDateToModeTableAll(List<CompanyOtherDto> listData) {
+        if (listData.size() > 0) {
+            long startTime = System.currentTimeMillis();
+            List<Future<?>> futureList = new ArrayList<>();
+            // 一次500条
+            int batchSize = 500;
+//            计算需要进行几次拆分，最低拆分一次
+            int limit = (listData.size() + batchSize - 1) / batchSize;
+            Stream.iterate(0, n -> n + 1).limit(limit).forEach(a -> {
+                Map<String, List<CompanyOtherDto>> groupByLanguage = listData.stream().skip(a * batchSize)
+                        .limit(batchSize)
+                        .peek(item -> {
+                            if (Strings.isNullOrEmpty(item.getLanguageCd())) {
+                                item.setLanguageCd(SyncOtherHrmcompanyToOA.ENG);
+                            }
+                        })
+                        .collect(Collectors.groupingBy(CompanyOtherDto::getLanguageCd));
+                Future<?> submit = Util.threadPool.submit(() -> {
+                    String taskId = UUID.randomUUID().toString();
+                    SyncOtherHrmcompanyToOA.TASK_ID_MAP.set(taskId);
+                    log.info(Util.logStr("update task start run, the taskId id [{}]", taskId));
+                    updateDateToModeTableByGroup(groupByLanguage);
+                });
+                futureList.add(submit);
+            });
+            for (Future<?> future : futureList) {
+                try {
+                    future.get();
+                } catch (InterruptedException | ExecutionException e) {
+                    log.error(Util.logStr("main thread wait other insert thread error!"));
+                }
+            }
+            log.info(Util.logStr("update companies data finish ! update [{}] data, use time [{}]ms",
+                    listData.size(), System.currentTimeMillis() - startTime));
+        }
+    }
+
+    /**
+     * <h2>根据中英文分组更新建模数据</h2>
+     *
+     * @param groupByLanguage 中英文分组数据
+     */
+    private void updateDateToModeTableByGroup(Map<String, List<CompanyOtherDto>> groupByLanguage) {
+        long startTime = System.currentTimeMillis();
+        String taskId = SyncOtherHrmcompanyToOA.TASK_ID_MAP.get();
+        SyncOtherHrmcompanyToOA.TASK_ID_MAP.remove();
+        log.info(Util.logStr("taskId [{}] is running!", taskId));
+        RecordSet recordSet = new RecordSet();
+//        中文分组
+        List<CompanyOtherDto> companyDtoZhsList = groupByLanguage.get(SyncOtherHrmcompanyToOA.ZHS);
+//        获取英文分组
+        List<CompanyOtherDto> companyDtoEngList = groupByLanguage.get(SyncOtherHrmcompanyToOA.ENG);
+        if (null != companyDtoEngList && !companyDtoEngList.isEmpty()) {
+//        获取英文分组中的建模id
+            List<Integer> companiesEngIdList = companyDtoEngList.stream().map(CompanyOtherDto::getId).map(Integer::parseInt).collect(Collectors.toList());
+//        将英文分组转为list，组装sql参数
+            List<List> companyDtoEngSqlArgs = companyDtoEngList.stream().map(this::companyDtoToListByEn).collect(Collectors.toList());
+            String engSql = "update " + tableName + " set " +
+                    "company_english_name = ?, " +
+                    "modedatamodifier = ?," +
+                    "modedatamodifydatetime = ? " +
+                    "where id = ?";
+            boolean b = recordSet.executeBatchSql(engSql, companyDtoEngSqlArgs);
+            if (!b) {
+                mapper.deleteRedundancyData(tableName);
+            }
+            Util.rebuildModeDataShareByAsyncList(1, Integer.parseInt((modeId)), companiesEngIdList);
+        }
+        if (null != companyDtoZhsList && !companyDtoZhsList.isEmpty()) {
+            // insertOrUpdateZhsCompanies(groupByLanguage, recordSet);
+//      获取中文分组数据建模id
+            List<Integer> companiesZshIdList = companyDtoZhsList.stream().map(CompanyOtherDto::getId).map(Integer::parseInt).collect(Collectors.toList());
+//        将中文分组数据转换为list，用于批量修改数据的sql参数
+            List<List> companyDtoZhsSqlArgs = companyDtoZhsList.stream().map(this::companyDtoToList).collect(Collectors.toList());
+            String zshSql = "update " + tableName + " set " +
+                    "language_cd = ?, " +
+                    "company_code = ?, " +
+                    "company_name = ?, " +
+                    "company_abbreviation = ?, " +
+                    "country_code = ?, " +
+                    "country_name = ?, " +
+                    "company_level_code = ?, " +
+                    "company_level_name = ?, " +
+                    "is_direct_sales = ?, " +
+                    "unify_social_credit_code = ?, " +
+                    "status = ?, " +
+                    "modedatamodifier = ?," +
+                    "modedatamodifydatetime = ? " +
+                    "where id = ?";
+
+            boolean b = recordSet.executeBatchSql(zshSql, companyDtoZhsSqlArgs);
+            if (!b) {
+                mapper.deleteRedundancyData(tableName);
+            }
+            Util.rebuildModeDataShareByAsyncList(1, Integer.parseInt((modeId)), companiesZshIdList);
+        }
+        log.info(Util.logStr("taskId [{}] execute finish! sync company datas [{}], use time [{}]",
+                taskId, (companyDtoZhsList == null ? 0 : companyDtoZhsList.size()) + (companyDtoEngList == null ? 0 : companyDtoEngList.size()),
+                System.currentTimeMillis() - startTime));
+    }
+
+    /**
+     * <h2>将实体类转换为list 用于批量插入的参数，切记字段顺序不可乱，否则字段无法一一对应</h2>
+     *
+     * @param companyDto 公司信息实体
+     * @return list
+     */
+    private List<Object> companyDtoToList(CompanyOtherDto companyDto) {
+        List<Object> list = new ArrayList<>(16);
+//        语言字段
+        list.add(companyDto.getLanguageCd());
+        list.add(companyDto.getCompanyCode());
+        list.add(companyDto.getCompanyName());
+        list.add(companyDto.getCompanyAbbreviation());
+        list.add(companyDto.getCountryCode());
+        list.add(companyDto.getCountryName());
+        list.add(companyDto.getCompanyLevelCode());
+        list.add(companyDto.getCompanyLevelName());
+        list.add(companyDto.getIsDirectSales());
+        list.add(companyDto.getUnifySocialCreditCode());
+        list.add(companyDto.getStatus());
+        list.add(1);
+        list.add(Util.getTime("yyyy-MM-dd HH:mm:ss"));
+        list.add(companyDto.getId());
+        return list;
+    }
+
+    /**
+     * <h2>将实体类转化为list，用于批量更新英文的公司名称</h2>
+     *
+     * @param companyDto 待转换的公司实体
+     * @return 转换后的集合
+     */
+    private List<Object> companyDtoToListByEn(CompanyOtherDto companyDto) {
+        List<Object> list = new ArrayList<>();
+        list.add(companyDto.getCompanyName());
+        list.add(1);
+        list.add(Util.getTime("yyyy-MM-dd HH:mm:ss"));
+        list.add(companyDto.getId());
+        return list;
+    }
+
+
+    /**
+     * <h2>查询一存在的公司信息数据</h2>
+     *
+     * @return 查询一存在的公司信息数据
+     */
+    private Map<String, String> getExitsCompanyCode() {
+        List<Map<String, String>> codeList = mapper.selectExitsCompanyCodeList(tableName);
+        Map<String, String> codeMap = new ConcurrentHashMap<>(codeList.size());
+        codeList.forEach(item -> codeMap.put(item.get("companyCode"), String.valueOf(item.get("id"))));
+        return codeMap;
+    }
+
+
+    /**
+     * <h2>获取需要同步的公司信息数据</h2>
+     *
+     * @return 需要同步额公司数据
+     */
+    @SuppressWarnings("all")
+    private JSONArray getCompanies() {
+        int current = 1, size = Util.getIntValue(pageSize, 2000), pages;
+        String url = getBaseUrl() + "/dcopenedi/hrCompany/pageByUpdateTime";
+        String token = HttpClientToJT.getToken();
+        JSONArray jsonArray = new JSONArray();
+        do {
+            Map<String, Object> params = new HashMap<>();
+            params.put("updateTime", "2018-03-21 00:00:00");
+            params.put("current", current++);
+            params.put("size", size);
+            String s = HttpClientToJT.sendGet(url, token, params);
+            JSONObject jsonObject;
+//           如果不能解析jsonObject即表示请求未能正确到达目标服务器或参数、身份校验未通过等报错信息
+            try {
+                jsonObject = JSONObject.parseObject(s);
+            } catch (Exception e) {
+                throw new CustomerException("parse response string error, can't parse response to JsonObject, check you request params and network link status!" +
+                        " response str is : [" + s + "] ; this request params is : [" + JSON.toJSONString(params) + "],this request token is : " + token + ", request url is :" + url);
+            }
+            boolean code = jsonObject.getInteger("code").equals(1);
+            if (!code) {
+                throw new CustomerException("get hrmcompany data error, the request's param is :[" + JSON.toJSONString(params) + "], this response is :" + s + ",this request token is : " + token + ", request url is :" + url);
+            }
+            JSONObject result = jsonObject.getJSONObject("data");
+            pages = result.getInteger("pages");
+            JSONArray records = result.getJSONArray("records");
+            jsonArray.addAll(records);
+        } while (current <= pages);
+//        过滤掉之前逻辑中已经添加到建模表中的数据，将其他的数据返回后填写到其他建模表中
+        Object collect = jsonArray.stream().filter(item -> {
+            JSONObject itemJson = JSONObject.parseObject(JSON.toJSONString(item));
+            return !("CHN".equals(itemJson.getString("countryCode")) && "ZHS".equals(itemJson.getString("languageCd"))) && !Strings.isNullOrEmpty(itemJson.getString("companyCode"));
+        }).collect(Collectors.toList());
+        jsonArray = JSON.parseArray(JSON.toJSONString(collect));
+        Object companyCodeList = jsonArray.stream().filter(item -> {
+            JSONObject itemJson = JSONObject.parseObject(JSON.toJSONString(item));
+            boolean b = !("CHN".equals(itemJson.getString("countryCode")) && "ZHS".equals(itemJson.getString("languageCd")));
+            boolean isNull = Strings.isNullOrEmpty(itemJson.getString("companyCode"));
+            return b && isNull;
+        }).collect(Collectors.toList());
+        if (null != companyCodeList) {
+            JSONArray companyCodeJsonList = JSON.parseArray(JSON.toJSONString(companyCodeList));
+            log.warn(Util.logStr("get companies success, but hava [{}] companies is have't company_code， all data is [ {} ]",
+                    companyCodeJsonList.toJSONString()));
+        }
+        return jsonArray;
+    }
+
+
+    /**
+     * <h2>复制他们的代码，不推荐使用，有很多隐藏的bug</h2>
+     *
+     * @return 不推荐使用
+     */
+    @Deprecated
+    public JSONArray getCompanys() {
+        int current = 1, size = 10000, pages = 2;
+        String url = getBaseUrl() + "/dcopenedi/hrCompany/pageByUpdateTime";
+        System.out.println(url);
+        String token = HttpClientToJT.getToken();
+        Map<String, Object> params = new HashMap<>();
+        params.put("updateTime", "2018-03-21 00:00:00");
+        params.put("current", current);
+        params.put("size", size);
+        String s = HttpClientToJT.sendGet(url, token, params);
+        JSONObject jsonObject = JSONObject.parseObject(s);
+        JSONArray jsonArray = new JSONArray();
+        if (jsonObject.getInteger("code").equals(1)) {
+            JSONObject result = jsonObject.getJSONObject("data");
+            pages = result.getInteger("pages");
+            JSONArray records = result.getJSONArray("records");
+            jsonArray.addAll(records);
+            for (int i = 2; i <= pages; i++) {
+                params.put("current", i);
+                String str = HttpClientToJT.sendGet(url, token, params);
+                JSONObject jsonObject1 = JSONObject.parseObject(str);
+                JSONObject jsonResult = jsonObject1.getJSONObject("data");
+                JSONArray records1 = jsonResult.getJSONArray("records");
+                jsonArray.addAll(records1);
+            }
+        }
+        // 将写入转化为流的形式
+//        writeFile(jsonArray);
+        return jsonArray;
+    }
+
+    public String getBaseUrl() {
+        return Prop.getPropValue("DevToDC_jntchina", mode + "_baseUrl");
+    }
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/schedule/hrm/entity/AssetGroup.java b/src/main/youhong_ai_jitu_src/jntchina/schedule/hrm/entity/AssetGroup.java
new file mode 100644
index 0000000..5db01cc
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/schedule/hrm/entity/AssetGroup.java
@@ -0,0 +1,39 @@
+package jntchina.schedule.hrm.entity;
+
+import java.io.Serializable;
+
+/**
+ * @title: assetGroup
+ * @Author ycf
+ * @Date: 2021/9/28 10:35
+ * @Version 1.0
+ */
+public class AssetGroup implements Serializable {
+
+    private String company_name;
+    private String company_code;
+
+    public AssetGroup() {
+    }
+
+    public AssetGroup(String company_name, String company_code) {
+        this.company_name = company_name;
+        this.company_code = company_code;
+    }
+
+    public String getCompany_name() {
+        return company_name;
+    }
+
+    public void setCompany_name(String company_name) {
+        this.company_name = company_name;
+    }
+
+    public String getCompany_code() {
+        return company_code;
+    }
+
+    public void setCompany_code(String company_code) {
+        this.company_code = company_code;
+    }
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/schedule/hrm/entity/CompanyDto.java b/src/main/youhong_ai_jitu_src/jntchina/schedule/hrm/entity/CompanyDto.java
new file mode 100644
index 0000000..8f8f293
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/schedule/hrm/entity/CompanyDto.java
@@ -0,0 +1,103 @@
+package jntchina.schedule.hrm.entity;
+
+public class CompanyDto{
+	private String isDirectSales;
+	private String languageCd;
+	private String countryCode;
+	private String companyLevelName;
+	private String companyName;
+	private String companyAbbreviation;
+	private String countryName;
+	private String companyCode;
+	private String companyLevelCode;
+	private String unifySocialCreditCode;
+	private String status;
+
+	public void setIsDirectSales(String isDirectSales){
+		this.isDirectSales = isDirectSales;
+	}
+
+	public String getIsDirectSales(){
+		return isDirectSales;
+	}
+
+	public void setLanguageCd(String languageCd){
+		this.languageCd = languageCd;
+	}
+
+	public String getLanguageCd(){
+		return languageCd;
+	}
+
+	public void setCountryCode(String countryCode){
+		this.countryCode = countryCode;
+	}
+
+	public String getCountryCode(){
+		return countryCode;
+	}
+
+	public void setCompanyLevelName(String companyLevelName){
+		this.companyLevelName = companyLevelName;
+	}
+
+	public String getCompanyLevelName(){
+		return companyLevelName;
+	}
+
+	public void setCompanyName(String companyName){
+		this.companyName = companyName;
+	}
+
+	public String getCompanyName(){
+		return companyName;
+	}
+
+	public void setCompanyAbbreviation(String companyAbbreviation){
+		this.companyAbbreviation = companyAbbreviation;
+	}
+
+	public String getCompanyAbbreviation(){
+		return companyAbbreviation;
+	}
+
+	public void setCountryName(String countryName){
+		this.countryName = countryName;
+	}
+
+	public String getCountryName(){
+		return countryName;
+	}
+
+	public void setCompanyCode(String companyCode){
+		this.companyCode = companyCode;
+	}
+
+	public String getCompanyCode(){
+		return companyCode;
+	}
+
+	public void setCompanyLevelCode(String companyLevelCode){
+		this.companyLevelCode = companyLevelCode;
+	}
+
+	public String getCompanyLevelCode(){
+		return companyLevelCode;
+	}
+
+	public void setUnifySocialCreditCode(String unifySocialCreditCode){
+		this.unifySocialCreditCode = unifySocialCreditCode;
+	}
+
+	public String getUnifySocialCreditCode(){
+		return unifySocialCreditCode;
+	}
+
+	public void setStatus(String status){
+		this.status = status;
+	}
+
+	public String getStatus(){
+		return status;
+	}
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/schedule/hrm/entity/CompanyOtherDto.java b/src/main/youhong_ai_jitu_src/jntchina/schedule/hrm/entity/CompanyOtherDto.java
new file mode 100644
index 0000000..652e67a
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/schedule/hrm/entity/CompanyOtherDto.java
@@ -0,0 +1,112 @@
+package jntchina.schedule.hrm.entity;
+
+public class CompanyOtherDto {
+    private String id;
+	private String isDirectSales;
+	private String languageCd;
+	private String countryCode;
+	private String companyLevelName;
+	private String companyName;
+	private String companyAbbreviation;
+	private String countryName;
+	private String companyCode;
+	private String companyLevelCode;
+	private String unifySocialCreditCode;
+	private String status;
+
+    public String getId(){
+        return this.id;
+    }
+
+    public void setId(String id){
+       this.id = id;
+    }
+
+	public void setIsDirectSales(String isDirectSales){
+		this.isDirectSales = isDirectSales;
+	}
+
+	public String getIsDirectSales(){
+		return isDirectSales;
+	}
+
+	public void setLanguageCd(String languageCd){
+		this.languageCd = languageCd;
+	}
+
+	public String getLanguageCd(){
+		return languageCd;
+	}
+
+	public void setCountryCode(String countryCode){
+		this.countryCode = countryCode;
+	}
+
+	public String getCountryCode(){
+		return countryCode;
+	}
+
+	public void setCompanyLevelName(String companyLevelName){
+		this.companyLevelName = companyLevelName;
+	}
+
+	public String getCompanyLevelName(){
+		return companyLevelName;
+	}
+
+	public void setCompanyName(String companyName){
+		this.companyName = companyName;
+	}
+
+	public String getCompanyName(){
+		return companyName;
+	}
+
+	public void setCompanyAbbreviation(String companyAbbreviation){
+		this.companyAbbreviation = companyAbbreviation;
+	}
+
+	public String getCompanyAbbreviation(){
+		return companyAbbreviation;
+	}
+
+	public void setCountryName(String countryName){
+		this.countryName = countryName;
+	}
+
+	public String getCountryName(){
+		return countryName;
+	}
+
+	public void setCompanyCode(String companyCode){
+		this.companyCode = companyCode;
+	}
+
+	public String getCompanyCode(){
+		return companyCode;
+	}
+
+	public void setCompanyLevelCode(String companyLevelCode){
+		this.companyLevelCode = companyLevelCode;
+	}
+
+	public String getCompanyLevelCode(){
+		return companyLevelCode;
+	}
+
+	public void setUnifySocialCreditCode(String unifySocialCreditCode){
+		this.unifySocialCreditCode = unifySocialCreditCode;
+	}
+
+	public String getUnifySocialCreditCode(){
+		return unifySocialCreditCode;
+	}
+
+	public void setStatus(String status){
+		this.status = status;
+	}
+
+	public String getStatus(){
+		return status;
+	}
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/schedule/hrm/entity/DepartmentDto.java b/src/main/youhong_ai_jitu_src/jntchina/schedule/hrm/entity/DepartmentDto.java
new file mode 100644
index 0000000..ea9bfd4
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/schedule/hrm/entity/DepartmentDto.java
@@ -0,0 +1,233 @@
+package jntchina.schedule.hrm.entity;
+
+import java.io.Serializable;
+
+public class DepartmentDto implements Serializable {
+
+	private String companyCode;
+	private String departmentName;
+	private String businessUnitName;
+	private String deptManager;
+	private String languageCd;
+	private String departmentOrder;
+	private String brchLeaderName;
+	private String companyName;
+	private String departmentCode;
+	private String departmentAbbreviation;
+	private String updateTime;
+	private String isDirectSales;
+	private String superiorDepartment;
+	private String organizationCode;
+	private String organizationType;
+	private String organizationTypeDescr;
+	private String organizationClass;
+	private String organizationClassDescr;
+	private String createTime;
+	private String countryCode;
+	private String deptManagerName;
+	private String businessUnitCode;
+//	private List<RankItem> rank;
+	private String countryName;
+	private String brchLeader;
+	private String status;
+
+	public void setCompanyCode(String companyCode){
+		this.companyCode = companyCode;
+	}
+
+	public String getCompanyCode(){
+		return companyCode;
+	}
+
+	public void setDepartmentName(String departmentName){
+		this.departmentName = departmentName;
+	}
+
+	public String getDepartmentName(){
+		return departmentName;
+	}
+
+	public void setBusinessUnitName(String businessUnitName){
+		this.businessUnitName = businessUnitName;
+	}
+
+	public String getBusinessUnitName(){
+		return businessUnitName;
+	}
+
+	public void setDeptManager(String deptManager){
+		this.deptManager = deptManager;
+	}
+
+	public String getDeptManager(){
+		return deptManager;
+	}
+
+	public void setLanguageCd(String languageCd){
+		this.languageCd = languageCd;
+	}
+
+	public String getLanguageCd(){
+		return languageCd;
+	}
+
+	public void setDepartmentOrder(String departmentOrder){
+		this.departmentOrder = departmentOrder;
+	}
+
+	public String getDepartmentOrder(){
+		return departmentOrder;
+	}
+
+	public void setBrchLeaderName(String brchLeaderName){
+		this.brchLeaderName = brchLeaderName;
+	}
+
+	public String getBrchLeaderName(){
+		return brchLeaderName;
+	}
+
+	public void setCompanyName(String companyName){
+		this.companyName = companyName;
+	}
+
+	public String getCompanyName(){
+		return companyName;
+	}
+
+	public void setDepartmentCode(String departmentCode){
+		this.departmentCode = departmentCode;
+	}
+
+	public String getDepartmentCode(){
+		return departmentCode;
+	}
+
+	public void setDepartmentAbbreviation(String departmentAbbreviation){
+		this.departmentAbbreviation = departmentAbbreviation;
+	}
+
+	public String getDepartmentAbbreviation(){
+		return departmentAbbreviation;
+	}
+
+	public void setUpdateTime(String updateTime){
+		this.updateTime = updateTime;
+	}
+
+	public String getUpdateTime(){
+		return updateTime;
+	}
+
+	public void setIsDirectSales(String isDirectSales){
+		this.isDirectSales = isDirectSales;
+	}
+
+	public String getIsDirectSales(){
+		return isDirectSales;
+	}
+
+	public void setOrganizationTypeDescr(String organizationTypeDescr){
+		this.organizationTypeDescr = organizationTypeDescr;
+	}
+
+	public String getOrganizationTypeDescr(){
+		return organizationTypeDescr;
+	}
+
+	public void setSuperiorDepartment(String superiorDepartment){
+		this.superiorDepartment = superiorDepartment;
+	}
+
+	public String getSuperiorDepartment(){
+		return superiorDepartment;
+	}
+
+	public void setOrganizationType(String organizationType){
+		this.organizationType = organizationType;
+	}
+
+	public String getOrganizationType(){
+		return organizationType;
+	}
+
+	public void setCreateTime(String createTime){
+		this.createTime = createTime;
+	}
+
+	public String getCreateTime(){
+		return createTime;
+	}
+
+	public void setOrganizationCode(String organizationCode){
+		this.organizationCode = organizationCode;
+	}
+
+	public String getOrganizationCode(){
+		return organizationCode;
+	}
+
+	public void setCountryCode(String countryCode){
+		this.countryCode = countryCode;
+	}
+
+	public String getCountryCode(){
+		return countryCode;
+	}
+
+	public void setDeptManagerName(String deptManagerName){
+		this.deptManagerName = deptManagerName;
+	}
+
+	public String getDeptManagerName(){
+		return deptManagerName;
+	}
+
+	public void setBusinessUnitCode(String businessUnitCode){
+		this.businessUnitCode = businessUnitCode;
+	}
+
+	public String getBusinessUnitCode(){
+		return businessUnitCode;
+	}
+
+	public void setCountryName(String countryName){
+		this.countryName = countryName;
+	}
+
+	public String getCountryName(){
+		return countryName;
+	}
+
+	public void setBrchLeader(String brchLeader){
+		this.brchLeader = brchLeader;
+	}
+
+	public String getBrchLeader(){
+		return brchLeader;
+	}
+
+	public void setStatus(String status){
+		this.status = status;
+	}
+
+	public String getStatus(){
+		return status;
+	}
+
+	public String getOrganizationClass() {
+		return organizationClass;
+	}
+
+	public void setOrganizationClass(String organizationClass) {
+		this.organizationClass = organizationClass;
+	}
+
+	public String getOrganizationClassDescr() {
+		return organizationClassDescr;
+	}
+
+	public void setOrganizationClassDescr(String organizationClassDescr) {
+		this.organizationClassDescr = organizationClassDescr;
+	}
+}
\ No newline at end of file
diff --git a/src/main/youhong_ai_jitu_src/jntchina/schedule/hrm/entity/HrmUserDto.java b/src/main/youhong_ai_jitu_src/jntchina/schedule/hrm/entity/HrmUserDto.java
new file mode 100644
index 0000000..cceb370
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/schedule/hrm/entity/HrmUserDto.java
@@ -0,0 +1,794 @@
+package jntchina.schedule.hrm.entity;
+
+public class HrmUserDto{
+	private String deptName;
+	private String personalTel;
+	private String positionType;
+	private String actionSubReasonDescr;
+	private String companyName;
+	private String inspectEndDate;
+	private String actionDescr;
+	private String highestEducation;
+	private String emplTerminationDate;
+	private String isStay;
+	private String positonRankDescr;
+	private String bankCountry;
+	private String personalEmail;
+	private String positionPropeCode;
+	private String actionReasonDescr;
+	private String positionGroupName;
+	private String action;
+	private String stdPositionName;
+	private String bankCountryName;
+	private String bankAccountOpenDt;
+	private String companyCode;
+	private String oldEmployeeCode;
+	private String employeeName;
+	private String languageCd;
+	private String ethnicGroupCode;
+	private String bankCurrencyName;
+	private String companyTel;
+	private String bankAccountAc;
+	private String supervisorId;
+	private String hrStatus;
+	private String positonRankCode;
+	private String workLocationCode;
+	private String bankCurrencyId;
+	private String bankId;
+	private String bankAccountId;
+	private String employeeEnglishName;
+	private String postCode;
+	private String countryName;
+	private String deptCode;
+	private String certificateType;
+	private String positionPropeName;
+	private String status;
+	private String supervisorName;
+	private String emergeContactName;
+	private String religiousFaithDescr;
+	private String ethnicGroupName;
+	private String bankBranchName;
+	private String actionReason;
+	private String positionCode;
+	private String bankName;
+	private String actionSubReason;
+	private String sequenceName;
+	private String positionTypeDescr;
+	private String employeeCode;
+	private String positionName;
+	private String employeeSexCode;
+	private String politicalStatusDescr;
+	private String sequenceCode;
+	private String companyEmail;
+	private String employeeBirthdate;
+	private String countryCode;
+	private String postName;
+	private String employeeTypeName;
+	private String workLocaltionName;
+	private String employeeSexDescr;
+	private String politicalStatus;
+	private String updateTime;
+	private String emergeContactPhone;
+	private String certificateTypeName;
+	private String currentAddress;
+	private String highestEducationDescr;
+	private String stdPositionCode;
+	private String positionGroupCode;
+	private String religiousFaith;
+	private String trialEndDate;
+	private String createTime;
+	private String employeeTypeCode;
+	private String emplHireDate;
+	private String certificateNum;
+
+
+	//  字段说明
+	//	language_cd	语言编码	CHN
+    //	employee_code	员工ID	10000002
+    //	employee_name	姓名	李四
+    //	employee_english_name	英文名	Four Li
+    //	employee_birthdate	出生日期	34255
+    //	personal_tel	移动电话	15719312349
+    //	company_tel	公司电话	3030127
+    //	country_code	国家/地区编码	CHN
+    //	country_name	国家/地区	中国
+    //	employee_sex_code	性别，转换值	M/F
+    //	employee_sex_descr	性别	男 /女
+    //	personal_email	个人邮箱	1387597880@qq.com
+    //	company_email	公司邮箱	13213@123.com
+    //	current_address	现居住地址	黑龙江双鸭山市
+    //	certificate_type	证件类型，NID\PASP\PASS\TCS	NID
+    //	certificate_type_name	证件描述：身份证号、护照、港澳通行证、台胞证	身份证号
+    //	certificate_num	证件号码	1309031993025310000
+    //	highest_education	最高学历，转换值	50
+    //	highest_education_descr	最高学历	50-博士研究生
+    //	political_status	政治面貌，转换值	10
+    //	political_status_descr	政治面貌	10-群众
+    //	religious_faith	宗教信仰，转换值	60
+    //	religious_faith_descr	宗教信仰	60-无神论者
+    //	action	操作，转换值	PRD
+    //	action_descr	操作	转正
+    //	action_reason	操作原因，转换值	P01
+    //	action_reason_descr	操作原因	试用期转正
+    //	action_sub_reason	操作原因子项，转换值	10
+    //	action_sub_reason_descr	操作原因子项	按期转正
+    //	hr_status	A在职，I离职	A
+    //	position_code	岗位编码	00000012
+    //	position_name	岗位名称	安全监察专员
+    //	company_code	公司编码	100
+    //	company_name	公司名称	上海极兔极致供应链管理有限公司
+    //	dept_code	部门编码	10000011
+    //	dept_name	部门名称	安全监察部
+    //	std_position_code	标准岗位编码	1000001
+    //	std_position_name	标准岗位名称	转运中心主管
+    //	ethnic_group_code	族群编码	40002
+    //	ethnic_group_name	族群名称	运作
+    //	position_group_code	岗族编码	30002
+    //	position_group_name	岗族名称	转运
+    //	position_prope_code	岗位属性编码	10
+    //	position_prope_name	岗位属性名称	一线
+    //	sequence_code	序列编码	20002
+    //	sequence_name	序列名称	仓储与分拣
+    //	post_code	岗编码	10005
+    //	post_name	岗名称	配送与分拣
+    //	employee_type_code	员工类型编码	10
+    //	employee_type_name	员工类型名称	10-全日制
+    //	position_type	岗位类别	10
+    //	position_type_descr	岗位类别名称	M
+    //	positon_rank_code	职级编码	20
+    //	positon_rank_descr	职级编码名称	M02
+    //	is_stay	是否住宿	Y-是  N-否
+    //	trial_end_date	试用期结束日期	2021-04-20
+    //	inspect_end_date	考察期结束日期	2021-04-20
+    //	work_location_code	工作地点编码	10000
+    //	work_localtion_name	工作地点描述	上海
+    //	supervisor_id	直属领导编码	0000010000
+    //	supervisor_name	直属领导姓名	张三
+    //	emerge_contact_name	紧急联系人姓名	张五
+    //	emerge_contact_phone	紧急联系人电话	13393344566
+    //	old_employee_code	老工号	1232142324
+    //	bank_country	银行所属国家地区编码	CHN
+    //	bank_country_name	银行所属国家地区描述	中国
+    //	bank_id	银行编码	CIB
+    //	bank_name	银行名称	兴业银行
+    //	bank_account_id	银行账号	12349999
+    //	bank_branch_name	开户行支行	开户行支行
+    //	bank_currency_id	币种编码	CNY
+    //	bank_currency_name	币种名称	人民币
+    //	bank_account_ac	银行联码	9999999999
+    //	bank_account_open_dt	开户日期	2021-04-01
+    //	status	状态码	1 新增    2 修改  3作废
+
+
+	public void setDeptName(String deptName){
+		this.deptName = deptName;
+	}
+
+	public String getDeptName(){
+		return deptName;
+	}
+
+	public void setPersonalTel(String personalTel){
+		this.personalTel = personalTel;
+	}
+
+	public String getPersonalTel(){
+		return personalTel;
+	}
+
+	public void setPositionType(String positionType){
+		this.positionType = positionType;
+	}
+
+	public String getPositionType(){
+		return positionType;
+	}
+
+	public void setActionSubReasonDescr(String actionSubReasonDescr){
+		this.actionSubReasonDescr = actionSubReasonDescr;
+	}
+
+	public String getActionSubReasonDescr(){
+		return actionSubReasonDescr;
+	}
+
+	public void setCompanyName(String companyName){
+		this.companyName = companyName;
+	}
+
+	public String getCompanyName(){
+		return companyName;
+	}
+
+	public void setInspectEndDate(String inspectEndDate){
+		this.inspectEndDate = inspectEndDate;
+	}
+
+	public String getInspectEndDate(){
+		return inspectEndDate;
+	}
+
+	public void setActionDescr(String actionDescr){
+		this.actionDescr = actionDescr;
+	}
+
+	public String getActionDescr(){
+		return actionDescr;
+	}
+
+	public void setHighestEducation(String highestEducation){
+		this.highestEducation = highestEducation;
+	}
+
+	public String getHighestEducation(){
+		return highestEducation;
+	}
+
+	public void setEmplTerminationDate(String emplTerminationDate){
+		this.emplTerminationDate = emplTerminationDate;
+	}
+
+	public String getEmplTerminationDate(){
+		return emplTerminationDate;
+	}
+
+	public void setIsStay(String isStay){
+		this.isStay = isStay;
+	}
+
+	public String getIsStay(){
+		return isStay;
+	}
+
+	public void setPositonRankDescr(String positonRankDescr){
+		this.positonRankDescr = positonRankDescr;
+	}
+
+	public String getPositonRankDescr(){
+		return positonRankDescr;
+	}
+
+	public void setBankCountry(String bankCountry){
+		this.bankCountry = bankCountry;
+	}
+
+	public String getBankCountry(){
+		return bankCountry;
+	}
+
+	public void setPersonalEmail(String personalEmail){
+		this.personalEmail = personalEmail;
+	}
+
+	public String getPersonalEmail(){
+		return personalEmail;
+	}
+
+	public void setPositionPropeCode(String positionPropeCode){
+		this.positionPropeCode = positionPropeCode;
+	}
+
+	public String getPositionPropeCode(){
+		return positionPropeCode;
+	}
+
+	public void setActionReasonDescr(String actionReasonDescr){
+		this.actionReasonDescr = actionReasonDescr;
+	}
+
+	public String getActionReasonDescr(){
+		return actionReasonDescr;
+	}
+
+	public void setPositionGroupName(String positionGroupName){
+		this.positionGroupName = positionGroupName;
+	}
+
+	public String getPositionGroupName(){
+		return positionGroupName;
+	}
+
+	public void setAction(String action){
+		this.action = action;
+	}
+
+	public String getAction(){
+		return action;
+	}
+
+	public void setStdPositionName(String stdPositionName){
+		this.stdPositionName = stdPositionName;
+	}
+
+	public String getStdPositionName(){
+		return stdPositionName;
+	}
+
+	public void setBankCountryName(String bankCountryName){
+		this.bankCountryName = bankCountryName;
+	}
+
+	public String getBankCountryName(){
+		return bankCountryName;
+	}
+
+	public void setBankAccountOpenDt(String bankAccountOpenDt){
+		this.bankAccountOpenDt = bankAccountOpenDt;
+	}
+
+	public String getBankAccountOpenDt(){
+		return bankAccountOpenDt;
+	}
+
+	public void setCompanyCode(String companyCode){
+		this.companyCode = companyCode;
+	}
+
+	public String getCompanyCode(){
+		return companyCode;
+	}
+
+	public void setOldEmployeeCode(String oldEmployeeCode){
+		this.oldEmployeeCode = oldEmployeeCode;
+	}
+
+	public String getOldEmployeeCode(){
+		return oldEmployeeCode;
+	}
+
+	public void setEmployeeName(String employeeName){
+		this.employeeName = employeeName;
+	}
+
+	public String getEmployeeName(){
+		return employeeName;
+	}
+
+	public void setLanguageCd(String languageCd){
+		this.languageCd = languageCd;
+	}
+
+	public String getLanguageCd(){
+		return languageCd;
+	}
+
+	public void setEthnicGroupCode(String ethnicGroupCode){
+		this.ethnicGroupCode = ethnicGroupCode;
+	}
+
+	public String getEthnicGroupCode(){
+		return ethnicGroupCode;
+	}
+
+	public void setBankCurrencyName(String bankCurrencyName){
+		this.bankCurrencyName = bankCurrencyName;
+	}
+
+	public String getBankCurrencyName(){
+		return bankCurrencyName;
+	}
+
+	public void setCompanyTel(String companyTel){
+		this.companyTel = companyTel;
+	}
+
+	public String getCompanyTel(){
+		return companyTel;
+	}
+
+	public void setBankAccountAc(String bankAccountAc){
+		this.bankAccountAc = bankAccountAc;
+	}
+
+	public String getBankAccountAc(){
+		return bankAccountAc;
+	}
+
+	public void setSupervisorId(String supervisorId){
+		this.supervisorId = supervisorId;
+	}
+
+	public String getSupervisorId(){
+		return supervisorId;
+	}
+
+	public void setHrStatus(String hrStatus){
+		this.hrStatus = hrStatus;
+	}
+
+	public String getHrStatus(){
+		return hrStatus;
+	}
+
+	public void setPositonRankCode(String positonRankCode){
+		this.positonRankCode = positonRankCode;
+	}
+
+	public String getPositonRankCode(){
+		return positonRankCode;
+	}
+
+	public void setWorkLocationCode(String workLocationCode){
+		this.workLocationCode = workLocationCode;
+	}
+
+	public String getWorkLocationCode(){
+		return workLocationCode;
+	}
+
+	public void setBankCurrencyId(String bankCurrencyId){
+		this.bankCurrencyId = bankCurrencyId;
+	}
+
+	public String getBankCurrencyId(){
+		return bankCurrencyId;
+	}
+
+	public void setBankId(String bankId){
+		this.bankId = bankId;
+	}
+
+	public String getBankId(){
+		return bankId;
+	}
+
+	public void setBankAccountId(String bankAccountId){
+		this.bankAccountId = bankAccountId;
+	}
+
+	public String getBankAccountId(){
+		return bankAccountId;
+	}
+
+	public void setEmployeeEnglishName(String employeeEnglishName){
+		this.employeeEnglishName = employeeEnglishName;
+	}
+
+	public String getEmployeeEnglishName(){
+		return employeeEnglishName;
+	}
+
+	public void setPostCode(String postCode){
+		this.postCode = postCode;
+	}
+
+	public String getPostCode(){
+		return postCode;
+	}
+
+	public void setCountryName(String countryName){
+		this.countryName = countryName;
+	}
+
+	public String getCountryName(){
+		return countryName;
+	}
+
+	public void setDeptCode(String deptCode){
+		this.deptCode = deptCode;
+	}
+
+	public String getDeptCode(){
+		return deptCode;
+	}
+
+	public void setCertificateType(String certificateType){
+		this.certificateType = certificateType;
+	}
+
+	public String getCertificateType(){
+		return certificateType;
+	}
+
+	public void setPositionPropeName(String positionPropeName){
+		this.positionPropeName = positionPropeName;
+	}
+
+	public String getPositionPropeName(){
+		return positionPropeName;
+	}
+
+	public void setStatus(String status){
+		this.status = status;
+	}
+
+	public String getStatus(){
+		return status;
+	}
+
+	public void setSupervisorName(String supervisorName){
+		this.supervisorName = supervisorName;
+	}
+
+	public String getSupervisorName(){
+		return supervisorName;
+	}
+
+	public void setEmergeContactName(String emergeContactName){
+		this.emergeContactName = emergeContactName;
+	}
+
+	public String getEmergeContactName(){
+		return emergeContactName;
+	}
+
+	public void setReligiousFaithDescr(String religiousFaithDescr){
+		this.religiousFaithDescr = religiousFaithDescr;
+	}
+
+	public String getReligiousFaithDescr(){
+		return religiousFaithDescr;
+	}
+
+	public void setEthnicGroupName(String ethnicGroupName){
+		this.ethnicGroupName = ethnicGroupName;
+	}
+
+	public String getEthnicGroupName(){
+		return ethnicGroupName;
+	}
+
+	public void setBankBranchName(String bankBranchName){
+		this.bankBranchName = bankBranchName;
+	}
+
+	public String getBankBranchName(){
+		return bankBranchName;
+	}
+
+	public void setActionReason(String actionReason){
+		this.actionReason = actionReason;
+	}
+
+	public String getActionReason(){
+		return actionReason;
+	}
+
+	public void setPositionCode(String positionCode){
+		this.positionCode = positionCode;
+	}
+
+	public String getPositionCode(){
+		return positionCode;
+	}
+
+	public void setBankName(String bankName){
+		this.bankName = bankName;
+	}
+
+	public String getBankName(){
+		return bankName;
+	}
+
+	public void setActionSubReason(String actionSubReason){
+		this.actionSubReason = actionSubReason;
+	}
+
+	public String getActionSubReason(){
+		return actionSubReason;
+	}
+
+	public void setSequenceName(String sequenceName){
+		this.sequenceName = sequenceName;
+	}
+
+	public String getSequenceName(){
+		return sequenceName;
+	}
+
+	public void setPositionTypeDescr(String positionTypeDescr){
+		this.positionTypeDescr = positionTypeDescr;
+	}
+
+	public String getPositionTypeDescr(){
+		return positionTypeDescr;
+	}
+
+	public void setEmployeeCode(String employeeCode){
+		this.employeeCode = employeeCode;
+	}
+
+	public String getEmployeeCode(){
+		return employeeCode;
+	}
+
+	public void setPositionName(String positionName){
+		this.positionName = positionName;
+	}
+
+	public String getPositionName(){
+		return positionName;
+	}
+
+	public void setEmployeeSexCode(String employeeSexCode){
+		this.employeeSexCode = employeeSexCode;
+	}
+
+	public String getEmployeeSexCode(){
+		return employeeSexCode;
+	}
+
+	public void setPoliticalStatusDescr(String politicalStatusDescr){
+		this.politicalStatusDescr = politicalStatusDescr;
+	}
+
+	public String getPoliticalStatusDescr(){
+		return politicalStatusDescr;
+	}
+
+	public void setSequenceCode(String sequenceCode){
+		this.sequenceCode = sequenceCode;
+	}
+
+	public String getSequenceCode(){
+		return sequenceCode;
+	}
+
+	public void setCompanyEmail(String companyEmail){
+		this.companyEmail = companyEmail;
+	}
+
+	public String getCompanyEmail(){
+		return companyEmail;
+	}
+
+	public void setEmployeeBirthdate(String employeeBirthdate){
+		this.employeeBirthdate = employeeBirthdate;
+	}
+
+	public String getEmployeeBirthdate(){
+		return employeeBirthdate;
+	}
+
+	public void setCountryCode(String countryCode){
+		this.countryCode = countryCode;
+	}
+
+	public String getCountryCode(){
+		return countryCode;
+	}
+
+	public void setPostName(String postName){
+		this.postName = postName;
+	}
+
+	public String getPostName(){
+		return postName;
+	}
+
+	public void setEmployeeTypeName(String employeeTypeName){
+		this.employeeTypeName = employeeTypeName;
+	}
+
+	public String getEmployeeTypeName(){
+		return employeeTypeName;
+	}
+
+	public void setWorkLocaltionName(String workLocaltionName){
+		this.workLocaltionName = workLocaltionName;
+	}
+
+	public String getWorkLocaltionName(){
+		return workLocaltionName;
+	}
+
+	public void setEmployeeSexDescr(String employeeSexDescr){
+		this.employeeSexDescr = employeeSexDescr;
+	}
+
+	public String getEmployeeSexDescr(){
+		return employeeSexDescr;
+	}
+
+	public void setPoliticalStatus(String politicalStatus){
+		this.politicalStatus = politicalStatus;
+	}
+
+	public String getPoliticalStatus(){
+		return politicalStatus;
+	}
+
+	public void setUpdateTime(String updateTime){
+		this.updateTime = updateTime;
+	}
+
+	public String getUpdateTime(){
+		return updateTime;
+	}
+
+	public void setEmergeContactPhone(String emergeContactPhone){
+		this.emergeContactPhone = emergeContactPhone;
+	}
+
+	public String getEmergeContactPhone(){
+		return emergeContactPhone;
+	}
+
+	public void setCertificateTypeName(String certificateTypeName){
+		this.certificateTypeName = certificateTypeName;
+	}
+
+	public String getCertificateTypeName(){
+		return certificateTypeName;
+	}
+
+	public void setCurrentAddress(String currentAddress){
+		this.currentAddress = currentAddress;
+	}
+
+	public String getCurrentAddress(){
+		return currentAddress;
+	}
+
+	public void setHighestEducationDescr(String highestEducationDescr){
+		this.highestEducationDescr = highestEducationDescr;
+	}
+
+	public String getHighestEducationDescr(){
+		return highestEducationDescr;
+	}
+
+	public void setStdPositionCode(String stdPositionCode){
+		this.stdPositionCode = stdPositionCode;
+	}
+
+	public String getStdPositionCode(){
+		return stdPositionCode;
+	}
+
+	public void setPositionGroupCode(String positionGroupCode){
+		this.positionGroupCode = positionGroupCode;
+	}
+
+	public String getPositionGroupCode(){
+		return positionGroupCode;
+	}
+
+	public void setReligiousFaith(String religiousFaith){
+		this.religiousFaith = religiousFaith;
+	}
+
+	public String getReligiousFaith(){
+		return religiousFaith;
+	}
+
+	public void setTrialEndDate(String trialEndDate){
+		this.trialEndDate = trialEndDate;
+	}
+
+	public String getTrialEndDate(){
+		return trialEndDate;
+	}
+
+	public void setCreateTime(String createTime){
+		this.createTime = createTime;
+	}
+
+	public String getCreateTime(){
+		return createTime;
+	}
+
+	public void setEmployeeTypeCode(String employeeTypeCode){
+		this.employeeTypeCode = employeeTypeCode;
+	}
+
+	public String getEmployeeTypeCode(){
+		return employeeTypeCode;
+	}
+
+	public void setEmplHireDate(String emplHireDate){
+		this.emplHireDate = emplHireDate;
+	}
+
+	public String getEmplHireDate(){
+		return emplHireDate;
+	}
+
+	public void setCertificateNum(String certificateNum){
+		this.certificateNum = certificateNum;
+	}
+
+	public String getCertificateNum(){
+		return certificateNum;
+	}
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/schedule/hrm/entity/ResoutDate.java b/src/main/youhong_ai_jitu_src/jntchina/schedule/hrm/entity/ResoutDate.java
new file mode 100644
index 0000000..58fd9dc
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/schedule/hrm/entity/ResoutDate.java
@@ -0,0 +1,70 @@
+package jntchina.schedule.hrm.entity;
+
+import java.io.Serializable;
+
+/**
+ * @title: ResoutDate
+ * @Author ycf
+ * @Date: 2021/9/28 14:07
+ * @Version 1.0
+ */
+public class ResoutDate implements Serializable {
+    private String FIELDVALUE;
+    private String XlADLONGNAME;
+    private String FIELDNAME;
+    private String XLADSHORTNAME;
+    private String gs;
+
+    @Override
+    public String toString() {
+        return "ResoutDate{" +
+                "FIELDVALUE='" + FIELDVALUE + '\'' +
+                ", XlADLONGNAME='" + XlADLONGNAME + '\'' +
+                ", FIELDNAME='" + FIELDNAME + '\'' +
+                ", XLADSHORTNAME='" + XLADSHORTNAME + '\'' +
+                ", gs='" + gs + '\'' +
+                '}';
+    }
+
+    public String getGs() {
+        return gs;
+    }
+
+    public void setGs(String gs) {
+        this.gs = gs;
+    }
+
+    public String getFIELDVALUE() {
+        return FIELDVALUE;
+    }
+
+    public void setFIELDVALUE(String FIELDVALUE) {
+        this.FIELDVALUE = FIELDVALUE;
+    }
+
+    public String getXlADLONGNAME() {
+        return XlADLONGNAME;
+    }
+
+    public void setXlADLONGNAME(String xlADLONGNAME) {
+        XlADLONGNAME = xlADLONGNAME;
+    }
+
+    public String getFIELDNAME() {
+        return FIELDNAME;
+    }
+
+    public void setFIELDNAME(String FIELDNAME) {
+        this.FIELDNAME = FIELDNAME;
+    }
+
+    public String getXLADSHORTNAME() {
+        return XLADSHORTNAME;
+    }
+
+    public void setXLADSHORTNAME(String XLADSHORTNAME) {
+        this.XLADSHORTNAME = XLADSHORTNAME;
+    }
+
+
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/schedule/hrm/idn/HRSynIDN.java b/src/main/youhong_ai_jitu_src/jntchina/schedule/hrm/idn/HRSynIDN.java
new file mode 100644
index 0000000..7e9fdb0
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/schedule/hrm/idn/HRSynIDN.java
@@ -0,0 +1,41 @@
+package jntchina.schedule.hrm.idn;
+
+import weaver.conn.RecordSet;
+import weaver.interfaces.schedule.BaseCronJob;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.format.DateTimeFormatter;
+
+public class HRSynIDN extends BaseCronJob {
+
+
+    @Override
+    public void execute() {
+        LocalDateTime today_start = LocalDateTime.of(LocalDate.now(), LocalTime.MIN);//当天零点
+        String today = today_start.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+        String allDay = "2018-03-21 00:00:00";
+        SynHrmdepartmentToOAIDN dept = new SynHrmdepartmentToOAIDN();
+        SyncHrmjobtitlesToOAIDN job = new SyncHrmjobtitlesToOAIDN();
+        SyncHrmresourceToOAIDN user = new SyncHrmresourceToOAIDN();
+        RecordSet rs = new RecordSet();
+        rs.executeQuery("select * from controltaskidn");
+        if (!rs.next()) {
+            rs.executeUpdate("insert into controltaskidn(task) values(?)", 0);
+        }
+        rs.executeQuery("select * from controltaskidn where task = ?", 0);
+        if (rs.next()) {
+            rs.executeUpdate("update controltaskidn set task = ?", 1);
+            dept.execute(today);
+            job.execute(today);
+            user.execute(today);
+            rs.executeUpdate("update controltaskidn set task = ?", 0);
+        }
+
+    }
+}
+
+
+
+
diff --git a/src/main/youhong_ai_jitu_src/jntchina/schedule/hrm/idn/SynHrmdepartmentToOAIDN.java b/src/main/youhong_ai_jitu_src/jntchina/schedule/hrm/idn/SynHrmdepartmentToOAIDN.java
new file mode 100644
index 0000000..6321a86
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/schedule/hrm/idn/SynHrmdepartmentToOAIDN.java
@@ -0,0 +1,781 @@
+package jntchina.schedule.hrm.idn;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.api.integration.util.JavaUtil;
+import jntchina.schedule.hrm.SyncHrmdepartmentToOA;
+import jntchina.schedule.hrm.SyncHrmresourceToOA;
+import jntchina.schedule.hrm.entity.DepartmentDto;
+import jntchina.util.HttpClientToJT;
+import selfdev.util.base.TimeCommonUtil;
+import selfdev.util.log.LogTool;
+import weaver.conn.RecordSet;
+import weaver.general.Util;
+import weaver.hrm.company.DepartmentComInfo;
+import weaver.matrix.MatrixUtil;
+
+import java.io.BufferedWriter;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.util.*;
+import java.util.stream.Collectors;
+
+public class SynHrmdepartmentToOAIDN {
+
+    Map<String, Object> deptMap = new HashMap<>();
+
+
+    //分页接口参数
+    String maxPoint = "1";
+    //接口是否有下一页 默认为有
+    boolean ifPage = true;
+
+
+    //部门编码和id  map
+    Map<String, String> map_dept_code_id = new HashMap<String, String>();
+    private LogTool log = new LogTool("/log/hrm/IDN/dept/", false);
+
+    //60里面是否还有分部
+    boolean ifExistenceSub = true;
+
+    //所有10分部的上级
+    List subList = new ArrayList();
+
+
+    //存放60分部
+    List list60 = new ArrayList();
+
+
+    public void ScreenSub(Map<String, Object> supSubMap) {
+        try {
+            boolean ifSub = false;
+            Set keySet = supSubMap.keySet();
+            Iterator it = keySet.iterator();
+            while (it.hasNext()) {
+                //60的key
+                String deptCode = (String) it.next();
+                if (subList.contains(deptCode)) {
+                    ifSub = true;
+                    String supDeptCode = String.valueOf(supSubMap.get(deptCode));
+                    //60的value
+                    list60.add(deptCode);
+                    subList.add(supDeptCode);
+                    supSubMap.remove(deptCode);
+                }
+            }
+            ifExistenceSub = ifSub;
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+
+    /**
+     * 同步分部、部门数据
+     * 注：对方整个组织数不区分部门和分部，全部用部门接口数据，用类型区分
+     */
+    public Map<String, List<DepartmentDto>> execute(String date) {
+        Map<String, List<DepartmentDto>> rtMap = new HashMap<>();
+        try {
+            String now = TimeCommonUtil.obtainDate(0);
+            //匹配部门id，关联的上级部门，所属分部 map
+            Map<String, Map<String, String>> map_dept_id_data = new HashMap<>();
+            map_dept_id_data = getDeptDataMap();
+//        log.writeLog("字典："+JSON.toJSONString(map_dept_id_data));
+            map_dept_code_id = getAllDepartmentCodeIdMap();
+            SyncHrmsubcompanyToOAIDN hrmsubcompany = new SyncHrmsubcompanyToOAIDN();
+            SyncHrmresourceToOA hrmresource = new SyncHrmresourceToOA();
+            //人员map,用于匹配上级领导
+            Map<String, String> map_user_code_id = hrmresource.getUserCodeIdMap();
+            //拆分数据、organizationClass 10类型是组织，其他类型当部门,【代理区】在对方那是虚拟部门，特殊处理划分为OA   分部
+            //JSONArray data = getDepartments(date);
+            //JSONArray ocData = getOcDepartments(date);
+
+            JSONArray ocData = new JSONArray();
+            while (ifPage) {
+                ocData.addAll(getOcDepartments(date, maxPoint));
+            }
+
+            //key为60自己，value为上级
+            Map<String, Object> supSubMap = new HashMap<>();
+
+            Object directSales = ocData.stream().filter(item -> {
+                JSONObject itemJson = JSONObject.parseObject(JSON.toJSONString(item));
+                if ("10".equals(itemJson.getString("organizationClass"))) {
+                    subList.add(itemJson.getString("superiorDepartment"));
+                }
+                if ("60".equals(itemJson.getString("organizationClass"))) {
+                    //key为60自己，value为上级
+                    supSubMap.put(itemJson.getString("departmentCode"), itemJson.getString("superiorDepartment"));
+                }
+                return !"10".equals(itemJson.getString("organizationClass"));
+            }).collect(Collectors.toList());
+            /*
+            while (ifExistenceSub) {
+                ScreenSub(supSubMap);
+            }*/
+
+            List<DepartmentDto> dataList = JSONArray.parseArray(ocData.toJSONString(), DepartmentDto.class);
+            log.writeLog("-----------------全部长度：" + dataList.size());
+
+            //分部数据
+            List<DepartmentDto> subcompanys = dataList.stream().filter(item -> {
+                return "10".equals(item.getOrganizationClass()) || "60".equals(item.getOrganizationClass());
+                //return "10".equals(item.getOrganizationClass()) || ("60".equals(item.getOrganizationClass()) && list60.contains(item.getDepartmentCode()));
+            }).collect(Collectors.toList());
+            //部门数据  注意：10000300代理区编码
+            List<DepartmentDto> departments = dataList.stream().filter(item -> {
+                return "20".equals(item.getOrganizationClass())
+                        || "30".equals(item.getOrganizationClass())
+                        || "40".equals(item.getOrganizationClass())
+                        || "50".equals(item.getOrganizationClass()) ;
+                        //|| ("60".equals(item.getOrganizationClass()) && !list60.contains(item.getDepartmentCode()));
+            }).collect(Collectors.toList());
+            log.writeLog("-----------------分部长度：" + subcompanys.size());
+            log.writeLog("-----------------部门长度：" + departments.size());
+
+            rtMap.put("department", departments);
+            //处理分部同步逻辑
+            List<DepartmentDto> execute = hrmsubcompany.execute(subcompanys, departments);
+            //departments = execute;
+            Map<String, String> map_subcompany_code_id = hrmsubcompany.getSubCodeIdMap();
+            //处理部门同步逻辑
+            RecordSet rs = new RecordSet();
+            int skipNum = 0, insertNum = 0, updateNum = 0;
+            List<DepartmentDto> skipList = new ArrayList<>();
+            log.writeLog("----------开始同步部门，条数:" + departments.size());
+            //log.writeLog("----------同步部门源数据：" + JSON.toJSONString(departments));
+            // 处理部门同步逻辑 1.未匹配到分部，不新增，
+            for (int i = 0; i < departments.size(); i++) {
+                DepartmentDto row = departments.get(i);
+                String countryCode = Util.null2String(row.getCountryCode());//国家
+                String departmentCode = Util.null2String(row.getDepartmentCode());//部门编码
+                String departmentName = Util.null2String(row.getDepartmentName());//部门全称
+                String shortName = Util.null2String(row.getDepartmentAbbreviation());//部门简称
+                String superiorDepartment = Util.null2String(row.getSuperiorDepartment());//上级部门编码
+                String departmentOrder = Util.null2String(row.getDepartmentOrder());//排序
+                String deptManager = Util.null2String(row.getDeptManager());//部门负责人code
+                String brchLeader = Util.null2String(row.getBrchLeader());//分管领导code
+                Integer canceled = Util.null2String(row.getStatus()).equals("3") ? 1 : null;//1 新增  2 修改  3作废
+                String companyCode = Util.null2String(row.getCompanyCode());// 公司
+//            String companyName = Util.null2String(row.getCompanyName());//公司名称
+                if ("".equals(superiorDepartment)) {
+                    skipList.add(row);
+                    log.writeLog("cylnb superiorDepartment is null:" + superiorDepartment);
+                    skipNum++;
+                    deptMap.put(departmentCode, superiorDepartment);
+                    // continue;
+                }
+                //各种code转id
+                String bmfzr = Util.null2String(map_user_code_id.get(deptManager));//部门负责人
+                String bmfgld = Util.null2String(map_user_code_id.get(brchLeader));//分管领导
+                String subcompanyid1 = Util.null2String(map_subcompany_code_id.get(superiorDepartment));//分部ID
+                String supdepid = Util.null2String(map_dept_code_id.get(superiorDepartment));//获取上级ID
+                log.writeLog("------------subcompanyid1：" + subcompanyid1 + "-----deptCode：" + departmentCode + ",status:" + row.getStatus() + ",canceled:" + canceled + "-------");
+                log.writeLog("------------supdepid：" + supdepid + "----deptCode：" + departmentCode + ",status:" + row.getStatus() + ",canceled:" + canceled + "--------");
+                //如果上级编码为空、所属分部，上级部门都找不到，不作处理
+                if ("".equals(superiorDepartment) || ("".equals(subcompanyid1) && "".equals(supdepid))) {
+                    skipList.add(row);
+                    skipNum++;
+                    log.writeLog("cylnb 上级编码为空、所属分部，上级部门都找不到，不作处理deptcode:" + departmentCode + ";supcode:" + superiorDepartment);
+                    deptMap.put(departmentCode, superiorDepartment);
+                    //continue;
+                }
+                String sql = "";
+                //判断HR部门ID是否已经存在
+
+                String status = row.getStatus();
+                if (!"3".equals(status)) {
+                    log.writeLog("---------------国家：" + countryCode);
+                    departmentName = getDepartmentName(date, countryCode, departmentCode, departmentName);
+                } else {
+                    log.writeLog("----------------状态为3");
+                }
+
+                if ("".equals(departmentName)) {
+                    log.writeLog("----------------多语言为空");
+                    departmentName = row.getDepartmentName();
+                }
+
+                log.writeLog("-----------------countryCode:" + countryCode);
+                log.writeLog("-----------------departmentName:" + departmentName);
+                log.writeLog("第" + (i + 1) + "条，取数据完成！");
+                if (!map_dept_code_id.containsKey(departmentCode)) {//部门不存在则插入生成新部门
+                    rs.executeQuery("select id from hrmdepartment where outkey = ?", departmentCode);
+                    if (rs.next()) {
+                        String id = rs.getString("id");
+                        //如果找到subcompanyid1不为空，说明是顶级部门，
+                        //String deptid = Util.null2String(map_dept_code_id.get(departmentCode));//OA部门ID
+                        String deptid = id;//OA部门ID
+                        if ("".equals(deptid)) {
+                            skipNum++;
+                            log.writeLog("cylnb deptid is null");
+                            deptMap.put(departmentCode, superiorDepartment);
+                            //continue;
+                        }
+                        if (!"".equals(subcompanyid1)) {
+                            supdepid = "0";
+                        }
+                        if (!"".equals(supdepid) && "".equals(subcompanyid1)) {
+                            log.writeLog("开始取部门" + departmentCode + "上级分部id：" + supdepid + "。");
+                            subcompanyid1 = getSubId(map_dept_id_data, supdepid);
+                            log.writeLog("结束取部门" + departmentCode + "上级分部id：" + supdepid + "。取到的分部id：" + subcompanyid1);
+                            if ("".equals(subcompanyid1)) {
+                                log.writeLog("----------------分部id找不到");
+                                deptMap.put(departmentCode, superiorDepartment);
+                            }
+                        }
+                        String updateStr = "";
+                        //只有有值才覆盖
+                        updateStr += !"".equals(subcompanyid1) ? "subcompanyid1 = '" + subcompanyid1 + "', " : "";
+                        updateStr += !"".equals(supdepid) ? "supdepid = '" + supdepid + "', " : "";
+                        updateStr += !"".equals(bmfzr) ? "bmfzr = '" + bmfzr + "', " : "";
+                        updateStr += !"".equals(bmfgld) ? "bmfgld = '" + bmfgld + "', " : "";
+                        sql = "update HrmDepartment set " +
+                                "departmentname = '" + departmentName + "', " +
+                                "departmentmark = '" + departmentName + "', " +
+                                updateStr +
+                                "canceled = " + canceled + ", " +
+                                "modified = to_date('" + now + "','yyyy-mm-dd hh24:mi:ss'), " +
+                                "modifier = '1', " +
+                                "showorder = '" + departmentOrder + "' " +
+                                "where  id= '" + deptid + "'";
+                        log.writeLog("更新部门表中数据sql--------->" + sql);
+                        boolean b1 = rs.executeUpdate(sql);
+                        log.writeLog("deptid " + deptid + " ---------是否成功：" + b1);
+                        updateNum++;
+                        //处理部门矩阵
+                        sql = "select deptid,bmfzr,bmfgld,sfzy from HrmDepartmentDefined where deptid ='" + deptid + "'";
+                        rs.executeQuery(sql);
+                        if (rs.next()) {
+                            bmfzr = !"".equals(bmfzr) ? bmfzr : Util.null2String(rs.getString("bmfzr"));
+                            bmfgld = !"".equals(bmfgld) ? bmfgld : Util.null2String(rs.getString("bmfgld"));
+                            sql = "update HrmDepartmentDefined set " +
+                                    "bmfzr = '" + bmfzr + "' " +
+                                    ",sfzy = '" + row.getIsDirectSales() + "' " +
+                                    ",frgs= '" + companyCode + "'" +
+                                    ",bmfgld= '" + bmfgld + "'" +
+                                    ",guojia = '" + countryCode + "' " +
+                                    " where deptid = '" + deptid + "'";
+                            boolean b = rs.executeUpdate(sql);
+                            log.writeLog("更新部门自定义表中数据sql--------->" + sql);
+                            log.writeLog("deptid " + deptid + " ---------是否成功：" + b);
+                        } else {
+                            sql = "insert into HrmDepartmentDefined(deptid,sfzy,frgs,bmfzr,bmfgld,guojia) " +
+                                    "values('" + deptid + "'," +
+                                    "'" + row.getIsDirectSales() + "'," +
+                                    "'" + companyCode + "'," +
+                                    "'" + bmfzr + "'," +
+                                    "'" + bmfgld + ",'" +
+                                    "'" + countryCode + "')";
+                            boolean b = rs.executeUpdate(sql);
+                            log.writeLog("插入部门自定义表中数据sql--------->" + sql);
+                            log.writeLog("deptid " + deptid + " ---------是否成功：" + b);
+                        }
+                        //同步部门矩阵信息
+                        MatrixUtil.updateDepartmentData(deptid);
+                        continue;
+                    }
+                    //如果找到subcompanyid1不为空，说明是顶级部门，
+                    if (!"".equals(subcompanyid1)) {
+                        supdepid = "0";
+                    }
+                    if (!"".equals(supdepid) && "".equals(subcompanyid1)) {
+                        log.writeLog("开始取部门:" + departmentCode + ",上级分部id:" + supdepid + "。");
+                        subcompanyid1 = getSubId(map_dept_id_data, supdepid);
+                        log.writeLog("结束取部门:" + departmentCode + ",上级分部id:" + supdepid + ",取到的分部id:" + subcompanyid1);
+                        if ("".equals(subcompanyid1)) {
+                            log.writeLog("---------------分部id找不到:");
+                            deptMap.put(departmentCode, superiorDepartment);
+                        }
+                    }
+                    sql = "insert into HrmDepartment (departmentname,departmentcode,departmentmark,outkey," +
+                            "supdepid,canceled,created,creater,modified,modifier," +
+                            "showorder,subcompanyid1,bmfzr,bmfgld) values("
+                            + "'" + departmentName + "',"
+                            + "'" + departmentCode + "',"
+                            + "'" + departmentName + "',"
+                            + "'" + departmentCode + "',"
+                            + "'" + supdepid + "',"
+                            + "" + canceled + ","
+                            + "to_date('" + now + "','yyyy-mm-dd hh24:mi:ss'),"
+                            + "'1',"
+                            + "to_date('" + now + "','yyyy-mm-dd hh24:mi:ss'),"
+                            + "'1',"
+                            + "'" + departmentOrder + "',"
+                            + "'" + subcompanyid1 + "', "
+                            + "'" + bmfzr + "', "
+                            + "'" + bmfgld + "')";
+                    log.writeLog("插入部门表生成新数据sql--------->" + sql);
+                    rs.executeUpdate(sql);
+                    insertNum++;
+                    rs.executeQuery("select id from HrmDepartment where departmentcode = ?", departmentCode);
+                    int maxDeptID = 0;//新插入数据的部门ID
+                    if (rs.next()) {
+                        maxDeptID = rs.getInt("id");
+                        //将新增加的部门加入至MAP中
+                        map_dept_code_id.put(departmentCode, maxDeptID + "");
+                        Map<String, String> map1 = new HashMap<>();
+                        map1.put("outkey", departmentCode);
+                        map1.put("supdepid", supdepid);
+                        map1.put("subcompanyid1", subcompanyid1);
+                        log.writeLog("maxDeptID--------->" + maxDeptID + ",size:" + map_dept_id_data.size());
+                        map_dept_id_data.put(maxDeptID + "", map1);
+                    }
+                    //新增数据,插入到部门自定义表HrmDepartmentDefined中
+                    sql = "insert into HrmDepartmentDefined(deptid,sfzy,frgs,bmfzr,bmfgld,guojia) " +
+                            "values('" + maxDeptID + "'," +
+                            "'" + row.getIsDirectSales() + "'," +
+                            "'" + companyCode + "'," +
+                            "'" + bmfzr + "'," +
+                            "'" + bmfgld + "'," +
+                            "'" + countryCode + "')";
+                    boolean b = rs.executeUpdate(sql);
+                    log.writeLog("插入部门自定义表中数据sql--------->" + sql);
+                    log.writeLog("deptid " + maxDeptID + " ---------是否成功：" + b);
+                    //同步部门矩阵信息
+                    MatrixUtil.updateDepartmentData(maxDeptID + "");
+//                //将新增加的人员自定义信息加入至MAP中
+//                map_dept_id_defined.put(maxDeptID + "", maxDeptID + "");
+//                //将部门与所属分部对应关系放到map中
+//                map_deptid_subcompanyid.put(maxDeptID + "", subcompanyid1);
+                } else {//部门存在则更新
+                    //如果找到subcompanyid1不为空，说明是顶级部门，
+                    String deptid = Util.null2String(map_dept_code_id.get(departmentCode));//OA部门ID
+                    if ("".equals(deptid)) {
+                        skipNum++;
+                        log.writeLog("cylnb deptid is null");
+                        deptMap.put(departmentCode, superiorDepartment);
+                        //continue;
+                    }
+                    if (!"".equals(subcompanyid1)) {
+                        supdepid = "0";
+                    }
+                    if (!"".equals(supdepid) && "".equals(subcompanyid1)) {
+                        log.writeLog("开始取部门" + departmentCode + "上级分部id：" + supdepid + "。");
+                        subcompanyid1 = getSubId(map_dept_id_data, supdepid);
+                        log.writeLog("结束取部门" + departmentCode + "上级分部id：" + supdepid + "。取到的分部id：" + subcompanyid1);
+                        if ("".equals(subcompanyid1)) {
+                            log.writeLog("----------------分部id找不到");
+                            deptMap.put(departmentCode, superiorDepartment);
+                        }
+                    }
+                    String updateStr = "";
+                    //只有有值才覆盖
+                    updateStr += !"".equals(subcompanyid1) ? "subcompanyid1 = '" + subcompanyid1 + "', " : "";
+                    updateStr += !"".equals(supdepid) ? "supdepid = '" + supdepid + "', " : "";
+                    updateStr += !"".equals(bmfzr) ? "bmfzr = '" + bmfzr + "', " : "";
+                    updateStr += !"".equals(bmfgld) ? "bmfgld = '" + bmfgld + "', " : "";
+                    sql = "update HrmDepartment set " +
+                            "departmentname = '" + departmentName + "', " +
+                            "departmentmark = '" + departmentName + "', " +
+                            updateStr +
+                            "canceled = " + canceled + ", " +
+                            "modified = to_date('" + now + "','yyyy-mm-dd hh24:mi:ss'), " +
+                            "modifier = '1', " +
+                            "showorder = '" + departmentOrder + "' " +
+                            "where  id= '" + deptid + "'";
+                    log.writeLog("更新部门表中数据sql--------->" + sql);
+                    boolean b1 = rs.executeUpdate(sql);
+                    log.writeLog("deptid " + deptid + " ---------是否成功：" + b1);
+                    // map_dept_code_id.put(departmentCode, deptid + "");
+                    Map<String, String> map1 = new HashMap<>();
+                    map1.put("outkey", departmentCode);
+                    map1.put("supdepid", supdepid);
+                    map1.put("subcompanyid1", subcompanyid1);
+                    log.writeLog("update-maxDeptID--------->" + deptid + ",size:" + map_dept_id_data.size());
+                    map_dept_id_data.put(deptid + "", map1);
+                    updateNum++;
+                    //处理部门矩阵
+                    sql = "select deptid,bmfzr,bmfgld,sfzy from HrmDepartmentDefined where deptid ='" + deptid + "'";
+                    rs.executeQuery(sql);
+                    if (rs.next()) {
+                        bmfzr = !"".equals(bmfzr) ? bmfzr : Util.null2String(rs.getString("bmfzr"));
+                        bmfgld = !"".equals(bmfgld) ? bmfgld : Util.null2String(rs.getString("bmfgld"));
+                        sql = "update HrmDepartmentDefined set " +
+                                "bmfzr = '" + bmfzr + "' " +
+                                ",sfzy = '" + row.getIsDirectSales() + "' " +
+                                ",frgs= '" + companyCode + "'" +
+                                ",bmfgld= '" + bmfgld + "'" +
+                                ",guojia = '" + countryCode + "' " +
+                                " where deptid = '" + deptid + "'";
+                        boolean b = rs.executeUpdate(sql);
+                        log.writeLog("更新部门自定义表中数据sql--------->" + sql);
+                        log.writeLog("deptid " + deptid + " ---------是否成功：" + b);
+                    } else {
+                        sql = "insert into HrmDepartmentDefined(deptid,sfzy,frgs,bmfzr,bmfgld,guojia) " +
+                                "values('" + deptid + "'," +
+                                "'" + row.getIsDirectSales() + "'," +
+                                "'" + companyCode + "'," +
+                                "'" + bmfzr + "'," +
+                                "'" + bmfgld + ",'" +
+                                "'" + countryCode + "')";
+                        boolean b = rs.executeUpdate(sql);
+                        log.writeLog("插入部门自定义表中数据sql--------->" + sql);
+                        log.writeLog("deptid " + deptid + " ---------是否成功：" + b);
+                    }
+                    //人员信息伴随部门信息变化
+                    if (!"".equals(subcompanyid1) && !"".equals(deptid)) {
+                        sql = "update hrmResource set subCompanyId1='" + subcompanyid1 + "' where departmentId = '" + deptid + "' ";
+                        rs.executeUpdate(sql);
+
+                        //更新该部门的所有下级部门的所属分部
+                        sql = "update hrmdepartment set subCompanyId1 = '" + subcompanyid1 + "' where exists ( \n" +
+                            "   select 1 from (" +
+                            "       select id from hrmdepartment start with id = " + deptid + " connect by supdepid = prior id \n" +
+                            "   ) s where s.id = hrmdepartment.id \n" +
+                            ")";
+
+                        rs.executeUpdate(sql);
+                    }
+                    //同步部门矩阵信息
+                    MatrixUtil.updateDepartmentData(deptid);
+                }
+            }
+
+
+//        for (int i = 0; i < departments.size(); i++) {
+//            DepartmentDto row = departments.get(i);
+//            String departmentCode = Util.null2String(row.getDepartmentCode());//部门编码
+//            String superiorDepartment = Util.null2String(row.getSuperiorDepartment());//上级部门编码
+//            String parId = "";
+//            rs.executeQuery("select * from HRMDEPARTMENT where outkey = ?",superiorDepartment);
+//            if(rs.next()){
+//                parId = rs.getString("id");
+//            }
+//            rs.executeUpdate("update HRMDEPARTMENT set supdepid = ? where outkey = ?",parId,departmentCode);
+//        }
+
+            log.writeLog("此次同步部门总数为：" + departments.size() + ",新增部门数为：" + insertNum +
+                    ",更新部门数为：" + updateNum + ",跳出处理部门数为：" + skipNum);
+            log.writeLog("此次同步部门跳过是数据为：" + JSON.toJSONString(skipList));
+
+
+            log.writeLog("----sta:" + deptMap.size());
+            int size = deptMap.size();
+            int lastCount = deptMap.size();
+            for (int i = 0; i < size; i++) {
+                if (deptMap.size() == 0) {
+                    break;
+                }
+                log.writeLog("---------------当前正在执行第" + i + "次，本次剩余" + deptMap.size() + "条部门待处理");
+                setSup();
+                if (lastCount <= deptMap.size()) {
+                    log.writeLog("---------------异常，有" + deptMap.size() + "条部门无分部的数据异常");
+                    break;
+                } else {
+                    lastCount = deptMap.size();
+                }
+            }
+            log.writeLog("----end");
+
+
+            //更新部门缓存
+            DepartmentComInfo dci = new DepartmentComInfo();
+            dci.removeCompanyCache();
+
+            //释放map内存
+            map_dept_id_data.clear();
+            map_dept_id_data = null;
+            map_dept_code_id.clear();
+            map_dept_code_id = null;
+            map_user_code_id.clear();
+            map_user_code_id = null;
+
+            //更新同步时间到中间表
+            String sql1 = "update uf_HRRestDate set sctbsj ='" + now + "' where jkm = '/dcopenedi/hrDept/pageByUpdateTime'";
+            rs.executeUpdate(sql1);
+
+        } catch (Exception e) {
+            log.writeLog("--------------------Exception：" + JavaUtil.getExceptionDetail(e));
+            e.printStackTrace();
+        }
+        return rtMap;
+    }
+
+
+    public void setSup() {
+        RecordSet rss = new RecordSet();
+        Set keySet = deptMap.keySet();
+        Iterator it = keySet.iterator();
+        while (it.hasNext()) {
+            try {
+                String deptCode = (String) it.next();
+                String supCode = String.valueOf(deptMap.get(deptCode));
+                String SUPDEPID = "";
+                String SUBCOMPANYID1 = "";
+                rss.executeQuery("select * from hrmdepartment where departmentcode = ?", supCode);
+                if (rss.next()) {
+                    SUPDEPID = rss.getString("id");
+                    SUBCOMPANYID1 = rss.getString("SUBCOMPANYID1");
+                    if (SUBCOMPANYID1 != null && !"".equals(SUBCOMPANYID1)) {
+                        rss.executeUpdate("update hrmdepartment set SUPDEPID = ? ,SUBCOMPANYID1 = ? where departmentcode = ? ", SUPDEPID, SUBCOMPANYID1, deptCode);
+                        it.remove();
+                    }
+                    log.writeLog("-----------------已补处理部门code：" + deptCode + "，分部id：" + SUBCOMPANYID1);
+                }
+            } catch (Exception e) {
+                log.writeLog("--------------------Exception：" + JavaUtil.getExceptionDetail(e));
+            }
+        }
+
+    }
+
+
+    /**
+     * 匹配部门id，关联的上级部门，所属分部 map
+     *
+     * @return
+     */
+    private Map<String, Map<String, String>> getDeptDataMap() {
+        RecordSet rs = new RecordSet();
+        Map<String, Map<String, String>> map = new HashMap<>();
+        rs.executeQuery("select id, outkey,supdepid,subcompanyid1 from HrmDepartment where (CANCELED!=1 or CANCELED is null)");
+        while (rs.next()) {
+            Map<String, String> map1 = new HashMap<>();
+            map1.put("outkey", rs.getString("outkey"));
+            map1.put("supdepid", rs.getString("supdepid"));
+            map1.put("subcompanyid1", rs.getString("subcompanyid1"));
+            map.put(rs.getString("id"), map1);
+        }
+        return map;
+    }
+
+    /**
+     * 根据部门id匹配所属分部
+     *
+     * @return
+     */
+    public String getSubId(Map<String, Map<String, String>> map_dept_id_data, String deptId) {
+        String subcompanyid = "";
+        if (!map_dept_id_data.containsKey(deptId)) {
+            return "";
+        }
+        Map<String, String> map = map_dept_id_data.get(deptId);
+        subcompanyid = map.get("subcompanyid1");
+        return subcompanyid;
+    }
+//    /**
+//     * 获取部门编码和上级分部的集合
+//     *
+//     * @return
+//     */
+//    public Map<String, String> getDeptComMap() {
+//        RecordSet rs = new RecordSet();
+//        Map<String, String> map = new HashMap<>();
+//        rs.executeQuery("select outkey,supdepid from HrmDepartment where outkey is not null  and (CANCELED!=1 or CANCELED is null)");
+//        while (rs.next()) {
+//            map.put(rs.getString("outkey"), rs.getString("supdepid"));
+//        }
+//        return map;
+//    }
+
+    private Map<String, String> getAllDepartmentCodeIdMap() {
+        RecordSet rs = new RecordSet();
+        Map<String, String> map = new HashMap<>();
+        rs.executeQuery("select departmentcode,outkey,id from HrmDepartment where outkey is not null");
+        while (rs.next()) {
+            map.put(rs.getString("outkey"), rs.getString("id"));
+        }
+        return map;
+    }
+
+    public Map<String, String> getDepartmentCodeIdMap() {
+        RecordSet rs = new RecordSet();
+        Map<String, String> map = new HashMap<>();
+        rs.executeQuery("select departmentcode,outkey,id from HrmDepartment where outkey is not null  and (CANCELED!=1 or CANCELED is null)");
+        while (rs.next()) {
+            map.put(rs.getString("outkey"), rs.getString("id"));
+        }
+        return map;
+    }
+
+
+    /**
+     * 获取印尼部门数据
+     *
+     * @param date  时间
+     * @param point
+     * @return
+     */
+    public JSONArray getOcDepartments(String date, String point) {
+        int current = 1, size = 5000, pages = 2;
+        String url = HttpClientToJT.baseUrl + "/dcopenedi/hrDept/pageNewHrDeptByUpdateTime";
+        String token = HttpClientToJT.getToken();
+        log.writeLog("-------token--------->" + token);
+        Map<String, Object> params = new HashMap<>();
+        List list1 = new ArrayList();
+        list1.add("ZHS");
+        params.put("languageCds", list1);
+        params.put("countryCode", "IDN");
+        params.put("updateTime", date);
+        params.put("point", point);
+        params.put("size", size);
+        log.writeLog("传入JSON--------------->" + JSON.toJSONString(params));
+        String s = HttpClientToJT.sendPost(url, token, JSONObject.toJSONString(params));
+        JSONObject jsonObject = JSONObject.parseObject(s);
+        JSONArray jsonArray = new JSONArray();
+
+        String code = Util.null2String(jsonObject.getString("code"));
+        log.writeLog("code------>" + code);
+        if ("1".equals(code)) {
+            JSONObject result = jsonObject.getJSONObject("data");
+            JSONArray records = result.getJSONArray("records");
+            Object hasNextPage = result.get("hasNextPage");
+            jsonArray.addAll(records);
+            //下次继续传
+            maxPoint = result.get("maxPoint").toString();
+            if ("false".equals(hasNextPage.toString())) {
+                ifPage = false;
+            }
+
+            Object directSales = jsonArray.stream().filter(item -> {
+                JSONObject itemJson = JSONObject.parseObject(JSON.toJSONString(item));
+                return "IDN".equals(itemJson.getString("countryCode"));
+            }).collect(Collectors.toList());
+            jsonArray = JSONArray.parseArray(JSON.toJSONString(directSales));
+        }
+
+        return jsonArray;
+    }
+
+    /**
+     * 获取海外部门国家数据
+     *
+     * @param date  时间
+     * @param point
+     * @return
+     */
+    public JSONArray getOcDepartmentsGUOJIA(String date, String point, String guojia, String departmentCode) {
+        int current = 1, size = 5000, pages = 2;
+        String url = HttpClientToJT.baseUrl + "/dcopenedi/hrDept/pageNewHrDeptByUpdateTime";
+        String token = HttpClientToJT.getToken();
+        log.writeLog("-------token--------->" + token);
+        Map<String, Object> params = new HashMap<>();
+        List list1 = new ArrayList();
+        list1.add(guojia);
+        params.put("languageCds", list1);
+        params.put("updateTime", date);
+        params.put("point", point);
+        params.put("size", size);
+        params.put("deptCode", departmentCode);
+        log.writeLog("传入JSON--------------->" + JSON.toJSONString(params));
+        String s = HttpClientToJT.sendPost(url, token, JSONObject.toJSONString(params));
+        JSONObject jsonObject = JSONObject.parseObject(s);
+        JSONArray jsonArray = new JSONArray();
+
+        String code = Util.null2String(jsonObject.getString("code"));
+        log.writeLog("code------>" + code);
+        if ("1".equals(code)) {
+            JSONObject result = jsonObject.getJSONObject("data");
+            JSONArray records = result.getJSONArray("records");
+            Object hasNextPage = result.get("hasNextPage");
+            jsonArray.addAll(records);
+//            //下次继续传
+//            maxPoint = result.get("maxPoint").toString();
+//            if ("false".equals(hasNextPage.toString())) {
+//                ifPage = false;
+//            }
+
+            Object directSales = jsonArray.stream().filter(item -> {
+                JSONObject itemJson = JSONObject.parseObject(JSON.toJSONString(item));
+                return !"CHN".equals(itemJson.getString("countryCode"));
+            }).collect(Collectors.toList());
+            jsonArray = JSONArray.parseArray(JSON.toJSONString(directSales));
+        }
+
+        return jsonArray;
+    }
+
+
+    /**
+     * 获取多语言
+     *
+     * @param date           时间
+     * @param countryCode    国家code
+     * @param departmentCode 部门code
+     * @param deptName       部门中文名称
+     * @return 多语言名称
+     */
+    public String   getDepartmentName(String date, String countryCode, String departmentCode, String deptName) {
+        String retName = "";
+        boolean existence = true;
+        String language = "";
+        String cdIndex = "";
+        try {
+            if ("CHN".equals(countryCode)) {
+                language = "ZHS";
+            }
+            if ("BRA".equals(countryCode)) {
+                language = "POR";
+                cdIndex = "21";
+            }
+
+            if ("SAU".equals(countryCode) || "ARE".equals(countryCode)
+                    || "EGY".equals(countryCode)
+                    || "MEX".equals(countryCode)
+                    || "SGP".equals(countryCode)
+                    || "PHL".equals(countryCode)
+                    || "MYS".equals(countryCode)
+                    || "KHM".equals(countryCode)
+            ) {
+                existence = false;
+                language = "ENG";
+            }
+            // 、 • 7中°~^8英文、心‘9繁体、• ~‘14 越南°~17泰国°~‘21 葡萄牙‘～‘22 印尼
+            if ("IDN".equals(countryCode)) {
+                language = "IDN";
+                cdIndex = "22";
+            }
+            if ("THA".equals(countryCode)) {
+                language = "THA";
+                cdIndex = "17";
+            }
+            if ("VNM".equals(countryCode)) {
+                language = "VIE";
+                cdIndex = "14";
+            }
+
+            String country = "";
+            // 日期  位置  国家  部门code
+            JSONArray ocDepartmentsGUOJIA = getOcDepartmentsGUOJIA(date, "1", language, departmentCode);
+            List<DepartmentDto> countryList = JSONArray.parseArray(ocDepartmentsGUOJIA.toJSONString(), DepartmentDto.class);
+            DepartmentDto countryDto = countryList.get(0);
+            //对应国家的语言名称（对应国家标签里面）
+            String countryDepartmentName = countryDto.getDepartmentName();
+            log.writeLog("---------------对应国家语言名称：" + countryDepartmentName);
+
+            //departmentName =
+            if (existence) {
+                //需要3个标签
+                retName = "~`~`7 " + deptName + "`~`8 " + countryDepartmentName + "`~`" + cdIndex + " " + countryDepartmentName + "`~`~";
+            } else {
+                //只需要中文和英文
+                retName = "~`~`7 " + deptName + "`~`8 " + countryDepartmentName + "`~`~";
+            }
+
+            log.writeLog("---------------多语言名称：" + retName);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return retName;
+    }
+
+
+    private void writeFile(JSONArray jsonArray) {
+        BufferedWriter bw = null;
+        try {
+            bw = new BufferedWriter(new FileWriter("D:\\2.txt"));
+            //一次写一行
+            bw.write(jsonArray.toJSONString());
+            bw.newLine();  //换行用
+            //关闭流
+            bw.close();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        System.out.println("写入成功");
+    }
+
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/schedule/hrm/idn/SynHrmdepartmentToOAIDNOld.java b/src/main/youhong_ai_jitu_src/jntchina/schedule/hrm/idn/SynHrmdepartmentToOAIDNOld.java
new file mode 100644
index 0000000..6580085
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/schedule/hrm/idn/SynHrmdepartmentToOAIDNOld.java
@@ -0,0 +1,807 @@
+package jntchina.schedule.hrm.idn;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.api.integration.util.JavaUtil;
+import jntchina.schedule.hrm.SyncHrmdepartmentToOA;
+import jntchina.schedule.hrm.SyncHrmresourceToOA;
+import jntchina.schedule.hrm.entity.DepartmentDto;
+import jntchina.util.HttpClientToJT;
+import selfdev.util.base.TimeCommonUtil;
+import selfdev.util.log.LogTool;
+import weaver.conn.RecordSet;
+import weaver.general.Util;
+import weaver.hrm.company.DepartmentComInfo;
+import weaver.matrix.MatrixUtil;
+
+import java.io.BufferedWriter;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.util.*;
+import java.util.stream.Collectors;
+
+public class SynHrmdepartmentToOAIDNOld {
+
+    Map<String, Object> deptMap = new HashMap<>();
+
+
+    //分页接口参数
+    String maxPoint = "1";
+    //接口是否有下一页 默认为有
+    boolean ifPage = true;
+
+
+    //部门编码和id  map
+    Map<String, String> map_dept_code_id = new HashMap<String, String>();
+    private LogTool log = new LogTool("/log/hrm/IDN/dept/", false);
+
+    //60里面是否还有分部
+    boolean ifExistenceSub = true;
+
+    //所有10分部的上级
+    List subList = new ArrayList();
+
+
+    //存放60分部
+    List list60 = new ArrayList();
+
+
+    public void ScreenSub(Map<String, Object> supSubMap) {
+        try {
+            boolean ifSub = false;
+            Set keySet = supSubMap.keySet();
+            Iterator it = keySet.iterator();
+            while (it.hasNext()) {
+                //60的key
+                String deptCode = (String) it.next();
+                if (subList.contains(deptCode)) {
+                    ifSub = true;
+                    String supDeptCode = String.valueOf(supSubMap.get(deptCode));
+                    //60的value
+                    list60.add(deptCode);
+                    subList.add(supDeptCode);
+                    supSubMap.remove(deptCode);
+                }
+            }
+            ifExistenceSub = ifSub;
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+
+    /**
+     * 同步分部、部门数据
+     * 注：对方整个组织数不区分部门和分部，全部用部门接口数据，用类型区分
+     */
+    public Map<String, List<DepartmentDto>> execute(String date) {
+        Map<String, List<DepartmentDto>> rtMap = new HashMap<>();
+        try {
+            String now = TimeCommonUtil.obtainDate(0);
+            //匹配部门id，关联的上级部门，所属分部 map
+            Map<String, Map<String, String>> map_dept_id_data = new HashMap<>();
+            map_dept_id_data = getDeptDataMap();
+//        log.writeLog("字典："+JSON.toJSONString(map_dept_id_data));
+            map_dept_code_id = getAllDepartmentCodeIdMap();
+            SyncHrmsubcompanyToOAIDN hrmsubcompany = new SyncHrmsubcompanyToOAIDN();
+            SyncHrmresourceToOA hrmresource = new SyncHrmresourceToOA();
+            //人员map,用于匹配上级领导
+            Map<String, String> map_user_code_id = hrmresource.getUserCodeIdMap();
+            //拆分数据、organizationClass 10类型是组织，其他类型当部门,【代理区】在对方那是虚拟部门，特殊处理划分为OA   分部
+            //JSONArray data = getDepartments(date);
+            //JSONArray ocData = getOcDepartments(date);
+
+            JSONArray ocData = new JSONArray();
+            while (ifPage) {
+                ocData.addAll(getOcDepartments(date, maxPoint));
+            }
+
+            //key为60自己，value为上级
+            Map<String, Object> supSubMap = new HashMap<>();
+
+            Object directSales = ocData.stream().filter(item -> {
+                JSONObject itemJson = JSONObject.parseObject(JSON.toJSONString(item));
+                if ("10".equals(itemJson.getString("organizationClass"))) {
+                    subList.add(itemJson.getString("superiorDepartment"));
+                }
+                if ("60".equals(itemJson.getString("organizationClass"))) {
+                    //key为60自己，value为上级
+                    supSubMap.put(itemJson.getString("departmentCode"), itemJson.getString("superiorDepartment"));
+                }
+                return !"10".equals(itemJson.getString("organizationClass"));
+            }).collect(Collectors.toList());
+
+            while (ifExistenceSub) {
+                ScreenSub(supSubMap);
+            }
+
+            List<DepartmentDto> dataList = JSONArray.parseArray(ocData.toJSONString(), DepartmentDto.class);
+            log.writeLog("-----------------全部长度：" + dataList.size());
+
+            //分部数据
+            List<DepartmentDto> subcompanys = dataList.stream().filter(item -> {
+                //return "10".equals(item.getOrganizationClass()) || "60".equals(item.getOrganizationClass());
+                return "10".equals(item.getOrganizationClass()) || ("60".equals(item.getOrganizationClass()) && list60.contains(item.getDepartmentCode()));
+            }).collect(Collectors.toList());
+            //部门数据  注意：10000300代理区编码
+            List<DepartmentDto> departments = dataList.stream().filter(item -> {
+                return "20".equals(item.getOrganizationClass())
+                        || "30".equals(item.getOrganizationClass())
+                        || "40".equals(item.getOrganizationClass())
+                        || "50".equals(item.getOrganizationClass())
+                        || ("60".equals(item.getOrganizationClass()) && !list60.contains(item.getDepartmentCode()));
+            }).collect(Collectors.toList());
+            log.writeLog("-----------------分部长度：" + subcompanys.size());
+            log.writeLog("-----------------部门长度：" + departments.size());
+
+            rtMap.put("department", departments);
+            //处理分部同步逻辑
+            List<DepartmentDto> execute = hrmsubcompany.execute(subcompanys, departments);
+            //departments = execute;
+            Map<String, String> map_subcompany_code_id = hrmsubcompany.getSubCodeIdMap();
+            //处理部门同步逻辑
+            RecordSet rs = new RecordSet();
+            int skipNum = 0, insertNum = 0, updateNum = 0;
+            List<DepartmentDto> skipList = new ArrayList<>();
+            log.writeLog("----------开始同步部门，条数:" + departments.size());
+            //log.writeLog("----------同步部门源数据：" + JSON.toJSONString(departments));
+            // 处理部门同步逻辑 1.未匹配到分部，不新增，
+            for (int i = 0; i < departments.size(); i++) {
+                DepartmentDto row = departments.get(i);
+                String countryCode = Util.null2String(row.getCountryCode());//国家
+                String departmentCode = Util.null2String(row.getDepartmentCode());//部门编码
+                String departmentName = Util.null2String(row.getDepartmentName());//部门全称
+                String shortName = Util.null2String(row.getDepartmentAbbreviation());//部门简称
+                String superiorDepartment = Util.null2String(row.getSuperiorDepartment());//上级部门编码
+                String departmentOrder = Util.null2String(row.getDepartmentOrder());//排序
+                String deptManager = Util.null2String(row.getDeptManager());//部门负责人code
+                String brchLeader = Util.null2String(row.getBrchLeader());//分管领导code
+                Integer canceled = Util.null2String(row.getStatus()).equals("3") ? 1 : null;//1 新增  2 修改  3作废
+                String companyCode = Util.null2String(row.getCompanyCode());// 公司
+//            String companyName = Util.null2String(row.getCompanyName());//公司名称
+                if ("".equals(superiorDepartment)) {
+                    skipList.add(row);
+                    log.writeLog("cylnb superiorDepartment is null:" + superiorDepartment);
+                    skipNum++;
+                    deptMap.put(departmentCode, superiorDepartment);
+                    // continue;
+                }
+                //各种code转id
+                String bmfzr = Util.null2String(map_user_code_id.get(deptManager));//部门负责人
+                String bmfgld = Util.null2String(map_user_code_id.get(brchLeader));//分管领导
+                String subcompanyid1 = Util.null2String(map_subcompany_code_id.get(superiorDepartment));//分部ID
+                String supdepid = Util.null2String(map_dept_code_id.get(superiorDepartment));//获取上级ID
+                log.writeLog("------------subcompanyid1：" + subcompanyid1 + "-----deptCode：" + departmentCode + ",status:" + row.getStatus() + ",canceled:" + canceled + "-------");
+                log.writeLog("------------supdepid：" + supdepid + "----deptCode：" + departmentCode + ",status:" + row.getStatus() + ",canceled:" + canceled + "--------");
+                //如果上级编码为空、所属分部，上级部门都找不到，不作处理
+                if ("".equals(superiorDepartment) || ("".equals(subcompanyid1) && "".equals(supdepid))) {
+                    skipList.add(row);
+                    skipNum++;
+                    log.writeLog("cylnb 上级编码为空、所属分部，上级部门都找不到，不作处理deptcode:" + departmentCode + ";supcode:" + superiorDepartment);
+                    deptMap.put(departmentCode, superiorDepartment);
+                    //continue;
+                }
+                String sql = "";
+                //判断HR部门ID是否已经存在
+
+                String status = row.getStatus();
+                if (!"3".equals(status)) {
+                    log.writeLog("---------------国家：" + countryCode);
+                    departmentName = getDepartmentName(date, countryCode, departmentCode, departmentName);
+                } else {
+                    log.writeLog("----------------状态为3");
+                }
+
+                if ("".equals(departmentName)) {
+                    log.writeLog("----------------多语言为空");
+                    departmentName = row.getDepartmentName();
+                }
+
+                log.writeLog("-----------------countryCode:" + countryCode);
+                log.writeLog("-----------------departmentName:" + departmentName);
+                log.writeLog("第" + (i + 1) + "条，取数据完成！");
+                if (!map_dept_code_id.containsKey(departmentCode)) {//部门不存在则插入生成新部门
+                    rs.executeQuery("select id from hrmdepartment where outkey = ?", departmentCode);
+                    if (rs.next()) {
+                        String id = rs.getString("id");
+                        //如果找到subcompanyid1不为空，说明是顶级部门，
+                        //String deptid = Util.null2String(map_dept_code_id.get(departmentCode));//OA部门ID
+                        String deptid = id;//OA部门ID
+                        if ("".equals(deptid)) {
+                            skipNum++;
+                            log.writeLog("cylnb deptid is null");
+                            deptMap.put(departmentCode, superiorDepartment);
+                            //continue;
+                        }
+                        if (!"".equals(subcompanyid1)) {
+                            supdepid = "0";
+                        }
+                        if (!"".equals(supdepid) && "".equals(subcompanyid1)) {
+                            log.writeLog("开始取部门" + departmentCode + "上级分部id：" + supdepid + "。");
+                            subcompanyid1 = getSubId(map_dept_id_data, supdepid);
+                            log.writeLog("结束取部门" + departmentCode + "上级分部id：" + supdepid + "。取到的分部id：" + subcompanyid1);
+                            if ("".equals(subcompanyid1)) {
+                                log.writeLog("----------------分部id找不到");
+                                deptMap.put(departmentCode, superiorDepartment);
+                            }
+                        }
+                        String updateStr = "";
+                        //只有有值才覆盖
+                        updateStr += !"".equals(subcompanyid1) ? "subcompanyid1 = '" + subcompanyid1 + "', " : "";
+                        updateStr += !"".equals(supdepid) ? "supdepid = '" + supdepid + "', " : "";
+                        updateStr += !"".equals(bmfzr) ? "bmfzr = '" + bmfzr + "', " : "";
+                        updateStr += !"".equals(bmfgld) ? "bmfgld = '" + bmfgld + "', " : "";
+                        sql = "update HrmDepartment set " +
+                                "departmentname = '" + departmentName + "', " +
+                                "departmentmark = '" + departmentName + "', " +
+                                updateStr +
+                                "canceled = " + canceled + ", " +
+                                "modified = to_date('" + now + "','yyyy-mm-dd hh24:mi:ss'), " +
+                                "modifier = '1', " +
+                                "showorder = '" + departmentOrder + "' " +
+                                "where  id= '" + deptid + "'";
+                        log.writeLog("更新部门表中数据sql--------->" + sql);
+                        boolean b1 = rs.executeUpdate(sql);
+                        log.writeLog("deptid " + deptid + " ---------是否成功：" + b1);
+                        updateNum++;
+                        //处理部门矩阵
+                        sql = "select deptid,bmfzr,bmfgld,sfzy from HrmDepartmentDefined where deptid ='" + deptid + "'";
+                        rs.executeQuery(sql);
+                        if (rs.next()) {
+                            bmfzr = !"".equals(bmfzr) ? bmfzr : Util.null2String(rs.getString("bmfzr"));
+                            bmfgld = !"".equals(bmfgld) ? bmfgld : Util.null2String(rs.getString("bmfgld"));
+                            sql = "update HrmDepartmentDefined set " +
+                                    "bmfzr = '" + bmfzr + "' " +
+                                    ",sfzy = '" + row.getIsDirectSales() + "' " +
+                                    ",frgs= '" + companyCode + "'" +
+                                    ",bmfgld= '" + bmfgld + "'" +
+                                    ",guojia = '" + countryCode + "' " +
+                                    " where deptid = '" + deptid + "'";
+                            boolean b = rs.executeUpdate(sql);
+                            log.writeLog("更新部门自定义表中数据sql--------->" + sql);
+                            log.writeLog("deptid " + deptid + " ---------是否成功：" + b);
+                        } else {
+                            sql = "insert into HrmDepartmentDefined(deptid,sfzy,frgs,bmfzr,bmfgld,guojia) " +
+                                    "values('" + deptid + "'," +
+                                    "'" + row.getIsDirectSales() + "'," +
+                                    "'" + companyCode + "'," +
+                                    "'" + bmfzr + "'," +
+                                    "'" + bmfgld + ",'" +
+                                    "'" + countryCode + "')";
+                            boolean b = rs.executeUpdate(sql);
+                            log.writeLog("插入部门自定义表中数据sql--------->" + sql);
+                            log.writeLog("deptid " + deptid + " ---------是否成功：" + b);
+                        }
+                        //同步部门矩阵信息
+                        MatrixUtil.updateDepartmentData(deptid);
+                        continue;
+                    }
+                    //如果找到subcompanyid1不为空，说明是顶级部门，
+                    if (!"".equals(subcompanyid1)) {
+                        supdepid = "0";
+                    }
+                    if (!"".equals(supdepid) && "".equals(subcompanyid1)) {
+                        log.writeLog("开始取部门:" + departmentCode + ",上级分部id:" + supdepid + "。");
+                        subcompanyid1 = getSubId(map_dept_id_data, supdepid);
+                        log.writeLog("结束取部门:" + departmentCode + ",上级分部id:" + supdepid + ",取到的分部id:" + subcompanyid1);
+                        if ("".equals(subcompanyid1)) {
+                            log.writeLog("---------------分部id找不到:");
+                            deptMap.put(departmentCode, superiorDepartment);
+                        }
+                    }
+                    sql = "insert into HrmDepartment (departmentname,departmentcode,departmentmark,outkey," +
+                            "supdepid,canceled,created,creater,modified,modifier," +
+                            "showorder,subcompanyid1,bmfzr,bmfgld) values("
+                            + "'" + departmentName + "',"
+                            + "'" + departmentCode + "',"
+                            + "'" + departmentName + "',"
+                            + "'" + departmentCode + "',"
+                            + "'" + supdepid + "',"
+                            + "" + canceled + ","
+                            + "to_date('" + now + "','yyyy-mm-dd hh24:mi:ss'),"
+                            + "'1',"
+                            + "to_date('" + now + "','yyyy-mm-dd hh24:mi:ss'),"
+                            + "'1',"
+                            + "'" + departmentOrder + "',"
+                            + "'" + subcompanyid1 + "', "
+                            + "'" + bmfzr + "', "
+                            + "'" + bmfgld + "')";
+                    log.writeLog("插入部门表生成新数据sql--------->" + sql);
+                    rs.executeUpdate(sql);
+                    insertNum++;
+                    rs.executeQuery("select id from HrmDepartment where departmentcode = ?", departmentCode);
+                    int maxDeptID = 0;//新插入数据的部门ID
+                    if (rs.next()) {
+                        maxDeptID = rs.getInt("id");
+                        //将新增加的部门加入至MAP中
+                        map_dept_code_id.put(departmentCode, maxDeptID + "");
+                        Map<String, String> map1 = new HashMap<>();
+                        map1.put("outkey", departmentCode);
+                        map1.put("supdepid", supdepid);
+                        map1.put("subcompanyid1", subcompanyid1);
+                        log.writeLog("maxDeptID--------->" + maxDeptID + ",size:" + map_dept_id_data.size());
+                        map_dept_id_data.put(maxDeptID + "", map1);
+                    }
+                    //新增数据,插入到部门自定义表HrmDepartmentDefined中
+                    sql = "insert into HrmDepartmentDefined(deptid,sfzy,frgs,bmfzr,bmfgld,guojia) " +
+                            "values('" + maxDeptID + "'," +
+                            "'" + row.getIsDirectSales() + "'," +
+                            "'" + companyCode + "'," +
+                            "'" + bmfzr + "'," +
+                            "'" + bmfgld + "'," +
+                            "'" + countryCode + "')";
+                    boolean b = rs.executeUpdate(sql);
+                    log.writeLog("插入部门自定义表中数据sql--------->" + sql);
+                    log.writeLog("deptid " + maxDeptID + " ---------是否成功：" + b);
+                    //同步部门矩阵信息
+                    MatrixUtil.updateDepartmentData(maxDeptID + "");
+//                //将新增加的人员自定义信息加入至MAP中
+//                map_dept_id_defined.put(maxDeptID + "", maxDeptID + "");
+//                //将部门与所属分部对应关系放到map中
+//                map_deptid_subcompanyid.put(maxDeptID + "", subcompanyid1);
+                } else {//部门存在则更新
+                    //如果找到subcompanyid1不为空，说明是顶级部门，
+                    String deptid = Util.null2String(map_dept_code_id.get(departmentCode));//OA部门ID
+                    if ("".equals(deptid)) {
+                        skipNum++;
+                        log.writeLog("cylnb deptid is null");
+                        deptMap.put(departmentCode, superiorDepartment);
+                        //continue;
+                    }
+                    if (!"".equals(subcompanyid1)) {
+                        supdepid = "0";
+                    }
+                    if (!"".equals(supdepid) && "".equals(subcompanyid1)) {
+                        log.writeLog("开始取部门" + departmentCode + "上级分部id：" + supdepid + "。");
+                        subcompanyid1 = getSubId(map_dept_id_data, supdepid);
+                        log.writeLog("结束取部门" + departmentCode + "上级分部id：" + supdepid + "。取到的分部id：" + subcompanyid1);
+                        if ("".equals(subcompanyid1)) {
+                            log.writeLog("----------------分部id找不到");
+                            deptMap.put(departmentCode, superiorDepartment);
+                        }
+                    }
+                    String updateStr = "";
+                    //只有有值才覆盖
+                    updateStr += !"".equals(subcompanyid1) ? "subcompanyid1 = '" + subcompanyid1 + "', " : "";
+                    updateStr += !"".equals(supdepid) ? "supdepid = '" + supdepid + "', " : "";
+                    updateStr += !"".equals(bmfzr) ? "bmfzr = '" + bmfzr + "', " : "";
+                    updateStr += !"".equals(bmfgld) ? "bmfgld = '" + bmfgld + "', " : "";
+                    sql = "update HrmDepartment set " +
+                            "departmentname = '" + departmentName + "', " +
+                            "departmentmark = '" + departmentName + "', " +
+                            updateStr +
+                            "canceled = " + canceled + ", " +
+                            "modified = to_date('" + now + "','yyyy-mm-dd hh24:mi:ss'), " +
+                            "modifier = '1', " +
+                            "showorder = '" + departmentOrder + "' " +
+                            "where  id= '" + deptid + "'";
+                    log.writeLog("更新部门表中数据sql--------->" + sql);
+                    boolean b1 = rs.executeUpdate(sql);
+                    log.writeLog("deptid " + deptid + " ---------是否成功：" + b1);
+                    // map_dept_code_id.put(departmentCode, deptid + "");
+                    Map<String, String> map1 = new HashMap<>();
+                    map1.put("outkey", departmentCode);
+                    map1.put("supdepid", supdepid);
+                    map1.put("subcompanyid1", subcompanyid1);
+                    log.writeLog("update-maxDeptID--------->" + deptid + ",size:" + map_dept_id_data.size());
+                    map_dept_id_data.put(deptid + "", map1);
+                    updateNum++;
+                    //处理部门矩阵
+                    sql = "select deptid,bmfzr,bmfgld,sfzy from HrmDepartmentDefined where deptid ='" + deptid + "'";
+                    rs.executeQuery(sql);
+                    if (rs.next()) {
+                        bmfzr = !"".equals(bmfzr) ? bmfzr : Util.null2String(rs.getString("bmfzr"));
+                        bmfgld = !"".equals(bmfgld) ? bmfgld : Util.null2String(rs.getString("bmfgld"));
+                        sql = "update HrmDepartmentDefined set " +
+                                "bmfzr = '" + bmfzr + "' " +
+                                ",sfzy = '" + row.getIsDirectSales() + "' " +
+                                ",frgs= '" + companyCode + "'" +
+                                ",bmfgld= '" + bmfgld + "'" +
+                                ",guojia = '" + countryCode + "' " +
+                                " where deptid = '" + deptid + "'";
+                        boolean b = rs.executeUpdate(sql);
+                        log.writeLog("更新部门自定义表中数据sql--------->" + sql);
+                        log.writeLog("deptid " + deptid + " ---------是否成功：" + b);
+                    } else {
+                        sql = "insert into HrmDepartmentDefined(deptid,sfzy,frgs,bmfzr,bmfgld,guojia) " +
+                                "values('" + deptid + "'," +
+                                "'" + row.getIsDirectSales() + "'," +
+                                "'" + companyCode + "'," +
+                                "'" + bmfzr + "'," +
+                                "'" + bmfgld + ",'" +
+                                "'" + countryCode + "')";
+                        boolean b = rs.executeUpdate(sql);
+                        log.writeLog("插入部门自定义表中数据sql--------->" + sql);
+                        log.writeLog("deptid " + deptid + " ---------是否成功：" + b);
+                    }
+                    //人员信息伴随部门信息变化
+                    if (!"".equals(subcompanyid1) && !"".equals(deptid)) {
+                        sql = "update hrmResource set subCompanyId1='" + subcompanyid1 + "' where departmentId = '" + deptid + "' ";
+                        rs.executeUpdate(sql);
+
+                        //更新该部门的所有下级部门的所属分部
+                        sql = "update hrmdepartment set subCompanyId1 = '" + subcompanyid1 + "' where exists ( \n" +
+                            "   select 1 from (" +
+                            "       select id from hrmdepartment start with id = " + deptid + " connect by supdepid = prior id \n" +
+                            "   ) s where s.id = hrmdepartment.id \n" +
+                            ")";
+
+                        rs.executeUpdate(sql);
+                    }
+                    //同步部门矩阵信息
+                    MatrixUtil.updateDepartmentData(deptid);
+                }
+            }
+
+
+//        for (int i = 0; i < departments.size(); i++) {
+//            DepartmentDto row = departments.get(i);
+//            String departmentCode = Util.null2String(row.getDepartmentCode());//部门编码
+//            String superiorDepartment = Util.null2String(row.getSuperiorDepartment());//上级部门编码
+//            String parId = "";
+//            rs.executeQuery("select * from HRMDEPARTMENT where outkey = ?",superiorDepartment);
+//            if(rs.next()){
+//                parId = rs.getString("id");
+//            }
+//            rs.executeUpdate("update HRMDEPARTMENT set supdepid = ? where outkey = ?",parId,departmentCode);
+//        }
+
+            log.writeLog("此次同步部门总数为：" + departments.size() + ",新增部门数为：" + insertNum +
+                    ",更新部门数为：" + updateNum + ",跳出处理部门数为：" + skipNum);
+            log.writeLog("此次同步部门跳过是数据为：" + JSON.toJSONString(skipList));
+
+
+            log.writeLog("----sta:" + deptMap.size());
+            int size = deptMap.size();
+            int lastCount = deptMap.size();
+            for (int i = 0; i < size; i++) {
+                if (deptMap.size() == 0) {
+                    break;
+                }
+                log.writeLog("---------------当前正在执行第" + i + "次，本次剩余" + deptMap.size() + "条部门待处理");
+                setSup();
+                if (lastCount <= deptMap.size()) {
+                    log.writeLog("---------------异常，有" + deptMap.size() + "条部门无分部的数据异常");
+                    break;
+                } else {
+                    lastCount = deptMap.size();
+                }
+            }
+            log.writeLog("----end");
+
+
+            //更新部门缓存
+            DepartmentComInfo dci = new DepartmentComInfo();
+            dci.removeCompanyCache();
+
+            //释放map内存
+            map_dept_id_data.clear();
+            map_dept_id_data = null;
+            map_dept_code_id.clear();
+            map_dept_code_id = null;
+            map_user_code_id.clear();
+            map_user_code_id = null;
+
+            //更新同步时间到中间表
+            String sql1 = "update uf_HRRestDate set sctbsj ='" + now + "' where jkm = '/dcopenedi/hrDept/pageByUpdateTime'";
+            rs.executeUpdate(sql1);
+
+        } catch (Exception e) {
+            log.writeLog("--------------------Exception：" + JavaUtil.getExceptionDetail(e));
+            e.printStackTrace();
+        }
+        return rtMap;
+    }
+
+
+    public void setSup() {
+        RecordSet rss = new RecordSet();
+        Set keySet = deptMap.keySet();
+        Iterator it = keySet.iterator();
+        while (it.hasNext()) {
+            try {
+                String deptCode = (String) it.next();
+                String supCode = String.valueOf(deptMap.get(deptCode));
+                String SUPDEPID = "";
+                String SUBCOMPANYID1 = "";
+                rss.executeQuery("select * from hrmdepartment where departmentcode = ?", supCode);
+                if (rss.next()) {
+                    SUPDEPID = rss.getString("id");
+                    SUBCOMPANYID1 = rss.getString("SUBCOMPANYID1");
+                    if (SUBCOMPANYID1 != null && !"".equals(SUBCOMPANYID1)) {
+                        rss.executeUpdate("update hrmdepartment set SUPDEPID = ? ,SUBCOMPANYID1 = ? where departmentcode = ? ", SUPDEPID, SUBCOMPANYID1, deptCode);
+                        it.remove();
+                    }
+                    log.writeLog("-----------------已补处理部门code：" + deptCode + "，分部id：" + SUBCOMPANYID1);
+                }
+            } catch (Exception e) {
+                log.writeLog("--------------------Exception：" + JavaUtil.getExceptionDetail(e));
+            }
+        }
+
+    }
+
+
+    /**
+     * 匹配部门id，关联的上级部门，所属分部 map
+     *
+     * @return
+     */
+    private Map<String, Map<String, String>> getDeptDataMap() {
+        RecordSet rs = new RecordSet();
+        Map<String, Map<String, String>> map = new HashMap<>();
+        rs.executeQuery("select id, outkey,supdepid,subcompanyid1 from HrmDepartment where (CANCELED!=1 or CANCELED is null)");
+        while (rs.next()) {
+            Map<String, String> map1 = new HashMap<>();
+            map1.put("outkey", rs.getString("outkey"));
+            map1.put("supdepid", rs.getString("supdepid"));
+            map1.put("subcompanyid1", rs.getString("subcompanyid1"));
+            map.put(rs.getString("id"), map1);
+        }
+        return map;
+    }
+
+    /**
+     * 根据部门id匹配所属分部
+     *
+     * @return
+     */
+    public String getSubId(Map<String, Map<String, String>> map_dept_id_data, String deptId) {
+        String subcompanyid = "";
+        if (!map_dept_id_data.containsKey(deptId)) {
+            return "";
+        }
+        Map<String, String> map = map_dept_id_data.get(deptId);
+        subcompanyid = map.get("subcompanyid1");
+        return subcompanyid;
+    }
+//    /**
+//     * 获取部门编码和上级分部的集合
+//     *
+//     * @return
+//     */
+//    public Map<String, String> getDeptComMap() {
+//        RecordSet rs = new RecordSet();
+//        Map<String, String> map = new HashMap<>();
+//        rs.executeQuery("select outkey,supdepid from HrmDepartment where outkey is not null  and (CANCELED!=1 or CANCELED is null)");
+//        while (rs.next()) {
+//            map.put(rs.getString("outkey"), rs.getString("supdepid"));
+//        }
+//        return map;
+//    }
+
+    /**
+     * 获取当前OA系统中的所有部门信息（存在外键）
+     * @return 部门信息集合
+     */
+    private Map<String, String> getAllDepartmentCodeIdMap() {
+        RecordSet rs = new RecordSet();
+        Map<String, String> map = new HashMap<>();
+        rs.executeQuery("select departmentcode,outkey,id from HrmDepartment where outkey is not null");
+        while (rs.next()) {
+            map.put(rs.getString("outkey"), rs.getString("id"));
+        }
+        return map;
+    }
+
+    public Map<String, String> getDepartmentCodeIdMap() {
+        RecordSet rs = new RecordSet();
+        Map<String, String> map = new HashMap<>();
+        rs.executeQuery("select departmentcode,outkey,id from HrmDepartment where outkey is not null  and (CANCELED!=1 or CANCELED is null)");
+        while (rs.next()) {
+            map.put(rs.getString("outkey"), rs.getString("id"));
+        }
+        return map;
+    }
+
+
+    /**
+     * 获取印尼部门数据
+     *
+     * @param date  时间
+     * @param point
+     * @return
+     */
+    public JSONArray getOcDepartments(String date, String point) {
+        int current = 1, size = 5000, pages = 2;
+        String url = HttpClientToJT.baseUrl + "/dcopenedi/hrDept/pageNewHrDeptByUpdateTime";
+        String token = HttpClientToJT.getToken();
+        log.writeLog("-------token--------->" + token);
+        Map<String, Object> params = new HashMap<>();
+        List list1 = new ArrayList();
+        list1.add("ZHS");
+        params.put("languageCds", list1);
+        params.put("countryCode", "IDN");
+        params.put("updateTime", date);
+        params.put("point", point);
+        params.put("size", size);
+        log.writeLog("传入JSON--------------->" + JSON.toJSONString(params));
+        String s = HttpClientToJT.sendPost(url, token, JSONObject.toJSONString(params));
+        JSONObject jsonObject = JSONObject.parseObject(s);
+        JSONArray jsonArray = new JSONArray();
+
+        String code = Util.null2String(jsonObject.getString("code"));
+        log.writeLog("code------>" + code);
+        if ("1".equals(code)) {
+            JSONObject result = jsonObject.getJSONObject("data");
+            JSONArray records = result.getJSONArray("records");
+            Object hasNextPage = result.get("hasNextPage");
+            jsonArray.addAll(records);
+            //下次继续传
+            maxPoint = result.get("maxPoint").toString();
+            if ("false".equals(hasNextPage.toString())) {
+                ifPage = false;
+            }
+
+            Object directSales = jsonArray.stream().filter(item -> {
+                JSONObject itemJson = JSONObject.parseObject(JSON.toJSONString(item));
+                return "IDN".equals(itemJson.getString("countryCode"));
+            }).collect(Collectors.toList());
+            jsonArray = JSONArray.parseArray(JSON.toJSONString(directSales));
+        }
+
+        return jsonArray;
+    }
+
+    /**
+     * 获取海外部门国家数据
+     *
+     * @param date  时间
+     * @param point
+     * @return
+     */
+    public JSONArray getOcDepartmentsGUOJIA(String date, String point, String guojia, String departmentCode) {
+        int current = 1, size = 5000, pages = 2;
+        String url = HttpClientToJT.baseUrl + "/dcopenedi/hrDept/pageNewHrDeptByUpdateTime";
+        String token = HttpClientToJT.getToken();
+        log.writeLog("-------token--------->" + token);
+        Map<String, Object> params = new HashMap<>();
+        List list1 = new ArrayList();
+        list1.add(guojia);
+        params.put("languageCds", list1);
+        params.put("updateTime", date);
+        params.put("point", point);
+        params.put("size", size);
+        params.put("deptCode", departmentCode);
+        log.writeLog("传入JSON--------------->" + JSON.toJSONString(params));
+        String s = HttpClientToJT.sendPost(url, token, JSONObject.toJSONString(params));
+        JSONObject jsonObject = JSONObject.parseObject(s);
+        JSONArray jsonArray = new JSONArray();
+
+        String code = Util.null2String(jsonObject.getString("code"));
+        log.writeLog("code------>" + code);
+        if ("1".equals(code)) {
+            JSONObject result = jsonObject.getJSONObject("data");
+            JSONArray records = result.getJSONArray("records");
+            Object hasNextPage = result.get("hasNextPage");
+            jsonArray.addAll(records);
+//            //下次继续传
+//            maxPoint = result.get("maxPoint").toString();
+//            if ("false".equals(hasNextPage.toString())) {
+//                ifPage = false;
+//            }
+
+            Object directSales = jsonArray.stream().filter(item -> {
+                JSONObject itemJson = JSONObject.parseObject(JSON.toJSONString(item));
+                return !"CHN".equals(itemJson.getString("countryCode"));
+            }).collect(Collectors.toList());
+            jsonArray = JSONArray.parseArray(JSON.toJSONString(directSales));
+        }
+
+        return jsonArray;
+    }
+
+
+    /**
+     * 获取多语言
+     *
+     * @param date           时间
+     * @param countryCode    国家code
+     * @param departmentCode 部门code
+     * @param deptName       部门中文名称
+     * @return 多语言名称
+     */
+    public String getDepartmentName(String date, String countryCode, String departmentCode, String deptName) {
+        String retName = "";
+        boolean existence = true;
+        String language = "";
+        String cdIndex = "";
+        try {
+            if ("CHN".equals(countryCode)) {
+                language = "ZHS";
+            }
+            if ("BRA".equals(countryCode)) {
+                language = "POR";
+                cdIndex = "21";
+            }
+
+            if ("SAU".equals(countryCode) || "ARE".equals(countryCode)
+                    || "EGY".equals(countryCode)
+                    || "MEX".equals(countryCode)
+                    || "SGP".equals(countryCode)
+                    || "PHL".equals(countryCode)
+                    || "MYS".equals(countryCode)
+                    || "KHM".equals(countryCode)
+            ) {
+                existence = false;
+                language = "ENG";
+            }
+            // 、 • 7中°~^8英文、心‘9繁体、• ~‘14 越南°~17泰国°~‘21 葡萄牙‘～‘22 印尼
+            if ("IDN".equals(countryCode)) {
+                language = "IDN";
+                cdIndex = "22";
+            }
+            if ("THA".equals(countryCode)) {
+                language = "THA";
+                cdIndex = "17";
+            }
+            if ("VNM".equals(countryCode)) {
+                language = "VIE";
+                cdIndex = "14";
+            }
+
+            String country = "";
+            // 日期  位置  国家  部门code
+            JSONArray ocDepartmentsGUOJIA = getOcDepartmentsGUOJIA(date, "1", language, departmentCode);
+            List<DepartmentDto> countryList = JSONArray.parseArray(ocDepartmentsGUOJIA.toJSONString(), DepartmentDto.class);
+            DepartmentDto countryDto = countryList.get(0);
+            //对应国家的语言名称（对应国家标签里面）
+            String countryDepartmentName = countryDto.getDepartmentName();
+            log.writeLog("---------------对应国家语言名称：" + countryDepartmentName);
+
+            //departmentName =
+            if (existence) {
+                //需要3个标签
+                retName = "~`~`7 " + deptName + "`~`8 " + countryDepartmentName + "`~`" + cdIndex + " " + countryDepartmentName + "`~`~";
+            } else {
+                //只需要中文和英文
+                retName = "~`~`7 " + deptName + "`~`8 " + countryDepartmentName + "`~`~";
+            }
+
+            log.writeLog("---------------多语言名称：" + retName);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return retName;
+    }
+
+
+    private void writeFile(JSONArray jsonArray) {
+        BufferedWriter bw = null;
+        try {
+            bw = new BufferedWriter(new FileWriter("D:\\2.txt"));
+            //一次写一行
+            bw.write(jsonArray.toJSONString());
+            bw.newLine();  //换行用
+            //关闭流
+            bw.close();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        System.out.println("写入成功");
+    }
+
+
+    public static void main(String[] args) {
+//        String token = HttpClientToJT.getToken();
+//        SyncHrmsubcompanyToOA hrmsubcompany = new SyncHrmsubcompanyToOA();
+//        hrmsubcompany.getSubcompanys();
+        SyncHrmdepartmentToOA hrmdepartment = new SyncHrmdepartmentToOA();
+        JSONArray data = hrmdepartment.getDepartments("2018-08-01 00:00:00");
+        // hrmdepartment.writeFile(data);
+//        List<DepartmentDto> dataList = JSONArray.parseArray(data.toJSONString(), DepartmentDto.class);
+//        System.out.println(JSON.toJSONString(dataList));
+//        SyncHrmjobtitlesToOA hrmjobtitles = new SyncHrmjobtitlesToOA();
+//        hrmjobtitles.getJobtitles();
+//        SyncHrmresourceToOA hrmresource = new SyncHrmresourceToOA();
+//        JSONArray users = hrmresource.getUsers();
+//        System.out.println(users);
+//        System.out.println(JSON.toJSONString(users));
+//        JSONObject row =new JSONObject();
+//        Integer status = Util.null2String(row.getInteger("status"))== "3" ? 1 : null;
+//        System.out.println(status);
+    }
+
+
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/schedule/hrm/idn/SyncHrmjobtitlesToOAIDN.java b/src/main/youhong_ai_jitu_src/jntchina/schedule/hrm/idn/SyncHrmjobtitlesToOAIDN.java
new file mode 100644
index 0000000..e09558a
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/schedule/hrm/idn/SyncHrmjobtitlesToOAIDN.java
@@ -0,0 +1,450 @@
+package jntchina.schedule.hrm.idn;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import jntchina.schedule.hrm.SyncHrmdepartmentToOA;
+import jntchina.schedule.hrm.SyncHrmjobtitlesToOA;
+import jntchina.schedule.hrm.util.OrganizationUtil;
+import jntchina.schedule.hrmNew.JobTitleMultilingualUtil;
+import jntchina.util.HttpClientToJT;
+import selfdev.util.base.TimeCommonUtil;
+import selfdev.util.log.LogTool;
+import weaver.conn.RecordSet;
+import weaver.general.Util;
+import weaver.hrm.job.JobTitlesComInfo;
+
+import java.io.BufferedWriter;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * @author Cyq
+ * @date 2021年6月17日 02:01:51
+ */
+public class SyncHrmjobtitlesToOAIDN {
+	
+	
+	// 分页接口参数
+	static String maxPoint = "1";
+	// 接口是否有下一页 默认为有
+	static boolean ifPage = true;
+	
+	static int defaultPage = 0;
+	
+	// 岗位编码和id  map
+	// Map<String, String> map_jobtitle_code_id = new HashMap<String, String>();
+	
+	private final LogTool log = new LogTool("/log/hrm/IDN/job/", false);
+	
+	// 岗位编码和id  map
+	// Map<String, String> map_jobtitle_code_id = new HashMap<String, String>();
+	
+	private final JSONArray allResult = new JSONArray();
+	
+	protected void execute(String date) {
+		/* ******************* 清除所有岗位信息，释放内存空间 start youhong.ai ******************* */
+		allResult.clear();
+		/* ******************* 清除所有岗位信息，释放内存空间 end youhong.ai ******************* */
+		String now = TimeCommonUtil.obtainDate(0);
+		SyncHrmdepartmentToOA hrmdepartment = new SyncHrmdepartmentToOA();
+		Map<String, String> map_dept_code_id = hrmdepartment.getDepartmentCodeIdMap();
+		// 岗位自定义建模表中的ID和编码  map
+		// Map<String, String> map_jobtitledefined_id_code = BaseUtil.getMapKeyValueInfoByParm("uf_jobtitledefined", "", "positionid", "positioncode");
+		// map_jobtitle_code_id = getJobtitleCodeIdMap();
+		RecordSet rs = new RecordSet();
+		log.writeLog("----------开始同步岗位-------");
+		int count = 0;
+		int skipNum = 0, insertNum = 0, updateNum = 0;
+		// int page = getPages(date);
+		// 获取所有的岗位编码，同时将岗位编码存入List中
+		List<String> codeList = new ArrayList<>();
+		// 当前库中已存在的记录集合 -- 系统岗位表
+		Map<String, String> sysExistMap = new HashMap<>();
+		// 当前库中已存在的记录集合 -- 自定义岗位表
+		Map<String, String> definedExistMap = new HashMap<>();
+		/* ******************* 获取所有的岗位数据 start for youhong.ai ******************* */
+		
+		JSONArray filterResultList = new JSONArray();
+		while (ifPage) {
+			defaultPage++;
+			JSONArray jobtitles = getJobsByPage(maxPoint, date);
+			filterResultList.addAll(jobtitles);
+		}
+		JobTitleMultilingualUtil jobTitleMultilingualUtil = new JobTitleMultilingualUtil();
+		List<JSONArray> splitArray = new ArrayList<>();
+		double size = 10_000;
+		int sizeInt = (int) size;
+		int totalResultSize = allResult.size();
+		int batchNum = (int) Math.ceil(totalResultSize / size);
+		for (int i = 0; i < batchNum; i++) {
+			int start = i * sizeInt;
+			int endIndex = start + sizeInt;
+			List sub = JobTitleMultilingualUtil.sub(allResult, start, endIndex);
+			JSONArray objects = JSONArray.parseArray(JSON.toJSONString(sub));
+			splitArray.add(objects);
+		}
+		/* ******************* 获取所有的杆位数据 end for youhong.ai ******************* */
+		
+		/* ******************* 注释原来循环获取接口数据 start for youhong.ai ******************* */
+	   /* while(ifPage){
+            defaultPage++;
+            int k = defaultPage;
+
+            JSONArray jobtitles = getJobsByPage(maxPoint,date);
+*/
+		/* ******************* 注释原来循环获取接口数据 end for youhong.ai ******************* */
+		/* ******************* 添加循环 start for youhong.ai ******************* */
+		for (int k = 0; k < splitArray.size(); k++) {
+			JSONArray jobtitles = splitArray.get(k);
+			/* ******************* 添加循环 end for youhong.ai ******************* */
+			// 未获取到数据,跳出循环
+			if (jobtitles == null || jobtitles.isEmpty()) {
+				log.writeLog("------------第【" + k + "】调用接口未获取到数据，可能是语言languageCd!=ZHS，跳出本次循环，继续下次循环");
+				continue;
+			}
+			
+			codeList.clear();
+			sysExistMap.clear();
+			definedExistMap.clear();
+			for (int m = 0; m < jobtitles.size(); m++) {
+				JSONObject row = jobtitles.getJSONObject(m);
+				String positionCode = Util.null2String(row.getString("positionCode"));// 岗位编码
+				if (!"".equals(positionCode)) {
+					codeList.add(positionCode);
+				}
+			}
+			
+			if (codeList.size() > 0) {
+				sysExistMap = OrganizationUtil.getExitsData(codeList, 0);
+				definedExistMap = OrganizationUtil.getExitsData(codeList, 1);
+			}
+			
+			
+			count = count + jobtitles.size();
+			log.writeLog("----------同步岗位第" + k + "页，条数:" + jobtitles.size());
+			for (int i = 0; i < jobtitles.size(); i++) {
+				JSONObject row = jobtitles.getJSONObject(i);
+				String positionCode = Util.null2String(row.getString("positionCode"));// 岗位编码
+				/* ******************* 多语言岗位处理 start for youhong.ai ******************* */
+				String positionName = jobTitleMultilingualUtil.getMultilingual(allResult,
+						row,
+						item -> aiyh.utils.Util.null2String(item.get("positionCode")),
+						item -> aiyh.utils.Util.null2String(item.get("positionName")),
+						item -> aiyh.utils.Util.null2String(item.get("languageCd")));
+				if (JobTitleMultilingualUtil.isBlank(positionName)) {
+					positionName = Util.null2String(row.getString("positionName"));
+				}
+				/* ******************* 多语言岗位处理 end for youhong.ai ******************* */
+				// String positionName = Util.null2String(row.getString("positionName"));// 岗位名称
+				log.writeLog("------------岗位名称:" + positionName);
+				log.writeLog("------------岗位编码:" + positionCode);
+				Integer canceled = "3".equals(Util.null2String(row.getString("status"))) ? 1 : 0;// 1 新增  2 修改  3作废
+				String deptCode = Util.null2String(row.getString("deptCode"));// 部门编码
+				String jobdepartmentid = Util.null2String(map_dept_code_id.get(deptCode));// 所属部门ID
+				String jobtitleid = Util.null2String(sysExistMap.get(positionCode));// OA岗位ID
+//                String jobactivityid ="1545";//默认职务ID
+				String positionabbreviation = Util.null2String(row.getString("positionAbbreviation"));// 岗位简称
+				String positiontype = Util.null2String(row.getString("positionType"));// 岗位类别
+				String positiontypehighest = Util.null2String(row.getString("positionTypeHighest"));// 岗位类别最高
+				String positiontypelowest = Util.null2String(row.getString("positionTypeLowest"));// 岗位类别最低
+				String positionpropecode = Util.null2String(row.getString("positionPropeCode"));// 岗位属性编码
+				String positionpropename = Util.null2String(row.getString("positionPropeName"));// 岗位属性名称
+				String companycode = Util.null2String(row.getString("companyCode"));// 公司编码
+				String companyname = Util.null2String(row.getString("companyName"));// 公司名称
+				String deptname = Util.null2String(row.getString("deptName"));// 部门名称
+				String locationcode = Util.null2String(row.getString("locationCode"));// 地点编码
+				String locationname = Util.null2String(row.getString("locationName"));// 地点描述
+				String stdpositioncode = Util.null2String(row.getString("stdPositionCode"));// 标准岗位编码
+				String stdpositionname = Util.null2String(row.getString("stdPositionName"));// 标准岗位名称
+				String postcode = Util.null2String(row.getString("postCode"));// 岗编码
+				String postname = Util.null2String(row.getString("postName"));// 岗名称
+				String sequencecode = Util.null2String(row.getString("sequenceCode"));// 序列编码
+				String sequencename = Util.null2String(row.getString("sequenceName"));// 序列名称
+				String positiongroupcode = Util.null2String(row.getString("positionGroupCode"));// 岗族编码
+				String positiongroupname = Util.null2String(row.getString("positionGroupName"));// 岗族名称
+				String ethnicgroupcode = Util.null2String(row.getString("ethnicGroupCode"));// 族群编码
+				String ethnicgroupname = Util.null2String(row.getString("ethnicGroupName"));// 族群名称
+				
+				String sql = "";
+				// 判断HR岗位ID是否已经存在
+//                if("".equals(jobdepartmentid)){
+//                    skipNum++;
+//                    continue;
+//                }
+
+//                if("".equals(canceled) || canceled == null){
+//                    canceled = 0;
+//                }
+				
+				if ("".equals(Util.null2String(jobtitleid))) {// 岗位不存在则插入生成新岗位
+					// 新增数据,插入到hrmjobtitles表中
+					sql = "insert into hrmjobtitles (jobtitlename,jobtitlemark,outkey,jobdepartmentid," +
+							      "canceled,created,creater,modified,modifier) values("
+							      + "'" + positionName + "',"
+							      + "'" + positionName + "',"
+							      + "'" + positionCode + "',"
+							      + "'" + jobdepartmentid + "',"
+							      + "" + canceled + ","
+							      + "to_date('" + now + "','yyyy-mm-dd hh24:mi:ss'),"
+							      + "'1',"
+							      + "to_date('" + now + "','yyyy-mm-dd hh24:mi:ss'),"
+							      + "'1')";
+					log.writeLog("插入岗位表生成新数据sql--------->" + sql);
+					boolean executeUpdate1 = rs.executeUpdate(sql);
+					log.writeLog("是否成功：" + executeUpdate1);
+					log.writeLog("原因：" + rs.getExceptionMsg());
+					insertNum++;
+					rs.execute("select max(id) from hrmjobtitles");
+					int maxJobid = 0;// 新插入数据的岗位ID
+					if (rs.next()) {
+						maxJobid = rs.getInt(1);
+						// 将新增加的岗位加入至MAP中
+						sysExistMap.put(positionCode, maxJobid + "");
+					}
+					
+					// 新增数据,插入到hrmjobtitles表中
+					sql = "insert into uf_jobtitledefined (formmodeid,modedatacreater,modedatacreatertype,modedatacreatedate,modedatacreatetime,"
+							      + "positionid,positioncode,positionname,positionabbreviation,positiontype,positiontypehighest,positiontypelowest,"
+							      + "positionpropecode,positionpropename,companycode,companyname,deptcode,deptname,locationcode,locationname,stdpositioncode,"
+							      + "stdpositionname,postcode,postname,sequencecode,sequencename,positiongroupcode,positiongroupname,ethnicgroupcode,ethnicgroupname) values"
+							      + "(32501,1,0,to_char(sysdate, 'yyyy-MM-dd'),to_char(sysdate, 'HH24:mi:ss'),'" + maxJobid + "','" + positionCode + "','" + positionName + "',"
+							      + "'" + positionabbreviation + "','" + positiontype + "','" + positiontypehighest + "','" + positiontypelowest + "','" + positionpropecode + "',"
+							      + "'" + positionpropename + "','" + companycode + "','" + companyname + "','" + deptCode + "','" + deptname + "','" + locationcode + "'" + ","
+							      + "'" + locationname + "','" + stdpositioncode + "','" + stdpositionname + "','" + postcode + "','" + postname + "','" + sequencecode + "','" + sequencename + "',"
+							      + "'" + positiongroupcode + "','" + positiongroupname + "','" + ethnicgroupcode + "','" + ethnicgroupname + "')";
+					log.writeLog("插入岗位建模自定义表生成新数据sql--------->" + sql);
+					boolean executeUpdate = rs.executeUpdate(sql);
+					log.writeLog("是否成功：" + executeUpdate);
+					log.writeLog("原因：" + rs.getExceptionMsg());
+					// 将新增加的岗位加入至MAP中
+					definedExistMap.put(maxJobid + "", positionCode);
+					
+				} else {// 岗位存在则更新
+					sql = "update hrmjobtitles set " +
+							      "jobtitlename = '" + positionName + "', " +
+							      "jobtitlemark = '" + positionName + "', " +
+							      "jobtitlecode = '" + positionCode + "', " +
+							      "jobdepartmentid = '" + jobdepartmentid + "', " +
+							      "modified = to_date('" + now + "','yyyy-mm-dd hh24:mi:ss')," +
+							      "modifier = '1', " +
+							      "canceled = " + canceled + " " +
+							      "where  id= '" + jobtitleid + "'";
+					log.writeLog("更新岗位表中数据sql--------->" + sql);
+					rs.executeUpdate(sql);
+					updateNum++;
+					log.writeLog("更新岗位表---成功------>");
+					
+					
+					if (definedExistMap.containsKey(jobtitleid)) {// 存在则更新岗位自定义表
+						sql = "update uf_jobtitledefined set " +
+								      "positionName = '" + positionName + "', " +
+								      "positionabbreviation = '" + positionabbreviation + "', " +
+								      "positiontype = '" + positiontype + "', " +
+								      "positiontypehighest = '" + positiontypehighest + "', " +
+								      "positiontypelowest = '" + positiontypelowest + "', " +
+								      "positionpropecode = '" + positionpropecode + "', " +
+								      "positionpropename = '" + positionpropename + "', " +
+								      "companycode = '" + companycode + "', " +
+								      "companyname = '" + companyname + "', " +
+								      "deptCode = '" + deptCode + "', " +
+								      "deptname = '" + deptname + "', " +
+								      "locationcode = '" + locationcode + "', " +
+								      "locationname = '" + locationname + "', " +
+								      "stdpositioncode = '" + stdpositioncode + "', " +
+								      "stdpositionname = '" + stdpositionname + "', " +
+								      "postcode = '" + postcode + "', " +
+								      "postname = '" + postname + "', " +
+								      "sequencecode = '" + sequencecode + "', " +
+								      "sequencename = '" + sequencename + "', " +
+								      "positiongroupcode = '" + positiongroupcode + "', " +
+								      "positiongroupname = '" + positiongroupname + "', " +
+								      "ethnicgroupcode = '" + ethnicgroupcode + "', " +
+								      "ethnicgroupname = '" + ethnicgroupname + "' " +
+								      "where positionid= '" + jobtitleid + "'";
+						log.writeLog("更新岗位建模自定义表中数据sql--------->" + sql);
+						rs.executeUpdate(sql);
+						
+					} else {// 不存在则插入岗位自定义表
+						// 新增数据,插入到hrmjobtitles表中
+						sql = "insert into uf_jobtitledefined (formmodeid,modedatacreater,modedatacreatertype,modedatacreatedate,modedatacreatetime,"
+								      + "positionid,positioncode,positionname,positionabbreviation,positiontype,positiontypehighest,positiontypelowest,"
+								      + "positionpropecode,positionpropename,companycode,companyname,deptcode,deptname,locationcode,locationname,stdpositioncode,"
+								      + "stdpositionname,postcode,postname,sequencecode,sequencename,positiongroupcode,positiongroupname,ethnicgroupcode,ethnicgroupname) values"
+								      + "(32501,1,0,to_char(sysdate, 'yyyy-MM-dd'),to_char(sysdate, 'HH24:mi:ss'),'" + jobtitleid + "','" + positionCode + "','" + positionName + "',"
+								      + "'" + positionabbreviation + "','" + positiontype + "','" + positiontypehighest + "','" + positiontypelowest + "','" + positionpropecode + "',"
+								      + "'" + positionpropename + "','" + companycode + "','" + companyname + "','" + deptCode + "','" + deptname + "','" + locationcode + "'" + ","
+								      + "'" + locationname + "','" + stdpositioncode + "','" + stdpositionname + "','" + postcode + "','" + postname + "','" + sequencecode + "','" + sequencename + "',"
+								      + "'" + positiongroupcode + "','" + positiongroupname + "','" + ethnicgroupcode + "','" + ethnicgroupname + "')";
+						log.writeLog("插入岗位建模自定义表生成新数据sql--------->" + sql);
+						rs.executeUpdate(sql);
+						// 将新增加的岗位加入至MAP中
+						definedExistMap.put(jobtitleid + "", positionCode);
+					}
+				}
+			}
+			log.writeLog("----------同步结束岗位，第" + k + "页：" + count +
+					             ",新增岗位数为：" + insertNum + " ,更新岗位数为：" + updateNum + ",跳出处理岗位数为：" + skipNum + "------------");
+			skipNum = 0;
+			insertNum = 0;
+			updateNum = 0;
+		}
+		log.writeLog("----------同步结束岗位总数：" + count + "------------");
+		// 更新岗位缓存
+		JobTitlesComInfo jtci = new JobTitlesComInfo();
+		jtci.removeJobTitlesCache();
+		
+		// 释放map占用的内存
+		// map_jobtitledefined_id_code.clear();
+		// map_jobtitledefined_id_code=null;
+		map_dept_code_id.clear();
+		map_dept_code_id = null;
+		// map_jobtitle_code_id.clear();
+		// map_jobtitle_code_id=null;
+		
+		// 更新同步时间到中间表
+		String sql1 = "update uf_HRRestDate set sctbsj ='" + now + "' where jkm = '/dcopenedi/hrPost/pageByUpdateTime'";
+		rs.executeUpdate(sql1);
+		/* ******************* 清除所有岗位信息，释放内存空间 start youhong.ai ******************* */
+		allResult.clear();
+		/* ******************* 清除所有岗位信息，释放内存空间 end youhong.ai ******************* */
+	}
+	
+	
+	public Map<String, String> getJobtitleCodeIdMap() {
+		RecordSet rs = new RecordSet();
+		Map<String, String> map = new HashMap<>();
+		rs.executeQuery("select jobtitlecode,outkey,id from hrmjobtitles where outkey is not null  and (CANCELED!=1 or CANCELED is null)");
+		while (rs.next()) {
+			map.put(rs.getString("outkey"), rs.getString("id"));
+		}
+		return map;
+	}
+	
+	public int getPages(String date) {
+		int current = 1, size = 10000, pages = 1;
+		String url = HttpClientToJT.baseUrl + "/dcopenedi/hrPost/pageByUpdateTime";
+		String token = HttpClientToJT.getToken();
+		Map<String, Object> params = new HashMap<>();
+//        LocalDateTime today_start = LocalDateTime.of(LocalDate.now(), LocalTime.MIN);//当天零点
+//        String td_st_str = today_start.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+		params.put("updateTime", date);
+//        params.put("updateTime", "2018-03-21 00:00:00");
+		params.put("current", current);
+		params.put("size", size);
+		String s = HttpClientToJT.sendGet(url, token, params);
+		JSONObject jsonObject = JSONObject.parseObject(s);
+		if (jsonObject.getInteger("code").equals(1)) {
+			JSONObject result = jsonObject.getJSONObject("data");
+			pages = result.getInteger("pages");
+		}
+		return pages;
+	}
+	
+	public JSONArray getJobsByPage(String pages, String date) {
+		int size = 5000;
+		String url = HttpClientToJT.baseUrl + "/dcopenedi/hrPost/pageByParam";
+		String token = HttpClientToJT.getToken();
+		Map<String, Object> params = new HashMap<>();
+		
+		params.put("beginTime", date);
+		params.put("point", pages);
+		params.put("size", size);
+		
+		String s = HttpClientToJT.sendPost(url, token, JSONObject.toJSONString(params));
+		JSONObject jsonObject = JSONObject.parseObject(s);
+		JSONArray jsonArray = new JSONArray();
+		if (jsonObject.getInteger("code").equals(1)) {
+			JSONObject result = jsonObject.getJSONObject("data");
+			JSONArray records = result.getJSONArray("records");
+			
+			// 是否有下一页
+			Object hasNextPage = result.get("hasNextPage");
+			// 下次继续传
+			maxPoint = result.get("maxPoint").toString();
+			if ("false".equals(hasNextPage.toString())) {
+				ifPage = false;
+			}
+			/* ******************* 收集所有岗位信息 start for youhong.ai ******************* */
+			allResult.addAll(records);
+			/* ******************* 收集所有岗位信息 end for youhong.ai ******************* */
+			jsonArray.addAll(records);
+		} else {
+			ifPage = false;
+		}
+		Object directSales = jsonArray.stream().filter(item -> {
+			JSONObject itemJson = JSONObject.parseObject(JSON.toJSONString(item));
+			return "IDN".equals(itemJson.getString("countryCode"));
+		}).collect(Collectors.toList());
+		jsonArray = JSONArray.parseArray(JSON.toJSONString(directSales));
+		// log.writeLog("-------------------数据："+jsonArray);
+		return jsonArray;
+	}
+	
+	public JSONArray getJobtitles() {
+		int current = 1, size = 10000, pages = 2;
+		String url = HttpClientToJT.baseUrl + "/dcopenedi/hrPost/pageByUpdateTime";
+		// String url = "https://jtdcapi.jtexpress.com.cn/dcopenedi/hrPost/pageByUpdateTime";
+		String token = HttpClientToJT.getToken();
+		Map<String, Object> params = new HashMap<>();
+//        LocalDateTime today_start = LocalDateTime.of(LocalDate.now(), LocalTime.MIN);//当天零点
+//        String td_st_str = today_start.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+//        params.put("updateTime",td_st_str);
+		params.put("updateTime", "2021-03-21 00:00:00");
+		params.put("current", current);
+		params.put("size", size);
+		String s = HttpClientToJT.sendGet(url, token, params);
+		JSONObject jsonObject = JSONObject.parseObject(s);
+		JSONArray jsonArray = new JSONArray();
+		if (jsonObject.getInteger("code").equals(1)) {
+			JSONObject result = jsonObject.getJSONObject("data");
+			pages = result.getInteger("pages");
+			JSONArray records = result.getJSONArray("records");
+			jsonArray.addAll(records);
+			for (int i = 2; i <= pages; i++) {
+				System.out.println(i);
+				params.put("current", i);
+				String str = HttpClientToJT.sendGet(url, token, params);
+				JSONObject jsonObject1 = JSONObject.parseObject(str);
+				JSONObject jsonResult = jsonObject1.getJSONObject("data");
+				JSONArray records1 = jsonResult.getJSONArray("records");
+				jsonArray.addAll(records1);
+			}
+			Object directSales = jsonArray.stream().filter(item -> {
+				JSONObject itemJson = JSONObject.parseObject(JSON.toJSONString(item));
+				return !"ZHS".equals(itemJson.getString("languageCd"));
+			}).collect(Collectors.toList());
+			jsonArray = JSONArray.parseArray(JSON.toJSONString(directSales));
+		}
+//        System.out.println(jsonArray.toJSONString());
+//        System.out.println(s);
+		// 将写入转化为流的形式
+		writeFile(jsonArray);
+		return jsonArray;
+	}
+	
+	private void writeFile(JSONArray jsonArray) {
+		BufferedWriter bw = null;
+		try {
+			bw = new BufferedWriter(new FileWriter("E:\\3.txt"));
+			// 一次写一行
+			bw.write(jsonArray.toJSONString());
+			bw.newLine();  // 换行用
+			// 关闭流
+			bw.close();
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+		System.out.println("写入成功");
+	}
+	
+	public static void main(String[] args) {
+		SyncHrmjobtitlesToOA job = new SyncHrmjobtitlesToOA();
+		job.getJobtitles();
+	}
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/schedule/hrm/idn/SyncHrmresourceToOAIDN.java b/src/main/youhong_ai_jitu_src/jntchina/schedule/hrm/idn/SyncHrmresourceToOAIDN.java
new file mode 100644
index 0000000..3ee8b74
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/schedule/hrm/idn/SyncHrmresourceToOAIDN.java
@@ -0,0 +1,344 @@
+package jntchina.schedule.hrm.idn;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.api.integration.util.JavaUtil;
+import com.engine.common.service.impl.HrmCommonServiceImpl;
+import com.engine.common.service.impl.ThemeServiceImpl;
+import jntchina.schedule.hrm.entity.HrmUserDto;
+import jntchina.schedule.hrm.util.OrganizationUtil;
+import selfdev.util.base.TimeCommonUtil;
+import selfdev.util.log.LogTool;
+import weaver.conn.RecordSet;
+import weaver.general.Util;
+import weaver.hrm.resource.ResourceComInfo;
+
+import java.util.*;
+
+/**
+ * @author Cyq
+ * @date 2021年6月17日 02:01:51
+ */
+public class SyncHrmresourceToOAIDN {
+
+    //是否有下一页
+    boolean isNext = true;
+
+    //页码
+    String current = "1";
+    private final LogTool log = new LogTool("/log/hrm/IDN/user/", false);
+
+    /**
+     * 人员同步操作
+     * @param today 当前日期
+     */
+    @SuppressWarnings("unchecked")
+    public void execute(String today) {
+        log.writeLog("---------进入印尼人员同步------------");
+        try {
+            HrmCommonServiceImpl hrmCommonServiceImpl = new HrmCommonServiceImpl();
+            String now = TimeCommonUtil.obtainDate(0);
+            ThemeServiceImpl themeService = new ThemeServiceImpl();
+
+            //当前系统中 部门、分部信息
+            Map<String, String> oaDeptAndComMap = OrganizationUtil.getEffectiveDeptAndCompany();
+
+
+            //部门与国家对应关系集合
+            Map<String,String> deptCountryMap = OrganizationUtil.getDeptCountryMap();
+
+
+            //未获取到的上级的集合
+            Map<String, String> noFindManagerMap = new HashMap<>();
+
+            // 处理人员同步逻辑
+            RecordSet rs = new RecordSet();
+            String sql;
+            log.writeLog("----------印尼 开始同步人员------------");
+            int totalCount = 0, insertCount = 0, updateCount = 0, skipCount = 0;
+            int skipNum = 0, insertNum = 0, updateNum = 0;
+
+            //更新人员缓存
+            ResourceComInfo rci = new ResourceComInfo();
+            //如果有下一页就会循环
+            int count = 0;
+            while (isNext) {
+                count++;
+                JSONArray data = getUsersByPage(current, today);
+                List<HrmUserDto> users = JSONArray.parseArray(data.toJSONString(), HrmUserDto.class);
+                totalCount = totalCount + users.size();
+                log.writeLog("----------同步人员第" + count + "页，条数:" + users.size());
+                String password = "9F51B4682F92AB843B401218BF27C301";//默认密码Jitu@2021
+                for (HrmUserDto row : users) {
+                    String field0;
+                    String employeeCode = Util.null2String(row.getEmployeeCode());//员工code
+                    String employeeName = Util.null2String(row.getEmployeeName());//姓名
+                    String employeeSexCode = Util.null2String(row.getEmployeeSexCode());//性别 M男 F女 对应 OA 0男 1女
+                    int sex = "M".equals(employeeSexCode) ? 0 : 1;
+                    String birthdate = Util.null2String(row.getEmployeeBirthdate());//出生年月
+                    String companyTel = Util.null2String(row.getCompanyTel());//办公电话
+                    String personalTel = Util.null2String(row.getPersonalTel());//手机号
+                    String email = Util.null2String(row.getCompanyEmail());//邮箱
+                    String idNumber = Util.null2String(row.getCertificateNum());//身份证号码
+                    String managerCode = Util.null2String(row.getSupervisorId());//上级次账号code
+                    //获取人员姓名的拼音
+                    String name_pinyin = hrmCommonServiceImpl.generateQuickSearchStr(employeeName);
+                    String EntryDate = Util.null2String(row.getEmplHireDate());//入职日期  无字段，暂用试用结束日期来替代
+                    String hrStatus = Util.null2String(row.getHrStatus());//状态A在职，I离职 对应OA的1正式 5离职
+                    int status = "A".equals(hrStatus) ? 1 : 5;//OA的在职状态
+                    String deptCode = Util.null2String(row.getDeptCode());//部门
+                    String positionCode = Util.null2String(row.getPositionCode());//岗位
+                    String bankBranchName = Util.null2String(row.getBankBranchName());//开户行
+                    String bankAccountId = Util.null2String(row.getBankAccountId());//银行卡号
+                    String bankName = Util.null2String(row.getBankName());//银行类型
+                    String departmentid, subcompanyid1;
+
+                    log.writeLog("工号:[" + employeeCode + "],姓名:[" + employeeName + "],部门:[" + deptCode + "],领导:[" + managerCode + "],岗位:[" + positionCode + "]");
+
+                    String managerid;
+
+                    //处理岗位id
+                    String jobtitleId = OrganizationUtil.getJobtitleIdByOutKey(positionCode);
+
+                    //如果部门编码为空，跳过不同步
+                    if ("".equals(deptCode)) {
+                        skipNum++;
+                        log.writeLog("cylnb is dept null1:" + deptCode + "; userCode" + employeeCode);
+                        continue;
+                    } else {
+                        if(oaDeptAndComMap.containsKey(deptCode)){
+                            String mapValue = oaDeptAndComMap.get(deptCode);
+
+                            departmentid = Util.TokenizerString2(mapValue,"^_^")[0];
+                            subcompanyid1 = Util.TokenizerString2(mapValue,"^_^")[1];
+                        } else {
+                            log.writeLog("cylnb is dept and sub null Code:" + deptCode + "; userCode" + employeeCode);
+                            skipNum++;
+                            continue;
+                        }
+
+                        managerid = OrganizationUtil.getEmployeeManagerId(managerCode,departmentid);
+
+                        //从HR获取有上级，但是在OA中未找到，则说明可能上级是新入职还未同步到OA中
+                        if ("".equals(managerid) && !"".equals(managerCode)) {
+                            noFindManagerMap.put(employeeCode, managerCode);
+                        }
+                    }
+
+                    //去除国家
+                    if(deptCountryMap.containsKey(departmentid)){
+                        String tmpCountryCode = deptCountryMap.get(departmentid);
+
+                        if (!"IDN".equals(tmpCountryCode)) {
+                            log.writeLog("cylnb continue user 部门不是印尼或没有国家字段:" + employeeCode + " 部门:" + deptCode);
+                            skipNum++;
+                            continue;
+                        }
+                    } else {
+                        log.writeLog("cylnb continue 找不到部门所属国家自定义信息:" + employeeCode + " 部门:" + deptCode);
+                        skipNum++;
+                        continue;
+                    }
+
+                    field0 = Util.null2String(row.getEmployeeEnglishName());
+
+                    String[] bankInfo = new String[] {bankBranchName,bankAccountId,bankName};
+
+                    //判断人员ID是否已经存在,不存在则插入生成新人员
+                    rs.executeQuery("select id,lastname from hrmresource where workcode = ?", employeeCode);
+                    if (!rs.next()) {
+                        // if (!map_user_code_id.containsKey(employeeCode)) {
+                        //获取即将插入的人员ID
+                        rs.executeProc("HrmResourceMaxId_Get", "");
+                        rs.next();
+                        String maxUserId = "" + rs.getInt(1);
+                        //新增数据,插入到人员基本信息表HrmResource中 seclevel
+                        sql = "insert into hrmresource(id,loginid,password,lastname,workcode,sex, " +
+                                "mobile,email,departmentid,jobtitle,birthday,certificatenum," +
+                                "seclevel,outkey,status,systemlanguage,createrid,createdate," +
+                                "companystartdate,telephone,ecology_pinyin_search,pinyinlastname," +
+                                "created,creater,modified,modifier,managerid,subcompanyid1) values( "
+                                + "'" + maxUserId + "',"
+                                + "'" + employeeCode + "',"
+                                + "'" + password + "',"
+                                + "?,"
+                                + "'" + employeeCode + "',"
+                                + "'" + sex + "',"
+                                + "'" + personalTel + "',"
+                                + "'" + email + "',"
+                                + "'" + departmentid + "',"
+                                + "'" + jobtitleId + "',"
+                                + "'" + birthdate + "',"
+                                + "'" + idNumber + "',"
+                                + "'" + 10 + "',"
+                                + "'" + employeeCode + "',"
+                                + "" + status + ","
+                                + "'7',"
+                                + "'1',"
+                                + "'" + now.substring(0, 10) + "',"
+                                + "'" + EntryDate + "',"
+                                + "'" + companyTel + "',"
+                                + "?,"
+                                + "?,"
+                                + "to_date('" + now + "','yyyy-mm-dd hh24:mi:ss'),"
+                                + "'1',"
+                                + "to_date('" + now + "','yyyy-mm-dd hh24:mi:ss'),"
+                                + "'1',"
+                                + "'" + managerid + "',"
+                                + "'" + subcompanyid1 + "')";
+
+                        boolean executeUpdate = rs.executeUpdate(sql, employeeName, name_pinyin, name_pinyin);
+                        log.writeLog("新增人员是否正确" + executeUpdate);
+                        log.writeLog("插入人员表中数据sql--------->" + sql);
+                        //将新增加的人员加入至MAP中
+                        insertNum++;
+                        // map_user_code_id.put(employeeCode,maxUserId);
+                        //新增数据,插入到人员自定义表cus_fielddata中
+
+                        rs.executeQuery("select id,field15 from cus_fielddata where scopeid='1' and scope='HrmCustomFieldByInfoType' and id='" + maxUserId + "'");
+                        if (!rs.next()) {
+                            if ("".equals(bankAccountId)) {
+                                OrganizationUtil.insertEmployeeCustomizePersonal(maxUserId,null,null,row);
+                            } else {
+                                OrganizationUtil.insertEmployeeCustomizePersonal(maxUserId,bankInfo,null,row);
+                            }
+                        } else {
+                            //如果已经存在就修改
+                            log.writeLog("---------------已经存在但是信息不是自己");
+                        }
+
+                        OrganizationUtil.dealEmployeeNickName(maxUserId,field0);
+
+                        themeService.createSubCompanyMenu(Integer.parseInt(maxUserId), Integer.parseInt(subcompanyid1));
+                        //刷新人员缓存
+                        rci.addResourceInfoCache(maxUserId);
+                    } else {//存在则更新
+
+                        String id = rs.getString("id");
+                        //OA库中人员姓名
+                        String oaLastName = Util.null2String(rs.getString("lastname"));
+
+                      // String newEmployeeName = OrganizationUtil.dealEmployeeName(oaLastName,employeeName);
+                        String newEmployeeName = employeeName;
+
+                        //更新人员基本信息表数据
+                        String updateStr = "";
+                        updateStr += !"".equals(departmentid) ? "departmentid = '" + departmentid + "', " : "";
+                        updateStr += !"".equals(jobtitleId) ? "jobtitle = '" + jobtitleId + "', " : "";
+                        updateStr += !"".equals(subcompanyid1) ? "subcompanyid1 = '" + subcompanyid1 + "', " : "";
+                        updateStr += !"".equals(managerid) ? "managerid = '" + managerid + "', " : "";
+                        sql = "update hrmresource set " +
+                                "workcode = '" + employeeCode + "', " +
+                                "lastname = ?, " +
+                                "sex = '" + sex + "', " +
+                                "mobile = '" + personalTel + "', " +
+                                "ecology_pinyin_search = ?, " +
+                                "pinyinlastname = ?, " +
+                                "email = '" + email + "', " +
+                                "telephone = '" + companyTel + "', " +
+                                "status = " + status + ", " +
+                                "birthday = '" + birthdate + "', " +
+                                "certificatenum = '" + idNumber + "', " +
+                                "companystartdate = '" + EntryDate + "', " +
+                                "modified = to_date('" + now + "','yyyy-mm-dd hh24:mi:ss')," +
+                                "modifier = '1', " +
+                                "lastmoddate = '" + now.substring(0, 10) + "', " +
+                                updateStr +
+                                "lastmodid = '1' " +
+                                "where  id ='" + id + "'";
+                        boolean executeUpdate = rs.executeUpdate(sql, newEmployeeName, name_pinyin, name_pinyin);
+                        log.writeLog("更新人员是否正确：" + executeUpdate);
+                        updateNum++;
+
+                        log.writeLog("更新人员基本信息表中数据sql--------->" + sql);
+                        rs.executeQuery("select id,field15 from cus_fielddata where scopeid='1' and scope='HrmCustomFieldByInfoType' and id='" + id + "'");
+                        if (!rs.next()) {
+                            OrganizationUtil.insertEmployeeCustomizePersonal(id,bankInfo,null,row);
+                        } else {
+                            //更新人员工作信息表数据
+                            if ("".equals(bankAccountId)) {
+                                OrganizationUtil.updateEmployeeCustomizePersonal(id,null,null,row);
+                            } else {
+                                OrganizationUtil.updateEmployeeCustomizePersonal(id,bankInfo,null,row);
+                            }
+                        }
+
+                        OrganizationUtil.dealEmployeeNickName(id,field0);
+                        //刷新人员缓存
+                        rci.updateResourceInfoCache(id);
+                    }
+                }
+                insertCount += insertNum;
+                updateCount += updateNum;
+                skipCount += skipNum;
+                log.writeLog("----------同步结束人员，第" + count + "页：" + totalCount +
+                        ",新增人员数为：" + insertNum + " ,更新人员数为：" + updateNum + ",跳过处理人员数为：" + skipNum + "------------");
+                skipNum = 0;
+                insertNum = 0;
+                updateNum = 0;
+            }
+            log.writeLog("---------开始处理未更新的直属领导信息-------");
+            OrganizationUtil.dealNoFindMangerEmployeeData(noFindManagerMap);
+            log.writeLog("---------结束处理未更新的直属领导信息-------");
+            log.writeLog("----------印尼 同步人员结束总人数：" + totalCount + ",新增人数：" + insertCount + ",更新人数：" + updateCount + ",跳过人数：" + skipCount + "------------");
+
+            //更新同步时间到中间表
+            String sql1 = "update uf_HRRestDate set sctbsj ='" + now + "' where jkm = '/dcopenedi/hrEmployee/pageByUpdateTime'";
+            rs.executeUpdate(sql1);
+
+        } catch (Exception e) {
+            log.writeLog("---------Exception------------:" + JavaUtil.getExceptionDetail(e));
+            e.printStackTrace();
+        }
+
+    }
+
+    /**
+     * 获取员工信息
+     * @param pages 页码
+     * @param today 日期
+     * @return 返回员工信息
+     */
+    public JSONArray getUsersByPage(String pages, String today) {
+        int size = 5000;
+        List<String> list = new ArrayList<>();
+        list.add("IDN");
+
+        String s = OrganizationUtil.callEmployeeInterface(size,pages,today,list,list,"");
+        if (!"".equals(s) && null != s) {
+            log.writeLog("---------------接口返回空成功:" + s.substring(0, 1000));
+        } else {
+            log.writeLog("---------------接口返回空");
+        }
+
+        JSONObject jsonObject = JSONObject.parseObject(s);
+
+        //人员数据集合
+        JSONArray jsonArray = new JSONArray();
+
+        if(jsonObject.containsKey("code")){
+            int code = jsonObject.getInteger("code");
+
+            if(code == 1){
+                JSONObject result = jsonObject.getJSONObject("data");
+
+                JSONArray records = result.getJSONArray("records");
+                jsonArray.addAll(records);
+
+                //是否存在下一页
+                if (result.get("hasNextPage").toString().equals("true")) {
+                    current = result.get("maxPoint").toString();
+                } else {
+                    isNext = false;
+                }
+            }
+        }else{
+            isNext = false;
+        }
+
+        log.writeLog("没筛选之前条数：" + jsonArray.size());
+
+        return jsonArray;
+    }
+
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/schedule/hrm/idn/SyncHrmresourceToOAIDNOld.java b/src/main/youhong_ai_jitu_src/jntchina/schedule/hrm/idn/SyncHrmresourceToOAIDNOld.java
new file mode 100644
index 0000000..8c8a330
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/schedule/hrm/idn/SyncHrmresourceToOAIDNOld.java
@@ -0,0 +1,856 @@
+package jntchina.schedule.hrm.idn;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.api.integration.util.JavaUtil;
+import com.engine.common.service.impl.HrmCommonServiceImpl;
+import com.engine.common.service.impl.ThemeServiceImpl;
+import jntchina.schedule.hrm.SyncHrmdepartmentToOA;
+import jntchina.schedule.hrm.SyncHrmjobtitlesToOA;
+import jntchina.schedule.hrm.SyncHrmresourceToOA;
+import jntchina.schedule.hrm.SyncHrmsubcompanyToOA;
+import jntchina.schedule.hrm.entity.HrmUserDto;
+import jntchina.util.HttpClientToJT;
+import selfdev.util.base.TimeCommonUtil;
+import selfdev.util.log.LogTool;
+import weaver.conn.RecordSet;
+import weaver.file.Prop;
+import weaver.general.Util;
+import weaver.hrm.resource.ResourceComInfo;
+
+import java.io.BufferedWriter;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.format.DateTimeFormatter;
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * @author Cyq
+ * @date 2021年6月17日 02:01:51
+ */
+public class SyncHrmresourceToOAIDNOld {
+
+    //是否有下一页
+    boolean isNext = true;
+
+    //页码
+    String current = "1";
+    //人员编码和id  map
+    Map<String, String> map_user_code_id = new HashMap<String, String>();
+    private LogTool log = new LogTool("/log/hrm/IDN/user/", false);
+
+    public void execute(String today) {
+        log.writeLog("---------进入印尼人员同步------------");
+        try {
+
+            HrmCommonServiceImpl hrmCommonServiceImpl = new HrmCommonServiceImpl();
+            String now = TimeCommonUtil.obtainDate(0);
+            SyncHrmsubcompanyToOA hrmsubcompany = new SyncHrmsubcompanyToOA();
+            SyncHrmdepartmentToOA hrmdepartment = new SyncHrmdepartmentToOA();
+            SyncHrmjobtitlesToOA hrmjobtitles = new SyncHrmjobtitlesToOA();
+            ThemeServiceImpl themeService = new ThemeServiceImpl();
+            Map<String, String> map_subcompany_code_id = hrmsubcompany.getSubCodeIdMap();
+            Map<String, String> map_dept_code_id = hrmdepartment.getDepartmentCodeIdMap();
+//        Map<String, String> map_zybm = getZyBmMap();//直营部门
+//        Map<String, String> map_zyfb = getZyFbMap();//直营分部
+//        log.writeLog("----------直营部门MAP:"+JSON.toJSONString(map_zybm)+"------------");
+//        log.writeLog("----------map_dept_code_id："+JSON.toJSONString(map_dept_code_id)+"------------");
+//        Map<String, String> map_dept_com= hrmdepartment.getDeptComMap();
+            //Map<String, String> map_jobtitle_code_id = hrmjobtitles.getJobtitleCodeIdMap();
+//        Map<String, String> map_gzdd_OA = getGzddOAMap();
+            //未获取到的上级的集合
+            Map<String, String> map_usernofindsuper = new HashMap<>();
+            Map<String, String> map_user_id_defined = getUserIdDefinedMap();
+            map_user_code_id = getUserCodeIdMap();
+//        log.writeLog("----------UserCodeIdmap:"+JSON.toJSONString(map_user_code_id)+"------------");
+            // 处理人员同步逻辑
+            RecordSet rs = new RecordSet();
+            String sql = "";
+            log.writeLog("----------开始同步人员------------");
+            int totalCount = 0, insertCount = 0, updateCount = 0, skipCount = 0;
+            int skipNum = 0, insertNum = 0, updateNum = 0;
+            //int page = getPage(today);
+            //log.writeLog("page------------>" + page);
+
+            //更新人员缓存
+            ResourceComInfo rci = new ResourceComInfo();
+            // for (int k = 1; k <= page; k++) {
+            //如果有下一页就会循环
+            int count = 0;
+            while (isNext) {
+                count++;
+                JSONArray data = getUsersByPage(current, today);
+                List<HrmUserDto> users = JSONArray.parseArray(data.toJSONString(), HrmUserDto.class);
+                totalCount = totalCount + users.size();
+                // log.writeLog("----------同步人员第" + current + "页，条数:" + users.size());
+                log.writeLog("----------同步人员第" + count + "页，条数:" + users.size());
+//            log.writeLog("----------同步人员源数据："+users.toJSONString());
+//            String password = "96E79218965EB72C92A549DD5A330112";//默认密码111111
+                String password = "9F51B4682F92AB843B401218BF27C301";//默认密码Jitu@2021
+                for (int i = 0; i < users.size(); i++) {
+                    try {
+                        String field0 = "";
+                        HrmUserDto row = users.get(i);
+                        String employeeCode = Util.null2String(row.getEmployeeCode());//员工code
+                        log.writeLog("----------------工号：" + employeeCode);
+                        String employeeName = Util.null2String(row.getEmployeeName());//姓名
+                        log.writeLog("----------------姓名：" + employeeName);
+                        String employeeSexCode = Util.null2String(row.getEmployeeSexCode());//性别 M男 F女 对应 OA 0男 1女
+                        Integer sex = "M".equals(employeeSexCode) ? 0 : 1;
+                        String birthdate = Util.null2String(row.getEmployeeBirthdate());//出生年月
+                        String companyTel = Util.null2String(row.getCompanyTel());//办公电话
+                        String personalTel = Util.null2String(row.getPersonalTel());//手机号
+                        String email = Util.null2String(row.getCompanyEmail());//邮箱
+                        String idNumber = Util.null2String(row.getCertificateNum());//身份证号码
+//                String seclevel = "0";
+                        String managerCode = Util.null2String(row.getSupervisorId());//上级次账号code
+                        //获取人员姓名的拼音
+                        String name_pinyin = hrmCommonServiceImpl.generateQuickSearchStr(employeeName);
+                        String EntryDate = Util.null2String(row.getEmplHireDate());//入职日期  无字段，暂用试用结束日期来替代
+                        String hrStatus = Util.null2String(row.getHrStatus());//状态A在职，I离职 对应OA的1正式 5离职
+                        Integer status = "A".equals(hrStatus) ? 1 : 5;//OA的在职状态
+                        String companyCode = Util.null2String(row.getCompanyCode());//所属组织
+                        String deptCode = Util.null2String(row.getDeptCode());//部门
+                        String positionCode = Util.null2String(row.getPositionCode());//岗位
+                        log.writeLog("----------------岗位：" + positionCode);
+                        log.writeLog("----------------部门：" + deptCode);
+
+                        String workLocationCode = Util.null2String(row.getWorkLocationCode());//工作地点code
+                        String workLocaltionName = Util.null2String(row.getWorkLocaltionName());//工作地点
+//            String OIdJobSequence = Util.null2String(map_zwxl_HR.get(row.getString("positonRankCode")));//职务序列
+                        String jobLevel = Util.null2String(row.getPositonRankCode());//职级
+                        String bankBranchName = Util.null2String(row.getBankBranchName());//开户行
+                        String bankAccountId = Util.null2String(row.getBankAccountId());//银行卡号
+                        String bankName = Util.null2String(row.getBankName());//银行类型
+//                String locationid = "521"; //默认上海
+                        String departmentid = "", subcompanyid1 = "";
+                        //各种code换id
+                        // String userId = Util.null2String(map_user_code_id.get(employeeCode));//员工ID
+                        String managerid = "";
+                        //若维护了上级次账号，则根据维护的数据找上级
+                        if (!"".equals(managerCode)) {
+                            rs.executeQuery("select id from hrmresource where workcode = ?", managerCode);
+                            if (rs.next()) {
+                                managerid = rs.getString("id");
+                            }
+                            //managerid = Util.null2String(map_user_code_id.get(managerCode));//直接上级
+                        } else {
+                            String depid = Util.null2String(map_dept_code_id.get(deptCode));//部门ID
+//                    rs.executeQuery("select id from hrmdepartment where code = ?",deptCode);
+//                    rs.next();
+//                    String depid = rs.getString("id");
+                            if (!"".equals(depid)) {
+                                rs.executeQuery("select bmfzr from HRMDEPARTMENTDEFINED where DEPTID = " + depid);
+                                if (rs.next()) {
+                                    managerid = Util.null2String(rs.getString("bmfzr"));
+                                }
+                            }
+                        }
+                        //从HR获取有上级，但是在OA中未找到，则说明可能上级是新入职还未同步到OA中
+                        if ("".equals(managerid) && !"".equals(managerCode)) {
+                            map_usernofindsuper.put(employeeCode, managerCode);
+                        }
+                        //处理岗位id
+                        String jobtitleid = "";
+                        if (!"".equals(positionCode)) {
+                            // jobtitleid = Util.null2String(map_jobtitle_code_id.get(positionCode));//岗位ID
+                            rs.executeQuery("select id from hrmjobtitles where outkey = ?", positionCode);
+                            if (rs.next()) {
+                                jobtitleid = rs.getString("id");
+                            } else {
+                                log.writeLog("cylnb 这个人的岗位不存在:" + employeeName);
+                                log.writeLog("cylnb 岗位编码:" + positionCode);
+                            }
+                        }
+
+
+                        //如果部门编码为空，跳过不同步
+                        if ("".equals(deptCode)) {
+                            skipNum++;
+                            log.writeLog("cylnb is dept null1:" + deptCode + "; userCode" + employeeCode);
+                            continue;
+                        } else {
+                            //处理所属部门编码对应的OA部门、分部。在分部表，部门表匹配
+                            departmentid = Util.null2String(map_dept_code_id.get(deptCode));//部门ID
+                            subcompanyid1 = Util.null2String(map_subcompany_code_id.get(deptCode));//分部ID
+                            log.writeLog("----人员code:" + employeeCode + ",所属部门code:" + deptCode + ",部门id：" + departmentid + ",部门领导code：" + managerCode + ",部门领导id：" + managerid + "--------->");
+                            if ("".equals(departmentid) && "".equals(subcompanyid1)) {
+                                log.writeLog("cylnb is dept and sub null Code:" + deptCode + "; userCode" + employeeCode);
+                                skipNum++;
+                                continue;
+                            } else if (!"".equals(departmentid)) {
+                                subcompanyid1 = getSubcomBydept(departmentid);
+                                log.writeLog("----人员code:" + employeeCode + ",所属部门code:" + deptCode + ",所属部门id:" + departmentid + ",对应的分部id：" + subcompanyid1 + "--------->");
+                            } else if (!"".equals(subcompanyid1)) {
+                                log.writeLog("cylnb is dept null Code:" + deptCode + "; userCode" + employeeCode);
+
+                                //String deptId = Prop.getPropValue("", guojia);
+//                            String deptId = "800117";
+//                            departmentid = deptId;
+//                            rs.executeQuery("select  from hrmdepartment where id = ?", deptId);
+//                            if (rs.next()) {
+//                                subcompanyid1 = rs.getString("subcompanyid1");
+//                            }
+                                skipNum++;
+                                continue;
+                                //departmentid = "";
+                            }
+
+                        }
+
+                        //去除国家
+                        rs.executeQuery("select * from hrmdepartmentdefined where deptid = ?", departmentid);
+                        if (rs.next()) {
+                            String guojia = rs.getString("guojia");
+                            if (!"IDN".equals(guojia) || "".equals(guojia)) {
+                                log.writeLog("cylnb continue user 部门不是印尼或没有国家字段:" + employeeCode + " 部门:" + deptCode);
+                                skipNum++;
+                                continue;
+                            }
+                        } else {
+                            log.writeLog("cylnb continue 找不到部门:" + employeeCode + " 部门:" + deptCode);
+                            skipNum++;
+                            continue;
+                        }
+                        //是否直营判断
+//                if(departmentid!=null){
+//                    status = map_zybm.containsKey(departmentid)?7:status;
+//                }
+//                if(subcompanyid1!=null){
+//                    status = map_zyfb.containsKey(subcompanyid1)?7:status;
+//                }
+
+
+                        //判断人员ID是否已经存在,不存在则插入生成新人员
+//                        employeeName = row.getEmployeeEnglishName();
+//                        bankBranchName = row.getEmployeeName();
+
+//                        employeeName = row.getEmployeeEnglishName();
+//                        field0 = row.getEmployeeName();
+                        field0 = row.getEmployeeEnglishName();
+                        employeeName = row.getEmployeeName();
+
+
+                        log.writeLog("-----------------field0:" + field0);
+                        log.writeLog("-----------------employeeName:" + employeeName);
+
+                        rs.executeQuery("select id from hrmresource where workcode = ?", employeeCode);
+                        if (!rs.next()) {
+                            // if (!map_user_code_id.containsKey(employeeCode)) {
+                            //获取即将插入的人员ID
+                            rs.executeProc("HrmResourceMaxId_Get", "");
+                            rs.next();
+                            String maxUserId = "" + rs.getInt(1);
+                            //新增数据,插入到人员基本信息表HrmResource中 seclevel
+                            sql = "insert into hrmresource(id,loginid,password,lastname,workcode,sex, " +
+                                    "mobile,email,departmentid,jobtitle,birthday,certificatenum," +
+                                    "seclevel,outkey,status,systemlanguage,createrid,createdate," +
+                                    "companystartdate,telephone,ecology_pinyin_search,pinyinlastname," +
+                                    "created,creater,modified,modifier,managerid,subcompanyid1) values( "
+                                    + "'" + maxUserId + "',"
+                                    + "'" + employeeCode + "',"
+                                    + "'" + password + "',"
+                                    + "'" + employeeName + "',"
+                                    + "'" + employeeCode + "',"
+                                    + "'" + sex + "',"
+                                    + "'" + personalTel + "',"
+                                    + "'" + email + "',"
+                                    + "'" + departmentid + "',"
+                                    + "'" + jobtitleid + "',"
+                                    + "'" + birthdate + "',"
+                                    + "'" + idNumber + "',"
+                                    + "'" + 10 + "',"
+                                    + "'" + employeeCode + "',"
+                                    + "" + status + ","
+                                    + "'7',"
+                                    + "'1',"
+                                    + "'" + now.substring(0, 10) + "',"
+                                    + "'" + EntryDate + "',"
+                                    + "'" + companyTel + "',"
+                                    + "'" + name_pinyin + "',"
+                                    + "'" + name_pinyin + "',"
+                                    + "to_date('" + now + "','yyyy-mm-dd hh24:mi:ss'),"
+                                    + "'1',"
+                                    + "to_date('" + now + "','yyyy-mm-dd hh24:mi:ss'),"
+                                    + "'1',"
+                                    + "'" + managerid + "',"
+                                    + "'" + subcompanyid1 + "')";
+                            boolean executeUpdate = rs.executeUpdate(sql);
+                            log.writeLog("新增人员是否正确" + executeUpdate);
+                            log.writeLog("插入人员表中数据sql--------->" + sql);
+                            //将新增加的人员加入至MAP中
+                            insertNum++;
+                            // map_user_code_id.put(employeeCode,maxUserId);
+                            //新增数据,插入到人员自定义表cus_fielddata中
+
+                            String uid = maxUserId;
+//                        rs.executeQuery("select id from hrmresource where workcode = ?", employeeCode);
+//                        if (rs.next()) {
+//                            uid = rs.getString("id");
+//                        }
+
+                            rs.executeQuery("select id,field15 from cus_fielddata where scopeid='1' and scope='HrmCustomFieldByInfoType' and field15='" + employeeCode + "'");
+                            //rs.executeQuery("select id,field15 from cus_fielddata where scope='HrmCustomFieldByInfoType' and id='" + uid + "'");
+                            if (!rs.next()) {
+                                if ("".equals(bankAccountId)) {
+                                    sql = "insert into cus_fielddata(scope,scopeid,id,field0,field15,field16,field17,field18,field19,field20,field21,field14,field22,field23,field24) values("
+                                            + "'HrmCustomFieldByInfoType',"
+                                            + "'1',"
+                                            + "'" + uid + "',"
+                                            + "'" + bankAccountId + "'," //多语言 昵称
+                                            + "'" + employeeCode + "',"
+                                            + "'" + Util.null2String(row.getCompanyCode()) + "',"
+                                            + "'" + Util.null2String(row.getCompanyName()) + "',"
+                                            + "'" + Util.null2String(row.getDeptCode()) + "',"
+                                            + "'" + Util.null2String(row.getDeptName()) + "',"
+                                            + "'" + Util.null2String(row.getPositionCode()) + "',"
+                                            + "'" + Util.null2String(row.getPositionName()) + "',"
+                                            + "'" + Util.null2String(row.getPositionType()) + "',"
+                                            + "'" + Util.null2String(row.getPositionTypeDescr()) + "',"
+                                            + "'" + Util.null2String(row.getPositonRankCode()) + "',"
+                                            + "'" + Util.null2String(row.getPositonRankDescr()) + "')";
+                                } else {
+                                    sql = "insert into cus_fielddata(scope,scopeid,id,field0,field1,field5,field7,field15,field16,field17,field18,field19,field20,field21,field14,field22,field23,field24) values("
+                                            + "'HrmCustomFieldByInfoType',"
+                                            + "'1',"
+                                            + "'" + uid + "',"
+                                            + "'" + bankBranchName + "',"
+                                            + "'" + bankAccountId + "'," //多语言 昵称
+                                            + "'" + employeeName + "',"
+                                            + "'" + bankName + "',"
+                                            + "'" + employeeCode + "',"
+                                            + "'" + Util.null2String(row.getCompanyCode()) + "',"
+                                            + "'" + Util.null2String(row.getCompanyName()) + "',"
+                                            + "'" + Util.null2String(row.getDeptCode()) + "',"
+                                            + "'" + Util.null2String(row.getDeptName()) + "',"
+                                            + "'" + Util.null2String(row.getPositionCode()) + "',"
+                                            + "'" + Util.null2String(row.getPositionName()) + "',"
+                                            + "'" + Util.null2String(row.getPositionType()) + "',"
+                                            + "'" + Util.null2String(row.getPositionTypeDescr()) + "',"
+                                            + "'" + Util.null2String(row.getPositonRankCode()) + "',"
+                                            + "'" + Util.null2String(row.getPositonRankDescr()) + "')";
+
+                                }
+                                boolean b = rs.executeUpdate(sql);
+                                log.writeLog("-------------新增自定义信息：" + sql);
+                                log.writeLog("-------------新增自定义信息是否成功：" + b);
+                                //将新增加的人员自定义信息加入至MAP中
+                                //map_user_id_defined.put(maxUserId,employeeCode);
+                            } else {
+                                //如果已经存在就修改
+                                log.writeLog("---------------已经存在但是信息不是自己");
+                            }
+                            //log.writeLog("插入人员自定义表中数据sql--------->" + sql);
+                            //基本信息
+                            rs.executeQuery("select id from cus_fielddata where scopeid='-1' and scope='HrmCustomFieldByInfoType' ");
+                            if (!rs.next()) {
+                                String cusSql = "insert into cus_fielddata(scope,scopeid,id,field0) values("
+                                        + "'HrmCustomFieldByInfoType',"
+                                        + "'-1',"
+                                        + "'" + uid + "',"
+                                        + "'" + field0 + "')";
+                                boolean b = rs.executeUpdate(cusSql);
+                                log.writeLog("-------------新增自定义基本信息：" + cusSql);
+                                log.writeLog("-------------新增自定义基本是否成功：" + b);
+                            } else {
+                                String cusSql = "update cus_fielddata set " +
+                                        "scopeid = '-1', " +
+                                        "field0 = '" + field0 + "' " +
+                                        "where  id ='" + uid + "' and scopeid='-1' and scope = 'HrmCustomFieldByInfoType'";
+
+                                boolean b = rs.executeUpdate(cusSql);
+                                log.writeLog("-------------修改自定义基本信息：" + cusSql);
+                                log.writeLog("-------------修改自定义基本是否成功：" + b);
+                            }
+                            themeService.createSubCompanyMenu(Integer.valueOf(maxUserId), Integer.valueOf(subcompanyid1));
+                            //刷新人员缓存
+                            rci.addResourceInfoCache(maxUserId);
+                        } else {//存在则更新
+
+                            String id = rs.getString("id");
+                            //更新人员基本信息表数据
+                            //userId = Util.null2String(map_user_code_id.get(employeeCode));//员工ID
+                            String updateStr = "";
+                            updateStr += !"".equals(departmentid) ? "departmentid = '" + departmentid + "', " : "";
+                            updateStr += !"".equals(jobtitleid) ? "jobtitle = '" + jobtitleid + "', " : "";
+                            updateStr += !"".equals(subcompanyid1) ? "subcompanyid1 = '" + subcompanyid1 + "', " : "";
+                            updateStr += !"".equals(managerid) ? "managerid = '" + managerid + "', " : "";
+                            sql = "update hrmresource set " +
+                                    "workcode = '" + employeeCode + "', " +
+                                    "lastname = '" + employeeName + "', " +
+                                    "sex = '" + sex + "', " +
+                                    "mobile = '" + personalTel + "', " +
+                                    "ecology_pinyin_search = '" + name_pinyin + "', " +
+                                    "pinyinlastname = '" + name_pinyin + "', " +
+                                    "email = '" + email + "', " +
+                                    "telephone = '" + companyTel + "', " +
+                                    "status = " + status + ", " +
+                                    "birthday = '" + birthdate + "', " +
+                                    "certificatenum = '" + idNumber + "', " +
+                                    "companystartdate = '" + EntryDate + "', " +
+                                    "modified = to_date('" + now + "','yyyy-mm-dd hh24:mi:ss')," +
+                                    "modifier = '1', " +
+                                    "lastmoddate = '" + now.substring(0, 10) + "', " +
+                                    updateStr +
+                                    "lastmodid = '1' " +
+//                                "loginid = '"+employeeCode+"' , "+
+//                                "password = '"+password+"'  "+
+                                    "where  id ='" + id + "'";
+                            boolean executeUpdate = rs.executeUpdate(sql);
+                            log.writeLog("更新人员是否正确：" + executeUpdate);
+                            updateNum++;
+
+//                    themeService.createSubCompanyMenu(Integer.valueOf(userId),Integer.valueOf(subcompanyid1));
+                            log.writeLog("更新人员基本信息表中数据sql--------->" + sql);
+                            rs.executeQuery("select id,field15 from cus_fielddata where scopeid='1' and scope='HrmCustomFieldByInfoType' and id='" + id + "'");
+                            //rs.executeQuery("select id,field15 from cus_fielddata where  scope='HrmCustomFieldByInfoType' and id='" + id + "'");
+                            if (!rs.next()) {
+                                //if ("".equals(Util.null2String(map_user_id_defined.get(userId)))) {
+
+                                //新增数据,插入到人员自定义表cus_fielddata中
+                                sql = "insert into cus_fielddata(scope,scopeid,id,field0,field1,field5,field7,field15,field16,field17,field18,field19,field20,field21,field14,field22,field23,field24) values("
+                                        + "'HrmCustomFieldByInfoType',"
+                                        + "'1',"
+                                        + "'" + id + "',"
+                                        + "'" + bankBranchName + "',"
+                                        + "'" + bankAccountId + "',"
+                                        + "'" + employeeName + "',"
+                                        + "'" + bankName + "',"
+                                        + "'" + employeeCode + "',"
+                                        + "'" + Util.null2String(row.getCompanyCode()) + "',"
+                                        + "'" + Util.null2String(row.getCompanyName()) + "',"
+                                        + "'" + Util.null2String(row.getDeptCode()) + "',"
+                                        + "'" + Util.null2String(row.getDeptName()) + "',"
+                                        + "'" + Util.null2String(row.getPositionCode()) + "',"
+                                        + "'" + Util.null2String(row.getPositionName()) + "',"
+                                        + "'" + Util.null2String(row.getPositionType()) + "',"
+                                        + "'" + Util.null2String(row.getPositionTypeDescr()) + "',"
+                                        + "'" + Util.null2String(row.getPositonRankCode()) + "',"
+                                        + "'" + Util.null2String(row.getPositonRankDescr()) + "')";
+
+                            } else {
+                                //更新人员工作信息表数据
+                                if ("".equals(bankAccountId)) {
+                                    sql = "update cus_fielddata set " +
+                                            //"scopeid = '-1', " +
+                                            "field0 = '" + bankBranchName + "', " +
+                                            "field15 = '" + employeeCode + "', " +
+                                            "field16 = '" + Util.null2String(row.getCompanyCode()) + "', " +
+                                            "field17 = '" + Util.null2String(row.getCompanyName()) + "', " +
+                                            "field18 = '" + Util.null2String(row.getDeptCode()) + "', " +
+                                            "field19 = '" + Util.null2String(row.getDeptName()) + "', " +
+                                            "field20 = '" + Util.null2String(row.getPositionCode()) + "', " +
+                                            "field21 = '" + Util.null2String(row.getPositionName()) + "', " +
+                                            "field14 = '" + Util.null2String(row.getPositionType()) + "', " +
+                                            "field22 = '" + Util.null2String(row.getPositionTypeDescr()) + "', " +
+                                            "field23 = '" + Util.null2String(row.getPositonRankCode()) + "', " +
+                                            "field24 = '" + Util.null2String(row.getPositonRankDescr()) + "' " +
+                                            "where  id ='" + id + "' and scopeid='1' and scope = 'HrmCustomFieldByInfoType'";
+                                    //"where  id ='" + id + "'  and scope = 'HrmCustomFieldByInfoType'";
+                                } else {
+                                    sql = "update cus_fielddata set " +
+                                            //"scopeid = '-1', " +
+                                            "field0 = '" + bankBranchName + "', " +
+                                            "field1 = '" + bankAccountId + "', " +
+                                            "field5 = '" + employeeName + "', " +
+                                            "field7 = '" + bankName + "', " +
+                                            "field15 = '" + employeeCode + "', " +
+                                            "field16 = '" + Util.null2String(row.getCompanyCode()) + "', " +
+                                            "field17 = '" + Util.null2String(row.getCompanyName()) + "', " +
+                                            "field18 = '" + Util.null2String(row.getDeptCode()) + "', " +
+                                            "field19 = '" + Util.null2String(row.getDeptName()) + "', " +
+                                            "field20 = '" + Util.null2String(row.getPositionCode()) + "', " +
+                                            "field21 = '" + Util.null2String(row.getPositionName()) + "', " +
+                                            "field14 = '" + Util.null2String(row.getPositionType()) + "', " +
+                                            "field22 = '" + Util.null2String(row.getPositionTypeDescr()) + "', " +
+                                            "field23 = '" + Util.null2String(row.getPositonRankCode()) + "', " +
+                                            "field24 = '" + Util.null2String(row.getPositonRankDescr()) + "' " +
+                                            "where  id ='" + id + "' and scopeid='1' and scope = 'HrmCustomFieldByInfoType'";
+                                    // "where  id ='" + id + "' and scope = 'HrmCustomFieldByInfoType'";
+                                }
+                            }
+                            boolean executeUpdate1 = rs.executeUpdate(sql);
+                            log.writeLog("更新人员自定义表中数据sql--------->" + sql);
+                            log.writeLog("是否正确--------->" + executeUpdate1);
+                            //将新增加的人员自定义信息加入至MAP中
+                            // map_user_id_defined.put(userId, employeeCode);
+
+
+                            //基本信息
+                            rs.executeQuery("select id from cus_fielddata where scopeid='-1' and scope='HrmCustomFieldByInfoType' and id='" + id + "'");
+                            if (!rs.next()) {
+                                String cusSql = "insert into cus_fielddata(scope,scopeid,id,field0) values("
+                                        + "'HrmCustomFieldByInfoType',"
+                                        + "'-1',"
+                                        + "'" + id + "',"
+                                        + "'" + field0 + "')";
+                                boolean b = rs.executeUpdate(cusSql);
+                                log.writeLog("-------------新增自定义基本信息：" + cusSql);
+                                log.writeLog("-------------新增自定义基本是否成功：" + b);
+                            } else {
+                                String cusSql = "update cus_fielddata set " +
+                                        "scopeid = '-1', " +
+                                        "field0 = '" + field0 + "' " +
+                                        "where  id ='" + id + "' and scopeid='-1' and scope = 'HrmCustomFieldByInfoType'";
+
+                                boolean b = rs.executeUpdate(cusSql);
+                                log.writeLog("-------------修改自定义基本信息：" + cusSql);
+                                log.writeLog("-------------修改自定义基本是否成功：" + b);
+                            }
+
+                            //刷新人员缓存
+                            rci.addResourceInfoCache(id);
+                        }
+                    } catch (Exception e) {
+                        log.writeLog("--------------报错了：" + JavaUtil.getExceptionDetail(e));
+                        continue;
+                    }
+                }
+                insertCount += insertNum;
+                updateCount += updateNum;
+                skipCount += skipNum;
+                log.writeLog("----------同步结束人员，第" + count + "页：" + totalCount +
+                        ",新增人员数为：" + insertNum + " ,更新人员数为：" + updateNum + ",跳过处理人员数为：" + skipNum + "------------");
+                skipNum = 0;
+                insertNum = 0;
+                updateNum = 0;
+            }
+            log.writeLog("---------开始处理未更新的直属领导信息-------");
+            donotfinduser(map_usernofindsuper);
+            log.writeLog("---------结束处理未更新的直属领导信息-------");
+            log.writeLog("----------同步人员结束总人数：" + totalCount + ",新增人数：" + insertCount + ",更新人数：" + updateCount + ",跳过人数：" + skipCount + "------------");
+            try {
+                //更新人员缓存
+                // ResourceComInfo rci = new ResourceComInfo();
+                // rci.removeResourceCache();
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+
+            //更新同步时间到中间表
+            String sql1 = "update uf_HRRestDate set sctbsj ='" + now + "' where jkm = '/dcopenedi/hrEmployee/pageByUpdateTime'";
+            rs.executeUpdate(sql1);
+
+        } catch (Exception e) {
+            log.writeLog("---------Exception------------:" + JavaUtil.getExceptionDetail(e));
+            e.printStackTrace();
+        }
+
+    }
+
+    /**
+     * 更新上级领导（原先还未同步的上级领导）
+     *
+     * @param map_usernofindsuper
+     */
+    private void donotfinduser(Map<String, String> map_usernofindsuper) {
+        map_usernofindsuper.keySet();
+        Iterator entries = map_usernofindsuper.entrySet().iterator();
+        String sql = "", updateSql = "";
+        RecordSet rs = new RecordSet();
+        while (entries.hasNext()) {
+            Map.Entry<String, String> entry = (Map.Entry<String, String>) entries.next();
+            String userId = entry.getKey();
+            String managerCode = entry.getValue();
+            sql = "select id,outkey from  hrmresource where outkey='" + managerCode + "'";
+            rs.executeQuery(sql);
+            if (rs.next()) {
+                String id = Util.null2String(rs.getString("id"));
+                if (!"".equals(id)) {
+                    updateSql = "update hrmresource set managerid = '" + rs.getString("id") + "' where workcode ='" + userId + "'";
+                    rs.execute(updateSql);
+                }
+            }
+        }
+
+    }
+
+
+    public JSONArray getUsersByPage(String pages, String today) {
+        int size = 5000;
+        List list = new ArrayList();
+//        list.add("EGY");
+//        list.add("BRA");
+//        list.add("MEX");
+//        list.add("SAU");
+//        list.add("VNM");
+//        list.add("THA");
+//        list.add("MYS");
+//        list.add("SGP");
+//        list.add("KHM");
+//        list.add("PHL");
+        list.add("IDN");
+        List list1 = new ArrayList();
+        list1.add("IDN");
+
+
+        // String[] deptCountryCodes = new String[]{"EGY","BRA","MEX","SAU","VNM","THA","MYS","SGP","KHM","PHL"};
+        //String url = HttpClientToJT.baseUrl + "/dcopenedi/hrEmployee/pageByUpdateTime";
+        String url = HttpClientToJT.baseUrl + "/dcopenedi/hrEmployee/pageByParam";
+        String token = HttpClientToJT.getToken();
+        Map<String, Object> params = new HashMap<>();
+        params.put("updateTime", today);
+        params.put("point", pages);
+        params.put("languageCds", list1);
+//        params.put("updateTime", "2018-03-21 00:00:00");
+//        params.put("current", pages);
+        params.put("size", size);
+        params.put("deptCountryCodes", list);
+        // params.put("deptCountryCodes", "CHN");
+        log.writeLog("-----------------user请求地址：" + url);
+        log.writeLog("-----------------userToken：" + token);
+        log.writeLog("-----------------userParams：" + params);
+        String s = HttpClientToJT.sendPost(url, token, JSONObject.toJSONString(params));
+        if (!"".equals(s) && null != s) {
+            log.writeLog("---------------接口返回空成功:" + s.substring(0, 1000));
+        } else {
+            log.writeLog("---------------接口返回空");
+        }
+
+        JSONObject jsonObject = JSONObject.parseObject(s);
+
+        if (jsonObject.getInteger("code").equals(1)) {
+            JSONObject result = jsonObject.getJSONObject("data");
+            if (result.get("hasNextPage").toString().equals("true")) {
+                //  if (result.getJSONArray("records").size() > 0) {
+                //pages = result.getInteger("pages");
+                // pages++;
+                current = result.get("maxPoint").toString();
+                // current++;
+            } else {
+                isNext = false;
+            }
+        } else {
+            isNext = false;
+        }
+        JSONArray jsonArray = new JSONArray();
+        if (jsonObject.getInteger("code").equals(1)) {
+            JSONObject result = jsonObject.getJSONObject("data");
+            JSONArray records = result.getJSONArray("records");
+            jsonArray.addAll(records);
+        }
+        log.writeLog("没塞选之前条数：" + jsonArray.size());
+        //-------modifier by KangMD  取消国家，全部同步  start-------//
+//        Object directSales = jsonArray.stream().filter(item -> {
+//            JSONObject itemJson = JSONObject.parseObject(JSON.toJSONString(item));
+//            //return !"CHN".equals(itemJson.getString("countryCode"))&&!"IDN".equals(itemJson.getString("countryCode"));
+//            return !"CHN".equals(itemJson.getString("deptCountryCode")) && !"IDN".equals(itemJson.getString("deptCountryCode"));
+//            //return "ZHS".equals(itemJson.getString("languageCd"));
+//        }).collect(Collectors.toList());
+//        jsonArray = JSONArray.parseArray(JSON.toJSONString(directSales));
+        //-------modifier by KangMD  取消国家，全部同步  end-------//
+        //  log.writeLog("塞选之后条数："+jsonArray.size());
+
+//        System.out.println(jsonArray.toJSONString());
+//        System.out.println(s);
+        //将写入转化为流的形式
+//        writeFile(jsonArray);
+        return jsonArray;
+    }
+
+    public int getPage(String today) {
+        int current = 1, size = 5000, pages = 1;
+        String url = HttpClientToJT.baseUrl + "/dcopenedi/hrEmployee/pageByUpdateTime";
+        String token = HttpClientToJT.getToken();
+        boolean is = true;
+        while (is) {
+            Map<String, Object> params = new HashMap<>();
+            params.put("updateTime", today);
+//        params.put("updateTime", "2018-03-21 00:00:00");
+            params.put("current", current);
+            params.put("size", size);
+            //  params.put("deptCountryCodes", "EGY,BRA,MEX,SAU,VNM,THA,MYS,SGP,KHM,PHL");
+            params.put("deptCountryCodes", "CHN");
+            log.writeLog("-----------------page请求地址：" + url);
+            log.writeLog("-----------------pagetoken：" + token);
+            log.writeLog("-----------------pageparams：" + params);
+            String s = HttpClientToJT.sendGet(url, token, params);
+            JSONObject jsonObject = JSONObject.parseObject(s);
+            if (jsonObject.getInteger("code").equals(1)) {
+                JSONObject result = jsonObject.getJSONObject("data");
+                if (result.getJSONArray("records").size() > 0) {
+                    //pages = result.getInteger("pages");
+                    pages++;
+                    current++;
+                } else {
+                    is = false;
+                }
+            } else {
+                is = false;
+            }
+            try {
+                Thread.sleep(900);
+            } catch (InterruptedException e) {
+
+            }
+        }
+        return pages;
+    }
+
+    /**
+     * 根据部门编号获取所属分部
+     *
+     * @return
+     */
+    public String getSubcomBydept(String deptId) {
+        String subComid = "";
+        RecordSet rs = new RecordSet();
+        rs.executeQuery("select supdepid,subcompanyid1,outkey from HrmDepartment where id ='" + deptId + "'");
+        if (rs.next()) {
+            subComid = Util.null2String(rs.getString("subcompanyid1"));
+            String supdepid = Util.null2String(rs.getString("supdepid"));
+            //判断是一级部门或者无上级部门返回
+            if ("0".equals(supdepid) || "".equals(supdepid)) {
+                return subComid;
+            } else {
+                return getSubcomBydept(supdepid);
+            }
+        }
+        return subComid;
+    }
+
+    public JSONArray getUsers() {
+        int current = 1, size = 10000, pages = 2;
+        String url = HttpClientToJT.baseUrl + "/dcopenedi/hrEmployee/pageByUpdateTime";
+        String token = HttpClientToJT.getToken();
+        Map<String, Object> params = new HashMap<>();
+        LocalDateTime today_start = LocalDateTime.of(LocalDate.now(), LocalTime.MIN);//当天零点
+        String td_st_str = today_start.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+//        params.put("updateTime", td_st_str);
+        params.put("updateTime", "2021-07-09 00:00:00");
+        params.put("current", current);
+        params.put("size", size);
+        log.writeLog("-----------------请求地址：" + url);
+        log.writeLog("-----------------token：" + token);
+        log.writeLog("-----------------params：" + params);
+        String s = HttpClientToJT.sendGet(url, token, params);
+        JSONObject jsonObject = JSONObject.parseObject(s);
+        JSONArray jsonArray = new JSONArray();
+        if (jsonObject.getInteger("code").equals(1)) {
+            JSONObject result = jsonObject.getJSONObject("data");
+            pages = result.getInteger("pages");
+            JSONArray records = result.getJSONArray("records");
+            jsonArray.addAll(records);
+            for (int i = 1; i <= pages; i++) {
+                params.put("current", i);
+                String str = HttpClientToJT.sendGet(url, token, params);
+                JSONObject jsonObject1 = JSONObject.parseObject(str);
+                JSONObject jsonResult = jsonObject1.getJSONObject("data");
+                JSONArray records1 = jsonResult.getJSONArray("records");
+                Optional first = records1.stream().filter(item -> {
+                    JSONObject itemJson = JSONObject.parseObject(JSON.toJSONString(item));
+                    return "00367587".equals(itemJson.getString("employeeCode"));
+                }).findFirst();
+                if (first.isPresent()) {
+                    System.out.println(JSON.toJSONString(first.get()));
+                    return null;
+                }
+            }
+        }
+//        jsonArray = JSONArray.parseArray(JSON.toJSONString(directSales));
+//        System.out.println(jsonArray.toJSONString());
+//        System.out.println(s);
+//        //将写入转化为流的形式
+//        writeFile(jsonArray);
+        return jsonArray;
+    }
+
+    /**
+     * 获取人员自定义字段map id-->id
+     *
+     * @return
+     */
+    public Map<String, String> getUserIdDefinedMap() {
+
+        RecordSet rs = new RecordSet();
+        Map<String, String> map = new HashMap<>();
+        rs.executeQuery("select id,field15 from cus_fielddata where scopeid='1' and scope='HrmCustomFieldByInfoType'");
+        while (rs.next()) {
+            map.put(rs.getString("id"), rs.getString("field15"));
+        }
+        return map;
+
+    }
+
+    /**
+     * 获取工作地点map code-->id
+     *
+     * @return
+     */
+    public Map<String, String> getGzddOAMap() {
+        RecordSet rs = new RecordSet();
+        Map<String, String> map = new HashMap<>();
+        rs.executeQuery("select locationname,id from HrmLocations where locationname is not null");
+        while (rs.next()) {
+            map.put(rs.getString("locationname"), rs.getString("id"));
+        }
+        return map;
+    }
+
+    /**
+     * 获取获取直营部门
+     *
+     * @return
+     */
+    public Map<String, String> getZyBmMap() {
+        RecordSet rs = new RecordSet();
+        Map<String, String> map = new HashMap<>();
+        rs.executeQuery("select a.id,a.created from HrmDepartment a left join HrmDepartmentDefined b on a.id=b.deptid where b.sfzy = 'N' " +
+                "and  a.created > to_date('2021-07-27 00:00:00','yyyy-mm-dd hh24:mi:ss')");
+        while (rs.next()) {
+            map.put(rs.getString("id"), rs.getString("created"));
+        }
+        return map;
+    }
+
+    /**
+     * 获取获取直营分部
+     *
+     * @return
+     */
+    public Map<String, String> getZyFbMap() {
+        RecordSet rs = new RecordSet();
+        Map<String, String> map = new HashMap<>();
+        rs.executeQuery("select a.id,a.created from hrmsubcompany a left join hrmsubcompanyDefined b on a.id=b.SUBCOMID where b.sfzy = 'N' " +
+                "and  a.created > to_date('2021-07-27 00:00:00','yyyy-mm-dd hh24:mi:ss')");
+        while (rs.next()) {
+            map.put(rs.getString("id"), rs.getString("created"));
+        }
+        return map;
+    }
+
+    public Map<String, String> getUserCodeIdMap() {
+        RecordSet rs = new RecordSet();
+        Map<String, String> map = new HashMap<>();
+        rs.executeQuery("select workcode,outkey,id from hrmresource where outkey is not null ");
+        while (rs.next()) {
+            map.put(rs.getString("outkey"), rs.getString("id"));
+        }
+        return map;
+    }
+
+    private void writeFile(JSONArray jsonArray) {
+        BufferedWriter bw = null;
+        try {
+            bw = new BufferedWriter(new FileWriter("D:\\4.txt"));
+            //一次写一行
+            bw.write(jsonArray.toJSONString());
+            bw.newLine();  //换行用
+            //关闭流
+            bw.close();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        System.out.println("写入成功");
+    }
+
+    public static void main(String[] args) {
+        SyncHrmresourceToOA xx = new SyncHrmresourceToOA();
+        xx.getUsersByPage(1, "2021-08-29 10:00:00");
+    }
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/schedule/hrm/idn/SyncHrmsubcompanyToOAIDN.java b/src/main/youhong_ai_jitu_src/jntchina/schedule/hrm/idn/SyncHrmsubcompanyToOAIDN.java
new file mode 100644
index 0000000..7260028
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/schedule/hrm/idn/SyncHrmsubcompanyToOAIDN.java
@@ -0,0 +1,576 @@
+package jntchina.schedule.hrm.idn;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.api.integration.util.JavaUtil;
+import jntchina.schedule.hrm.SyncHrmsubcompanyToOA;
+import jntchina.schedule.hrm.entity.DepartmentDto;
+import jntchina.util.HttpClientToJT;
+import selfdev.util.base.TimeCommonUtil;
+import selfdev.util.log.LogTool;
+import weaver.conn.RecordSet;
+import weaver.general.Util;
+import weaver.hrm.company.SubCompanyComInfo;
+
+import java.io.BufferedWriter;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.format.DateTimeFormatter;
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * @author Cyq
+ * @date 2021年6月17日 02:01:51
+ */
+public class SyncHrmsubcompanyToOAIDN {
+
+    //分页接口参数
+    String maxPoint = "1";
+    //接口是否有下一页 默认为有
+    boolean ifPage = true;
+
+    Map<String,Object> subMap = new HashMap<>();
+
+    //分部编码和id  map
+    Map<String, String> map_subcompany_code_id = new HashMap<String, String>();
+    private LogTool log = new LogTool("/log/hrm/IDN/subcompany/", false);
+
+    /**
+     * 同步分部信息
+     */
+    public List<DepartmentDto> execute(List<DepartmentDto> subcompanys, List<DepartmentDto> departments) {
+        log.writeLog("----------开始同步分部，条数:" + subcompanys.size());
+        try {
+            RecordSet rss = new RecordSet();
+//        for (int i = 0; i < departments.size(); i++) {
+//            DepartmentDto row = departments.get(i);
+//            String departmentCode = Util.null2String(row.getDepartmentCode());//部门编码
+//            String departmentName = Util.null2String(row.getDepartmentName());//部门全称
+//            String ShortName = Util.null2String(row.getDepartmentAbbreviation());//部门简称
+//            String superiorDepartment = Util.null2String(row.getSuperiorDepartment());//上级部门编码
+//            log.writeLog("----------部门编码:" + departmentCode);
+//
+//            rss.executeQuery("select * from HrmDepartment where outkey = ? ",departmentCode);
+//            if(!rss.next()){
+//                boolean executeUpdate = rss.executeUpdate("insert into HrmDepartment(Departmentname,outkey,uuid) values(?,?,?) ", departmentName, departmentCode, superiorDepartment);
+//                log.writeLog("----------先把部门同步进去:" + executeUpdate);
+//                log.writeLog("----------msg:" + rss.getExceptionMsg());
+//            }else{
+//                log.writeLog("----------这个部门已经放进去了不用新增:" + departmentName);
+//            }
+//        }
+
+            map_subcompany_code_id = getAllSubCodeIdMap();
+            RecordSet rs = new RecordSet();
+//        log.writeLog("----------同步分部源数据：" + JSON.toJSONString(subcompanys));
+            // 处理公司同步逻辑
+            for (int i = 0; i < subcompanys.size(); i++) {
+                DepartmentDto row = subcompanys.get(i);
+                String countryCode = Util.null2String(row.getCountryCode());//国家编码
+                String departmentCode = Util.null2String(row.getDepartmentCode());//部门编码
+                String departmentName = Util.null2String(row.getDepartmentName());//部门全称
+                String ShortName = Util.null2String(row.getDepartmentAbbreviation());//部门简称
+                String superiorDepartment = Util.null2String(row.getSuperiorDepartment());//上级部门编码
+                String departmentOrder = Util.null2String(row.getDepartmentOrder());//排序
+                Integer canceled = Util.null2String(row.getStatus()).equals("3") ? 1 : null;//1 新增  2 修改  3作废
+                String sql = "";
+                //判断HR分部ID是否已经存在
+                log.writeLog("----------------分部编码：" + departmentCode);
+                log.writeLog("----------------国家：" + countryCode);
+                log.writeLog("----------------分部名称：" + departmentName);
+                log.writeLog("----------------上级分部编码：" + superiorDepartment);
+                log.writeLog("----------------canceled：" + canceled);
+                String now = TimeCommonUtil.obtainDate(0);
+                String supsubcomid = "0";
+                if (map_subcompany_code_id.containsKey(superiorDepartment)) {
+                    supsubcomid = map_subcompany_code_id.get(superiorDepartment);
+                }
+                if("0".equals(supsubcomid) && !"".equals(superiorDepartment)){
+                    subMap.put(departmentCode,superiorDepartment);
+                }
+
+                String status = row.getStatus();
+                if (!"3".equals(status)) {
+                    log.writeLog("---------------国家："+countryCode);
+                    departmentName = getDepartmentName("2018-04-23 00:00:00",countryCode,departmentCode,departmentName);
+                }else{
+                    log.writeLog("----------------状态为3");
+                }
+
+                if("".equals(departmentName)) {
+                    log.writeLog("----------------多语言为空");
+                    departmentName = row.getDepartmentName();
+                }
+
+
+                log.writeLog("-----------------countryCode:"+countryCode);
+                log.writeLog("-----------------departmentName:"+departmentName);
+                //分部不存在则插入生成新分部
+                if (!map_subcompany_code_id.containsKey(departmentCode)) {
+                    //新增数据,插入到hrmsubcompany表中
+                    sql = "insert into hrmsubcompany (companyid,supsubcomid,subcompanyname,subcompanydesc,outkey," +
+                            "canceled,created,creater,modified,modifier) values("
+                            + "'1',"
+                            + "'" + supsubcomid + "',"
+                            + "'" + departmentName + "',"
+                            + "'" + departmentName + "',"
+                            + "'" + departmentCode + "',"
+                            + canceled + ","
+                            + "to_date('" + now + "','yyyy-mm-dd hh24:mi:ss'),"
+                            + "'1',"
+                            + "to_date('" + now + "','yyyy-mm-dd hh24:mi:ss'),"
+                            + "'1')";
+                    log.writeLog("插入分部表生成新数据sql--------->" + sql);
+                    rs.executeUpdate(sql);
+
+                    rs.executeQuery("select id from hrmsubcompany where outkey = ?",departmentCode);
+                    int maxSubcompanyid = 0;//新插入数据的分部ID
+                    if (rs.next()) {
+                        maxSubcompanyid = rs.getInt("id");
+                    }
+                    //将新增加的分部加入至MAP中
+                    map_subcompany_code_id.put(departmentCode, maxSubcompanyid + "");
+                    rs.executeQuery("select id from hrmsubcompany where outkey = ?",departmentCode);
+                    //新增数据,插入到部门自定义表HrmDepartmentDefined中
+                    int maxSubID = 0;//新插入数据的部门ID
+                    if (rs.next()) {
+                        maxSubID = rs.getInt("id");
+                    }
+                    sql = "insert into hrmsubcompanyDefined(SUBCOMID,guojia,sfzy) " +
+                            "values('" + maxSubID + "','" + countryCode + "','" + row.getIsDirectSales() + "')";
+                    rs.executeUpdate(sql);
+                    log.writeLog("插入分部自定义表中数据sql--------->" + sql);
+
+                } else {//分部存在则更新
+                    String updateStr = "";
+                    updateStr += !"0".equals(supsubcomid) ? "supsubcomid= '" + supsubcomid + "', " : "";
+                    sql = "update hrmsubcompany set " +
+                            updateStr +
+                            "subcompanyname = '" + departmentName + "', " +
+                            "subcompanydesc = '" + departmentName + "', " +
+                            "outkey = '" + departmentCode + "', " +
+                            "modified = to_date('" + now + "','yyyy-mm-dd hh24:mi:ss')," +
+                            "modifier = '1', " +
+                            "canceled = " + canceled + " " +
+                            "where outkey= '" + departmentCode + "'";
+                    log.writeLog("更新分部表中数据sql--------->" + sql );
+                    rs.executeUpdate(sql);
+
+                    //处理分部自定义表
+                    String subcomid = map_subcompany_code_id.get(departmentCode);
+                    rs.execute("select SUBCOMID from hrmsubcompanyDefined where SUBCOMID='" + subcomid + "'");
+                    if (rs.next()) {
+                        sql = "update hrmsubcompanyDefined set " +
+                                " sfzy = '" + row.getIsDirectSales() + "' ," +
+                                " guojia = '" + countryCode + "' " +
+                                " where SUBCOMID = '" + subcomid + "'";
+                        boolean b = rs.executeUpdate(sql);
+                        log.writeLog("更新部门自定义表中数据sql--------->" + sql+" ；结果"+b);
+
+                    } else {
+                        sql = "insert into hrmsubcompanyDefined(SUBCOMID,guojia,sfzy) " +
+                                "values('" + subcomid + "','" + countryCode + "','" + row.getIsDirectSales() + "')";
+                        boolean b = rs.executeUpdate(sql);
+                        log.writeLog("插入分部自定义表中数据sql--------->" + sql+" ；结果"+b);
+                    }
+                }
+            }
+
+            for (int i = 0; i < subcompanys.size(); i++) {
+                log.writeLog("---------分部上级查询--------->");
+                DepartmentDto row = subcompanys.get(i);
+                String departmentCode = Util.null2String(row.getDepartmentCode());//部门编码
+                String superiorDepartment = Util.null2String(row.getSuperiorDepartment());//上级部门编码
+                String parId = "";
+                log.writeLog("---------分部编码：" + departmentCode);
+                log.writeLog("---------上级分部编码：" + superiorDepartment);
+                rs.executeQuery("select * from HRMSUBCOMPANY where outkey = ?", superiorDepartment);
+                if (rs.next()) {
+                    log.writeLog("---------在HRMSUBCOMPANY表查到了上级");
+                    parId = rs.getString("id");
+                }
+//            else{
+//                String now = TimeCommonUtil.obtainDate(0);
+//                rs.executeQuery("select * from HrmDepartment where outkey = ? ",superiorDepartment);
+//                if(rs.next()){
+//                    log.writeLog("---------在HrmDepartment表查到了上级");
+//                    String departmentname = rs.getString("Departmentname");
+//                    String parCode = rs.getString("uuid");
+//                    String outkey = rs.getString("outkey");
+//                    String supid = "0";
+//                    rs.executeQuery("select * from HRMSUBCOMPANY where outkey = ?",parCode);
+//                    if(rs.next()) {
+//                        supid = rs.getString("id");
+//                    }
+//                    String sql = "insert into hrmsubcompany (companyid,supsubcomid,subcompanyname,subcompanydesc,outkey," +
+//                            "created,creater,modified,modifier) values("
+//                            + "'1',"
+//                            + "'" + supid + "',"
+//                            + "'" + departmentname + "',"
+//                            + "'" + departmentname + "',"
+//                            + "'" + outkey + "',"
+//                            + "to_date('" + now + "','yyyy-mm-dd hh24:mi:ss'),"
+//                            + "'1',"
+//                            + "to_date('" + now + "','yyyy-mm-dd hh24:mi:ss'),"
+//                            + "'1')";
+//                    boolean executeUpdate = rs.executeUpdate(sql);
+//                    log.writeLog("部门插入分部表生成新数据sql--------->" + sql);
+//                    log.writeLog("sql:" + executeUpdate);
+//                    log.writeLog("msg:" + rs.getExceptionMsg());
+//                    //删除部门
+//                    rs.executeUpdate("delete from HrmDepartment where outkey = ? ",outkey);
+//                    //数据里面清理
+//                    for (int j = 0; j < departments.size(); j++) {
+//                        DepartmentDto deptRow = departments.get(j);
+//                        String deptCode = Util.null2String(deptRow.getDepartmentCode());//部门编码
+//                        String deptName = Util.null2String(deptRow.getDepartmentName());//部门编码
+//                        //如果部门的编码等于分部的上级就把数据库这个部门删掉 新增到分部
+//                        if(deptCode.equals(superiorDepartment)) {
+//                            departments.remove(j);
+//                            log.writeLog("去除部门的第"+j+"条数据名称:"+deptName);
+//                        }
+//                    }
+//                    rs.executeQuery("select * from HRMSUBCOMPANY where outkey = ?",superiorDepartment);
+//                    if(rs.next()){
+//                        parId = rs.getString("id");
+//                    }
+//                }
+//            }
+                log.writeLog("---------拿到上级id：" + parId);
+                if (!"".equals(parId)) {
+                    boolean executeUpdate = rs.executeUpdate("update HRMSUBCOMPANY set supsubcomid = ? where outkey = ? ", parId, departmentCode);
+                    log.writeLog("---------sql：" + executeUpdate);
+                    log.writeLog("---------msg：" + rs.getExceptionMsg());
+                } else {
+                    boolean executeUpdate = rs.executeUpdate("delete from HRMSUBCOMPANY where outkey = ? ", departmentCode);
+                    log.writeLog("---------找不到上级就删除：" + executeUpdate);
+                    log.writeLog("---------msg：" + rs.getExceptionMsg());
+                }
+            }
+
+            log.writeLog("----sta:"+subMap.size());
+            setSup();
+            log.writeLog("----end");
+
+
+            SubCompanyComInfo sccif = new SubCompanyComInfo();
+            sccif.removeCompanyCache();
+
+            map_subcompany_code_id.clear();
+            map_subcompany_code_id = null;
+
+        } catch (Exception e) {
+            log.writeLog("----------Exception:" + JavaUtil.getExceptionDetail(e));
+            e.printStackTrace();
+        }
+
+        return departments;
+    }
+
+    /**
+     * 获取当前OA系统中所有的分部信息
+     * @return 分部信息集合
+     */
+    private Map<String, String> getAllSubCodeIdMap() {
+        RecordSet rs = new RecordSet();
+        Map<String, String> map = new HashMap<>();
+        //rs.executeQuery("select subcompanycode,outkey,id from HrmSubCompany where outkey is not null  and (CANCELED!=1 or CANCELED is null)");
+        rs.executeQuery("select subcompanycode,outkey,id from HrmSubCompany where outkey is not null");
+        while (rs.next()) {
+            map.put(rs.getString("outkey"), rs.getString("id"));
+        }
+        return map;
+    }
+
+    /**
+     * 获取当前OA系统中状态未封存的分部信息
+     * @return 分部信息集合
+     */
+    public Map<String, String> getSubCodeIdMap() {
+        RecordSet rs = new RecordSet();
+        Map<String, String> map = new HashMap<>();
+        //rs.executeQuery("select subcompanycode,outkey,id from HrmSubCompany where outkey is not null  and (CANCELED!=1 or CANCELED is null)");
+        rs.executeQuery("select subcompanycode,outkey,id from HrmSubCompany where outkey is not null  and (CANCELED!=1 or CANCELED is null)");
+        while (rs.next()) {
+            map.put(rs.getString("outkey"), rs.getString("id"));
+        }
+        return map;
+    }
+
+
+    public void setSup() {
+        RecordSet rss = new RecordSet();
+        Set keySet = subMap.keySet();
+        Iterator it = keySet.iterator();
+        while (it.hasNext()) {
+            try {
+                String subCode = (String) it.next();
+                String supCode = String.valueOf(subMap.get(subCode));
+                String SUPSubID = "";
+                rss.executeQuery("select * from hrmsubcompany where SUBCOMPANYCODE = ?", supCode);
+                if (rss.next()) {
+                    SUPSubID = rss.getString("id");
+                    rss.executeUpdate("update hrmsubcompany set SUPSUBCOMID = ? where SUBCOMPANYCODE = ? ", SUPSubID, subCode);
+                    it.remove();
+                    log.writeLog("-----------------已补处理分部code："+subCode+"，上级分部code："+supCode);
+                }
+            } catch (Exception e) {
+                log.writeLog("--------------------Exception：" + JavaUtil.getExceptionDetail(e));
+            }
+        }
+
+    }
+
+
+    public JSONArray getSubcompanys() {
+        int current = 1, size = 10000, pages = 2;
+        String url = HttpClientToJT.baseUrl + "/dcopenedi/hrCompany/pageByUpdateTime";
+        String token = HttpClientToJT.getToken();
+        Map<String, Object> params = new HashMap<>();
+        LocalDateTime today_start = LocalDateTime.of(LocalDate.now(), LocalTime.MIN);//当天零点
+        String td_st_str = today_start.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+//        params.put("updateTime", td_st_str);
+        params.put("updateTime", "2018-03-21 00:00:00");
+        params.put("current", current);
+        params.put("size", size);
+        String s = HttpClientToJT.sendGet(url, token, params);
+        JSONObject jsonObject = JSONObject.parseObject(s);
+        JSONArray jsonArray = new JSONArray();
+        if (jsonObject.getInteger("code").equals(1)) {
+            JSONObject result = jsonObject.getJSONObject("data");
+            pages = result.getInteger("pages");
+            JSONArray records = result.getJSONArray("records");
+            jsonArray.addAll(records);
+            for (int i = 2; i <= pages; i++) {
+                params.put("current", i);
+                String str = HttpClientToJT.sendGet(url, token, params);
+                JSONObject jsonObject1 = JSONObject.parseObject(str);
+                JSONObject jsonResult = jsonObject1.getJSONObject("data");
+                JSONArray records1 = jsonResult.getJSONArray("records");
+                jsonArray.addAll(records1);
+            }
+            Object directSales = jsonArray.stream().filter(item -> {
+                JSONObject itemJson = JSONObject.parseObject(JSON.toJSONString(item));
+                return "Y".equals(itemJson.getString("isDirectSales"));
+            }).collect(Collectors.toList());
+            jsonArray = JSONArray.parseArray(JSON.toJSONString(directSales));
+        }
+        System.out.println(jsonArray.toJSONString());
+        //将写入转化为流的形式
+//        writeFile(jsonArray);
+        return jsonArray;
+    }
+
+
+    /**
+     * 获取海外部门国家数据
+     *
+     * @param date  时间
+     * @param point
+     * @return
+     */
+    public JSONArray getOcDepartmentsGUOJIA(String date, String point, String guojia, String departmentCode) {
+        int current = 1, size = 5000, pages = 2;
+        String url = HttpClientToJT.baseUrl + "/dcopenedi/hrDept/pageNewHrDeptByUpdateTime";
+        String token = HttpClientToJT.getToken();
+        log.writeLog("-------token--------->" + token);
+        Map<String, Object> params = new HashMap<>();
+        List list1 = new ArrayList();
+        list1.add(guojia);
+        params.put("languageCds", list1);
+        params.put("updateTime", date);
+        params.put("point", point);
+        params.put("size", size);
+        params.put("deptCode", departmentCode);
+        log.writeLog("传入JSON--------------->" + JSON.toJSONString(params));
+        String s = HttpClientToJT.sendPost(url, token, JSONObject.toJSONString(params));
+        JSONObject jsonObject = JSONObject.parseObject(s);
+        JSONArray jsonArray = new JSONArray();
+
+        String code = Util.null2String(jsonObject.getString("code"));
+        log.writeLog("code------>" + code);
+        if ("1".equals(code)) {
+            JSONObject result = jsonObject.getJSONObject("data");
+            JSONArray records = result.getJSONArray("records");
+            Object hasNextPage = result.get("hasNextPage");
+            jsonArray.addAll(records);
+//            //下次继续传
+//            maxPoint = result.get("maxPoint").toString();
+//            if ("false".equals(hasNextPage.toString())) {
+//                ifPage = false;
+//            }
+
+//            Object directSales = jsonArray.stream().filter(item -> {
+//                JSONObject itemJson = JSONObject.parseObject(JSON.toJSONString(item));
+//                return !"CHN".equals(itemJson.getString("countryCode"));
+//            }).collect(Collectors.toList());
+//            jsonArray = JSONArray.parseArray(JSON.toJSONString(directSales));
+        }
+
+        return jsonArray;
+    }
+
+
+
+    /**
+     * 获取多语言
+     *
+     * @param date           时间
+     * @param countryCode    国家code
+     * @param departmentCode 部门code
+     * @param deptName       部门中文名称
+     * @return 多语言名称
+     */
+    public String getDepartmentName(String date, String countryCode, String departmentCode, String deptName) {
+        String retName = "";
+        boolean existence = true;
+        String language = "";
+        String cdIndex = "";
+        try {
+            if ("CHN".equals(countryCode)) {
+                language = "ZHS";
+            }
+            if ("BRA".equals(countryCode)) {
+                language = "POR";
+                cdIndex =  "21";
+            }
+
+            if ("SAU".equals(countryCode) || "ARE".equals(countryCode)
+                    || "EGY".equals(countryCode)
+                    || "MEX".equals(countryCode)
+                    || "SGP".equals(countryCode)
+                    || "PHL".equals(countryCode)
+                    || "MYS".equals(countryCode)
+                    || "KHM".equals(countryCode)
+            ) {
+                existence = false;
+                language = "ENG";
+            }
+            // 、 • 7中°~^8英文、心‘9繁体、• ~‘14 越南°~17泰国°~‘21 葡萄牙‘～‘22 印尼
+            if ("IDN".equals(countryCode)) {
+                language = "IDN";
+                cdIndex =  "22";
+            }
+            if ("THA".equals(countryCode)) {
+                language = "THA";
+                cdIndex =  "17";
+            }
+            if ("VNM".equals(countryCode)) {
+                language = "VIE";
+                cdIndex =  "14";
+            }
+
+            String country = "";
+            // 日期  位置  国家  部门code
+            JSONArray ocDepartmentsGUOJIA = getOcDepartmentsGUOJIA(date, "1", language, departmentCode);
+            log.writeLog("--------------多语言是否拿到数据："+ocDepartmentsGUOJIA.size());
+            List<DepartmentDto> countryList = JSONArray.parseArray(ocDepartmentsGUOJIA.toJSONString(), DepartmentDto.class);
+            DepartmentDto countryDto = countryList.get(0);
+            //对应国家的语言名称（对应国家标签里面）
+            String countryDepartmentName = countryDto.getDepartmentName();
+            log.writeLog("---------------对应国家语言名称：" + countryDepartmentName);
+
+            //departmentName =
+            if (existence) {
+                //需要3个标签
+                retName = "~`~`7 " + deptName + "`~`8 " + countryDepartmentName + "`~`"+cdIndex+" "+countryDepartmentName+"`~`~";
+            } else {
+                //只需要中文和英文
+                retName = "~`~`7 " + deptName + "`~`8 " + countryDepartmentName + "`~`~";
+            }
+
+            log.writeLog("---------------多语言名称：" + retName);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return retName;
+    }
+
+    private void writeFile(JSONArray jsonArray) {
+        BufferedWriter bw = null;
+        try {
+            bw = new BufferedWriter(new FileWriter("D:\\1.txt"));
+            //一次写一行
+            bw.write(jsonArray.toJSONString());
+            bw.newLine();  //换行用
+            //关闭流
+            bw.close();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        System.out.println("写入成功");
+    }
+
+    public static void main(String[] args) {
+        SyncHrmsubcompanyToOA ss = new SyncHrmsubcompanyToOA();
+        ss.getSubcompanys();
+    }
+
+//    /**
+//     * 此方法废弃
+//     */
+//    public void executeInvail() {
+//        JSONArray subcompanys = getSubcompanys();
+//        map_subcompany_code_id = getSubCodeIdMap();
+//        RecordSet rs = new RecordSet();
+//        log.writeLog("----------开始同步分部，条数:"+subcompanys.size());
+//        log.writeLog("----------同步分部源数据："+subcompanys.toJSONString());
+//        // 处理公司同步逻辑
+//        for (int i = 0; i < subcompanys.size(); i++) {
+//            JSONObject sub = subcompanys.getJSONObject(i);
+//            String Code = Util.null2String(sub.getString("companyCode"));//分部编码
+//            String Name = Util.null2String(sub.getString("companyName"));//分部全称
+//            String ShortName = Util.null2String(sub.getString("companyAbbreviation"));//分部简称
+//            String companyLevelCode = Util.null2String(sub.getString("companyLevelCode"));//公司级别编码
+//            String companyLevelName = Util.null2String(sub.getString("companyLevelName"));//公司级别描述
+//            String countryCode = Util.null2String(sub.getString("countryCode"));//国家代码
+//            String countryName = Util.null2String(sub.getString("countryName"));//国家名称
+//            Integer canceled = Util.null2String(sub.getString("status"))== "3"?1:null;//1 新增  2 修改  3作废
+//            String sql = "";
+//            //判断HR分部ID是否已经存在
+//            String now = TimeCommonUtil.obtainDate(0);
+//            if (!map_subcompany_code_id.containsKey(Code)) {//分部不存在则插入生成新分部
+//                //新增数据,插入到hrmsubcompany表中
+//                sql = "insert into hrmsubcompany (subcompanyname,subcompanydesc,outkey," +
+//                        "tlevel,canceled,created,creater,modified,modifier,companyid) values("
+//                        + "'" + ShortName + "',"
+//                        + "'" + Name + "',"
+//                        + "'" + Code + "',"
+//                        + "'" + companyLevelCode + "',"
+//                        + canceled + ","
+//                        + "to_date('" + now + "','yyyy-mm-dd hh24:mi:ss'),"
+//                        + "'1',"
+//                        + "to_date('" + now + "','yyyy-mm-dd hh24:mi:ss'),"
+//                        + "'1',"
+//                        + "'1')";
+//                log.writeLog("插入分部表生成新数据sql--------->" + sql);
+//                rs.execute(sql);
+//
+//                rs.execute("select max(id) from hrmsubcompany");
+//                int maxSubcompanyid = 0;//新插入数据的分部ID
+//                if (rs.next()) {
+//                    maxSubcompanyid = rs.getInt(1);
+//                }
+//                //将新增加的分部加入至MAP中
+//                map_subcompany_code_id.put(Code, maxSubcompanyid + "");
+//
+//            } else {//分部存在则更新
+//                sql = "update hrmsubcompany set " +
+//                        "subcompanyname = '" + ShortName + "', " +
+//                        "subcompanydesc = '" + Name + "', " +
+//                        "outkey = '" + Code + "', " +
+//                        "modified = to_date('" + now + "','yyyy-mm-dd hh24:mi:ss')," +
+//                        "modifier = '1', "+
+//                        "canceled = " + canceled + " "+
+//                        "where outkey= '" + Code + "'";
+//                log.writeLog("更新分部表中数据sql--------->" + sql);
+//                rs.execute(sql);
+//            }
+//        }
+//    }
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/schedule/hrm/util/OrganizationUtil.java b/src/main/youhong_ai_jitu_src/jntchina/schedule/hrm/util/OrganizationUtil.java
new file mode 100644
index 0000000..ab3d056
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/schedule/hrm/util/OrganizationUtil.java
@@ -0,0 +1,492 @@
+package jntchina.schedule.hrm.util;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.serializer.SerializerFeature;
+import jntchina.schedule.hrm.entity.HrmUserDto;
+import jntchina.util.HttpClientToJT;
+import org.apache.commons.lang3.StringUtils;
+import selfdev.util.base.TimeCommonUtil;
+import selfdev.util.log.LogTool;
+import weaver.conn.RecordSet;
+import weaver.general.Util;
+
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * 极兔集团
+ * 组织架构同步通用工具类
+ */
+public class OrganizationUtil {
+
+    /**
+     * 当前类数据库连接
+     */
+    private static final RecordSet rs = new RecordSet();
+
+    /**
+     * 组织同步通用日志操作类
+     */
+    private static final LogTool logComm = new LogTool("/log/hrm/comm/", false);
+
+    /**
+     * 组织同步 部门日志操作类
+     */
+    private static final LogTool logDept = new LogTool("/log/hrm/dept/", false);
+
+
+    /**
+     * 组织同步 人员日志操作类
+     */
+    private static final LogTool logHrm = new LogTool("/log/hrm/user/", false);
+
+
+    private static final String getOrganizationURL = "/dcopenedi/hrDept/pageNewHrDeptByUpdateTime";
+
+    /**
+     * 根据岗位外键编码获取其OA中的主键ID值
+     *
+     * @param outKey 外键编码值
+     * @return OA主键ID值
+     */
+    public static String getJobtitleIdByOutKey(String outKey) {
+        String jobtitleId = "";
+        if (!"".equals(outKey) && rs.executeQuery("select id from hrmJobtitles where outKey = ?", new Object[]{outKey}) && rs.next()) {
+            jobtitleId = Util.null2String(rs.getString(1));
+        }
+        return jobtitleId;
+    }
+
+
+    /**
+     * 获取员工的直接上级ID 先根据直接上级编码获取对应的员工，若找不到，则获取所在部门的部门负责人作为直接上级
+     *
+     * @param managerCode  直接上级编码
+     * @param departmentId 部门ID
+     * @return 直接上级ID
+     */
+    public static String getEmployeeManagerId(String managerCode, String departmentId) {
+        String managerId = "";
+        if (rs.executeQuery("select id from hrmResource where workCode = ?", new Object[]{managerCode}) && rs.next()) {
+            managerId = Util.null2String(rs.getString(1));
+        }
+        if ("".equals(managerId) && rs.executeQuery("select bmfzr from hrmDepartmentDefined where deptId = ?", new Object[]{departmentId}) && rs.next()) {
+            managerId = Util.null2String(rs.getString(1));
+        }
+        return managerId;
+    }
+
+    /**
+     * 更新上级领导（原先还未同步的上级领导）
+     *
+     * @param noFindManagerMap 未同步上级领导的员工信息集合
+     */
+    public static void dealNoFindMangerEmployeeData(Map<String, String> noFindManagerMap) {
+        Iterator<Map.Entry<String, String>> entries = noFindManagerMap.entrySet().iterator();
+        while (entries.hasNext()) {
+            Map.Entry<String, String> entry = entries.next();
+            String userId = entry.getKey();
+            String managerCode = entry.getValue();
+            String sql = "select id,outKey from hrmResource where outKey= ?";
+            if (rs.executeQuery(sql, new Object[]{managerCode}) && rs.next()) {
+                String id = Util.null2String(rs.getString("id"));
+                if (!"".equals(id)) {
+                    String updateSql = "update hrmResource set managerId = ? where workCode =?";
+                    rs.executeUpdate(updateSql, new Object[]{id, userId});
+                }
+            }
+        }
+    }
+
+
+    /**
+     * 获取当期系统中  所有的部门信息<外部主键,OA主键>
+     *
+     * @return 返回部门信息集合 <outKey,id>
+     */
+    public static Map<String, String> getAllDepartmentCodeIdMap() {
+        return getDepartmentCodeIdMap(false);
+    }
+
+
+    /**
+     * 获取当期系统中  状态未封存的部门信息<外部主键,OA主键>
+     *
+     * @return 返回部门信息集合 <outKey,id>
+     */
+    public static Map<String, String> getEffectiveDepartmentCodeIdMap() {
+        return getDepartmentCodeIdMap(true);
+    }
+
+    /**
+     * 获取当期系统中  部门信息<外部主键,OA主键>
+     *
+     * @param isEffective 是否生效记录 （CANCELED = 1 表示封存）
+     * @return 返回部门信息集合 <outKey,id>
+     */
+    private static Map<String, String> getDepartmentCodeIdMap(boolean isEffective) {
+        String selectSQL;
+        Map<String, String> map = new HashMap<>();
+        if (isEffective) {
+            selectSQL = "select departmentCode,outKey,id from HrmDepartment where outKey is not null and (CANCELED!=1 or CANCELED is null)";
+        } else {
+            selectSQL = "select departmentCode,outKey,id from HrmDepartment where outKey is not null";
+        }
+        if (rs.executeQuery(selectSQL, new Object[0])) {
+            while (rs.next()) {
+                String outKey = Util.null2String(rs.getString("outKey"));
+                if (!"".equals(outKey))
+                    map.put(outKey, rs.getString("id"));
+            }
+        }
+        return map;
+    }
+
+    /**
+     * 获取当期系统中  所有的分部信息<外部主键,OA主键>
+     *
+     * @return 返回部门信息集合 <outKey,id>
+     */
+    public static Map<String, String> getAllSubCompanyCodeIdMap() {
+        return getSubCompanyCodeIdMap(false);
+    }
+
+
+    /**
+     * 获取当期系统中  状态未封存的分部信息<外部主键,OA主键>
+     *
+     * @return 返回部门信息集合 <outKey,id>
+     */
+    public static Map<String, String> getEffectiveSubCompanyCodeIdMap() {
+        return getSubCompanyCodeIdMap(true);
+    }
+
+    /**
+     * 获取当期系统中  分部信息<外部主键,OA主键>
+     *
+     * @return 返回分部信息集合 <outKey,id>
+     */
+    private static Map<String, String> getSubCompanyCodeIdMap(boolean isEffective) {
+        String selectSQL;
+        Map<String, String> map = new HashMap<>();
+        if (isEffective) {
+            selectSQL = "select outKey,id from HrmSubCompany where outKey is not null and (CANCELED!=1 or CANCELED is null)";
+        } else {
+            selectSQL = "select outKey,id from HrmSubCompany where outKey is not null";
+        }
+        if (rs.executeQuery(selectSQL, new Object[0])) {
+            while (rs.next()) {
+                String outKey = Util.null2String(rs.getString("outKey"));
+                if (!"".equals(outKey))
+                    map.put(outKey, Util.null2String(rs.getString("id")));
+            }
+        }
+        return map;
+    }
+
+    /**
+     * 获取当前OA系统中  未封存部门信息集合 <外键,OA部门ID^_^OA分部ID>
+     *
+     * @return 部门信息集合
+     */
+    public static Map<String, String> getEffectiveDeptAndCompany() {
+        Map<String, String> map = new HashMap<>();
+        RecordSet recordSet = new RecordSet();
+        String selectSQL = "select outKey,id,subCompanyId1 from HrmDepartment where outKey is not null and (CANCELED!=1 or CANCELED is null)";
+        if (recordSet.executeQuery(selectSQL)) {
+            while (recordSet.next()) {
+                String outKey = Util.null2String(recordSet.getString("outKey"));
+                String keyId = Util.null2String(recordSet.getString("id"));
+                String subCompanyId = Util.null2String(recordSet.getString("subCompanyId1"));
+                if (!"".equals(outKey))
+                    map.put(outKey, keyId + "^_^" + subCompanyId);
+            }
+        }
+        return map;
+    }
+
+    /**
+     * 获取人员处理后的姓名 (将系统中人员姓名字段中的简体中文姓名进行替换）
+     *
+     * @param oldName        系统原有的姓名
+     * @param simplifiedName 默认简体中文的姓名
+     * @return 返回处理后的姓名
+     */
+    public static String dealEmployeeName(String oldName, String simplifiedName) {
+        String finalName;
+        if (oldName.contains("~`~`") && oldName.contains("`~`~")) {
+            //获取第一个出现该字符串的位置
+            int firstBit = oldName.indexOf("~`~`");
+            //字符串 + 数字 + 空格
+            String mindStr = oldName.substring(firstBit + 6);
+            //第一个姓名的语言
+            String lang = oldName.substring(4, oldName.indexOf(" "));
+            //两个语言之间分隔符位置
+            int endBit = mindStr.indexOf("`~`");
+            endBit = endBit < 0 ? mindStr.indexOf("`~`~") : endBit;
+            String balanceStr = mindStr.substring(endBit);
+            if ("7".equals(lang)) {//说明第一个语言为简体中文
+                finalName = "~`~`7 " + simplifiedName + balanceStr;
+            } else {//第一个语言不为简体中文，那在其最前面加上该语言姓名
+                finalName = "~`~`7 " + simplifiedName + "`~`" + oldName.substring(firstBit + 4);
+            }
+        } else {
+            finalName = "~`~`7 " + simplifiedName + "`~`8 `~`~";
+        }
+        return finalName;
+    }
+
+    /**
+     * 根据部门ID获取其对应的分部ID
+     *
+     * @param deptId 部门ID
+     * @return 分部ID
+     */
+    public static String getSubCompanyIdByDeptCode(String deptId) {
+        String subCompanyId = "";
+        RecordSet rs = new RecordSet();
+        rs.executeQuery("select subcompanyid1 from HrmDepartment where id ='" + deptId + "'", new Object[0]);
+        if (rs.next()) {
+            subCompanyId = Util.null2String(rs.getString(1));
+        }
+        return subCompanyId;
+    }
+
+
+    /**
+     * 获取部门对应的国家信息
+     *
+     * @return 返回部门国家对应信息集合
+     */
+    public static Map<String, String> getDeptCountryMap() {
+        Map<String, String> deptCountryMap = new HashMap<>();
+        if (rs.executeQuery("select deptId,guojia from hrmDepartmentDefined", new Object[0])) {
+            while (rs.next()) {
+                deptCountryMap.put(Util.null2String(rs.getString(1)), Util.null2String(rs.getString(2)));
+            }
+        }
+        return deptCountryMap;
+    }
+
+
+    /**
+     * 获取部门对应的国家和负责人信息
+     *
+     * @return 返回部门国家和负责人对应信息集合
+     */
+    public static Map<String, Map<String, String>> getDeptCountryAndManagerMap() {
+        Map<String, Map<String, String>> deptCountryAndManagerMap = new HashMap<>();
+        if (rs.executeQuery("select deptId,guojia,bmfzr from hrmDepartmentDefined", new Object[0])) {
+            while (rs.next()) {
+                String deptId = Util.null2String(rs.getString("deptId"));
+                Map<String, String> detailMap = new HashMap<>();
+                detailMap.put("guojia", Util.null2String(rs.getString("guojia")));
+                detailMap.put("bmfzr", Util.null2String(rs.getString("bmfzr")));
+                deptCountryAndManagerMap.put(deptId, detailMap);
+            }
+        }
+        return deptCountryAndManagerMap;
+    }
+
+
+    /**
+     * 调用人员接口，获取接口返回信息
+     *
+     * @param size             每页条数
+     * @param pages            页码
+     * @param today            日期
+     * @param languageCds      语言代码
+     * @param deptCountryCodes 部门国家代码
+     * @param code             员工编码
+     * @return 接口响应信息
+     */
+    public static String callEmployeeInterface(int size, String pages, String today, List<String> languageCds, List<String> deptCountryCodes, String code) {
+        Map<String, Object> params = new HashMap<>();
+        params.put("updateTime", today);
+        params.put("point", pages);
+        params.put("languageCds", languageCds);
+        params.put("size", Integer.valueOf(size));
+        params.put("deptCountryCodes", deptCountryCodes);
+        if (!"".equals(code)) {
+            params.put("employeeCode", code);
+        }
+        String url = "https://jtdcapi.jtexpress.com.cn/dcopenedi/hrEmployee/pageByParam";
+        String token = HttpClientToJT.getToken();
+        return HttpClientToJT.sendPost(url, token, JSONObject.toJSONString(params));
+    }
+
+
+    /**
+     * 获取该List中的外键已存在的记录信息
+     *
+     * @param codeList 所有外键信息集合
+     * @param dataType 0 - 系统表  1- 自定义表
+     * @return 所有已存在的记录集合
+     */
+    public static Map<String, String> getExitsData(List<String> codeList, int dataType) {
+        String selectData;
+        Map<String, String> existMap = new HashMap<>();
+        if (dataType == 1) {
+            selectData = "select positionid,positionCode from uf_jobTitleDefined u where exists ( select 1 from (  select regexp_substr('" + StringUtils.join(codeList, ",") + "','[^,]+',1,LEVEL) as code from dual connect by LEVEL <= " + codeList.size() + " ) t where t.code = u.positionCode)";
+        } else {
+            selectData = "select outKey,id from hrmJobTitles where outKey is not null and exists ( select 1 from (  select regexp_substr('" + StringUtils.join(codeList, ",") + "','[^,]+',1,LEVEL) as code from dual connect by LEVEL <= " + codeList.size() + " ) t where t.code = hrmJobTitles.outKey)";
+        }
+        if (rs.executeQuery(selectData, new Object[0])) {
+            while (rs.next()) {
+                existMap.put(Util.null2String(rs.getString(1)), Util.null2String(rs.getString(2)));
+            }
+        }
+        return existMap;
+    }
+
+    /**
+     * 插入员工自定义 - 个人
+     *
+     * @param userId     用户ID
+     * @param bankInfo   [bankBranchName,bankAccountId,bankName]  银行信息数组
+     * @param actionInfo [action,action_describe] 操作信息
+     * @param row        用户信息实体类
+     * @return 执行结果
+     */
+    public static boolean insertEmployeeCustomizePersonal(String userId, String[] bankInfo, String[] actionInfo, HrmUserDto row) {
+        boolean isSuccess;
+        String now = TimeCommonUtil.obtainDate(0);
+        if (rs.executeQuery("select 1 from cus_fielddata where id = ? and scopeid = 1 and scope = 'HrmCustomFieldByInfoType'", new Object[]{userId}) && rs.next()) {
+            return updateEmployeeCustomizePersonal(userId, bankInfo, actionInfo, row);
+        }
+        String bankInfoCol = "";
+        String bankInfoVal = "";
+        if (bankInfo != null && bankInfo.length > 2) {
+            bankInfoCol = "field0,field1,field5,field7,";
+            bankInfoVal = "'" + bankInfo[0] + "','" + bankInfo[1] + "',?,'" + bankInfo[2] + "',";
+        }
+        if (actionInfo != null && actionInfo.length > 1) {
+            bankInfoCol = bankInfoCol + "field10,field11,";
+            bankInfoVal = bankInfoVal + "'" + actionInfo[0] + "','" + actionInfo[1] + "',";
+        }
+        String sql = "insert into cus_fielddata(scope,scopeid,id," + bankInfoCol + "field15,field16,field17,field18,field19,field20,field21,field14,field22,field23,field24,created1,modified1) values('HrmCustomFieldByInfoType','1','" + userId + "'," + bankInfoVal + "'" + Util.null2String(row.getEmployeeCode()) + "','" +
+                Util.null2String(row.getCompanyCode()) + "','" +
+                Util.null2String(row.getCompanyName()) + "','" +
+                Util.null2String(row.getDeptCode()) + "','" +
+                Util.null2String(row.getDeptName()) + "','" +
+                Util.null2String(row.getPositionCode()) + "','" +
+                Util.null2String(row.getPositionName()) + "','" +
+                Util.null2String(row.getPositionType()) + "','" +
+                Util.null2String(row.getPositionTypeDescr()) + "','" +
+                Util.null2String(row.getPositonRankCode()) + "','" +
+                Util.null2String(row.getPositonRankDescr()) +
+                "',to_date('" + now + "','yyyy-mm-dd hh24:mi:ss')," +
+                "to_date('" + now + "','yyyy-mm-dd hh24:mi:ss')" + ")";
+        if (bankInfo != null && bankInfo.length > 2) {
+            isSuccess = rs.executeUpdate(sql, new Object[]{Util.null2String(row.getEmployeeName())});
+        } else {
+            isSuccess = rs.executeUpdate(sql, new Object[0]);
+        }
+        logComm.writeLog("写入人员自定义信息:[" + sql + "],执行结果:[" + isSuccess + "]");
+        return isSuccess;
+    }
+
+    /**
+     * 更新员工自定义 - 个人
+     *
+     * @param userId     用户ID
+     * @param bankInfo   [bankBranchName,bankAccountId,bankName]  银行信息数组
+     * @param actionInfo [action,action_describe] 操作信息
+     * @param row        用户信息实体类
+     * @return 执行结果
+     */
+    public static boolean updateEmployeeCustomizePersonal(String userId, String[] bankInfo, String[] actionInfo, HrmUserDto row) {
+        boolean isSuccess;
+        String now = TimeCommonUtil.obtainDate(0);
+        String cusCol = "";
+        if (bankInfo != null && bankInfo.length > 2) {
+            cusCol = "field0 = '" + bankInfo[0] + "', field1 = '" + bankInfo[1] + "', field5 = ?, field7 = '" + bankInfo[2] + "', ";
+        }
+        if (actionInfo != null && actionInfo.length > 1) {
+            cusCol = cusCol + "field10 = '" + actionInfo[0] + "', field11 = '" + actionInfo[1] + "', ";
+        }
+        String updateSQL = "update cus_fielddata set " + cusCol + "field15 = '" + Util.null2String(row.getEmployeeCode()) + "', field16 = '" + Util.null2String(row.getCompanyCode()) + "', field17 = '" + Util.null2String(row.getCompanyName()) + "', field18 = '" + Util.null2String(row.getDeptCode()) + "', field19 = '" + Util.null2String(row.getDeptName()) + "', field20 = '" + Util.null2String(row.getPositionCode()) + "', field21 = '" + Util.null2String(row.getPositionName()) + "', field14 = '" + Util.null2String(row.getPositionType()) + "', field22 = '" + Util.null2String(row.getPositionTypeDescr()) +
+                "', field23 = '" + Util.null2String(row.getPositonRankCode()) +
+                "', field24 = '" + Util.null2String(row.getPositonRankDescr()) +
+                "', modified1 = to_date('" + now + "','yyyy-mm-dd hh24:mi:ss')" +
+                " where id ='" + userId + "' and scopeid='1' and scope = 'HrmCustomFieldByInfoType'";
+        if (bankInfo != null && bankInfo.length > 2) {
+            isSuccess = rs.executeUpdate(updateSQL, new Object[]{Util.null2String(row.getEmployeeName())});
+        } else {
+            isSuccess = rs.executeUpdate(updateSQL, new Object[0]);
+        }
+        logComm.writeLog("更新人员自定义信息:[" + updateSQL + "],执行结果:[" + isSuccess + "]");
+        return isSuccess;
+    }
+
+
+    /**
+     * 处理人员昵称信息
+     *
+     * @param userId   用户ID
+     * @param nickName 昵称
+     */
+    public static void dealEmployeeNickName(String userId, String nickName) {
+        String cusSql;
+        RecordSet rs = new RecordSet();
+        rs.executeQuery("select id from cus_fielddata where scopeid='-1' and scope='HrmCustomFieldByInfoType' and id = ?", new Object[]{userId});
+        if (!rs.next()) {
+            cusSql = "insert into cus_fielddata(scope,scopeid,id,field0) values('HrmCustomFieldByInfoType','-1','" + userId + "',?)";
+        } else {
+            cusSql = "update cus_fielddata set scopeid = '-1',field0 = ? where  id ='" + userId + "' and scopeid='-1' and scope = 'HrmCustomFieldByInfoType'";
+        }
+        boolean b = rs.executeUpdate(cusSql, new Object[]{nickName});
+        logComm.writeLog("-------------修改自定义基本信息：" + cusSql);
+        logComm.writeLog("-------------修改自定义基本是否成功：" + b);
+    }
+
+
+    /**
+     * 获取组织信息
+     *
+     * @param dateTimeTs 同步时间戳 （上一次同步时间戳）
+     * @return 所有组织信息的JSONArray对象
+     */
+    @SuppressWarnings("unchecked")
+    public JSONArray getDepartmentsByPoint(String dateTimeTs) {
+        String url = "https://jtdcapi.jtexpress.com.cn/dcopenedi/hrDept/pageNewHrDeptByUpdateTime";
+        logComm.writeLog("获取部门数据url-------->" + url);
+        JSONArray jsonArray = new JSONArray();
+        boolean hasNext = true;
+        String token = HttpClientToJT.getToken();
+        int point = 1;
+        Map<String, Object> requestMap = new HashMap<>();
+        requestMap.put("updateTime", dateTimeTs);
+        requestMap.put("size", Integer.valueOf(1000));
+        do {
+            try {
+                requestMap.put("point", Integer.valueOf(point));
+                String param = JSONObject.toJSONString(requestMap, new SerializerFeature[]{SerializerFeature.DisableCircularReferenceDetect});
+                logComm.writeLog("获取组织数据传入参数param------------>" + param);
+                String s = HttpClientToJT.sendPost(url, token, param);
+                logDept.writeLog("组织数据返回结果------------>" + s);
+                JSONObject jsonObject = JSONObject.parseObject(s);
+                String code = Util.null2String(jsonObject.getString("code"));
+                logDept.writeLog("code------------>" + code);
+                if ("1".equals(code)) {
+                    JSONObject result = jsonObject.getJSONObject("data");
+                    hasNext = result.getBoolean("hasNextPage").booleanValue();
+                    point = Util.getIntValue(result.getString("maxPoint"), 0);
+                    JSONArray records = result.getJSONArray("records");
+                    if (records != null) {
+                        Object directSales = records.stream().filter(item -> {
+                            JSONObject itemJson = JSONObject.parseObject(JSON.toJSONString(item));
+                            return ("CHN".equals(itemJson.getString("countryCode")) && "ZHS".equals(itemJson.getString("languageCd")));
+                        }).collect(Collectors.toList());
+                        jsonArray.addAll((Collection) JSONArray.parseArray(JSON.toJSONString(directSales)));
+                    }
+                }
+            } catch (Exception e) {
+                logDept.writeLog("获取组织接口报错，错误信息：" + e.getMessage());
+            }
+        } while (hasNext);
+        return jsonArray;
+    }
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/schedule/hrmNew/InternalSync.java b/src/main/youhong_ai_jitu_src/jntchina/schedule/hrmNew/InternalSync.java
new file mode 100644
index 0000000..c5befce
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/schedule/hrmNew/InternalSync.java
@@ -0,0 +1,577 @@
+package jntchina.schedule.hrmNew;
+
+import aiyh.utils.Util;
+import aiyh.utils.tool.cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.engine.common.service.impl.HrmCommonServiceImpl;
+import jntchina.schedule.hrm.entity.DepartmentDto;
+import jntchina.schedule.hrm.entity.HrmUserDto;
+import selfdev.util.base.BaseUtil;
+import selfdev.util.log.LogTool;
+import weaver.conn.RecordSet;
+import weaver.hrm.job.JobTitlesComInfo;
+import weaver.hrm.resource.ResourceComInfo;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * 极兔集团
+ * 国内架构同步操作
+ */
+@SuppressWarnings("all")
+public class InternalSync {
+	
+	/**
+	 * 部门日志操作
+	 */
+	private static final LogTool logDept = new LogTool("/log/hrm/dept/", false);
+	
+	/**
+	 * 岗位日志操作
+	 */
+	private static final LogTool logJob = new LogTool("/log/hrm/job/", false);
+	
+	/**
+	 * 员工日志操作
+	 */
+	private static final LogTool logHrm = new LogTool("/log/hrm/user/", false);
+	
+	/**
+	 * 分部、部门同步逻辑处理
+	 *
+	 * @param lastTimestamp 上一次同步时间戳
+	 */
+	
+	public void syncOrganizationData(String lastTimestamp, String currentDateTime) {
+		// 从配置中获取自定义分部名称
+		String subCompanyNames = Util.getCusConfigValue("PS_Fixed_SubCompanyNames");
+		// 将分部名称转成List集合
+		List<String> fixSubCompanyList = Util.splitString2List(subCompanyNames, ",");
+		
+		// 调用接口，获取组织信息
+		JSONArray dataArray = OrganizationUtil.getDepartmentsByPoint(lastTimestamp, SyncConstants.SyncDataType_Internal_Data, 1000);
+		
+		// 将JSON数组转成对象集合
+		List<DepartmentDto> dataList = JSONArray.parseArray(dataArray.toJSONString(), DepartmentDto.class);
+		
+		// 分部数据
+		List<DepartmentDto> subCompanyList = dataList.stream().filter(item -> "10".equals(item.getOrganizationClass()) || fixSubCompanyList.contains(item.getDepartmentName())).collect(Collectors.toList());
+		
+		// 部门数据
+		List<DepartmentDto> departmentList = dataList.stream().filter(item -> !"10".equals(item.getOrganizationClass()) && !fixSubCompanyList.contains(item.getDepartmentName())).collect(Collectors.toList());
+		
+		// 跳过的数据集合
+		List<DepartmentDto> skipList = new ArrayList<>();
+		// 跳过数量  插入数量  更新数量
+		int skipNum = 0, insertNum = 0, updateNum = 0;
+		
+		// 部门数据不为空
+		if (!dataList.isEmpty()) {
+			RecordSet rs = new RecordSet();
+			
+			// 分部数据不为空
+			if (!subCompanyList.isEmpty()) {
+				OrganizationUtil.subCompanySyncDeal(subCompanyList, currentDateTime);
+			}
+			
+			if (!departmentList.isEmpty()) {
+				// 人员数据集合
+				Map<String, String> userMap = OrganizationUtil.getEmployeeMap();
+				// 部门数据集合
+				Map<String, String> oaDeptMap = OrganizationUtil.getEffectiveDepartmentCodeIdMap();
+				// 分部数据集合
+				Map<String, String> oaComMap = OrganizationUtil.getEffectiveSubCompanyCodeIdMap();
+				// 部门分部数据集合
+				Map<String, String> oaDeptAndComMap = OrganizationUtil.getDepartmentCodeAndComIdMap();
+				
+				for (DepartmentDto row : departmentList) {
+					// 国家编码
+					String countryCode = Util.null2String(row.getCountryCode());
+					// 部门编码
+					String departmentCode = Util.null2String(row.getDepartmentCode());
+					// 部门全称
+					String departmentName = Util.null2String(row.getDepartmentName());
+					// 上级部门编码
+					String superiorDepartment = Util.null2String(row.getSuperiorDepartment());
+					// 排序
+					String departmentOrder = Util.null2String(row.getDepartmentOrder());
+					// 部门负责人code
+					String deptManager = Util.null2String(row.getDeptManager());
+					// 分管领导code
+					String brchLeader = Util.null2String(row.getBrchLeader());
+					// 1 新增  2 修改  3作废
+					int canceled = Util.null2String(row.getStatus()).equals("3") ? 1 : 0;
+					// 公司
+					String companyCode = Util.null2String(row.getCompanyCode());
+					
+					// 上级部门为空时，则跳过同步
+					if ("".equals(superiorDepartment)) {
+						skipList.add(row);
+						skipNum++;
+						logDept.writeLog("---->部门编码【" + departmentCode + "】、部门名称【" + departmentName + "】的上级部门为空，跳过同步----------");
+						continue;
+					}
+					
+					// 直接上级ID
+					String managerId = Util.null2String(userMap.get(deptManager));
+					// 分管领导ID
+					String leaderId = Util.null2String(userMap.get(brchLeader));
+					
+					// 根据上级编码找到其对应上级部门和上级分部ID
+					String supDeptId = Util.null2String(oaDeptMap.get(superiorDepartment));
+					String subCompanyId = Util.null2String(oaComMap.get(superiorDepartment));
+					
+					// 如果上级编码为空、所属分部，上级部门都找不到，不作处理
+					if ("".equals(subCompanyId) && "".equals(supDeptId)) {
+						skipList.add(row);
+						skipNum++;
+						logDept.writeLog("--->部门编码【" + departmentCode + "】、部门名称【" + departmentName + "】、上级部门编码【" + superiorDepartment + "】在OA中为匹配上上级部门，或者未找到所属分部，跳过同步----------");
+						continue;
+					}
+					
+					if (!"".equals(subCompanyId)) {// 上级部门编码为分部，则当前部门为顶级部门
+						supDeptId = "0";
+					} else {
+						// 获取该部门对应的分部信息
+						subCompanyId = Util.null2String(oaDeptAndComMap.get(supDeptId));
+					}
+					
+					// 只需要中文和英文
+					departmentName = "~`~`7 " + departmentName + "`~`8  `~`~";
+					
+					if (oaDeptMap.containsKey(departmentCode)) {// 该部门数据存在，执行更新操作
+						String oldDeptId = Util.null2String(oaDeptMap.get(departmentCode));
+						
+						if ("".equals(oldDeptId)) {
+							skipNum++;
+							continue;
+						}
+						
+						String updateStr = "";
+						// 只有有值才覆盖
+						updateStr += !"".equals(subCompanyId) ? "subcompanyid1 = '" + subCompanyId + "', " : "";
+						updateStr += !"".equals(managerId) ? "bmfzr = '" + managerId + "', " : "";
+						updateStr += !"".equals(leaderId) ? "bmfgld = '" + leaderId + "', " : "";
+						String operateSQL = "update HrmDepartment set " +
+								                    "departmentName = '" + departmentName + "', " +
+								                    "departmentMark = '" + departmentName + "', " +
+								                    "supDepId = '" + supDeptId + "'," +
+								                    updateStr +
+								                    "canceled = " + canceled + ", " +
+								                    "modified = to_date('" + currentDateTime + "','yyyy-mm-dd hh24:mi:ss'), " +
+								                    "modifier = '1', " +
+								                    "showOrder = '" + departmentOrder + "' " +
+								                    "where  id= '" + oldDeptId + "'";
+						
+						logDept.writeLog("部门数据更新SQL:[" + operateSQL + "]");
+						
+						updateNum++;
+						
+						OrganizationUtil.departmentDefinedDeal(oldDeptId, row.getIsDirectSales(), companyCode, managerId, countryCode, leaderId);
+						if (rs.executeUpdate(operateSQL)) {
+							// 人员信息伴随部门信息变化
+							if (!"".equals(subCompanyId)) {
+								operateSQL = "update hrmResource set subCompanyId1='" + subCompanyId + "' where departmentId = '" + oldDeptId + "' ";
+								rs.executeUpdate(operateSQL);
+								
+								// 更新该部门的所有下级部门的所属分部
+								operateSQL = "update hrmdepartment set subCompanyId1 = '" + subCompanyId + "' where exists ( \n" +
+										             "   select 1 from (" +
+										             "       select id from hrmdepartment start with id = " + oldDeptId + " connect by supDepId = prior id \n" +
+										             "   ) s where s.id = hrmdepartment.id \n" +
+										             ")";
+								
+								rs.executeUpdate(operateSQL);
+							}
+						}
+					} else { // 该部门数据不存在，执行插入操作
+						String operateSQL = "insert into HrmDepartment (departmentName,departmentCode,departmentMark,outkey," +
+								                    "supDepId,canceled,created,creater,modified,modifier," +
+								                    "showOrder,subcompanyid1,bmfzr,bmfgld) values("
+								                    + "'" + departmentName + "',"
+								                    + "'" + departmentCode + "',"
+								                    + "'" + departmentName + "',"
+								                    + "'" + departmentCode + "',"
+								                    + "'" + supDeptId + "',"
+								                    + "" + canceled + ","
+								                    + "to_date('" + currentDateTime + "','yyyy-mm-dd hh24:mi:ss'),"
+								                    + "'1',"
+								                    + "to_date('" + currentDateTime + "','yyyy-mm-dd hh24:mi:ss'),"
+								                    + "'1',"
+								                    + "'" + departmentOrder + "',"
+								                    + "'" + subCompanyId + "', "
+								                    + "'" + managerId + "', "
+								                    + "'" + leaderId + "')";
+						
+						insertNum++;
+						logDept.writeLog("部门数据写入SQL:[" + operateSQL + "]");
+						if (rs.executeUpdate(operateSQL)) {
+							
+							if (rs.executeQuery("select id from HrmDepartment where outkey = ?", departmentCode) && rs.next()) {
+								String newDeptId = Util.null2String(rs.getString(1));
+								
+								oaDeptMap.put(departmentCode, newDeptId);
+								oaDeptAndComMap.put(departmentCode, subCompanyId);
+								
+								// 部门自定义信息处理
+								OrganizationUtil.departmentDefinedDeal(newDeptId, row.getIsDirectSales(), companyCode, managerId, countryCode, leaderId);
+							} else {
+								logDept.writeLog("获取最新插入的部门记录ID失败！");
+							}
+						} else {
+							logDept.writeLog("部门数据操作写入失败！");
+						}
+					}
+				}
+			}
+			logDept.writeLog("此次同步部门总数为：" + departmentList.size() + ",新增部门数为：" + insertNum +
+					                 ",更新部门数为：" + updateNum + ",跳出处理部门数为：" + skipNum);
+			logDept.writeLog("此次同步部门跳过是数据为：" + JSON.toJSONString(skipList));
+		}
+	}
+	
+	
+	/**
+	 * 岗位同步逻辑处理
+	 *
+	 * @param lastTimestamp   上一次处理时间戳
+	 * @param currentDateTime 当前时间
+	 */
+	public void syncJobTitleData(String lastTimestamp, String currentDateTime) {
+		// 分页获取接口数据
+		// JSONArray dataArray = OrganizationUtil.getJobTitleByPoint(lastTimestamp, SyncConstants.SyncDataType_Internal_Data, 5000);
+		Map<String, JSONArray> jobTitleByPoint = OrganizationUtil.getJobTitleByPoint(lastTimestamp, SyncConstants.SyncDataType_Internal_Data, 5000);
+		JSONArray dataArray = jobTitleByPoint.get("filterResult");
+		JSONArray allResult = jobTitleByPoint.get("allResult");
+		
+		if (!dataArray.isEmpty()) {
+			logJob.writeLog("获取岗位的记录总条数:[" + dataArray.size() + "]");
+			
+			// 当前OA系统中部门信息
+			Map<String, String> oaDeptMap = OrganizationUtil.getEffectiveDepartmentCodeIdMap();
+			
+			// 已存在的岗位数据集合
+			Map<String, String> sysExistMap = new HashMap<>();
+			// 已存在的岗位自定义数据集合
+			Map<String, String> definedExistMap = new HashMap<>();
+			
+			List<String> codeList = new ArrayList<>();
+			
+			RecordSet rs = new RecordSet();
+			
+			for (int m = 0; m < dataArray.size(); m++) {
+				JSONObject row = dataArray.getJSONObject(m);
+				String positionCode = Util.null2String(row.getString("positionCode"));// 岗位编码
+				if (!"".equals(positionCode)) {
+					codeList.add(positionCode);
+				}
+			}
+			
+			if (codeList.size() > 0) {
+				sysExistMap = OrganizationUtil.getExitsData(codeList, 0);
+				definedExistMap = OrganizationUtil.getExitsData(codeList, 1);
+			}
+			
+			// 跳过的记录条数，插入记录条数，更新记录条数
+			int skipNum = 0, insertNum = 0, updateNum = 0;
+			
+			JobTitleMultilingualUtil jobTitleMultilingualUtil = new JobTitleMultilingualUtil();
+			for (int k = 0; k < dataArray.size(); k++) {
+				JSONObject row = dataArray.getJSONObject(k);
+				String positionCode = Util.null2String(row.getString("positionCode"));// 岗位编码
+				// 获取多语言岗位名称
+				String positionName = jobTitleMultilingualUtil.getMultilingual(allResult,
+						row,
+						item -> Util.null2String(item.get("positionCode")),
+						item -> Util.null2String(item.get("positionName")),
+						item -> Util.null2String(item.get("languageCd")));
+				if (StrUtil.isBlank(positionName)) {
+					positionName = Util.null2String(row.getString("positionName"));// 岗位名称
+				}
+				Integer canceled = "3".equals(Util.null2String(row.getString("status"))) ? 1 : null;// 1 新增  2 修改  3作废
+				String deptCode = Util.null2String(row.getString("deptCode"));// 部门编码
+				String jobDepartmentId = Util.null2String(oaDeptMap.get(deptCode));// 所属部门ID
+				String jobTitleId = Util.null2String(sysExistMap.get(positionCode));// OA岗位ID
+				
+				// 判断HR岗位所属部门ID是否已经存在
+				if ("".equals(jobDepartmentId)) {
+					skipNum++;
+					continue;
+				}
+				
+				if (!"".equals(jobTitleId)) {// 说明该岗位数据已存在，需要进行更新操作
+					updateNum++;
+					
+					// 新增数据,插入到hrmJobTitles表中
+					String operateSQL = "insert into hrmJobTitles (jobTitleName,jobTitleMark,outkey,jobDepartmentId," +
+							                    "canceled,created,creater,modified,modifier) values("
+							                    + "'" + positionName + "',"
+							                    + "'" + positionName + "',"
+							                    + "'" + positionCode + "',"
+							                    + "'" + jobDepartmentId + "',"
+							                    + "" + canceled + ","
+							                    + "to_date('" + currentDateTime + "','yyyy-mm-dd hh24:mi:ss'),"
+							                    + "'1',"
+							                    + "to_date('" + currentDateTime + "','yyyy-mm-dd hh24:mi:ss'),"
+							                    + "'1')";
+					
+					logJob.writeLog("岗位基本信息插入操作SQL:[" + operateSQL + "]");
+					if (rs.executeUpdate(operateSQL)) {
+						// 获取最新写入的数据ID
+						if (rs.executeQuery("select id from hrmJobTitles where outkey = ?", positionCode) && rs.next()) {
+							String newJobId = Util.null2String(rs.getString(1));
+							
+							sysExistMap.put(positionCode, newJobId);
+							
+							// 岗位自定义信息处理
+							int newCusId = OrganizationUtil.jobTitleDefinedDeal(newJobId, row);
+							
+							if (newCusId > 0) {
+								definedExistMap.put(positionCode, String.valueOf(newCusId));
+							}
+						} else {
+							logJob.writeLog("获取最新写入的岗位ID失败！");
+						}
+					} else {
+						logJob.writeLog("岗位基本信息数据写入失败！");
+					}
+				} else {// 说明该岗位数据不存在，需要进行插入操作
+					String operateSQL = "update hrmJobtitles set " +
+							                    "jobtitleName = '" + positionName + "', " +
+							                    "jobtitleMark = '" + positionName + "', " +
+							                    "jobtitleCode = '" + positionCode + "', " +
+							                    "jobDepartmentId = '" + jobDepartmentId + "', " +
+							                    "modified = to_date('" + currentDateTime + "','yyyy-mm-dd hh24:mi:ss')," +
+							                    "modifier = '1', " +
+							                    "canceled = " + canceled + " " +
+							                    "where id= '" + jobTitleId + "'";
+					
+					logJob.writeLog("岗位基本信息更新操作SQL:[" + operateSQL + "]");
+					
+					if (rs.executeUpdate(operateSQL)) {
+						OrganizationUtil.jobTitleDefinedDeal(jobTitleId, row);
+					} else {
+						logJob.writeLog("岗位基本信息数据更新失败！");
+					}
+					
+					insertNum++;
+				}
+			}
+			
+			logJob.writeLog("----------同步结束岗位，新增岗位数为：" + insertNum + " ,更新岗位数为：" + updateNum + ",跳出处理岗位数为：" + skipNum + "------------");
+			
+			// 更新岗位缓存
+			JobTitlesComInfo jobTitlesComInfo = new JobTitlesComInfo();
+			jobTitlesComInfo.removeJobTitlesCache();
+		}
+	}
+	
+	/**
+	 * 人员同步逻辑处理
+	 *
+	 * @param lastTimestamp 上一次处理时间戳
+	 */
+	@SuppressWarnings("unchecked")
+	public void syncEmployeeData(String lastTimestamp, String currentDateTime) {
+		JSONArray dataArray = OrganizationUtil.getEmployeeByPoint(lastTimestamp, SyncConstants.SyncDataType_Internal_Data, 1000);
+		
+		if (!dataArray.isEmpty()) {
+			HrmCommonServiceImpl hrmCommonServiceImpl = new HrmCommonServiceImpl();
+			
+			// 获取当前系统中的人员信息
+			Map<String, String> oaUserMap = OrganizationUtil.getEmployeeMap();
+			// 获取当前系统中有效的岗位信息
+			Map<String, String> oaJobTitleMap = OrganizationUtil.getEffectiveJobTitleMap();
+			// 获取当前系统中有效的部门和分部信息
+			// Map<String,String> oaDeptAndComMap = OrganizationUtil.getEffectiveDeptAndCompany();
+			// 获取当前系统中有效的部门信息
+			Map<String, Map<String, String>> oaDeptInfoMap = OrganizationUtil.getEffectiveDepartmentInfoMap();
+			// 获取当前系统中用户自定义信息
+			Map<String, String> userDefinedMap = OrganizationUtil.getEmployeeDefinedMap();
+			
+			// 将查询结果放到list对象中
+			List<HrmUserDto> usersList = JSONArray.parseArray(dataArray.toJSONString(), HrmUserDto.class);
+			
+			// 未获取到的上级的集合
+			Map<String, String> noFindManagerMap = new HashMap<>();
+			
+			RecordSet rs = new RecordSet();
+			
+			// 从建模表中读取默认密码（默认密码Jitu@2021）
+			String password = BaseUtil.getBaseInfoByParm("mrmm", "uf_tbygmrdllm", "1", "1", "");
+			if ("".equals(password)) {
+				password = "Jitu@2021";
+			}
+			password = BaseUtil.MD5(password);
+			
+			try {
+				// 更新人员缓存
+				ResourceComInfo resourceComInfo = new ResourceComInfo();
+				for (HrmUserDto row : usersList) {
+					// 昵称
+					String field0 = Util.null2String(row.getEmployeeEnglishName());// 员工英文姓名
+					String employeeCode = Util.null2String(row.getEmployeeCode());// 员工code
+					String employeeName = Util.null2String(row.getEmployeeName());// 姓名
+					String managerCode = Util.null2String(row.getSupervisorId());// 上级次账号code
+					// 获取人员姓名的拼音
+					String name_pinyin = hrmCommonServiceImpl.generateQuickSearchStr(employeeName);
+					String hrStatus = Util.null2String(row.getHrStatus());// 状态A在职，I离职 对应OA的1正式 5离职
+					int status = "A".equals(hrStatus) ? 1 : 5;// OA的在职状态
+					String deptCode = Util.null2String(row.getDeptCode());// 部门
+					String positionCode = Util.null2String(row.getPositionCode());// 岗位
+					String bankBranchName = Util.null2String(row.getBankBranchName());// 开户行
+					String bankAccountId = Util.null2String(row.getBankAccountId());// 银行卡号
+					String bankName = Util.null2String(row.getBankName());// 银行类型
+					String action = Util.null2String(row.getAction());// 操作编码
+					String actionDesc = Util.null2String(row.getActionDescr()).replace("'", "''");// 操作名称
+					String departmentid, subcompanyid1;
+					// 根据员工code获取员工id
+					String userId = Util.null2String(oaUserMap.get(employeeCode));// 员工ID
+					
+					logHrm.writeLog("员工编号:[" + employeeCode + "],状态:[" + hrStatus + "],部门:[" + deptCode + "],上级编号:[" + managerCode + "],岗位:[" + positionCode + "]");
+					
+					if (!"".equals(userId)) {
+						if (status == 5) {// 离职员工
+							// 更新离职状态和清空账号信息
+							String sql = "update hrmresource set " +
+									             "loginid = '', " +
+									             "account='', " +
+									             "modified = to_date('" + currentDateTime + "','yyyy-mm-dd hh24:mi:ss')," +
+									             "modifier = '1', " +
+									             "lastmoddate = '" + currentDateTime.substring(0, 10) + "', " +
+									             "lastmodid = '1', " +
+									             "status = '5' " +
+									             "where  id ='" + userId + "' and workcode='" + employeeCode + "'";
+							logHrm.writeLog("更新员工状态为离职sql--------->" + sql);
+							rs.executeUpdate(sql);
+							continue;
+						}
+					}
+					
+					String managerId;
+					if ("".equals(deptCode)) {
+						logHrm.writeLog("部门编码为空，直接跳过！");
+						continue;
+					} else {
+						if (oaDeptInfoMap.containsKey(deptCode)) {
+							Map<String, String> detailMap = oaDeptInfoMap.get(deptCode);
+							
+							departmentid = detailMap.get("deptId");
+							subcompanyid1 = detailMap.get("subCompanyId");
+							
+							// 再次获取其部门所属的国家编码
+							String countryCode = detailMap.get("countryCode");
+							
+							if (!"".equals(countryCode) && !"CHN".equals(countryCode)) {
+								logHrm.writeLog("该员工所属部门的国家属性不为CHN，直接跳过！");
+								continue;
+							}
+							
+							// 处理直接上级
+							if ("".equals(managerCode)) {// 直接上级编码为空
+								// 再次获取该部门的部门负责人
+								managerId = detailMap.get("deptManager");
+								
+								if (managerId.contains(",")) {
+									logHrm.writeLog("该员工所属部门的部门负责人存在多人，直接跳过！");
+								}
+							} else {
+								managerId = Util.null2String(oaUserMap.get(managerCode));
+							}
+							
+							// 未找到上级的数据存入临时的Map集合中，待后续处理
+							if ("".equals(managerId) && !"".equals(managerCode)) {
+								noFindManagerMap.put(employeeCode, managerCode);
+							}
+						} else {
+							logHrm.writeLog("部门编码:[" + deptCode + "],在OA中不存在或封存状态！");
+							continue;
+						}
+					}
+					
+					// 处理岗位id
+					String jobtitleId = "";
+					if (!"".equals(positionCode)) {
+						jobtitleId = Util.null2String(oaJobTitleMap.get(positionCode));// 岗位ID
+					}
+					
+					logHrm.writeLog("处理完匹配关系后信息，部门ID:[" + departmentid + "],分部ID:[" + subcompanyid1 + "],直接上级:[" + managerId + "],岗位ID:[" + jobtitleId + "]");
+					
+					// 操作信息
+					String[] actionInfo = new String[]{action, actionDesc};
+					String[] bankInfo = new String[]{bankBranchName, bankAccountId, bankName};
+					
+					if (oaUserMap.containsKey(employeeCode)) {// 说明当前用户在OA系统中已存在
+						// 人员基本信息更新操作
+						boolean isSuccess = OrganizationUtil.updateEmployeeBaseInfo(userId, row, employeeName, subcompanyid1, departmentid, jobtitleId, managerId, name_pinyin, currentDateTime);
+						
+						logHrm.writeLog("人员基本信息更新结果:[" + isSuccess + "]");
+						
+						// 基本信息处理
+						OrganizationUtil.dealEmployeeNickName(userId, field0);
+						
+						if (!userDefinedMap.containsKey(userId)) {// 判断该员工的工作自定义信息是否存在
+							isSuccess = OrganizationUtil.insertEmployeeCustomizePersonal(userId, bankInfo, actionInfo, row);
+						} else {
+							// 更新人员工作信息表数据
+							if ("".equals(bankAccountId)) {
+								isSuccess = OrganizationUtil.updateEmployeeCustomizePersonal(userId, null, actionInfo, row);
+							} else {
+								isSuccess = OrganizationUtil.updateEmployeeCustomizePersonal(userId, bankInfo, actionInfo, row);
+							}
+						}
+						// 人员缓存信息更新
+						resourceComInfo.updateResourceInfoCache(userId);
+						logHrm.writeLog("人员自定义工作信息更新结果:[" + isSuccess + "]");
+						
+					} else {// 说明当前用户在OA系统中不存在，需要进行插入操作
+						// 获取最新的用户ID
+						if (rs.executeProc("HrmResourceMaxId_Get", "") && rs.next()) {
+							String newUserId = Util.null2String(rs.getInt(1));
+							
+							// 人员基本信息插入操作
+							boolean isSuccess = OrganizationUtil.insertEmployeeBaseInfo(newUserId, row, employeeName, subcompanyid1, departmentid, jobtitleId, managerId, name_pinyin, password, currentDateTime);
+							
+							if (isSuccess) {
+								oaUserMap.put(employeeCode, newUserId);
+								OrganizationUtil.dealEmployeeNickName(newUserId, field0);
+								
+								if ("".equals(bankAccountId)) {
+									isSuccess = OrganizationUtil.insertEmployeeCustomizePersonal(newUserId, null, actionInfo, row);
+								} else {
+									isSuccess = OrganizationUtil.insertEmployeeCustomizePersonal(newUserId, bankInfo, actionInfo, row);
+								}
+								
+								if (isSuccess) {
+									userDefinedMap.put(newUserId, employeeCode);
+								}
+								logHrm.writeLog("人员自定义工作信息写入结果:[" + isSuccess + "]");
+							}
+							
+							// 人员缓存处理
+							resourceComInfo.addResourceInfoCache(newUserId);
+						} else {
+							logHrm.writeLog("获取新用户ID失败，请联系系统管理员检查数据库存储过程！");
+						}
+					}
+					
+				}
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
+			
+			
+			if (!noFindManagerMap.isEmpty()) {// 待处理数据不为空
+				OrganizationUtil.dealNoFindMangerEmployeeData(noFindManagerMap);
+			}
+		}
+	}
+	
+	
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/schedule/hrmNew/JobTitleMultilingualUtil.java b/src/main/youhong_ai_jitu_src/jntchina/schedule/hrmNew/JobTitleMultilingualUtil.java
new file mode 100644
index 0000000..552f87c
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/schedule/hrmNew/JobTitleMultilingualUtil.java
@@ -0,0 +1,194 @@
+package jntchina.schedule.hrmNew;
+
+import aiyh.utils.Util;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+
+import java.util.*;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+/**
+ * <h1>职位多语言工具类</h1>
+ *
+ * <p>create: 2023/3/24 14:14</p>
+ *
+ * @author youHong.ai
+ */
+public class JobTitleMultilingualUtil {
+	private static final Map<String, String> LANGUAGE_MAP = new HashMap<>();
+	
+	private JSONArray jsonArray = null;
+	private Map<String, List<Map>> groupMap = null;
+	
+	private final Long updateTime = 0L;
+	
+	static {
+		extracted();
+	}
+	
+	private static void extracted() {
+		try {
+			Map<String, Object> jituMultilingual = Util.readProperties2Map("JituMultilingual", "cus.multilingual");
+			if (!isEmpty(jituMultilingual)) {
+				for (Map.Entry<String, Object> entry : jituMultilingual.entrySet()) {
+					LANGUAGE_MAP.put(entry.getKey(), Util.null2String(entry.getValue()));
+				}
+			}
+		} catch (Exception e) {
+			Util.getLogger().error("初始化多语言配置参数失败：" + e.getMessage() + "\n" + Util.getErrString(e));
+		}
+	}
+	
+	
+	private static boolean isEmpty(Map<?, ?> map) {
+		return Objects.isNull(map) || map.isEmpty();
+	}
+	
+	public static boolean isEmpty(Collection<?> collection) {
+		return collection == null || collection.isEmpty();
+	}
+	
+	public static boolean isBlankChar(int c) {
+		return Character.isWhitespace(c)
+				       || Character.isSpaceChar(c)
+				       || c == '\ufeff'
+				       || c == '\u202a'
+				       || c == '\u0000'
+				       // issue#I5UGSQ，Hangul Filler
+				       || c == '\u3164'
+				       // Braille Pattern Blank
+				       || c == '\u2800'
+				       // MONGOLIAN VOWEL SEPARATOR
+				       || c == '\u180e';
+	}
+	
+	public static boolean isBlankChar(char c) {
+		return isBlankChar((int) c);
+	}
+	
+	public static boolean isBlank(CharSequence str) {
+		final int length;
+		if ((str == null) || ((length = str.length()) == 0)) {
+			return true;
+		}
+		
+		for (int i = 0; i < length; i++) {
+			// 只要有一个非空字符即为非空字符串
+			if (!isBlankChar(str.charAt(i))) {
+				return false;
+			}
+		}
+		
+		return true;
+	}
+	
+	
+	public static <T> List<T> sub(List<T> list, int start, int end) {
+		return sub(list, start, end, 1);
+	}
+	
+	public static <T> List<T> sub(List<T> list, int start, int end, int step) {
+		if (list == null) {
+			return null;
+		}
+		
+		if (list.isEmpty()) {
+			return new ArrayList<>(0);
+		}
+		
+		final int size = list.size();
+		if (start < 0) {
+			start += size;
+		}
+		if (end < 0) {
+			end += size;
+		}
+		if (start == size) {
+			return new ArrayList<>(0);
+		}
+		if (start > end) {
+			int tmp = start;
+			start = end;
+			end = tmp;
+		}
+		if (end > size) {
+			if (start >= size) {
+				return new ArrayList<>(0);
+			}
+			end = size;
+		}
+		
+		if (step < 1) {
+			step = 1;
+		}
+		
+		final List<T> result = new ArrayList<>();
+		for (int i = start; i < end; i += step) {
+			result.add(list.get(i));
+		}
+		return result;
+	}
+	
+	/**
+	 * <h2>获取多语言字符串</h2>
+	 *
+	 * @param jsonArray     总数据
+	 * @param currentObj    当前对象
+	 * @param getKey        获取分组key的方法
+	 * @param getName       获取名称的方法
+	 * @param getLanguageCd 获取语言cd的方法
+	 * @return 最终多语言字符串
+	 */
+	public String getMultilingual(JSONArray jsonArray,
+	                              JSONObject currentObj,
+	                              Function<Map, String> getKey,
+	                              Function<Map, String> getName,
+	                              Function<Map, String> getLanguageCd) {
+		long l = System.currentTimeMillis();
+		if (l - updateTime >= 1_000 * 60 * 60 * 3) {
+			extracted();
+		}
+		StringBuilder sb = new StringBuilder();
+		List<Map> list = jsonArray.toJavaList(Map.class);
+		Map<String, List<Map>> groupMap = null;
+		// 对比缓存数据，如果是上一次传递进来的总数组，则不用再次分组
+		if (!jsonArray.equals(this.jsonArray)) {
+			this.jsonArray = jsonArray;
+			this.groupMap = list.stream().collect(Collectors.groupingBy(getKey));
+		}
+		String active = LANGUAGE_MAP.get("active");
+		if (isBlank(active)) {
+			return getName.apply(JSONObject.toJavaObject(currentObj, Map.class));
+		}
+		// 默认添加中文
+		active += ",ZHS";
+		String[] activeLanguageArray = active.split(",");
+		List<String> activeList = Arrays.stream(activeLanguageArray).distinct().collect(Collectors.toList());
+		groupMap = this.groupMap;
+		if (!isEmpty(groupMap)) {
+			List<Map> maps = groupMap.get(getKey.apply(JSONObject.toJavaObject(currentObj, Map.class)));
+			if (!isEmpty(maps)) {
+				sb.append("~`");
+				for (Map map : maps) {
+					String name = getName.apply(map);
+					String languageCd = getLanguageCd.apply(map);
+					// 当语言转换映射map中存在并且已经开启语言同步时，将对语言进行序列化
+					if (LANGUAGE_MAP.containsKey(languageCd) && activeList.contains(languageCd)) {
+						String languageId = LANGUAGE_MAP.get(languageCd);
+						sb.append("~`").append(languageId).append(" ").append(name).append("`");
+					}
+				}
+			}
+			return sb.append("~`~").toString();
+		}
+		// 如果没有相关分组数据，返回传入的对象的name
+		return getName.apply(JSONObject.toJavaObject(currentObj, Map.class));
+		
+	}
+	
+	public void clearJsonArray() {
+		this.jsonArray = null;
+	}
+	
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/schedule/hrmNew/OrganizationUtil.java b/src/main/youhong_ai_jitu_src/jntchina/schedule/hrmNew/OrganizationUtil.java
new file mode 100644
index 0000000..7c77f61
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/schedule/hrmNew/OrganizationUtil.java
@@ -0,0 +1,1317 @@
+package jntchina.schedule.hrmNew;
+
+import aiyh.utils.Util;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.serializer.SerializerFeature;
+import com.engine.common.service.impl.ThemeServiceImpl;
+import jntchina.schedule.hrm.entity.DepartmentDto;
+import jntchina.schedule.hrm.entity.HrmUserDto;
+import jntchina.util.HttpClientToJT;
+import org.apache.commons.lang3.StringUtils;
+import selfdev.util.log.LogTool;
+import weaver.conn.RecordSet;
+import weaver.hrm.company.SubCompanyComInfo;
+import weaver.matrix.MatrixUtil;
+
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * 极兔集团
+ * 组织架构同步通用工具类
+ */
+public class OrganizationUtil {
+	
+	/**
+	 * 当前类数据库连接
+	 */
+	private static final RecordSet rs = new RecordSet();
+	
+	/**
+	 * 组织同步通用日志操作类
+	 */
+	private static final LogTool logComm = new LogTool("/log/hrm/comm/", false);
+	
+	/**
+	 * 组织同步 部门日志操作类
+	 */
+	private static final LogTool logDept = new LogTool("/log/hrm/dept/", false);
+	
+	
+	/**
+	 * 组织同步 部门日志操作类
+	 */
+	private static final LogTool logJob = new LogTool("/log/hrm/job/", false);
+	
+	
+	/**
+	 * 组织同步 人员日志操作类
+	 */
+	private static final LogTool logHrm = new LogTool("/log/hrm/user/", false);
+	
+	
+	/**
+	 * 获取组织信息的接口地址后缀
+	 */
+	private static final String getOrganizationURL = "/dcopenedi/hrDept/pageNewHrDeptByUpdateTime";
+	
+	/**
+	 * 获取岗位信息接口地址后缀
+	 */
+	private static final String getJobTitleURL = "/dcopenedi/hrPost/pageByParam";
+	
+	/**
+	 * 获取人员信息接口地址后缀
+	 */
+	private static final String getEmployeeURL = "/dcopenedi/hrEmployee/pageByParam";
+	
+	
+	/**
+	 * 岗位自定义信息对应的模块ID
+	 */
+	private static final int jobDefinedModeId = 32501;
+	/**
+	 * 岗位自定义信息对应的表名称
+	 */
+	private static final String jobDefinedTableName = "uf_jobTitleDefined";
+	
+	
+	/**
+	 * 获取上一次同步时间戳
+	 *
+	 * @param dataType 数据类型 0-国内  1-海外 2-印尼
+	 * @return 上一次同步时间戳
+	 */
+	public static String getSyncTimestamp(int dataType) {
+		rs.executeQuery("select syncTs from org_sync_ts where dataType = ?", dataType);
+		if (rs.next()) {
+			return Util.null2String(rs.getString(1));
+		}
+		return "";
+	}
+	
+	/**
+	 * 更新上一次同步时间戳
+	 *
+	 * @param dataType 数据类型 0-国内  1-海外 2-印尼
+	 * @param ts       时间戳
+	 */
+	public static void updateSyncTimestamp(int dataType, String ts) {
+		rs.executeUpdate("update org_sync_ts set syncTs = ? where dataType = ?", ts, dataType);
+	}
+	
+	/**
+	 * 根据岗位外键编码获取其OA中的主键ID值
+	 *
+	 * @param outKey 外键编码值
+	 * @return OA主键ID值
+	 */
+	public static String getJobtitleIdByOutKey(String outKey) {
+		String jobtitleId = "";
+		if (!"".equals(outKey)) {
+			if (rs.executeQuery("select id from hrmJobtitles where outKey = ?", outKey) && rs.next()) {
+				jobtitleId = Util.null2String(rs.getString(1));
+			}
+		}
+		
+		return jobtitleId;
+	}
+	
+	
+	/**
+	 * 获取员工的直接上级ID 先根据直接上级编码获取对应的员工，若找不到，则获取所在部门的部门负责人作为直接上级
+	 *
+	 * @param managerCode  直接上级编码
+	 * @param departmentId 部门ID
+	 * @return 直接上级ID
+	 * 暂时删除该方法
+	 */
+	@Deprecated
+	public static String getEmployeeManagerId(String managerCode, String departmentId) {
+		String managerId = "";
+		
+		if (rs.executeQuery("select id from hrmResource where workCode = ?", managerCode) && rs.next()) {
+			managerId = Util.null2String(rs.getString(1));
+		}
+		if ("".equals(managerId)) {
+			if (rs.executeQuery("select bmfzr from hrmDepartmentDefined where deptId = ?", departmentId) && rs.next()) {
+				managerId = Util.null2String(rs.getString(1));
+			}
+		}
+		return managerId;
+	}
+	
+	/**
+	 * 更新上级领导（原先还未同步的上级领导）
+	 *
+	 * @param noFindManagerMap 未同步上级领导的员工信息集合
+	 */
+	public static void dealNoFindMangerEmployeeData(Map<String, String> noFindManagerMap) {
+		Iterator<Map.Entry<String, String>> entries = noFindManagerMap.entrySet().iterator();
+		String sql, updateSql;
+		while (entries.hasNext()) {
+			Map.Entry<String, String> entry = entries.next();
+			// 当前用户编码
+			String userId = entry.getKey();
+			// 上级领导编码
+			String managerCode = entry.getValue();
+			// 根据上级领导编码，获取其主键ID值
+			sql = "select id,outKey from hrmResource where outKey= ?";
+			if (rs.executeQuery(sql, managerCode) && rs.next()) {
+				String id = Util.null2String(rs.getString("id"));
+				if (!"".equals(id)) {
+					updateSql = "update hrmResource set managerId = ? where workCode =?";
+					rs.executeUpdate(updateSql, id, userId);
+				}
+			}
+		}
+	}
+	
+	
+	/**
+	 * 获取当期系统中  所有的部门信息<外部主键,OA主键>
+	 *
+	 * @return 返回部门信息集合 <outKey,id>
+	 */
+	public static Map<String, String> getAllDepartmentCodeIdMap() {
+		return getDepartmentCodeIdMap(false);
+	}
+	
+	
+	/**
+	 * 获取当期系统中  状态未封存的部门信息<外部主键,OA主键>
+	 *
+	 * @return 返回部门信息集合 <outKey,id>
+	 */
+	public static Map<String, String> getEffectiveDepartmentCodeIdMap() {
+		return getDepartmentCodeIdMap(true);
+	}
+	
+	/**
+	 * 获取当期系统中  部门信息<外部主键,OA主键>
+	 *
+	 * @param isEffective 是否生效记录 （CANCELED = 1 表示封存）
+	 * @return 返回部门信息集合 <outKey,id>
+	 */
+	private static Map<String, String> getDepartmentCodeIdMap(boolean isEffective) {
+		Map<String, String> map = new HashMap<>();
+		String selectSQL;
+		if (isEffective) {
+			selectSQL = "select departmentCode,outKey,id from HrmDepartment where outKey is not null and (CANCELED!=1 or CANCELED is null)";
+		} else {
+			selectSQL = "select departmentCode,outKey,id from HrmDepartment where outKey is not null";
+		}
+		if (rs.executeQuery(selectSQL)) {
+			while (rs.next()) {
+				// 外部主键值
+				String outKey = Util.null2String(rs.getString("outKey"));
+				if (!"".equals(outKey)) {// 不为空时才存入Map中
+					map.put(outKey, rs.getString("id"));
+				}
+			}
+		}
+		return map;
+	}
+	
+	/**
+	 * 获取部门对应的分部ID <部门外键,分部ID>
+	 *
+	 * @return 返回部门对应分部ID信息集合
+	 */
+	public static Map<String, String> getDepartmentCodeAndComIdMap() {
+		Map<String, String> map = new HashMap<>();
+		
+		if (rs.executeQuery("select outkey,subcompanyid1 from hrmdepartment where outkey is not null")) {
+			while (rs.next()) {
+				map.put(Util.null2String(rs.getString(1)), Util.null2String(rs.getString(2)));
+			}
+		}
+		return map;
+	}
+	
+	/**
+	 * 获取有效的部门必要信息 <部门外键,部门其他信息集合>
+	 *
+	 * @return 返回部门信息
+	 */
+	public static Map<String, Map<String, String>> getEffectiveDepartmentInfoMap() {
+		Map<String, Map<String, String>> infoMap = new HashMap<>();
+		
+		String selectSQL = "select h.outKey,h.id,u.bmfzr,u.guojia,h.subcompanyid1 from hrmdepartment h left join hrmDepartmentDefined u on h.id = u.deptId where h.outkey is not null and (CANCELED!=1 or CANCELED is null)";
+		
+		if (rs.executeQuery(selectSQL)) {
+			while (rs.next()) {
+				String outKey = Util.null2String(rs.getString("outKey"));
+				
+				String subCompanyId = Util.null2String(rs.getString("subcompanyid1"));
+				
+				String deptId = Util.null2String(rs.getString("id"));
+				
+				String deptManager = Util.null2String(rs.getString("bmfzr"));
+				
+				String countryCode = Util.null2String(rs.getString("guojia"));
+				
+				Map<String, String> detailMap = new HashMap<>();
+				detailMap.put("deptId", deptId);
+				detailMap.put("deptManager", deptManager);
+				detailMap.put("countryCode", countryCode);
+				detailMap.put("outKey", outKey);
+				detailMap.put("subCompanyId", subCompanyId);
+				
+				infoMap.put(outKey, detailMap);
+			}
+		}
+		
+		
+		return infoMap;
+	}
+	
+	/**
+	 * 判断某个部门对应自定义信息是否存在
+	 *
+	 * @param deptId 部门ID
+	 * @return 是否存在
+	 */
+	private static boolean deptDefinedIsExists(String deptId) {
+		return rs.executeQuery("select 1 from HrmDepartmentDefined where deptId = ?", deptId) && rs.next();
+	}
+	
+	
+	/**
+	 * 部门自定义信息处理
+	 *
+	 * @param deptId        部门ID
+	 * @param companyCode   组织编码
+	 * @param countryCode   国家编码
+	 * @param isDirectSales 是否直属销售
+	 * @param managerId     部门负责人
+	 * @param leaderId      分管领导
+	 */
+	public static void departmentDefinedDeal(String deptId, String isDirectSales, String companyCode, String managerId, String countryCode, String leaderId) {
+		String operateSQL;
+		if (deptDefinedIsExists(deptId)) {
+			String innerUpdate = "";
+			innerUpdate += !"".equals(managerId) ? managerId : "";
+			innerUpdate += !"".equals(leaderId) ? leaderId : "";
+			operateSQL = "update HrmDepartmentDefined set " +
+					             ",guojia = '" + countryCode + "' " +
+					             ",sfzy = '" + isDirectSales + "' " +
+					             ",frgs= '" + companyCode + "'" +
+					             innerUpdate +
+					             "where deptId = '" + deptId + "'";
+		} else { // 不存在，则进行插入操作
+			operateSQL = "insert into HrmDepartmentDefined(deptId,sfzy,frgs,bmfzr,guojia,bmfgld) " +
+					             "values('" + deptId + "'," +
+					             "'" + isDirectSales + "'," +
+					             "'" + companyCode + "'," +
+					             "'" + managerId + "'," +
+					             "'" + countryCode + "'," +
+					             "'" + leaderId + "')";
+		}
+		
+		if (rs.executeUpdate(operateSQL)) {
+			// 部门矩阵信息更新
+			MatrixUtil.updateDepartmentData(deptId);
+		} else {
+			logDept.writeLog("部门自定义信息操作失败，失败SQL:[" + operateSQL + "]");
+		}
+	}
+	
+	/**
+	 * 分部自定义信息处理
+	 *
+	 * @param comId         分部ID
+	 * @param countryCode   国家编码
+	 * @param isDirectSales 是否直营
+	 */
+	public static void companyDefinedDeal(String comId, String countryCode, String isDirectSales) {
+		String operateSQL;
+		
+		if (rs.executeQuery("select id from hrmSubCompanyDefined where subComId = ?", comId) && rs.next()) {
+			operateSQL = "update hrmSubCompanyDefined set " +
+					             "sfzy = '" + isDirectSales + "', " +
+					             "guojia = '" + countryCode + "' " +
+					             "where subComId = '" + comId + "'";
+		} else {
+			// 自定义信息写入
+			operateSQL = "insert into hrmSubCompanyDefined(subComId,guojia,sfzy) " +
+					             "values('" + comId + "','" + countryCode + "'," +
+					             "'" + isDirectSales + "')";
+		}
+		
+		if (rs.executeQuery(operateSQL)) {
+			MatrixUtil.updateSubcompayData(comId);
+		} else {
+			logComm.writeLog("分部自定义信息操作失败，失败SQL:[" + operateSQL + "]");
+		}
+	}
+	
+	/**
+	 * 岗位自定义信息处理
+	 *
+	 * @param jobTitleId 岗位ID
+	 * @param row        接口某一条记录信息
+	 */
+	public static int jobTitleDefinedDeal(String jobTitleId, JSONObject row) {
+		RecordSet rs = new RecordSet();
+		
+		String positionName = Util.null2String(row.getString("positionName"));// 岗位名称
+		String positionAbbreviation = Util.null2String(row.getString("positionAbbreviation"));// 岗位简称
+		String positionType = Util.null2String(row.getString("positionType"));// 岗位类别
+		String positionTypeHighest = Util.null2String(row.getString("positionTypeHighest"));// 岗位类别最高
+		String positionTypeLowest = Util.null2String(row.getString("positionTypeLowest"));// 岗位类别最低
+		String positionPropeCode = Util.null2String(row.getString("positionPropeCode"));// 岗位属性编码
+		String positionPropeName = Util.null2String(row.getString("positionPropeName"));// 岗位属性名称
+		String companyCode = Util.null2String(row.getString("companyCode"));// 公司编码
+		String companyName = Util.null2String(row.getString("companyName"));// 公司名称
+		String deptCode = Util.null2String(row.getString("deptCode"));// 部门编码
+		String deptName = Util.null2String(row.getString("deptName"));// 部门名称
+		String locationCode = Util.null2String(row.getString("locationCode"));// 地点编码
+		String locationName = Util.null2String(row.getString("locationName"));// 地点描述
+		String stdPositionCode = Util.null2String(row.getString("stdPositionCode"));// 标准岗位编码
+		String stdPositionName = Util.null2String(row.getString("stdPositionName"));// 标准岗位名称
+		String postCode = Util.null2String(row.getString("postCode"));// 岗编码
+		String postName = Util.null2String(row.getString("postName"));// 岗名称
+		String sequenceCode = Util.null2String(row.getString("sequenceCode"));// 序列编码
+		String sequenceName = Util.null2String(row.getString("sequenceName"));// 序列名称
+		String positionGroupCode = Util.null2String(row.getString("positionGroupCode"));// 岗族编码
+		String positionGroupName = Util.null2String(row.getString("positionGroupName"));// 岗族名称
+		String ethnicGroupCode = Util.null2String(row.getString("ethnicGroupCode"));// 族群编码
+		String ethnicGroupName = Util.null2String(row.getString("ethnicGroupName"));// 族群名称
+		
+		
+		boolean isNew = false;
+		int dataId;
+		
+		if (rs.executeQuery("select id from " + jobDefinedModeId + " where positionid = ?", jobTitleId) && rs.next()) {
+			dataId = Util.getIntValue(rs.getString(1), 0);
+		} else {
+			isNew = true;
+			// 数据ID
+			dataId = Util.getModeDataId(jobDefinedTableName, jobDefinedModeId, 1);
+		}
+		
+		String operateSQL = "update " + jobDefinedTableName + " set " +
+				                    "positionName = '" + positionName + "', " +
+				                    "positionAbbreviation = '" + positionAbbreviation + "', " +
+				                    "positionType = '" + positionType + "', " +
+				                    "positionTypeHighest = '" + positionTypeHighest + "', " +
+				                    "positionTypeLowest = '" + positionTypeLowest + "', " +
+				                    "positionPropeCode = '" + positionPropeCode + "', " +
+				                    "positionPropeName = '" + positionPropeName + "', " +
+				                    "companyCode = '" + companyCode + "', " +
+				                    "companyName = '" + companyName + "', " +
+				                    "deptCode = '" + deptCode + "', " +
+				                    "deptName = '" + deptName + "', " +
+				                    "locationCode = '" + locationCode + "', " +
+				                    "locationName = '" + locationName + "', " +
+				                    "stdPositionCode = '" + stdPositionCode + "', " +
+				                    "stdPositionName = '" + stdPositionName + "', " +
+				                    "postcode = '" + postCode + "', " +
+				                    "postName = '" + postName + "', " +
+				                    "sequenceCode = '" + sequenceCode + "', " +
+				                    "sequenceName = '" + sequenceName + "', " +
+				                    "positionGroupCode = '" + positionGroupCode + "', " +
+				                    "positionGroupName = '" + positionGroupName + "', " +
+				                    "ethnicGroupCode = '" + ethnicGroupCode + "', " +
+				                    "ethnicGroupName = '" + ethnicGroupName + "' " +
+				                    "where positionid= '" + jobTitleId + "'";
+		logJob.writeLog("更新岗位建模自定义表中数据sql--------->" + operateSQL);
+		if (!rs.executeUpdate(operateSQL)) {
+			if (isNew) {
+				rs.executeUpdate("delete from " + jobDefinedTableName + " where id = ?", dataId);
+			}
+			dataId = -1;
+		} else {
+			if (!isNew) {
+				dataId = -1;
+			}
+		}
+		
+		return dataId;
+	}
+	
+	/**
+	 * 获取当期系统中  所有的分部信息<外部主键,OA主键>
+	 *
+	 * @return 返回部门信息集合 <outKey,id>
+	 */
+	public static Map<String, String> getAllSubCompanyCodeIdMap() {
+		return getSubCompanyCodeIdMap(false);
+	}
+	
+	
+	/**
+	 * 获取当期系统中  状态未封存的分部信息<外部主键,OA主键>
+	 *
+	 * @return 返回部门信息集合 <outKey,id>
+	 */
+	public static Map<String, String> getEffectiveSubCompanyCodeIdMap() {
+		return getSubCompanyCodeIdMap(true);
+	}
+	
+	/**
+	 * 获取当期系统中  分部信息<外部主键,OA主键>
+	 *
+	 * @return 返回分部信息集合 <outKey,id>
+	 */
+	private static Map<String, String> getSubCompanyCodeIdMap(boolean isEffective) {
+		Map<String, String> map = new HashMap<>();
+		String selectSQL;
+		if (isEffective) {
+			selectSQL = "select outKey,id from HrmSubCompany where outKey is not null and (CANCELED!=1 or CANCELED is null)";
+		} else {
+			selectSQL = "select outKey,id from HrmSubCompany where outKey is not null";
+		}
+		if (rs.executeQuery(selectSQL)) {
+			while (rs.next()) {
+				// 外部主键值
+				String outKey = Util.null2String(rs.getString("outKey"));
+				if (!"".equals(outKey)) {// 不为空时才存入Map中
+					map.put(outKey, Util.null2String(rs.getString("id")));
+				}
+			}
+		}
+		return map;
+	}
+	
+	/**
+	 * 获取当前OA系统中  未封存部门信息集合 <外键,OA部门ID^_^OA分部ID>
+	 *
+	 * @return 部门信息集合
+	 */
+	public static Map<String, String> getEffectiveDeptAndCompany() {
+		Map<String, String> map = new HashMap<>();
+		
+		String selectSQL = "select outKey,id,subCompanyId1 from HrmDepartment where outKey is not null and (CANCELED!=1 or CANCELED is null)";
+		if (rs.executeQuery(selectSQL)) {
+			while (rs.next()) {
+				// 外部主键值
+				String outKey = Util.null2String(rs.getString("outKey"));
+				String keyId = Util.null2String(rs.getString("id"));
+				String subCompanyId = Util.null2String(rs.getString("subCompanyId1"));
+				if (!"".equals(outKey)) {// 不为空时才存入Map中
+					map.put(outKey, keyId + "^_^" + subCompanyId);
+				}
+			}
+		}
+		return map;
+	}
+	
+	/**
+	 * 获取人员处理后的姓名 (将系统中人员姓名字段中的简体中文姓名进行替换）
+	 *
+	 * @param oldName        系统原有的姓名
+	 * @param simplifiedName 默认简体中文的姓名
+	 * @return 返回处理后的姓名
+	 */
+	public static String dealEmployeeName(String oldName, String simplifiedName) {
+		String finalName;
+		if (oldName.contains("~`~`") && oldName.contains("`~`~")) {
+			// 获取第一个出现该字符串的位置
+			int firstBit = oldName.indexOf("~`~`");
+			
+			// 字符串 + 数字 + 空格
+			String mindStr = oldName.substring(firstBit + 6);
+			// 第一个姓名的语言
+			String lang = oldName.substring(4, oldName.indexOf(" "));
+			// 两个语言之间分隔符位置
+			int endBit = mindStr.indexOf("‘~‘");
+			
+			endBit = endBit < 0 ? mindStr.indexOf("`~`~") : endBit;
+			
+			String balanceStr = mindStr.substring(endBit);
+			
+			if ("7".equals(lang)) {// 说明第一个语言为简体中文
+				finalName = "~`~`7 " + simplifiedName + balanceStr;
+			} else {// 第一个语言不为简体中文，那在其最前面加上该语言姓名
+				finalName = "~`~`7 " + simplifiedName + "‘~‘" + oldName.substring(firstBit + 4);
+			}
+		} else {
+			finalName = "~`~`7 " + simplifiedName + "`~`~";
+		}
+		return finalName;
+	}
+	
+	/**
+	 * 获取人员数据集合 <外键，主键>
+	 *
+	 * @return 人员数据集合
+	 */
+	public static Map<String, String> getEmployeeMap() {
+		Map<String, String> dataMap = new HashMap<>();
+		if (rs.executeQuery("select outkey,id from hrmresource where outkey is not null")) {
+			while (rs.next()) {
+				dataMap.put(Util.null2String(rs.getString(1)), Util.null2String(rs.getString(2)));
+			}
+		}
+		return dataMap;
+	}
+	
+	/**
+	 * 获取人员工作信息自定义字段 <用户ID，field15字段值>
+	 *
+	 * @return 用户自定义信息
+	 */
+	public static Map<String, String> getEmployeeDefinedMap() {
+		Map<String, String> map = new HashMap<>();
+		rs.executeQuery("select id,field15 from cus_fielddata where scopeid='1' and scope='HrmCustomFieldByInfoType'");
+		while (rs.next()) {
+			map.put(rs.getString("id"), rs.getString("field15"));
+		}
+		return map;
+		
+	}
+	
+	
+	/**
+	 * 获取有效的岗位数据集合 <外键，主键>
+	 *
+	 * @return 人员数据集合
+	 */
+	public static Map<String, String> getEffectiveJobTitleMap() {
+		Map<String, String> dataMap = new HashMap<>();
+		if (rs.executeQuery("select outkey,id from hrmJobtitles where outkey is not null and (CANCELED!=1 or CANCELED is null)")) {
+			while (rs.next()) {
+				dataMap.put(Util.null2String(rs.getString(1)), Util.null2String(rs.getString(2)));
+			}
+		}
+		return dataMap;
+	}
+	
+	/**
+	 * 根据部门ID获取其对应的分部ID
+	 *
+	 * @param deptId 部门ID
+	 * @return 分部ID
+	 */
+	public static String getSubCompanyIdByDeptCode(String deptId) {
+		String subCompanyId = "";
+		RecordSet rs = new RecordSet();
+		rs.executeQuery("select subcompanyid1 from HrmDepartment where id ='" + deptId + "'");
+		if (rs.next()) {
+			subCompanyId = Util.null2String(rs.getString(1));
+		}
+		return subCompanyId;
+	}
+	
+	
+	/**
+	 * 获取部门对应的国家信息
+	 *
+	 * @return 返回部门国家对应信息集合
+	 */
+	public static Map<String, String> getDeptCountryMap() {
+		Map<String, String> deptCountryMap = new HashMap<>();
+		
+		if (rs.executeQuery("select deptId,guojia from hrmDepartmentDefined")) {
+			while (rs.next()) {
+				deptCountryMap.put(Util.null2String(rs.getString(1)), Util.null2String(rs.getString(2)));
+			}
+		}
+		
+		return deptCountryMap;
+	}
+	
+	
+	/**
+	 * 获取部门对应的国家和负责人信息
+	 *
+	 * @return 返回部门国家和负责人对应信息集合
+	 */
+	public static Map<String, Map<String, String>> getDeptCountryAndManagerMap() {
+		Map<String, Map<String, String>> deptCountryAndManagerMap = new HashMap<>();
+		
+		if (rs.executeQuery("select deptId,guojia,bmfzr from hrmDepartmentDefined")) {
+			while (rs.next()) {
+				String deptId = Util.null2String(rs.getString("deptId"));
+				
+				Map<String, String> detailMap = new HashMap<>();
+				detailMap.put("guojia", Util.null2String(rs.getString("guojia")));
+				detailMap.put("bmfzr", Util.null2String(rs.getString("bmfzr")));
+				
+				deptCountryAndManagerMap.put(deptId, detailMap);
+			}
+		}
+		
+		return deptCountryAndManagerMap;
+	}
+	
+	
+	/**
+	 * 获取该List中的外键已存在的记录信息
+	 *
+	 * @param codeList 所有外键信息集合
+	 * @param dataType 0 - 系统表  1- 自定义表
+	 * @return 所有已存在的记录集合
+	 */
+	public static Map<String, String> getExitsData(List<String> codeList, int dataType) {
+		Map<String, String> existMap = new HashMap<>();
+		String selectData;
+		
+		if (dataType == 1) {
+			selectData = "select positionid,positionCode from uf_jobTitleDefined u where exists (" +
+					             " select 1 from (" +
+					             "  select regexp_substr('" + StringUtils.join(codeList, ",") + "','[^,]+',1,LEVEL) as code from dual connect by LEVEL <= " + codeList.size() +
+					             " ) t where t.code = u.positionCode)";
+		} else {
+			selectData = "select outKey,id from hrmJobTitles where outKey is not null and exists (" +
+					             " select 1 from (" +
+					             "  select regexp_substr('" + StringUtils.join(codeList, ",") + "','[^,]+',1,LEVEL) as code from dual connect by LEVEL <= " + codeList.size() +
+					             " ) t where t.code = hrmJobTitles.outKey)";
+		}
+		
+		if (rs.executeQuery(selectData)) {
+			while (rs.next()) {
+				existMap.put(Util.null2String(rs.getString(1)), Util.null2String(rs.getString(2)));
+			}
+		}
+		
+		return existMap;
+	}
+	
+	/**
+	 * 分部同步操作
+	 *
+	 * @param subCompanyList  分部信息集合
+	 * @param currentDateTime 当前系统时间戳
+	 */
+	public static void subCompanySyncDeal(List<DepartmentDto> subCompanyList, String currentDateTime) {
+		
+		ThemeServiceImpl themeService = new ThemeServiceImpl();
+		
+		// 分部数据集合
+		Map<String, String> oaComMap = getEffectiveSubCompanyCodeIdMap();
+		
+		for (DepartmentDto row : subCompanyList) {
+			String countryCode = Util.null2String(row.getCountryCode());// 国家编码
+			String departmentCode = Util.null2String(row.getDepartmentCode());// 分部编码
+			String departmentName = Util.null2String(row.getDepartmentName());// 分部全称
+			String superiorDepartment = Util.null2String(row.getSuperiorDepartment());// 上级分部编码
+			int canceled = Util.null2String(row.getStatus()).equals("3") ? 1 : 0;// 1 新增  2 修改  3作废
+			
+			// 只需要中文和英文
+			departmentName = "~`~`7 " + departmentName + "`~`8  `~`~";
+			
+			String supSubComId = "0";
+			if (!"".equals(superiorDepartment) && oaComMap.containsKey(superiorDepartment)) {
+				supSubComId = Util.null2String(oaComMap.get(superiorDepartment));
+			}
+			
+			String operateSQL;
+			if (oaComMap.containsKey(departmentCode)) {// 该编码对应的分部存在
+				String oldComId = oaComMap.get(departmentCode);
+				
+				String updateStr = !"0".equals(supSubComId) ? "supSubComId= '" + supSubComId + "', " : "";
+				operateSQL = "update hrmSubCompany set " +
+						             updateStr +
+						             "subCompanyName = '" + departmentName + "', " +
+						             "subCompanyDesc = '" + departmentName + "', " +
+						             "subCompanyCode = '" + departmentCode + "', " +
+						             "modified = to_date('" + currentDateTime + "','yyyy-mm-dd hh24:mi:ss')," +
+						             "modifier = '1', " +
+						             "canceled = " + canceled + " " +
+						             "where outkey= '" + departmentCode + "'";
+				
+				logDept.writeLog("分部信息更新操作:[" + operateSQL + "]");
+				
+				if (rs.executeUpdate(operateSQL)) {
+					OrganizationUtil.companyDefinedDeal(oldComId, countryCode, row.getIsDirectSales());
+				} else {
+					logDept.writeLog("分部信息更新失败！");
+				}
+			} else { // 该编码对应的分部不存在
+				// 新增数据,插入到hrmSubCompany表中
+				operateSQL = "insert into hrmSubCompany (companyId,supSubComId,subCompanyName,subCompanyDesc,outkey,subCompanyCode," +
+						             "canceled,created,creater,modified,modifier) values("
+						             + "'1',"
+						             + "'" + supSubComId + "',"
+						             + "'" + departmentName + "',"
+						             + "'" + departmentName + "',"
+						             + "'" + departmentCode + "',"
+						             + "'" + departmentCode + "',"
+						             + canceled + ","
+						             + "to_date('" + currentDateTime + "','yyyy-mm-dd hh24:mi:ss'),"
+						             + "'1',"
+						             + "to_date('" + currentDateTime + "','yyyy-mm-dd hh24:mi:ss'),"
+						             + "'1')";
+				
+				logDept.writeLog("分部信息写入操作:[" + operateSQL + "]");
+				
+				if (rs.executeUpdate(operateSQL)) {
+					// 获取新写入的记录ID
+					if (rs.executeQuery("select id from hrmSubCompany where outkey = ?", departmentCode) && rs.next()) {
+						String newComId = Util.null2String(rs.getString(1));
+						
+						// 创建分部菜单
+						themeService.createSubCompanyMenu(Integer.parseInt(newComId), Integer.parseInt(supSubComId));
+						
+						oaComMap.put(departmentCode, newComId);
+						
+						OrganizationUtil.companyDefinedDeal(newComId, countryCode, row.getIsDirectSales());
+					} else {
+						logDept.writeLog("获取新写入分部ID失败！");
+					}
+				} else {
+					logDept.writeLog("分部信息写入失败!");
+				}
+			}
+		}
+		
+		// 分部缓存处理
+		SubCompanyComInfo subCompanyComInfo = new SubCompanyComInfo();
+		subCompanyComInfo.removeCompanyCache();
+	}
+	
+	/**
+	 * 用户基础信息写入
+	 *
+	 * @param userId          用户ID
+	 * @param row             用户信息
+	 * @param lastName        姓名
+	 * @param subCompanyId    分部ID
+	 * @param departmentId    部门ID
+	 * @param jobtitleId      岗位ID
+	 * @param managerId       直接上级ID
+	 * @param name_pinyin     姓名拼音
+	 * @param currentDateTime 系统时间戳
+	 * @return 执行结果
+	 */
+	public static boolean insertEmployeeBaseInfo(String userId, HrmUserDto row, String lastName, String subCompanyId, String departmentId, String jobtitleId, String managerId, String name_pinyin, String password, String currentDateTime) {
+		
+		String employeeCode = Util.null2String(row.getEmployeeCode());// 员工code
+		String employeeSexCode = Util.null2String(row.getEmployeeSexCode());// 性别 M男 F女 对应 OA 0男 1女
+		int sex = "M".equals(employeeSexCode) ? 0 : 1;
+		String birthdate = Util.null2String(row.getEmployeeBirthdate());// 出生年月
+		String companyTel = Util.null2String(row.getCompanyTel());// 办公电话
+		String personalTel = Util.null2String(row.getPersonalTel());// 手机号
+		String email = Util.null2String(row.getCompanyEmail());// 邮箱
+		String idNumber = Util.null2String(row.getCertificateNum());// 身份证号码
+		String EntryDate = Util.null2String(row.getEmplHireDate());// 入职日期  无字段，暂用试用结束日期来替代
+		String hrStatus = Util.null2String(row.getHrStatus());// 状态A在职，I离职 对应OA的1正式 5离职
+		int status = "A".equals(hrStatus) ? 1 : 5;// OA的在职状态
+		
+		String operateSQL = "insert into hrmresource(id,loginid,password,lastname,workcode,sex, " +
+				                    "mobile,email,departmentid,jobtitle,birthday,certificatenum," +
+				                    "seclevel,outkey,status,systemlanguage,createrid,createdate," +
+				                    "companystartdate,telephone,ecology_pinyin_search,pinyinlastname," +
+				                    "created,creater,modified,modifier,managerid,subcompanyid1) values( "
+				                    + "'" + userId + "',"
+				                    + "'" + row + "',"
+				                    + "'" + password + "',"
+				                    + "?,"
+				                    + "'" + employeeCode + "',"
+				                    + "'" + sex + "',"
+				                    + "'" + personalTel + "',"
+				                    + "'" + email + "',"
+				                    + "'" + departmentId + "',"
+				                    + "'" + jobtitleId + "',"
+				                    + "'" + birthdate + "',"
+				                    + "'" + idNumber + "',"
+				                    + "'" + 10 + "',"
+				                    + "'" + employeeCode + "',"
+				                    + "" + status + ","
+				                    + "'7',"
+				                    + "'1',"
+				                    + "'" + currentDateTime.substring(0, 10) + "',"
+				                    + "'" + EntryDate + "',"
+				                    + "'" + companyTel + "',"
+				                    + "'" + name_pinyin + "',"
+				                    + "'" + name_pinyin + "',"
+				                    + "to_date('" + currentDateTime + "','yyyy-mm-dd hh24:mi:ss'),"
+				                    + "'1',"
+				                    + "to_date('" + currentDateTime + "','yyyy-mm-dd hh24:mi:ss'),"
+				                    + "'1',"
+				                    + "'" + managerId + "',"
+				                    + "'" + subCompanyId + "')";
+		
+		
+		logHrm.writeLog("人员基本信息插入SQL:[" + operateSQL + "],[" + lastName + "]");
+		RecordSet rs = new RecordSet();
+		
+		return rs.executeUpdate(operateSQL, lastName);
+	}
+	
+	
+	/**
+	 * 更新用户的基本信息
+	 *
+	 * @param userId          用户ID
+	 * @param row             用户信息
+	 * @param lastName        用户姓名
+	 * @param subCompanyId    分部ID
+	 * @param departmentId    部门ID
+	 * @param jobtitleId      岗位ID
+	 * @param managerId       直接上级ID
+	 * @param name_pinyin     姓名拼音
+	 * @param currentDateTime 系统时间戳
+	 * @return 执行结果
+	 */
+	public static boolean updateEmployeeBaseInfo(String userId, HrmUserDto row, String lastName, String subCompanyId, String departmentId, String jobtitleId, String managerId, String name_pinyin, String currentDateTime) {
+		String employeeCode = Util.null2String(row.getEmployeeCode());// 员工code
+		String employeeSexCode = Util.null2String(row.getEmployeeSexCode());// 性别 M男 F女 对应 OA 0男 1女
+		int sex = "M".equals(employeeSexCode) ? 0 : 1;
+		String birthdate = Util.null2String(row.getEmployeeBirthdate());// 出生年月
+		String companyTel = Util.null2String(row.getCompanyTel());// 办公电话
+		String personalTel = Util.null2String(row.getPersonalTel());// 手机号
+		String email = Util.null2String(row.getCompanyEmail());// 邮箱
+		String idNumber = Util.null2String(row.getCertificateNum());// 身份证号码
+		String EntryDate = Util.null2String(row.getEmplHireDate());// 入职日期  无字段，暂用试用结束日期来替代
+		String hrStatus = Util.null2String(row.getHrStatus());// 状态A在职，I离职 对应OA的1正式 5离职
+		int status = "A".equals(hrStatus) ? 1 : 5;// OA的在职状态
+		
+		RecordSet rs = new RecordSet();
+		
+		String updateStr = !"".equals(jobtitleId) ? "jobtitle = '" + jobtitleId + "', " : "";
+		updateStr += !"".equals(managerId) ? "managerid = '" + managerId + "', " : "";
+		String updateSQL = "update hrmresource set " +
+				                   "workcode = '" + employeeCode + "', " +
+				                   "departmentid = '" + departmentId + "'," +
+				                   "subcompanyid1 = '" + subCompanyId + "'," +
+				                   "lastname = ?, " +
+				                   "sex = '" + sex + "', " +
+				                   "mobile = '" + personalTel + "', " +
+				                   "ecology_pinyin_search = '" + name_pinyin + "', " +
+				                   "pinyinlastname = '" + name_pinyin + "', " +
+				                   "email = '" + email + "', " +
+				                   "telephone = '" + companyTel + "', " +
+				                   "status = " + status + ", " +
+				                   "birthday = '" + birthdate + "', " +
+				                   "certificatenum = '" + idNumber + "', " +
+				                   "companystartdate = '" + EntryDate + "', " +
+				                   "modified = to_date('" + currentDateTime + "','yyyy-mm-dd hh24:mi:ss')," +
+				                   "modifier = '1', " +
+				                   "lastmoddate = '" + currentDateTime.substring(0, 10) + "', " +
+				                   updateStr +
+				                   "lastmodid = '1' " +
+				                   "where  id ='" + userId + "'";
+		
+		logHrm.writeLog("人员基本信息更新SQL:[" + updateSQL + "],[" + lastName + "]");
+		
+		return rs.executeUpdate(updateSQL, lastName);
+	}
+	
+	
+	/**
+	 * 插入员工自定义 - 个人
+	 *
+	 * @param userId     用户ID
+	 * @param bankInfo   [bankBranchName,bankAccountId,bankName]  银行信息数组
+	 * @param actionInfo [action,action_describe] 操作信息
+	 * @param row        用户信息实体类
+	 * @return 执行结果
+	 */
+	public static boolean insertEmployeeCustomizePersonal(String userId, String[] bankInfo, String[] actionInfo, HrmUserDto row) {
+		boolean isSuccess;
+		
+		// 插入前先判断记录是否存在
+		if (rs.executeQuery("select 1 from cus_fielddata where id = ? and scopeid = 1 and scope = 'HrmCustomFieldByInfoType'", userId) && rs.next()) {
+			return updateEmployeeCustomizePersonal(userId, bankInfo, actionInfo, row);
+		}
+		
+		String bankInfoCol = "";
+		String bankInfoVal = "";
+		
+		if (bankInfo != null && bankInfo.length > 2) {
+			bankInfoCol = "field0,field1,field5,field7,";
+			bankInfoVal = "'" + bankInfo[0] + "',"
+					              + "'" + bankInfo[1] + "',"
+					              + "?,"
+					              + "'" + bankInfo[2] + "',";
+		}
+		
+		if (actionInfo != null && actionInfo.length > 1) {
+			bankInfoCol += "field10,field11,";
+			bankInfoVal += "'" + actionInfo[0] + "',"
+					               + "'" + actionInfo[1] + "',";
+		}
+		
+		// 自定义信息插入SQL语句拼接
+		String sql = "insert into cus_fielddata(scope,scopeid,id," + bankInfoCol + "field15,field16,field17,field18,field19,field20,field21,field14,field22,field23,field24) values("
+				             + "'HrmCustomFieldByInfoType',"
+				             + "'1',"
+				             + "'" + userId + "',"
+				             + bankInfoVal
+				             + "'" + Util.null2String(row.getEmployeeCode()) + "',"
+				             + "'" + Util.null2String(row.getCompanyCode()) + "',"
+				             + "'" + Util.null2String(row.getCompanyName()) + "',"
+				             + "'" + Util.null2String(row.getDeptCode()) + "',"
+				             + "'" + Util.null2String(row.getDeptName()) + "',"
+				             + "'" + Util.null2String(row.getPositionCode()) + "',"
+				             + "'" + Util.null2String(row.getPositionName()) + "',"
+				             + "'" + Util.null2String(row.getPositionType()) + "',"
+				             + "'" + Util.null2String(row.getPositionTypeDescr()) + "',"
+				             + "'" + Util.null2String(row.getPositonRankCode()) + "',"
+				             + "'" + Util.null2String(row.getPositonRankDescr()) + "')";
+		
+		
+		if (bankInfo != null && bankInfo.length > 2) {
+			isSuccess = rs.executeUpdate(sql, Util.null2String(row.getEmployeeName()));
+		} else {
+			isSuccess = rs.executeUpdate(sql);
+		}
+		
+		logComm.writeLog("写入人员自定义信息:[" + sql + "],执行结果:[" + isSuccess + "]");
+		
+		return isSuccess;
+	}
+	
+	/**
+	 * 更新员工自定义 - 个人
+	 *
+	 * @param userId     用户ID
+	 * @param bankInfo   [bankBranchName,bankAccountId,bankName]  银行信息数组
+	 * @param actionInfo [action,action_describe] 操作信息
+	 * @param row        用户信息实体类
+	 * @return 执行结果
+	 */
+	public static boolean updateEmployeeCustomizePersonal(String userId, String[] bankInfo, String[] actionInfo, HrmUserDto row) {
+		boolean isSuccess;
+		
+		String cusCol = "";
+		
+		if (bankInfo != null && bankInfo.length > 2) {
+			cusCol = "field0 = '" + bankInfo[0] + "', " +
+					         "field1 = '" + bankInfo[1] + "', " +
+					         "field5 = '?', " +
+					         "field7 = '" + bankInfo[2] + "', ";
+		}
+		
+		if (actionInfo != null && actionInfo.length > 1) {
+			cusCol += "field10 = '" + actionInfo[0] + "', " +
+					          "field11 = '" + actionInfo[1] + "', ";
+		}
+		
+		// 自定义信息更新SQL语句拼接
+		String updateSQL = "update cus_fielddata set " +
+				                   cusCol +
+				                   "field15 = '" + Util.null2String(row.getEmployeeCode()) + "', " +
+				                   "field16 = '" + Util.null2String(row.getCompanyCode()) + "', " +
+				                   "field17 = '" + Util.null2String(row.getCompanyName()) + "', " +
+				                   "field18 = '" + Util.null2String(row.getDeptCode()) + "', " +
+				                   "field19 = '" + Util.null2String(row.getDeptName()) + "', " +
+				                   "field20 = '" + Util.null2String(row.getPositionCode()) + "', " +
+				                   "field21 = '" + Util.null2String(row.getPositionName()) + "', " +
+				                   "field14 = '" + Util.null2String(row.getPositionType()) + "', " +
+				                   "field22 = '" + Util.null2String(row.getPositionTypeDescr()) + "', " +
+				                   "field23 = '" + Util.null2String(row.getPositonRankCode()) + "', " +
+				                   "field24 = '" + Util.null2String(row.getPositonRankDescr()) + "' " +
+				                   "where  id ='" + userId + "' and scopeid='1' and scope = 'HrmCustomFieldByInfoType'";
+		
+		if (bankInfo != null && bankInfo.length > 2) {
+			isSuccess = rs.executeUpdate(updateSQL, Util.null2String(row.getEmployeeName()));
+		} else {
+			isSuccess = rs.executeUpdate(updateSQL);
+		}
+		
+		logHrm.writeLog("更新人员自定义信息:[" + updateSQL + "],执行结果:[" + isSuccess + "]");
+		
+		return isSuccess;
+	}
+	
+	
+	/**
+	 * 处理人员昵称信息
+	 *
+	 * @param userId   用户ID
+	 * @param nickName 昵称
+	 */
+	public static void dealEmployeeNickName(String userId, String nickName) {
+		RecordSet rs = new RecordSet();
+		// 基本信息处理
+		String cusSql;
+		// 基本信息
+		rs.executeQuery("select id from cus_fielddata where scopeid='-1' and scope='HrmCustomFieldByInfoType' and id = ?", userId);
+		if (!rs.next()) {// 若不存在该用户的自定义信息-基本信息
+			cusSql = "insert into cus_fielddata(scope,scopeid,id,field0) values("
+					         + "'HrmCustomFieldByInfoType',"
+					         + "'-1',"
+					         + "'" + userId + "',?)";
+		} else {
+			cusSql = "update cus_fielddata set scopeid = '-1',field0 = ?" +
+					         " where  id ='" + userId + "' and scopeid='-1' and scope = 'HrmCustomFieldByInfoType'";
+		}
+		
+		boolean b = rs.executeUpdate(cusSql, nickName);
+		logComm.writeLog("-------------修改自定义基本信息：" + cusSql);
+		logComm.writeLog("-------------修改自定义基本是否成功：" + b);
+	}
+	
+	
+	/**
+	 * 调用人员接口，获取接口返回信息
+	 *
+	 * @param size             每页条数
+	 * @param pages            页码
+	 * @param today            日期
+	 * @param languageCds      语言代码
+	 * @param deptCountryCodes 部门国家代码
+	 * @param code             员工编码
+	 * @return 接口响应信息
+	 */
+	public static String callEmployeeInterface(int size, String pages, String today, List<String> languageCds, List<String> deptCountryCodes, String code) {
+		Map<String, Object> params = new HashMap<>();
+		params.put("updateTime", today);
+		params.put("point", pages);
+		params.put("languageCds", languageCds);
+		params.put("size", size);
+		params.put("deptCountryCodes", deptCountryCodes);
+		
+		if (!"".equals(code)) {
+			params.put("employeeCode", code);
+		}
+		
+		String url = HttpClientToJT.baseUrl + "/dcopenedi/hrEmployee/pageByParam";
+		
+		String token = HttpClientToJT.getToken();
+		
+		return HttpClientToJT.sendPost(url, token, JSONObject.toJSONString(params));
+	}
+	
+	/**
+	 * 获取人员接口数据
+	 *
+	 * @param dataTimeTs 上一次同步时间戳
+	 * @param dataType   数据类型 0-国内数据 1-海外数据 2-印尼数据
+	 * @param size       每页条数
+	 * @return 接口数据
+	 */
+	@SuppressWarnings("unchecked")
+	public static JSONArray getEmployeeByPoint(String dataTimeTs, int dataType, int size) {
+		String requestURL = HttpClientToJT.baseUrl + getEmployeeURL;
+		
+		logHrm.writeLog("获取人员数据接口URL:[" + requestURL + "]");
+		
+		JSONArray dataArray = new JSONArray();
+		
+		// 是否有下一页
+		boolean hasNext = false;
+		
+		String token = Util.null2String(HttpClientToJT.getToken());
+		
+		if (!"".equals(token)) {
+			String point = "1";// 数据最大位置点 默认从1开始
+			
+			Map<String, Object> requestParam = new HashMap<>();
+			requestParam.put("updateTime", dataTimeTs);
+			requestParam.put("size", size);
+			
+			List<String> languageList = new ArrayList<>();
+			if (dataType == SyncConstants.SyncDataType_Internal_Data) {
+				languageList.add("ZHS");
+			} else if (dataType == SyncConstants.SyncDataType_Overseas_Data) {
+				languageList.add("ENG");
+			} else if (dataType == SyncConstants.SyncDataType_Indonesia_Data) {
+				languageList.add("IDN");
+				// 部门国家编码
+				List<String> deptCountryCodes = new ArrayList<>();
+				deptCountryCodes.add("IDN");
+				requestParam.put("deptCountryCodes", deptCountryCodes);
+			}
+			
+			requestParam.put("languageCds", languageList);
+			
+			do {
+				requestParam.put("point", point);
+				
+				String result = HttpClientToJT.sendPost(requestURL, token, JSONObject.toJSONString(requestParam));
+				
+				// 接口返回信息转成JSON对象
+				JSONObject jsonObject = JSONObject.parseObject(result);
+				
+				// 获取成功失败标识符
+				String code = weaver.general.Util.null2String(jsonObject.get("code"));
+				
+				if ("1".equals(code)) {// 表示接口调用成功
+					JSONObject data = jsonObject.getJSONObject("data");
+					
+					// 是否有下一页
+					hasNext = data.getBoolean("hasNextPage");// 是否有下一页
+					
+					point = Util.null2String(data.getString("maxPoint"));// 下一页开始位置点
+					
+					JSONArray records = data.getJSONArray("records");
+					// 过滤未获取到数据
+					if (records != null) {
+						Object directSales = records.stream().filter(item -> {
+							JSONObject itemJson = JSONObject.parseObject(JSON.toJSONString(item));
+							
+							if (dataType == SyncConstants.SyncDataType_Internal_Data) {
+								return "CHN".equals(itemJson.getString("deptCountryCode")) && "ZHS".equals(itemJson.getString("languageCd"));
+							} else {
+								return true;
+							}
+						}).collect(Collectors.toList());
+						dataArray.addAll(JSONArray.parseArray(JSON.toJSONString(directSales)));
+					}
+				} else {
+					logHrm.writeLog("人员接口调用失败，失败信息:[" + jsonObject.toJSONString() + "]");
+				}
+			} while (hasNext);
+		} else {
+			logHrm.writeLog("获取Token信息失败！");
+		}
+		
+		return dataArray;
+	}
+	
+	
+	/**
+	 * 获取组织信息
+	 *
+	 * @param dateTimeTs 同步时间戳 （上一次同步时间戳）
+	 * @param dataType   数据类型 0：国内 1：海外 2：印尼
+	 * @param size       数据条数
+	 * @return 所有组织信息的JSONArray对象
+	 */
+	@SuppressWarnings("all")
+	public static JSONArray getDepartmentsByPoint(String dateTimeTs, int dataType, int size) {
+		// 新接口URL
+		String url = HttpClientToJT.baseUrl + getOrganizationURL;
+		logComm.writeLog("获取部门数据url-------->" + url);
+		JSONArray jsonArray = new JSONArray();
+		boolean hasNext = false;
+		// 获取token
+		String token = HttpClientToJT.getToken();
+		// 默认起始点
+		int point = 1;
+		// 接口请求参数集合
+		Map<String, Object> requestMap = new HashMap<>();
+		requestMap.put("updateTime", dateTimeTs);// 上次同步时间戳
+		requestMap.put("size", size);// 记录条数
+		
+		if (dataType == SyncConstants.SyncDataType_Overseas_Data) {
+			List<String> languageList = new ArrayList<>();
+			languageList.add("ZHS");
+			requestMap.put("languageCds", languageList);
+		} else if (dataType == SyncConstants.SyncDataType_Indonesia_Data) {
+			List<String> languageList = new ArrayList<>();
+			languageList.add("ZHS");
+			requestMap.put("languageCds", languageList);
+			requestMap.put("countryCode", "IDN");
+		}
+		
+		do {
+			try {
+				requestMap.put("point", point);
+				// 将map转成JSON格式字符串
+				String param = JSONObject.toJSONString(requestMap, SerializerFeature.DisableCircularReferenceDetect);
+				logComm.writeLog("获取组织数据传入参数param------------>" + param);
+				String s = HttpClientToJT.sendPost(url, token, param);
+				logDept.writeLog("组织数据返回结果------------>" + s);
+				JSONObject jsonObject = JSONObject.parseObject(s);
+				String code = Util.null2String(jsonObject.getString("code"));
+				logDept.writeLog("code------------>" + code);
+				if ("1".equals(code)) {
+					JSONObject result = jsonObject.getJSONObject("data");
+					// 是否有下一页
+					hasNext = result.getBoolean("hasNextPage");// 是否有下一页 b
+					point = Util.getIntValue(result.getString("maxPoint"), 0);// 下一页开始
+					
+					JSONArray records = result.getJSONArray("records");
+					// 判断不为空
+					if (records != null) {
+						// jsonArray.addAll(records);
+						// 对返回的数据进行过滤（只取国家编码=CHN 且语言编码=ZHS的记录）
+						Object directSales = records.stream().filter(item -> {
+							JSONObject itemJson = JSONObject.parseObject(JSON.toJSONString(item));
+							
+							if (dataType == SyncConstants.SyncDataType_Internal_Data) {
+								return "CHN".equals(itemJson.getString("countryCode")) && "ZHS".equals(itemJson.getString("languageCd"));
+							} else if (dataType == SyncConstants.SyncDataType_Overseas_Data) {
+								return !"CHN".equals(itemJson.getString("countryCode")) && !"IDN".equals(itemJson.getString("countryCode"));
+							} else if (dataType == SyncConstants.SyncDataType_Indonesia_Data) {
+								return "IDN".equals(itemJson.getString("countryCode"));
+							} else {
+								return false;
+							}
+						}).collect(Collectors.toList());
+						jsonArray.addAll(JSONArray.parseArray(JSON.toJSONString(directSales)));
+					}
+				} else {
+					hasNext = false;
+				}
+			} catch (Exception e) {
+				logDept.writeLog("获取组织接口报错，错误信息：" + e.getMessage());
+			}
+		} while (hasNext);
+		
+		return jsonArray;
+	}
+	
+	/**
+	 * 调用岗位接口获取接口返回信息
+	 *
+	 * @param dateTimeTs 时间戳
+	 * @param dataType   数据类型 0-国内 1-海外 2-印尼
+	 * @param size       每页数据条数
+	 * @return 接口返回信息
+	 */
+	@SuppressWarnings("unchecked")
+	public static Map<String, JSONArray> getJobTitleByPoint(String dateTimeTs, int dataType, int size) {
+		JSONArray jsonArray = new JSONArray();
+		Map<String, JSONArray> resultMap = new HashMap<>();
+		// 新接口URL
+		String url = HttpClientToJT.baseUrl + getJobTitleURL;
+		// 获取token
+		String token = HttpClientToJT.getToken();
+		
+		Map<String, Object> requestMap = new HashMap<>();
+		
+		requestMap.put("beginTime", dateTimeTs);
+		requestMap.put("size", size);
+		boolean hasNextPage = false;
+		String maxPoint = "1";
+		JSONArray totalResult = new JSONArray();
+		
+		do {
+			requestMap.put("point", maxPoint);
+			
+			// 将map转成字符串
+			String param = JSONObject.toJSONString(requestMap, SerializerFeature.DisableCircularReferenceDetect);
+			
+			// 调用接口，获取接口返回信息
+			String s = HttpClientToJT.sendPost(url, token, param);
+			
+			// 接口返回信息转成JSON对象
+			JSONObject jsonObject = JSONObject.parseObject(s);
+			
+			// 获取成功失败标志
+			String code = Util.null2String(jsonObject.getString("code"));
+			if ("1".equals(code)) {
+				JSONObject result = jsonObject.getJSONObject("data");
+				// 是否有下一页
+				hasNextPage = result.getBoolean("hasNextPage");
+				// 下一页开始
+				maxPoint = result.getString("maxPoint");
+				JSONArray records = result.getJSONArray("records");
+				// 过滤未获取到数据
+				if (records != null) {
+					totalResult.addAll(records);
+					// jsonArray.addAll(records);
+					Object directSales = jsonArray.stream().filter(item -> {
+						JSONObject itemJson = JSONObject.parseObject(JSON.toJSONString(item));
+						if (dataType == SyncConstants.SyncDataType_Internal_Data) {
+							return "ZHS".equals(itemJson.getString("languageCd"));
+						} else if (dataType == SyncConstants.SyncDataType_Overseas_Data) {
+							return !"CHN".equals(itemJson.getString("countryCode")) && !"IDN".equals(itemJson.getString("countryCode"));
+						} else if (dataType == SyncConstants.SyncDataType_Indonesia_Data) {
+							return "IDN".equals(itemJson.getString("countryCode"));
+						} else {
+							return false;
+						}
+					}).collect(Collectors.toList());
+					jsonArray.addAll(JSONArray.parseArray(JSON.toJSONString(directSales)));
+				}
+			} else {
+				hasNextPage = false;
+			}
+		} while (hasNextPage);
+		resultMap.put("filterResult", jsonArray);
+		resultMap.put("allResult", totalResult);
+		return resultMap;
+	}
+	
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/schedule/hrmNew/OverseasSync.java b/src/main/youhong_ai_jitu_src/jntchina/schedule/hrmNew/OverseasSync.java
new file mode 100644
index 0000000..e546d7f
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/schedule/hrmNew/OverseasSync.java
@@ -0,0 +1,68 @@
+package jntchina.schedule.hrmNew;
+
+import com.alibaba.fastjson.JSONArray;
+import jntchina.schedule.hrm.entity.DepartmentDto;
+import selfdev.util.log.LogTool;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 极兔集团
+ * 海外架构同步操作
+ */
+public class OverseasSync {
+
+    /**
+     * 部门日志操作
+     */
+    private static final LogTool logDept = new LogTool("/log/hrm/deptOC/", false);
+
+    /**
+     * 岗位日志操作
+     */
+    private static final LogTool logJob = new LogTool("/log/hrm/jobOC/", false);
+
+    /**
+     * 员工日志操作
+     */
+    private static final LogTool logHrm = new LogTool("/log/hrm/userOC/",false);
+
+
+    /**
+     * 组织同步
+     * @param lastTimeStamp 上一次同步时间戳
+     * @param currentDateTime 当前时间戳
+     */
+    @SuppressWarnings("unchecked")
+    private void syncOrganizationData(String lastTimeStamp,String currentDateTime){
+
+        //调用接口，获取组织信息
+        JSONArray dataArray = OrganizationUtil.getDepartmentsByPoint(lastTimeStamp,SyncConstants.SyncDataType_Overseas_Data,1000);
+
+
+        //将JSON数组转成对象集合
+        List<DepartmentDto> dataList = JSONArray.parseArray(dataArray.toJSONString(), DepartmentDto.class);
+
+
+        //分部数据
+        List<DepartmentDto> subCompanyList = dataList.stream().filter(item -> "10".equals(item.getOrganizationClass()) || "60".equals(item.getOrganizationClass())).collect(Collectors.toList());
+
+        //部门数据
+        List<DepartmentDto> departmentList = dataList.stream().filter(item -> !"10".equals(item.getOrganizationClass()) && !"60".equals(item.getOrganizationClass())).collect(Collectors.toList());
+
+
+        if(!dataList.isEmpty()){//接口返回的数据不为空
+
+            if(subCompanyList.size() > 0){//分部数据
+                logDept.writeLog("分部总记录条数：[" + subCompanyList.size() + "]");
+                OrganizationUtil.subCompanySyncDeal(subCompanyList,currentDateTime);
+            }
+
+            if(departmentList.size() > 0){//部门数据
+                logDept.writeLog("部门总记录条数：[" + subCompanyList.size() + "]");
+
+            }
+        }
+    }
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/schedule/hrmNew/SyncAllData.java b/src/main/youhong_ai_jitu_src/jntchina/schedule/hrmNew/SyncAllData.java
new file mode 100644
index 0000000..6a022f0
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/schedule/hrmNew/SyncAllData.java
@@ -0,0 +1,79 @@
+package jntchina.schedule.hrmNew;
+
+import selfdev.util.log.LogTool;
+import weaver.general.TimeUtil;
+import weaver.interfaces.schedule.BaseCronJob;
+
+
+/**
+ * 极兔集团
+ * 组织架构同步逻辑入口
+ */
+public class SyncAllData extends BaseCronJob {
+
+    /**
+     * 组织同步通用日志操作类
+     */
+    private static final LogTool logComm = new LogTool("/log/hrm/comm/", false);
+
+
+    /**
+     * 实现父类方法
+     */
+    @Override
+    public synchronized void execute() {
+        logComm.writeLog("---------------SyncAllData Begin--------------");
+        //国内逻辑处理
+        internalSync();
+        //海外逻辑处理
+
+        //印尼逻辑处理
+
+        logComm.writeLog("---------------SyncAllData End--------------");
+    }
+
+    /**
+     * 国内数据同步
+     */
+    private synchronized void internalSync(){
+        //获取上一次国内同步时间戳
+        String lastTimestamp = OrganizationUtil.getSyncTimestamp(SyncConstants.SyncDataType_Internal_Data);
+
+        //获取当前时间戳
+        String currentDateTime = TimeUtil.getCurrentTimeString();
+
+        logComm.writeLog("国内上一次同步时间戳:[" + lastTimestamp + "],当前时间戳:[" + currentDateTime + "]");
+
+        InternalSync internalSync = new InternalSync();
+
+        //同步组织
+        internalSync.syncOrganizationData(lastTimestamp,currentDateTime);
+
+        //同步岗位
+        internalSync.syncJobTitleData(lastTimestamp,currentDateTime);
+
+        //同步人员
+        internalSync.syncEmployeeData(lastTimestamp,currentDateTime);
+
+        //将当前时间戳写入到同步记录中
+        OrganizationUtil.updateSyncTimestamp(SyncConstants.SyncDataType_Internal_Data,currentDateTime);
+
+        logComm.writeLog("国内数据同步结束:[" + TimeUtil.getCurrentTimeString() + "]");
+    }
+
+
+    /**
+     * 海外数据同步
+     */
+    private synchronized void overseasSync(){
+        //获取上一次海外同步时间戳
+        String lastTimestamp = OrganizationUtil.getSyncTimestamp(SyncConstants.SyncDataType_Overseas_Data);
+
+        //获取当前时间戳
+        String currentDateTime = TimeUtil.getCurrentTimeString();
+
+        logComm.writeLog("海外上一次同步时间戳:[" + lastTimestamp + "],当前时间戳:[" + currentDateTime + "]");
+
+
+    }
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/schedule/hrmNew/SyncConstants.java b/src/main/youhong_ai_jitu_src/jntchina/schedule/hrmNew/SyncConstants.java
new file mode 100644
index 0000000..cb69501
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/schedule/hrmNew/SyncConstants.java
@@ -0,0 +1,22 @@
+package jntchina.schedule.hrmNew;
+
+/**
+ * 极兔集团
+ * 组织架构图常量
+ */
+public class SyncConstants {
+    /**
+     * 国内数据
+     */
+    public static final int SyncDataType_Internal_Data = 0;
+
+    /**
+     * 海外数据
+     */
+    public static final int SyncDataType_Overseas_Data = 1;
+
+    /**
+     * 印尼数据
+     */
+    public static final int SyncDataType_Indonesia_Data = 2;
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/service/LJL/LiShiYanGeAPI.java b/src/main/youhong_ai_jitu_src/jntchina/service/LJL/LiShiYanGeAPI.java
new file mode 100644
index 0000000..e3e35d2
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/service/LJL/LiShiYanGeAPI.java
@@ -0,0 +1,151 @@
+package jntchina.service.LJL;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import weaver.conn.RecordSet;
+
+import javax.ws.rs.FormParam;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import java.util.Map;
+
+/**
+ * @title: LiShiYanGeAPI
+ * @Author LJL
+ * @Date: 2021/11/10 14:01
+ * @Version 1.0
+ */
+
+@Path("/LJL")
+public class LiShiYanGeAPI {
+
+    /**
+     * 历史沿革
+     * 判断更改前和更改后是否一致  如果全部一致 那么将不会更改
+     *
+     * @param json
+     */
+    @Path("/PanDuan")
+    @Produces(MediaType.APPLICATION_JSON)
+    @POST
+    public String judge(@FormParam("data") String json){
+//        String js = "[" +
+//                "{'rq' : '2021-11-09','bgxm' : 'qymc','bgq':'极兔','bgh':'极兔2','fj':'','bz':'备注'}," +
+//                "{'rq' : '2021-11-09','bgxm' : 'gly','bgq':'1','bgh':'1','fj':'','bz':'备注'}]";
+
+
+
+        int TorF = 0;
+        String name = "";
+        JSONArray jo = JSONArray.parseArray(json);
+        for (int i = 0; i < jo.size(); i++) {
+            Map map = JSONObject.parseObject(JSONObject.toJSONString(jo.get(i)), Map.class);
+            if (map.get("bgxm").equals("企业名称变更前")) {
+                name = name + map.get("bgq");
+            }
+        }
+
+
+
+        for (int i = 0; i < jo.size(); i++) {
+            Map map = JSONObject.parseObject(JSONObject.toJSONString(jo.get(i)), Map.class);
+            Object bgq = map.get("bgq");
+            Object bgh = map.get("bgh");
+
+
+            if(!bgq.equals(bgh)){
+                RecordSet rs = new RecordSet();
+                RecordSet rs2 = new RecordSet();
+                String SQL = "insert into uf_jingneiqiyexinxi_dt1(rq,bgxm,bgq,bgh,fj,bz) values('" +
+                        map.get("rq") +
+                        "','" +map.get("bgxm")+
+                        "','" +bgq+
+                        "','" +bgh+
+                        "','" +map.get("fj")+
+                        "','" +map.get("bz")+
+                        "')";
+                rs.executeUpdate(SQL);
+                String SQL2 = "update uf_jingneiqiyexinxi SET "+getChinaName(map.get("bgxm"))+" = "+bgh+" where qymc = '"+name+"'";
+                rs2.executeUpdate(SQL2);
+                TorF++;
+
+            }
+        }
+        if(TorF>0) {
+            return "1";  //1是成功
+        }else{
+            return "没有需要更改的数据";  //其他的就是是失败
+        }
+
+
+    }
+
+    Object getChinaName(Object s) {
+        if (s.equals("管理员变更前")) {
+            s = "gly";
+        }
+        if (s.equals("企业名称变更前")) {
+            s = "qymc";
+        }
+        if (s.equals("曾用名变更前")) {
+            s = "zym";
+        }
+        if (s.equals("英文名变更前")) {
+            s = "ywm";
+        }
+        if (s.equals("成立日期变更前")) {
+            s = "clrq";
+        }
+        if (s.equals("社会信用代码变更前")) {
+            s = "shxydm";
+        }
+        if (s.equals("注册资本变更前")) {
+            s = "zczb";
+        }
+        if (s.equals("地址变更前")) {
+            s = "dz";
+        }
+        if (s.equals("经营范围变更前")) {
+            s = "jyfw";
+        }
+        if (s.equals("股权特殊安排变更前")) {
+            s = "gqtsap";
+        }
+        if (s.equals("股权安排附件变更前")) {
+            s = "gqapfj";
+        }
+        if (s.equals("法人代表变更前")) {
+            s = "frdb";
+        }
+        if (s.equals("财务负责人变更前")) {
+            s = "cwfzr";
+        }
+        if (s.equals("经理变更前")) {
+            s = "jl";
+        }
+        if (s.equals("监事变更前")) {
+            s = "js";
+        }
+        if (s.equals("董事变更前")) {
+            s = "ds";
+        }
+        if (s.equals("登记状态变更前")) {
+            s = "djzt";
+        }
+        if (s.equals("业务承载变更前")) {
+            s = "ywcz";
+        }
+        if (s.equals("是否为并表单位变更前")) {
+            s = "sfwbbdw";
+        }
+        if (s.equals("备案附件变更前")) {
+            s = "bafj";
+        }
+
+
+        return s;
+
+    }
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/service/ncc/NCCOrderValidateAction.java b/src/main/youhong_ai_jitu_src/jntchina/service/ncc/NCCOrderValidateAction.java
new file mode 100644
index 0000000..d22ae23
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/service/ncc/NCCOrderValidateAction.java
@@ -0,0 +1,192 @@
+package jntchina.service.ncc;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.serializer.SerializerFeature;
+import com.api.lh.port.AddJournal;
+import org.apache.commons.io.IOUtils;
+import selfdev.util.log.LogTool;
+import weaver.conn.RecordSet;
+import weaver.file.Prop;
+import weaver.general.Util;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.HttpHeaders;
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @ClassName NCCOrderValidateAction
+ * @Description 获取ncc采购订单号查询oa是否有在审批
+ * @Author louh
+ * @Date 2022/2/23 9:56
+ * @Version 1.0
+ */
+@Path("/NCCOrder")
+public class NCCOrderValidateAction {
+    @POST
+    @Path("/ValidateDocument")
+    @Produces({"application/json"})
+    public String deleteOrder(@Context HttpServletRequest request, @Context HttpServletResponse response, @Context HttpHeaders headers) {
+        LogTool log = new LogTool("/log/lh/rest/ncc", false);
+        Map<String, Object> map_return = new HashMap<>();
+        List<Map<String, String>> list = new ArrayList<>();
+        String allmsg = "";
+        String allstutas = "1";
+        String body ="";
+        try {
+            //获取配置文件中的参数
+            String mode = Prop.getPropValue("DevToNCC_jntchina", "mode");
+            //或配置文件中维护的准入码
+            String AccessCode_p = Prop.getPropValue("DevToNCC_jntchina", mode + "_AccessCode");
+            //header中没有AccessCode参数
+            if (headers.getRequestHeader("AccessCode") == null || headers.getRequestHeader("AccessCode").size() == 0) {
+                allstutas = "0";//状态
+                allmsg = "请在header中传入准入码AccessCode参数";//返回信息
+                map_return.put("allstatus", allstutas);
+                map_return.put("allmsg", allmsg);
+                return JSON.toJSONString(map_return);
+            }
+            List<String> accessCode = headers.getRequestHeader("AccessCode");
+            //准入码
+            String AccessCode = accessCode.get(0);
+            log.writeLog("AccessCode------>" + AccessCode);
+            if ("".equals(AccessCode)) {
+                allstutas = "0";//状态
+                allmsg = "header中准入码AccessCode参数不可为空";//返回信息
+                map_return.put("allstatus", allstutas);
+                map_return.put("allmsg", allmsg);
+                return JSON.toJSONString(map_return);
+            }
+            if (!AccessCode_p.equals(AccessCode)) {
+                allstutas = "0";//状态
+                allmsg = "header中传入的准入码【" + AccessCode + "】无效，请联系OA管理员提供正确的准入码";//返回信息
+                map_return.put("allstatus", allstutas);
+                map_return.put("allmsg", allmsg);
+                return JSON.toJSONString(map_return);
+            }
+            //获取body内容,设置UTF-8格式
+            BufferedReader reader = new BufferedReader(new InputStreamReader(request.getInputStream(), "UTF-8"));
+            //过滤前后空格
+            body = IOUtils.toString(reader).trim();
+            log.writeLog("body----->" + body);
+            if ("".equals(body)) {
+                allstutas = "0";//状态
+                allmsg = "body中请传入JSON格式数据";//返回信息
+                map_return.put("allstatus", allstutas);
+                map_return.put("allmsg", allmsg);
+                String s = JSON.toJSONString(map_return, SerializerFeature.DisableCircularReferenceDetect);
+                AddJournal.addInfo("获取ncc采购订单号查询oa是否有在审批", body, s, "1", "/NCCOrder/ValidateDocument", null);
+                return s;
+            }
+            JSONArray jsonArray = null;
+            try {
+                //解析JOSN字符串
+                jsonArray = JSONObject.parseArray(body);
+            } catch (Exception e) {
+                allstutas = "0";//状态
+                allmsg = "body中传入的数据格式初始化异常，请检查数据为JSON格式";//返回信息
+                map_return.put("allstatus", allstutas);
+                map_return.put("allmsg", allmsg);
+                String s = JSON.toJSONString(map_return, SerializerFeature.DisableCircularReferenceDetect);
+                AddJournal.addInfo("获取ncc采购订单号查询oa是否有在审批", body, s, "1", "/NCCOrder/ValidateDocument", null);
+                return s;
+            }
+
+
+            RecordSet rs = new RecordSet();
+            //数据条数
+            int size = jsonArray.size();
+            for (int k = 0; k < size; k++) {
+                String msg = "";
+                Map<String, String> map_detail = new HashMap<String, String>();
+                //获取每条流程的数据
+                JSONObject item = jsonArray.getJSONObject(k);
+                String podh = item.getString(Util.null2String("Podh"));/* 采购订单号 */
+                String company_code = item.getString(Util.null2String("company_code")); /* 公司编码 */
+                String supplier_code = item.getString(Util.null2String("supplier_code")); /* 供应商编码 */
+                String prepay = item.getString(Util.null2String("prepay"));  /* 0:预付单, 1:应付单*/
+                String operation_msg = item.getString(Util.null2String("operation_msg")); /* 操作信息详情 */
+                if (null == podh || "".equals(podh)) {
+                    msg = "采购单号【Podh】不允许为空!";
+                    map_detail.put("msg", msg);
+                    map_detail.put("status", "0");
+                    allstutas = "0";
+                    allmsg += msg;
+                    list.add(map_detail);
+                    continue;
+                }
+                log.writeLog("**********podh【" + podh + "】*******************");
+                map_detail.put("podh", podh);
+                if (null == supplier_code || "".equals(supplier_code)) {
+                    msg = "供应商编码【supplier_code】不允许为空!";
+                    map_detail.put("msg", msg);
+                    map_detail.put("status", "0");
+                    allstutas = "0";
+                    allmsg += msg;
+                    list.add(map_detail);
+                    continue;
+                }
+                if (null == company_code || "".equals(company_code)) {
+                    msg = "公司编码【company_code】不允许为空!";
+                    map_detail.put("msg", msg);
+                    map_detail.put("status", "0");
+                    allstutas = "0";
+                    allmsg += msg;
+                    list.add(map_detail);
+                    continue;
+                }
+                map_detail.put("company_code", company_code);
+                String sql = "select lcbh,requestid from cgddcx20220429 where cgddh = '" + podh + "' and gsmc ='" + company_code + "' and podhname = '" + prepay + "' and gysmc = '" + supplier_code + "' and stutas not in (0,3)";
+                log.writeLog("查询当前单号是否在审批中sql----> " + sql);
+                rs.execute(sql);
+                String requestid = "";
+                String lcbh = "";
+                if (rs.next()) {
+                    requestid = Util.null2String(rs.getString("requestid"));  //获取改单号requestid
+                    lcbh = Util.null2String(rs.getString("lcbh"));  /* 流程编号 */
+                } else {
+                    msg = "该【" + company_code + "】公司【" + podh + "】此单号并未采用!";
+                    map_detail.put("msg", msg);
+                    map_detail.put("status", "1");
+                    //allstutas = "0";
+                    allmsg += msg;
+                    list.add(map_detail);
+                    continue;
+                }
+                msg = "该【" + podh + "】单号OA在审批中,对应的审批流程requestid为【" + requestid + "】,流程编号为【" + lcbh + "】不允许操作!";
+                map_detail.put("msg", msg);
+                map_detail.put("status", "0");
+                allstutas = "0";
+                allmsg += msg;
+                list.add(map_detail);
+            }
+        } catch (Exception e) {
+            log.writeLog("接口异常,错误信息: " + e.getMessage());
+            allstutas = "0";//状态
+            allmsg = "接口异常，错误信息：" + e.toString();//返回信息
+        }
+        map_return.put("allstatus", allstutas);
+        map_return.put("allmsg", allmsg);
+        map_return.put("detail", list);
+
+        //SerializerFeature.DisableCircularReferenceDetect 消除对同一对象循环引用的问题
+        String result = JSON.toJSONString(map_return, SerializerFeature.DisableCircularReferenceDetect);
+        if(allstutas.equals("1")){
+            AddJournal.addInfo("获取ncc采购订单号查询oa是否有在审批", body, result, "0", "/NCCOrder/ValidateDocument", null);
+        }else{
+            AddJournal.addInfo("获取ncc采购订单号查询oa是否有在审批", body, result, "1", "/NCCOrder/ValidateDocument", null);
+        }
+        return result;
+    }
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/service/ncc/NCCServiceAction.java b/src/main/youhong_ai_jitu_src/jntchina/service/ncc/NCCServiceAction.java
new file mode 100644
index 0000000..5eadd3b
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/service/ncc/NCCServiceAction.java
@@ -0,0 +1,273 @@
+package jntchina.service.ncc;
+
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.HttpHeaders;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.serializer.SerializerFeature;
+
+import weaver.conn.RecordSet;
+import weaver.file.Prop;
+import weaver.general.Util;
+import weaver.soa.workflow.request.RequestService;
+
+import selfdev.util.log.LogTool;
+/**
+ * 接收NCC状态接口
+ * @author KangMD
+ * 2021-01-13
+ */
+
+@SuppressWarnings("SuspiciousMethodCalls")
+@Path("/NCC")
+public class NCCServiceAction {
+	@POST
+	@Path("/ReceivePaymentStatus")
+	@Produces({"application/json"})
+	public String receivePaymentStatus(@Context HttpServletRequest request, @Context HttpServletResponse response,@Context HttpHeaders headers){
+		LogTool log=new LogTool("/log/selfdev/rest/ncc", false);
+		String allstatus="1";//状态
+		String allmsg="";//返回信息
+		Map<String,Object> map_return=new HashMap<String,Object>();
+		List<Object> list_detail=new ArrayList<Object>();
+		try{
+			//获取配置文件中的参数
+			String mode = Prop.getPropValue("DevToNCC_jntchina","mode");
+			//或配置文件中维护的准入码
+			String AccessCode_p = Prop.getPropValue("DevToNCC_jntchina",mode+"_AccessCode");
+			
+			//header中没有AccessCode参数
+			if(headers.getRequestHeader("AccessCode")==null||headers.getRequestHeader("AccessCode").size()==0){
+				allstatus="0";//状态
+				allmsg="请在header中传入准入码AccessCode参数";//返回信息
+				map_return.put("allstatus", allstatus);
+				map_return.put("allmsg", allmsg);
+				return JSON.toJSONString(map_return);
+			}
+			List<String> AccessCodeList= headers.getRequestHeader("AccessCode");
+			//准入码
+			String AccessCode=AccessCodeList.get(0);
+			log.writeLog("AccessCode------>"+AccessCode);
+			if("".equals(AccessCode)){
+				allstatus="0";//状态
+				allmsg="header中准入码AccessCode参数不可为空";//返回信息
+				map_return.put("allstatus", allstatus);
+				map_return.put("allmsg", allmsg);
+				return JSON.toJSONString(map_return);
+			}
+			if(!AccessCode_p.equals(AccessCode)){
+				allstatus="0";//状态
+				allmsg="header中传入的准入码【"+AccessCode+"】无效，请联系OA管理员提供正确的准入码";//返回信息
+				map_return.put("allstatus", allstatus);
+				map_return.put("allmsg", allmsg);
+				return JSON.toJSONString(map_return);
+			}
+			
+			//获取body内容,设置UTF-8格式
+			BufferedReader reader = new BufferedReader(new InputStreamReader(request.getInputStream(),"UTF-8"));
+			//过滤前后空格
+	        String body =org.apache.commons.io.IOUtils.toString(reader).trim();
+	        log.writeLog("body----->"+body);
+	        if("".equals(body)){
+				allstatus="0";//状态
+				allmsg="body中请传入JSON格式数据";//返回信息
+				map_return.put("allstatus", allstatus);
+				map_return.put("allmsg", allmsg);
+				return JSON.toJSONString(map_return);
+			}
+	        JSONArray jsonArray=new JSONArray();
+			try{
+				//由于支持一次性触发多个流程，故传入的JSON格式为数组，需要以中括号[ ]开头及结尾
+				if(!body.startsWith("[")){
+					body="["+body;
+				}
+				if(!body.endsWith("]")){
+					body=body+"]";
+				}
+				//解析JOSN字符串
+				jsonArray = JSONObject.parseArray(body);
+			}catch (Exception e) {
+				allstatus="0";//状态
+				allmsg="body中传入的数据格式初始化异常，请检查数据为JSON格式";//返回信息
+				map_return.put("allstatus", allstatus);
+				map_return.put("allmsg", allmsg);
+				return JSON.toJSONString(map_return);
+			}
+			RecordSet rs=new RecordSet();
+			RequestService requestService=new RequestService();
+			//数据条数
+        	int size=jsonArray.size();
+        	for(int k=0;k<size;k++){
+        		Map<String,String> map_detail=new HashMap<String, String>();
+				//获取每条流程的数据
+        		JSONObject item=jsonArray.getJSONObject(k);
+        		String requestid=Util.null2String(item.getString("requestid"));//
+        		String status=Util.null2String(item.getString("status"));//1表示付款成功，0表示退单
+        		String paydate=Util.null2String(item.getString("paydate"));//实际付款日期
+        		String rejecttype=Util.null2o(item.getString("rejecttype"));//退回状态
+        		String msg=Util.null2String(item.getString("msg"));//提示信息
+				String isOverseas = "0";//是否海外 0:否  1:是
+
+				if(item.containsKey("isOverseas")){
+					isOverseas = Util.null2String(item.getString("isOverseas"));
+				}
+
+        		map_detail.put("requestid", requestid);
+        		if("".equals(requestid)){
+        			msg="requestid不可为空。";
+        			map_detail.put("status", "0");
+					map_detail.put("msg", msg);
+					allstatus="0";//状态
+					allmsg+=msg;
+					list_detail.add(map_detail);
+					continue;
+        		}
+        		if(!requestid.matches("[0-9]+")){
+        			msg="传入requestid必须是整数数字。";
+        			map_detail.put("status", "0");
+					map_detail.put("msg", msg);
+					allstatus="0";//状态
+					allmsg+=msg;
+					list_detail.add(map_detail);
+					continue;
+        		}
+        		
+//        		String workflowid="";//
+        		String nodeid="";//当前节点ID
+        		String nodename="";//当前节点名称
+        		String userid="";//当前节点操作者
+        		String tablename="";//表名
+        		String sql="select a.requestid,a.workflowid,a.currentnodeid,d.nodename,c.tablename  ";
+        		sql+="from workflow_requestbase a,workflow_base b,workflow_bill c,workflow_nodebase d  ";
+        		sql+="where a.workflowid=b.id and b.formid=c.id and a.currentnodeid=d.id and a.requestid="+requestid;
+        		rs.execute(sql);
+        		int row=rs.getCounts();
+        		if(row==0){
+        			msg="传入requestid【"+requestid+"】未找到对应的OA流程，请核对requestid是否正确。";
+        			map_detail.put("status", "0");
+					map_detail.put("msg", msg);
+					allstatus="0";//状态
+					allmsg+=msg;
+					list_detail.add(map_detail);
+					continue;
+        		}
+        		while(rs.next()){
+//        			workflowid=Util.null2String(rs.getString("workflowid"));
+        			nodeid=Util.null2String(rs.getString("currentnodeid"));
+        			tablename=Util.null2String(rs.getString("tablename"));
+        			nodename=Util.null2String(rs.getString("nodename"));
+        		}
+        		if(!nodename.contains("等待")){
+        			msg="OA流程requestid【"+requestid+"】当前处于【"+nodename+"】节点，只有处于【等待NCC审核】的OA流程才可接收NCC接口返回数据，请联系OA管理员核实当前流程节点情况。";
+        			map_detail.put("status", "0");
+					map_detail.put("msg", msg);
+					allstatus="0";//状态
+					allmsg+=msg;
+					list_detail.add(map_detail);
+					continue;
+        		}
+				//查询当前流程节点操作者
+				String sql2="SELECT * FROM workflow_currentoperator WHERE requestid="+requestid+" AND isremark=0 AND nodeid="+nodeid;
+				rs.execute(sql2);
+				//若此节点有多个操作者时，取第一行即可，故用if
+				if(rs.next()){
+					userid=Util.null2String(rs.getString("userid"));
+				}
+				log.writeLog("**********requestid【"+requestid+"】、nodeid【"+nodeid+"】、userid【"+userid+"】**********");
+				
+				map_detail.put("requestid", requestid);
+				if("1".equals(status)||"2".equals(status)){//付款成功或者全额核销
+
+					String updateSQL = "update "+tablename+" set nccfkzt='"+status+"',nccsjfkrq='"+paydate+"',nccfhxx='"+msg.replace("'", "''")+"' where requestid="+requestid;
+
+	        		String remark="NCC已于"+paydate+"付款成功";
+	        		if("2".equals(status)){
+	        			remark="NCC已核销成功";
+	        		}
+
+					if("1".equals(isOverseas)){//若为海外
+						//1：审核完成 2：付款完成
+						if("1".equals(status)){
+							remark = "NCC已于" + paydate + "审核完成";
+							updateSQL = "update " + tablename + " set nccAuditStatus = " + status + ",nccAuditDate = '" + paydate + "',nccAuditRemark = '" + msg.replace("'","''") + "' where requestId = " + requestid;
+						} else {
+							String paymentCode = "";
+							if(item.containsKey("paymentCode")){
+								paymentCode = Util.null2String(item.get("paymentCode"));
+							}
+							remark = "NCC已于" + paydate + "付款完成";
+							updateSQL = "update " + tablename + " set nccfkzt='" + status + "',nccsjfkrq = '"+paydate + "',nccfhxx = '" + msg.replace("'", "''") + "',nccfkdh='" + paymentCode + "' where requestId = "+requestid;
+						}
+					}
+
+					//将NCC结果更新至流程表单字段中
+					rs.executeUpdate(updateSQL);
+
+					boolean flag2=requestService.nextNodeBySubmit(null, Integer.parseInt(requestid), Integer.parseInt(userid), remark);
+					log.writeLog("**********requestid【"+requestid+"】流程提交状态**********"+flag2);
+					if(flag2){
+						if("1".equals(isOverseas) && "1".equals(status)){
+							msg = "OA已接收NCC传入的审核状态,OA流程requestid【" + requestid + "】已成功流转至下一个节点";
+						}else {
+							msg = "OA已接收NCC传入的付款状态,OA流程requestid【" + requestid + "】已成功流转至下一个节点";
+						}
+						map_detail.put("status", "1");
+						map_detail.put("msg", msg);
+					}else{
+						msg="OA流程requestid【"+requestid+"】流转至下一个节点失败，请联系OA管理员检查流程设置。";
+						map_detail.put("status", "0");
+						map_detail.put("msg", msg);
+						allstatus="0";//状态
+						allmsg+=msg;
+					}
+        		}else{
+        			boolean flag2=requestService.nextNodeByReject(Integer.parseInt(requestid), Integer.parseInt(userid), msg);
+        			log.writeLog("**********requestid【"+requestid+"】流程退回状态**********"+flag2);
+        			if(flag2){
+						String updateSQL = "update "+tablename+" set nccfkzt='"+status+"',sfcgscnccfkd = null, nccfkdh = '',ncctdhzctjlz='"+rejecttype+"',nccfhxx='"+msg.replace("'", "''")+"' where requestid="+requestid;
+
+        				//将NCC结果更新至流程表单字段中(清空上一次的NCC付款单号以及付款单状态)
+    	        		rs.executeUpdate(updateSQL);
+						map_detail.put("status", "1");
+						map_detail.put("msg", "OA已接收NCC传入的付款状态,OA流程requestid【"+requestid+"】已退回至申请人补充资料节点");
+					}else{
+						//将NCC结果更新至流程表单字段中(清空上一次的NCC付款单号以及付款单状态)
+		        		rs.execute("update "+tablename+" set nccfkzt='"+status+"',ncctdhzctjlz='"+rejecttype+"',nccfhxx='"+msg.replace("'", "''")+"' where requestid="+requestid);
+						msg="OA流程requestid【"+requestid+"】退回至申请人补充资料节点失败，请联系OA管理员检查流程设置。";
+						map_detail.put("status", "0");
+						map_detail.put("msg", msg);
+						allstatus="0";//状态
+						allmsg+=msg;
+					}
+        		}
+				list_detail.add(map_detail);
+        	}
+		}catch (Exception e) {
+			log.writeLog("接口异常，错误信息：" + e.toString());
+			allstatus="0";//状态
+			allmsg="接口异常，错误信息："+e.toString();//返回信息
+		}
+		map_return.put("allstatus", allstatus);
+		map_return.put("allmsg", allmsg);
+		map_return.put("detail", list_detail);
+		
+		String returnMsg=JSON.toJSONString(map_return, SerializerFeature.DisableCircularReferenceDetect);
+		
+		log.writeLog("**********returnMsg**********"+returnMsg);
+		return returnMsg;
+	}
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/service/oa/ChangeDt1.java b/src/main/youhong_ai_jitu_src/jntchina/service/oa/ChangeDt1.java
new file mode 100644
index 0000000..cbf1187
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/service/oa/ChangeDt1.java
@@ -0,0 +1,459 @@
+package jntchina.service.oa;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.engine.portal.entity.Select;
+import jntchina.service.oa.util.ModifyDetailInfo;
+import jntchina.util.DataBaseUtils;
+import selfdev.util.log.LogTool;
+import weaver.conn.RecordSet;
+import weaver.general.Util;
+
+import java.util.*;
+
+/**
+ * @title: 改变明细表
+ * @author ycf
+ * @date 2022-02-04
+ */
+public class ChangeDt1 {
+    private final LogTool log = new LogTool("/log/api/aa/", false);
+
+
+    public void ChangeDetail(String qyid,String changeBillId) {
+        log.writeLog("企业id:"+qyid);
+
+        log.writeLog("-------------------------------------登记股东---------------------------------:");
+        ModifyDetailInfo modifyDetailInfo=
+                new ModifyDetailInfo("djgd,cgbl,cgfs,gfzl,bz",
+                        "uf_jnqyxxbgb_dt1",
+                        "uf_jnqyxxbgb_dt2",
+                        Integer.parseInt(DataBaseUtils.getModelIdByName("uf_jingneiqiyexinxi")) ,
+                        Integer.parseInt(changeBillId),
+                        qyid);
+        modifyDetailInfo.setDtailJson();
+
+
+
+        String sql = "";
+        RecordSet recordSet = new RecordSet();
+
+
+        Map<String, Object> bgMap = new TreeMap<>(String::compareTo);
+        JSONObject jsonObject = modifyDetailInfo.getJsonVersion();
+        log.writeLog("获取的json:"+jsonObject.toString());
+
+//        log.writeLog("附件:"+modifyDetailInfo.getChangeFjJson());
+//
+//        log.writeLog("备注:"+modifyDetailInfo.getChangeRemarkJson());
+
+
+
+
+        for (Object date : jsonObject.keySet()) {
+            JSONObject parseObject = JSONObject.parseObject(jsonObject.getString(date.toString()));
+            HashMap<String, Object> map = new HashMap<>();
+            map.put("date", parseObject.getJSONArray("data"));
+            map.put("bgqstr", parseObject.getString("oldrowDesc"));
+            map.put("bghstr", parseObject.getString("rowDesc"));
+            map.put("fj", strNull(parseObject.getString("fj")));
+            map.put("bz", strNull(parseObject.getString("bz")));
+
+            bgMap.put(String.valueOf(date), map);
+        }
+
+        log.writeLog("变更集合:"+bgMap);
+
+        for (String bbrq : bgMap.keySet()) {
+            HashMap<String, Object> map = (HashMap<String, Object>) bgMap.get(bbrq);
+            String bgqstr = map.get("bgqstr").toString().replace("/、","、");
+            String bghstr = map.get("bghstr").toString().replace("/、","、");
+            String fj = map.get("fj").toString();
+            String bz = map.get("bz").toString();
+            if ("".equals(bgqstr)) {
+                bgqstr = "无";
+            }
+            log.writeLog("变更前:"+bgqstr);
+
+            String versionId = SynDate(qyid, bbrq);
+
+            String bghListStr = map.get("date").toString();
+
+            ArrayList<Map<String, String>> gqList = new ArrayList<>();
+            JSONArray jsonArray = JSONArray.parseArray(bghListStr);
+            for (int i = 0; i < jsonArray.size(); i++) {
+                HashMap<String, String> map1 = new HashMap<>();
+                map1.put("cgbl", strNull(JSONObject.parseObject(String.valueOf(jsonArray.get(i))).getString("cgbl")));
+                map1.put("gfzl", strNull(JSONObject.parseObject(String.valueOf(jsonArray.get(i))).getString("gfzl")));
+                map1.put("mainbillid", strNull(JSONObject.parseObject(String.valueOf(jsonArray.get(i))).getString("mainbillid")));
+                map1.put("bbrq", strNull(JSONObject.parseObject(String.valueOf(jsonArray.get(i))).getString("bbrq")));
+                map1.put("djgd", strNull(JSONObject.parseObject(String.valueOf(jsonArray.get(i))).getString("djgd")));
+                map1.put("cgfs", strNull(JSONObject.parseObject(String.valueOf(jsonArray.get(i))).getString("cgfs")));
+                map1.put("bz", strNull(JSONObject.parseObject(String.valueOf(jsonArray.get(i))).getString("bz")));
+                map1.put("isChange", strNull(JSONObject.parseObject(String.valueOf(jsonArray.get(i))).getString("isChange")));
+                map1.put("uuid", UUID.randomUUID().toString().replace("-", ""));
+//                map.put("isChange", strNull(parseObject.getString("isChange")));
+                gqList.add(map1);
+            }
+
+//            sql = "delete from formtable_main_3055_DT1 where mainid = '"+versionId+"' and rq = '"+bbrq+"' and bgxm = '登记股东/持股比例/持股份数/股份种类'";
+//            log.writeLog("删除当日的变更项目:"+sql);
+//            recordSet.execute(sql);
+            //当日版本添加历史沿革
+            sql = "insert into formtable_main_3055_DT1 (MAINID, RQ, BGXM, BGQ, BGH, FJ, BZ)\n" +
+                    "values ('"+versionId+"','"+bbrq+"','登记股东/持股比例/持股份数/股份种类','"+bgqstr+"'," +
+                    "'"+bghstr+"','"+fj+"','"+bz+"')";
+            log.writeLog("插入历史沿革:"+sql+"\n"+ recordSet.execute(sql));
+
+
+            /*
+            判断之后是否有版本
+               有版本:
+                   判断版本是否变更股权
+                   有变更:
+                       (更新到有变更的表，有变更的表的变更前要更新)  ---历史沿革新增
+                   没有变更:
+                      (更新之后版本所有的表，企业信息表)    ---历史沿革新增
+               没有版本:
+                   (更新当前版本表，更新企业表)   ---历史沿革新增
+             */
+
+            sql = "select ID\n" +
+                    "from formtable_main_3055 where bbrq > '" + bbrq + "' and qyid = " + qyid +" order by bbrq";
+            log.writeLog("获取之后版本的id:"+sql);
+            ArrayList<Map<String, String>> afterIdList = DataBaseUtils.getDataList(sql);
+            log.writeLog("之后版本的id:"+ Arrays.toString(afterIdList.toArray()));
+
+            boolean isupdatemaintable = true;
+            boolean hasbb = afterIdList.size() > 0;
+
+//            if (!hasbb) {
+//                sql = "delete from uf_jingneiqiyexinxi where mainid = " + qyid;
+//                log.writeLog("删除股东:"+sql);
+//                recordSet.execute(sql);
+//            }
+
+            //删除当日的所有的股东
+            sql = "delete from formtable_main_3055_dt2 where mainid = " + versionId;
+            log.writeLog("删除当日股东:"+sql);
+            recordSet.execute(sql);
+
+
+            //往当前版本插入数据
+            for (Map<String, String> gqmap : gqList) {
+
+                if (gqmap.get("isChange").equals("1")) {
+                    if ("".equals(gqmap.get("mainbillid"))&&bbrq.equals(gqmap.get("bbrq"))) {
+                        log.writeLog("mainbillid为空，新增1:");
+
+                        sql = "insert into uf_jingneiqiyexinxi_dt2 (MAINID, CGBL, BZ, QYMC1, GFZL, DJGD, MODFLYUUID, CGFS) values " +
+                                "('"+qyid+"','"+gqmap.get("cgbl")+"','"+gqmap.get("bz")+"','"+qyid+"'" +
+                                ",'"+gqmap.get("gfzl")+"','"+gqmap.get("djgd")+"','"+gqmap.get("uuid")+"','"+gqmap.get("cgfs")+"') ";
+                        log.writeLog("插入企业信息表:"+sql);
+                        recordSet.execute(sql);
+                        sql = "select id from uf_jingneiqiyexinxi_dt2 where MODFLYUUID = '" + gqmap.get("uuid") + "'";
+                        String mainbillid = DataBaseUtils.getFirstValue(sql);
+                        sql = "insert into formtable_main_3055_dt2 (MAINID, CGBL, BZ, QYMC1, GFZL, DJGD, mainbillid, CGFS) values " +
+                                "('"+versionId+"','"+gqmap.get("cgbl")+"','"+gqmap.get("bz")+"','"+qyid+"'" +
+                                ",'"+gqmap.get("gfzl")+"','"+gqmap.get("djgd")+"','"+mainbillid+"','"+gqmap.get("cgfs")+"') ";
+                        log.writeLog("添加新增的股东:"+sql);
+                        recordSet.execute(sql);
+                    } else if (!"".equals(gqmap.get("mainbillid"))){
+                        log.writeLog("mainid不为空更新:"+gqmap.get("mainbillid"));
+//                    sql = "update formtable_main_3055_dt2 set CGBL = '"+gqmap.get("cgbl")+"' ,BZ = '"+gqmap.get("bz")+"'" +
+//                            ", GFZL = '"+gqmap.get("gfzl")+"', DJGD = '"+gqmap.get("djgd")+"' ,CGFS = '"+gqmap.get("cgfs")+"' " +
+//                            " where mainid = '"+versionId+"' and mainbillid =  '"+gqmap.get("mainbillid")+"'";
+
+
+                        sql = "insert into formtable_main_3055_dt2 (MAINID, CGBL, BZ, QYMC1, GFZL, DJGD, MODFLYUUID, CGFS,mainbillid) values " +
+                                "('"+versionId+"','"+gqmap.get("cgbl")+"','"+gqmap.get("bz")+"','"+qyid+"'" +
+                                ",'"+gqmap.get("gfzl")+"','"+gqmap.get("djgd")+"','"+gqmap.get("uuid")+"','"+gqmap.get("cgfs")+"','"+gqmap.get("mainbillid")+"') ";
+
+                        log.writeLog("当前股东的mainbillid存在，更新:"+sql);
+
+                        recordSet.execute(sql);
+                    }
+                }
+
+            }
+
+            //有之后的版本
+            if (afterIdList.size() > 0) {
+                //判断之后版本是否变更股权
+                for (Map<String, String> idMap : afterIdList) {
+                    String afterId = idMap.get("ID");
+                    sql = "select id from formtable_main_3055_DT1 where mainid = "+afterId+" and bgxm = '登记股东/持股比例/持股份数/股份种类'";
+                    log.writeLog("获取有变更股东的企业:"+sql);
+
+                    String bgid = DataBaseUtils.getFirstValue(sql);
+                    /*
+                    有变更:
+                       (更新到有变更的表，有变更的表的变更前要更新)
+                   没有变更:
+                      (更新之后版本所有的表，企业信息表)
+                     */
+                    if ("".equals(DataBaseUtils.strNull(bgid))) {
+                        //重新添加
+                        for (Map<String, String> gqmap : gqList) {
+                            if (gqmap.get("isChange").equals("1")) {
+                                if ("".equals(gqmap.get("mainbillid"))&&bbrq.equals(gqmap.get("bbrq"))) {
+                                    log.writeLog("mainbillid为空，版本日期相同新增2:");
+
+                                    sql = "select id from uf_jingneiqiyexinxi_dt2 where MODFLYUUID = '" + gqmap.get("uuid") + "'";
+                                    String mainbillid = DataBaseUtils.getFirstValue(sql);
+                                    sql = "insert into formtable_main_3055_dt2 (MAINID, CGBL, BZ, QYMC1, GFZL, DJGD, mainbillid, CGFS) values " +
+                                            "('"+afterId+"','"+gqmap.get("cgbl")+"','"+gqmap.get("bz")+"','"+qyid+"'" +
+                                            ",'"+gqmap.get("gfzl")+"','"+gqmap.get("djgd")+"','"+mainbillid+"','"+gqmap.get("cgfs")+"') ";
+                                    log.writeLog("添加新增的股东:"+sql);
+                                    recordSet.execute(sql);
+                                } else if (!"".equals(gqmap.get("mainbillid"))){
+                                    log.writeLog("更新:"+gqmap.get("mainbillid"));
+//                                sql = "update formtable_main_3055_dt2 set CGBL = '"+gqmap.get("cgbl")+"', BZ = '"+gqmap.get("bz")+"'," +
+//                                        " GFZL = '"+gqmap.get("gfzl")+"', DJGD = '"+gqmap.get("djgd")+"', CGFS = '"+gqmap.get("cgfs")+"' " +
+//                                        " where mainid = '"+afterId+"' and mainbillid =  '"+gqmap.get("mainbillid")+"'";
+
+
+
+                                    sql = "insert into formtable_main_3055_dt2 (MAINID, CGBL, BZ, QYMC1, GFZL, DJGD, mainbillid, CGFS) values " +
+                                            "('"+afterId+"','"+gqmap.get("cgbl")+"','"+gqmap.get("bz")+"','"+qyid+"'" +
+                                            ",'"+gqmap.get("gfzl")+"','"+gqmap.get("djgd")+"','"+gqmap.get("mainbillid")+"','"+gqmap.get("cgfs")+"') ";
+
+                                    log.writeLog("当前股东的mainbillid存在，更新:"+sql);
+
+                                    recordSet.execute(sql);
+                                }
+                            }
+
+                        }
+                    } else {
+
+                        log.writeLog("当前版本存在股权变更:-----====");
+
+                        sql = "update formtable_main_3055_DT1 set bgq ='"+bghstr+"' where id = " + bgid;
+                        log.writeLog("更新版本的历史沿革的变更前:"+sql+"\n"+recordSet.execute(sql));
+
+                        for (Map<String, String> gqMap : gqList) {
+
+                            if ("".equals(gqMap.get("mainbillid"))&&bbrq.equals(gqMap.get("bbrq"))) {
+                                sql = "delete from uf_jingneiqiyexinxi_dt2  where modflyuuid = '" + gqMap.get("uuid") + "'";
+                                //更新为空
+                                log.writeLog("清空企业表的股权:"+sql);
+
+                                recordSet.execute(sql);
+                            }
+                        }
+
+                        //后续有变更，不忘企业表中添加
+                        isupdatemaintable = false;
+                        break;
+                    }
+                }
+            }
+
+
+            if (isupdatemaintable) {
+                //往当前版本更新数据
+                for (Map<String, String> gqmap : gqList) {
+
+                    if (!"".equals(gqmap.get("mainbillid"))){
+                        log.writeLog("mainid不为空更新:"+gqmap.get("mainbillid"));
+                        sql = "update uf_jingneiqiyexinxi_dt2 set CGBL = '"+gqmap.get("cgbl")+"' ,BZ = '"+gqmap.get("bz")+"'" +
+                                ", GFZL = '"+gqmap.get("gfzl")+"', DJGD = '"+gqmap.get("djgd")+"' ,CGFS = '"+gqmap.get("cgfs")+"' " +
+                                " where  id =  '"+gqmap.get("mainbillid")+"'";
+                        log.writeLog("变更最新的企业表:"+sql);
+
+                        recordSet.execute(sql);
+                    }
+                }
+                //如果当前id在上一个版本中不存在，那就删除这个
+                sql = "select djgd from uf_jingneiqiyexinxi_dt2 where mainid = "+qyid;
+                ArrayList<String> list = DataBaseUtils.getList(sql);
+
+
+                sql = "select djgd\n" +
+                        "from FORMTABLE_MAIN_3055_dt2\n" +
+                        "where mainid in (select *\n" +
+                        "                 from (select id from FORMTABLE_MAIN_3055 where qyid = "+qyid+" order by BBRQ desc)\n" +
+                        "                 where rownum < 2)";
+                log.writeLog("获取最后一个版本中的股东:"+sql);
+                
+                ArrayList<String> bbList = DataBaseUtils.getList(sql);
+                log.writeLog("版本list:"+bbList);
+                log.writeLog("企业list:"+list);
+                
+                for (String s : list) {
+                    //如果s不存在bblist中，直接删除
+                    if (!bbList.contains(s)) {
+                        sql = "delete from uf_jingneiqiyexinxi_dt2 where djgd = '" + s+"'";
+                        log.writeLog("当前股东不在最新版本中，直接删除:"+sql);
+                        recordSet.execute(sql);
+                    }
+
+
+                }
+            }
+
+        }
+
+
+
+
+    }
+
+
+
+    /**
+     *
+     * 判断当前日期是否有数据，没有就从上一个版本复制
+     * @param qyid 企业id
+     * @param date 日期
+     * @return 当天企业的id
+     */
+    public String SynDate(String qyid, String date) {
+        RecordSet recordSet = new RecordSet();
+        String sql = "select id from formtable_main_3055 where qyid = '"+qyid+"' and bbrq = '"+date+"' ";
+        String changeId = "";
+        String firstValue = DataBaseUtils.getFirstValue(sql);
+        if ("".equals(firstValue)) {
+            //空,同步所有信息,同步上一个版本所有信息 ,然后在后面修改
+            sql = "select * from (select * from formtable_main_3055 where " +
+                    " BBRQ <= '"+date+"' and qyid = '"+qyid+"'   order by BBRQ desc ) where  rownum <2";
+
+            log.writeLog("找到上一个版本的信息:"+sql);
+
+            Map<String, String> hashMap = DataBaseUtils.getDataMap(sql);
+
+            if("".equals(strNull(hashMap.get("QYMC")))){
+                log.writeLog("企业名称为空:"+hashMap);
+
+                hashMap = DataBaseUtils.getDataMap("select * from (select * from formtable_main_3055 where   qyid = '"+qyid+"'   order by BBRQ  ) where  rownum <2");
+            }
+
+            log.writeLog("上一个版本的信息:"+hashMap);
+
+            sql = "insert into  formtable_main_3055 (zczb,dz,gly,qymc,zym,ywm,clrq,shxydm,dhyj,dhej,dhsj,dhsj1,dhwj,dhlj,dhqj," +
+                    "jyfw,gqtsap,gqapfj,frdb,cwfzr,jl,js,ds,djzt,sfwbbdw,bafj,bbrq,qyid,GBDQ,DLQ" +
+                    "                , GSLX,GS,BZ,MGMZ,DLDFLST,YYDZ,YWBK,YWMKZJTZDJS,BZ2,DYZY,FJSC,ZJFWJGMSGS,SJS,GLF,NBJZQ,FORMMODEID) values ('" + hashMap.get("ZCZB") + "', '" + hashMap.get("DZ") + "', " +
+                    "'" + hashMap.get("GLY") + "', '" + hashMap.get("QYMC") + "', '" + hashMap.get("ZYM") + "', '" + hashMap.get("YWM") + "', " +
+                    "'" + hashMap.get("CLRQ") + "', '" + hashMap.get("SHXYDM") + "', '" + hashMap.get("DHYJ") + "', '" + hashMap.get("DHEJ") + "', " +
+                    "'" + hashMap.get("DHSJ") + "', '" + hashMap.get("DHSJ1") + "', '" + hashMap.get("DHWJ") + "', '" + hashMap.get("DHLJ") + "', " +
+                    "'" + hashMap.get("DHQJ") + "', '" + hashMap.get("JYFW") + "', '" + hashMap.get("GQTSAP") + "', '" + hashMap.get("GQAPFJ") + "', " +
+                    "'" + hashMap.get("FRDB") + "', '" + hashMap.get("CWFZR") + "', '" + hashMap.get("JL") + "', '" + hashMap.get("JS") + "', " +
+                    "'" + hashMap.get("DS") + "', '" + hashMap.get("DJZT") + "', '" + hashMap.get("SFWBBDW") + "', " +
+                    "'" + hashMap.get("BAFJ") + "', '" + date + "','" + qyid + "'" +
+                    ", '" + hashMap.get("GBDQ") + "', '" + hashMap.get("DLQ") + "', '" + hashMap.get("GSLX") + "', '" + hashMap.get("GS") + "'" +
+                    ", '" + hashMap.get("BZ") + "', '" + hashMap.get("MGMZ") + "', '" + hashMap.get("DLDFLST") + "', '" + hashMap.get("YYDZ") + "'" +
+                    ", '" + hashMap.get("YWBK") + "', '" + hashMap.get("YWMKZJTZDJS") + "', '" + hashMap.get("BZ2") + "', '" + hashMap.get("DYZY") + "'" +
+                    ", '" + hashMap.get("FJSC") + "', '" + hashMap.get("ZJFWJGMSGS") + "', '" + hashMap.get("SJS") + "','"+ hashMap.get("GLF") +"','"+
+                    hashMap.get("NBJZQ") +"','"+DataBaseUtils.getModelIdByName("formtable_main_3055")+"')";
+            log.writeLog("插入版本表的sql:" + sql);
+            recordSet.execute(sql);
+
+            changeId = DataBaseUtils.getFirstValue("select id from formtable_main_3055 where qyid = '"+qyid+"' and bbrq = '"+date+"' ");
+
+
+
+            sql = "select * from formtable_main_3055_dt2 where MAINID =  (select * from (select id from formtable_main_3055 where " +
+                    " BBRQ < '"+date+"' and qyid = '"+qyid+"'   order by BBRQ desc ) where  rownum <2) " ;
+            log.writeLog("获取股东:"+sql);
+
+            ArrayList<Map<String, String>> dt2List =  DataBaseUtils.getDataList(sql);
+            for (Map<String, String> map : dt2List) {
+                sql = "insert into formtable_main_3055_dt2 (MAINID,DJGD,CGBL,BZ,QYMC1,rq,CGFS,gfzl,mainbillid) values ('" + changeId + "'" +
+                        ",'" + map.get("DJGD") + "','" + map.get("CGBL") + "','" + map.get("BZ") + "','" + map.get("QYMC1") + "'," +
+                        "'" + date + "','" + map.get("CGFS") + "','" + map.get("GFZL") + "','"+map.get("MAINBILLID")+"')";
+                recordSet.execute(sql);
+                log.writeLog("插入股东:" + sql);
+            }
+
+
+            //同步资质证照
+            sql = "select * from formtable_main_3055_dt3 where MAINID =  (select * from (select id from formtable_main_3055 where " +
+                    " BBRQ < '"+date+"' and qyid = '"+qyid+"'   order by BBRQ desc ) where  rownum <2) " ;
+            log.writeLog("同步资质证照的SQL:"+sql);
+
+            ArrayList<Map<String, String>> dt3List = DataBaseUtils.getDataList(sql);
+            log.writeLog("同步资质证照的list:"+dt3List.size());
+
+            for (Map<String, String> map : dt3List) {
+                sql = "insert into formtable_main_3055_dt3 (MAINID,zzzz,fjsc,BZ,QYMC,MAINBILLID) values ('" + changeId + "'" +
+                        ",'" + map.get("ZZZZ") + "','" + map.get("FJSC") + "','" + map.get("BZ") + "','" + map.get("QYMC") + "','"+strNull(map.get("MAINBILLID"))+"')";
+                log.writeLog("插入资质证照信息sql:" + sql);
+                recordSet.execute(sql);
+            }
+
+
+        }
+        //返回刚刚那张表的id
+
+        sql = "select id from formtable_main_3055 where qyid = '"+qyid+"' and bbrq = '"+date+"' ";
+        firstValue = DataBaseUtils.getFirstValue(sql);
+        log.writeLog("之后的firstvalue:" + firstValue);
+
+        return firstValue;
+    }
+
+    /**
+     * 股东变更前后
+     * @param list 股东集合
+     * @return 内容
+     */
+    public String getGdBg(ArrayList<Map<String,String>> list) {
+
+        String value = "";
+        for (Map<String, String> map : list) {
+
+            value += "\n"+getQyOrRy(Util.null2String(map.get("DJGD")))+"/"+map.get("CGBL")+
+                    "%/"+map.get("CGFS")+"/"+getCgzl(Util.null2String(map.get("GFZL")))+"、";
+        }
+        log.writeLog("value:"+value);
+        return "".equals(value)?value:value.substring(0,value.length()-1);
+    }
+
+    /**
+     * 获取持股种类
+     * @param id id
+     * @return 种类内容
+     */
+    public String getCgzl(String id) {
+        if (Util.null2String(id).equals("")) {
+            return "";
+        }
+        RecordSet recordSet = new RecordSet();
+        recordSet.execute("select GFZL from uf_gufenzhonglei where id = " + id);
+        recordSet.next();
+        return Util.null2String(recordSet.getString("GFZL"));
+    }
+
+    /**
+     * 获取企业或人员姓名
+     * @param str id
+     * @return name
+     */
+    private String getQyOrRy(String str) {
+        String[] strs = str.split("_");
+
+        String sql = "";
+        if ("qy".equals(strs[0])) {
+            sql = "select qymc name from uf_jingneiqiyexinxi where id = " + strs[1];
+        } else {
+            sql = "select xm name from UF_RENYUANXINXIKU where id = " + strs[1];
+
+        }
+        RecordSet recordSet = new RecordSet();
+        recordSet.execute(sql);
+        recordSet.next();
+
+        log.writeLog("查找新的股东:"+sql);
+        return recordSet.getString("name");
+    }
+
+
+    public static String strNull(String str) {
+        return (null == str) ? "" : str;
+    }
+
+
+
+
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/service/oa/ChangeDt2.java b/src/main/youhong_ai_jitu_src/jntchina/service/oa/ChangeDt2.java
new file mode 100644
index 0000000..76d360e
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/service/oa/ChangeDt2.java
@@ -0,0 +1,292 @@
+package jntchina.service.oa;
+
+import jntchina.util.DataBaseUtils;
+import selfdev.util.log.LogTool;
+import weaver.conn.RecordSet;
+import weaver.general.Util;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+
+/**
+ * @title: 改变明细表
+ * @author ycf
+ * @date 2022-02-04
+ */
+public class ChangeDt2 {
+    private final LogTool log = new LogTool("/log/api/aa/", false);
+    public void changeDt2(String qyId, String changeBillId) {
+        log.writeLog("-------------------------------------资质证照---------------------------------:");
+        log.writeLog("企业id:"+qyId);
+
+        
+        //先找到所有变更明细表中的有变更日期的数据
+        String sql = "";
+        RecordSet recordSet = new RecordSet();
+        String qymc = qyId;
+
+        //只考虑新增
+        sql = "select * from uf_jnqyxxbgb_dt4 where mainid =  '" + changeBillId + "' and rq is not null and zbid is null ";
+        log.writeLog("获取新增的资质证照:"+sql);
+
+        log.writeLog("通过SQL获取数据集:"+sql);
+        ArrayList<Map<String, String>> addList = new ArrayList<>();
+
+        recordSet.execute(sql);
+        while (recordSet.next()) {
+            HashMap<String, String> map = new HashMap<>();
+            for (String s : recordSet.getColumnName()) {
+                map.put(s, (recordSet.getString(s)));
+            }
+            map.put("uuid", UUID.randomUUID().toString().replace("-", ""));
+            addList.add(map);
+        }
+        for (Map<String, String> bgMap : addList) {
+            /*
+            变更插入两张表
+            历史沿革插入两张表
+            往之后版本更新
+             */
+            String bgrq = bgMap.get("RQ");
+
+            //插入两张表
+            sql = "insert into uf_jingneiqiyexinxi_dt3 (zzzz,fjsc,bz,mainid,qymc,MODFLYUUID) values ('"+bgMap.get("ZZZZ")+"','"+bgMap.get("FJSC")+"','"+bgMap.get("BZ")+"','"+qyId+"','"+qymc+"','"+bgMap.get("uuid")+"') ";
+            log.writeLog("插入企业信息的明细表" + sql);
+            recordSet.execute(sql);
+
+            sql = "select id from uf_jingneiqiyexinxi_dt3 where MODFLYUUID = '"+bgMap.get("uuid")+"' ";
+            log.writeLog("通过新增的list中的UUID取变更主表的id:"+sql);
+
+            String qiyeMainId = DataBaseUtils.getFirstValue(sql);
+            log.writeLog("获取插入企业表中的资质证照的ID:"+qiyeMainId);
+            
+
+
+            String versionId = SynDate(qyId, bgrq);
+
+            sql = "insert into formtable_main_3055_dt3 (zzzz,fjsc,bz,mainbillid,mainid) values" +
+                    " ('"+bgMap.get("ZZZZ")+"','"+bgMap.get("FJSC")+"','"+bgMap.get("BZ")+"','"+qiyeMainId+"','"+versionId+"') ";
+            log.writeLog("将新增的资质证照插入版本的明细表" + sql);
+            recordSet.execute(sql);
+
+
+
+
+
+            sql = "insert into formtable_main_3055_dt1 (rq,mainid,bgxm,bgq,bgh,fj,bz) values" +
+                    "('"+bgrq+"','"+versionId+"','资质证照','无','"+bgMap.get("ZZZZ")+"','"+bgMap.get("FJ")+"','"+bgMap.get("BZ1")+"') ";
+            log.writeLog("插入历史沿革" + sql);
+            recordSet.execute(sql);
+
+            //找到之后是否有版本信息
+            sql = "select id from formtable_main_3055 where qyid  = '" + qyId + "' and bbrq > '" + bgrq + "' ";
+            log.writeLog("找到变更资质证照之后所有的版本"+sql);
+            ArrayList<Map<String, String>> idList = DataBaseUtils.getDataList(sql);
+
+            //之后所有的版本都要插入当前的资质证照
+            for (Map<String, String> bbMap : idList) {
+                sql = "insert into formtable_main_3055_dt3 (zzzz,fjsc,bz,mainbillid,mainid) values" +
+                        " ('"+bgMap.get("ZZZZ")+"','"+bgMap.get("FJSC")+"','"+bgMap.get("BZ")+"','"+qiyeMainId+"','"+bbMap.get("ID")+"') ";
+                log.writeLog("插入之后所有的版本"+sql);
+                recordSet.execute(sql);
+            }
+        }
+
+        //所有需要更新的
+        sql = "select * from uf_jnqyxxbgb_dt4 where mainid =  '" + changeBillId + "' and rq is not null and zbid is not null ";
+        log.writeLog("获取更新的资质证照:"+sql);
+        
+        ArrayList<Map<String, String>> changeList = DataBaseUtils.getDataList(sql);
+        for (Map<String, String> bghMap : changeList) {
+            String bgrq = bghMap.get("RQ");
+            String zbid = bghMap.get("ZBID");
+            String versionId = SynDate(qyId, bgrq);
+
+            //获取原本的资质证照---改成上一个版本的
+            sql = "select *\n" +
+                    "from formtable_main_3055_DT3 where MAINID = '"+versionId+"' and MAINBILLID = "+bghMap.get("ZBID");
+            log.writeLog("获取上一个版本的资质证照:"+sql);
+
+            Map<String, String> bgqMap = DataBaseUtils.getDataMap(sql);
+            
+
+            
+            log.writeLog("主表id:"+zbid);
+            log.writeLog("上一版本的mainbillid:"+bgqMap.get("MAINBILLID"));
+            
+            
+            //主表id相同的情况下
+            if (zbid.equals(bgqMap.get("MAINBILLID"))) {
+                log.writeLog("主表id相同的情况下");
+
+                //当前编辑版本的ID
+                String versionID = SynDate(qyId, bgrq);
+                //判断后面 是否有版本
+
+                sql = "select id from formtable_main_3055 where bbrq>'"+bgrq+"' and qyid = '"+qyId+"'";
+                //获取之后版本的id
+                ArrayList<Map<String, String>> afterVersionId = DataBaseUtils.getDataList(sql);
+
+                log.writeLog("变更前资质证照:"+bgqMap.get("ZZZZ"));
+                log.writeLog("变更后资质证照:"+bghMap.get("ZZZZ"));
+
+                //资质证照名称变更
+                if (!Util.null2String(bghMap.get("ZZZZ")).equals(Util.null2String(bgqMap.get("ZZZZ")))){
+                    //修改明细表中的字段(版本表,企业表)
+                    sql = "update uf_jingneiqiyexinxi_dt3 set zzzz = '"+bghMap.get("ZZZZ")+"' where id = '"+zbid+"'";
+                    log.writeLog("修改资质证照的sql:"+sql);
+                    recordSet.execute(sql);
+                    //修改所有的id为xx，并且变更前为XXX 的版本表的明细表
+                    sql = "update formtable_main_3055_dt3 set zzzz = '"+bghMap.get("ZZZZ")+"' where MAINBILLID = '"+zbid+"' and mainid in" +
+                            " (select id from formtable_main_3055 where bbrq >= '"+bgrq+"' and qyid = '"+qyId+"' ) and zzzz = '"+bgqMap.get("ZZZZ")+"' ";
+                    log.writeLog("修改所有的id为xx，并且变更前为XXX 的版本表的明细表:"+sql);
+                    recordSet.execute(sql);
+
+
+
+
+
+                    sql = "insert into formtable_main_3055_dt1 (rq,mainid,bgxm,bgq,bgh,fj,bz) values " +
+                            "('"+bgrq+"','"+versionID+"','资质证照','"+bgqMap.get("ZZZZ")+"','"+bghMap.get("ZZZZ")+"','"+ bghMap.get("FJ")+"','"+ bghMap.get("BZ1")+"')";
+                    log.writeLog("插入企业版本表中的历史沿革:"+sql);
+                    recordSet.execute(sql);
+
+
+
+                    //修改之后历史沿革的变更前为xx的信息变成当前版本的变更后的
+                    sql = "update formtable_main_3055_dt1 set bgq = '" + bghMap.get("ZZZZ") + "' " +
+                            "where mainid in (select id from formtable_main_3055 where qyid = '" + qyId + "')   and bgxm = '资质证照' and bgq = '" + bgqMap.get("ZZZZ") + "' and rq > '" + bgrq + "' ";
+                    log.writeLog("修改之后历史沿革的变更前为xx的信息变成当前版本的变更后的:" + sql);
+                    recordSet.execute(sql);
+
+                }
+
+                log.writeLog("变更前资质证照FJSC:"+bgqMap.get("FJSC"));
+                log.writeLog("变更后资质证照FJSC:"+bghMap.get("FJSC"));
+                if (!Util.null2String(bghMap.get("FJSC")).equals(Util.null2String(bgqMap.get("FJSC")))){
+                    sql = "update uf_jingneiqiyexinxi_dt3 set FJSC = '"+bghMap.get("FJSC")+"' where id = '"+zbid+"' ";
+                    log.writeLog("修改资质证照附件的sql:"+sql);
+                    recordSet.execute(sql);
+
+                    sql = "update formtable_main_3055_dt3 set FJSC = '"+bghMap.get("FJSC")+"' where MAINBILLID = '"+zbid+"' and mainid = "+versionID;
+                    log.writeLog("修改资质证照附件的sql:"+sql);
+                    recordSet.execute(sql);
+
+                    //修改所有的id为xx，并且变更前为XXX 的版本表的明细表
+                    sql = "update formtable_main_3055_dt3 set FJSC = '"+bghMap.get("FJSC")+"' where MAINBILLID = '"+zbid+"' and mainid in" +
+                            " (select id from formtable_main_3055 where bbrq >= '"+bgrq+"' and qyid = '"+qyId+"' ) and (FJSC = '"+bgqMap.get("FJSC")+"' or fjsc is null) ";
+                    log.writeLog("变更所有的之后版本的数据:"+sql);
+                    recordSet.execute(sql);
+                }
+
+                log.writeLog("变更前资质证照BZ:"+bgqMap.get("BZ"));
+                log.writeLog("变更后资质证照BZ:"+bghMap.get("BZ"));
+                if (!Util.null2String(bghMap.get("BZ")).equals(Util.null2String(bgqMap.get("BZ")))){
+                    sql = "update uf_jingneiqiyexinxi_dt3 set BZ = '"+bghMap.get("BZ")+"' where id = '"+zbid+"'";
+                    log.writeLog("修改资质证照备注的sql:"+sql);
+                    recordSet.execute(sql);
+
+                    sql = "update formtable_main_3055_dt3 set BZ = '"+bghMap.get("BZ")+"' where id = '"+zbid+"' and id = "+versionID;
+                    log.writeLog("修改资质证照备注的sql:"+sql);
+                    recordSet.execute(sql);
+
+                    //修改所有的id为xx，并且变更前为XXX 的版本表的明细表
+                    sql = "update formtable_main_3055_dt3 set BZ = '"+bghMap.get("BZ")+"' where MAINBILLID = '"+zbid+"' and mainid in" +
+                            " (select id from formtable_main_3055 where bbrq >= '"+bgrq+"' and qyid = '"+qyId+"' ) and BZ = '"+bgqMap.get("BZ")+"' ";
+                    log.writeLog("变更所有的之后版本的备注数据:"+sql);
+                    recordSet.execute(sql);
+                }
+            }
+        }
+    }
+    /**
+     *
+     * 判断当前日期是否有数据，没有就从上一个版本复制
+     * @param qyid 企业id
+     * @param date 日期
+     * @return 当天企业的id
+     */
+    public String SynDate(String qyid, String date) {
+        RecordSet recordSet = new RecordSet();
+        String sql = "select id from formtable_main_3055 where qyid = '"+qyid+"' and bbrq = '"+date+"' ";
+        String changeId = "";
+        String firstValue = DataBaseUtils.getFirstValue(sql);
+        if ("".equals(firstValue)) {
+            //空,同步所有信息,同步上一个版本所有信息 ,然后在后面修改
+            sql = "select * from (select * from formtable_main_3055 where " +
+                    " BBRQ <= '"+date+"' and qyid = '"+qyid+"'   order by BBRQ desc ) where  rownum <2";
+
+            log.writeLog("找到上一个版本的信息:"+sql);
+
+            Map<String, String> hashMap = DataBaseUtils.getDataMap(sql);
+
+            if("".equals(DataBaseUtils.strNull(hashMap.get("QYMC")))){
+                log.writeLog("企业名称为空:"+hashMap);
+
+                hashMap = DataBaseUtils.getDataMap("select * from (select * from formtable_main_3055 where   qyid = '"+qyid+"'   order by BBRQ  ) where  rownum <2");
+            }
+
+            log.writeLog("上一个版本的信息:"+hashMap);
+
+            sql = "insert into  formtable_main_3055 (zczb,dz,gly,qymc,zym,ywm,clrq,shxydm,dhyj,dhej,dhsj,dhsj1,dhwj,dhlj,dhqj," +
+                    "jyfw,gqtsap,gqapfj,frdb,cwfzr,jl,js,ds,djzt,sfwbbdw,bafj,bbrq,qyid,GBDQ,DLQ" +
+                    "                , GSLX,GS,BZ,MGMZ,DLDFLST,YYDZ,YWBK,YWMKZJTZDJS,BZ2,DYZY,FJSC,ZJFWJGMSGS,SJS,GLF,NBJZQ,FORMMODEID) values ('" + hashMap.get("ZCZB") + "', '" + hashMap.get("DZ") + "', " +
+                    "'" + hashMap.get("GLY") + "', '" + hashMap.get("QYMC") + "', '" + hashMap.get("ZYM") + "', '" + hashMap.get("YWM") + "', " +
+                    "'" + hashMap.get("CLRQ") + "', '" + hashMap.get("SHXYDM") + "', '" + hashMap.get("DHYJ") + "', '" + hashMap.get("DHEJ") + "', " +
+                    "'" + hashMap.get("DHSJ") + "', '" + hashMap.get("DHSJ1") + "', '" + hashMap.get("DHWJ") + "', '" + hashMap.get("DHLJ") + "', " +
+                    "'" + hashMap.get("DHQJ") + "', '" + hashMap.get("JYFW") + "', '" + hashMap.get("GQTSAP") + "', '" + hashMap.get("GQAPFJ") + "', " +
+                    "'" + hashMap.get("FRDB") + "', '" + hashMap.get("CWFZR") + "', '" + hashMap.get("JL") + "', '" + hashMap.get("JS") + "', " +
+                    "'" + hashMap.get("DS") + "', '" + hashMap.get("DJZT") + "', '" + hashMap.get("SFWBBDW") + "', " +
+                    "'" + hashMap.get("BAFJ") + "', '" + date + "','" + qyid + "'" +
+                    ", '" + hashMap.get("GBDQ") + "', '" + hashMap.get("DLQ") + "', '" + hashMap.get("GSLX") + "', '" + hashMap.get("GS") + "'" +
+                    ", '" + hashMap.get("BZ") + "', '" + hashMap.get("MGMZ") + "', '" + hashMap.get("DLDFLST") + "', '" + hashMap.get("YYDZ") + "'" +
+                    ", '" + hashMap.get("YWBK") + "', '" + hashMap.get("YWMKZJTZDJS") + "', '" + hashMap.get("BZ2") + "', '" + hashMap.get("DYZY") + "'" +
+                    ", '" + hashMap.get("FJSC") + "', '" + hashMap.get("ZJFWJGMSGS") + "', '" + hashMap.get("SJS") + "','"+ hashMap.get("GLF") +"','"+
+                    hashMap.get("NBJZQ") +"','"+DataBaseUtils.getModelIdByName("formtable_main_3055")+"')";
+            log.writeLog("插入版本表的sql:" + sql);
+            recordSet.execute(sql);
+
+            changeId = DataBaseUtils.getFirstValue("select id from formtable_main_3055 where qyid = '"+qyid+"' and bbrq = '"+date+"' ");
+
+
+
+            sql = "select * from formtable_main_3055_dt2 where MAINID =  (select * from (select id from formtable_main_3055 where " +
+                    " BBRQ < '"+date+"' and qyid = '"+qyid+"'   order by BBRQ desc ) where  rownum <2) " ;
+            log.writeLog("获取股东:"+sql);
+            
+            ArrayList<Map<String, String>> dt2List =  DataBaseUtils.getDataList(sql);
+            for (Map<String, String> map : dt2List) {
+                sql = "insert into formtable_main_3055_dt2 (MAINID,DJGD,CGBL,BZ,QYMC1,rq,CGFS,gfzl,mainbillid) values ('" + changeId + "'" +
+                        ",'" + map.get("DJGD") + "','" + map.get("CGBL") + "','" + map.get("BZ") + "','" + map.get("QYMC1") + "'," +
+                        "'" + date + "','" + map.get("CGFS") + "','" + map.get("GFZL") + "','" + map.get("MAINBILLID") + "')";
+                recordSet.execute(sql);
+                log.writeLog("插入股东:" + sql);
+            }
+            //同步资质证照
+            sql = "select * from formtable_main_3055_dt3 where MAINID =  (select * from (select id from formtable_main_3055 where " +
+                    " BBRQ < '"+date+"' and qyid = '"+qyid+"'   order by BBRQ desc ) where  rownum <2) " ;
+            log.writeLog("同步资质证照的SQL:"+sql);
+            
+            ArrayList<Map<String, String>> dt3List = DataBaseUtils.getDataList(sql);
+            log.writeLog("同步资质证照的list:"+dt3List.size());
+            
+            for (Map<String, String> map : dt3List) {
+                sql = "insert into formtable_main_3055_dt3 (MAINID,zzzz,fjsc,BZ,QYMC,MAINBILLID) values ('" + changeId + "'" +
+                        ",'" + map.get("ZZZZ") + "','" + map.get("FJSC") + "','" + map.get("BZ") + "','" + map.get("QYMC") + "','"+map.get("MAINBILLID")+"')";
+                log.writeLog("插入资质证照信息sql:" + sql);
+                recordSet.execute(sql);
+            }
+
+
+        }
+        //返回刚刚那张表的id
+
+        sql = "select id from formtable_main_3055 where qyid = '"+qyid+"' and bbrq = '"+date+"' ";
+        firstValue = DataBaseUtils.getFirstValue(sql);
+        log.writeLog("之后的firstvalue:" + firstValue);
+
+        return firstValue;
+    }
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/service/oa/DeleteQiye.java b/src/main/youhong_ai_jitu_src/jntchina/service/oa/DeleteQiye.java
new file mode 100644
index 0000000..4eb6fe7
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/service/oa/DeleteQiye.java
@@ -0,0 +1,68 @@
+package jntchina.service.oa;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import selfdev.util.log.LogTool;
+import weaver.conn.RecordSet;
+import weaver.formmode.customjavacode.AbstractModeExpandJavaCodeNew;
+import weaver.general.Util;
+import weaver.hrm.User;
+import weaver.soa.workflow.request.RequestInfo;
+
+
+/**
+ * 说明
+ * 修改时
+ * 类名要与文件名保持一致
+ * class文件存放位置与路径保持一致。
+ * 请把编译后的class文件，放在对应的目录中才能生效
+ * 注意 同一路径下java名不能相同。
+ * @author Administrator
+ *
+ */
+public class DeleteQiye extends AbstractModeExpandJavaCodeNew {
+	private final LogTool log = new LogTool("/log/api/qiye/", false);
+	/**
+	 * 执行模块扩展动作
+	 * @param param
+	 *  param包含(但不限于)以下数据
+	 *  user 当前用户
+	 *  importtype 导入方式(仅在批量导入的接口动作会传输) 1 追加，2覆盖,3更新，获取方式(int)param.get("importtype")
+     *  导入链接中拼接的特殊参数(仅在批量导入的接口动作会传输)，比如a=1，可通过param.get("a")获取参数值
+	 *  页面链接拼接的参数，比如b=2,可以通过param.get("b")来获取参数
+	 * @return 
+	 */
+	public Map<String, String> doModeExpand(Map<String, Object> param) {
+		Map<String, String> result = new HashMap<String, String>();
+		try {
+			User user = (User)param.get("user");
+			int billid = -1;//数据id
+			int modeid = -1;//模块id
+			RequestInfo requestInfo = (RequestInfo)param.get("RequestInfo");
+			if(requestInfo!=null){
+				billid = Util.getIntValue(requestInfo.getRequestid());
+				modeid = Util.getIntValue(requestInfo.getWorkflowid());
+				if(billid>0&&modeid>0){
+					//------请在下面编写业务逻辑代码------
+
+
+					String sql = "";
+					RecordSet recordSet = new RecordSet();
+					sql = "delete from formtable_main_3055 where qyid = " + billid;
+					log.writeLog("从信息卡片中删除:" + sql);
+					recordSet.executeUpdate(sql);
+
+
+
+
+				}
+			}
+		} catch (Exception e) {
+			result.put("errmsg","自定义出错信息");
+			result.put("flag", "false");
+		}
+		return result;
+	}
+
+}
\ No newline at end of file
diff --git a/src/main/youhong_ai_jitu_src/jntchina/service/oa/EnterpriseAPI.java b/src/main/youhong_ai_jitu_src/jntchina/service/oa/EnterpriseAPI.java
new file mode 100644
index 0000000..1d506b3
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/service/oa/EnterpriseAPI.java
@@ -0,0 +1,1009 @@
+package jntchina.service.oa;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import jntchina.entity.ChangeInfo;
+import jntchina.util.DataBaseUtils;
+import selfdev.util.log.LogTool;
+import weaver.conn.RecordSet;
+
+import weaver.front.tablestring.Sql;
+import weaver.general.Util;
+import weaver.hrm.HrmUserVarify;
+import weaver.hrm.User;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.ws.rs.*;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.HttpHeaders;
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.math.BigDecimal;
+import java.text.DecimalFormat;
+import java.time.LocalDate;
+import java.util.*;
+
+/**
+ * @title: EnterpriseAPI企业信息api
+ * @Author ycf
+ * @Date: 2021/11/1 15:32
+ * @Version 1.0
+ */
+@Path("/EnterpriseAPI")
+public class EnterpriseAPI {
+    private final LogTool log = new LogTool("/log/api/qiye/", false);
+
+
+    @POST
+    @Path("/getEquityInfo")
+    @Produces({"application/json"})
+    public String getEquityInfo(@Context HttpServletRequest request, @Context HttpServletResponse response) {
+
+        String qymc = request.getParameter("name");
+        RecordSet recordSet = new RecordSet();
+        String sql = "";
+
+        OAUtils oaUtils = new OAUtils();
+
+        recordSet.execute("select id from UF_JINGNEIQIYEXINXI where qymc = '" + qymc + "' ");
+        log.writeLog("寻找企业id:" + "select id from UF_JINGNEIQIYEXINXI where qymc = '" + qymc + "'");
+
+        recordSet.next();
+
+
+        //处理的企业id
+        String cxqyid = recordSet.getString("id");
+        //当前企业id
+        String dqqyid = cxqyid;
+
+        log.writeLog("qiye id:" + cxqyid);
+
+
+        String qyurl = "/jntchina/workflow/jsp/JumpEnterprise.jsp?id=";
+
+        String json = "{\n" +
+                "  \"label\": \"" + qymc + "\",\n" +
+                "  \"url\": \"qyurl\",\n" +
+                "  \"ratio\": \"bili% \",\n" +
+                "  \"children\": []\n" +
+                "}";
+
+        String gudong = "{\n" +
+                "          \"label\": \"chigu\",\n" +
+                "          \"url\": \" qyurl \",\n" +
+                "          replacereplace," +
+                "          \"children\": []" +
+                "        }ens";
+
+        String chigu = "{\n" +
+                "          \"label\": \"chigu\",\n" +
+                "          \"url\": \" qyurl \",\n" +
+                "          \"ratio\": \" bili% \",\n" +
+                "          \"children\": []" +
+                "        }ens";
+        json = json.replace("qyurl", qyurl + cxqyid);
+        log.writeLog("json:" + json);
+        List<String> list3 = new ArrayList<>();
+        cxqyid = "qy_" + cxqyid;
+
+        //通过企业id获取
+        while (!cxqyid.equals("")) {
+            String[] gd = cxqyid.split("_");
+            log.writeLog("股东cxqyid:" + cxqyid);
+            if ("qy".equals(gd[0])) {
+
+                sql = "select mainid, (select name from V_CHIGU where IDS = a.djgd) djgdC,djgd,cgbl from uf_jingneiqiyexinxi_dt2 a where mainid = '" + gd[1] + "' and" +
+                        " cgbl is not null and (select DJZT from UF_JINGNEIQIYEXINXI b where b.id = a.MAINID) != 5  order by CGBL desc,CGFS desc,DJGD desc ";
+
+                log.writeLog("获取股东的sql:" + sql);
+                if (list3.contains(recordSet.getString("djgd"))) {
+                    log.writeLog("list3中存在:" + list3);
+                    break;
+                } else {
+                    list3.add(recordSet.getString("djgd"));
+                }
+                recordSet.execute(sql);
+                recordSet.next();
+                cxqyid = Util.null2String(recordSet.getString("djgd")).trim();
+                log.writeLog("获取的股东:" + cxqyid);
+
+                if (!(cxqyid.trim()).equals("")) {
+                    json = gudong.replace("[]", "[" + json + "]");
+
+                    json = json.replace("chigu", recordSet.getString("DJGDC"));
+                    json = json.replace("bili", recordSet.getString("CGBL"));
+                    json = json.replace("replacereplace,", "\"ratio\": \" bili% \",\n");
+                    json = json.replace("qyurl", qyurl + cxqyid);
+                    json = json.replace("ens", " ");
+                }
+            } else {
+                sql = "select ids,name from V_CHIGU where ids = '" + cxqyid + "'";
+                log.writeLog("获取股东人员的sql:" + sql);
+
+                recordSet.execute(sql);
+                recordSet.next();
+
+                cxqyid = "";
+
+
+//                    json = gudong.replace("[]","["+json+"]");
+
+                json = json.replace("\"label\": \"\",", "\"label\": \"" + recordSet.getString("name") + "\",");
+//                    json = json.replace("bili", recordSet.getString("CGBL"));
+//                    json = json.replace("replacereplace,", "\"ratio\": \" bili% \",\n");
+//                    json = json.replace("qyurl", qyurl + recordSet.getString("ids"));
+                json = json.replace("ens", " ");
+
+            }
+
+        }
+
+        json = json.replace("bili%", "");
+        log.writeLog("股东json:" + json);
+//往下追溯，找股东
+
+        list3.clear();
+        //用来遍历
+        List<String> list = new ArrayList<>();
+        list.add(dqqyid);
+        //用来缓存
+        List<String> list2 = new ArrayList<>();
+        //所有企业的合集
+        log.writeLog("list长度:" + list.size());
+        for (String s : list) {
+            sql = "select * from UF_JINGNEIQIYEXINXI_DT2 a where DJGD  = 'qy_" + s + "' " +
+                    "and cgbl is not null and (select DJZT from UF_JINGNEIQIYEXINXI b where b.id = a.MAINID) != 5 order by CGBL desc,CGFS desc,DJGD desc ";
+            log.writeLog("找股东:" + sql);
+
+            recordSet.execute(sql);
+            int i = 0;
+
+            while (recordSet.next()) {
+                list2.add(recordSet.getString("mainid"));
+                if (list3.contains(recordSet.getString("mainid"))) {
+                    log.writeLog("list3中存在:" + list3);
+                    break;
+                }
+                i++;
+                list3.add(recordSet.getString("mainid"));
+
+                if (i == 1) {
+                    json = json.replace("[]", "[" + chigu + "]");
+                } else {
+                    json = json.replace("ens", "," + chigu);
+                }
+                String qy = Util.null2String(oaUtils.getQymc(recordSet.getString("mainid")));
+
+
+                json = json.replace("chigu", qy);
+                json = json.replace("qyurl", qyurl + recordSet.getString("mainid"));
+                json = json.replace("bili", recordSet.getString("cgbl"));
+                String a = ("index" + recordSet.getString("mainid") + " ");
+                log.writeLog("要替换的值:" + a);
+                json = json.replace("[]", a);
+            }
+
+
+            json = json.replace("ens", "");
+            log.writeLog("22222222222:" + json);
+        }
+        json = json.replace("ens", "");
+        log.writeLog("股东一级:" + list);
+        list.clear();
+        log.writeLog("股东二级:" + list2);
+        //持股二级如果有值
+
+        list.addAll(list2);
+        log.writeLog("11111111111111111111111:" + 1);
+
+        log.writeLog("list.size:" + list.size());
+
+        while (list.size() > 0) {
+            log.writeLog("遍历list1:" + list);
+            list2.clear();
+            for (String s : list) {
+
+                sql = "select * from UF_JINGNEIQIYEXINXI_DT2 a where DJGD  = 'qy_" + s + "' and cgbl is not null" +
+                        " and (select DJZT from UF_JINGNEIQIYEXINXI b where b.id = a.MAINID) != 5 order by CGBL desc,CGFS desc,DJGD desc ";
+                log.writeLog("寻找下一级:" + sql);
+                recordSet.execute(sql);
+                int i = 0;
+                log.writeLog("前:" + json);
+
+                while (recordSet.next()) {
+                    list2.add(recordSet.getString("mainid"));
+                    if (list3.contains(recordSet.getString("mainid"))) {
+                        log.writeLog("list3中存在:" + list3);
+                        break;
+                    }
+                    i++;
+                    list3.add(recordSet.getString("mainid"));
+
+                    if (i == 1) {
+                        json = json.replace("index" + s + " ", "[" + chigu + "]");
+                    } else {
+                        json = json.replace("ens", "," + chigu);
+                    }
+                    json = json.replace("chigu", oaUtils.getQymc(recordSet.getString("mainid")));
+                    json = json.replace("qyurl", qyurl + recordSet.getString("mainid"));
+                    json = json.replace("bili", recordSet.getString("cgbl"));
+
+                    String a = ("index" + recordSet.getString("mainid") + " ");
+
+                    json = json.replace("[]", a);
+                    log.writeLog("json:" + i + json);
+
+
+                }
+                json = json.replace("ens", "");
+                log.writeLog("后:" + json);
+
+            }
+
+            log.writeLog("寻找下一级公司:" + list2);
+            list.clear();
+            list.addAll(list2);
+            list2.clear();
+
+
+        }
+
+
+        for (String s : list3) {
+            json = json.replace("index" + s + " ", "\"\"");
+        }
+
+        json = json.replace("bili%", "");
+        json = json.replace("ens", "");
+        json = json.replace("replacereplace,", "");
+        json = json.replace("[]", "\"\"");
+
+        log.writeLog("endjson:" + json);
+
+
+        return json;
+
+
+    }
+
+
+    public String getDjgd() {
+
+
+        return "";
+    }
+
+
+    /**
+     * 获取下一级目录
+     *
+     * @param request 请求的参数
+     * @return 企业信息和目录信息
+     */
+    @POST
+    @Path("/getDirs")
+    @Produces({"application/json"})
+    public String getDir(@Context HttpServletRequest request, @Context HttpServletResponse response, @Context HttpHeaders headers) {
+
+
+        String code = request.getParameter("id");
+//        code = "1a2a1a2a1a2a3";
+
+        log.writeLog("获取的id:" + code);
+        String[] daohang = code.split("a");
+
+//        String[] cgbls = request.getParameterValues("query[cgbl][]");
+//        log.writeLog("cgbl:"+Arrays.toString(cgbls));
+
+
+        String search = Util.null2String(request.getParameter("search"));
+
+        StringBuilder sqls = new StringBuilder();
+        String[] deleteIds = request.getParameterValues("deleteId[]");
+        log.writeLog("删除:" + Arrays.toString(deleteIds));
+
+        String[] clrq = request.getParameterValues("query[clrq][]");
+        log.writeLog("获取的成立日期:" + Arrays.toString(clrq));
+
+
+        String dateSql = new OAUtils().getDateSql(clrq);
+        log.writeLog("成立日期助理后:" + dateSql);
+        sqls.append(dateSql);
+
+
+        //浏览按钮人员信息库
+        String gly = Util.null2String(request.getParameter("query[gly][id]"));
+        log.writeLog("gly:" + gly);
+
+        String qymc = Util.null2String(request.getParameter("query[qymc]"));
+        log.writeLog("qymc:" + qymc);
+
+        String zym = Util.null2String(request.getParameter("query[zym]"));
+        String ywm = Util.null2String(request.getParameter("query[ywm]"));
+
+        String shxydm = Util.null2String(request.getParameter("query[shxydm]"));
+        String zczb = Util.null2String(request.getParameter("query[zczb]"));
+        String dz = Util.null2String(request.getParameter("query[dz]"));
+        String jyfw = Util.null2String(request.getParameter("query[jyfw]"));
+        //浏览按钮企业名称
+        String bz = Util.null2String(request.getParameter("query[bz][id]"));
+        String gqtsap = Util.null2String(request.getParameter("query[gqtsap]"));
+        //浏览按钮人员信息库
+        String frdb = Util.null2String(request.getParameter("query[frdb][id]"));
+        //浏览按钮人员信息库
+        String cwfzr = Util.null2String(request.getParameter("query[cwfzr][id]"));
+        //浏览按钮人员信息库
+        String jl = Util.null2String(request.getParameter("query[jl][id]"));
+        //浏览按钮人员信息库
+        String js = Util.null2String(request.getParameter("query[js][id]"));
+        //浏览按钮人员信息库
+        String ds = Util.null2String(request.getParameter("query[ds][id]"));
+        //选择框
+        String djzt = Util.null2String(request.getParameter("query[djzt][id]"));
+        //选择框
+
+        //选择框
+        String sfwbbdw = Util.null2String(request.getParameter("query[sfwbbdw][id]"));
+        String dhyj = Util.null2String(request.getParameter("query[dhyj][id]"));
+        String dhej = Util.null2String(request.getParameter("query[dhej][id]"));
+        String dhsj = Util.null2String(request.getParameter("query[dhsj][id]"));
+        String dhsj1 = Util.null2String(request.getParameter("query[dhsj1][id]"));
+        String dhwj = Util.null2String(request.getParameter("query[dhwj][id]"));
+        String dhlj = Util.null2String(request.getParameter("query[dhlj][id]"));
+        String dhqj = Util.null2String(request.getParameter("query[dhqj][id]"));
+        String gbdq = Util.null2String(request.getParameter("query[gbdq][id]"));
+        String dlq = Util.null2String(request.getParameter("query[dlq][id]"));
+        String gslx = Util.null2String(request.getParameter("query[gslx][id]"));
+        String dldflst = Util.null2String(request.getParameter("query[dldflst]"));
+        String ywbk = Util.null2String(request.getParameter("query[ywbk][id]"));
+        String ywmkzjtzdjs = Util.null2String(request.getParameter("query[ywmkzjtzdjs][id]"));
+        String bafj = Util.null2String(request.getParameter("query[bafj][id]"));
+        String yydz = Util.null2String(request.getParameter("query[yydz]"));
+        String bz2 = Util.null2String(request.getParameter("query[bz2]"));
+        String fjsc = Util.null2String(request.getParameter("query[fjsc][id]"));
+        String fjsc2 = Util.null2String(request.getParameter("query[fjsc2][id]"));
+        String dyzy = Util.null2String(request.getParameter("query[dyzy]"));
+        String sjs = Util.null2String(request.getParameter("query[sjs]"));
+        String mgmz = Util.null2String(request.getParameter("query[mgmz]"));
+        String gqapfj = Util.null2String(request.getParameter("query[gqapfj][id]"));
+        String gs = Util.null2String(request.getParameter("query[gs]"));
+        String zjfwjgmsgs = Util.null2String(request.getParameter("query[zjfwjgmsgs]"));
+        String glf = Util.null2String(request.getParameter("query[glf]"));
+
+        String djgd = Util.null2String(request.getParameter("query[djgd][id]"));
+        String djgds = Util.null2String(request.getParameter("query[djgd]"));
+        String cgbl = Util.null2String(request.getParameter("query[cgbl]"));
+
+
+        //浏览按钮
+        String[] str = {djzt, sfwbbdw,
+                dhyj, dhej, dhsj, dhsj1, dhwj, dhlj, dhqj, gbdq, dlq, gslx, dldflst,
+                ywbk, ywmkzjtzdjs, ywbk, bz, dyzy, glf};
+        String[] strzd = {"djzt", "sfwbbdw",
+                "dhyj", "dhej", "dhsj", "dhsj1", "dhwj", "dhlj", "dhqj", "gbdq", "dlq", "gslx", "dldflst",
+                "ywbk", "ywmkzjtzdjs", "ywbk", "bz", "dyzy", "glf"};
+        //文本框
+        String[] str1 = {gly, qymc, zym, ywm, shxydm, zczb, dz, jyfw, bz2, gqtsap,
+                sjs, yydz, gs, zjfwjgmsgs, gqapfj, fjsc, fjsc2, bafj, mgmz};
+        String[] str1zd = {"gly", "qymc", "zym", "ywm", "shxydm", "zczb", "dz", "jyfw", "bz2", "gqtsap",
+                "sjs", "yydz", "gs", "zjfwjgmsgs", "gqapfj", "fjsc", "fjsc2", "bafj", "mgmz"};
+
+        //人力，多选
+        String[] str2 = {frdb, cwfzr, jl, js, ds};
+        String[] str2zd = {"frdb", "cwfzr", "jl", "js", "ds"};
+
+
+        log.writeLog("str:" + Arrays.toString(str));
+        log.writeLog("str1:" + Arrays.toString(str1));
+
+
+        //浏览按钮
+        for (int i = 0; i < str.length; i++) {
+            if (!"null".equals(str[i]) && !"".equals(str[i]) && str[i] != null) {
+                sqls.append(" and ").append(strzd[i]).append(" = '").append(str[i]).append("' ");
+
+            }
+        }
+
+        log.writeLog("sqls1:" + sqls);
+        //文本框，模糊搜索
+        for (int i = 0; i < str1.length; i++) {
+            if (!"null".equals(str1[i]) && !"".equals(str1[i]) && str[i] != null) {
+                sqls.append(" and ").append(str1zd[i]).append(" like '%").append(str1[i]).append("%' ");
+
+            }
+        }
+
+        for (int i = 0; i < str2.length; i++) {
+            if (!"null".equals(str2[i]) && !"".equals(str2[i]) && str2[i] != null) {
+                sqls.append(" and ','||a.").append(str2zd[i]).append("||','  like  '%,").append(str2[i]).append(",%'  ");
+
+            }
+        }
+
+
+        if (!"".equals(djgd)) {
+            sqls.append("  and id in (select MAINID from UF_JINGNEIQIYEXINXI_DT2 where DJGD= '").append(djgd).append("') ");
+        }
+        if (!"".equals(cgbl)) {
+            sqls.append("  and id in (select MAINID from UF_JINGNEIQIYEXINXI_DT2 where cgbl like '%").append(cgbl).append("%') ");
+        }
+
+        //登记股东   张三有限责任公司/50%
+        if (!"".equals(djgds)) {
+
+            String[] strs = djgds.replace("%", "").split("/");
+            sqls.append(" and id in (select MAINID from UF_JINGNEIQIYEXINXI_DT2 where DJGD  in (select ids from V_CHIGU where name like '%").append(strs[0]).append("%')  ");
+            if (strs.length == 2) {
+                sqls.append(" and CGBL like '%").append(strs[1]).append("%') ");
+            }
+        }
+
+
+        String cc = search;
+        if ("yes".contains(search.toLowerCase())) {
+            cc = "%0%";
+        }
+        if ("no".contains(search.toLowerCase())) {
+            cc = "%1%";
+        }
+        log.writeLog("sqls:" + sqls);
+
+        //当模糊搜索不为空时，拼接
+        if (!"".equals(search.trim())) {
+            sqls.append(" and ( \n" +
+                    "        lower(qymc) like lower('%" + search + "%') or lower(clrq)   like lower('%" + search + "%') or lower(ZYM)  like lower('%" + search + "%') or\n" +
+                    "        lower(YWM)  like lower('%" + search + "%') or lower(SHXYDM) like lower('%" + search + "%') or lower(ZCZB) like lower('%" + search + "%') or\n" +
+                    "        lower(GS)   like lower('%" + search + "%') or lower(MGMZ)   like lower('%" + search + "%') or lower(DZ)   like lower('%" + search + "%') or\n" +
+                    "        lower(YYDZ) like lower('%" + search + "%') or lower(dyzy)   like lower('%" + search + "%') or lower(JYFW) like lower('%" + search + "%') or " +
+                    "        lower(BZ)   like lower('%" + search + "%') or lower(NBJZQ)  like lower('%" + search + "%') or      \n" +
+
+                    "        GBDQ in (select b.id from uf_guojiadiquku b where lower(GJDQK) like lower('%" + search + "%')) or\n" +
+                    "        DLQ in (select b.ID from uf_dailiqu b where lower(b.DLQ) like lower('%" + search + "%')) or\n" +
+                    "        GSLX in  (select b.id from uf_gongsileixing b where lower(b.GSLX) like lower('%" + search + "%')) or\n" +
+                    "        DJZT in (select b.ID from uf_dengjizhuangtai b where lower(b.DJZT) like lower('%" + search + "%')) or\n" +
+                    "        BZ in (select b.id from uf_bizhong b where lower(b.BZ) like lower('%" + search + "%')) or\n" +
+                    "        DLDFLST like '" + cc + "' or\n" +
+                    "        glf like '" + cc + "' or\n" +
+                    "        YWBK in (select b.id from uf_yewubankuai b where lower(b.YWBK) like lower('%" + search + "%')) or\n" +
+                    "        YWMKZJTZDJS in (select b.id from uf_jituanzhongdejue b where lower(b.YWMKZJTZDJS) like lower('%" + search + "%')) or\n" +
+                    "        SFWBBDW in (select b.id from uf_shifouweibingbia b where lower(b.SFWBBDW) like lower('%" + search + "%')) " +
+//                    "or\n" +
+////                    "        FJSC in (select b.DOCID from docimagefile b where b.IMAGEFILENAME like '%"+search+"%') or\n" +
+//                    "        GQAPFJ in (select b.DOCID from docimagefile b where b.IMAGEFILENAME like '%"+search+"%') or\n" +
+//                    "        BAFJ in (select b.DOCID from docimagefile b where b.IMAGEFILENAME like '%"+search+"%')\n" +
+                    "     or GLY in   (select b.id from UF_GUANLIYUANKUXIN b where lower(SFZXM) like lower('%" + search + "%'))" +
+//                    " or\n" +
+//                    "        CWFZR in (select b.id from UF_RENYUANXINXIKU b where lower(XM) like lower('%"+search+"%')) or\n" +
+//                    "        FRDB  in  (select b.id from UF_RENYUANXINXIKU b where lower(XM) like lower('%"+search+"%')) or\n" +
+//                    "        JS    in    (select b.id from UF_RENYUANXINXIKU b where lower(XM) like lower('%"+search+"%')) or\n" +
+//                    "        DS    in    (select b.id from UF_RENYUANXINXIKU b where lower(XM) like lower('%"+search+"%')) or\n" +
+//                    "        JL    in    (select b.id from UF_RENYUANXINXIKU b where lower(XM) like lower('%"+search+"%')) " +
+                    " ");
+            ArrayList<String> list = DataBaseUtils.getList("select id from UF_RENYUANXINXIKU where xm like '%" + search + "%' ");
+            for (String s : list) {
+                sqls.append(" or  ','||CWFZR||','  like  '%," + s + ",%'  " +
+                        " or  ','||FRDB||','  like  '%," + s + ",%'  " +
+                        " or  ','||JS||','  like  '%," + s + ",%'  " +
+                        " or  ','||DS||','  like  '%," + s + ",%'  " +
+                        " or  ','||JL||','  like  '%," + s + ",%'  ");
+            }
+
+        }
+
+        //登记股东   张三有限责任公司/50%
+        if (!"".equals(search)) {
+
+            String[] strs = search.replace("%", "").split("/");
+            sqls.append(" or id in (select MAINID from UF_JINGNEIQIYEXINXI_DT2 where DJGD  in (select ids from V_CHIGU where name like '%").append(strs[0]).append("%')  ");
+            if (strs.length == 2) {
+                sqls.append(" and CGBL like '%").append(strs[1]).append("%') ");
+            } else {
+                sqls.append(" ) ");
+            }
+        }
+
+
+        log.writeLog("sqls:" + sqls);
+        log.writeLog("参数code：" + code);
+        //导航
+        String sql = "";
+        //企业个数
+        String sql2 = "";
+        //企业
+        String sql3 = "";
+        //是否为父节点
+        String sql4 = "";
+        RecordSet recordSet = new RecordSet();
+
+        //删除企业
+        if (null != deleteIds && deleteIds.length >= 1 && !"".equals(deleteIds[0])) {
+            for (String deleteId : deleteIds) {
+                if (!"".equals(deleteId)) {
+                    sql = "delete from uf_jingneiqiyexinxi where id = " + deleteId;
+                    log.writeLog("删除企业:" + sql);
+                    recordSet.execute(sql);
+                    sql = "delete from uf_jingneiqiyexinxi_dt2 where mainid = " + deleteId;
+                    log.writeLog("删除持股:" + sql);
+                    recordSet.execute(sql);
+                    sql = "delete from uf_jingneiqiyexinxi_dt2 where djgd = 'qy_" + deleteId + "' ";
+                    log.writeLog("删除dt股东:" + sql);
+                    recordSet.execute(sql);
+                }
+
+            }
+
+            sql = "delete \n" +
+                    "from formtable_main_3055 where qyid not in (select id from UF_JINGNEIQIYEXINXI)";
+            recordSet.execute(sql);
+            log.writeLog("删除历史表的数据:" + sql);
+
+        }
+
+
+        if (sqls.toString().contains("and ( ")) {
+            sqls.append(" ) ");
+        }
+        String gl = "";
+
+        User user1 = HrmUserVarify.getUser(request, response);
+        int uid1 = user1.getUID();
+        if (uid1 != 1) {
+            String username = DataBaseUtils.getFirstValue("select LASTNAME  from HRMRESOURCE where id =  " + user1.getUID());
+            Map<String, String> glyMap = DataBaseUtils.getDataMap("select type,id from uf_guanliyuankuxin where sfzxm = '" + username + "' ");
+            log.writeLog("用户名:" + username);
+            log.writeLog("glytype:" + glyMap);
+
+            ArrayList<Map<String, Object>> maps = new ArrayList<>();
+            //判断当前用户是否为超级管理员
+            if (!glyMap.get("TYPE").equals("0")) {
+                //判断管理员是否为本人
+                gl = " and (gly = '" + glyMap.get("ID") + "' or ','||gxry||',' like '%," + uid1 + ",%' )";
+            }
+
+
+        }
+
+
+        switch (daohang.length) {
+            case 1:
+                if ("".equals(code)) {
+
+                    //默认中国大陆
+                    sql = "select  (select DHYJZDXX from uf_daohangyijizidua b where a.dhyj=b.id) name,count(1) num,dhyj code  from  uf_jingneiqiyexinxi a where 1= 1 " + sqls + gl + "   group by dhyj   order by dhyj ";
+                    sql2 = "select count(1) from uf_jingneiqiyexinxi a where 1=1 " + sqls;
+                    sql3 = " select (select DHYJZDXX from uf_daohangyijizidua where id = a.dhyj) dhyj,(select dhej from uf_daohangerji where id = a.dhej) dhej,(select dhsj from  uf_saohangsanji where id = a.dhsj) dhsj\n" +
+                            "        ,(select dhsj from  uf_daohangsiji where id = a.dhsj1) dhsj1,id\n" +
+                            "        ,(select dhwj from  uf_daohangwuji where id = a.dhwj) dhwj,(select dhlj from  uf_daohangliuji where id = a.dhlj) dhlj,(select dhqj from  uf_daohangqiji where id = a.dhqj)  dhqj\n" +
+                            "        ,(select GJDQK from uf_guojiadiquku where id = a.gbdq) gbdq,(select DLQ from uf_dailiqu where id=a.dlq) dlq,(select gslx from uf_gongsileixing where id=a.gslx) gslx,(select bz from uf_bizhong where id=a.bz) bz,\n" +
+                            "        dldflst,(select YWBK from uf_yewubankuai where id=a.ywbk) ywbk,(select YWMKZJTZDJS from uf_jituanzhongdejue where id=a.ywmkzjtzdjs) ywmkzjtzdjs,\n" +
+                            "       gly, frdb, cwfzr, jl,js,ds,(select DJZT from uf_dengjizhuangtai where id=a.djzt) djzt,(select SFWBBDW from uf_shifouweibingbia where id = a.sfwbbdw) sfwbbdw,gs,mgmz,yydz,bz2,dyzy\n" +
+                            "        ,zjfwjgmsgs,sjs,zczb,dz,qymc,zym,ywm,clrq,shxydm,jyfw,gqtsap, fjsc,gqapfj,bafj,GLF,NBJZQ  from uf_jingneiqiyexinxi a  where 1=1 " + sqls;
+                    sql4 = "select a.*,rownum num  from uf_jingneiqiyexinxi a where  dhej is not null " + sqls;
+
+                } else {
+                    sql = "select  (select DHEJ from  uf_daohangerji b where a.dhej=b.id) name,count(1) num,dhej code  from  uf_jingneiqiyexinxi a  where a.DHYJ=" + daohang[0] + sqls + gl + "   group by dhej  ";
+                    sql2 = "select count(1) from uf_jingneiqiyexinxi a where dhyj = " + daohang[0] + sqls;
+                    sql3 = " select (select DHYJZDXX from uf_daohangyijizidua where id = a.dhyj) dhyj,(select dhej from uf_daohangerji where id = a.dhej) dhej,(select dhsj from  uf_saohangsanji where id = a.dhsj) dhsj\n" +
+                            "        ,(select dhsj from  uf_daohangsiji where id = a.dhsj1) dhsj1,id\n" +
+                            "        ,(select dhwj from  uf_daohangwuji where id = a.dhwj) dhwj,(select dhlj from  uf_daohangliuji where id = a.dhlj) dhlj,(select dhqj from  uf_daohangqiji where id = a.dhqj)  dhqj\n" +
+                            "        ,(select GJDQK from uf_guojiadiquku where id = a.gbdq) gbdq,(select DLQ from uf_dailiqu where id=a.dlq) dlq,(select gslx from uf_gongsileixing where id=a.gslx) gslx,(select bz from uf_bizhong where id=a.bz) bz,\n" +
+                            "        dldflst,(select YWBK from uf_yewubankuai where id=a.ywbk) ywbk,(select YWMKZJTZDJS from uf_jituanzhongdejue where id=a.ywmkzjtzdjs) ywmkzjtzdjs,\n" +
+                            "       gly, frdb, cwfzr, jl,js,ds,(select DJZT from uf_dengjizhuangtai where id=a.djzt) djzt,(select SFWBBDW from uf_shifouweibingbia where id = a.sfwbbdw) sfwbbdw,gs,mgmz,yydz,bz2,dyzy\n" +
+                            "        ,zjfwjgmsgs,sjs,zczb,dz,qymc,zym,ywm,clrq,shxydm,jyfw,gqtsap, fjsc,gqapfj,bafj,GLF,NBJZQ   from uf_jingneiqiyexinxi a where dhyj = " + daohang[0] + "  " + sqls;
+
+                }
+                break;
+            case 2:
+                sql = "select (select DHSJ from  uf_saohangsanji b where a.DHSJ =b.id) name,count(2) num,dhsj code  from  uf_jingneiqiyexinxi a  where a.dhyj=" + daohang[0] + " and a.dhej=" + daohang[1] + " and dhsj is not null " + sqls + gl + " group by dhsj ";
+                sql2 = "select count(1) from uf_jingneiqiyexinxi a where dhej = " + daohang[1] + " and dhyj = " + daohang[0] + " " + sqls;
+                sql3 = " select (select DHYJZDXX from uf_daohangyijizidua where id = a.dhyj) dhyj,(select dhej from uf_daohangerji where id = a.dhej) dhej,(select dhsj from  uf_saohangsanji where id = a.dhsj) dhsj\n" +
+                        "        ,(select dhsj from  uf_daohangsiji where id = a.dhsj1) dhsj1,id\n" +
+                        "        ,(select dhwj from  uf_daohangwuji where id = a.dhwj) dhwj,(select dhlj from  uf_daohangliuji where id = a.dhlj) dhlj,(select dhqj from  uf_daohangqiji where id = a.dhqj)  dhqj\n" +
+                        "        ,(select GJDQK from uf_guojiadiquku where id = a.gbdq) gbdq,(select DLQ from uf_dailiqu where id=a.dlq) dlq,(select gslx from uf_gongsileixing where id=a.gslx) gslx,(select bz from uf_bizhong where id=a.bz) bz,\n" +
+                        "        dldflst,(select YWBK from uf_yewubankuai where id=a.ywbk) ywbk,(select YWMKZJTZDJS from uf_jituanzhongdejue where id=a.ywmkzjtzdjs) ywmkzjtzdjs,\n" +
+                        "       gly, frdb, cwfzr, jl,js,ds,(select DJZT from uf_dengjizhuangtai where id=a.djzt) djzt,(select SFWBBDW from uf_shifouweibingbia where id = a.sfwbbdw) sfwbbdw,gs,mgmz,yydz,bz2,dyzy\n" +
+                        "        ,zjfwjgmsgs,sjs,zczb,dz,qymc,zym,ywm,clrq,shxydm,jyfw,gqtsap, fjsc,gqapfj,bafj,GLF,NBJZQ   from uf_jingneiqiyexinxi a where dhej = " + daohang[1] + " and dhyj = " + daohang[0] + " " + sqls;
+
+                break;
+            case 3:
+                sql = "select  (select DHSJ from  uf_daohangsiji b where a.DHSJ1 =b.id) name,count(2) num ,dhsj1 code from  uf_jingneiqiyexinxi a  where a.dhyj=" + daohang[0] + " and a.dhej=" + daohang[1] + " and  a.dhsj=" + daohang[2] + "  and dhsj1 is not null " + sqls + gl + " group by dhsj1";
+                sql2 = "select count(1) from uf_jingneiqiyexinxi a where  dhsj = " + daohang[2] + "  and dhej = " + daohang[1] + " and dhyj = " + daohang[0] + " " + sqls;
+                sql3 = " select (select DHYJZDXX from uf_daohangyijizidua where id = a.dhyj) dhyj,(select dhej from uf_daohangerji where id = a.dhej) dhej,(select dhsj from  uf_saohangsanji where id = a.dhsj) dhsj\n" +
+                        "        ,(select dhsj from  uf_daohangsiji where id = a.dhsj1) dhsj1,id\n" +
+                        "        ,(select dhwj from  uf_daohangwuji where id = a.dhwj) dhwj,(select dhlj from  uf_daohangliuji where id = a.dhlj) dhlj,(select dhqj from  uf_daohangqiji where id = a.dhqj)  dhqj\n" +
+                        "        ,(select GJDQK from uf_guojiadiquku where id = a.gbdq) gbdq,(select DLQ from uf_dailiqu where id=a.dlq) dlq,(select gslx from uf_gongsileixing where id=a.gslx) gslx,(select bz from uf_bizhong where id=a.bz) bz,\n" +
+                        "       dldflst,(select YWBK from uf_yewubankuai where id=a.ywbk) ywbk,(select YWMKZJTZDJS from uf_jituanzhongdejue where id=a.ywmkzjtzdjs) ywmkzjtzdjs,\n" +
+                        "       gly, frdb, cwfzr, jl,js,ds,(select DJZT from uf_dengjizhuangtai where id=a.djzt) djzt,(select SFWBBDW from uf_shifouweibingbia where id = a.sfwbbdw) sfwbbdw,gs,mgmz,yydz,bz2,dyzy\n" +
+                        "        ,zjfwjgmsgs,sjs,zczb,dz,qymc,zym,ywm,clrq,shxydm,jyfw,gqtsap, fjsc,gqapfj,bafj,GLF,NBJZQ   from uf_jingneiqiyexinxi a where  dhsj = " + daohang[2] + "  and dhej = " + daohang[1] + " and dhyj = " + daohang[0] + "  " + sqls;
+
+                break;
+            case 4:
+                sql = "select (select DHWJ from uf_daohangwuji b where a.DHWJ = b.id) name, count(2) num,DHWJ code from uf_jingneiqiyexinxi a where dhyj = " + daohang[0] + "   and dhej = " + daohang[1] + "   and dhsj = " + daohang[2] + "   and dhsj1 = " + daohang[3] + "   and DHWJ is not null " + sqls + gl + " group by DHWJ";
+                sql2 = "select count(1) from uf_jingneiqiyexinxi a where  dhsj1 = " + daohang[3] + " and dhsj = " + daohang[2] + "  and dhej = " + daohang[1] + " and dhyj = " + daohang[0] + " " + sqls;
+                sql3 = " select (select DHYJZDXX from uf_daohangyijizidua where id = a.dhyj) dhyj,(select dhej from uf_daohangerji where id = a.dhej) dhej,(select dhsj from  uf_saohangsanji where id = a.dhsj) dhsj\n" +
+                        "        ,(select dhsj from  uf_daohangsiji where id = a.dhsj1) dhsj1,id\n" +
+                        "        ,(select dhwj from  uf_daohangwuji where id = a.dhwj) dhwj,(select dhlj from  uf_daohangliuji where id = a.dhlj) dhlj,(select dhqj from  uf_daohangqiji where id = a.dhqj)  dhqj\n" +
+                        "        ,(select GJDQK from uf_guojiadiquku where id = a.gbdq) gbdq,(select DLQ from uf_dailiqu where id=a.dlq) dlq,(select gslx from uf_gongsileixing where id=a.gslx) gslx,(select bz from uf_bizhong where id=a.bz) bz,\n" +
+                        "        dldflst,(select YWBK from uf_yewubankuai where id=a.ywbk) ywbk,(select YWMKZJTZDJS from uf_jituanzhongdejue where id=a.ywmkzjtzdjs) ywmkzjtzdjs,\n" +
+                        "       gly, frdb, cwfzr, jl,js,ds,(select DJZT from uf_dengjizhuangtai where id=a.djzt) djzt,(select SFWBBDW from uf_shifouweibingbia where id = a.sfwbbdw) sfwbbdw,gs,mgmz,yydz,bz2,dyzy\n" +
+                        "        ,zjfwjgmsgs,sjs,zczb,dz,qymc,zym,ywm,clrq,shxydm,jyfw,gqtsap, fjsc,gqapfj,bafj,GLF,NBJZQ   from uf_jingneiqiyexinxi a where  dhsj1 = " + daohang[3] + " and dhsj = " + daohang[2] + "  and dhej = " + daohang[1] + " and dhyj = " + daohang[0] + " " + sqls;
+
+                break;
+            case 5:
+                sql = "select (select dhlj from uf_daohangliuji b where a.dhlj = b.id) name, count(2) num,dhlj code from uf_jingneiqiyexinxi a where dhyj = " + daohang[0] + "   and dhej = " + daohang[1] + "   and dhsj = " + daohang[2] + "   and dhsj1 = " + daohang[3] + " and  dhwj=" + daohang[4] + " and dhlj is not null " + sqls + gl + " group by dhlj ";
+                sql2 = "select count(1) from uf_jingneiqiyexinxi a where dhwj = " + daohang[4] + " and dhsj1 = " + daohang[3] + " and dhsj = " + daohang[2] + "  and dhej = " + daohang[1] + " and dhyj = " + daohang[0] + " " + sqls;
+                sql3 = " select (select DHYJZDXX from uf_daohangyijizidua where id = a.dhyj) dhyj,(select dhej from uf_daohangerji where id = a.dhej) dhej,(select dhsj from  uf_saohangsanji where id = a.dhsj) dhsj\n" +
+                        "        ,(select dhsj from  uf_daohangsiji where id = a.dhsj1) dhsj1,id\n" +
+                        "        ,(select dhwj from  uf_daohangwuji where id = a.dhwj) dhwj,(select dhlj from  uf_daohangliuji where id = a.dhlj) dhlj,(select dhqj from  uf_daohangqiji where id = a.dhqj)  dhqj\n" +
+                        "        ,(select GJDQK from uf_guojiadiquku where id = a.gbdq) gbdq,(select DLQ from uf_dailiqu where id=a.dlq) dlq,(select gslx from uf_gongsileixing where id=a.gslx) gslx,(select bz from uf_bizhong where id=a.bz) bz,\n" +
+                        "        dldflst,(select YWBK from uf_yewubankuai where id=a.ywbk) ywbk,(select YWMKZJTZDJS from uf_jituanzhongdejue where id=a.ywmkzjtzdjs) ywmkzjtzdjs,\n" +
+                        "       gly, frdb, cwfzr, jl,js,ds,(select DJZT from uf_dengjizhuangtai where id=a.djzt) djzt,(select SFWBBDW from uf_shifouweibingbia where id = a.sfwbbdw) sfwbbdw,gs,mgmz,yydz,bz2,dyzy\n" +
+                        "        ,zjfwjgmsgs,sjs,zczb,dz,qymc,zym,ywm,clrq,shxydm,jyfw,gqtsap, fjsc,gqapfj,bafj,GLF,NBJZQ   from uf_jingneiqiyexinxi a where dhwj = " + daohang[4] + " and dhsj1 = " + daohang[3] + " and dhsj = " + daohang[2] + "  and dhej = " + daohang[1] + " and dhyj = " + daohang[0] + "  " + sqls;
+
+                break;
+            case 6:
+                sql = "select (select dhqj from uf_daohangqiji b where a.dhqj= b.id) name, count(2) num,dhqj code from uf_jingneiqiyexinxi a where dhyj = " + daohang[0] + "  and dhej =  " + daohang[1] + "  and dhsj =  " + daohang[2] + "  and dhsj1 = " + daohang[3] + " and  dhwj=" + daohang[4] + " and dhlj=" + daohang[5] + " and dhqj is not null " + sqls + gl + " group by dhqj";
+                sql2 = "select count(1) from uf_jingneiqiyexinxi a where dhlj = " + daohang[5] + " and dhwj = " + daohang[4] + " and dhsj1 = " + daohang[3] + " and dhsj = " + daohang[2] + "  and dhej = " + daohang[1] + " and dhyj = " + daohang[0] + " " + sqls;
+                sql3 = " select (select DHYJZDXX from uf_daohangyijizidua where id = a.dhyj) dhyj,(select dhej from uf_daohangerji where id = a.dhej) dhej,(select dhsj from  uf_saohangsanji where id = a.dhsj) dhsj\n" +
+                        "        ,(select dhsj from  uf_daohangsiji where id = a.dhsj1) dhsj1,id\n" +
+                        "        ,(select dhwj from  uf_daohangwuji where id = a.dhwj) dhwj,(select dhlj from  uf_daohangliuji where id = a.dhlj) dhlj,(select dhqj from  uf_daohangqiji where id = a.dhqj)  dhqj\n" +
+                        "        ,(select GJDQK from uf_guojiadiquku where id = a.gbdq) gbdq,(select DLQ from uf_dailiqu where id=a.dlq) dlq,(select gslx from uf_gongsileixing where id=a.gslx) gslx,(select bz from uf_bizhong where id=a.bz) bz,\n" +
+                        "        dldflst,(select YWBK from uf_yewubankuai where id=a.ywbk) ywbk,(select YWMKZJTZDJS from uf_jituanzhongdejue where id=a.ywmkzjtzdjs) ywmkzjtzdjs,\n" +
+                        "       gly, frdb, cwfzr, jl,js,ds,(select DJZT from uf_dengjizhuangtai where id=a.djzt) djzt,(select SFWBBDW from uf_shifouweibingbia where id = a.sfwbbdw) sfwbbdw,gs,mgmz,yydz,bz2,dyzy\n" +
+                        "        ,zjfwjgmsgs,sjs,zczb,dz,qymc,zym,ywm,clrq,shxydm,jyfw,gqtsap, fjsc,gqapfj,bafj,GLF,NBJZQ   from uf_jingneiqiyexinxi a where dhlj = " + daohang[5] + " and dhwj = " + daohang[4] + " and dhsj1 = " + daohang[3] + " and dhsj = " + daohang[2] + " and dhej = " + daohang[1] + " and dhyj = " + daohang[0] + "  " + sqls;
+
+                break;
+            case 7:
+//                sql = "select (select dhqj from uf_daohangqiji b where a.dhqj= b.id) name, count(2) num,dhqj code from uf_jingneiqiyexinxi a where dhyj = "+daohang[0]+"  and dhej =  "+daohang[1]+"  and dhsj = "+daohang[2]+"   and dhsj1 = "+daohang[3]+" and  dhwj="+daohang[4]+" and dhlj="+daohang[5]+" and dhqj is not null group by dhqj";
+                sql2 = "select count(1) from uf_jingneiqiyexinxi a where dhqj = " + daohang[6] + " and dhlj = " + daohang[5] + " and dhwj = " + daohang[4] + " and dhsj1 = " + daohang[3] + " and dhsj = " + daohang[2] + "  and dhej = " + daohang[1] + " and dhyj = " + daohang[0] + " " + sqls;
+                sql3 = " select (select DHYJZDXX from uf_daohangyijizidua where id = a.dhyj) dhyj,(select dhej from uf_daohangerji where id = a.dhej) dhej,(select dhsj from  uf_saohangsanji where id = a.dhsj) dhsj\n" +
+                        "        ,(select dhsj from  uf_daohangsiji where id = a.dhsj1) dhsj1,id\n" +
+                        "        ,(select dhwj from  uf_daohangwuji where id = a.dhwj) dhwj,(select dhlj from  uf_daohangliuji where id = a.dhlj) dhlj,(select dhqj from  uf_daohangqiji where id = a.dhqj)  dhqj\n" +
+                        "        ,(select GJDQK from uf_guojiadiquku where id = a.gbdq) gbdq,(select DLQ from uf_dailiqu where id=a.dlq) dlq,(select gslx from uf_gongsileixing where id=a.gslx) gslx,(select bz from uf_bizhong where id=a.bz) bz,\n" +
+                        "        dldflst,(select YWBK from uf_yewubankuai where id=a.ywbk) ywbk,(select YWMKZJTZDJS from uf_jituanzhongdejue where id=a.ywmkzjtzdjs) ywmkzjtzdjs,\n" +
+                        "       gly, frdb, cwfzr, jl,js,ds,(select DJZT from uf_dengjizhuangtai where id=a.djzt) djzt,(select SFWBBDW from uf_shifouweibingbia where id = a.sfwbbdw) sfwbbdw,gs,mgmz,yydz,bz2,dyzy\n" +
+                        "        ,zjfwjgmsgs,sjs,zczb,dz,qymc,zym,ywm,clrq,shxydm,jyfw,gqtsap, fjsc,gqapfj,bafj,GLF,NBJZQ   from uf_jingneiqiyexinxi a where dhqj = " + daohang[6] + " and  dhlj = " + daohang[5] + " and dhwj = " + daohang[4] + " and dhsj1 = " + daohang[3] + " and dhsj = " + daohang[2] + "  and dhej = " + daohang[1] + " and dhyj = " + daohang[0] + "  " + sqls;
+
+
+                break;
+
+        }
+        HashMap<String, Object> hashMap = new HashMap<>();
+        sql2 = sql2 + gl;
+        sql3 = sql3 + gl;
+        log.writeLog("sql1:" + sql);
+        log.writeLog("sql2:" + sql2);
+        log.writeLog("sql3:" + sql3);
+        //查询导航
+        ArrayList<Map<String, Object>> daohangList = new ArrayList<>();
+        if (daohang.length == 7 || daohang.length == 6) {
+            recordSet.execute(sql);
+            while (recordSet.next()) {
+                HashMap<String, Object> map = new HashMap<>();
+                map.put("name", recordSet.getString("name") + "(" + recordSet.getString("num") + ")");
+                map.put("number", recordSet.getString("num"));
+                map.put("nodeid", code + "a" + recordSet.getString("code"));
+                map.put("id", code + "a" + recordSet.getString("code"));
+                map.put("isParent", false);
+                map.put("canClick", true);
+                map.put("dragDisabled", true);
+
+
+                daohangList.add(map);
+//                log.writeLog("导航查询map:" + map.toString());
+            }
+        } else {
+            recordSet.execute(sql);
+
+            while (recordSet.next()) {
+
+
+                HashMap<String, Object> map = new HashMap<>();
+                map.put("name", recordSet.getString("name") + "(" + recordSet.getString("num") + ")");
+                map.put("number", recordSet.getString("num"));
+                map.put("canClick", true);
+                map.put("dragDisabled", true);
+
+                if ("".equals(code)) {
+
+                    map.put("nodeid", recordSet.getString("code"));
+                    map.put("id", recordSet.getString("code"));
+                } else {
+                    map.put("nodeid", code + "a" + recordSet.getString("code"));
+                    map.put("id", code + "a" + recordSet.getString("code"));
+
+                }
+                switch (daohang.length) {
+                    case 1:
+                        if (!"".equals(code)) {
+                            sql4 = sql3 + " and dhej = " + recordSet.getString("code") + " and dhsj is not null";
+                        }
+                        break;
+                    case 2:
+                        sql4 = sql3 + " and dhsj = " + recordSet.getString("code") + " and dhsj1 is not null";
+                        break;
+                    case 3:
+                        sql4 = sql3 + " and dhsj1 = " + recordSet.getString("code") + " and dhwj is not null ";
+                        break;
+                    case 4:
+                        sql4 = sql3 + " and dhwj = " + recordSet.getString("code") + " and dhlj is not null ";
+                        break;
+                    case 5:
+                        sql4 = sql3 + " and dhlj = " + recordSet.getString("code") + " and dhqj is not null ";
+                        break;
+                }
+
+                map.put("isParent", new OAUtils().isHaveNext(sql4 + gl));
+                daohangList.add(map);
+//                log.writeLog("导航查询map:" + map.toString());
+            }
+        }
+        hashMap.put("datas", daohangList);
+
+        log.writeLog("sql4:" + sql4);
+
+
+        //查询企业个数
+        recordSet.execute(sql2);
+        while (recordSet.next()) {
+            hashMap.put("number", recordSet.getString(1));
+            log.writeLog("企业个数:" + recordSet.getString(1));
+        }
+
+
+        //获取管理员模块id
+        sql = "select id from modeinfo where formid = (select id from workflow_bill where tablename = 'uf_guanliyuankuxin')";
+        recordSet.execute(sql);
+        recordSet.next();
+        String glymodeId = recordSet.getString("ID");
+
+        //获取管理员表单id
+        sql = "select id from workflow_bill where tablename = 'uf_guanliyuankuxin'";
+        recordSet.execute(sql);
+        recordSet.next();
+        String glyformId = recordSet.getString("ID");
+
+
+        ArrayList<Map<String, Object>> qiyeList = new ArrayList<>();
+        //查询企业
+        recordSet.execute(sql3 + "   order by  to_date(clrq,'yyyy-MM-dd') ");
+
+        int i = 0;
+        while (recordSet.next()) {
+
+            i++;
+            HashMap<String, Object> map = new HashMap<>();
+            for (String s : recordSet.getColumnName()) {
+                map.put(s, recordSet.getString(s));
+            }
+
+
+            if ("0".equals(map.get("DLDFLST"))) {
+                map.put("DLDFLST", "Yes");
+            } else if ("1".equals(map.get("DLDFLST"))) {
+                map.put("DLDFLST", "No");
+            } else {
+                map.put("DLDFLST", "");
+            }
+
+            //信息卡片的URL
+            map.put("QYMCURL", "/jntchina/workflow/jsp/JumpEnterprise.jsp?id=" + map.get("ID"));
+            map.put("GLYURL", "/spa/cube/index.html#/main/cube/card?type=0&modeId=" + glymodeId + "&formId=" + glyformId + "&billid=" + map.get("GLY"));
+
+            OAUtils oaUtils = new OAUtils();
+            map.put("GLYID", map.get("GLY"));
+            map.put("GLY", oaUtils.getGlyName(map.get("GLY").toString()));
+
+
+            try {
+                map.put("FRDB", oaUtils.getUrl((String) map.get("FRDB")));
+                map.put("CWFZR", oaUtils.getUrl((String) map.get("CWFZR")));
+                map.put("JL", oaUtils.getUrl((String) map.get("JL")));
+                map.put("DS", oaUtils.getUrl((String) map.get("DS")));
+                map.put("JS", oaUtils.getUrl((String) map.get("JS")));
+
+//                map.put("BAFJ", oaUtils.getWenJianUrl((String) map.get("BAFJ")));
+//                map.put("FJSC", oaUtils.getWenJianUrl((String) map.get("FJSC")));
+//                map.put("GQAPFJ", oaUtils.getWenJianUrl((String) map.get("GQAPFJ")));
+
+
+            } catch (Exception e) {
+                log.writeLog("错误:" + e);
+
+            }
+
+            map.put("DJGD", oaUtils.gdStr(map.get("ID").toString(), "uf_jingneiqiyexinxi"));
+
+            //查询出来的数据千分位展示，并保留三位小数
+            DecimalFormat df = new DecimalFormat(",###,##0.000"); //保留二位小数
+            try {
+                BigDecimal GS = new BigDecimal(String.valueOf(map.get("GS")));
+//                BigDecimal MGMZ = new BigDecimal(String.valueOf(map.get("MGMZ")));
+
+                map.put("GS", df.format(GS));
+//                map.put("MGMZ", df.format(MGMZ));
+
+            } catch (Exception e) {
+//                log.writeLog("格式化错误:"+e);
+            }
+            try {
+
+                BigDecimal ZCZB = new BigDecimal(String.valueOf(map.get("ZCZB")));
+                map.put("ZCZB", df.format(ZCZB));
+            } catch (Exception e) {
+                log.writeLog("格式化错误:" + e);
+            }
+            qiyeList.add(map);
+
+        }
+
+        qiyeList.sort(Comparator.comparing((Map<String, Object> o) -> ((String) o.get("QYMC"))));
+        qiyeList.sort(Comparator.comparing((Map<String, Object> o) -> ((String) o.get("CLRQ"))));
+
+        //获取当前用户
+//        User user = HrmUserVarify.getUser (request , response) ;
+//        int uid = user.getUID();
+//        if (uid != 1) {
+//            String username = DataBaseUtils.getFirstValue("select LASTNAME  from HRMRESOURCE where id =  " + user.getUID());
+//            Map<String, String> glyMap = DataBaseUtils.getDataMap("select type,id from uf_guanliyuankuxin where sfzxm = '" + username + "' ");
+//            log.writeLog("用户名:"+username);
+//            log.writeLog("glytype:"+glyMap);
+//
+//            ArrayList<Map<String, Object>> maps = new ArrayList<>();
+//            //判断当前用户是否为超级管理员
+//            if (!glyMap.get("TYPE").equals("0")) {
+//                //判断管理员是否为本人
+//                for (Map<String, Object> map : qiyeList) {
+//                    if ((map.get("GLYID")).toString().equals(glyMap.get("ID"))) {
+//                        maps.add(map);
+//                    }
+//                }
+//
+//                qiyeList = maps;
+//            }
+//
+//
+//
+//        }
+
+
+        hashMap.put("dataSource", qiyeList);
+
+
+        return JSON.toJSONString(hashMap);
+    }
+
+
+    @POST
+    @Path("/getUserByqyid")
+    @Produces({"application/json"})
+    public String getUserByQYID(@Context HttpServletRequest request) {
+        String qyid = request.getParameter("qyid");
+        log.writeLog("qyid:" + qyid);
+
+        String sql = "select id,lastname name from HRMRESOURCE where ','|| (select gxry from UF_JINGNEIQIYEXINXI where id = " + qyid + ") ||',' like '%,'|| id ||',%' ";
+        log.writeLog("获取共享人员的sql:" + sql);
+
+        ArrayList<Map<String, String>> dataList = DataBaseUtils.getDataList(sql);
+        for (Map<String, String> stringMap : dataList) {
+            stringMap.put("id", stringMap.get("ID"));
+            stringMap.put("name", stringMap.get("NAME"));
+
+        }
+        HashMap<String, Object> map = new HashMap<>();
+        map.put("data", dataList);
+        return JSON.toJSONString(map);
+
+    }
+
+    @POST
+    @Path("/updGxry")
+    @Produces({"application/json"})
+    public String updGxry(@Context HttpServletRequest request, @Context HttpServletResponse response, @Context HttpHeaders headers) {
+        String msg = "成功";
+        String code = "1";
+        try {
+            log.writeLog("更新共享人员数据");
+
+            //获取body内容,设置UTF-8格式
+            BufferedReader reader = new BufferedReader(new InputStreamReader(request.getInputStream(), "UTF-8"));
+            //过滤前后空格
+            String body = org.apache.commons.io.IOUtils.toString(reader).trim();
+            log.writeLog("body:" + body);
+
+
+            String value = "";
+
+            JSONObject json = JSON.parseObject(body);
+            JSONArray gxry = json.getJSONArray("gxry");
+            for (int i = 0; i < gxry.size(); i++) {
+                String id = gxry.getJSONObject(i).getString("id");
+                System.out.println("人员" + id);
+                value = value + id + ",";
+
+            }
+            System.out.println("企业" + json.getString("id"));
+
+            String qyid = json.getString("id");
+
+
+            log.writeLog("value分割前:" + value);
+
+            if (value.contains(",")) {
+                value = value.substring(0, value.length() - 1);
+            }
+
+            log.writeLog("value分割后:" + value);
+
+            String sql = "update uf_jingneiqiyexinxi set gxry = '" + value + "' where id = " + qyid;
+            log.writeLog("更新共享人员的sql:" + sql);
+
+            RecordSet recordSet = new RecordSet();
+            recordSet.execute(sql);
+        } catch (Exception e) {
+            msg = "错误" + e;
+            code = "1";
+        }
+
+
+        HashMap<String, Object> map = new HashMap<>();
+        map.put("msg", msg);
+        map.put("code", code);
+        return JSON.toJSONString(map);
+
+    }
+
+
+    @POST
+    @Path("/isGly")
+    @Produces({"application/json"})
+    public String isGly(@Context HttpServletRequest request, @Context HttpServletResponse response, @Context HttpHeaders headers) {
+        
+        User user1 = HrmUserVarify.getUser(request, response);
+
+        String username = DataBaseUtils.getFirstValue("select LASTNAME  from HRMRESOURCE where id =  " + user1.getUID());
+        Map<String, String> glyMap = DataBaseUtils.getDataMap("select count(id) num from uf_guanliyuankuxin where sfzxm = '" + username + "' ");
+        log.writeLog("管理员:"+glyMap);
+        
+        HashMap<String, String> map = new HashMap<>();
+        if ("0".equals(glyMap.get("NUM"))&&user1.getUID() != 1)  {
+            map.put("status", "1");
+            map.put("role", "普通用户");
+        } else {
+            map.put("status", "0");
+            map.put("role", "管理员");
+        } 
+
+        return JSON.toJSONString(map);
+
+    }
+
+    @GET
+    @Path("/isGlyGet")
+    @Produces({"application/json"})
+    public String isGlyget(@Context HttpServletRequest request, @Context HttpServletResponse response, @Context HttpHeaders headers) {
+
+        User user1 = HrmUserVarify.getUser(request, response);
+
+        String username = DataBaseUtils.getFirstValue("select LASTNAME  from HRMRESOURCE where id =  " + user1.getUID());
+        Map<String, String> glyMap = DataBaseUtils.getDataMap("select count(id) num from uf_guanliyuankuxin where sfzxm = '" + username + "' ");
+        log.writeLog("管理员:"+glyMap);
+
+        HashMap<String, String> map = new HashMap<>();
+        if ("0".equals(glyMap.get("NUM"))&&user1.getUID() != 1)  {
+            map.put("status", "1");
+            map.put("role", "普通用户");
+        } else {
+            map.put("status", "0");
+            map.put("role", "管理员");
+        }
+
+        return JSON.toJSONString(map);
+
+    }
+
+
+}
\ No newline at end of file
diff --git a/src/main/youhong_ai_jitu_src/jntchina/service/oa/HisEnterpriseAPI.java b/src/main/youhong_ai_jitu_src/jntchina/service/oa/HisEnterpriseAPI.java
new file mode 100644
index 0000000..72f8f0c
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/service/oa/HisEnterpriseAPI.java
@@ -0,0 +1,475 @@
+package jntchina.service.oa;
+
+import com.alibaba.fastjson.JSON;
+import jntchina.util.DataBaseUtils;
+import selfdev.util.log.LogTool;
+import weaver.conn.RecordSet;
+import weaver.general.Util;
+import weaver.hrm.HrmUserVarify;
+import weaver.hrm.User;
+
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.ws.rs.*;
+import javax.ws.rs.core.Context;
+import java.math.BigDecimal;
+import java.text.DecimalFormat;
+import java.time.LocalDate;
+import java.util.*;
+
+/**
+ * @title: EnterpriseAPI企业版本信息api
+ * @Author ycf
+ * @Date: 2021/11/1 15:32
+ * @Version 1.0
+ */
+@Path("/HisEnterpriseAPI")
+public class HisEnterpriseAPI {
+    private final LogTool log = new LogTool("/log/api/lqiye/", false);
+
+
+    @POST
+    @Path("/getHisEquityInfo")
+    @Produces({"application/json"})
+    public String getHisEquityInfo(@Context HttpServletRequest request) {
+        String name = request.getParameter("name");
+        String bbrq = request.getParameter("bbrq");
+        RecordSet recordSet = new RecordSet();
+        String sql = "";
+        sql = "select qyid from  formtable_main_3055 where qymc =  '" + name + "'";
+        recordSet.execute(sql);
+        recordSet.next();
+        String qyid = recordSet.getString("qyid");
+        sql = "select json from uf_gqjgbb where qyid = " + qyid + " and bbrq = " + bbrq;
+        recordSet.execute(sql);
+        recordSet.next();
+        String json = recordSet.getString("json");
+        log.writeLog("json:" + json);
+
+
+        return json;
+    }
+
+
+    /**
+     * 获取下一级目录  (历史)
+     *
+     * @param request 请求的参数
+     *                code 导航树id
+     *                date 日期
+     * @return 企业信息和目录信息
+     */
+    @POST
+    @Path("/getHisDirs")
+    @Produces({"application/json"})
+    public String getHisDir(@Context HttpServletRequest request, @Context HttpServletResponse response) {
+
+        String code = request.getParameter("id");
+//        code = "1a2a1a2a1a2a3";
+        String search = Util.null2String(request.getParameter("search"));
+        String date = request.getParameter("date");
+        log.writeLog("获取的id:" + code);
+        String[] daohang = code.split("a");
+
+        StringBuilder sqls = new StringBuilder();
+        String cc = search;
+        if ("yes".contains(search.toLowerCase())) {
+            cc = "%0%";
+        }
+        if ("no".contains(search.toLowerCase())) {
+            cc = "%1%";
+        }
+        //当模糊搜索不为空时，拼接
+        if (!"".equals(search.trim())) {
+            sqls.append(" and ( \n" +
+                    "        lower(qymc) like lower('%" + search + "%') or lower(clrq)   like lower('%" + search + "%') or lower(ZYM)  like lower('%" + search + "%') or\n" +
+                    "        lower(YWM)  like lower('%" + search + "%') or lower(SHXYDM) like lower('%" + search + "%') or lower(ZCZB) like lower('%" + search + "%') or\n" +
+                    "        lower(GS)   like lower('%" + search + "%') or lower(MGMZ)   like lower('%" + search + "%') or lower(DZ)   like lower('%" + search + "%') or\n" +
+                    "        lower(YYDZ) like lower('%" + search + "%') or lower(dyzy)   like lower('%" + search + "%') or lower(JYFW) like lower('%" + search + "%') or " +
+                    "        lower(BZ)   like lower('%" + search + "%') or lower(NBJZQ)  like lower('%" + search + "%') or      \n" +
+
+                    "        GBDQ in (select b.id from uf_guojiadiquku b where lower(GJDQK) like lower('%" + search + "%')) or\n" +
+                    "        DLQ in (select b.ID from uf_dailiqu b where lower(b.DLQ) like lower('%" + search + "%')) or\n" +
+                    "        GSLX in  (select b.id from uf_gongsileixing b where lower(b.GSLX) like lower('%" + search + "%')) or\n" +
+                    "        DJZT in (select b.ID from uf_dengjizhuangtai b where lower(b.DJZT) like lower('%" + search + "%')) or\n" +
+                    "        BZ in (select b.id from uf_bizhong b where lower(b.BZ) like lower('%" + search + "%')) or\n" +
+                    "        DLDFLST like '" + cc + "' or\n" +
+                    "        glf like '" + cc + "' or\n" +
+                    "        YWBK in (select b.id from uf_yewubankuai b where lower(b.YWBK) like lower('%" + search + "%')) or\n" +
+                    "        YWMKZJTZDJS in (select b.id from uf_jituanzhongdejue b where lower(b.YWMKZJTZDJS) like lower('%" + search + "%')) or\n" +
+                    "        SFWBBDW in (select b.id from uf_shifouweibingbia b where lower(b.SFWBBDW) like lower('%" + search + "%')) " +
+//                    "or\n" +
+////                    "        FJSC in (select b.DOCID from docimagefile b where b.IMAGEFILENAME like '%"+search+"%') or\n" +
+//                    "        GQAPFJ in (select b.DOCID from docimagefile b where b.IMAGEFILENAME like '%"+search+"%') or\n" +
+//                    "        BAFJ in (select b.DOCID from docimagefile b where b.IMAGEFILENAME like '%"+search+"%')\n" +
+                    "     or GLY in   (select b.id from UF_GUANLIYUANKUXIN b where lower(SFZXM) like lower('%" + search + "%'))" +
+//                    " or\n" +
+//                    "        ','||UF_JINGNEIQIYEXINXI.CWFZR||','  like  '%,"+search+",%' or\n" +
+//                    "        ','||UF_JINGNEIQIYEXINXI.CWFZR||','  like  '%,"+search+",%' or\n" +
+//                    "        ','||UF_JINGNEIQIYEXINXI.CWFZR||','  like  '%,"+search+",%' or\n" +
+//                    "        ','||UF_JINGNEIQIYEXINXI.CWFZR||','  like  '%,"+search+",%' or\n" +
+//                    "        ','||UF_JINGNEIQIYEXINXI.CWFZR||','  like  '%,"+search+",%' " +
+                    " ");
+
+            ArrayList<String> list = DataBaseUtils.getList("select id from UF_RENYUANXINXIKU where xm like '%" + search + "%' ");
+            for (String s : list) {
+                sqls.append(" or  ','||CWFZR||','  like  '%," + s + ",%'  " +
+                        " or  ','||FRDB||','  like  '%," + s + ",%'  " +
+                        " or  ','||JS||','  like  '%," + s + ",%'  " +
+                        " or  ','||DS||','  like  '%," + s + ",%'  " +
+                        " or  ','||JL||','  like  '%," + s + ",%'  ");
+            }
+        }
+
+        //登记股东   张三有限责任公司/50%
+        if (!"".equals(search)) {
+
+            String[] strs = search.replace("%", "").split("/");
+            sqls.append(" or id in (select MAINID from formtable_main_3055_DT2 where DJGD  in (select ids from V_CHIGU where name like '%").append(strs[0]).append("%')  ");
+            if (strs.length == 2) {
+                sqls.append(" and CGBL like '%").append(strs[1]).append("%') ");
+            } else {
+                sqls.append(" ) ");
+            }
+
+        }
+
+        if (date.equals("")) {
+            date = LocalDate.now().toString();
+        }
+
+
+        if (sqls.toString().contains(" and ( ")) {
+            sqls.append(" ) ");
+        }
+
+
+
+        String gl = "";
+
+        //过滤管理员和三方权限
+        User user1 = HrmUserVarify.getUser (request , response) ;
+        int uid1 = user1.getUID();
+        if (uid1 != 1) {
+            String username = DataBaseUtils.getFirstValue("select LASTNAME  from HRMRESOURCE where id =  " + user1.getUID());
+            Map<String, String> glyMap = DataBaseUtils.getDataMap("select type,id from uf_guanliyuankuxin where sfzxm = '" + username + "' ");
+            log.writeLog("用户名:"+username);
+            log.writeLog("glytype:"+glyMap);
+
+            ArrayList<Map<String, Object>> maps = new ArrayList<>();
+            //判断当前用户是否为超级管理员
+            if (!glyMap.get("TYPE").equals("0")) {
+                //判断管理员是否为本人
+                gl = " and  gly = '"+glyMap.get("ID")+"'  ";
+            }
+        }
+
+
+
+
+
+
+
+
+        log.writeLog("参数code：" + code);
+        //导航
+        String sql = "";
+        //企业个数
+        String sql2 = "";
+        //企业
+        String sql3 = "";
+        //是否为父节点
+        String sql4 = "";
+        RecordSet recordSet = new RecordSet();
+
+        log.writeLog("进入第:" + daohang.length + "层");
+
+        String s = "(select DHYJZDXX from uf_daohangyijizidua where id = a.dhyj) dhyj,(select dhej from uf_daohangerji where id = a.dhej) dhej,(select dhsj from  uf_saohangsanji where id = a.dhsj) dhsj\n" +
+                " ,(select dhsj from  uf_daohangsiji where id = a.dhsj1) dhsj1,id,qyid \n" +
+                " ,(select dhwj from  uf_daohangwuji where id = a.dhwj) dhwj,(select dhlj from  uf_daohangliuji where id = a.dhlj) dhlj,(select dhqj from  uf_daohangqiji where id = a.dhqj)  dhqj\n" +
+                ",(select GJDQK from uf_guojiadiquku where id = a.gbdq) gbdq,(select DLQ from uf_dailiqu where id=a.dlq) dlq,(select gslx from uf_gongsileixing where id=a.gslx) gslx,(select bz from uf_bizhong where id=a.bz) bz,\n" +
+                " dldflst,(select YWBK from uf_yewubankuai where id=a.ywbk) ywbk,(select YWMKZJTZDJS from uf_jituanzhongdejue where id=a.ywmkzjtzdjs) ywmkzjtzdjs,\n" +
+                " gly, frdb, cwfzr,jl, fjsc,bafj,gqapfj,  \n" +
+                " js,\n" +
+                " ds,(select DJZT from uf_dengjizhuangtai where id=a.djzt) djzt,(select SFWBBDW from uf_shifouweibingbia where id = a.sfwbbdw) sfwbbdw,gs,mgmz,yydz,bz2,dyzy\n" +
+                ",zjfwjgmsgs,sjs,zczb,dz,qymc,zym,ywm,clrq,shxydm,jyfw,gqtsap,GLF,NBJZQ,";
+        switch (daohang.length) {
+            case 1:
+                if ("".equals(code)) {
+
+                    //默认中国大陆
+                    sql = "select (select DHYJZDXX from uf_daohangyijizidua c where b.dhyj=c.id) name,count(1) num,dhyj code   from(   select a.*, rank() over(partition by a.qyid   order by to_date(bbrq,'yyyy-MM-dd') desc) rn   from formtable_main_3055  a where to_date(clrq, 'YYYY-MM-DD') <=to_date('" + date + "', 'YYYY-MM-DD') " + sqls+gl + " ) b  where b.rn=1 group by dhyj   order by dhyj ";
+                    sql2 = "select  count(1) nums from(   select a.*, rank() over(partition by a.qyid   order by to_date(bbrq,'yyyy-MM-dd') desc) rn   from formtable_main_3055  a where to_date(bbrq, 'YYYY-MM-DD') <=to_date('" + date + "', 'YYYY-MM-DD') and  to_date(clrq, 'YYYY-MM-DD') <=to_date('" + date + "', 'YYYY-MM-DD') " + sqls + " ) b  where b.rn=1 ";
+                    sql3 = "select * from(   select " + s + " rank() over(partition by a.qyid   order by to_date(bbrq,'yyyy-MM-dd') desc) rn   from formtable_main_3055  a where to_date(bbrq, 'YYYY-MM-DD') <=to_date('" + date + "', 'YYYY-MM-DD')  and  to_date(clrq, 'YYYY-MM-DD') <=to_date('" + date + "', 'YYYY-MM-DD') " + sqls + " ) b  where b.rn=1   ";
+                    sql4 = "select * from(   select a.*, rank() over(partition by a.qyid   order by to_date(bbrq,'yyyy-MM-dd') desc) rn   from formtable_main_3055  a where   to_date(clrq, 'YYYY-MM-DD') <=to_date('" + date + "', 'YYYY-MM-DD')) b  where b.rn=1   and dhej is not null ";
+
+
+                } else {
+                    sql = "select  (select DHEJ from  uf_daohangerji c where b.dhej=c.id) name,count(1) num,dhej code from (   select a.*, rank() over(partition by a.qyid   order by to_date(bbrq,'yyyy-MM-dd')) rn   from formtable_main_3055  a where to_date(clrq, 'YYYY-MM-DD') <=to_date('" + date + "', 'YYYY-MM-DD') " + sqls+gl + " ) b  where b.rn=1 and DHYJ=" + daohang[0] + " group by dhej ";
+                    sql2 = "select count(1) nums from (   select a.*, rank() over(partition by a.qyid   order by to_date(bbrq,'yyyy-MM-dd') desc) rn   from formtable_main_3055  a where to_date(bbrq, 'YYYY-MM-DD') <=to_date('" + date + "', 'YYYY-MM-DD') and  to_date(clrq, 'YYYY-MM-DD') <=to_date('" + date + "', 'YYYY-MM-DD') " + sqls + " ) b  where b.rn=1 and dhyj = " + daohang[0];
+                    sql3 = " select * from (   select " + s + " rank() over(partition by a.qyid   order by to_date(bbrq,'yyyy-MM-dd') desc) rn   from formtable_main_3055  a where to_date(bbrq, 'YYYY-MM-DD') <=to_date('" + date + "', 'YYYY-MM-DD') and dhyj = " + daohang[0] + "  and  to_date(clrq, 'YYYY-MM-DD') <=to_date('" + date + "', 'YYYY-MM-DD') " + sqls + " ) b  where b.rn=1   ";
+
+                }
+                break;
+            case 2:
+                sql = "select  (select DHSJ from   uf_saohangsanji c where b.DHSJ =c.id) name,count(2) num,dhsj code  from  (   select a.*, rank() over(partition by a.qyid   order by to_date(bbrq,'yyyy-MM-dd') desc) rn   from formtable_main_3055  a where to_date(clrq, 'YYYY-MM-DD') <=to_date('" + date + "', 'YYYY-MM-DD') " + sqls+gl + " ) b  where b.rn=1 and dhyj=" + daohang[0] + " and dhej=" + daohang[1] + " and dhsj is not null  group by dhsj";
+                sql2 = "select count(1) nums from (   select a.*, rank() over(partition by a.qyid   order by to_date(bbrq,'yyyy-MM-dd') desc) rn   from formtable_main_3055  a where to_date(bbrq, 'YYYY-MM-DD') <=to_date('" + date + "', 'YYYY-MM-DD')  and  to_date(clrq, 'YYYY-MM-DD') <=to_date('" + date + "', 'YYYY-MM-DD') " + sqls + " ) b  where b.rn=1 and dhej = " + daohang[1] + " and dhyj = " + daohang[0] + "";
+                sql3 = " select * from (   select " + s + " rank() over(partition by a.qyid   order by to_date(bbrq,'yyyy-MM-dd') desc) rn   from formtable_main_3055  a where to_date(bbrq, 'YYYY-MM-DD') <=to_date('" + date + "', 'YYYY-MM-DD') and dhej = " + daohang[1] + " and dhyj = " + daohang[0] + "  and  to_date(clrq, 'YYYY-MM-DD') <=to_date('" + date + "', 'YYYY-MM-DD') " + sqls + " ) b  where b.rn=1    ";
+
+                break;
+            case 3:
+                sql = "select  (select DHSJ from  uf_daohangsiji c where b.DHSJ1 =c.id) name,count(2) num ,dhsj1 code from  (   select a.*, rank() over(partition by a.qyid   order by to_date(bbrq,'yyyy-MM-dd') desc) rn   from formtable_main_3055  a where to_date(clrq, 'YYYY-MM-DD') <=to_date('" + date + "', 'YYYY-MM-DD') " + sqls+gl + " ) b  where b.rn=1 and dhyj=" + daohang[0] + " and dhej=" + daohang[1] + " and  dhsj=" + daohang[2] + "  and dhsj1 is not null  group by dhsj1";
+                sql2 = "select count(1) nums from (   select a.*, rank() over(partition by a.qyid   order by to_date(bbrq,'yyyy-MM-dd') desc) rn   from formtable_main_3055  a where to_date(bbrq, 'YYYY-MM-DD') <=to_date('" + date + "', 'YYYY-MM-DD')   and  to_date(clrq, 'YYYY-MM-DD') <=to_date('" + date + "', 'YYYY-MM-DD') " + sqls + " ) b  where b.rn=1 and  dhsj = " + daohang[2] + "  and dhej = " + daohang[1] + " and dhyj = " + daohang[0] + "";
+                sql3 = " select * from (   select " + s + " rank() over(partition by a.qyid   order by to_date(bbrq,'yyyy-MM-dd') desc) rn   from formtable_main_3055  a where to_date(bbrq, 'YYYY-MM-DD') <=to_date('" + date + "', 'YYYY-MM-DD') and  dhsj = " + daohang[2] + "  and dhej = " + daohang[1] + " and dhyj = " + daohang[0] + "  and  to_date(clrq, 'YYYY-MM-DD') <=to_date('" + date + "', 'YYYY-MM-DD') " + sqls + " ) b  where b.rn=1   ";
+
+                break;
+            case 4:
+                sql = "select (select DHWJ from uf_daohangwuji c where b.DHWJ = c.id) name, count(2) num,DHWJ code from (   select a.*, rank() over(partition by a.qyid   order by to_date(bbrq,'yyyy-MM-dd') desc) rn   from formtable_main_3055  a where to_date(clrq, 'YYYY-MM-DD') <to_date('" + date + "', 'YYYY-MM-DD') " + sqls+gl + " ) b  where b.rn=1 and dhyj = " + daohang[0] + "   and dhej = " + daohang[1] + "   and dhsj = " + daohang[2] + "   and dhsj1 = " + daohang[3] + "   and DHWJ is not null group by DHWJ";
+                sql2 = "select count(1) nums from (   select a.*, rank() over(partition by a.qyid   order by to_date(bbrq,'yyyy-MM-dd') desc) rn   from formtable_main_3055  a where to_date(bbrq, 'YYYY-MM-DD') <=to_date('" + date + "', 'YYYY-MM-DD')  and  to_date(clrq, 'YYYY-MM-DD') <=to_date('" + date + "', 'YYYY-MM-DD') " + sqls + " ) b  where b.rn=1 and  dhsj1 = " + daohang[3] + " and dhsj = " + daohang[2] + "  and dhej = " + daohang[1] + " and dhyj = " + daohang[0] + "";
+                sql3 = " select * from (   select " + s + " rank() over(partition by a.qyid   order by to_date(bbrq,'yyyy-MM-dd') desc) rn   from formtable_main_3055  a where to_date(bbrq, 'YYYY-MM-DD') <=to_date('" + date + "', 'YYYY-MM-DD') and  dhsj1 = " + daohang[3] + " and dhsj = " + daohang[2] + "  and dhej = " + daohang[1] + " and dhyj = " + daohang[0] + "  and  to_date(clrq, 'YYYY-MM-DD') <=to_date('" + date + "', 'YYYY-MM-DD') " + sqls + " ) b  where b.rn=1    ";
+
+                break;
+            case 5:
+                sql = "select (select dhlj from uf_daohangliuji c where b.dhlj = c.id) name, count(2) num,dhlj code from (   select a.*, rank() over(partition by a.qyid   order by to_date(bbrq,'yyyy-MM-dd') desc) rn   from formtable_main_3055  a where to_date(clrq, 'YYYY-MM-DD') <=to_date('" + date + "', 'YYYY-MM-DD') " + sqls+gl + " ) b  where b.rn=1 and  dhyj = " + daohang[0] + "   and dhej = " + daohang[1] + "   and dhsj = " + daohang[2] + "   and dhsj1 = " + daohang[3] + " and  dhwj=" + daohang[4] + " and dhlj is not null group by dhlj ";
+                sql2 = "select count(1) nums from (   select a.*, rank() over(partition by a.qyid   order by to_date(bbrq,'yyyy-MM-dd') desc) rn   from formtable_main_3055  a where to_date(bbrq, 'YYYY-MM-DD') <=to_date('" + date + "', 'YYYY-MM-DD')  and  to_date(clrq, 'YYYY-MM-DD') <=to_date('" + date + "', 'YYYY-MM-DD') " + sqls + " ) b  where b.rn=1 and dhwj = " + daohang[4] + " and dhsj1 = " + daohang[3] + " and dhsj = " + daohang[2] + "  and dhej = " + daohang[1] + " and dhyj = " + daohang[0] + "";
+                sql3 = " select * from (   select " + s + " rank() over(partition by a.qyid   order by to_date(bbrq,'yyyy-MM-dd') desc) rn   from formtable_main_3055  a where to_date(bbrq, 'YYYY-MM-DD') <=to_date('" + date + "', 'YYYY-MM-DD') and dhwj = " + daohang[4] + " and dhsj1 = " + daohang[3] + " and dhsj = " + daohang[2] + "  and dhej = " + daohang[1] + " and dhyj = " + daohang[0] + "  and  to_date(clrq, 'YYYY-MM-DD') <=to_date('" + date + "', 'YYYY-MM-DD') " + sqls + " ) b  where b.rn=1   ";
+
+                break;
+            case 6:
+                sql = "select (select dhqj from uf_daohangqiji c where b.dhqj= c.id) name, count(2) num,dhqj code from (   select a.*, rank() over(partition by a.qyid   order by to_date(bbrq,'yyyy-MM-dd') desc ) rn   from formtable_main_3055  a where   to_date(clrq, 'YYYY-MM-DD') <=to_date('" + date + "', 'YYYY-MM-DD') " + sqls+gl + " ) b  where b.rn=1 and dhyj = " + daohang[0] + "  and dhej =  " + daohang[1] + "  and dhsj =  " + daohang[2] + "  and dhsj1 = " + daohang[3] + " and  dhwj=" + daohang[4] + " and dhlj=" + daohang[5] + " and dhqj is not null group by dhqj";
+                sql2 = "select count(1) nums from (   select a.*, rank() over(partition by a.qyid   order by to_date(bbrq,'yyyy-MM-dd') desc) rn   from formtable_main_3055  a where to_date(bbrq, 'YYYY-MM-DD') <=to_date('" + date + "', 'YYYY-MM-DD')  and  to_date(clrq, 'YYYY-MM-DD') <=to_date('" + date + "', 'YYYY-MM-DD') " + sqls + " ) b  where b.rn=1 and dhlj = " + daohang[5] + " and dhwj = " + daohang[4] + " and dhsj1 = " + daohang[3] + " and dhsj = " + daohang[2] + "  and dhej = " + daohang[1] + " and dhyj = " + daohang[0] + "";
+                sql3 = " select * from (   select " + s + " rank() over(partition by a.qyid   order by to_date(bbrq,'yyyy-MM-dd') desc) rn   from formtable_main_3055  a where to_date(bbrq, 'YYYY-MM-DD') <=to_date('" + date + "', 'YYYY-MM-DD') and dhlj = " + daohang[5] + " and dhwj = " + daohang[4] + " and dhsj1 = " + daohang[3] + " and dhsj = " + daohang[2] + " and dhej = " + daohang[1] + " and dhyj = " + daohang[0] + "  and  to_date(clrq, 'YYYY-MM-DD') <=to_date('" + date + "', 'YYYY-MM-DD') " + sqls + " ) b  where b.rn=1   ";
+
+                break;
+            case 7:
+//                sql = "select (select dhqj from uf_daohangqiji b where a.dhqj= b.id) name, count(2) num,dhqj code from uf_jingneiqiyexinxi a where dhyj = "+daohang[0]+"  and dhej =  "+daohang[1]+"  and dhsj = "+daohang[2]+"   and dhsj1 = "+daohang[3]+" and  dhwj="+daohang[4]+" and dhlj="+daohang[5]+" and dhqj is not null group by dhqj";
+                sql2 = "select count(1) nums from (   select a.*, rank() over(partition by a.qyid   order by to_date(bbrq,'yyyy-MM-dd') desc) rn   from formtable_main_3055  a where to_date(clrq, 'YYYY-MM-DD') <=to_date('" + date + "', 'YYYY-MM-DD') " + sqls + " ) b  where b.rn=1 and dhqj = " + daohang[6] + " and dhlj = " + daohang[5] + " and dhwj = " + daohang[4] + " and dhsj1 = " + daohang[3] + " and dhsj = " + daohang[2] + "  and dhej = " + daohang[1] + " and dhyj = " + daohang[0];
+                sql3 = " select * from (   select " + s + " rank() over(partition by a.qyid   order by to_date(bbrq,'yyyy-MM-dd') desc) rn   from formtable_main_3055  a where to_date(bbrq, 'YYYY-MM-DD') <=to_date('" + date + "', 'YYYY-MM-DD') and dhqj = " + daohang[6] + " and  dhlj = " + daohang[5] + " and dhwj = " + daohang[4] + " and dhsj1 = " + daohang[3] + " and dhsj = " + daohang[2] + "  and dhej = " + daohang[1] + " and dhyj = " + daohang[0] + "  and  to_date(clrq, 'YYYY-MM-DD') <=to_date('" + date + "', 'YYYY-MM-DD') " + sqls + " ) b  where b.rn=1 ";
+
+
+                break;
+
+        }
+
+        HashMap<String, Object> hashMap = new HashMap<>();
+
+        sql3 = sql3 + gl;
+        log.writeLog("sql1:" + sql);
+        log.writeLog("sql2:" + sql2);
+        log.writeLog("sql3:" + sql3);
+
+
+        //查询导航,每个树节点对应一个id  例如1a2a2a1，通过id拼接
+        ArrayList<Map<String, Object>> daohangList = new ArrayList<>();
+        if (daohang.length == 7 || daohang.length == 6) {
+            recordSet.execute(sql);
+            while (recordSet.next()) {
+
+                HashMap<String, Object> map = new HashMap<>();
+                map.put("name", recordSet.getString("name") + "(" + recordSet.getString("num") + ")");
+                map.put("number", recordSet.getString("num"));
+                map.put("nodeid", code + "a" + recordSet.getString("code"));
+                map.put("id", code + "a" + recordSet.getString("code"));
+                map.put("isParent", false);
+                map.put("canClick", true);
+                map.put("dragDisabled", true);
+
+                daohangList.add(map);
+            }
+        } else {
+            recordSet.execute(sql);
+
+            while (recordSet.next()) {
+
+                HashMap<String, Object> map = new HashMap<>();
+                map.put("name", recordSet.getString("name") + "(" + recordSet.getString("num") + ")");
+                map.put("number", recordSet.getString("num"));
+                map.put("canClick", true);
+                map.put("dragDisabled", true);
+
+                if ("".equals(code)) {
+
+                    map.put("nodeid", recordSet.getString("code"));
+                    map.put("id", recordSet.getString("code"));
+                } else {
+                    map.put("nodeid", code + "a" + recordSet.getString("code"));
+                    map.put("id", code + "a" + recordSet.getString("code"));
+
+                }
+
+                //判断是否为父节点的SQL
+                switch (daohang.length) {
+                    case 1:
+                        if (!"".equals(code)) {
+                            sql4 = " select * from (   select a.*, rank() over(partition by a.qyid   order by to_date(bbrq,'yyyy-MM-dd') desc) rn   from formtable_main_3055  a where to_date(clrq, 'YYYY-MM-DD') <=to_date('" + date + "', 'YYYY-MM-DD')) b  where b.rn=1 and dhyj = " + daohang[0] + " and dhej = " + recordSet.getString("code") + " and dhsj is not null";
+                        }
+                        break;
+                    case 2:
+                        sql4 = " select * from (   select a.*, rank() over(partition by a.qyid   order by to_date(bbrq,'yyyy-MM-dd') desc) rn   from formtable_main_3055  a where to_date(clrq, 'YYYY-MM-DD') <=to_date('" + date + "', 'YYYY-MM-DD')) b  where b.rn=1 and dhej = " + daohang[1] + " and dhyj = " + daohang[0] + " and dhsj = " + recordSet.getString("code") + " and dhsj1 is not null";
+                        break;
+                    case 3:
+                        sql4 = " select * from (   select a.*, rank() over(partition by a.qyid   order by to_date(bbrq,'yyyy-MM-dd') desc) rn   from formtable_main_3055  a where to_date(clrq, 'YYYY-MM-DD') <=to_date('" + date + "', 'YYYY-MM-DD')) b  where b.rn=1 and  dhsj = " + daohang[2] + "  and dhej = " + daohang[1] + " and dhyj = " + daohang[0] + " and dhsj1 = " + recordSet.getString("code") + " and dhwj is not null ";
+                        break;
+                    case 4:
+                        sql4 = " select * from (   select a.*, rank() over(partition by a.qyid   order by to_date(bbrq,'yyyy-MM-dd') desc) rn   from formtable_main_3055  a where to_date(clrq, 'YYYY-MM-DD') <=to_date('" + date + "', 'YYYY-MM-DD')) b  where b.rn=1 and  dhsj1 = " + daohang[3] + " and dhsj = " + daohang[2] + "  and dhej = " + daohang[1] + " and dhyj = " + daohang[0] + " and dhwj = " + recordSet.getString("code") + " and dhlj is not null ";
+                        break;
+                    case 5:
+                        sql4 = " select * from (   select a.*, rank() over(partition by a.qyid   order by to_date(bbrq,'yyyy-MM-dd') desc) rn   from formtable_main_3055  a where to_date(clrq, 'YYYY-MM-DD') <=to_date('" + date + "', 'YYYY-MM-DD')) b  where b.rn=1 and dhwj = " + daohang[4] + " and dhsj1 = " + daohang[3] + " and dhsj = " + daohang[2] + "  and dhej = " + daohang[1] + " and dhyj = " + daohang[0] + " and dhlj = " + recordSet.getString("code") + " and dhqj is not null ";
+                        break;
+                }
+
+                log.writeLog("查询sql4:" + sql4);
+                map.put("isParent", new OAUtils().isHaveNext(sql4+gl));
+                daohangList.add(map);
+            }
+        }
+        hashMap.put("datas", daohangList);
+
+        log.writeLog("sql4:" + sql4+gl);
+
+
+//        //查询企业个数
+//        recordSet.execute(sql2);
+//        while (recordSet.next()) {
+//            hashMap.put("number", recordSet.getString("nums"));
+//            log.writeLog("企业个数:" + recordSet.getString("nums"));
+//        }
+
+
+        recordSet = new RecordSet();
+        //找到各个模块id和表单id拼接url，用于跳转url
+        //获取模块id
+        sql = "select id from modeinfo where formid = (select id from workflow_bill where tablename = 'formtable_main_3055')";
+        log.writeLog("获取模块id:" + sql);
+
+        recordSet.execute(sql);
+        recordSet.next();
+        String modeId = recordSet.getString("ID");
+        //获取表单id
+        sql = "select id from workflow_bill where tablename = 'formtable_main_3055'";
+        log.writeLog("获取表单id:" + sql);
+        recordSet.execute(sql);
+        recordSet.next();
+        String formId = recordSet.getString("ID");
+        //获取管理员模块id
+        sql = "select id from modeinfo where formid = (select id from workflow_bill where tablename = 'uf_guanliyuankuxin')";
+        recordSet.execute(sql);
+        recordSet.next();
+        String glymodeId = recordSet.getString("ID");
+
+        //获取管理员表单id
+        sql = "select id from workflow_bill where tablename = 'uf_guanliyuankuxin'";
+        recordSet.execute(sql);
+        recordSet.next();
+        String glyformId = recordSet.getString("ID");
+
+
+        ArrayList<Map<String, Object>> qiyeList = new ArrayList<>();
+        //获取所有企业
+
+
+        //查询架构表中企业，从所有企业的集合中剔除
+        recordSet.execute(sql3);
+        while (recordSet.next()) {
+
+
+            HashMap<String, Object> map = new HashMap<>();
+            for (String s1 : recordSet.getColumnName()) {
+                map.put(s1, recordSet.getString(s1));
+            }
+
+            if ("0".equals(map.get("DLDFLST"))) {
+                map.put("DLDFLST", "Yes");
+            } else if ("1".equals(map.get("DLDFLST"))) {
+                map.put("DLDFLST", "No");
+            } else {
+                map.put("DLDFLST", "");
+            }
+
+
+            map.put("QYMCURL", "/spa/cube/index.html#/main/cube/card?type=0&modeId=" + modeId + "&formId=" + formId + "&billid=" + map.get("ID"));
+            map.put("GLYURL", "/spa/cube/index.html#/main/cube/card?type=0&modeId=" + glymodeId + "&formId=" + glyformId + "&billid=" + map.get("GLY"));
+
+
+            OAUtils oaUtils = new OAUtils();
+
+            map.put("GLY", oaUtils.getGlyName(map.get("GLY").toString()));
+            map.put("GLYID", Util.null2String(map.get("GLY")));
+            //因为会存在多个人员的情况，还得重新包装成集合
+            try {
+                map.put("FRDB", oaUtils.getUrl((String) map.get("FRDB")));
+                map.put("CWFZR", oaUtils.getUrl((String) map.get("CWFZR")));
+                map.put("JL", oaUtils.getUrl((String) map.get("JL")));
+                map.put("DS", oaUtils.getUrl((String) map.get("DS")));
+
+                map.put("JS", oaUtils.getUrl((String) map.get("JS")));
+
+                map.put("BAFJ", oaUtils.getWenJianUrl((String) map.get("BAFJ")));
+                map.put("FJSC", oaUtils.getWenJianUrl((String) map.get("FJSC")));
+                map.put("GQAPFJ", oaUtils.getWenJianUrl((String) map.get("GQAPFJ")));
+
+
+            } catch (Exception e) {
+                log.writeLog("错误:" + e);
+
+            }
+            //拼接登记股东
+            map.put("DJGD", oaUtils.gdStr(map.get("ID").toString(), "formtable_main_3055"));
+            //查询出来的数据千分位展示，并保留三位小数,注册资本可能为中文会报错
+            DecimalFormat df = new DecimalFormat(",###,##0.000"); //保留三位小数
+            try {
+                BigDecimal GS = new BigDecimal(String.valueOf(map.get("GS")));
+//                BigDecimal MGMZ = new BigDecimal(String.valueOf(map.get("MGMZ")));
+
+                map.put("GS", df.format(GS));
+//                map.put("MGMZ", df.format(MGMZ));
+            } catch (Exception e) {
+                log.writeLog("格式化错误:" + e);
+
+            }
+            try {
+                BigDecimal ZCZB = new BigDecimal(String.valueOf(map.get("ZCZB")));
+                map.put("ZCZB", df.format(ZCZB));
+            } catch (Exception e) {
+                log.writeLog("格式化错误:" + e);
+            }
+
+            qiyeList.add(map);
+
+        }
+        //所有企业根据list》map中的成立日期排序,从小到大
+
+        qiyeList.sort(Comparator.comparing((Map<String, Object> o) -> ((String) o.get("QYMC"))));
+        qiyeList.sort(Comparator.comparing((Map<String, Object> o) -> ((String) o.get("CLRQ"))));
+
+
+//        //获取当前用户
+//        User user = HrmUserVarify.getUser (request , response) ;
+//        int uid = user.getUID();
+//        if (uid != 1) {
+//            String username = DataBaseUtils.getFirstValue("select LASTNAME  from HRMRESOURCE where id =  " + user.getUID());
+//            Map<String, String> glyMap = DataBaseUtils.getDataMap("select type,id from uf_guanliyuankuxin where sfzxm = '" + username + "' ");
+//            log.writeLog("用户名:"+username);
+//            log.writeLog("glytype:"+glyMap);
+//
+//            ArrayList<Map<String, Object>> maps = new ArrayList<>();
+//            //判断当前用户是否为超级管理员
+//            if (!glyMap.get("TYPE").equals("0")) {
+//                //判断管理员是否为本人
+//                for (Map<String, Object> map : qiyeList) {
+//                    if ((map.get("GLYID")).toString().equals(glyMap.get("ID"))) {
+//                        maps.add(map);
+//                    }
+//                }
+//
+//                qiyeList = maps;
+//            }
+//        }
+        hashMap.put("dataSource", qiyeList);
+        return JSON.toJSONString(hashMap);
+    }
+
+}
+
+
diff --git a/src/main/youhong_ai_jitu_src/jntchina/service/oa/HisInfoChangeJiekou.java b/src/main/youhong_ai_jitu_src/jntchina/service/oa/HisInfoChangeJiekou.java
new file mode 100644
index 0000000..14e7077
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/service/oa/HisInfoChangeJiekou.java
@@ -0,0 +1,598 @@
+package jntchina.service.oa;
+
+
+import jntchina.util.DataBaseUtils;
+import selfdev.util.log.LogTool;
+import weaver.conn.RecordSet;
+import weaver.formmode.customjavacode.AbstractModeExpandJavaCodeNew;
+import weaver.general.Util;
+import weaver.hrm.User;
+import weaver.soa.workflow.request.RequestInfo;
+
+import java.util.*;
+
+
+/**
+ * 说明
+ * 修改时
+ * 类名要与文件名保持一致
+ * class文件存放位置与路径保持一致。
+ * 请把编译后的class文件，放在对应的目录中才能生效
+ * 注意 同一路径下java名不能相同。
+ *
+ * @author Administrator
+ */
+public class HisInfoChangeJiekou extends AbstractModeExpandJavaCodeNew {
+    private final LogTool log = new LogTool("/log/api/aa/", false);
+
+    /**
+     * 执行模块扩展动作
+     *
+     * @param param param包含(但不限于)以下数据
+     *              user 当前用户
+     *              importtype 导入方式(仅在批量导入的接口动作会传输) 1 追加，2覆盖,3更新，获取方式(int)param.get("importtype")
+     *              导入链接中拼接的特殊参数(仅在批量导入的接口动作会传输)，比如a=1，可通过param.get("a")获取参数值
+     *              页面链接拼接的参数，比如b=2,可以通过param.get("b")来获取参数
+     * @return
+     */
+    public Map<String, String> doModeExpand(Map<String, Object> param) {
+        Map<String, String> result = new HashMap<String, String>();
+        try {
+            User user = (User) param.get("user");
+            int billid = -1;//数据id
+            int modeid = -1;//模块id
+            RequestInfo requestInfo = (RequestInfo) param.get("RequestInfo");
+            if (requestInfo != null) {
+                billid = Util.getIntValue(requestInfo.getRequestid());
+                modeid = Util.getIntValue(requestInfo.getWorkflowid());
+                if (billid > 0 && modeid > 0) {
+                    //------请在下面编写业务逻辑代码------
+                    log.writeLog("【【【【【【【【【【【【【【【【【【【【【【【【【【【企业修改】】】】】】】】】】】】】】】】】】】】】】】】");
+
+                    log.writeLog("模块id:" + billid);
+                    this.changeInfo(String.valueOf(billid));
+                    log.writeLog("param:"+param);
+                }
+            }
+
+        } catch (Exception e) {
+            result.put("errmsg", "自定义出错信息");
+            result.put("flag", "false");
+        }
+        return result;
+    }
+
+
+    /**
+     * 修改企业信息
+     *
+     * @param id 流程id
+     */
+    public void changeInfo(String id) {
+        /*
+        当企业变更后，
+        insert > 境内企业版本表     table:  formtable_main_3055
+        update > 境内企业信息表     table:  uf_jingneiqiyexinxi
+        insert > 历史沿革表        table:  uf_jingneiqiyexinxi_dt1
+         */
+        log.writeLog("表单id:" + id);
+
+        RecordSet recordSet = new RecordSet();
+        //变更的项目
+        HashMap<String, String> bghMap = new HashMap<>();
+        //变更的集合
+
+
+        //首先从 变更表(uf_jnqyxxbgb)找出所有变更数据，
+        String sql = "select  * from   uf_jnqyxxbgb where id = " + id;
+        recordSet.execute(sql);
+        while (recordSet.next()) {
+            for (String s : recordSet.getColumnName()) {
+                bghMap.put(s, recordSet.getString(s));
+            }
+        }
+        log.writeLog("变更表信息:" + bghMap);
+
+        String qyid = bghMap.get("QYID");
+
+        log.writeLog("企业名称变更前:" + bghMap.get("QYMCBGQ"));
+        //找出所有的变更项目
+        String[] xm = {"GLY", "QYMC", "ZYM", "YWM", "CLRQ", "SHXYDM"
+                , "ZCZB", "DZ", "JYFW", "GQTSAP", "GQAPFJ", "FRDB", "CWFZR", "JL"
+                , "JS", "DS", "DJZT", "SFWBBDW", "BAFJ", "GBDQ", "DLQ",
+                "DHYJ", "DHEJ", "DHSJ", "DHSJ1", "DHWJ", "DHLJ", "DHQJ"
+                , "GSLX", "GS", "BZ", "MGMZ", "DLDFLST", "YYDZ", "YWBK", "YWMKZJTZDJS"
+                , "BZ2", "DYZY", "DYZYFJSC", "ZJFWJGMSGS", "SJS","GLF","NBJZQ"};
+
+        //判断变更表的变更前后是否一样
+        log.writeLog("企业名称变更后:" + bghMap.get("QYMCBGH"));
+
+        log.writeLog(":"+bghMap.get("CLRQBGH"));
+        log.writeLog(":"+bghMap.get("CLRQBGQ"));
+
+        if (!bghMap.get("CLRQBGH").equals(bghMap.get("CLRQBGQ"))) {
+
+
+            recordSet.execute(sql);
+            sql = "update  formtable_main_3055 set clrq = '"+bghMap.get("CLRQBGH")+"' where qyid = " + qyid + "  ";
+            log.writeLog("更新所有企业:"+sql);
+            recordSet.execute(sql);
+            sql = "update  uf_jingneiqiyexinxi set clrq = '"+bghMap.get("CLRQBGH")+"' where id = " + qyid + "  ";
+            recordSet.execute(sql);
+            log.writeLog("更新企业表:"+sql);
+            
+        }
+
+
+
+        //变更主表
+        for (String key : xm) {
+            String date = bghMap.get(key + "RQ");
+            //如果日期不为空，那么该项目有变更
+            if (!"".equals(Util.null2String(date))) {
+                //获取日期,当日之前的一个企业版本做对比
+                sql = "select *from (select * from formtable_main_3055 where " +
+                        " BBRQ <= '"+date+"' and qyid = '"+qyid+"'   order by BBRQ desc ) where  rownum <2";
+                log.writeLog("找到变更前的:"+sql);
+
+                Map<String, String> bgqMap = DataBaseUtils.getDataMap(sql);
+                log.writeLog("变更前map:"+bgqMap);
+
+                //判断版本的前后数据是否一致
+                if (!strNull(bghMap.get(key+"BGH")).equals(strNull( bgqMap.get(key)))) {
+                    //不一致时，直接修改
+                    String VersionId = SynDate(qyid, date);
+                    log.writeLog("返回的versionid:"+VersionId);
+                    sql = "update formtable_main_3055 set " + key + " = '" + bghMap.get(key+"BGH") + "' where id =  " + VersionId;
+                    log.writeLog("直接版本表:"+sql);
+                    recordSet.execute(sql);
+
+
+                    sql = "delete from formtable_main_3055_dt1 where mainid = '" + VersionId + "' " +
+                            "and rq = '" + date + "' and bgxm = '" + this.getBgxms(key) + "' ";
+                    log.writeLog("删除当日的变更项目:"+sql);
+//                    recordSet.execute(sql);
+                    sql = "insert into formtable_main_3055_dt1 (MAINID,RQ,BGXM,BGQ,BGH,FJ,BZ) values " +
+                            "('" + VersionId + "','" + date + "','" + this.getBgxms(key) + "'" +
+                            ",'" + this.getBianGeng(key, bgqMap.get(key)) + "','" + this.getBianGeng(key, bghMap.get(key+"BGH")) + "','" + bghMap.get(key+"FJ") + "','" + bghMap.get(key+"BZ") + "')";
+                    log.writeLog("插入版本表的历史沿革:"+sql);
+                    recordSet.execute(sql);
+
+                    //判断之后是否有版本;
+                    sql = "select bbrq from formtable_main_3055 where BBRQ > '"+date+"' and qyid = '"+qyid+"'   order by BBRQ desc";
+                    if (DataBaseUtils.dataIsExists(sql)) {
+                        log.writeLog("有之后的版本:-----------");
+
+                        //如果之后没有修改过这个字段,就要修改
+                        sql = "select id from formtable_main_3055 where  qyid = '" + qyid + "' " +
+                                "and to_date(BBRQ,'YYYY-MM-DD')>to_date('" + date + "','YYYY-MM-DD') order by bbrq";
+                        ArrayList<Map<String, String>> idList = DataBaseUtils.getDataList(sql);
+                        boolean isUpdateQiYe = true;
+                        //遍历之后版本
+                        for (Map<String, String> map : idList) {
+                            String id1 = map.get("ID");
+                            //如果没有变更此项目，直接更新
+                            sql = "select bgxm from formtable_main_3055_dt1 where mainid = '" + id1 + "' ";
+                            ArrayList<String> list = DataBaseUtils.getList(sql);
+                            log.writeLog("list:"+list);
+                            log.writeLog("bgxm:"+getBgxms(key));
+                            if (!list.contains(getBgxms(key))) {
+                                //之后版本所有的字段都要修改
+                                sql = "update formtable_main_3055  set "+key+" = '" + bghMap.get(key+"BGH") + "'  where id =   "+id1;
+                                log.writeLog("修改之后所有版本的字段:"+sql);
+                                recordSet.execute(sql);
+                            } else {
+                                //有更新过，跳出更新，不更新企业表
+                                //设置变更前
+                                sql = "update formtable_main_3055_dt1 set bgq = '"+this.getBianGeng(key, bghMap.get(key+"BGH"))+"' where mainid = '" + id1 + "' and bgxm = '"+getBgxms(key)+"' ";
+                                log.writeLog("设置变更前:" + sql);
+                                recordSet.execute(sql);
+                                isUpdateQiYe = false;
+                                break;
+                            }
+                        }
+                        //之后没修改过该项目,要修改主表
+                        if (isUpdateQiYe) {
+
+                            sql = "update uf_jingneiqiyexinxi set " + key + " = '" + bghMap.get(key+"BGH") + "' where id =  " + qyid +"  ";
+                            log.writeLog("之后版本没有修改该项目，直接企业信息表:"+sql);
+                            recordSet.execute(sql);
+                        }
+                    } else {
+                        log.writeLog("没有之后的版本:");
+                        sql = "update uf_jingneiqiyexinxi set " + key + " = '" + bghMap.get(key+"BGH") + "' where id =  " + qyid;
+                        log.writeLog("不存在日期后的企业，直接修改企业表:"+sql);
+                        recordSet.execute(sql);
+
+                    }
+                }
+            }
+        }
+        //变更明细表3资质证照
+        new ChangeDt2().changeDt2(qyid,id);
+        try {
+
+            new ChangeDt1().ChangeDetail(qyid,id);
+
+            sql = "update uf_jingneiqiyexinxi_dt2 set qymc1 = mainid where id = "+qyid;
+            recordSet.execute(sql);
+        } catch (Exception e) {
+            log.writeLog(":"+DataBaseUtils.getExceptionDetail(e));
+            ;
+        }
+
+        log.writeLog("删除持股比例和持股份数的股东:");
+
+        sql = "delete from UF_JINGNEIQIYEXINXI_DT2 where (CGBL = '0.00' or CGBL is null ) and (cgfs = '0.00' or CGFS is null ) and GFZL is null";
+        recordSet.execute(sql);
+        sql = "delete from formtable_main_3055_DT2 where (CGBL = '0.00' or CGBL is null ) and (cgfs = '0.00' or CGFS is null ) and GFZL is null ";
+        recordSet.execute(sql);
+    }
+
+    /**
+     *
+     * 判断当前日期是否有数据，有的话就删除，没有就从上一个版本复制
+     * @param qyid 企业id
+     * @param date 日期
+     * @return 当天企业的id
+     */
+    public String SynDate(String qyid, String date) {
+        RecordSet recordSet = new RecordSet();
+        String sql = "select id from formtable_main_3055 where qyid = '"+qyid+"' and bbrq = '"+date+"' ";
+        String changeId;
+        String firstValue = DataBaseUtils.getFirstValue(sql);
+        if ("".equals(firstValue)) {
+            //空,同步所有信息,同步上一个版本所有信息 ,然后在后面修改
+            sql = "select * from (select * from formtable_main_3055 where " +
+                    " BBRQ <= '"+date+"' and qyid = '"+qyid+"'   order by BBRQ desc ) where  rownum <2";
+            
+            log.writeLog("找到上一个版本的信息:"+sql);
+            
+            Map<String, String> hashMap = DataBaseUtils.getDataMap(sql);
+
+            if("".equals(strNull(hashMap.get("QYMC")))){
+                log.writeLog("企业名称为空:"+hashMap);
+                
+                hashMap = DataBaseUtils.getDataMap("select * from (select * from formtable_main_3055 where   qyid = '"+qyid+"'   order by BBRQ  ) where  rownum <2");
+            }
+
+            log.writeLog("上一个版本的信息:"+hashMap);
+
+            sql = "insert into  formtable_main_3055 (zczb,dz,gly,qymc,zym,ywm,clrq,shxydm,dhyj,dhej,dhsj,dhsj1,dhwj,dhlj,dhqj," +
+                    "jyfw,gqtsap,gqapfj,frdb,cwfzr,jl,js,ds,djzt,sfwbbdw,bafj,bbrq,qyid,GBDQ,DLQ" +
+                    "                , GSLX,GS,BZ,MGMZ,DLDFLST,YYDZ,YWBK,YWMKZJTZDJS,BZ2,DYZY,FJSC,ZJFWJGMSGS,SJS,GLF,NBJZQ,FORMMODEID) values ('" + hashMap.get("ZCZB") + "', '" + hashMap.get("DZ") + "', " +
+                    "'" + hashMap.get("GLY") + "', '" + hashMap.get("QYMC") + "', '" + hashMap.get("ZYM") + "', '" + hashMap.get("YWM") + "', " +
+                    "'" + hashMap.get("CLRQ") + "', '" + hashMap.get("SHXYDM") + "', '" + hashMap.get("DHYJ") + "', '" + hashMap.get("DHEJ") + "', " +
+                    "'" + hashMap.get("DHSJ") + "', '" + hashMap.get("DHSJ1") + "', '" + hashMap.get("DHWJ") + "', '" + hashMap.get("DHLJ") + "', " +
+                    "'" + hashMap.get("DHQJ") + "', '" + hashMap.get("JYFW") + "', '" + hashMap.get("GQTSAP") + "', '" + hashMap.get("GQAPFJ") + "', " +
+                    "'" + hashMap.get("FRDB") + "', '" + hashMap.get("CWFZR") + "', '" + hashMap.get("JL") + "', '" + hashMap.get("JS") + "', " +
+                    "'" + hashMap.get("DS") + "', '" + hashMap.get("DJZT") + "', '" + hashMap.get("SFWBBDW") + "', " +
+                    "'" + hashMap.get("BAFJ") + "', '" + date + "','" + qyid + "'" +
+                    ", '" + hashMap.get("GBDQ") + "', '" + hashMap.get("DLQ") + "', '" + hashMap.get("GSLX") + "', '" + hashMap.get("GS") + "'" +
+                    ", '" + hashMap.get("BZ") + "', '" + hashMap.get("MGMZ") + "', '" + hashMap.get("DLDFLST") + "', '" + hashMap.get("YYDZ") + "'" +
+                    ", '" + hashMap.get("YWBK") + "', '" + hashMap.get("YWMKZJTZDJS") + "', '" + hashMap.get("BZ2") + "', '" + hashMap.get("DYZY") + "'" +
+                    ", '" + hashMap.get("FJSC") + "', '" + hashMap.get("ZJFWJGMSGS") + "', '" + hashMap.get("SJS") + "','"+ hashMap.get("GLF") +"','"+
+                    hashMap.get("NBJZQ") +"','"+DataBaseUtils.getModelIdByName("formtable_main_3055")+"')";
+            log.writeLog("插入版本表的sql:" + sql);
+            recordSet.execute(sql);
+
+            changeId = DataBaseUtils.getFirstValue("select id from formtable_main_3055 where qyid = '"+qyid+"' and bbrq = '"+date+"' ");
+
+
+//            //同步历史沿革
+//            sql = "select * from uf_jingneiqiyexinxi_dt1 where MAINID = '" + qyid + "'  and  to_date(rq,'yyyy-MM-dd') <=to_date('" + date + "','yyyy-MM-dd') ";
+//            log.writeLog("同步历史沿革的SQL:" + sql);
+//            ArrayList<Map<String, String>> dt1List = DataBaseUtils.getDataList(sql);
+//            for (Map<String, String> map : dt1List) {
+//                sql = "insert into formtable_main_3055_dt1 (MAINID,RQ,BGXM,BGQ,BGH,FJ,BZ,mainbillid) values  ('" + changeId + "','" + map.get("RQ") + "','" + map.get("BGXM") + "'" +
+//                        ",'" + map.get("BGQ") + "','" + map.get("BGH") + "','" + map.get("FJ") + "','" + map.get("BZ") + "','"+map.get("ID")+"')";
+//                recordSet.execute()(sql);
+//                log.writeLog("插入版本表的变更表:" + sql);
+//            }
+            //同步股权信息
+
+            sql = "select * from formtable_main_3055_dt2 where MAINID =  (select * from (select id from formtable_main_3055 where " +
+                    " BBRQ < '"+date+"' and qyid = '"+qyid+"'   order by BBRQ desc ) where  rownum <2) " ;
+            ArrayList<Map<String, String>> dt2List = DataBaseUtils.getDataList(sql);
+            for (Map<String, String> map : dt2List) {
+                sql = "insert into formtable_main_3055_dt2 (MAINID,DJGD,CGBL,BZ,QYMC1,rq,CGFS,gfzl,MAINBILLID) values ('" + changeId + "'" +
+                        ",'" + map.get("DJGD") + "','" + map.get("CGBL") + "','" + map.get("BZ") + "','" + map.get("QYMC1") + "'," +
+                        "'" + date + "','" + map.get("CGFS") + "','" + map.get("GFZL") + "','"+map.get("MAINBILLID")+"')";
+                recordSet.execute(sql);
+                log.writeLog("插入股东:" + sql);
+            }
+            //同步资质证照
+            sql = "select * from formtable_main_3055_dt3 where MAINID =  (select * from (select id from formtable_main_3055 where " +
+                    " BBRQ <= '"+date+"' and qyid = '"+qyid+"'   order by BBRQ desc ) where  rownum <2) " ;
+            ArrayList<Map<String, String>> dt3List = DataBaseUtils.getDataList(sql);
+            for (Map<String, String> map : dt3List) {
+                sql = "insert into formtable_main_3055_dt3 (MAINID,zzzz,fjsc,BZ,QYMC,MAINBILLID) values ('" + changeId + "'" +
+                        ",'" + map.get("ZZZZ") + "','" + map.get("FJSC") + "','" + map.get("BZ") + "','" + map.get("QYMC") + "','"+map.get("MAINBILLID")+"')";
+                log.writeLog("插入股权信息sql:" + sql);
+                recordSet.execute(sql);
+            }
+
+        }
+        //返回刚刚那张表的id
+
+        sql = "select id from formtable_main_3055 where qyid = '"+qyid+"' and bbrq = '"+date+"' ";
+        firstValue = DataBaseUtils.getFirstValue(sql);
+        log.writeLog("之后的firstvalue:" + firstValue);
+
+        return firstValue;
+    }
+
+    public static String strNull(String str) {
+        return (null == str) ? "" : str;
+    }
+    /**
+     * 字段转换(通过字符找到变更项目)
+     * @param bg 变更的字符串
+     * @return 变更项目
+     */
+    public String getBgxms(String bg) {
+        //设置变更项目的对应字段
+        Map<String, String> cors = new HashMap<>();
+        cors.put("QYMC", "企业名称");
+        cors.put("ZYM", "曾用名");
+        cors.put("YWM", "英文名");
+        cors.put("CLRQ", "成立日期");
+        cors.put("SHXYDM", "社会信用代码");
+        cors.put("GQTSAP", "股权特殊安排");
+        cors.put("FRDB", "法人代表");
+        cors.put("CWFZR", "财务负责人");
+        cors.put("JL", "经理");
+        cors.put("JS", "监事");
+        cors.put("DS", "董事");
+        cors.put("DJZT", "登记状态");
+        cors.put("YWCZ", "业务承载");
+        cors.put("SFWBBDW", "是否为并表单位");
+        cors.put("ZCZB", "注册资本");
+        cors.put("DZ", "注册地址");
+        cors.put("JYFW", "经营范围");
+        cors.put("DJGD", "登记股东");
+        cors.put("CGBL", "持股比例");
+        cors.put("GLY", "管理员");
+        cors.put("DHYJ", "导航一级");
+        cors.put("DHEJ", "导航二级");
+        cors.put("DHSJ", "导航三级");
+        cors.put("DHSJ1", "导航四级");
+        cors.put("DHWJ", "导航五级");
+        cors.put("DHLJ", "导航六级");
+        cors.put("DHQJ", "导航七级");
+        cors.put("BAFJ", "备案附件");
+
+        cors.put("GBDQ", "国别/地区");
+        cors.put("DLQ", "代理区");
+        cors.put("GSLX", "公司类型");
+        cors.put("GS", "股数");
+        cors.put("BZ", "币种");
+        cors.put("MGMZ", "每股面值");
+        cors.put("DLDFLST", "独立的法律实体");
+        cors.put("YYDZ", "营业地址");
+        cors.put("YWBK", "业务板块");
+        cors.put("YWMKZJTZDJS", "业务模块/在集团中的角色");
+        cors.put("BZ2", "备注");
+        cors.put("DYZY", "抵押/质押");
+        cors.put("FJSC", "附件上传");
+        cors.put("ZJFWJGMSGS", "中介服务机构/秘书公司");
+        cors.put("SJS", "审计师");
+        cors.put("GQAPFJ", "股权安排附件");
+        cors.put("DYZYFJSC", "抵押/质押附件上传");
+        cors.put("GLF", "关联方");
+        cors.put("NBJZQ", "年报截止期");
+
+
+        //判断
+        if (Util.null2String(cors.get(bg)).equals("")) {
+
+            log.writeLog("bgx---------------------------------------------:" + bg);
+            return Util.null2String(bg);
+        } else {
+            log.writeLog("bgx---------------------------------------------:" + cors.get(bg));
+
+            return Util.null2String(cors.get(bg));
+        }
+    }
+
+    /**
+     * 找到浏览按钮的变更项目
+     * @param bgxm filedName
+     * @param value value
+     * @return 变更内容
+     */
+    public String getBianGeng(String bgxm, String value) {
+        this.log.writeLog("接收参数bgxm:" + bgxm);
+        this.log.writeLog("接收参数value:" + value);
+
+        String sql = "";
+        if ("FRDB,CWFZR,JL,JS,DS".contains(bgxm)) {
+            sql = "select xm returnvalue from uf_renyuanxinxiku where id = ";
+
+            log.writeLog("bgxm  value:" + value);
+            if (!value.equals("")) {
+                RecordSet recordSet = new RecordSet();
+                String[] values = value.split(",");
+                log.writeLog(bgxm + "人员:" + values.length);
+
+                StringBuilder res = new StringBuilder();
+                for (String s : values) {
+                    sql = "select xm from uf_renyuanxinxiku where id =  " + s;
+                    recordSet.execute(sql);
+                    recordSet.next();
+                    res.append(recordSet.getString("xm")).append(";\n");
+                }
+                log.writeLog("res:" + res);
+                return Util.null2String(res.toString());
+            }
+        }
+        if ("GLY".equals(bgxm)) {
+            sql = "select sfzxm  returnvalue from uf_guanliyuankuxin where id =";
+
+        }
+        if ("GLF".equals(bgxm)) {
+            return "0".equals(value) ? "YES" : "NO";
+
+        }
+        if ("GBDQ".equals(bgxm)) {
+            sql = "select GJDQK  returnvalue from uf_guojiadiquku where id =";
+        }
+
+        if ("DLQ".equals(bgxm)) {
+            sql = "select DLQ  returnvalue from uf_dailiqu where id =";
+        }
+
+        if ("GSLX".equals(bgxm)) {
+            sql = "select gslx  returnvalue from uf_gongsileixing where id = ";
+        }
+
+        if ("DJZT".equals(bgxm)) {
+            sql = "select DJZT  returnvalue from uf_dengjizhuangtai where id =";
+        }
+
+        if ("DHYJ".equals(bgxm)) {
+            sql = "select DHYJZDXX  returnvalue from uf_daohangyijizidua where id =";
+        }
+
+        if ("DHEJ".equals(bgxm)) {
+            sql = "select dhej returnvalue  from uf_daohangerji where id = ";
+        }
+
+        if ("DHSJ".equals(bgxm)) {
+            sql = "select dhsj returnvalue  from uf_saohangsanji where id =";
+        }
+
+        if ("DHSJ1".equals(bgxm)) {
+            sql = "select dhsj  returnvalue from uf_daohangsiji where id =";
+        }
+
+        if ("DHWJ".equals(bgxm)) {
+            sql = "select dhwj  returnvalue from uf_daohangwuji where id =";
+        }
+
+        if ("DHLJ".equals(bgxm)) {
+            sql = "select dhlj  returnvalue from uf_daohangliuji where id =";
+        }
+        if ("BZ".equals(bgxm)) {
+            sql = "select bz returnvalue from UF_BIZHONG where id = ";
+        }
+
+        if ("DHQJ".equals(bgxm)) {
+            sql = "select dhqj  returnvalue from uf_daohangqiji where id =";
+        }
+
+        if ("DLDFLST".equals(bgxm)) {
+            return "0".equals(value) ? "YES" : "NO";
+        }
+
+
+
+        if ("YWBK".equals(bgxm)) {
+            sql = "select YWBK  returnvalue from uf_yewubankuai where id =";
+        }
+
+        if ("YWMKZJTZDJS".equals(bgxm)) {
+            sql = "select YWMKZJTZDJS  returnvalue from uf_jituanzhongdejue where id =";
+        }
+
+        if ("QYMC".equals(bgxm)) {
+            return value;
+        }
+
+        if ("SFWBBDW".equals(bgxm)) {
+            sql = "select SFWBBDW  returnvalue from uf_shifouweibingbia where id =";
+        }
+        if ("BAFJ".equals(bgxm) || "GQAPFJ".equals(bgxm) || "DYZYFJSC".equals(bgxm) || "FJSC".equals(bgxm)) {
+            log.writeLog("bgxm  value:" + value);
+            if (!value.equals("")) {
+                RecordSet recordSet = new RecordSet();
+                String[] values = value.split(",");
+                log.writeLog(bgxm + "附件的个数:" + values.length);
+
+                StringBuilder res = new StringBuilder();
+                for (String s : values) {
+                    sql = "select  IMAGEFILENAME  from docimagefile where  docid= " + s;
+                    recordSet.execute(sql);
+                    recordSet.next();
+                    res.append(recordSet.getString("IMAGEFILENAME")).append(";\n");
+                }
+                return Util.null2String(res.toString());
+            }
+        }
+
+        if ("".equals(sql)) {
+            return Util.null2String(value);
+        } else if ("".equals(Util.null2String(value))) {
+            return Util.null2String(value);
+        } else {
+            RecordSet recordSet = new RecordSet();
+            this.log.writeLog("查找中文字段的SQL:" + sql + value);
+            recordSet.execute(sql + value);
+            recordSet.next();
+            return Util.null2String(recordSet.getString("returnvalue"));
+        }
+    }
+
+
+    /**
+     * 获取企业或人员姓名
+     * @param str id
+     * @return name
+     */
+    private String getQyOrRy(String str) {
+        String[] strs = str.split("_");
+
+        String sql ;
+        if ("qy".equals(strs[0])) {
+            sql = "select qymc name from uf_jingneiqiyexinxi where id = " + strs[1];
+        } else {
+            sql = "select xm name from UF_RENYUANXINXIKU where id = " + strs[1];
+
+        }
+        RecordSet recordSet = new RecordSet();
+        recordSet.execute(sql);
+        recordSet.next();
+        
+        log.writeLog("查找新的股东:"+sql);
+        return recordSet.getString("name");
+    }
+
+
+    /**
+     * 股东变更前后
+     * @param list 股东集合
+     * @return 内容
+     */
+    public String getGdBg(ArrayList<Map<String,String>> list) {
+
+        String value = "";
+        for (Map<String, String> map : list) {
+
+            value += "\n"+getQyOrRy(Util.null2String(map.get("DJGD")))+"/"+map.get("CGBL")+
+                    "%/"+map.get("CGFS")+"/"+getCgzl(Util.null2String(map.get("GFZL")))+"、";
+        }
+        log.writeLog("value:"+value);
+        return "".equals(value)?value:value.substring(0,value.length()-1);
+    }
+
+    /**
+     * 获取持股种类
+     * @param id id
+     * @return 种类内容
+     */
+    public String getCgzl(String id) {
+        if (Util.null2String(id).equals("")) {
+            return "";
+        }
+        RecordSet recordSet = new RecordSet();
+        recordSet.execute("select GFZL from uf_gufenzhonglei where id = " + id);
+        recordSet.next();
+        return Util.null2String(recordSet.getString("GFZL"));
+    }
+
+
+
+
+
+
+}
\ No newline at end of file
diff --git a/src/main/youhong_ai_jitu_src/jntchina/service/oa/HistoryInfoAPI.java b/src/main/youhong_ai_jitu_src/jntchina/service/oa/HistoryInfoAPI.java
new file mode 100644
index 0000000..a4fb954
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/service/oa/HistoryInfoAPI.java
@@ -0,0 +1,445 @@
+package jntchina.service.oa;
+
+import com.alibaba.fastjson.JSON;
+import jntchina.entity.ChangeInfo;
+import selfdev.util.log.LogTool;
+import weaver.conn.RecordSet;
+import weaver.general.Util;
+
+import java.util.*;
+
+/**
+ * @title: 历史信息
+ * @Author ycf
+ * @Date: 2021/11/18 17:15
+ * @Version 1.0
+ */
+public class HistoryInfoAPI {
+    private final LogTool log = new LogTool("/log/api/aa/", false);
+
+    /**
+     * 修改企业信息
+     * @param id 流程id
+     */
+    public void changeInfo(String id) {
+        /*
+        当企业变更后，
+        insert > 境内企业版本表     table:  formtable_main_3055
+        update > 境内企业信息表     table:  uf_jingneiqiyexinxi
+        insert > 历史沿革表        table:  uf_jingneiqiyexinxi_dt1
+         */
+        log.writeLog("表单id:" + id);
+
+        RecordSet recordSet = new RecordSet();
+        //变更的项目
+        HashMap<String, String> bgMap = new HashMap<>();
+        //变更的集合
+        ArrayList<ChangeInfo> changeInfosList = new ArrayList<>();
+
+        //首先从 变更表(uf_jnqyxxbgb)找出所有变更数据，
+        String sql = "select  * from   uf_jnqyxxbgb where id = " + id;
+        recordSet.execute(sql);
+        while (recordSet.next()) {
+            for (String s : recordSet.getColumnName()) {
+                bgMap.put(s, recordSet.getString(s));
+            }
+        }
+        log.writeLog("变更表信息:" + bgMap.toString());
+
+        log.writeLog("企业名称变更前:" + bgMap.get("QYMCBGH"));
+        //找出所有的变更项目
+        String[] xm = {"GLY", "QYMC", "ZYM", "YWM", "CLRQ", "SHXYDM"
+                , "ZCZB", "DZ", "JYFW", "GQTSAP", "GQAPFJ", "FRDB", "CWFZR", "JL"
+                , "JS", "DS", "DJZT", "SFWBBDW", "BAFJ", "GBDQ", "DLQ"
+                , "GSLX", "GS","BZ","MGMZ","DLDFLST","YYDZ","YWBK","YWBKZJTZDJS"
+                ,"BZ2","DYZY","FJSC","ZJFWJGMSGS","SJS","DHYJ","DHEJ","DHSJ","DHSJ1","DHWJ","DHLJ","DHQJ"};
+
+        //判断变更表的变更前后是否一yydz样
+        log.writeLog("企业名称变更后:" + bgMap.get("QYMCBGH"));
+
+        for (String value : xm) {
+
+
+            log.writeLog(value + "BGQ:--" + bgMap.get(value + "BGQ"));
+            log.writeLog(value + "BGH:--" + bgMap.get(value + "BGH"));
+
+
+            if (!bgMap.get(value + "BGQ").equals(bgMap.get(value + "BGH"))) {
+                //当做出了改变,先把改变的值存到list中
+                ChangeInfo changeInfo = new ChangeInfo();
+                changeInfo.setMainid(bgMap.get("QYID"));
+                changeInfo.setRq(bgMap.get(value + "RQ"));
+                changeInfo.setBgxm(value);
+                changeInfo.setBgq(bgMap.get(value + "BGQ"));
+                changeInfo.setBgh(bgMap.get(value + "BGH"));
+                changeInfo.setFj(bgMap.get(value + "FJ"));
+                changeInfo.setBz(bgMap.get(value + "BZ"));
+                changeInfosList.add(changeInfo);
+                log.writeLog("变更的:" + changeInfo);
+            }
+        }
+
+        log.writeLog("所有变更项目集合:" + changeInfosList.toString());
+
+        //变更企业的股权架构
+
+        //changeInfosList里面加上股权变更
+        ArrayList<HashMap<String, String>> bgqList = new ArrayList<>();
+        ArrayList<HashMap<String, String>> bghList = new ArrayList<>();
+        sql = "select * from uf_jnqyxxbgb_dt1 where mainid = " + id;
+
+        log.writeLog("查询股权变更前的sql:" + sql);
+
+        //判断股权前后是否相等，
+        recordSet.execute(sql);
+        while (recordSet.next()) {
+            HashMap<String, String> bgqMap = new HashMap<>();
+            for (String s : recordSet.getColumnName()) {
+                bgqMap.put(s, Util.null2String(recordSet.getString(s)));
+            }
+            bgqList.add(bgqMap);
+        }
+
+        sql = "select * from uf_jnqyxxbgb_dt2 where mainid = " + id;
+        log.writeLog("查询股权变更后的sql:" + sql);
+
+        //判断股权前后是否相等，
+        recordSet.execute(sql);
+        while (recordSet.next()) {
+            HashMap<String, String> bghMap = new HashMap<>();
+            for (String s : recordSet.getColumnName()) {
+                bghMap.put(s, Util.null2String(recordSet.getString(s)));
+            }
+            bghList.add(bghMap);
+        }
+
+        log.writeLog("bgq:"+bgqList.toString());
+        log.writeLog("bgh:"+bghList.toString());
+
+        for (HashMap<String, String> bgqMap : bgqList) {
+            for (HashMap<String, String> bghMap : bghList) {
+                if (bgqMap.get("DJGD").equals(bghMap.get("DJGD"))) {
+                    if (!bghMap.get("CGBL").equals(bgqMap.get("CGBL"))||!bghMap.get("CGFS").equals(bgqMap.get("CGFS"))) {
+                        //股权改变
+                        log.writeLog("股权发生改变:");
+
+                        ChangeInfo changeInfo = new ChangeInfo();
+                        changeInfo.setMainid(bgMap.get("QYID"));
+                        changeInfo.setBgq("持股比例"+bgqMap.get("CGBL")+" 持股份数"+bgqMap.get("CGFS"));
+                        changeInfo.setBgh("持股比例"+bghMap.get("CGBL")+" 持股份数"+bghMap.get("CGFS"));
+                        changeInfo.setBz(bghMap.get("BZ"));
+                        changeInfo.setFj(bghMap.get("FJ"));
+                        changeInfo.setRq(bghMap.get("RQ"));
+                        sql = "select qymc from uf_jingneiqiyexinxi where id =" + bghMap.get("DJGD");
+                        log.writeLog("找到改变的企业名称sql:"+sql);
+
+                        recordSet.execute(sql);
+                        recordSet.next();
+
+                        log.writeLog("改变的企业名称:"+recordSet.getString("QYMC"));
+
+                        changeInfo.setBgxm(recordSet.getString("QYMC"));
+                        log.writeLog("改变的信息:"+changeInfo.toString());
+                        changeInfosList.add(changeInfo);
+
+                    }
+                }
+
+            }
+        }
+        if (bghList.size() > bgqList.size()) {
+            for (int i = 0; i < (bghList.size())- bgqList.size(); i++) {
+                log.writeLog("添加股东:");
+
+                HashMap<String, String> map = bghList.get(bgqList.size() + i);
+                ChangeInfo changeInfo = new ChangeInfo();
+                changeInfo.setMainid(bgMap.get("QYID"));
+                changeInfo.setBgq("持股比例0 持股份数0");
+                changeInfo.setBgh("持股比例"+map.get("CGBL")+" 持股份数"+map.get("CGFS"));
+                changeInfo.setBz(map.get("BZ"));
+                changeInfo.setRq(map.get("RQ"));
+
+                changeInfo.setFj(map.get("FJ"));
+                sql = "select qymc from uf_jingneiqiyexinxi where id =" + bgMap.get("QYID");
+                recordSet.execute(sql);
+                recordSet.next();
+
+                changeInfo.setBgxm(recordSet.getString("QYMC"));
+                log.writeLog("添加的股东:"+changeInfo.toString());
+                changeInfosList.add(changeInfo);
+
+            }
+        }
+        if (bghList.size() < bgqList.size()) {
+            //删除股东信息
+            for (HashMap<String, String> bgqMap : bgqList) {
+                for (HashMap<String, String> bghMap : bghList) {
+                    //当变更后的企业被删除，变更后则为0
+
+                }
+            }
+
+        }
+        log.writeLog("changeInfosList1111:"+changeInfosList.toString());
+        log.writeLog("changeInfosList1111:"+changeInfosList.size());
+
+
+
+
+
+        //所有改变信息
+
+
+        //把修改信息根据日期排序 map.(date,info)
+        // 根据日期降序排序
+        Map<String, ArrayList<ChangeInfo>> paixuMapBydate = new TreeMap<>(String::compareTo);
+
+        for (ChangeInfo info : changeInfosList) {
+
+            ArrayList<ChangeInfo> changeInfos = new ArrayList<>();
+
+            changeInfos.add(info);
+
+            if (!Util.null2String(paixuMapBydate.get(info.getRq())).equals("")) {
+
+                changeInfos.addAll(paixuMapBydate.get(info.getRq()));
+
+            }
+            paixuMapBydate.put(info.getRq(), changeInfos);
+
+        }
+
+        log.writeLog("map排序:" + paixuMapBydate.toString());
+
+        //先把境内企业信息表同步到企业信息版本表formtable_main_3055,按照日期修改
+        for (String key : paixuMapBydate.keySet()) {
+            ArrayList<ChangeInfo> changeInfos = paixuMapBydate.get(key);
+
+            //获取企业表的数据同步到版本表
+            log.writeLog("获取企业表的数据同步到版本表:");
+
+            sql = "select * from uf_jingneiqiyexinxi where id = " + bgMap.get("QYID");
+            HashMap<String, String> hashMap = new HashMap<>();
+            recordSet.execute(sql);
+            while (recordSet.next()) {
+                for (String s : recordSet.getColumnName()) {
+                    hashMap.put(s, recordSet.getString(s));
+                }
+            }
+            log.writeLog("境内企业信息表的数据:" + hashMap.toString());
+            log.writeLog("境内企业信息表的sql:" + sql);
+
+
+            //获取模块id
+            sql = "select id from modeinfo where formid = (select id from workflow_bill where tablename = 'formtable_main_3055')";
+            recordSet.execute(sql);
+            recordSet.next();
+            String modeId = recordSet.getString("ID");
+
+            //先判断是否存在当天日期的版本表
+            sql = "select * from formtable_main_3055 where bbrq='"+key+"' and qyid = "+bgMap.get("QYID");
+            recordSet.execute(sql);
+            recordSet.next();
+            if (!"".equals(recordSet.getString("ID"))) {
+                
+                log.writeLog("当前日期的企业已经存在，不做更新:");
+            } else {
+                
+                sql = "insert into  formtable_main_3055 (zczb,dz,gly,qymc,zym,ywm,clrq,shxydm,dhyj,dhej,dhsj,dhsj1,dhwj,dhlj,dhqj," +
+                        "jyfw,gqtsap,gqapfj,frdb,cwfzr,jl,js,ds,djzt,sfwbbdw,bafj,bbrq,qyid,FORMMODEID,GBDQ,DLQ" +
+                        "                , GSLX,GS,BZ,MGMZ,DLDFLST,YYDZ,YWBK,YWBKZJTZDJS,BZ2,DYZY,FJSC,ZJFWJGMSGS,SJS) values ('" + hashMap.get("ZCZB") + "', '" + hashMap.get("DZ") + "', " +
+                        "'" + hashMap.get("GLY") + "', '" + hashMap.get("QYMC") + "', '" + hashMap.get("ZYM") + "', '" + hashMap.get("YWM") + "', " +
+                        "'" + hashMap.get("CLRQ") + "', '" + hashMap.get("SHXYDM") + "', '" + hashMap.get("DHYJ") + "', '" + hashMap.get("DHEJ") + "', " +
+                        "'" + hashMap.get("DHSJ") + "', '" + hashMap.get("DHSJ1") + "', '" + hashMap.get("DHWJ") + "', '" + hashMap.get("DHLJ") + "', " +
+                        "'" + hashMap.get("DHQJ") + "', '" + hashMap.get("JYFW") + "', '" + hashMap.get("GQTSAP") + "', '" + hashMap.get("GQAPFJ") + "', " +
+                        "'" + hashMap.get("FRDB") + "', '" + hashMap.get("CWFZR") + "', '" + hashMap.get("JL") + "', '" + hashMap.get("JS") + "', " +
+                        "'" + hashMap.get("DS") + "', '" + hashMap.get("DJZT") + "', '" + hashMap.get("SFWBBDW") + "', " +
+                        "'" + hashMap.get("BAFJ") + "', '" + key + "','"+bgMap.get("QYID")+"',"+modeId+"" +
+                        ", '" + hashMap.get("GBDQ") + "', '" + hashMap.get("DLQ") + "', '" + hashMap.get("GSLX") + "', '" + hashMap.get("GS") + "'" +
+                        ", '" + hashMap.get("BZ") + "', '" + hashMap.get("MGMZ") + "', '" + hashMap.get("DLDFLST") + "', '" + hashMap.get("YYDZ") + "'" +
+                        ", '" + hashMap.get("YWBK") + "', '" + hashMap.get("YWBKZJTZDJS") + "', '" + hashMap.get("BZ2") + "', '" + hashMap.get("DYZY") + "'" +
+                        ", '" + hashMap.get("FJSC") + "', '" + hashMap.get("ZJFWJGMSGS") + "', '" + hashMap.get("SJS") + "')";
+                log.writeLog("插入版本表的sql:"+sql);
+
+                recordSet.executeUpdate(sql);
+                log.writeLog("当日版本的企业不存在，只更新sql:" + sql);
+
+            }
+
+
+            sql = "select max(id) QYID from formtable_main_3055 where qyid ="+bgMap.get("QYID")+" and bbrq = '"+key+"'";
+//            sql = "select max(id) from formtable_main_3055 order by id desc ";
+
+            log.writeLog("找表的的ID的sql:"+sql);
+            
+            recordSet.execute(sql);
+            recordSet.next();
+            String mxbId = recordSet.getString("QYID");
+            log.writeLog("主表的id:"+mxbId);
+
+
+            //同步历史沿革dt1
+            ArrayList<ChangeInfo> arrayList = new ArrayList<>();
+            sql = "select * from uf_jingneiqiyexinxi_dt1 where MAINID = " + bgMap.get("QYID");
+            recordSet.execute(sql);
+            while (recordSet.next()) {
+                ChangeInfo changeInfo = new ChangeInfo();
+                changeInfo.setMainid(recordSet.getString("MAINID"));
+                changeInfo.setRq(recordSet.getString("RQ"));
+                changeInfo.setBgxm(recordSet.getString("BGXM"));
+                changeInfo.setBgq(recordSet.getString("BGQ"));
+                changeInfo.setBgh(recordSet.getString("BGH"));
+                changeInfo.setFj(recordSet.getString("FJ"));
+                changeInfo.setBz(recordSet.getString("BZ"));
+                arrayList.add(changeInfo);
+            }
+            for (ChangeInfo changeInfo : arrayList) {
+                sql = "insert into formtable_main_3055_dt1 (MAINID,RQ,BGXM,BGQ,BGH,FJ,BZ) values  ('" + mxbId + "','" + changeInfo.getRq() + "','" + changeInfo.getBgxm() + "'" +
+                        ",'" + changeInfo.getBgq() + "','" + changeInfo.getBgh() + "','" + changeInfo.getFj() + "','" + changeInfo.getBz() + "')";
+                recordSet.executeUpdate(sql);
+                log.writeLog("插入版本表的变更表:" + sql);
+            }
+
+            //同步股权信息dt2
+            sql = "select * from uf_jingneiqiyexinxi_dt2 where MAINID = " + bgMap.get("QYID");
+            recordSet.execute(sql);
+            ArrayList<HashMap<String, String>> dt2 = new ArrayList<>();
+            log.writeLog("获取股权sql:" + sql);
+
+            while (recordSet.next()) {
+                HashMap<String, String> map = new HashMap<>();
+                for (String s : recordSet.getColumnName()) {
+                    map.put(s, recordSet.getString(s));
+                }
+                dt2.add(map);
+            }
+            log.writeLog("股权list:" + dt2);
+            log.writeLog("股权的行数:" + dt2.size());
+
+            //更新境内企业信息（uf_jingneiqiyexinxi）股权信息（dt2）
+            for (HashMap<String, String> map : dt2) {
+
+                sql = "insert into formtable_main_3055_dt2 (MAINID,DJGD,CGBL,BZ,QYMC1,rq,CGFS,gfzl) values ('" + mxbId + "'" +
+                        ",'" + map.get("DJGD") + "','" + map.get("CGBL") + "','" + map.get("BZ") + "','" + map.get("QYMC1") + "','"+key+"','"+map.get("CGFS")+"','"+map.get("GFZL")+"')";
+                log.writeLog("插入股权信息sql:" + sql);
+                recordSet.executeUpdate(sql);
+
+
+
+
+            }
+            log.writeLog("同步股权信息sql:" + sql);
+
+            //changeInfos,更新境内企业信息（uf_jingneiqiyexinxi）
+            for (ChangeInfo changeInfo : changeInfos) {
+//                if (!changeInfo.getBgxm().trim().substring(0, 1).matches("^[a-zA-Z]*")) {
+//
+//                } else {
+                    sql = "update uf_jingneiqiyexinxi set " + changeInfo.getBgxm() + " = '" + changeInfo.getBgh() + "' where id = " + bgMap.get("QYID");
+                    log.writeLog("更新境内企业信息:" + sql);
+                    recordSet.execute(sql);
+//                }
+
+            }
+
+            //插入修改信息到包括历史沿革uf_jingneiqiyexinxi_dt1
+
+            for (ChangeInfo changeInfo : changeInfos) {
+                sql = "insert into uf_jingneiqiyexinxi_dt1 (MAINID,RQ,BGXM,BGQ,BGH,FJ,BZ) values " +
+                        "('" + changeInfo.getMainid() + "','" + changeInfo.getRq() + "','" + new HistoryInfoAPI().getBgxms(changeInfo.getBgxm()) + "'" +
+                        ",'" + changeInfo.getBgq() + "','" + changeInfo.getBgh() + "','" + changeInfo.getFj() + "','" + changeInfo.getBz() + "')";
+                log.writeLog("插入修改信息到包括历史沿革uf_jingneiqiyexinxi_dt1:" + sql);
+                recordSet.executeUpdate(sql);
+
+            }
+
+            //先删除相关的股权
+            sql = "delete uf_jingneiqiyexinxi_dt2 where mainid=  " + bgMap.get("QYID");
+            recordSet.execute(sql);
+            log.writeLog("删除股权的sql:" + sql);
+
+            //更新股权 dt2
+            for (HashMap<String, String> map : bghList) {
+                //把变更后的股权插入到jingneiqiyexinxi_dt2中
+                sql = "insert into uf_jingneiqiyexinxi_dt2 (MAINID,DJGD,CGBL,BZ,CGFS,GFZL) values " +
+                        "('" + bgMap.get("QYID") + "','" + map.get("DJGD") + "','" + map.get("CGBL") + "','" + map.get("BZ") + "','"+map.get("CFFS")+"','"+ map.get("GFZL")+"')";
+                log.writeLog("添加境内企业信息的sql:" + sql);
+                recordSet.execute(sql);
+            }
+            //更新企业表中的股权信息
+//        update uf_jingneiqiyexinxi_dt2 set qymc1='用于测试的企业11' where qymc1= '用于测试的企业22'
+            sql = "update uf_jingneiqiyexinxi_dt2 set qymc1='" + bgMap.get("QYMCBGH") + "' where mainid = '" + bgMap.get("QYID") + "'";
+            log.writeLog("更新股权表的qymc1:" + sql);
+            recordSet.executeUpdate(sql);
+        }
+    }
+
+    /**
+     * 字段转换(通过字符找到变更项目)
+     * @param bg 变更的字符串
+     * @return 变更项目
+     */
+
+    public String getBgxms(String bg) {
+        //设置变更项目的对应字段
+        Map<String, String> cors = new HashMap<>();
+        cors.put("QYMC", "企业名称");
+        cors.put("ZYM", "曾用名");
+        cors.put("YWM", "英文名");
+        cors.put("CLRQ", "成立日期");
+        cors.put("SHXYDM", "社会信用代码");
+        cors.put("GQTSAP", "股权特殊安排");
+        cors.put("FRDB", "法人代表");
+        cors.put("CWFZR", "财务负责人");
+        cors.put("JL", "经理");
+        cors.put("JS", "监事");
+        cors.put("DS", "董事");
+        cors.put("DJZT", "登记状态");
+        cors.put("YWCZ", "业务承载");
+        cors.put("SFWBBDW", "是否为并表单位");
+        cors.put("ZCZB", "注册资本");
+        cors.put("DZ", "地址");
+        cors.put("JYFW", "经营范围");
+        cors.put("DJGD", "登记股东");
+        cors.put("CGBL", "持股比例");
+        cors.put("GLY", "管理员");
+        cors.put("DHYJ", "导航一级");
+        cors.put("DHEJ", "导航二级");
+        cors.put("DHSJ", "导航三级");
+        cors.put("DHSJ1", "导航四级");
+        cors.put("DHWJ", "导航五级");
+        cors.put("DHLJ", "导航六级");
+        cors.put("DHQJ", "导航七级");
+        cors.put("BAFJ", "备案附件");
+
+        cors.put("GBDQ", "国别/地区");
+        cors.put("DLQ", "代理区");
+        cors.put("GSLX", "公司类型");
+        cors.put("GS", "股数");
+        cors.put("BZ", "币种");
+        cors.put("MGMZ", "每股面值");
+        cors.put("DLDFLST", "独立的法律实体");
+        cors.put("YYDZ", "营业地址");
+        cors.put("YWBK", "业务板块");
+        cors.put("YWBKZJTZDJS", "业务模块/在集团中的角色");
+        cors.put("BZ2", "备注");
+        cors.put("DYZY", "抵押/质押");
+        cors.put("FJSC", "附件上传");
+        cors.put("ZJFWJGMSGS", "中介服务机构/秘书公司");
+        cors.put("SJS", "审计师");
+
+        //判断
+        if (Util.null2String(cors.get(bg)).equals("")) {
+
+            log.writeLog("bgx---------------------------------------------:" + bg);
+            return bg;
+        } else {
+            log.writeLog("bgx---------------------------------------------:" + cors.get(bg));
+
+            return cors.get(bg);
+        }
+    }
+
+
+
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/service/oa/NewQiye.java b/src/main/youhong_ai_jitu_src/jntchina/service/oa/NewQiye.java
new file mode 100644
index 0000000..755676b
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/service/oa/NewQiye.java
@@ -0,0 +1,136 @@
+package jntchina.service.oa;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
+
+import jntchina.util.DataBaseUtils;
+import selfdev.util.log.LogTool;
+import weaver.conn.RecordSet;
+import weaver.formmode.customjavacode.AbstractModeExpandJavaCodeNew;
+import weaver.general.Util;
+import weaver.hrm.User;
+import weaver.soa.workflow.request.RequestInfo;
+
+
+/**
+ * 说明
+ * 修改时
+ * 类名要与文件名保持一致
+ * class文件存放位置与路径保持一致。
+ * 请把编译后的class文件，放在对应的目录中才能生效
+ * 注意 同一路径下java名不能相同。
+ * @author Administrator
+ *
+ */
+public class NewQiye extends AbstractModeExpandJavaCodeNew {
+	private final LogTool log = new LogTool("/log/api/aa/", false);
+
+	/**
+	 * 执行模块扩展动作
+	 * @param param
+	 *  param包含(但不限于)以下数据
+	 *  user 当前用户
+	 *  importtype 导入方式(仅在批量导入的接口动作会传输) 1 追加，2覆盖,3更新，获取方式(int)param.get("importtype")
+     *  导入链接中拼接的特殊参数(仅在批量导入的接口动作会传输)，比如a=1，可通过param.get("a")获取参数值
+	 *  页面链接拼接的参数，比如b=2,可以通过param.get("b")来获取参数
+	 * @return 
+	 */
+	public Map<String, String> doModeExpand(Map<String, Object> param) {
+		Map<String, String> result = new HashMap<String, String>();
+		try {
+			User user = (User)param.get("user");
+			int billid = -1;//数据id
+			int modeid = -1;//模块id
+			RequestInfo requestInfo = (RequestInfo)param.get("RequestInfo");
+			if(requestInfo!=null){
+				billid = Util.getIntValue(requestInfo.getRequestid());
+				modeid = Util.getIntValue(requestInfo.getWorkflowid());
+				if(billid>0&&modeid>0){
+					//------请在下面编写业务逻辑代码------
+
+
+					RecordSet recordSet = new RecordSet();
+					String sql = "select * from uf_jingneiqiyexinxi where id = "+billid;
+					HashMap<String, String> hashMap = new HashMap<>();
+					recordSet.execute(sql);
+					while (recordSet.next()) {
+						for (String s : recordSet.getColumnName()) {
+							hashMap.put(s, recordSet.getString(s));
+						}
+					}
+					log.writeLog("创建企业查询语句:"+sql);
+//获取模块id
+					sql = "select id from modeinfo where formid = (select id from workflow_bill where tablename = 'formtable_main_3055')";
+					recordSet.execute(sql);
+					recordSet.next();
+					String modeId = recordSet.getString("ID");
+
+					sql = "insert into  formtable_main_3055 (zczb,dz,gly,qymc,zym,ywm,clrq,shxydm,dhyj,dhej,dhsj,dhsj1,dhwj,dhlj,dhqj," +
+							"jyfw,gqtsap,gqapfj,frdb,cwfzr,jl,js,ds,djzt,sfwbbdw,bafj,bbrq,qyid,FORMMODEID,GBDQ,DLQ" +
+							"                , GSLX,GS,BZ,MGMZ,DLDFLST,YYDZ,YWBK,YWMKZJTZDJS,BZ2,DYZY,FJSC,ZJFWJGMSGS,SJS,GLF,NBJZQ) values ('" + hashMap.get("ZCZB") + "', '" + hashMap.get("DZ") + "', " +
+							"'" + hashMap.get("GLY") + "', '" + hashMap.get("QYMC") + "', '" + hashMap.get("ZYM") + "', '" + hashMap.get("YWM") + "', " +
+							"'" + hashMap.get("CLRQ") + "', '" + hashMap.get("SHXYDM") + "', '" + hashMap.get("DHYJ") + "', '" + hashMap.get("DHEJ") + "', " +
+							"'" + hashMap.get("DHSJ") + "', '" + hashMap.get("DHSJ1") + "', '" + hashMap.get("DHWJ") + "', '" + hashMap.get("DHLJ") + "', " +
+							"'" + hashMap.get("DHQJ") + "', '" + hashMap.get("JYFW") + "', '" + hashMap.get("GQTSAP") + "', '" + hashMap.get("GQAPFJ") + "', " +
+							"'" + hashMap.get("FRDB") + "', '" + hashMap.get("CWFZR") + "', '" + hashMap.get("JL") + "', '" + hashMap.get("JS") + "', " +
+							"'" + hashMap.get("DS") + "', '" + hashMap.get("DJZT") + "', '" + hashMap.get("SFWBBDW") + "', " +
+							"'" + hashMap.get("BAFJ") + "', '" + hashMap.get("CLRQ") + "','"+billid+"',"+modeId+"" +
+							", '" + hashMap.get("GBDQ") + "', '" + hashMap.get("DLQ") + "', '" + hashMap.get("GSLX") + "', '" + hashMap.get("GS") + "'" +
+							", '" + hashMap.get("BZ") + "', '" + hashMap.get("MGMZ") + "', '" + hashMap.get("DLDFLST") + "', '" + hashMap.get("YYDZ") + "'" +
+							", '" + hashMap.get("YWBK") + "', '" + hashMap.get("YWMKZJTZDJS") + "', '" + hashMap.get("BZ2") + "', '" + hashMap.get("DYZY") + "'" +
+							", '" + hashMap.get("FJSC") + "', '" + hashMap.get("ZJFWJGMSGS") + "', '" + hashMap.get("SJS") + "', '" + hashMap.get("GLF") + "', '" + hashMap.get("NBJZQ") + "')";
+					log.writeLog("插入版本表的sql:"+sql);
+
+					recordSet.execute(sql);
+
+
+					sql = "select id from formtable_main_3055 where qyid = " + billid;
+					String versionId = DataBaseUtils.getFirstValue(sql);
+
+					sql = "select * from uf_jingneiqiyexinxi_dt2 where MAINID = "+billid ;
+					log.writeLog("获取股东:"+sql);
+
+					ArrayList<Map<String, String>> dt2List =  DataBaseUtils.getDataList(sql);
+					for (Map<String, String> map : dt2List) {
+						sql = "insert into formtable_main_3055_dt2 (MAINID,DJGD,CGBL,BZ,QYMC1,CGFS,gfzl,MAINBILLID) values ('" + versionId + "'" +
+								",'" + map.get("DJGD") + "','" + map.get("CGBL") + "','" + map.get("BZ") + "','" + map.get("QYMC1") + "'," +
+								"'','" + map.get("CGFS") + "','" + map.get("GFZL") + "','"+map.get("ID")+"')";
+						recordSet.execute(sql);
+						log.writeLog("插入股东:" + sql);
+					}
+					//同步资质证照
+					sql = "select * from uf_jingneiqiyexinxi_dt3 where MAINID =   " + billid;
+					log.writeLog("同步资质证照的SQL:"+sql);
+
+					ArrayList<Map<String, String>> dt3List = DataBaseUtils.getDataList(sql);
+					log.writeLog("同步资质证照的list:"+dt3List.size());
+
+
+
+					for (Map<String, String> map : dt3List) {
+						sql = "insert into formtable_main_3055_dt3 (MAINID,zzzz,fjsc,BZ,QYMC,MAINBILLID) values ('" + versionId + "'" +
+								",'" + map.get("ZZZZ") + "','" + map.get("FJSC") + "','" + map.get("BZ") + "','" + map.get("QYMC") + "','"+map.get("ID")+"')";
+						log.writeLog("插入资质证照信息sql:" + sql);
+						recordSet.execute(sql);
+					}
+
+					sql = "update  uf_jingneiqiyexinxi_dt2 set qymc1 = '" + billid + "' where mainid = '"+billid+"'";
+					log.writeLog("修改:"+sql);
+					recordSet.execute(sql);
+					sql = "update  uf_jingneiqiyexinxi_dt3 set qymc = '" + billid + "' where mainid = '"+billid+"'";
+					log.writeLog("修改:"+sql);
+					recordSet.execute(sql);
+
+
+
+				}
+			}
+		} catch (Exception e) {
+			result.put("errmsg","自定义出错信息");
+			result.put("flag", "false");
+		}
+		return result;
+	}
+
+}
\ No newline at end of file
diff --git a/src/main/youhong_ai_jitu_src/jntchina/service/oa/OAUtils.java b/src/main/youhong_ai_jitu_src/jntchina/service/oa/OAUtils.java
new file mode 100644
index 0000000..fa297b9
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/service/oa/OAUtils.java
@@ -0,0 +1,1013 @@
+package jntchina.service.oa;
+
+import com.alibaba.excel.ExcelWriter;
+import com.alibaba.excel.metadata.Sheet;
+import com.alibaba.excel.metadata.Table;
+import com.alibaba.excel.support.ExcelTypeEnum;
+import com.alibaba.fastjson.JSON;
+import jntchina.schedule.hrm.SynShangBiao;
+import jntchina.util.DataBaseUtils;
+import selfdev.util.log.LogTool;
+import weaver.conn.RecordSet;
+
+import weaver.general.Util;
+import weaver.hrm.User;
+
+
+import javax.servlet.http.HttpServletRequest;
+import javax.ws.rs.*;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import java.io.*;
+import java.time.LocalDate;
+import java.util.*;
+
+import static jntchina.service.oa.ChangeDt1.strNull;
+
+/**
+ * @title: OAUtils 工具处理类
+ * @Author ycf
+ * @Date: 2021/12/7 17:03
+ * @Version 1.0
+ */
+@Path("/UtilsAPI")
+public class OAUtils {
+    private final LogTool log = new LogTool("/log/api/qiye/", false);
+
+
+
+    @POST
+    @Path("/changeDate")
+    public String changeDate(@Context HttpServletRequest request) {
+        HashMap<String, Object> map = new HashMap<>();
+        RecordSet recordSet = new RecordSet();
+        String sql = "";
+        try {
+
+            
+            String[] bgq = request.getParameterValues("bgq[]");
+            String[] bgh = request.getParameterValues("bgh[]");
+            String id = request.getParameter("id");
+            log.writeLog("变更前日期:"+ Arrays.toString(bgq));
+            log.writeLog("变更hou日期:"+ Arrays.toString(bgh));
+            log.writeLog("id:"+id);
+
+            if (bgq.length == bgh.length) {
+                for (int i = 0; i < bgq.length; i++) {
+                    if (!bgq[i].equals(bgh[i])) {
+                        //更新历史沿革日期
+                        sql = "update formtable_main_3055_DT1\n" +
+                                "set rq = '"+bgh[i]+"'\n" +
+                                "where   mainid = (select id from formtable_main_3055 where bbRQ = '"+bgq[i]+"' and qyid = "+id+")  ";
+                        recordSet.execute(sql);
+                        log.writeLog("更新企业的历史沿革sql:" + sql);
+
+
+                        //更新版本日期
+                        sql = "update formtable_main_3055\n" +
+                                "set BBRQ = '"+bgh[i]+"'\n" +
+                                "where BBRQ = '"+bgq[i]+"' and QYID = "+id;
+                        recordSet.execute(sql);
+                        log.writeLog("更新企业的版本日期sql:"+sql);
+                    }
+                }
+            }
+
+             map.put("msg","修改成功");
+        } catch (Exception e) {
+            log.writeLog("e:"+e);
+
+
+            map.put("msg","修改失败"+e.toString());
+        }
+        log.writeLog("msg:"+JSON.toJSONString(map));
+        
+        return JSON.toJSONString(map);
+
+    }
+
+
+    @GET
+    @Path("/synShangBiao")
+    public String synShangBiao() {
+
+        HashMap<String, String> map = new HashMap<>();
+        try {
+            new SynShangBiao().execute();
+            map.put("code", "1");
+            map.put("msg", "成功");
+        } catch (Exception e) {
+            map.put("code", "0");
+            map.put("msg", "失败，失败原因请通过后台日志查看");
+        }
+        return JSON.toJSONString(map);
+
+    }
+
+    @POST
+    @Path("/getDetailValue")
+    public String getDetailValue(@Context HttpServletRequest request) {
+        String id = Util.null2String(request.getParameter("id"));
+        String isinfo = Util.null2String(request.getParameter("isinfo"));
+        String sql = "";
+
+        if ("0".equals(isinfo)) {
+            sql = "select *\n" +
+                    "from formtable_main_3055_DT1 where mainid in (select id\n" +
+                    "from formtable_main_3055 where   qyid = "+id+" ) order by RQ,  id";
+        } else {
+
+            sql = "select *\n" +
+                    "from formtable_main_3055_DT1 where mainid in (select id\n" +
+                    "from formtable_main_3055 where BBRQ<=(select BBRQ\n" +
+                    "from formtable_main_3055 where id = "+id+") and qyid = (select QYID\n" +
+                    "from formtable_main_3055 where id = "+id+") )  order by RQ,  id ";
+        }
+
+
+        log.writeLog("获取明细字段的sql:"+sql);
+
+
+        RecordSet recordSet = new RecordSet();
+        sql = strNull(sql);
+        log.writeLog("通过SQL获取数据集:"+sql);
+        ArrayList<Map<String, Object>> maps = new ArrayList<>();
+        recordSet.execute(sql);
+        while (recordSet.next()) {
+            HashMap<String, Object> map = new HashMap<>();
+            for (String s : recordSet.getColumnName()) {
+                map.put(s, strNull(recordSet.getString(s)));
+            }
+            maps.add(map);
+        }
+
+        log.writeLog("maps:"+maps);
+        
+
+        int i = 0;
+        for (Map<String, Object> map : maps) {
+            i++;
+            map.put("FJS", getWenJianUrl(map.get("FJ").toString()));
+
+            map.put("ID", i+"");
+        }
+
+        HashMap<String, Object> map = new HashMap<>();
+        map.put("data", maps);
+
+
+
+        return JSON.toJSONString(map);
+    }
+
+    /**
+     * 获取系统语言
+     * @return 是否为中文
+     */
+    @GET
+    @Path("/getLanguage")
+    public String getLanguage() {
+
+        RecordSet recordSet = new RecordSet();
+        recordSet.execute(" select id from modeinfo where formid = (select id from workflow_bill where tablename = 'uf_jingneiqiyexinxi')    ");
+        recordSet.next();
+        String id = recordSet.getString("ID");
+        HashMap<String, Object> map = new HashMap<>();
+        map.put("language", (User.getUser(1, 0).getLanguage() + "").equals("7"));
+        map.put("path", "/spa/cube/engine.html#/cubeengine/app/modebatchimport?modeid="+id+"&customid="+id+"&_key=2dcq42");
+        return JSON.toJSONString(map);
+    }
+
+    /**
+     * 获取创建企业的url
+     * @return url
+     */
+    @GET
+    @Path("/getCreateQiyeURL")
+    public String getCreateQiyeURL() {
+        RecordSet recordSet = new RecordSet();
+        recordSet.execute("select id from modeinfo where formid = (select id from workflow_bill where tablename = 'uf_jingneiqiyexinxi')");
+        recordSet.next();
+        String modelId = recordSet.getString("ID");
+        recordSet.execute("select id from workflow_bill where tablename = 'uf_jingneiqiyexinxi'");
+        recordSet.next();
+        String fromId = recordSet.getString("ID");
+
+        HashMap<String, String> map = new HashMap<>();
+        map.put("path", "/spa/cube/index.html#/main/cube/card?type=1&modeId=" + modelId + "&formId=" + fromId);
+        return JSON.toJSONString(map);
+    }
+
+    /**
+     * 检查企业名是否重名
+     *
+     * @param name 企业名
+     * @return 状态：0：可用，1：不可
+     */
+    @GET
+    @Path("/checkName")
+    public String checkName(@QueryParam("name") String name) {
+
+        RecordSet recordSet = new RecordSet();
+        String sql = "select count(1) from uf_jingneiqiyexinxi where qymc = '" + name + "'";
+        log.writeLog("检查：" + sql);
+        recordSet.execute(sql);
+        recordSet.next();
+        int anInt = recordSet.getInt(1);
+        log.writeLog("是否有重名;+" + anInt);
+        if (anInt == 0) {
+            return "0";
+        } else {
+            return "1";
+        }
+
+    }
+
+
+
+    /**
+     * 判断是否含有下一级
+     *
+     * @param sql 判断的SQL
+     * @return boolean true/false
+     */
+    public boolean isHaveNext(String sql) {
+        log.writeLog("isHaveNextsql4:" + sql);
+
+        RecordSet recordSet = new RecordSet();
+        recordSet.execute(sql);
+        recordSet.next();
+        String a = recordSet.getString("ID");
+        return !"".equals(a);
+
+
+    }
+
+    /**
+     * 根据参数获取日期的SQL
+     * @param str str
+     * @return sql
+     */
+    public String getDateSql(String[] str) {
+        String sql = "";
+        //开始时间
+        String date1 = "";
+        //结束时间
+        String date2 = "";
+        //当前时间
+        String date = String.valueOf(LocalDate.now());
+        String year = date.substring(0, 4);
+        String month = date.substring(5, 7);
+        String day = date.substring(8, 10);
+        log.writeLog("date:"+date);
+        log.writeLog("date1:"+date1);
+        log.writeLog("date2:"+date2);
+
+
+
+        if (null != str) {
+            switch (str[0]) {
+                case "1":
+                    //昨天
+                    if (!day.equals("01")) {
+                        sql += " and to_date(clrq,'yyyy-MM-dd') = to_date('" + year + "-" + month + "-" + (Integer.parseInt(day) - 1) + "','yyyy-MM-dd') ";
+                    } else {
+                        //获取上个月的最后一天
+                        String day2 = String.valueOf(LocalDate.of(Integer.parseInt(year), Integer.parseInt(month) - 1, Integer.parseInt(day)).lengthOfMonth());
+                        sql += " and to_date(clrq,'yyyy-MM-dd') = to_date('" + year + "-" + (Integer.parseInt(month) - 1) + "-" + day2 + "','yyyy-MM-dd') ";
+                    }
+                    break;
+                case "2":
+                    //今天
+                    sql += " and to_date(clrq,'yyyy-MM-dd') =  to_date('" + year + "-" + month + "-" + day + "','yyyy-MM-dd') ";
+                    break;
+                case "3":
+                    //明天
+                    //判断是否为本月最后一天
+                    if (day.equals(String.valueOf(LocalDate.of(Integer.parseInt(year), Integer.parseInt(month), Integer.parseInt(day)).lengthOfMonth()))) {
+                        if (month.equals("12")) {
+                            sql += " and to_date(clrq,'yyyy-MM-dd') =  to_date('" + (Integer.parseInt(year) + 1) + "-01-01','yyyy-MM-dd') ";
+                        } else {
+                            sql += " and to_date(clrq,'yyyy-MM-dd') =  to_date('" + year + "-" + (Integer.parseInt(month) + 1) + "-01','yyyy-MM-dd') ";
+                        }
+                    } else {
+                        sql += " and to_date(clrq,'yyyy-MM-dd') =  to_date('" + year + "-" + month + "-"+(Integer.parseInt(day) + 1)+"','yyyy-MM-dd') ";
+                    }
+                    break;
+                case "4":
+                    //上周
+                    break;
+                case "5":
+                    //本周
+                    break;
+                case "6":
+                    //指定日期范围
+                    if (null != str[1]) {
+                        if (!"".equals(str[1])) {
+                            sql += " and to_date(clrq,'yyyy-MM-dd') >= to_date('"+str[1]+"','yyyy-MM-dd') ";
+                        }
+                    }
+                    if (null != str[2]) {
+                        if (!"".equals(str[2])) {
+                            sql += " and to_date(clrq,'yyyy-MM-dd') <= to_date('"+str[2]+"','yyyy-MM-dd') ";
+                        }
+                    }
+
+                    break;
+                case "7":
+                    //下周
+
+                    break;
+                case "8":
+                    //本月
+
+                    sql += " and to_date(clrq,'yyyy-MM-dd') <= to_date('"+year+"-"+month+"-"+LocalDate.of(Integer.parseInt(year), Integer.parseInt(month), Integer.parseInt(day)).lengthOfMonth()+"','yyyy-MM-dd') ";
+                    sql += " and to_date(clrq,'yyyy-MM-dd') >= to_date('"+year+"-"+month+"-01','yyyy-MM-dd') ";
+                    break;
+                case "9":
+                    //本季度
+                    switch (Integer.parseInt(month)) {
+                        case 1:
+                        case 2:
+                        case 3 :
+                            sql += " and to_date(clrq,'yyyy-MM-dd') <= to_date('" + year + "-03-31','yyyy-MM-dd') ";
+                            sql += " and to_date(clrq,'yyyy-MM-dd') >= to_date('" + year + "-01-01','yyyy-MM-dd') ";
+                            break;
+                        case 4:
+                        case 5:
+                        case 6 :
+
+                            sql += " and to_date(clrq,'yyyy-MM-dd') <= to_date('" + year + "-06-31','yyyy-MM-dd') ";
+                            sql += " and to_date(clrq,'yyyy-MM-dd') >= to_date('" + year + "-04-01','yyyy-MM-dd') ";
+                            break;
+                        case 7:
+                        case 8:
+                        case 9 :
+
+                            sql += " and to_date(clrq,'yyyy-MM-dd') <= to_date('" + year + "-09-31','yyyy-MM-dd') ";
+                            sql += " and to_date(clrq,'yyyy-MM-dd') >= to_date('" + year + "-07-01','yyyy-MM-dd') ";
+                            break;
+
+                        case 10:
+                        case 11:
+                        case 12 :
+                            sql += " and to_date(clrq,'yyyy-MM-dd') <= to_date('" + year + "-12-31','yyyy-MM-dd') ";
+                            sql += " and to_date(clrq,'yyyy-MM-dd') >= to_date('" + year + "-10-01','yyyy-MM-dd') ";
+                            break;
+
+                    }
+                    break;
+                case "10":
+                    //本年
+                    sql += " and to_date(clrq,'yyyy-MM-dd') <= to_date('"+year+"-12-31','yyyy-MM-dd') ";
+                    sql += " and to_date(clrq,'yyyy-MM-dd') >= to_date('"+year+"-01-01','yyyy-MM-dd') ";
+
+                    break;
+                case "11":
+                    //上个月
+                    if (month.equals("01")) {
+                        sql += " and to_date(clrq,'yyyy-MM-dd') < to_date('"+(Integer.parseInt(year)-1)+"-12-01','yyyy-MM-dd') ";
+                        sql += " and to_date(clrq,'yyyy-MM-dd') >= to_date('"+(Integer.parseInt(year)-1)+"-12-31','yyyy-MM-dd') ";
+                    } else {
+                        String month2 = Integer.parseInt(month) - 1+"";
+                        sql += " and to_date(clrq,'yyyy-MM-dd') < to_date('"+year+"-"+month+"-1','yyyy-MM-dd') ";
+                        sql += " and to_date(clrq,'yyyy-MM-dd') >= to_date('"+year+"-"+month2+"-01','yyyy-MM-dd') ";
+                    }
+
+                    break;
+                case "12":
+                    //上一年
+
+                    sql += " and to_date(clrq,'yyyy-MM-dd') <= to_date('"+(Integer.parseInt(year)-1)+"-12-31','yyyy-MM-dd') ";
+                    sql += " and to_date(clrq,'yyyy-MM-dd') >= to_date('"+(Integer.parseInt(year)-1)+"-01-01','yyyy-MM-dd') ";
+
+                    break;
+            }
+
+        }
+        return sql;
+    }
+
+
+    /**
+     * 导出列表 Excel表格
+     * @param request 导出的企业id
+     * @return Excel
+     * @throws IOException io流异常
+     */
+    @Path("/exportToExcel")
+    @POST
+    public String exportToExcel(@Context HttpServletRequest request) throws IOException {
+        log.writeLog("进入导出:");
+        String[] qyid = request.getParameterValues("params[]");
+        log.writeLog("导出企业的id:"+ Arrays.toString(qyid));
+        RecordSet recordSet = new RecordSet();
+        List<List<String>> bodyList = new ArrayList<>();
+        for (String str : qyid) {
+            String sql = "select (select DHYJZDXX from uf_daohangyijizidua where id = a.dhyj) dhyj" +
+                    ",(select dhej from uf_daohangerji where id = a.dhej) dhej" +
+                    ",(select dhsj from  uf_saohangsanji where id = a.dhsj) dhsj " +
+                    " ,(select dhsj from  uf_daohangsiji where id = a.dhsj1) dhsj1 " +
+                    " ,(select dhwj from  uf_daohangwuji where id = a.dhwj) dhwj" +
+                    ",(select dhlj from  uf_daohangliuji where id = a.dhlj) dhlj" +
+                    ",(select dhqj from  uf_daohangqiji where id = a.dhqj)  dhqj " +
+                    ", (select sfzxm from uf_guanliyuankuxin where id =a.gly) gly" +
+                    ",qymc" +
+                    ",(select GJDQK from uf_guojiadiquku where id = a.gbdq) gbdq" +
+                    ",(select DLQ from uf_dailiqu where id=a.dlq) dlq" +
+                    ",(select gslx from uf_gongsileixing where id=a.gslx) gslx" +
+                    ",zym" +
+                    ",ywm" +
+                    ",clrq" +
+                    ",shxydm" +
+                    ",(select DJZT from uf_dengjizhuangtai where id=a.djzt) djzt" +
+                    ",zczb" +
+                    ",gs" +
+                    ",(select bz from uf_bizhong where id=a.bz) bz" +
+                    ",mgmz" +
+                    ",  dldflst" +
+                    ",dz" +
+                    ",yydz" +
+                    ",jyfw" +
+                    ",(select YWBK from uf_yewubankuai where id=a.ywbk) ywbk" +
+                    ",(select YWMKZJTZDJS from uf_jituanzhongdejue where id=a.ywmkzjtzdjs) ywmkzjtzdjs" +
+                    ",bz2" +
+                    ",(select SFWBBDW from uf_shifouweibingbia where id = a.sfwbbdw) sfwbbdw" +
+                    ", frdb" +
+                    ",cwfzr" +
+                    ", jl" +
+                    ",  js" +
+                    ",  ds" +
+                    ",gqtsap" +
+                    ",dyzy " +
+                    ",zjfwjgmsgs" +
+                    ",sjs,GLF,NBJZQ,id" +
+                    " from uf_jingneiqiyexinxi a where id = "+str;
+
+            log.writeLog("导出 查找企业的SQL:"+sql);
+
+            recordSet.execute(sql);
+//        ArrayList<Map<String, String>> mapArrayList = new ArrayList<>();
+
+            while (recordSet.next()) {
+                List<String> list = new ArrayList<>();
+                for (String s : recordSet.getColumnName()) {
+                    log.writeLog("s:"+s);
+                    if (!"ID".equals(s)){
+                        if ( "DS".equals(s) || "JS".equals(s) || "JL".equals(s) || "CWFZR".equals(s) || "FRDB".equals(s)) {
+                            list.add(Util.null2String(this.getRenYuan(recordSet.getString(s))));
+                        }else if ("GLF".equals(s)){
+                            list.add(Util.null2String("0".equals(recordSet.getString(s))?"YES":"NO"));
+                        }else if ("DLDFLST".equals(s)){
+                            log.writeLog("独立的法律实体:"+recordSet.getString(s));
+                            if ("0".equals(recordSet.getString(s))) {
+                                list.add("Yes");
+                            } else if ("1".equals(recordSet.getString(s))) {
+                                list.add("No");
+                            } else {
+                                list.add(" ");
+                            }
+                        }else if ("CLRQ".equals(s)){
+                            list.add(Util.null2String(recordSet.getString(s)));
+                            list.add(gdStr(recordSet.getString("ID"),"uf_jingneiqiyexinxi"));
+                        } else {
+                            list.add(Util.null2String(recordSet.getString(s)));
+
+                        }
+                    }
+
+
+                }
+                log.writeLog("获取的企业:"+list);
+                
+                bodyList.add(list);
+            }
+        }
+        List<List<String>> titleList = new ArrayList<>();
+        titleList.add(Arrays.asList("导航一级"));  titleList.add(Arrays.asList("导航二级"));titleList.add(Arrays.asList("导航三级"));titleList.add(Arrays.asList("导航四级"));titleList.add(Arrays.asList("导航五级"));titleList.add(Arrays.asList("导航六级"));titleList.add(Arrays.asList("导航七级"));titleList.add(Arrays.asList("管理员"));titleList.add(Arrays.asList("企业名称"));titleList.add(Arrays.asList("国别地区"));titleList.add(Arrays.asList("代理区"));titleList.add(Arrays.asList("公司类型"));titleList.add(Arrays.asList("曾用名"));titleList.add(Arrays.asList("外文名"));titleList.add(Arrays.asList("成立日期"));titleList.add(Arrays.asList("登记股东/持股比例"));titleList.add(Arrays.asList("社会信用代码"));titleList.add(Arrays.asList("登记状态"));titleList.add(Arrays.asList("注册资本"));titleList.add(Arrays.asList("股数"));titleList.add(Arrays.asList("币种"));titleList.add(Arrays.asList("每股面值"));titleList.add(Arrays.asList("独立的法律实体"));titleList.add(Arrays.asList("注册地址"));titleList.add(Arrays.asList("营业地址"));titleList.add(Arrays.asList("经营范围"));titleList.add(Arrays.asList("业务板块"));titleList.add(Arrays.asList("业务模块在集团中的角色"));titleList.add(Arrays.asList("备注"));titleList.add(Arrays.asList("是否为并表单位"));titleList.add(Arrays.asList("法人代表"));titleList.add(Arrays.asList("财务负责人"));titleList.add(Arrays.asList("经理"));titleList.add(Arrays.asList("监事"));titleList.add(Arrays.asList("董事"));titleList.add(Arrays.asList("股权特殊安排"));titleList.add(Arrays.asList("抵押质押"));titleList.add(Arrays.asList("中介服务机构/秘书公司"));titleList.add(Arrays.asList("审计师"));
+        titleList.add(Arrays.asList("关连方"));
+        titleList.add(Arrays.asList("年报截止期"));
+
+
+        String fileName = UUID.randomUUID().toString().replace("-", "") + "excel.xlsx";
+        File file = new File("/usr/weaver/ecology/filesystem/excel/"+fileName);
+        OutputStream out = new FileOutputStream(file);
+        //往文件写入数据
+        ExcelWriter writer = new ExcelWriter(out, ExcelTypeEnum.XLSX);
+        Sheet sheet = new Sheet(1, 0);
+        sheet.setSheetName("sheet1");
+        Table table = new Table(1);
+        //设置表头
+        table.setHead(titleList);
+        //写入数据
+        writer.write0(bodyList, sheet, table);
+        writer.finish();
+
+
+        HashMap<String, String> map = new HashMap<>();
+        map.put("url", fileName);
+        return JSON.toJSONString(map);
+
+    }
+
+
+    @GET
+    @Path("/getFile")
+    @Produces(MediaType.APPLICATION_OCTET_STREAM)//返回方式为流
+    public Response getFile(@Context HttpServletRequest request) throws Exception {
+
+        File file = new File("/usr/weaver/ecology/filesystem/excel/"+request.getParameter("fileName"));
+                return Response
+                .ok(new FileInputStream(file),MediaType.APPLICATION_OCTET_STREAM)
+                .header("content-disposition","attachment; filename = "+ java.net.URLEncoder.encode("企业信息列表.xlsx", "UTF-8"))
+                .build();
+    }
+
+
+
+    /**
+     * 导出架构表列表
+     * @param request 企业ID
+     * @return Excel
+     * @throws IOException io流
+     */
+    @Path("/exportHisToExcel")
+    @POST
+    public String exportHisToExcel(@Context HttpServletRequest request) throws IOException {
+        log.writeLog("进入导出:");
+        String[] qyid = request.getParameterValues("params[]");
+        log.writeLog("导出企业的id:"+ Arrays.toString(qyid));
+        RecordSet recordSet = new RecordSet();
+        List<List<String>> bodyList = new ArrayList<>();
+        for (String str : qyid) {
+            String table = "";
+            if ("c".equals(str.substring(0, 1))) {
+                str = str.replace("c", "");
+                table = "uf_jingneiqiyexinxi";
+            } else {
+                table = "formtable_main_3055";
+            }
+            String sql = "select (select DHYJZDXX from uf_daohangyijizidua where id = a.dhyj) dhyj" +
+                    ",(select dhej from uf_daohangerji where id = a.dhej) dhej" +
+                    ",(select dhsj from  uf_saohangsanji where id = a.dhsj) dhsj " +
+                    " ,(select dhsj from  uf_daohangsiji where id = a.dhsj1) dhsj1 " +
+                    " ,(select dhwj from  uf_daohangwuji where id = a.dhwj) dhwj" +
+                    ",(select dhlj from  uf_daohangliuji where id = a.dhlj) dhlj" +
+                    ",(select dhqj from  uf_daohangqiji where id = a.dhqj)  dhqj " +
+                    ", (select sfzxm from uf_guanliyuankuxin where id =a.gly) gly" +
+                    ",qymc" +
+                    ",(select GJDQK from uf_guojiadiquku where id = a.gbdq) gbdq" +
+                    ",(select DLQ from uf_dailiqu where id=a.dlq) dlq" +
+                    ",(select gslx from uf_gongsileixing where id=a.gslx) gslx" +
+                    ",zym" +
+                    ",ywm" +
+                    ",clrq" +
+                    ",shxydm" +
+                    ",(select DJZT from uf_dengjizhuangtai where id=a.djzt) djzt" +
+                    ",zczb" +
+                    ",gs" +
+                    ",(select bz from uf_bizhong where id=a.bz) bz" +
+                    ",mgmz" +
+                    ",  dldflst" +
+                    ",dz" +
+                    ",yydz" +
+                    ",jyfw" +
+                    ",(select YWBK from uf_yewubankuai where id=a.ywbk) ywbk" +
+                    ",(select YWMKZJTZDJS from uf_jituanzhongdejue where id=a.ywmkzjtzdjs) ywmkzjtzdjs" +
+                    ",bz2" +
+                    ",(select SFWBBDW from uf_shifouweibingbia where id = a.sfwbbdw) sfwbbdw" +
+                    ", frdb" +
+                    ",  cwfzr" +
+                    ",  jl" +
+                    ",   js" +
+                    ",   ds" +
+                    ",gqtsap" +
+                    ",dyzy " +
+                    ",zjfwjgmsgs" +
+                    ",sjs,GLF,NBJZQ,id" +
+                    " from "+table+" a where id = "+str;
+
+            log.writeLog("导出 查找企业的SQL:"+sql);
+
+            recordSet.execute(sql);
+//        ArrayList<Map<String, String>> mapArrayList = new ArrayList<>();
+
+            while (recordSet.next()) {
+                List<String> list = new ArrayList<>();
+                for (String s : recordSet.getColumnName()) {
+                    if (!"ID".equals(s)){
+                        if ( "DS".equals(s) || "JS".equals(s) || "JL".equals(s) || "CWFZR".equals(s) || "FRDB".equals(s)) {
+
+                            list.add(Util.null2String(this.getRenYuan(recordSet.getString(s))));
+                        }else if ("GLF".equals(s)){
+                            list.add(Util.null2String("0".equals(recordSet.getString(s))?"YES":"NO"));
+                        }else if ("DLDFLST".equals(s)){
+                            log.writeLog("独立的法律实体:"+recordSet.getString(s));
+                            if ("0".equals(recordSet.getString(s))) {
+                                list.add("Yes");
+                            } else if ("1".equals(recordSet.getString(s))) {
+                                list.add("No");
+                            } else {
+                                list.add(" ");
+                            }
+                        }else if ("CLRQ".equals(s)){
+                            list.add(Util.null2String(recordSet.getString(s)));
+                            list.add(gdStr(recordSet.getString("ID"),table));
+                        }else {
+                            list.add(Util.null2String(recordSet.getString(s)));
+                        }
+                    }
+                }
+                bodyList.add(list);
+            }
+        }
+        List<List<String>> titleList = new ArrayList<>();
+        titleList.add(Arrays.asList("导航一级"));  titleList.add(Arrays.asList("导航二级"));
+        titleList.add(Arrays.asList("导航三级"));
+        titleList.add(Arrays.asList("导航四级"));titleList.add(Arrays.asList("导航五级"));
+        titleList.add(Arrays.asList("导航六级"));titleList.add(Arrays.asList("导航七级"));
+        titleList.add(Arrays.asList("管理员"));titleList.add(Arrays.asList("企业名称"));
+        titleList.add(Arrays.asList("国别地区"));titleList.add(Arrays.asList("代理区"));
+        titleList.add(Arrays.asList("公司类型"));titleList.add(Arrays.asList("曾用名"));
+        titleList.add(Arrays.asList("外文名"));titleList.add(Arrays.asList("成立日期"));
+        titleList.add(Arrays.asList("登记股东/持股比例"));
+        titleList.add(Arrays.asList("社会信用代码"));titleList.add(Arrays.asList("登记状态"));
+        titleList.add(Arrays.asList("注册资本"));titleList.add(Arrays.asList("股数"));
+        titleList.add(Arrays.asList("币种"));titleList.add(Arrays.asList("每股面值"));
+        titleList.add(Arrays.asList("独立的法律实体"));titleList.add(Arrays.asList("注册地址"));
+        titleList.add(Arrays.asList("营业地址"));titleList.add(Arrays.asList("经营范围"));
+        titleList.add(Arrays.asList("业务板块"));titleList.add(Arrays.asList("业务模块在集团中的角色"));
+        titleList.add(Arrays.asList("备注"));titleList.add(Arrays.asList("是否为并表单位"));
+
+
+
+        titleList.add(Arrays.asList("法人代表"));
+        titleList.add(Arrays.asList("财务负责人"));
+        titleList.add(Arrays.asList("经理"));
+        titleList.add(Arrays.asList("监事"));titleList.add(Arrays.asList("董事"));
+        titleList.add(Arrays.asList("股权特殊安排"));
+        titleList.add(Arrays.asList("抵押质押"));titleList.add(Arrays.asList("中介服务机构/秘书公司"));
+        titleList.add(Arrays.asList("审计师"));
+        titleList.add(Arrays.asList("关连方"));
+        titleList.add(Arrays.asList("年报截止期"));
+
+
+        String fileName = UUID.randomUUID().toString().replace("-", "") + "excel.xlsx";
+        File file = new File("/usr/weaver/ecology/filesystem/excel/"+fileName);
+        OutputStream out = new FileOutputStream(file);
+        //往文件写入数据
+        ExcelWriter writer = new ExcelWriter(out, ExcelTypeEnum.XLSX);
+        Sheet sheet = new Sheet(1, 0);
+        sheet.setSheetName("sheet1");
+        Table table = new Table(1);
+        //设置表头
+        table.setHead(titleList);
+        //写入数据
+        writer.write0(bodyList, sheet, table);
+        writer.finish();
+
+
+        HashMap<String, String> map = new HashMap<>();
+        map.put("url", fileName);
+        return JSON.toJSONString(map);
+
+
+    }
+
+
+    @Path("/getUserName")
+    @GET
+    public String getUserByUserName(@Context HttpServletRequest request) {
+        RecordSet recordSet = new RecordSet();
+        String name = request.getParameter("name");
+
+        String sql = "select id,xm from uf_renyuanxinxiku where xm = '" + name+"'";
+        log.writeLog("查找:"+name+"的id的SQL"+sql);
+        
+        recordSet.execute(sql);
+        recordSet.next();
+        HashMap<String, String> map = new HashMap<>();
+        map.put("id", recordSet.getString("ID"));
+        map.put("name", recordSet.getString("xm"));
+
+        if (recordSet.getString("ID").equals("")) {
+            map.put("status", "1");
+
+        } else {
+            map.put("msg", (User.getUser(1, 0).getLanguage() + "").equals("7") ? "请管理员到人员信息库创建此登录用户" : "Ask the administrator to create this login user in the personnel information base");
+            map.put("status", "0");
+        }
+        return JSON.toJSONString(map);
+    }
+
+
+    /**
+     * 导出明细表
+     * @param request 企业id
+     * @return Excel
+     * @throws IOException io流异常
+     */
+    @Path("/exportDetailToExcel")
+    @GET
+    @Produces(MediaType.APPLICATION_OCTET_STREAM)//返回方式为流
+    public Response exportDetailToExcel(@Context HttpServletRequest request) throws IOException {
+        String qyid = request.getParameter("id");
+        RecordSet recordSet = new RecordSet();
+        List<List<String>> bodyList = new ArrayList<>();
+        String sql = "select rq,bgxm,bgq,bgh,bz from uf_jingneiqiyexinxi_dt1 where mainid ="+qyid+" order by rq";
+        sql = "select rq,bgxm,bgq,bgh,bz \n" +
+                "from formtable_main_3055_DT1 where mainid in (select id\n" +
+                "from formtable_main_3055 where   qyid = "+qyid+" ) order by RQ,  id";
+        recordSet.execute(sql);
+        int i = 0;
+        while (recordSet.next()) {
+            i++;
+            List<String> list = new ArrayList<>();
+            list.add(Util.null2String(i));
+            for (String s : recordSet.getColumnName()) {
+                list.add(Util.null2String(recordSet.getString(s)));
+            }
+            bodyList.add(list);
+
+        }
+        List<List<String>> titleList = new ArrayList<>();
+        titleList.add(Arrays.asList("序号"));
+        titleList.add(Arrays.asList("变更日期"));
+        titleList.add(Arrays.asList("变更项目"));
+        titleList.add(Arrays.asList("变更前"));
+        titleList.add(Arrays.asList("变更后"));
+        titleList.add(Arrays.asList("备注"));
+
+        File file = new File("/usr/weaver/ecology/filesystem/excel/"+UUID.randomUUID().toString().replace("-","")+"excel.xlsx");
+        OutputStream out = new FileOutputStream(file);
+        //往文件写入数据
+        ExcelWriter writer = new ExcelWriter(out, ExcelTypeEnum.XLSX);
+        Sheet sheet = new Sheet(1, 0);
+        sheet.setSheetName("sheet1");
+        Table table = new Table(1);
+        //设置表头
+        table.setHead(titleList);
+        //写入数据
+        writer.write0(bodyList, sheet, table);
+        writer.finish();
+
+        return Response
+                .ok(new FileInputStream(file),MediaType.APPLICATION_OCTET_STREAM)
+                .header("content-disposition","attachment; filename = "+ java.net.URLEncoder.encode("企业信息变更表.xlsx", "UTF-8"))
+                .build();
+
+    }
+
+
+
+    /**
+     * 导出架构表明细表
+     * @param request 企业id
+     * @return Excel
+     * @throws IOException io流异常
+     */
+    @Path("/exportHisDetailToExcel")
+    @GET
+    @Produces(MediaType.APPLICATION_OCTET_STREAM)//返回方式为流
+    public Response exportHisDetailToExcel(@Context HttpServletRequest request) throws IOException {
+        String qyid = request.getParameter("id");
+        RecordSet recordSet = new RecordSet();
+        List<List<String>> bodyList = new ArrayList<>();
+        String sql = "select rq,bgxm,bgq,bgh,bz from formtable_main_3055_dt1  where mainid ="+qyid+" order by ID";
+        sql = "select rq,bgxm,bgq,bgh,bz \n" +
+                "from formtable_main_3055_DT1 where mainid in (select id\n" +
+                "from formtable_main_3055 where BBRQ<=(select BBRQ\n" +
+                "from formtable_main_3055 where id = "+qyid+") and qyid = (select QYID\n" +
+                "from formtable_main_3055 where id = "+qyid+") )  order by RQ ,  id";
+
+        recordSet.execute(sql);
+        int i = 0;
+        while (recordSet.next()) {
+            List<String> list = new ArrayList<>();
+            i++;
+            list.add(Util.null2String(i));
+            for (String s : recordSet.getColumnName()) {
+                list.add(Util.null2String(recordSet.getString(s)));
+            }
+            bodyList.add(list);
+        }
+        List<List<String>> titleList = new ArrayList<>();
+        titleList.add(Arrays.asList("序号"));
+        titleList.add(Arrays.asList("变更日期"));
+        titleList.add(Arrays.asList("变更项目"));
+        titleList.add(Arrays.asList("变更前"));
+        titleList.add(Arrays.asList("变更后"));
+        titleList.add(Arrays.asList("备注"));
+
+        File file = new File("/usr/weaver/ecology/filesystem/excel/"+UUID.randomUUID().toString().replace("-","")+"excel.xlsx");
+        OutputStream out = new FileOutputStream(file);
+        //往文件写入数据
+        ExcelWriter writer = new ExcelWriter(out, ExcelTypeEnum.XLSX);
+        Sheet sheet = new Sheet(1, 0);
+        sheet.setSheetName("sheet1");
+        Table table = new Table(1);
+        //设置表头
+        table.setHead(titleList);
+        //写入数据
+        writer.write0(bodyList, sheet, table);
+        writer.finish();
+
+        return Response
+                .ok(new FileInputStream(file),MediaType.APPLICATION_OCTET_STREAM)
+                .header("content-disposition","attachment; filename = "+ java.net.URLEncoder.encode("企业信息变更表.xlsx", "UTF-8"))
+                .build();
+
+    }
+
+
+
+
+    public String getQymc(String qyid) {
+        qyid = DataBaseUtils.strNull(qyid);
+        RecordSet recordSet = new RecordSet();
+        recordSet.execute("select qymc from uf_jingneiqiyexinxi where id = " + qyid);
+//        log.writeLog("寻找企业名称:"+"select qymc from uf_jingneiqiyexinxi where id = " + qyid);
+        
+        recordSet.next();
+        String qymc = recordSet.getString("qymc");
+        log.writeLog("qymc:"+qymc);
+
+        return qymc;
+    }
+    public String getQyid(String qymc) {
+        RecordSet recordSet = new RecordSet();
+        recordSet.execute("select id from uf_jingneiqiyexinxi where qymc = '"+qymc+"'" );
+        recordSet.next();
+        return recordSet.getString("id");
+    }
+
+
+    public String getRenYuan(String value) {
+//        log.writeLog("获取的人员:"+value);
+
+        String sql = "";
+        String res = "";
+        if (!value.equals("")) {
+            RecordSet recordSet = new RecordSet();
+            String[] values = value.split(",");
+
+            for (String s : values) {
+                if (!"".equals(s.trim())) {
+
+                    sql = "select xm from uf_renyuanxinxiku where id =  " + s;
+                    recordSet.execute(sql);
+                    recordSet.next();
+                    res += recordSet.getString("xm")+"  ";
+                }
+            }
+
+
+        }
+        log.writeLog("res:"+res);
+
+        return res;
+    }
+    public String getFileNames(String value) {
+        log.writeLog("获取的文件名:"+value);
+
+        String sql = "";
+        String res = "";
+        if (!value.equals("")) {
+            RecordSet recordSet = new RecordSet();
+            String[] values = value.split(",");
+
+            for (String s : values) {
+                if (!"".equals(s.trim())) {
+
+                    sql = "select  IMAGEFILENAME  from docimagefile where  docid= " + s;
+                    recordSet.execute(sql);
+                    recordSet.next();
+                    res += recordSet.getString("IMAGEFILENAME")+";";
+                }
+            }
+        }
+        log.writeLog("返回的文件:"+res);
+
+        return res;
+    }
+
+    public List<Map<String,String>> getUrl(String value) {
+        List<Map<String,String>> list = new ArrayList<>();
+        RecordSet recordSet = new RecordSet();
+        String sql = "";
+        //人员信息库id
+        sql = "select id from modeinfo where formid = (select id from workflow_bill where tablename = 'uf_renyuanxinxiku')";
+        recordSet.execute(sql);
+        recordSet.next();
+        String rymodeId = recordSet.getString("ID");
+        //获取表单id
+        sql = "select id from workflow_bill where tablename = 'uf_renyuanxinxiku'";
+        recordSet.execute(sql);
+        recordSet.next();
+        String ryformId = recordSet.getString("ID");
+//                    map.put("JLURL", "/spa/cube/index.html#/main/cube/card?type=0&modeId=" + rymodeId + "&formId=" + ryformId + "&billid=" + map.get("JL"));
+        String url = "/spa/cube/index.html#/main/cube/card?type=0&modeId=" + rymodeId + "&formId=" + ryformId + "&billid=";
+
+        if (!value.equals("")) {
+            String[] values = value.split(",");
+            for (String s : values) {
+                if (!"".equals(s.trim())) {
+                    sql = "select id,xm from uf_renyuanxinxiku where id =  " + s;
+                    recordSet.execute(sql);
+                    recordSet.next();
+                    HashMap<String, String> map = new HashMap<>();
+                    map.put("value", recordSet.getString("xm"));
+                    map.put("url", url+recordSet.getString("id"));
+                    list.add(map);
+                }
+            }
+        }
+        return list;
+    }
+
+    public List<Map<String,String>> getWenJianUrl(String value) {
+
+        
+        List<Map<String,String>> list = new ArrayList<>();
+        RecordSet recordSet = new RecordSet();
+        String sql = "";
+        String url = "/spa/document/index2file.jsp?id=";
+
+        if (!value.equals("")) {
+            String[] values = value.split(",");
+            for (String s : values) {
+                if (!"".equals(s.trim())) {
+                    sql = "select  IMAGEFILENAME,docid  from docimagefile where  docid= " + s;
+                    recordSet.execute(sql);
+                    recordSet.next();
+                    HashMap<String, String> map = new HashMap<>();
+                    map.put("value", Util.null2String(recordSet.getString("IMAGEFILENAME")));
+                    map.put("url", Util.null2String(url+recordSet.getString("docid")));
+                    list.add(map);
+                }
+            }
+        }
+        return list;
+    }
+
+    public String getGlyName(String id) {
+        RecordSet recordSet = new RecordSet();
+        String sql = "select sfzxm from UF_GUANLIYUANKUXIN where id = " + Util.null2String(id);
+
+        recordSet.execute(sql);
+        recordSet.next();
+        return recordSet.getString("sfzxm");
+    }
+
+    /**
+     * 获取股东str
+     * @param id 企业id
+     * @param tableName 表名
+     * @return str
+     */
+    public String gdStr(String id,String tableName) {
+        String value = "";
+        String sql = "select * from "+tableName+"_dt2 where mainid = "+id +" order by djgd";
+//        log.writeLog("获取股东:"+sql);
+        
+        RecordSet recordSet = new RecordSet();
+        recordSet.execute(sql);
+        while (recordSet.next()) {
+            value += "\n"+getGdName(recordSet.getString("djgd"))+"/"+recordSet.getString("CGBL")+"%、";
+        }
+
+        
+        return "".equals(value)?value:value.substring(0,value.length()-1);
+    }
+
+
+    /**
+     * 获取股东名字 企业、人员
+     * @param gdname 股东
+     * @return 名字
+     */
+    private String getGdName(String gdname) {
+        String s = DataBaseUtils.strNull(gdname);
+        String[] strs = s.split("_");
+
+        String sql = "";
+        if (strs.length > 1) {
+            if ("qy".equals(strs[0])) {
+                sql = "select qymc name from uf_jingneiqiyexinxi where id = " + strs[1];
+            } else {
+                sql = "select xm name from UF_RENYUANXINXIKU where id = " + strs[1];
+
+            }
+        }
+
+        RecordSet recordSet = new RecordSet();
+        recordSet.execute(sql);
+        recordSet.next();
+
+//        log.writeLog("查找新的股东:"+sql);
+
+
+        return recordSet.getString("name");
+    }
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/service/oa/OnetimeSalaryPaySearchAPI.java b/src/main/youhong_ai_jitu_src/jntchina/service/oa/OnetimeSalaryPaySearchAPI.java
new file mode 100644
index 0000000..dbe3468
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/service/oa/OnetimeSalaryPaySearchAPI.java
@@ -0,0 +1,115 @@
+package jntchina.service.oa;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.serializer.SerializerFeature;
+import jntchina.util.HttpClientToDC;
+import jntchina.util.JTHrmApiUtil;
+import selfdev.util.log.LogTool;
+import weaver.general.Util;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.Context;
+import java.util.*;
+
+/**
+ * @title: 一次性薪资发放查询接口api
+ * @Author KangMD
+ * @Date: 2022/04/09
+ */
+@Path("/oa/OnetimeSalaryPaySearchAPI")
+public class OnetimeSalaryPaySearchAPI {
+    private final LogTool log = new LogTool("/log/selfdev/rest/oa", false);
+
+
+    /**
+     * 获取申请人有权限的薪资组
+     * @param request
+     * @return
+     */
+    @POST
+    @Path("/getPayGroupList")
+    @Produces({"application/json"})
+    public String getPayGroupList(@Context HttpServletRequest request) {
+        String workcode = Util.null2String(request.getParameter("workcode"));//工号
+        log.writeLog("前端获取薪资组传入workcode------>"+workcode);
+        String str="[]";//返回结果
+        //工号为空时返回空结果
+        if("".equals(workcode)){
+            return str;
+        }
+        try{
+            Map<String, Object> map=new HashMap<String, Object>();
+            map.put("LANGUAGE_CD","ZHS");//默认中国-ZHS
+            map.put("FIELDNAME","EMPL_PAYGP_"+workcode);//字段名
+            //将传入参数map转成字符串
+            String strParm = JSONObject.toJSONString(map, SerializerFeature.DisableCircularReferenceDetect);
+            log.writeLog("获取薪资组传入中台参数----------------->"+strParm);
+            //获取Token
+            String token = HttpClientToDC.getToken();
+            log.writeLog("转换接口token------>" + token);
+            //调用接口获取数据
+            JSONArray jsonArray = JTHrmApiUtil.translateValue(token, strParm);
+            if(jsonArray!=null){
+                //转成字符串
+                str=JSON.toJSONString(jsonArray, SerializerFeature.DisableCircularReferenceDetect);
+            }
+            log.writeLog("获取一次性薪酬发放薪资组返回结果--->"+str);
+        }catch (Exception e){
+            log.writeLog("调用一次性薪酬发放薪资组接口异常，错误信息："+e.toString());
+            str="[]";
+        }
+        return str;
+    }
+
+    /**
+     * 获取日历ID
+     * @param request
+     * @return
+     */
+    @POST
+    @Path("/getCalendarIDList")
+    @Produces({"application/json"})
+    public String getCalendarIDList(@Context HttpServletRequest request) {
+        String workcode = Util.null2String(request.getParameter("workcode"));//工号
+        String paygroup = Util.null2String(request.getParameter("paygroup"));//薪资组
+        log.writeLog("前端获取日历传入workcode------>"+workcode);
+        log.writeLog("前端获取日历传入paygroup------>"+paygroup);
+        String str="[]";//返回结果
+        //工号为空时返回空结果
+        if("".equals(workcode)||"".equals(paygroup)){
+            return str;
+        }
+
+        try{
+            Map<String, Object> map=new HashMap<String, Object>();
+            map.put("LANGUAGE_CD","ZHS");//默认中国-ZHS
+            map.put("FIELDNAME","EMPL_PAYGP_CAL_ID_"+workcode+"_"+paygroup);//字段名
+            //将传入参数map转成字符串
+            String strParm = JSONObject.toJSONString(map, SerializerFeature.DisableCircularReferenceDetect);
+            log.writeLog("获取日历传入中台参数----------------->"+strParm);
+            //获取Token
+            String token = HttpClientToDC.getToken();
+            log.writeLog("转换接口token------>" + token);
+            //调用接口获取数据
+            JSONArray jsonArray = JTHrmApiUtil.translateValue(token, strParm);
+            if(jsonArray!=null){
+                //转成字符串
+                str=JSON.toJSONString(jsonArray, SerializerFeature.DisableCircularReferenceDetect);
+            }
+            log.writeLog("获取一次性薪酬发放日历ID返回结果--->"+str);
+        }catch (Exception e){
+            log.writeLog("调用一次性薪酬发放日历ID接口异常，错误信息："+e.toString());
+            str="[]";
+        }
+        return str;
+    }
+
+
+}
+
+
diff --git a/src/main/youhong_ai_jitu_src/jntchina/service/oa/ShangbiaoTemplate.java b/src/main/youhong_ai_jitu_src/jntchina/service/oa/ShangbiaoTemplate.java
new file mode 100644
index 0000000..fcc3e7f
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/service/oa/ShangbiaoTemplate.java
@@ -0,0 +1,230 @@
+package jntchina.service.oa;
+
+
+import com.alibaba.fastjson.JSON;
+import selfdev.util.log.LogTool;
+import weaver.conn.RecordSet;
+import weaver.docs.webservices.DocAttachment;
+import weaver.docs.webservices.DocInfo;
+import weaver.docs.webservices.DocServiceImpl;
+
+import weaver.formmode.customjavacode.AbstractModeExpandJavaCodeNew;
+import weaver.general.Util;
+import weaver.hrm.User;
+import weaver.soa.workflow.request.RequestInfo;
+
+import javax.imageio.ImageIO;
+import java.awt.*;
+import java.awt.image.BufferedImage;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.util.Base64;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @title: ShangbiaoTemplate
+ * @Author ycf
+ * @Date: 2021/11/8 10:09
+ * @Version 1.0
+ */
+public  class ShangbiaoTemplate extends AbstractModeExpandJavaCodeNew {
+    private final LogTool log = new LogTool("/log/api/shangB/", false);
+
+    /**
+     * 执行模块扩展动作
+     * @param param
+     *  param包含(但不限于)以下数据
+     *  user 当前用户
+     *  importtype 导入方式(仅在批量导入的接口动作会传输) 1 追加，2覆盖,3更新，获取方式(int)param.get("importtype")
+     *  导入链接中拼接的特殊参数(仅在批量导入的接口动作会传输)，比如a=1，可通过param.get("a")获取参数值
+     *  页面链接拼接的参数，比如b=2,可以通过param.get("b")来获取参数
+     * @return
+     */
+    public Map<String, String> doModeExpand(Map<String, Object> param) {
+        Map<String, String> result = new HashMap<String, String>();
+        log.writeLog("参数:"+param);
+        
+        try {
+            User user = (User)param.get("user");
+            log.writeLog("user:"+user);
+
+            int billid = -1;//数据id
+            int modeid = -1;//模块id
+            RequestInfo requestInfo = (RequestInfo)param.get("RequestInfo");
+            log.writeLog("param:"+param.toString());
+
+            if(requestInfo!=null){
+                log.writeLog("requestInfo:"+requestInfo.toString());
+                billid = Util.getIntValue(requestInfo.getRequestid());
+                modeid = Util.getIntValue(requestInfo.getWorkflowid());
+                log.writeLog("billid:"+billid);
+                log.writeLog("modeid:"+modeid);
+
+                if(billid>0&&modeid>0){
+                log.writeLog("requestInfo:"+requestInfo.toString());
+                log.writeLog("param:"+ JSON.toJSONString(param));
+
+                    String name = "";
+                    String by = "";
+                    RecordSet recordSet = new RecordSet();
+                    String sql = "select a.by1,sbmc qymc from  uf_shangbiao a where a.id = " + billid ;
+                    recordSet.execute(sql);
+                    log.writeLog("sql:"+sql);
+
+                    while (recordSet.next()) {
+                        by = Util.null2String(recordSet.getString("by1"));
+                        log.writeLog("标样:"+by);
+                        name = recordSet.getString("qymc");
+                        log.writeLog("企业名:"+name);
+                    }
+                    //如果标样是空，则自动生成
+                    if (by.equals("null") || by.equals("")) {
+                        String base64 = this.getBase64(name);
+                        log.writeLog("base64:"+base64);
+                        DocServiceImpl docService=new DocServiceImpl();//OA知识接口
+                        DocInfo docInfo=new DocInfo();	//知识文档实体bean
+                        docInfo.setMaincategory(0);//文档主目录
+                        docInfo.setSubcategory(0);//文档分目录
+                        recordSet.execute("select id from docseccategory where CATEGORYNAME= '标样'");
+                        recordSet.next();
+                        docInfo.setSeccategory(recordSet.getInt("ID"));
+                        docInfo.setDocSubject(name+"商标");//文档标题
+                        //附件(一个附件创建一篇文档)
+                        DocAttachment[] da =new DocAttachment[1];
+                        da[0]=new DocAttachment();
+                        da[0].setDocid(0);
+                        da[0].setImagefileid(0);
+                        recordSet.execute("select needzip,needzipencrypt from systemset");
+                        while (recordSet.next()) {
+                            da[0].setIszip(recordSet.getInt("NEEDZIP"));//是否压缩
+                            da[0].setIsencrype(recordSet.getInt("NEEDZIPENCRYPT"));//是否加密
+                            log.writeLog("是否压缩:"+recordSet.getInt("NEEDZIP"));
+                            log.writeLog("是否加密:"+recordSet.getInt("NEEDZIPENCRYPT"));
+                        }
+                        da[0].setFilename(name+".jpeg");//附件名
+                        da[0].setFilecontent(base64);
+                        //将附件添加到文档中
+                        docInfo.setAttachments(da);
+                        User localUser = User.getUser(1,0);
+                        //创建文档
+                        try {
+                            int docid=docService.createDocByUser(docInfo, localUser);
+                            String sql2 = "update uf_shangbiao set by1 = "+docid+" where id = "+billid;
+                            log.writeLog("sql2:"+sql2);
+                            recordSet.execute(sql2);
+                        } catch (Exception e) {
+                            e.printStackTrace();
+                        }
+                    }
+                }
+            }
+        } catch (Exception e) {
+            result.put("errmsg",e.toString());
+            log.writeLog("错误:"+e.toString());
+
+            result.put("flag", "false");
+        }
+        return result;
+    }
+
+    public String getBase64(String name) {
+
+        BufferedImage bufImg = null;
+
+        int nameL = name.length();
+        log.writeLog("公司名长度:"+nameL);
+        
+        //生成中文的公司标样
+        if (!name.trim().substring(0, 1).matches("^[a-zA-Z]*")) {
+            bufImg = new BufferedImage(500, 500, BufferedImage.TYPE_INT_RGB);
+            Graphics2D g2 = (Graphics2D) bufImg.getGraphics();
+            g2.setColor(new Color(255, 255, 255));
+            g2.fillRect(0, 0, 500, 500);
+            g2.setColor(new Color(0, 0, 0));
+            //2*3布局
+            if (nameL <= 3) {
+                g2.setFont(new Font("宋体", Font.BOLD, 100));
+                g2.drawString(name, 100, 200);
+                System.out.println(nameL % 2);
+            }else if (nameL <= 6) {
+                g2.setFont(new Font("宋体", Font.BOLD, 100));
+                g2.drawString(name.substring(0, 3), 100, 200);
+                g2.drawString(name.substring(3, nameL), nameL == 6 ? 100 : 500 / 2 - nameL % 3 * 50, 350);
+                System.out.println(nameL % 2);
+            } else if (nameL <= 9) {
+                //3*3布局
+                g2.setFont(new Font("宋体", Font.BOLD, 100));
+                g2.drawString(name.substring(0, 3), 100, 150);
+                g2.drawString(name.substring(3, 6), 100, 270);
+                g2.drawString(name.substring(6, nameL), nameL == 9 ? 100 : 500 / 2 - nameL % 3 * 50, 390);
+                System.out.println(nameL % 2);
+            } else if (nameL <= 12) {
+                //3*4布局
+                g2.setFont(new Font("宋体", Font.BOLD, 80));
+                g2.drawString(name.substring(0, 4), 80, 150);
+                g2.drawString(name.substring(4, 8), 80, 270);
+                g2.drawString(name.substring(8, nameL), nameL == 12 ? 80 : 500 / 2 - nameL % 4 * 40, 390);
+                System.out.println(nameL % 2);
+            } else if (nameL <= 16) {
+//            4*4布局
+                g2.setFont(new Font("宋体", Font.BOLD, 80));
+                g2.drawString(name.substring(0, 4), 80, 120);
+                g2.drawString(name.substring(4, 8), 80, 230);
+                g2.drawString(name.substring(8, 12), 80, 340);
+                g2.drawString(name.substring(12, nameL), nameL == 16 ? 80 : 500 / 2 - nameL % 4 * 40, 450);
+                System.out.println(nameL % 2);
+            } else if (nameL <= 20) {
+                g2.setFont(new Font("宋体", Font.BOLD, 72));
+                g2.drawString(name.substring(0, 5), 62, 120);
+                g2.drawString(name.substring(5, 10), 62, 230);
+                g2.drawString(name.substring(10, 15), 62, 340);
+                g2.drawString(name.substring(15, nameL), nameL == 20 ? 62 : 500 / 2 - nameL % 5 * 36, 450);
+                System.out.println(500 / 2 - nameL % 4 * 30);
+            } else if (nameL <= 25) {
+                g2.setFont(new Font("宋体", Font.BOLD, 72));
+                g2.drawString(name.substring(0, 5), 62, 100);
+                g2.drawString(name.substring(5, 10), 62, 190);
+                g2.drawString(name.substring(10, 15), 62, 280);
+                g2.drawString(name.substring(15, 20), 62, 370);
+                g2.drawString(name.substring(20, nameL), nameL == 25 ? 62 : 500 / 2 - nameL % 5 * 36, 460);
+
+            } else if (nameL <= 30) {
+                g2.setFont(new Font("宋体", Font.BOLD, 72));
+                g2.drawString(name.substring(0, 5), 62, 80);
+                g2.drawString(name.substring(5, 10), 62, 160);
+                g2.drawString(name.substring(10, 15), 62, 240);
+                g2.drawString(name.substring(15, 20), 62, 320);
+                g2.drawString(name.substring(20, 25), 62, 400);
+                g2.drawString(name.substring(25, nameL), nameL == 30 ? 62 : 500 / 2 - nameL % 5 * 36, 480);
+                System.out.println(500 / 2 - nameL % 4 * 30);
+            }
+        } else {
+
+            int wid = name.length() * 28 + 80;
+
+            bufImg = new BufferedImage(wid, 200, BufferedImage.TYPE_INT_RGB);
+            Graphics2D g2 = (Graphics2D) bufImg.getGraphics();
+            g2.setColor(new Color(255, 255, 255));
+            g2.fillRect(0, 0, wid, 200);
+            g2.setColor(new Color(0, 0, 0));
+            //英文
+            g2.setFont(new Font("Times New Roma", Font.BOLD, 50));
+            g2.drawString(name, 50, 100);
+
+        }
+        String base64 = "";
+        ByteArrayOutputStream stream = new ByteArrayOutputStream();
+        try {
+            ImageIO.write(bufImg, "JPEG", stream);
+            base64 = Base64.getEncoder().encodeToString(stream.toByteArray());
+
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+
+        return base64;
+        
+        
+    }
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/service/oa/ShangbiaoTemplateChange.java b/src/main/youhong_ai_jitu_src/jntchina/service/oa/ShangbiaoTemplateChange.java
new file mode 100644
index 0000000..9361cf1
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/service/oa/ShangbiaoTemplateChange.java
@@ -0,0 +1,233 @@
+package jntchina.service.oa;
+
+
+import com.alibaba.fastjson.JSON;
+import selfdev.util.log.LogTool;
+import weaver.conn.RecordSet;
+import weaver.docs.webservices.DocAttachment;
+import weaver.docs.webservices.DocInfo;
+import weaver.docs.webservices.DocServiceImpl;
+import weaver.formmode.customjavacode.AbstractModeExpandJavaCodeNew;
+import weaver.general.Util;
+import weaver.hrm.User;
+import weaver.soa.workflow.request.RequestInfo;
+
+import javax.imageio.ImageIO;
+import java.awt.*;
+import java.awt.image.BufferedImage;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.util.Base64;
+import java.util.HashMap;
+import java.util.Map;
+
+;
+
+/**
+ * @title: ShangbiaoTemplate
+ * @Author ycf
+ * @Date: 2021/11/8 10:09
+ * @Version 1.0
+ */
+public  class ShangbiaoTemplateChange extends AbstractModeExpandJavaCodeNew {
+    private final LogTool log = new LogTool("/log/api/shangB/", false);
+
+    /**
+     * 执行模块扩展动作
+     * @param param
+     *  param包含(但不限于)以下数据
+     *  user 当前用户
+     *  importtype 导入方式(仅在批量导入的接口动作会传输) 1 追加，2覆盖,3更新，获取方式(int)param.get("importtype")
+     *  导入链接中拼接的特殊参数(仅在批量导入的接口动作会传输)，比如a=1，可通过param.get("a")获取参数值
+     *  页面链接拼接的参数，比如b=2,可以通过param.get("b")来获取参数
+     * @return r
+     */
+    public Map<String, String> doModeExpand(Map<String, Object> param) {
+        Map<String, String> result = new HashMap<String, String>();
+        log.writeLog("参数:"+param);
+        
+        try {
+            User user = (User)param.get("user");
+            log.writeLog("user:"+user);
+
+            int billid = -1;//数据id
+            int modeid = -1;//模块id
+            RequestInfo requestInfo = (RequestInfo)param.get("RequestInfo");
+            log.writeLog("param:"+param.toString());
+
+            if(requestInfo!=null){
+                log.writeLog("requestInfo:"+requestInfo.toString());
+                billid = Util.getIntValue(requestInfo.getRequestid());
+                modeid = Util.getIntValue(requestInfo.getWorkflowid());
+                log.writeLog("billid:"+billid);
+                log.writeLog("modeid:"+modeid);
+
+                if(billid>0&&modeid>0){
+                    log.writeLog("requestInfo:"+requestInfo.toString());
+                    log.writeLog("param:"+ JSON.toJSONString(param));
+
+                    String name = "";
+                    String by = "";
+                    RecordSet recordSet = new RecordSet();
+                    String sql = "select a.by1,sbmc qymc from  uf_shangbiao a where a.id = " + billid ;
+                    recordSet.execute(sql);
+                    log.writeLog("sql:"+sql);
+
+                    while (recordSet.next()) {
+                        by = Util.null2String(recordSet.getString("by1"));
+                        log.writeLog("标样:"+by);
+                        name = recordSet.getString("qymc");
+                        log.writeLog("企业名:"+name);
+                    }
+
+                        String base64 = this.getBase64(name);
+                        log.writeLog("base64:"+base64);
+
+                        DocServiceImpl docService=new DocServiceImpl();//OA知识接口
+                        DocInfo docInfo=new DocInfo();	//知识文档实体bean
+                        docInfo.setMaincategory(0);//文档主目录
+                        docInfo.setSubcategory(0);//文档分目录
+                    recordSet.execute("select id from docseccategory where CATEGORYNAME= '标样'");
+                    recordSet.next();
+                    docInfo.setSeccategory(recordSet.getInt("ID"));
+                        docInfo.setDocSubject(name+"商标");//文档标题
+                        //附件(一个附件创建一篇文档)
+                        DocAttachment da[]=new DocAttachment[1];
+                        da[0]=new DocAttachment();
+                        da[0].setDocid(0);
+                        da[0].setImagefileid(0);
+                        recordSet.execute("select needzip,needzipencrypt from systemset");
+                        while (recordSet.next()) {
+                            da[0].setIszip(recordSet.getInt("NEEDZIP"));//是否压缩
+                            da[0].setIsencrype(recordSet.getInt("NEEDZIPENCRYPT"));//是否加密
+                            log.writeLog("是否压缩:"+recordSet.getInt("NEEDZIP"));
+                            log.writeLog("是否加密:"+recordSet.getInt("NEEDZIPENCRYPT"));
+                        }
+                        da[0].setFilename(name+".jpeg");//附件名
+                        da[0].setFilecontent(base64);
+                        //将附件添加到文档中
+                        docInfo.setAttachments(da);
+                        User localUser = User.getUser(1,0);
+                        //创建文档
+                        try {
+                            int docid=docService.createDocByUser(docInfo, localUser);
+                            String sql2 = "update uf_shangbiao set by1 = "+docid+" where id = "+billid;
+                            log.writeLog("sql2:"+sql2);
+
+                            recordSet.execute(sql2);
+
+
+                        } catch (Exception e) {
+                            e.printStackTrace();
+                        }
+                    }
+
+            }
+        } catch (Exception e) {
+            result.put("errmsg",e.toString());
+            log.writeLog("错误:"+e.toString());
+
+            result.put("flag", "false");
+        }
+        return result;
+    }
+
+    public String getBase64(String name) {
+
+        BufferedImage bufImg = null;
+
+        int nameL = name.length();
+        log.writeLog("公司名长度:"+nameL);
+
+        //生成中文的公司标样
+        if (!name.trim().substring(0, 1).matches("^[a-zA-Z]*")) {
+            bufImg = new BufferedImage(500, 500, BufferedImage.TYPE_INT_RGB);
+            Graphics2D g2 = (Graphics2D) bufImg.getGraphics();
+            g2.setColor(new Color(255, 255, 255));
+            g2.fillRect(0, 0, 500, 500);
+            g2.setColor(new Color(0, 0, 0));
+            //2*3布局
+            if (nameL <= 3) {
+                g2.setFont(new Font("宋体", Font.BOLD, 100));
+                g2.drawString(name, 100, 200);
+                System.out.println(nameL % 2);
+            }else if (nameL <= 6) {
+                g2.setFont(new Font("宋体", Font.BOLD, 100));
+                g2.drawString(name.substring(0, 3), 100, 200);
+                g2.drawString(name.substring(3, nameL), nameL == 6 ? 100 : 500 / 2 - nameL % 3 * 50, 350);
+                System.out.println(nameL % 2);
+            } else if (nameL <= 9) {
+                //3*3布局
+                g2.setFont(new Font("宋体", Font.BOLD, 100));
+                g2.drawString(name.substring(0, 3), 100, 150);
+                g2.drawString(name.substring(3, 6), 100, 270);
+                g2.drawString(name.substring(6, nameL), nameL == 9 ? 100 : 500 / 2 - nameL % 3 * 50, 390);
+                System.out.println(nameL % 2);
+            } else if (nameL <= 12) {
+                //3*4布局
+                g2.setFont(new Font("宋体", Font.BOLD, 80));
+                g2.drawString(name.substring(0, 4), 80, 150);
+                g2.drawString(name.substring(4, 8), 80, 270);
+                g2.drawString(name.substring(8, nameL), nameL == 12 ? 80 : 500 / 2 - nameL % 4 * 40, 390);
+                System.out.println(nameL % 2);
+            } else if (nameL <= 16) {
+//            4*4布局
+                g2.setFont(new Font("宋体", Font.BOLD, 80));
+                g2.drawString(name.substring(0, 4), 80, 120);
+                g2.drawString(name.substring(4, 8), 80, 230);
+                g2.drawString(name.substring(8, 12), 80, 340);
+                g2.drawString(name.substring(12, nameL), nameL == 16 ? 80 : 500 / 2 - nameL % 4 * 40, 450);
+                System.out.println(nameL % 2);
+            } else if (nameL <= 20) {
+                g2.setFont(new Font("宋体", Font.BOLD, 72));
+                g2.drawString(name.substring(0, 5), 62, 120);
+                g2.drawString(name.substring(5, 10), 62, 230);
+                g2.drawString(name.substring(10, 15), 62, 340);
+                g2.drawString(name.substring(15, nameL), nameL == 20 ? 62 : 500 / 2 - nameL % 5 * 36, 450);
+                System.out.println(500 / 2 - nameL % 4 * 30);
+            } else if (nameL <= 25) {
+                g2.setFont(new Font("宋体", Font.BOLD, 72));
+                g2.drawString(name.substring(0, 5), 62, 100);
+                g2.drawString(name.substring(5, 10), 62, 190);
+                g2.drawString(name.substring(10, 15), 62, 280);
+                g2.drawString(name.substring(15, 20), 62, 370);
+                g2.drawString(name.substring(20, nameL), nameL == 25 ? 62 : 500 / 2 - nameL % 5 * 36, 460);
+
+            } else if (nameL <= 30) {
+                g2.setFont(new Font("宋体", Font.BOLD, 72));
+                g2.drawString(name.substring(0, 5), 62, 80);
+                g2.drawString(name.substring(5, 10), 62, 160);
+                g2.drawString(name.substring(10, 15), 62, 240);
+                g2.drawString(name.substring(15, 20), 62, 320);
+                g2.drawString(name.substring(20, 25), 62, 400);
+                g2.drawString(name.substring(25, nameL), nameL == 30 ? 62 : 500 / 2 - nameL % 5 * 36, 480);
+                System.out.println(500 / 2 - nameL % 4 * 30);
+            }
+        } else {
+            System.out.println(name.length());
+            bufImg = new BufferedImage(name.length()*27+45, 200, BufferedImage.TYPE_INT_RGB);
+            Graphics2D g2 = (Graphics2D) bufImg.getGraphics();
+            g2.setColor(new Color(255, 255, 255));
+            g2.fillRect(0, 0, name.length()*27+45, 200);
+            g2.setColor(new Color(0, 0, 0));
+            //英文
+            g2.setFont(new Font("Times New Roma", Font.BOLD, 50));
+            g2.drawString(name, 50, 100);
+
+        }
+        String base64 = "";
+        ByteArrayOutputStream stream = new ByteArrayOutputStream();
+        try {
+            ImageIO.write(bufImg, "JPEG", stream);
+            base64 = Base64.getEncoder().encodeToString(stream.toByteArray());
+            log.writeLog("base64:"+base64);
+
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+
+        return base64;
+
+
+    }
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/service/oa/util/ModifyDetailInfo.java b/src/main/youhong_ai_jitu_src/jntchina/service/oa/util/ModifyDetailInfo.java
new file mode 100644
index 0000000..7d34e7a
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/service/oa/util/ModifyDetailInfo.java
@@ -0,0 +1,680 @@
+package jntchina.service.oa.util;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.engine.demo.impl.BaseUtil;
+import com.engine.demo.impl.CubeSaveInterccept;
+import com.engine.demo.impl.TransField;
+import selfdev.util.log.LogTool;
+import weaver.conn.RecordSet;
+import weaver.general.Util;
+import weaver.hrm.User;
+
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+
+/**
+ *
+ * 明细数据修改
+ * 修改日期当做key 也就是一个版本
+ * 按照日期 降序 排列
+ * 版本包含了 新增以及修改以前的历史版本  数据
+ *
+ *
+ */
+public class ModifyDetailInfo {
+    private final static LogTool log = new LogTool("/log/ModifyDetailInfo/",false);
+    private List<String> dateVersion=new ArrayList<>();//日期版本数据
+    private static final String remarkField="";//备注字段
+    private static final String imageField="";//日期字段
+    private JSONObject jsonVersion=new JSONObject();//版本JSON
+    private String field="";//明细表字段信息
+    private String fromtableName="";//表名称
+    private String totableName="";//表名称
+    private int modeid=0;//模块ID
+    private int billid=0;//数据ID
+    private int formid=-3054;//数据ID  uat -1793  prd -3054
+    private String qyid="";//企业ID
+    private String changeFj="";//变更附件
+    private String changeRemark="";//变更备注
+    private JSONObject changeFjJson=new JSONObject();//变更附件
+    private JSONObject changeRemarkJson=new JSONObject();//变更备注
+    private String detailtabledesc="";//明细字段
+    private int newVersionDateIndex=-1;//最新的版本日期
+
+    public ArrayList<String> sortDate=new ArrayList<String>();//存储版本时间的数据
+    public ArrayList<String> addsortDate=new ArrayList<String>();//新增版本 存储版本时间的数据
+    public JSONObject fieldJson=new JSONObject();
+
+    public ModifyDetailInfo(String field,String fromtableName,String totableName,int modeid,int billid,String qyid){
+        this.field=field;
+        this.fromtableName=fromtableName;
+        this.totableName=totableName;
+        this.modeid=modeid;
+        this.billid=billid;
+        this.qyid=qyid;
+
+    }
+
+    public JSONObject getChangeFjJson() {
+        return changeFjJson;
+    }
+
+    public void setChangeFjJson(JSONObject changeFjJson) {
+        this.changeFjJson = changeFjJson;
+    }
+
+    public JSONObject getChangeRemarkJson() {
+        return changeRemarkJson;
+    }
+
+    public void setChangeRemarkJson(JSONObject changeRemarkJson) {
+        this.changeRemarkJson = changeRemarkJson;
+    }
+
+    public JSONObject getJsonVersion() {
+        return jsonVersion;
+    }
+
+    public void setJsonVersion(JSONObject jsonVersion) {
+        this.jsonVersion = jsonVersion;
+    }
+
+    public ModifyDetailInfo(){
+    }
+
+    public String getChangeFj() {
+        return changeFj;
+    }
+
+    public void setChangeFj(String changeFj) {
+        this.changeFj = changeFj;
+    }
+
+    public String getChangeRemark() {
+        return changeRemark;
+    }
+
+    public void setChangeRemark(String changeRemark) {
+        this.changeRemark = changeRemark;
+    }
+
+    public String getDetailtabledesc() {
+        return detailtabledesc;
+    }
+
+    public void setDetailtabledesc(String detailtabledesc) {
+        this.detailtabledesc = detailtabledesc;
+    }
+
+    public int getNewVersionDate() {
+        return newVersionDateIndex;
+    }
+
+    public void setNewVersionDate(int newVersionDate) {
+        this.newVersionDateIndex = newVersionDate;
+    }
+
+    public void setDtailJson(){
+        iniVersionDate();//初始化版本日期
+        log.writeLog(this.sortDate.toString());
+        //this.newVersionDateIndex=this.sortDate.size();
+        if(this.sortDate.size()>0){
+            this.newVersionDateIndex=this.sortDate.size()-1;//最新的版本位置
+        }
+        TransField transField=new TransField();
+        detailtabledesc=transField.getFeildnameByNames(replaceStr(field,"bz"), totableName, 1);
+        RecordSet recordSet=new RecordSet();
+        String sql="select * from "+totableName+" where  mainid="+this.billid+" and length(nvl(rq,''))>0  order by rq";
+        log.writeLog(sql);
+        recordSet.execute(sql);
+        while(recordSet.next()){
+            int type=0;//0新增  1修改
+            JSONObject checkJson=new JSONObject();
+            String detailid=Util.null2String(recordSet.getString("detailid")).trim();
+            String fj=Util.null2String(recordSet.getString("fj")).trim();//变更附件
+            String rq=Util.null2String(recordSet.getString("rq")).trim();
+            if(!"".equals(fj)){
+                if(changeFjJson.containsKey(rq)){
+                    changeFj=changeFj+fj+",";
+                    String fjStr=Util.null2String(changeFjJson.getString(rq)).trim() ;
+                    fjStr=fjStr+fj+",";
+                    changeFjJson.put(rq,fjStr);
+                }else{
+                    changeFjJson.put(rq,fj);
+                }
+            }
+            String bz1=Util.null2String(recordSet.getString("bz1")).trim();//变更备注
+            if(!"".equals(bz1)){
+                changeRemark=changeRemark+bz1+"\n";
+                if(changeRemarkJson.containsKey(rq)){
+                    String remarkStr=Util.null2String(changeRemarkJson.getString(rq)).trim() ;
+                    remarkStr=remarkStr+fj+"\n";
+                    changeRemarkJson.put(rq,remarkStr);
+                }else{
+                    changeRemarkJson.put(rq,bz1);
+                }
+            }
+            for(String str:field.split(",")){
+                str= Util.null2String(str).trim();
+                if(str.equals("")){
+                    continue;
+                }
+                checkJson.put(str,Util.null2String(recordSet.getString(str)));
+            }
+            checkJson.put("isChange","1");
+            if("".equals(detailid)){//新增
+                type=0;
+            }else{
+                JSONObject oldJSONObject=  getDetailData(detailid);
+                log.writeLog(oldJSONObject.toJSONString());
+                boolean flag=fastJsonDiff.compareJsons(checkJson,oldJSONObject,null);
+                if(flag){//代表有改变
+                    log.writeLog("data not modify!");
+                   continue;//开启下一次的循环
+                }else{
+                    log.writeLog("data  modify!");
+                }
+                type=1;
+            }
+            JSONObject rqversion= jsonVersion.getJSONObject(rq);//日期版本 （需要）
+            if(rqversion==null||rqversion.size()<=0){
+                //获取日期的版本  信息  需要加日期数据进行版本的叠加
+                JSONObject endDateVersionData=new JSONObject();
+                JSONArray olddata=new JSONArray();
+                /** 先判断 版本日期是否存在 初始化的版本里面  **/
+                String oldversiondate="";//getVersionDate(rq);//最新版本 或者是 前一个版本的日期
+                String historyVersionDate=getVersionDate(rq);//判断日期 是否是最新的 修改版本  为空则是
+
+                if("".equals(historyVersionDate)){//当前最新 修改版本  如果日期是最新的第二个版本以及之后的版本 则主要 拿前一个版本的数据
+                     int versionIndex=sortDateArray(rq,this.sortDate);
+                     if(versionIndex-newVersionDateIndex>=2){
+                         oldversiondate=this.sortDate.get(versionIndex-1);//获取上一个版本的数据
+                     }else{
+                         if(versionIndex>0){
+                             oldversiondate=this.sortDate.get(versionIndex);
+                         }else{
+                             oldversiondate=rq;
+                         }
+                     }
+                }else{
+                    int versionIndex=sortDateArray(rq,this.sortDate);
+                    if(versionIndex>0){
+                        int newindex= getAddSortDateAbove(addsortDate,historyVersionDate);
+                        if(newindex>-1){
+                            oldversiondate=addsortDate.get(newindex);//this.sortDate.get(versionIndex-1);
+                        }else{
+                            oldversiondate=historyVersionDate;
+                        }
+                    }else{
+                        oldversiondate=historyVersionDate;
+                    }
+
+                }
+                JSONArray  DateVersionData=null;
+//                if(versionIndex>0){
+//                    oldversiondate=this.sortDate.get(versionIndex-1);
+//                }
+                checkJson.put("type",type);//0 新增 1 修改
+                checkJson.put("bbrq",rq);
+                log.writeLog("oldversiondate-->"+oldversiondate);
+                if("".equals(oldversiondate)){
+                    DateVersionData=checkDateVersion(oldversiondate);//获取修改前的版本数据
+                }else{
+                    if(addsortDate.contains(oldversiondate)){
+
+                    }
+                    if(addsortDate.contains(oldversiondate)&&jsonVersion.containsKey(oldversiondate)){
+                        log.writeLog("isvali");
+                        DateVersionData=CopyJSONArray(jsonVersion.getJSONObject(oldversiondate).getJSONArray("data"));
+                        //relpaceJSONArray(DateVersionData,CopyJSONObject(checkJson),detailid);//添加或者修改
+                    }else{
+                        log.writeLog("is not vali");
+                        DateVersionData=checkDateVersion(oldversiondate);
+                        log.writeLog("DateVersionData-->"+DateVersionData.toJSONString());
+                    }
+                }
+                olddata=CopyJSONArray(DateVersionData);
+                if(type==0){
+                    DateVersionData.add(CopyJSONObject(checkJson));
+                }else{
+                    //修改   通过 detailid 去替换
+                    log.writeLog(DateVersionData.toJSONString()+"replace-->"+detailid+"  "+CopyJSONObject(checkJson).toJSONString());
+                    relpaceJSONArray(DateVersionData,CopyJSONObject(checkJson),detailid);
+                }
+                //JSONArray  DateVersionData=checkDateVersion(rq);//获取修改前的版本数据
+                endDateVersionData.put("data",DateVersionData);
+                endDateVersionData.put("olddata",olddata);//复制一下 保存起来 当做变更前的数据
+                endDateVersionData.put("rq",rq);
+                if(!addsortDate.contains(rq)){
+                    addsortDate.add(rq);//保存 新增的 版本信息
+                }
+                jsonVersion.put(rq,endDateVersionData);
+            }else{
+                JSONArray  DateVersionData=rqversion.getJSONArray("data");
+                if(type==0){
+                    checkJson.put("bbrq",rq);
+                    DateVersionData.add(checkJson);
+                }else{
+                    //修改   通过 detailid 去替换
+                    log.writeLog(" replace -->"+DateVersionData.toJSONString());
+                    relpaceJSONArray(DateVersionData,CopyJSONObject(checkJson),detailid);
+                }
+            }
+        }
+        //数据转换
+        if(this.jsonVersion!=null&&this.jsonVersion.size()>0){
+            Set<String> keys=this.jsonVersion.keySet();
+            for(String key:keys){
+               JSONObject jsonVersionSingle= this.jsonVersion.getJSONObject(key);
+               if(jsonVersionSingle!=null&&jsonVersionSingle.size()>0){
+                   String rowDesc=getStrByJSON(jsonVersionSingle.getJSONArray("data"),true);
+                   jsonVersionSingle.put("rowDesc",rowDesc);
+                   jsonVersionSingle.put("fj",changeFjJson.getString(key));
+                   jsonVersionSingle.put("bz",changeRemarkJson.getString(key));
+                   String oldrowDesc=getStrByJSON(jsonVersionSingle.getJSONArray("olddata"),false);
+                   jsonVersionSingle.put("oldrowDesc",oldrowDesc);
+               }
+
+            }
+        }
+        log.writeLog("jsonVersion"+jsonVersion.toJSONString());
+        log.writeLog("jsonVersion"+this.toString());
+    }
+
+    public JSONObject getDetailData(String detailid){
+        JSONObject json=new JSONObject();
+        RecordSet recordSet=new RecordSet();
+        String sql="select * from "+fromtableName+" where  mainid="+this.billid+" and detailid="+detailid;
+        recordSet.execute(sql);
+        if(recordSet.next()){
+            for(String str:field.split(",")){
+                str= Util.null2String(str).trim();
+                if(str.equals("")){
+                    continue;
+                }
+                json.put(str,Util.null2String(recordSet.getString(str)));
+            }
+        }
+        return json;
+    }
+
+    /**
+     * 获取日期的版本数据
+     * @param date
+     * @return
+     */
+    public JSONArray checkDateVersion( String date){
+        JSONArray jsons=new JSONArray();
+        JSONObject json=new JSONObject();
+        RecordSet re=new RecordSet();
+        boolean flag=false;
+        String sql="select * from "+ CubeSaveInterccept.CompanyVersionMaintable+"  where qyid='"+this.qyid+"' and bbrq='"+date+"'";
+        re.execute(sql);
+        if(re.next()){
+            flag =true;
+        }
+        log.writeLog("CubeSaveInterccept.CompanyVersionMaintable==>"+CubeSaveInterccept.CompanyVersionMaintable);
+        if(flag){//存在修改的版本
+            sql="select b.mainbillid,"+getSqlField("b")+" ,-1 leve from "+CubeSaveInterccept.CompanyVersionMaintable+" a,"+CubeSaveInterccept.CompanyVersionMaintable+"_dt2 b  where a.id=b.mainid and a.qyid='"+this.qyid+"' and a.bbrq='"+date+"'";
+        }else{//不存在取最新的数据（获取 ）
+            sql="select * from (" +
+                " select * from (select a.bbrq,b.mainbillid,"+getSqlField("b")+",0 ver,row_number() over(partition by  a.bbrq ORDER BY a.bbrq ASC ) leve from "+CubeSaveInterccept.CompanyVersionMaintable+" a,"+CubeSaveInterccept.CompanyVersionMaintable+"_dt2 b  where a.id=b.mainid and a.qyid='"+this.qyid+"' and a.bbrq<'"+date+"'   order by a.bbrq desc) " +
+                //" union all " +
+                //"select b.mainbillid,b."+field+",1 ver,row_number() over(partition by  a.bbrq ORDER BY a.bbrq ASC ) leve from "+CubeSaveInterccept.CompanyVersionMaintable+" a,"+CubeSaveInterccept.CompanyVersionMaintable+"_dt2 b  where a.id=b.mainid and a.qyid='"+this.qyid+"' and leve=1  "+
+                //" union all " +
+                //"select id mainbillid,"+field+",1 ver,99 leve from "+CubeSaveInterccept.CompanyMaintable+"_dt2   where  mainid='"+this.qyid+"' " +
+                ") g order by ver asc  ";
+        }
+        log.writeLog(sql);
+        String leve="";
+        re.executeQuery(sql);
+        int i=0;
+        while(re.next()){
+            log.writeLog(i);
+            i++;
+            json=new JSONObject();
+            if("".equals(leve)){
+                leve=Util.null2String(re.getString("bbrq"));
+            }else{
+               if(!leve.equals(Util.null2String(re.getString("bbrq")))){
+                   break;
+               }
+            }
+            for(String str:(field+",mainbillid").split(",")){
+                str= Util.null2String(str).trim();
+                if(str.equals("")){
+                    continue;
+                }
+                json.put(str,Util.null2String(re.getString(str)));
+            }
+            jsons.add(json);
+        }
+
+        return jsons;
+    }
+
+    public JSONArray CopyJSONArray(JSONArray jsons){
+        if(jsons==null||jsons.size()<=0){
+            return new JSONArray();
+        }
+        String newjson=JSON.toJSONString(jsons);
+        return JSONObject.parseArray(newjson);
+    }
+    public JSONObject CopyJSONObject(JSONObject jsons){
+        if(jsons==null||jsons.size()<=0){
+            return new JSONObject();
+        }
+        String newjson=JSON.toJSONString(jsons);
+        return JSONObject.parseObject(newjson);
+    }
+    public void relpaceJSONArray(JSONArray fromjsons,JSONObject tojson,String detailid){
+        if(tojson==null||tojson.size()<=0){
+             fromjsons=new JSONArray();
+        }
+        if(tojson.containsKey("mainbillid")){
+            detailid=Util.null2String(tojson.getString("mainbillid")) ;
+        }
+        if(fromjsons==null||fromjsons.size()<=0){
+            if(fromjsons==null){
+                fromjsons=new JSONArray();
+            }
+            tojson.put("mainbillid",detailid);
+            fromjsons.add(tojson);
+            return;
+        }
+        JSONArray newfromjsons=new JSONArray();
+        boolean isVali=false;
+        for(int i=0;i<fromjsons.size();i++){
+            JSONObject singleJSON=fromjsons.getJSONObject(i);
+            if(singleJSON==null||singleJSON.size()<=0){
+                continue;
+            }
+            String mainbillid=Util.null2String(singleJSON.getString("mainbillid")) ;
+            //String mainbillid=Util.null2String(singleJSON.getString("mainbillid")) ;
+            log.writeLog(mainbillid+" "+detailid);
+            if(detailid.equals(mainbillid)){
+                isVali=true;
+                tojson.put("mainbillid",detailid);
+                newfromjsons.add(tojson);
+            }else{
+                newfromjsons.add(singleJSON);
+            }
+        }
+        if(!isVali){
+            tojson.put("mainbillid",detailid);
+            newfromjsons.add(tojson);
+        }
+        if(newfromjsons.size()>0){
+            fromjsons.clear();
+            fromjsons.addAll(newfromjsons);
+        }
+    }
+
+    /**
+     * 获取版本日期
+     * @param date
+     * @return
+     */
+    public String getVersionDate(String date){
+        RecordSet re=new RecordSet();
+        String versiondate="";
+        String sql="select * from "+ CubeSaveInterccept.CompanyVersionMaintable+"  where qyid='"+this.qyid+"' and bbrq='"+date+"'";
+        re.execute(sql);
+        if(re.next()){
+           return date;
+        }
+//        sql="select * from (select a.bbrq,0 ver,row_number() over(partition by  a.bbrq ORDER BY a.bbrq ASC ) leve from "+CubeSaveInterccept.CompanyVersionMaintable+" a,"+CubeSaveInterccept.CompanyVersionMaintable+"_dt2 b  where a.id=b.mainid and a.qyid='"+this.qyid+"' and a.bbrq<'"+date+"'   order by a.bbrq desc ) where leve=1" ;
+//        log.writeLog(sql);
+//        re.execute(sql);
+//        if(re.next()){
+//            return Util.null2String(re.getString("bbrq")).trim();
+//        }
+        return "";
+    }
+
+    /**
+     * 初始化版本信息
+     */
+    public void iniVersionDate(){
+        RecordSet re=new RecordSet();
+        String versiondate="";
+        String sql="select * from "+ CubeSaveInterccept.CompanyVersionMaintable+"  where qyid='"+this.qyid+"'  order by bbrq";
+
+        re.execute(sql);
+        while(re.next()){
+            String bbrq=Util.null2String(re.getString("bbrq")).trim();
+            if("".equals(bbrq)){
+                continue;
+            }
+            sortDate.add(bbrq);
+        }
+    }
+    public int sortDateArray(String date,List<String> sortDatedemo){
+        SimpleDateFormat simpleDateFormat=new SimpleDateFormat("yyyy-MM-dd");
+        int inxex=-1;
+        date=Util.null2String(date).trim();
+        if("".equals(date)){
+            return inxex;
+        }
+        if(sortDatedemo.size()<=0){
+            sortDatedemo.add(date);
+            return 0;
+        }
+        try{
+            int listindex=-1;
+            boolean isadd=false;
+            for(String str:sortDatedemo){
+                str=Util.null2String(str).trim();
+                if("".equals(str)){
+                    //continue;
+                }
+                listindex++;
+                inxex++;
+                if(simpleDateFormat.parse(date).getTime()==simpleDateFormat.parse(str).getTime()){
+                    break;
+                }
+                if(simpleDateFormat.parse(date).getTime()<=simpleDateFormat.parse(str).getTime()){
+                    isadd=true;
+                    break;
+                }
+            }
+            if((listindex+1)==sortDatedemo.size()){//最后了
+                listindex++;
+                inxex++;
+                sortDatedemo.add(listindex,date);
+            }
+
+            if(listindex>-1&&isadd){
+                sortDatedemo.add(listindex,date);
+            }
+        }catch(Exception e){
+            return -1;
+        }
+        return inxex;
+    }
+
+    public String getStrByJSON(JSONArray jsons,boolean isgl){
+        String str="";
+        if(jsons==null||jsons.size()<=0){
+            return str;
+        }
+        TransField transField=new TransField(this.formid,this.billid+"",new User(1));
+
+        //getFieldIdByName(this.totableName,);
+        for(int i=0;i<jsons.size();i++){
+            JSONObject singleJson=jsons.getJSONObject(i);
+            if(singleJson==null||singleJson.size()<=0){
+                continue;
+            }
+            String isChange=singleJson.getString("isChange");
+            if(!"1".equals(isChange)&&isgl){
+                continue;
+            }
+            log.writeLog(singleJson.toJSONString());
+            String strSungle="";
+            for(String demo:replaceStr(field,"bz").split(",")){
+                demo=Util.null2String(demo).trim();
+                if(demo.equals("")){
+                    continue;
+                }
+
+                JSONObject fieldJSON=fieldJson.getJSONObject(demo);//transField.getFieldIdByName(str,this.totableName);
+                if(fieldJSON==null||fieldJSON.size()<=0){
+                    fieldJSON=transField.getFieldIdByName(demo,this.totableName);
+                    if(fieldJSON!=null){
+                        fieldJson.put(demo,fieldJSON);
+                    }else{
+                        log.writeLog("null field json！");
+                    }
+
+                }
+                log.writeLog(singleJson.getString(demo)+"  -->"+fieldJSON.toJSONString());
+                String newfieldvalue="";
+                try {
+
+                     newfieldvalue= BaseUtil.Html2Text(transField.transFieldValue(singleJson.getString(demo), fieldJSON))  ;
+                } catch (Exception e) {
+                    e.printStackTrace();
+                    log.writeLog(e.getMessage());
+                }
+                strSungle=strSungle+newfieldvalue+"/";
+
+            }
+            if(strSungle.endsWith("/")){
+                strSungle.substring(0,strSungle.length()-1);
+            }
+            str=str+strSungle+"、\n";
+        }
+        return str;
+    }
+
+    @Override
+    public String toString() {
+        return "ModifyDetailInfo{" +
+                "dateVersion=" + dateVersion +
+                ", jsonVersion=" + jsonVersion +
+                ", field='" + field + '\'' +
+                ", fromtableName='" + fromtableName + '\'' +
+                ", totableName='" + totableName + '\'' +
+                ", modeid=" + modeid +
+                ", billid=" + billid +
+                ", qyid='" + qyid + '\'' +
+                ", changeFj='" + changeFjJson.toJSONString() + '\'' +
+                ", changeRemark='" + changeFjJson.toJSONString() + '\'' +
+                ", detailtabledesc='" + detailtabledesc + '\'' +
+                '}';
+    }
+    public String getSqlField(String split){
+        String sqlfield="";
+        for(String str:this.field.split(",")){
+            str=Util.null2String(str).trim();
+            if("".equals(str)){
+                continue;
+            }
+            sqlfield=sqlfield+split+"."+str+",";
+        }
+        if(sqlfield.endsWith(",")){
+            sqlfield=sqlfield.substring(0,sqlfield.length()-1);
+        }
+        return sqlfield;
+    }
+
+    /**
+     * 获取上一个 日期的下标
+     * @return
+     */
+    public int getAddSortDateAbove(List<String> data,String date){
+        int index=-1;
+        if(data==null||data.size()<=0||"".equals(Util.null2String(date))){
+            return index;
+        }
+        try{
+            int indexdemo=-1;
+            SimpleDateFormat sim=new SimpleDateFormat("yyyy-MM-dd");
+            for(String key:data){
+                indexdemo++;
+                key=Util.null2String(key).trim();
+                if("".equals(key)){
+                    continue;
+                }
+                if((indexdemo+1)==data.size()){//最后一个
+                    if(sim.parse(key).getTime()<=sim.parse(date).getTime()){
+                        index=indexdemo;
+                        break;
+                    }
+                }else{
+                    if(sim.parse(key).getTime()<=sim.parse(date).getTime()&&sim.parse(data.get(indexdemo+1)).getTime()>=sim.parse(date).getTime()){
+                        index=indexdemo;
+                        break;
+                    }
+                }
+
+            }
+        }catch(Exception e){
+            index=-1;
+        }
+        return index;
+    }
+
+    public static void main(String[] arge){
+        ModifyDetailInfo modifyDetailInfo=new ModifyDetailInfo();
+        modifyDetailInfo.sortDate.add("2021-12-01");
+        modifyDetailInfo.sortDate.add("2021-12-07");
+        //modifyDetailInfo.sortDate.add("2021-12-03");
+        //modifyDetailInfo.sortDate.add("2021-12-05");
+        //modifyDetailInfo.sortDate.add("2021-12-06");
+        //getAddSortDateAbove
+        //System.out.println(modifyDetailInfo.sortDateArray("2021-12-17",modifyDetailInfo.sortDate));
+        System.out.println(modifyDetailInfo.getAddSortDateAbove(modifyDetailInfo.sortDate,"2021-12-05"));
+        System.out.println(modifyDetailInfo.sortDate.toString());
+
+        JSONArray jsons=new JSONArray();
+        JSONObject json=new JSONObject();
+        JSONObject json1=new JSONObject();
+        JSONObject json2=new JSONObject();
+        json.put("de","de");
+        json.put("de2","de2");
+        json.put("mainbillid","123");
+        jsons.add(json);
+        json1.put("de","de11");
+        json1.put("de2","de222");
+        jsons.add(json1);
+
+        json2.put("de","de11");
+        json2.put("de2","de222");
+        json2.put("mainbillid","123");
+        //System.out.println(modifyDetailInfo.CopyJSONArray(jsons).toJSONString());
+
+        //System.out.println(modifyDetailInfo.replaceStr("sdsd,dsd,sds,ds","dsdw"));
+        modifyDetailInfo.relpaceJSONArray(jsons,json2,"123");
+        System.out.println(jsons.toJSONString());
+
+    }
+
+    public String replaceStr(String tarStr,String str){
+        String newtarStr="";
+        tarStr=Util.null2String(tarStr);
+        str=Util.null2String(str);
+        if(!"".equals(str)){
+            for(String demo:tarStr.split(",")){
+                if(str.equals(demo)){
+                    continue;
+                }
+                newtarStr=newtarStr+demo+",";
+            }
+        }else{
+            newtarStr=tarStr;
+        }
+        if(newtarStr.endsWith(",")){
+            newtarStr=newtarStr.substring(0,newtarStr.length()-1);
+        }
+        return newtarStr;
+    }
+
+
+
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/service/oa/util/fastJsonDiff.java b/src/main/youhong_ai_jitu_src/jntchina/service/oa/util/fastJsonDiff.java
new file mode 100644
index 0000000..4a8685f
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/service/oa/util/fastJsonDiff.java
@@ -0,0 +1,110 @@
+package jntchina.service.oa.util;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.List;
+
+/**
+ * 比较json  是否一致
+ */
+public class fastJsonDiff {
+    public static boolean compareJsons(JSONObject json1, JSONObject json2,String key){
+        if(!commonCompare(json1,json2,key)){
+            return false;
+        }
+        Iterator<String> json1Keys = json1.keySet().iterator();
+        while (json1Keys.hasNext()){
+            key = json1Keys.next();
+            if(!compareJsons(json1.get(key), json2.get(key),key)){
+                return false;
+            }
+        }
+        return true;
+    }
+
+    public static boolean compareJsons(Object json1,Object json2, String key){
+        if(!commonCompare(json1,json2,key)){
+            return false;
+        }
+        if (json1 instanceof JSONObject){
+            //如果是JSONObject则继续递归比较。
+            return compareJsons((JSONObject) json1,(JSONObject) json2, key);
+        } else if (json1 instanceof JSONArray){
+            //如果是JSONArray，则进行数组类比较。
+            return compareJsons((JSONArray) json1,(JSONArray) json2,key);
+        }  else {
+            //其余全部为字符串比较，非字符串的也转换为字符串比较。
+            return compareJsons(json1.toString(),json2.toString(),key);
+        }
+        //return true;
+    }
+
+    public static boolean compareJsons(JSONArray jsonArray1, JSONArray jsonArray2, String key){
+        if(!commonCompare(jsonArray1,jsonArray2,key)){
+            return false;
+        }
+
+        //数组存在无序的情况，所以需要将1中的每一个元素，跟2中的所有元素进行比较。
+        //两种方案：1.先对两个jsonArray进行排序，然后再依次比较。 2.对1中的每一个元素，判断是否在2中存在。(有重复元素的可能会有问题。)
+        //方案2的实现：
+        Iterator<Object> iterator1 = jsonArray1.iterator();
+        while (iterator1.hasNext()){
+            Object o1 = iterator1.next();
+            if (jsonArray2.indexOf(o1) == -1){
+                System.err.println("不一致：key  "+ key +" json1中的 jsonArray其中的value ： " + JSONObject.toJSONString(o1) + "  仅在json1中存在，不在json2中存在");
+                return false;
+            } else {
+                System.out.println("一致：key " + key +" json1中的 jsonArray其中的value ："  + JSONObject.toJSONString(o1));
+            }
+        }
+        Iterator<Object> iterator2 = jsonArray2.iterator();
+        while (iterator2.hasNext()){
+            Object o2 = iterator2.next();
+            if (jsonArray1.indexOf(o2) == -1){
+                System.err.println("不一致：key " + key +" json2中的 jsonArray其中的value ： " + JSONObject.toJSONString(o2) + "  仅在json2中存在，不在json1中存在");
+                return false;
+            }
+        }
+        return true;
+    }
+
+    public static boolean compareJsons(String json1,String json2,String key){
+        if(!commonCompare(json1,json2,key)){
+            return false;
+        }
+        if (json1.equals(json2)){
+            System.out.println("一致：key " + key + " ， json1 value = " + json1 + " json2 value = " + json2);
+
+        } else {
+            System.err.println("不一致： key " + key + " ， json1 value = " + json1 + " json2 value = " + json2 );
+            return false;
+        }
+        return true;
+    }
+
+    public static boolean commonCompare(Object json1,Object json2,String key){
+        if (json1 == null && json2 == null){
+            //System.err.println("不一致： key " + key + " 在两者中均不存在");
+            return false;
+        }
+        if (json1 == null){
+            System.err.println("不一致： key " + key + " 在json1中不存在，在json2中为 " + JSONObject.toJSONString(json2) );
+            return false;
+        }
+        if (json2 == null){
+            System.err.println("不一致： key " + key + " 在json1中为 " + JSONObject.toJSONString(json2) + " 在json2中不存在" );
+            return false;
+        }
+        return true;
+    }
+    public static void main(String[] args) {
+        //String str1 = "{\"username\":\"tom\",\"age\":18,\"address\":[{\"province\":\"上海市\"},{\"city\":\"上海市\"},{\"city\":\"上海市政府\"},{\"disrtict\":\"静安区\"}],\"aihao\":[\"打球\",\"唱歌\",\"读书\"]}";
+        String str1 = "{\"username\":\"andy\",\"age\":18,\"address\":[{\"province\":\"上海市\"},{\"city\":\"上海市\"},{\"disrtict\":\"静安区\"}],\"aihao\":[\"写作\",\"唱歌\",\"打球\"]}";
+        String str2 = "{\"username1\":\"andy\",\"age\":18,\"address\":[{\"province\":\"上海市\"},{\"city\":\"上海市\"},{\"disrtict\":\"静安区\"}],\"aihao\":[\"写作\",\"唱歌\",\"打球\"]}";
+        boolean flag=compareJsons(JSONObject.parseObject(str1),JSONObject.parseObject(str2),null);
+        System.out.println("de"+flag) ;
+    }
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/test/DC_Test.java b/src/main/youhong_ai_jitu_src/jntchina/test/DC_Test.java
new file mode 100644
index 0000000..0db57ea
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/test/DC_Test.java
@@ -0,0 +1,84 @@
+package jntchina.test;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.http.HttpEntity;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.entity.ContentType;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.util.EntityUtils;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.weaver.general.Util;
+
+import jntchina.util.HttpClientToDC;
+import jntchina.util.MD5Utils;
+import selfdev.util.base.TimeCommonUtil;
+
+public class DC_Test {
+
+	public static void main(String[] args) {
+		// TODO Auto-generated method stub
+		String userName="oa003";
+		String password="123456";
+		String systemCode="oa";
+		String secretkey="5362448sd132d241e5ae27e318qws11d";
+		String token=getToken(userName,password,secretkey,systemCode);
+		System.out.println(token);
+	}
+	
+	 /**
+     * 获取token
+     * @return
+     * @throws Exception
+     */
+    public static String getToken(String userName,String password,String secretkey,String systemCode) {
+        String token = null;
+        try {
+            //获取当前系统日期
+            String today= TimeCommonUtil.obtainDate(0).substring(0,10).replace("-", "");
+            //加密串
+            String encryptionKey= MD5Utils.encrypt(userName+":"+password+":"+today+":"+secretkey);
+            System.out.println(encryptionKey);
+            CloseableHttpClient client = HttpClients.createDefault();
+            HttpPost post = new HttpPost("https://uat-jtdcapi.jtexpress.com.cn/dcoauthedi/oauth/getToken");
+            JSONObject param=new JSONObject();
+            param.put("userName",userName);//用户名
+            param.put("password",password);//密码
+            param.put("systemCode",systemCode);//系统标识
+            param.put("encryptionKey",encryptionKey);//授权类型
+
+            System.out.println(param.toString());
+
+            StringEntity  requestentity=new StringEntity(param.toString(),"utf-8");
+            requestentity.setContentType(ContentType.APPLICATION_JSON.toString());
+            post.setEntity(requestentity);
+            String responseContent = null; // 响应内容
+            CloseableHttpResponse response = client.execute(post);
+            if (response.getStatusLine().getStatusCode() == 200) {
+                HttpEntity entity = response.getEntity();
+                responseContent = EntityUtils.toString(entity, "UTF-8");
+            }
+            System.out.println("调用getToken接口返回结果----->"+responseContent);
+            if(!"".equals(responseContent)){
+                JSONObject object_return= JSON.parseObject(responseContent);
+                //接口返回状态
+                String succ= Util.null2String(object_return.getString("succ"));
+                if("true".equals(succ)){
+                    token= Util.null2String(object_return.getString("data"));
+                }
+            }
+        }catch (Exception e) {
+            e.printStackTrace();
+        }
+        System.out.println(token);
+        return token;
+    }
+	
+
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/test/DeptTest.java b/src/main/youhong_ai_jitu_src/jntchina/test/DeptTest.java
new file mode 100644
index 0000000..9c921d3
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/test/DeptTest.java
@@ -0,0 +1,206 @@
+package jntchina.test;
+
+import com.alibaba.fastjson.JSONObject;
+import org.apache.http.client.entity.UrlEncodedFormEntity;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.message.BasicNameValuePair;
+import org.apache.http.util.EntityUtils;
+
+import java.math.BigInteger;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.sql.Timestamp;
+import java.util.*;
+
+/**
+ * @Author Administrator
+ * @Description
+ * @Date 2021/2/22  17:32
+ */
+public class DeptTest {
+
+    public static void main(String[] args) {
+        DeptTest restfulDemo = new DeptTest();
+        restfulDemo.doAction();
+    }
+
+    /**
+     * restful接口调用案例
+     * 以getModeDataPageList为例
+     */
+    public void doAction() {
+
+        CloseableHttpResponse response;// 响应类,
+        CloseableHttpClient httpClient = HttpClients.createDefault();
+
+        //restful接口url
+        HttpPost httpPost = new HttpPost("http://159.138.82.156:8088/api/cube/restful/interface/saveOrUpdateModeData/insertOrUpdateDept");
+
+        //当前日期
+        String currentDate = getCurrentDate();
+        //当前时间
+        String currentTime = getCurrentTime();
+        //获取时间戳
+        String currentTimeTamp = getTimestamp();
+
+        Map params = new HashMap<>();
+        Map paramDatajson = new HashMap<>();
+
+        //header
+        Map header = new HashMap<>();
+
+        //系统标识
+        String systemid = "hr";
+        //密码
+        String d_password = "A038A0555B424DE1A869CBB664A093C9";
+        //封装header里的参数
+        header.put("systemid", systemid);
+        header.put("currentDateTime", currentTimeTamp);
+        String md5Source = systemid + d_password + currentTimeTamp;
+        String md5OfStr = getMD5Str(md5Source).toLowerCase();
+        //Md5是：系统标识+密码+时间戳 并且md5加密的结果
+        header.put("Md5", md5OfStr);
+        paramDatajson.put("header", header);
+
+        //封装pageinfo
+//        JSONObject pageInfo = new JSONObject();
+//        pageInfo.put("pageNo", 1);
+//        pageInfo.put("pageSize", 10);
+//        paramDatajson.put("pageInfo",pageInfo);
+
+        List<Object> list = new ArrayList<>();
+        Map<String, Object> map = new HashMap<>();
+
+        //封装mainTable参数
+        JSONObject mainTable = new JSONObject();
+        mainTable.put("id", 11);
+        mainTable.put("nc_dept_code", 11); // NCC部门编码
+        mainTable.put("nc_dept_name", "网络管理部"); // NCC部门名称  文本
+        mainTable.put("parent_dept_code", 123); // NCC上级部门 传id
+        mainTable.put("dept_id", 22); // OA部门ID  传id
+        mainTable.put("dept_code", "OAtest"); // OA部门编码
+        mainTable.put("dept_name", "OA的测试部门"); // OA部门名称
+        mainTable.put("type", "极兔管理"); // 业务板块
+        mainTable.put("property", "管理"); // 部门属性
+        mainTable.put("unit", "重庆纭庆供应链管理有限公司"); //所属业务单元
+//        paramDatajson.put("mainTable",mainTable);
+
+        //封装operationinfo参数
+        JSONObject operationinfo = new JSONObject();
+        operationinfo.put("operationDate", "");
+        operationinfo.put("operator", "1");
+        operationinfo.put("operationTime", "");
+
+        map.put("mainTable", mainTable);
+        map.put("operationinfo", operationinfo);
+
+        list.add(map);
+
+        paramDatajson.put("data", list);
+
+        params.put("datajson", paramDatajson);
+
+        System.out.println("===请求参数datajson===" + paramDatajson);
+
+        //装填参数
+        List nvps = new ArrayList();
+        if (params != null) {
+            params.forEach((k, v) -> {
+                nvps.add(new BasicNameValuePair((String) k, JSONObject.toJSONString(v)));
+            });
+        }
+        try {
+            httpPost.addHeader("Content-Type", "application/x-www-form-urlencoded; charset=utf-8");
+            httpPost.setEntity(new UrlEncodedFormEntity(nvps, "UTF-8"));
+            response = httpClient.execute(httpPost);
+            if (response != null && response.getEntity() != null) {
+                //返回信息
+                String resultString = EntityUtils.toString(response.getEntity());
+                //todo这里处理返回信息
+                System.out.println("返回的结果信息为：" + resultString);
+            } else {
+                System.out.println("获取数据失败，请查看日志" + currentDate + " " + currentTime);
+            }
+        } catch (Exception e) {
+            System.out.println("请求失败" + currentDate + " " + currentTime + "====errormsg:" + e.getMessage());
+        }
+    }
+
+    public String getMD5Str(String plainText) {
+        //定义一个字节数组
+        byte[] secretBytes = null;
+        try {
+            // 生成一个MD5加密计算摘要
+            MessageDigest md = MessageDigest.getInstance("MD5");
+            //对字符串进行加密
+            md.update(plainText.getBytes());
+            //获得加密后的数据
+            secretBytes = md.digest();
+        } catch (NoSuchAlgorithmException e) {
+            throw new RuntimeException("没有md5这个算法！");
+        }
+        //将加密后的数据转换为16进制数字
+        String md5code = new BigInteger(1, secretBytes).toString(16);
+        // 如果生成数字未满32位，需要前面补0
+        for (int i = 0; i < 32 - md5code.length(); i++) {
+            md5code = "0" + md5code;
+        }
+        return md5code;
+    }
+
+    public static String getCurrentTime() {
+        Date newdate = new Date();
+        long datetime = newdate.getTime();
+        Timestamp timestamp = new Timestamp(datetime);
+        String currenttime = (timestamp.toString()).substring(11, 13) + ":" + (timestamp.toString()).substring(14, 16) + ":"
+                + (timestamp.toString()).substring(17, 19);
+        return currenttime;
+    }
+
+    public static String getCurrentDate() {
+        Date newdate = new Date();
+        long datetime = newdate.getTime();
+        Timestamp timestamp = new Timestamp(datetime);
+        String currentdate = (timestamp.toString()).substring(0, 4) + "-" + (timestamp.toString()).substring(5, 7) + "-"
+                + (timestamp.toString()).substring(8, 10);
+        return currentdate;
+    }
+
+    /**
+     * 获取当前日期时间。 YYYY-MM-DD HH:MM:SS
+     *
+     * @return 当前日期时间
+     */
+    public static String getCurDateTime() {
+        Date newdate = new Date();
+        long datetime = newdate.getTime();
+        Timestamp timestamp = new Timestamp(datetime);
+        return (timestamp.toString()).substring(0, 19);
+    }
+
+    /**
+     * 获取时间戳   格式如：19990101235959
+     *
+     * @return
+     */
+    public static String getTimestamp() {
+        return getCurDateTime().replace("-", "").replace(":", "").replace(" ", "");
+    }
+
+    public static int getIntValue(String v, int def) {
+        try {
+            return Integer.parseInt(v);
+        } catch (Exception ex) {
+            return def;
+        }
+    }
+
+
+    public static String null2String(Object s) {
+        return s == null ? "" : s.toString();
+    }
+
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/test/DeptTest2.java b/src/main/youhong_ai_jitu_src/jntchina/test/DeptTest2.java
new file mode 100644
index 0000000..c7aa76a
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/test/DeptTest2.java
@@ -0,0 +1,188 @@
+package jntchina.test;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import org.apache.http.client.entity.UrlEncodedFormEntity;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.message.BasicNameValuePair;
+import org.apache.http.util.EntityUtils;
+
+import java.math.BigInteger;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.sql.Timestamp;
+import java.util.*;
+
+/**
+ * @Author Administrator
+ * @Description
+ * @Date 2021/2/22  17:32
+ */
+public class DeptTest2 {
+
+    public static void main(String[] args) {
+        DeptTest2 restfulDemo = new DeptTest2();
+        restfulDemo.doAction();
+    }
+
+    /**
+     * restful接口调用案例
+     * 以getModeDataPageList为例
+     */
+    public void doAction() {
+
+        CloseableHttpResponse response;// 响应类,
+        CloseableHttpClient httpClient = HttpClients.createDefault();
+
+        //restful接口url
+        HttpPost httpPost = new HttpPost("http://124.71.198.239:8088/api/cube/restful/interface/getModeDataPageList/listDepartmentInfo");
+
+        //当前日期
+        String currentDate = getCurrentDate();
+        //当前时间
+        String currentTime = getCurrentTime();
+        //获取时间戳
+        String currentTimeTamp = getTimestamp();
+
+        Map params = new HashMap<>();
+        Map paramDatajson = new HashMap<>();
+
+        //header
+        Map header = new HashMap<>();
+
+        //系统标识
+        String systemid = "oa";
+        //密码
+        String d_password = "BE598342ABA04FAFBB2C20ABD1C33F6B";
+        //封装header里的参数
+        header.put("systemid", systemid);
+        header.put("currentDateTime", currentTimeTamp);
+        String md5Source = systemid + d_password + currentTimeTamp;
+        String md5OfStr = getMD5Str(md5Source).toLowerCase();
+        //Md5是：系统标识+密码+时间戳 并且md5加密的结果
+        header.put("Md5", md5OfStr);
+        paramDatajson.put("header", header);
+
+        //封装pageinfo
+        JSONObject pageInfo = new JSONObject();
+        pageInfo.put("pageNo", 1);
+        pageInfo.put("pageSize", 10);
+        paramDatajson.put("pageInfo", pageInfo);
+
+        //封装mainTable参数
+        JSONObject mainTable = new JSONObject();
+        mainTable.put("MODIFIED", "2021-03-02 02:03");
+        paramDatajson.put("mainTable", mainTable);
+
+        //封装operationinfo参数
+        JSONObject operationinfo = new JSONObject();
+        operationinfo.put("operator", "1");
+        paramDatajson.put("operationinfo", operationinfo);
+
+        params.put("datajson", paramDatajson);
+
+        System.out.println("===请求参数datajson===" + JSON.toJSON(paramDatajson));
+
+        //装填参数
+        List nvps = new ArrayList();
+        if (params != null) {
+            params.forEach((k, v) -> {
+                nvps.add(new BasicNameValuePair((String) k, JSONObject.toJSONString(v)));
+            });
+        }
+        try {
+            httpPost.addHeader("Content-Type", "application/x-www-form-urlencoded; charset=utf-8");
+            httpPost.setEntity(new UrlEncodedFormEntity(nvps, "UTF-8"));
+            response = httpClient.execute(httpPost);
+            if (response != null && response.getEntity() != null) {
+                //返回信息
+                String resultString = EntityUtils.toString(response.getEntity());
+                //todo这里处理返回信息
+                System.out.println("返回的结果信息为：" + resultString);
+            } else {
+                System.out.println("获取数据失败，请查看日志" + currentDate + " " + currentTime);
+            }
+        } catch (Exception e) {
+            System.out.println("请求失败" + currentDate + " " + currentTime + "====errormsg:" + e.getMessage());
+        }
+    }
+
+    public String getMD5Str(String plainText) {
+        //定义一个字节数组
+        byte[] secretBytes = null;
+        try {
+            // 生成一个MD5加密计算摘要
+            MessageDigest md = MessageDigest.getInstance("MD5");
+            //对字符串进行加密
+            md.update(plainText.getBytes());
+            //获得加密后的数据
+            secretBytes = md.digest();
+        } catch (NoSuchAlgorithmException e) {
+            throw new RuntimeException("没有md5这个算法！");
+        }
+        //将加密后的数据转换为16进制数字
+        String md5code = new BigInteger(1, secretBytes).toString(16);
+        // 如果生成数字未满32位，需要前面补0
+        for (int i = 0; i < 32 - md5code.length(); i++) {
+            md5code = "0" + md5code;
+        }
+        return md5code;
+    }
+
+    public static String getCurrentTime() {
+        Date newdate = new Date();
+        long datetime = newdate.getTime();
+        Timestamp timestamp = new Timestamp(datetime);
+        String currenttime = (timestamp.toString()).substring(11, 13) + ":" + (timestamp.toString()).substring(14, 16) + ":"
+                + (timestamp.toString()).substring(17, 19);
+        return currenttime;
+    }
+
+    public static String getCurrentDate() {
+        Date newdate = new Date();
+        long datetime = newdate.getTime();
+        Timestamp timestamp = new Timestamp(datetime);
+        String currentdate = (timestamp.toString()).substring(0, 4) + "-" + (timestamp.toString()).substring(5, 7) + "-"
+                + (timestamp.toString()).substring(8, 10);
+        return currentdate;
+    }
+
+    /**
+     * 获取当前日期时间。 YYYY-MM-DD HH:MM:SS
+     *
+     * @return 当前日期时间
+     */
+    public static String getCurDateTime() {
+        Date newdate = new Date();
+        long datetime = newdate.getTime();
+        Timestamp timestamp = new Timestamp(datetime);
+        return (timestamp.toString()).substring(0, 19);
+    }
+
+    /**
+     * 获取时间戳   格式如：19990101235959
+     *
+     * @return
+     */
+    public static String getTimestamp() {
+        return getCurDateTime().replace("-", "").replace(":", "").replace(" ", "");
+    }
+
+    public static int getIntValue(String v, int def) {
+        try {
+            return Integer.parseInt(v);
+        } catch (Exception ex) {
+            return def;
+        }
+    }
+
+
+    public static String null2String(Object s) {
+        return s == null ? "" : s.toString();
+    }
+
+
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/test/HrTest.java b/src/main/youhong_ai_jitu_src/jntchina/test/HrTest.java
new file mode 100644
index 0000000..0ab1a97
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/test/HrTest.java
@@ -0,0 +1,204 @@
+package jntchina.test;
+
+import com.alibaba.fastjson.JSONObject;
+
+import org.apache.http.client.entity.UrlEncodedFormEntity;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.message.BasicNameValuePair;
+import org.apache.http.util.EntityUtils;
+
+
+import java.math.BigInteger;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.sql.Timestamp;
+import java.util.*;
+
+/**
+ * @Author Administrator
+ * @Description
+ * @Date 2021/2/22  17:32
+ */
+public class HrTest {
+
+    public static void main(String[] args) {
+        HrTest restfulDemo = new HrTest();
+        restfulDemo.doAction();
+    }
+
+    public void doAction() {
+
+        CloseableHttpResponse response;// 响应类,
+        CloseableHttpClient httpClient = HttpClients.createDefault();
+
+        //restful接口url
+        HttpPost httpPost = new HttpPost("http://159.138.82.156:8088/api/cube/restful/interface/saveOrUpdateModeData/insertOrUpdateHr");
+
+        //当前日期
+        String currentDate = getCurrentDate();
+        //当前时间
+        String currentTime = getCurrentTime();
+        //获取时间戳
+        String currentTimeTamp = getTimestamp();
+
+        Map params = new HashMap<>();
+        Map paramDatajson = new HashMap<>();
+
+        //header
+        Map header = new HashMap<>();
+
+        //系统标识
+        String systemid = "hr";
+        //密码
+        String d_password = "A038A0555B424DE1A869CBB664A093C9";
+        //封装header里的参数
+        header.put("systemid", systemid);
+        header.put("currentDateTime", currentTimeTamp);
+        String md5Source = systemid + d_password + currentTimeTamp;
+        String md5OfStr = getMD5Str(md5Source).toLowerCase();
+        //Md5是：系统标识+密码+时间戳 并且md5加密的结果
+        header.put("Md5", md5OfStr);
+        paramDatajson.put("header", header);
+
+        //封装pageinfo
+//        JSONObject pageInfo = new JSONObject();
+//        pageInfo.put("pageNo", 1);
+//        pageInfo.put("pageSize", 10);
+//        paramDatajson.put("pageInfo",pageInfo);
+
+        List<Object> list = new ArrayList<>();
+        Map<String, Object> map = new HashMap<>();
+
+        //封装mainTable参数
+        JSONObject mainTable = new JSONObject();
+        mainTable.put("id", "1");
+        mainTable.put("name", "张三啊"); // 姓名  传文本
+        mainTable.put("unit_code", "123"); // 所属业务单元 id
+        mainTable.put("code", "123"); // 人员编码 传id
+        mainTable.put("group_code", "123"); // 任职集团  传id  默认01
+        mainTable.put("post_unit_code", "123"); // 任职业务单元 id
+        mainTable.put("type", "2"); // 人员类别  枚举：[1:合同工,2:外包员工]
+        mainTable.put("dept_code", "123"); // 所在部门编码 id
+        mainTable.put("is_principal", "1"); // 状态 枚举：[1:正式,2:试用,3:离职]
+        mainTable.put("work_date", "2021-02-26"); // 任职开始日期 日期 yyyy-MM-dd
+//        paramDatajson.put("mainTable",mainTable);
+
+        //封装operationinfo参数
+        JSONObject operationinfo = new JSONObject();
+        operationinfo.put("operationDate", "");
+        operationinfo.put("operator", "1");
+        operationinfo.put("operationTime", "");
+
+        map.put("mainTable", mainTable);
+        map.put("operationinfo", operationinfo);
+
+        list.add(map);
+
+        paramDatajson.put("data", list);
+
+        params.put("datajson", paramDatajson);
+
+        System.out.println("===请求参数datajson===" + paramDatajson);
+
+        //装填参数
+        List nvps = new ArrayList();
+        if (params != null) {
+            params.forEach((k, v) -> {
+                nvps.add(new BasicNameValuePair((String) k, JSONObject.toJSONString(v)));
+            });
+        }
+        try {
+            httpPost.addHeader("Content-Type", "application/x-www-form-urlencoded; charset=utf-8");
+            httpPost.setEntity(new UrlEncodedFormEntity(nvps, "UTF-8"));
+            response = httpClient.execute(httpPost);
+            if (response != null && response.getEntity() != null) {
+                //返回信息
+                String resultString = EntityUtils.toString(response.getEntity());
+                //todo这里处理返回信息
+                System.out.println("返回的结果信息为：" + resultString);
+            } else {
+                System.out.println("获取数据失败，请查看日志" + currentDate + " " + currentTime);
+            }
+        } catch (Exception e) {
+            System.out.println("请求失败" + currentDate + " " + currentTime + "====errormsg:" + e.getMessage());
+        }
+    }
+
+    public String getMD5Str(String plainText) {
+        //定义一个字节数组
+        byte[] secretBytes = null;
+        try {
+            // 生成一个MD5加密计算摘要
+            MessageDigest md = MessageDigest.getInstance("MD5");
+            //对字符串进行加密
+            md.update(plainText.getBytes());
+            //获得加密后的数据
+            secretBytes = md.digest();
+        } catch (NoSuchAlgorithmException e) {
+            throw new RuntimeException("没有md5这个算法！");
+        }
+        //将加密后的数据转换为16进制数字
+        String md5code = new BigInteger(1, secretBytes).toString(16);
+        // 如果生成数字未满32位，需要前面补0
+        for (int i = 0; i < 32 - md5code.length(); i++) {
+            md5code = "0" + md5code;
+        }
+        return md5code;
+    }
+
+    public static String getCurrentTime() {
+        Date newdate = new Date();
+        long datetime = newdate.getTime();
+        Timestamp timestamp = new Timestamp(datetime);
+        String currenttime = (timestamp.toString()).substring(11, 13) + ":" + (timestamp.toString()).substring(14, 16) + ":"
+                + (timestamp.toString()).substring(17, 19);
+        return currenttime;
+    }
+
+    public static String getCurrentDate() {
+        Date newdate = new Date();
+        long datetime = newdate.getTime();
+        Timestamp timestamp = new Timestamp(datetime);
+        String currentdate = (timestamp.toString()).substring(0, 4) + "-" + (timestamp.toString()).substring(5, 7) + "-"
+                + (timestamp.toString()).substring(8, 10);
+        return currentdate;
+    }
+
+    /**
+     * 获取当前日期时间。 YYYY-MM-DD HH:MM:SS
+     *
+     * @return 当前日期时间
+     */
+    public static String getCurDateTime() {
+        Date newdate = new Date();
+        long datetime = newdate.getTime();
+        Timestamp timestamp = new Timestamp(datetime);
+        return (timestamp.toString()).substring(0, 19);
+    }
+
+    /**
+     * 获取时间戳   格式如：19990101235959
+     *
+     * @return
+     */
+    public static String getTimestamp() {
+        return getCurDateTime().replace("-", "").replace(":", "").replace(" ", "");
+    }
+
+    public static int getIntValue(String v, int def) {
+        try {
+            return Integer.parseInt(v);
+        } catch (Exception ex) {
+            return def;
+        }
+    }
+
+
+    public static String null2String(Object s) {
+        return s == null ? "" : s.toString();
+    }
+
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/test/HttpClientToNCC_Test.java b/src/main/youhong_ai_jitu_src/jntchina/test/HttpClientToNCC_Test.java
new file mode 100644
index 0000000..cb18cfe
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/test/HttpClientToNCC_Test.java
@@ -0,0 +1,374 @@
+package jntchina.test;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.lang.reflect.Type;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.net.URLEncoder;
+import java.nio.charset.Charset;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.commons.lang3.StringUtils;
+
+import com.google.gson.Gson;
+
+import jntchina.util.CompressUtil;
+import jntchina.util.Decryption;
+import jntchina.util.Encryption;
+import jntchina.util.ResultMessageUtil;
+import jntchina.util.SHA256Util;
+import jntchina.util.Test;
+import selfdev.util.log.LogTool;
+
+/**
+ * @Author Administrator
+ * @Description
+ * @Date 2021/2/19  11:21
+ */
+public class HttpClientToNCC_Test {
+    // app_secret
+    private static final String client_secret = "7f4960d6de4a42bebfc4";
+    // 公钥
+    private static final String pubKey = "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCbAEDvatjhVymfI2gubZ72iYaOtbcmLZljJOEfKtl0v3rkwoify8o1qBjqOYkvAh8a7iER/lWzMZgg5iHpbUqS1Plejx4fvUvslQt59B+1gzruLbW+4jDEY9Cl2f7vj7J1HYp9K7OBY0oM2GvzFJzLWnpDnJVjgNNyuEqlqYY5kQIDAQAB";
+    // app_id
+    private static final String client_id = "oa";
+    // ncc用户名
+    private static final String username = null;
+    // ncc用户名密码
+    private static final String pwd = null;
+    // ncc账套
+    private static final String busi_center = "jtsd";
+    // 获取token方式：client_credentials、password
+    private static final String grant_type = "client_credentials";
+    // 服务器ip：port
+    private static final String baseUrl = "http://180.169.229.37:9333";
+    // 返回值压缩加密级别
+    private static final String secret_level = "L0";
+    // openapi请求路径
+//    private static String apiUrl = "/nccloud/api/jitu/erm/bxbill/insert";
+    // 访问api获取到的access_token
+    public static String token = null;
+    // 重复调用检查
+    public static String repeat_check = null;
+    // 接口调用业务标识
+    public static String busi_id = null;
+
+    public static LogTool log = new LogTool("/log/selfdev/action", false);
+
+    public static void main(String[] args) {
+    	try {
+			System.out.println(getToken());
+		} catch (Exception e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+    }
+    
+    /**
+     * 获取access_token
+     *
+     * @return
+     * @throws Exception
+     */
+    public static String getToken() throws Exception {
+        String token = null;
+        if ("password".equals(grant_type)) {
+            // 密码模式
+            token = getTokenByPWD();
+            log.writeLog("--------密码模式----获取access_token");
+        } else if ("client_credentials".equals(grant_type)) {
+            // 客户端模式
+            token = getTokenByClient();
+            log.writeLog("--------客户端模式----获取access_token");
+        }
+        return token;
+    }
+
+    /**
+     * 客户端模式获取token
+     *
+     * @return
+     * @throws Exception
+     */
+    private static String getTokenByClient() throws Exception {
+        Map<String, String> paramMap = new HashMap<String, String>();
+        // 密码模式认证
+        paramMap.put("grant_type", "client_credentials");
+        // 第三方应用id
+        paramMap.put("client_id", client_id);
+        // 第三方应用secret 公钥加密
+        paramMap.put("client_secret", URLEncoder.encode(Encryption.pubEncrypt(pubKey, client_secret), "utf-8"));
+        // 账套编码
+        paramMap.put("biz_center", busi_center);
+        // 传递数据源和ncc登录用户
+        // paramMap.put("dsname", "TM_0614");
+        // paramMap.put("usercode", "1");
+
+        // 签名
+        String sign = SHA256Util.getSHA256(client_id + client_secret + pubKey);
+        paramMap.put("signature", sign);
+
+        String url = baseUrl + "/nccloud/opm/accesstoken";
+        String mediaType = "application/x-www-form-urlencoded";
+
+        log.writeLog("--------客户端模式获取token-----");
+
+        return doPost(url, paramMap, mediaType, null, "");
+    }
+
+    /**
+     * 密码模式获取token
+     *
+     * @return
+     * @throws Exception
+     */
+    private static String getTokenByPWD() throws Exception {
+        Map<String, String> paramMap = new HashMap<String, String>();
+        // 密码模式认证
+        paramMap.put("grant_type", "password");
+        // 第三方应用id
+        paramMap.put("client_id", client_id);
+        // 第三方应用secret 公钥加密
+        paramMap.put("client_secret", URLEncoder.encode(Encryption.pubEncrypt(pubKey, client_secret), "utf-8"));
+        // ncc用户名
+        paramMap.put("username", username);
+        // 密码 公钥加密
+        paramMap.put("password", URLEncoder.encode(Encryption.pubEncrypt(pubKey, pwd), "utf-8"));
+        // 账套编码
+        paramMap.put("biz_center", busi_center);
+        // 签名
+        String sign = SHA256Util.getSHA256(client_id + client_secret + username + pwd + pubKey);
+        paramMap.put("signature", sign);
+
+        String url = baseUrl + "/nccloud/opm/accesstoken";
+        String mediaType = "application/x-www-form-urlencoded";
+
+        log.writeLog("--------密码模式获取token-----");
+
+        return doPost(url, paramMap, mediaType, null, "");
+    }
+
+    /**
+     * @param token       token
+     * @param requestBody 请求参数
+     * @return
+     * @throws Exception
+     */
+    public static String sendApi(String token, String requestBody, String apiUrl) throws Exception {
+        // token转对象，获取api访问所用token和secret
+        ResultMessageUtil returnData = new Gson().fromJson(token, (Type) ResultMessageUtil.class);
+        Map<String, String> data = (Map<String, String>) returnData.getData();
+        String access_token = data.get("access_token");
+        String security_key = data.get("security_key");
+        String refresh_token = data.get("refresh_token");
+        System.out.println("【ACCESS_TOKEN】:" + access_token);
+
+        // 请求路径
+        String url = baseUrl + apiUrl;
+        // header 参数
+        Map<String, String> headermap = new HashMap<String, String>();
+        headermap.put("access_token", access_token);
+        headermap.put("client_id", client_id);
+
+        StringBuffer sb = new StringBuffer();
+        sb.append(client_id);
+        if (StringUtils.isNotBlank(requestBody)) {
+            sb.append(requestBody);
+        }
+        sb.append(pubKey);
+        String sign = SHA256Util.getSHA256(sb.toString());
+        headermap.put("signature", sign);
+
+        if (StringUtils.isNotBlank(busi_id)) {
+            headermap.put("busi_id", busi_id);
+        }
+        if (StringUtils.isNotBlank(repeat_check)) {
+            headermap.put("repeat_check", repeat_check);
+        }
+        headermap.put("ucg_flag", "y");
+
+        String mediaType = "application/json;charset=utf-8";
+
+        // 表体数据json
+        // 根据安全级别选择加密或压缩请求表体参数
+        String json = dealRequestBody(requestBody, security_key, secret_level);
+
+        log.writeLog("--------token---请求参数--");
+
+        return doPost(url, null, mediaType, headermap, json);
+    }
+
+    /**
+     * 返回值进行过加密和压缩，对返回值进行解压和解密
+     *
+     * @param source
+     * @param security_key
+     * @param level
+     * @return
+     * @throws Exception
+     */
+    private static String dealResponseBody(String source, String security_key, String level) throws Exception {
+        String result = null;
+
+        if (StringUtils.isEmpty(level) || "L0".equals(level)) {
+            result = source;
+        } else if ("L1".equals(level)) {
+            result = Decryption.symDecrypt(security_key, source);
+        } else if ("L2".equals(level)) {
+            result = CompressUtil.gzipDecompress(source);
+        } else if ("L3".equals(level)) {
+            result = CompressUtil.gzipDecompress(Decryption.symDecrypt(security_key, source));
+        } else if ("L4".equals(level)) {
+            result = Decryption.symDecrypt(security_key, CompressUtil.gzipDecompress(source));
+        } else {
+            throw new Exception("无效的安全等级");
+        }
+        return result;
+    }
+
+    // 根据安全级别设置，表体是否加密或压缩
+    private static String dealRequestBody(String source, String security_key, String level) throws Exception {
+        String result = null;
+        if (StringUtils.isEmpty(level) || "L0".equals(level)) {
+            result = source;
+        } else if ("L1".equals(level)) {
+            result = Encryption.symEncrypt(security_key, source);
+        } else if ("L2".equals(level)) {
+            result = CompressUtil.gzipCompress(source);
+        } else if ("L3".equals(level)) {
+            result = Encryption.symEncrypt(security_key, CompressUtil.gzipCompress(source));
+        } else if ("L4".equals(level)) {
+            result = CompressUtil.gzipCompress(Encryption.symEncrypt(security_key, source));
+        } else {
+            throw new Exception("无效的安全等级");
+        }
+
+        log.writeLog("-----根据安全级别设置，表体是否加密或压缩--");
+
+        return result;
+    }
+
+    /**
+     * 发送post请求
+     *
+     * @param baseUrl
+     * @param paramMap
+     * @param mediaType
+     * @param headers
+     * @param json
+     * @return
+     */
+    private static String doPost(String baseUrl, Map<String, String> paramMap, String mediaType, Map<String, String> headers, String json) {
+
+        HttpURLConnection urlConnection = null;
+        InputStream in = null;
+        OutputStream out = null;
+        BufferedReader bufferedReader = null;
+        String result = null;
+        try {
+            StringBuffer sb = new StringBuffer();
+            sb.append(baseUrl);
+            if (paramMap != null) {
+                sb.append("?");
+                for (Map.Entry<String, String> entry : paramMap.entrySet()) {
+                    String key = entry.getKey();
+                    String value = entry.getValue();
+                    sb.append(key + "=" + value).append("&");
+                }
+                baseUrl = sb.toString().substring(0, sb.toString().length() - 1);
+            }
+
+            URL urlObj = new URL(baseUrl);
+            urlConnection = (HttpURLConnection) urlObj.openConnection();
+            urlConnection.setConnectTimeout(50000);
+            urlConnection.setRequestMethod("POST");
+            urlConnection.setDoOutput(true);
+            urlConnection.setDoInput(true);
+            urlConnection.setUseCaches(false);
+            urlConnection.addRequestProperty("content-type", mediaType);
+            if (headers != null) {
+                for (String key : headers.keySet()) {
+                    urlConnection.addRequestProperty(key, headers.get(key));
+                }
+            }
+            out = urlConnection.getOutputStream();
+            out.write(json.getBytes("utf-8"));
+            out.flush();
+            int resCode = urlConnection.getResponseCode();
+            if (resCode == HttpURLConnection.HTTP_OK || resCode == HttpURLConnection.HTTP_CREATED || resCode == HttpURLConnection.HTTP_ACCEPTED) {
+                in = urlConnection.getInputStream();
+            } else {
+                in = urlConnection.getErrorStream();
+            }
+            bufferedReader = new BufferedReader(new InputStreamReader(in, "utf-8"));
+            StringBuffer temp = new StringBuffer();
+            String line = bufferedReader.readLine();
+            while (line != null) {
+                temp.append(line).append("\r\n");
+                line = bufferedReader.readLine();
+            }
+            String ecod = urlConnection.getContentEncoding();
+            if (ecod == null) {
+                ecod = Charset.forName("utf-8").name();
+            }
+            result = new String(temp.toString().getBytes("utf-8"), ecod);
+        } catch (Exception e) {
+            System.out.println(e);
+        } finally {
+            if (null != bufferedReader) {
+                try {
+                    bufferedReader.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+            if (null != out) {
+                try {
+                    out.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+            if (null != in) {
+                try {
+                    in.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+            urlConnection.disconnect();
+        }
+
+        log.writeLog("-----发送post请求---");
+
+        return result;
+    }
+
+    class SecretConst {
+        /**
+         * LEVEL0 不压缩、不加密
+         */
+        public static final String LEVEL0 = "L0";
+        /**
+         * LEVEL1 只加密、不压缩
+         */
+        public static final String LEVEL1 = "L1";
+        /**
+         * LEVEL2 只压缩、不加密
+         */
+        public static final String LEVEL2 = "L2";
+        /**
+         * LEVEL3 先压缩、后加密
+         */
+        public static final String LEVEL3 = "L3";
+        /**
+         * LEVEL4 先加密、后压缩
+         */
+        public static final String LEVEL4 = "L4";
+    }
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/test/LJL_test.java b/src/main/youhong_ai_jitu_src/jntchina/test/LJL_test.java
new file mode 100644
index 0000000..8556873
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/test/LJL_test.java
@@ -0,0 +1,69 @@
+package jntchina.test;
+
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.weaver.integration.datesource.SAPInterationOutUtilTest;
+import org.apache.commons.httpclient.HttpClient;
+import org.apache.http.HttpEntity;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.util.EntityUtils;
+import selfdev.util.log.LogTool;
+
+
+import java.io.IOException;
+
+/**
+ * @title: LJL_test
+ * @Author LJL
+ * @Date: 2021/10/18 15:24
+ * @Version 1.0
+ */
+public class LJL_test {
+    public static void main(String[] args) {
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.put("12","12");
+        jsonObject.put("112","12");
+        jsonObject.put("123","12");
+        jsonObject.put("124","12");
+        jsonObject.clear();
+        System.out.println(jsonObject);
+
+
+//        HttpGet get = new HttpGet("http://192.168.200.231:9905/sunq/provision/v1/get/leave/type");
+//        CloseableHttpClient aDefault = HttpClients.createDefault();
+//        try {
+//            CloseableHttpResponse execute = aDefault.execute(get);
+//            HttpEntity entity = execute.getEntity();
+//            JSONObject jsonObject = JSONObject.parseObject(EntityUtils.toString(entity));
+//
+//            JSONArray data = jsonObject.getJSONArray("data");
+//            for (int i = 0; i < data.size(); i++) {
+//                String o = (String)data.get(i);
+//                System.out.println(o);
+//            }
+//
+//
+//        } catch (IOException e) {
+//            e.printStackTrace();
+//        }
+
+//
+//        Object o = "123";
+//
+//        String oo = (String)o;
+//
+//        String s = "123";
+//        System.out.println(oo.equals(s));
+//        System.out.println(s.equals(oo));
+
+    }
+
+
+
+
+
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/test/Test_20210407.java b/src/main/youhong_ai_jitu_src/jntchina/test/Test_20210407.java
new file mode 100644
index 0000000..17cfe81
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/test/Test_20210407.java
@@ -0,0 +1,31 @@
+package jntchina.test;
+
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import weaver.general.Util;
+
+public class Test_20210407 {
+
+	
+	public static void main(String[] args) {
+		String s="{\"code\":1,\"msg\":\"请求成功\",\"data\":{\"maxPoint\":null,\"size\":0,\"hasNextPage\":false,\"records\":null},\"succ\":true,\"fail\":false}";
+		JSONObject jsonObject = JSONObject.parseObject(s);
+
+		String code= Util.null2String(jsonObject.getString("code"));
+		if ("1".equals(code)) {
+			JSONObject result = jsonObject.getJSONObject("data");
+			//是否有下一页
+			boolean sfyxyy = result.getBoolean("hasNextPage");//是否有下一页
+
+			String maxPoint = Util.null2o(result.getString("maxPoint"));//下一页开始
+			JSONArray records = result.getJSONArray("records");
+			if(records!=null){
+				System.out.println("1111--->"+records.isEmpty());
+				System.out.println("1111");
+			}
+
+
+		}
+	}
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/test/Test_20210517.java b/src/main/youhong_ai_jitu_src/jntchina/test/Test_20210517.java
new file mode 100644
index 0000000..f68a52b
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/test/Test_20210517.java
@@ -0,0 +1,23 @@
+package jntchina.test;
+
+
+import com.alibaba.fastjson.JSONObject;
+import jntchina.util.HttpClientToDC;
+import weaver.general.Util;
+import weaver.interfaces.workflow.action.Action;
+
+public class Test_20210517 {
+
+	
+	public static void main(String[] args) {
+		//调用NCC接口，将数据传给NCC
+		String returndata = "{\"code\":1,\"data\":true,\"fail\":false,\"msg\":\"请求成功\",\"succ\":true}";
+		if (!"".equals(returndata) && returndata != null) {
+			JSONObject jsonObject = JSONObject.parseObject(returndata);
+			String succ = Util.null2String(jsonObject.get("succ"));
+			System.out.println("-------->"+succ);
+		}
+       
+		
+	}
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/test/tTest.java b/src/main/youhong_ai_jitu_src/jntchina/test/tTest.java
new file mode 100644
index 0000000..bfa9dbf
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/test/tTest.java
@@ -0,0 +1,113 @@
+package jntchina.test;
+
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import jntchina.util.HttpClientToDC;
+import jntchina.util.NCCUtils;
+import weaver.file.Prop;
+import weaver.general.Util;
+
+
+import java.io.*;
+import java.sql.Timestamp;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.util.*;
+
+
+
+public class tTest {
+
+
+    public static void main(String[] args) throws FileNotFoundException {
+
+        String a = "";
+        String zyx9=a.length()>140?a.substring(0,140):a;//标题
+
+
+        System.out.println(zyx9);
+
+    }
+
+    public static String json(){
+
+        return "{\"gxry\":[{\"subcompanyid1span\":\"J&T集团>J&T中国\",\"subcompanyid\":\"1021\",\"pinyinlastname\":\"张华光\",\"departmentidspan\":\"法律合规部\",\"departmentid\":\"1526\",\"icon\":\"/messager/usericon/af61358e8d9e478590d8970e2a682bb7.jpg\",\"requestParams\":\"{\\\"headformat\\\":\\\"2\\\",\\\"isDefault\\\":true,\\\"gender\\\":\\\"0\\\",\\\"background\\\":\\\"#55B1F9\\\",\\\"messagerurl\\\":\\\"/messager/usericon/af61358e8d9e478590d8970e2a682bb7.jpg\\\",\\\"fontcolor\\\":\\\"#FFFFFF\\\",\\\"defaultmessagerurl\\\":\\\"\\\",\\\"shortname\\\":\\\"华光\\\",\\\"lastname\\\":\\\"张华光\\\"}\",\"subcompanyname\":\"J&T中国\",\"type\":\"resource\",\"supsubcompanyname\":\"J&T集团\",\"lastname\":\"张华光\",\"jobtitlename\":\"合规顾问\",\"departmentname\":\"法律合规部\",\"lastnamespan\":\"张华光\",\"id\":\"1754\",\"displayKeys\":[\"lastnamespan\",\"subcompanyid1span\",\"departmentidspan\"],\"nodeid\":\"resource_1754x\",\"supsubcompanyid\":\"521\",\"email\":\"\",\"name\":\"张华光\"},{\"subcompanyid1span\":\"J&T集团>J&T中国\",\"img\":\"/messager/usericon/e6a341e5-9f10-4d1a-8dc1-ef15d67628ec.jpg\",\"subcompanyid\":\"1021\",\"pinyinlastname\":\"\",\"workcode\":\"00166012\",\"departmentidspan\":\"财务部\",\"departmentid\":\"1525\",\"messagerurl\":\"/messager/usericon/e6a341e5-9f10-4d1a-8dc1-ef15d67628ec.jpg\",\"mobile\":\"18321533556\",\"icon\":\"/messager/usericon/e6a341e5-9f10-4d1a-8dc1-ef15d67628ec.jpg\",\"requestParams\":\"{\\\"headformat\\\":\\\"2\\\",\\\"isDefault\\\":true,\\\"gender\\\":\\\"0\\\",\\\"background\\\":\\\"#55B1F9\\\",\\\"messagerurl\\\":\\\"/messager/usericon/e6a341e5-9f10-4d1a-8dc1-ef15d67628ec.jpg\\\",\\\"fontcolor\\\":\\\"#FFFFFF\\\",\\\"defaultmessagerurl\\\":\\\"\\\",\\\"shortname\\\":\\\"刘庞\\\",\\\"lastname\\\":\\\"刘庞\\\"}\",\"subcompanyid1\":\"1021\",\"subcompanyname\":\"J&T中国\",\"supsubcompanyname\":\"J&T集团\",\"lastname\":\"刘庞\",\"jobtitlename\":\"账务会计\",\"departmentname\":\"财务部\",\"lastnamespan\":\"刘庞\",\"id\":\"44747\",\"supsubcompanyid\":\"521\",\"email\":\"\",\"nodeid\":\"resource_44747x\",\"type\":\"resource\",\"crmNames\":\"财务部／J&T集团／J&T中国\",\"name\":\"刘庞\"}],\"id\":\"12615\"}\n";
+    }
+
+    private static void readFile(InputStream input)
+
+            throws IOException {
+
+        InputStreamReader isr =
+
+                new InputStreamReader(input);
+
+        BufferedReader reader = new BufferedReader(isr);
+
+        String line;
+
+        while ((line = reader.readLine()) != null) {
+
+            System.out.println(line);
+
+        }
+
+        reader.close();
+
+    }
+
+
+
+
+    public static String getCurDateTime() {
+        Date newdate = new Date();
+        long datetime = newdate.getTime();
+        Timestamp timestamp = new Timestamp(datetime);
+        return (timestamp.toString().replace(".","").replace("-", "").replace(":", "").replace(" ", ""));
+    }
+
+
+    //BASE64解码成File文件
+    public  void base64ToFile(String destPath,String base64, String fileName) {
+        File file = null;
+        //创建文件目录
+        String filePath=destPath;
+        File  dir=new File(filePath);
+        if (!dir.exists() && !dir.isDirectory()) {
+            dir.mkdirs();
+        }
+        BufferedOutputStream bos = null;
+        java.io.FileOutputStream fos = null;
+        try {
+            byte[] bytes = Base64.getDecoder().decode(base64);
+            file=new File(filePath+"/"+fileName);
+            fos = new java.io.FileOutputStream(file);
+            bos = new BufferedOutputStream(fos);
+            bos.write(bytes);
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            if (bos != null) {
+                try {
+                    bos.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+            if (fos != null) {
+                try {
+                    fos.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+    }
+
+
+
+
+}
\ No newline at end of file
diff --git a/src/main/youhong_ai_jitu_src/jntchina/test/test4.java b/src/main/youhong_ai_jitu_src/jntchina/test/test4.java
new file mode 100644
index 0000000..78246ef
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/test/test4.java
@@ -0,0 +1,40 @@
+package jntchina.test;
+
+
+import jntchina.util.HttpClientUtil;
+import jntchina.util.URLConfigEnum;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+
+public class test4 {
+    public static void main(String[] args) throws Exception {
+        String a = "abcd";
+        String b = "abcd";
+        System.out.println(a.getBytes());
+        System.out.println(b.getBytes());
+        System.out.println(a.equals(b));
+        System.out.println(a == b);
+    }
+
+    /**
+     * 台账记账Bills
+     */
+    public static List<Object> accountBills() {
+        List<Object> datas = new ArrayList<Object>();
+        Map<String, Object> data = new HashMap<String, Object>();
+        //发票代码
+        data.put("invoiceCode", "036002000104");
+        //发票号码
+        data.put("invoiceNum", "25696630");
+        data.put("billType", "taxi");
+        data.put("accountUser", "系统管理员");
+        data.put("accountNote", "别问，问就是测试");
+        datas.add(data);
+        return datas;
+    }
+
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/util/Base64Util.java b/src/main/youhong_ai_jitu_src/jntchina/util/Base64Util.java
new file mode 100644
index 0000000..5cb399f
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/util/Base64Util.java
@@ -0,0 +1,88 @@
+package jntchina.util;
+
+import sun.misc.BASE64Decoder;
+import sun.misc.BASE64Encoder;
+
+import java.io.ByteArrayOutputStream;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.util.Base64;
+
+/**
+ * Base64������
+ * 
+ * @author liyang
+ *
+ */
+public class Base64Util {
+    
+    /**
+     * Base64����
+     */
+	public static String encryptBASE64(byte[] key) {
+        return (new BASE64Encoder()).encodeBuffer(key);
+    }
+
+    /**
+     * Base64����
+     * @throws IOException 
+     */
+	public static byte[] decryptBASE64(String key) throws IOException {
+        return (new BASE64Decoder()).decodeBuffer(key);
+    }
+
+    public static Object NetImageToBase64(String netImagePath) {
+        final ByteArrayOutputStream data = new ByteArrayOutputStream();
+        try {
+            // 创建URL
+            URL url = new URL(netImagePath);
+            final byte[] by = new byte[1024];
+            // 创建链接
+            final HttpURLConnection conn = (HttpURLConnection) url.openConnection();
+            conn.setRequestMethod("GET");
+            conn.setConnectTimeout(5000);
+            InputStream is = conn.getInputStream();
+            // 将内容读取内存中
+            int len = -1;
+            while ((len = is.read(by)) != -1) {
+                data.write(by, 0, len);
+            }
+            // 对字节数组Base64编码
+            BASE64Encoder encoder = new BASE64Encoder();
+            // 关闭流
+            is.close();
+            return Base64.getEncoder().encodeToString(data.toByteArray());
+            //return encoder.encode(data.toByteArray()).replaceAll("\n", "").replaceAll("\r", "");
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+    /**
+     * @description:  本地图片转Base64
+     * @author: kw
+     * @date: 2020/5/22
+     * @param: [imgPath]
+     * @return: java.lang.String
+     */
+    public static String imageToBase64(String imgPath) {
+        // 将图片文件转化为字节数组字符串，并对其进行Base64编码处理
+        InputStream in = null;
+        byte[] data = null;
+        // 读取图片字节数组
+        try {
+            in = new FileInputStream(imgPath);
+            data = new byte[in.available()];
+            in.read(data);
+            in.close();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        // 返回Base64编码过的字节数组字符串
+        //return new BASE64Encoder().encode(data).replaceAll("\n", "").replaceAll("\r", "");
+        return Base64.getEncoder().encodeToString(data);
+    }
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/util/CipherConstant.java b/src/main/youhong_ai_jitu_src/jntchina/util/CipherConstant.java
new file mode 100644
index 0000000..d592314
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/util/CipherConstant.java
@@ -0,0 +1,8 @@
+package jntchina.util;
+
+public class CipherConstant {	
+	// �����㷨����AES�ԳƼ���
+	public static final String ALGORITHM_AES = "AES";
+	// �����㷨����RSA�ǶԳƼ���
+	public static final String ALGORITHM_RSA = "RSA";
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/util/CompressUtil.java b/src/main/youhong_ai_jitu_src/jntchina/util/CompressUtil.java
new file mode 100644
index 0000000..b67e1cf
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/util/CompressUtil.java
@@ -0,0 +1,169 @@
+package jntchina.util;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.util.zip.*;
+
+/**
+ * ѹ��������
+ * 
+ * @author liyang
+ *
+ */
+public class CompressUtil {
+
+	private static int buffSize = 1024;
+
+	/**
+	 * deflaterCompress Ĭ��ѹ��
+	 * 
+	 * @param source
+	 *                   ԭ��
+	 * @return
+	 * @throws IOException
+	 * @throws BizException
+	 * @throws Exception
+	 */
+	public static String deflaterCompress(String source) throws Exception {
+		String value = null;
+
+		ByteArrayOutputStream bos = new ByteArrayOutputStream();
+		Deflater compressor = new Deflater();
+
+		try {
+
+			byte[] input = source.getBytes(StandardCharsets.UTF_8);
+			// ����ѹ���Ǽ�
+			compressor.setLevel(Deflater.DEFAULT_COMPRESSION);
+			compressor.setInput(input);
+			compressor.finish();
+			final byte[] buf = new byte[buffSize];
+
+			while (!compressor.finished()) {
+				int count = compressor.deflate(buf);
+				bos.write(buf, 0, count);
+			}
+			value = Base64Util.encryptBASE64(bos.toByteArray());
+
+		} finally {
+			bos.close();
+			compressor.end();
+		}
+
+		return value;
+	}
+
+	/**
+	 * deflaterDecompress Ĭ�Ͻ�ѹ
+	 * 
+	 * @param source
+	 *                   ѹ�����ı�
+	 * @return
+	 * @throws IOException
+	 * @throws @throws
+	 *                         Exception
+	 */
+	public static String deflaterDecompress(String source) throws Exception {
+		String value = null;
+
+		ByteArrayOutputStream bos = new ByteArrayOutputStream();
+		Inflater decompressor = new Inflater();
+
+		try {
+			byte[] input = Base64Util.decryptBASE64(source);
+
+			decompressor.setInput(input);
+			final byte[] buf = new byte[buffSize];
+
+			while (!decompressor.finished()) {
+				int count = decompressor.inflate(buf);
+				bos.write(buf, 0, count);
+			}
+
+			value = new String(bos.toByteArray(), StandardCharsets.UTF_8);
+		} catch (IOException | DataFormatException e) {
+			throw new Exception("��ѹ�쳣 " + e.getMessage());
+		} finally {
+			bos.close();
+			decompressor.end();
+		}
+		return value;
+	}
+
+	/**
+	 * gzipCompress ����gzipѹ��
+	 * 
+	 * @param source
+	 *                   ԭ��
+	 * @return
+	 * @throws IOException
+	 * @throws BizException
+	 * @throws Exception
+	 */
+	public static String gzipCompress(String source) throws Exception {
+		String value = null;
+
+		ByteArrayOutputStream out = null;
+		
+		try {
+			out = new ByteArrayOutputStream();
+			GZIPOutputStream gzip = new GZIPOutputStream(out);
+			byte[] input = source.getBytes(StandardCharsets.UTF_8);
+			gzip.write(input);
+			gzip.close();
+			value = Base64Util.encryptBASE64(out.toByteArray());
+		} catch (IOException e) {
+			throw new Exception("ѹ���쳣 " + e.getMessage());
+		}finally {
+			if(out != null){
+				out.close();
+			}
+		}
+
+		return value;
+	}
+
+	/**
+	 * gzipDecompress gzip��ѹ
+	 * 
+	 * @param source
+	 *                   ѹ�����ı�
+	 * @return
+	 * @throws BizException
+	 * @throws Exception
+	 */
+	public static String gzipDecompress(String source) throws Exception {
+		String value = null;
+
+		ByteArrayOutputStream out = null;
+		ByteArrayInputStream in = null;
+
+		try {
+			byte[] input = Base64Util.decryptBASE64(source);
+			out = new ByteArrayOutputStream();
+			in = new ByteArrayInputStream(input);
+			GZIPInputStream ungzip = new GZIPInputStream(in);
+
+			byte[] buffer = new byte[buffSize];
+			int n;
+			while ((n = ungzip.read(buffer)) >= 0) {
+				out.write(buffer, 0, n);
+			}
+			ungzip.close();
+			value = new String(out.toByteArray(), StandardCharsets.UTF_8);
+		} catch (IOException e) {
+			throw new Exception("ѹ���쳣 " + e.getMessage());
+		} finally {
+			if (in != null) {
+				in.close();
+			}
+			if (out != null) {
+				out.close();
+			}
+
+		}
+		return value;
+	}
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/util/DataBaseUtils.java b/src/main/youhong_ai_jitu_src/jntchina/util/DataBaseUtils.java
new file mode 100644
index 0000000..00464e0
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/util/DataBaseUtils.java
@@ -0,0 +1,288 @@
+package jntchina.util;
+
+import selfdev.util.log.LogTool;
+import weaver.conn.RecordSet;
+import weaver.soa.workflow.request.RequestInfo;
+
+import java.io.ByteArrayOutputStream;
+import java.io.PrintStream;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.Map;
+
+/**
+ * @title: 工具类
+ * @Author ycf
+ * @Date: 2022/1/7 17:13
+ * @Version 1.0
+ */
+public class DataBaseUtils {
+    private final static LogTool log = new LogTool("/log/utils/DataBase/", false);
+
+
+    /**
+     * 通过获取单条数据
+     * @param sql 执行的SQL
+     * @return map
+     */
+    public static Map<String, String> getDataMap(String sql) {
+        RecordSet recordSet = new RecordSet();
+        sql = strNull(sql);
+        log.writeLog("获取单行数据SQL:"+sql);
+        recordSet.execute(sql);
+        recordSet.next();
+        HashMap<String, String> map = new HashMap<>();
+        for (String s : recordSet.getColumnName()) {
+            map.put(s.toUpperCase(), strNull(recordSet.getString(s)));
+        }
+        return map;
+    }
+
+
+    /**
+     * 通过SQL获取数据集
+     * @param sql SQL命令
+     * @return map->list
+     */
+    public static ArrayList<Map<String, String>> getDataList(String sql) {
+        RecordSet recordSet = new RecordSet();
+        sql = strNull(sql);
+        log.writeLog("通过SQL获取数据集:"+sql);
+        ArrayList<Map<String, String>> maps = new ArrayList<>();
+
+        recordSet.execute(sql);
+        while (recordSet.next()) {
+            HashMap<String, String> map = new HashMap<>();
+            for (String s : recordSet.getColumnName()) {
+                map.put(s.toUpperCase(), strNull(recordSet.getString(s)));
+            }
+            maps.add(map);
+        }
+        return maps;
+    }
+
+
+
+    public static ArrayList<String> getList(String sql) {
+        RecordSet recordSet = new RecordSet();
+        sql = strNull(sql);
+        log.writeLog("通过SQL获取list:"+sql);
+        ArrayList<String> list = new ArrayList<>();
+
+        recordSet.execute(sql);
+        while (recordSet.next()) {
+
+            list.add(recordSet.getString(recordSet.getColumnName()[0]));
+        }
+        return list;
+    }
+
+    /**
+     * 获取查询结果中的第一个值
+     * @param sql sql
+     * @return value
+     */
+    public static String getFirstValue(String sql) {
+        RecordSet recordSet = new RecordSet();
+        sql = strNull(sql);
+        log.writeLog("获取查询结果中的第一个值:"+sql);
+
+        recordSet.execute(sql);
+        recordSet.next();
+        return strNull(recordSet.getString(recordSet.getColumnName()[0]));
+    }
+
+
+    /**
+     * 获取流程主表的数据
+     * @param requestInfo
+     * @return
+     */
+    public static Map<String, String> getProcessData(RequestInfo requestInfo) {
+        String tableName = requestInfo.getRequestManager().getBillTableName();
+        String requestid = requestInfo.getRequestid();
+        String sql = "select * from " + tableName + " where requestid = " + requestid;
+        log.writeLog("获取流程主表数据:"+sql);
+
+        return  DataBaseUtils.getDataMap(sql);
+
+    }
+
+    /**
+     * 获取流程主表的数据
+     * @param requestInfo req
+     * @param detailId 明细表索引 明细表1-》1 ，明细表2 -》2
+     * @return data
+     */
+    public static ArrayList<Map<String, String>> getProcessData(RequestInfo requestInfo,int detailId) {
+        String tableName = requestInfo.getRequestManager().getBillTableName();
+        String requestid = requestInfo.getRequestid();
+
+
+        String sql = "select * from " + tableName + "_dt" + detailId + " where mainid = (select id from "+tableName+" where requestid = '"+requestid+"' )";
+        log.writeLog("获取流程明细表["+detailId+"]数据:"+sql);
+
+
+        return  DataBaseUtils.getDataList(sql);
+
+    }
+
+
+
+
+    public static boolean dataIsExists(String sql) {
+        String firstValue = getFirstValue(strNull(sql));
+        log.writeLog("取得结果:" + firstValue);
+        return !"".equals(firstValue);
+
+    }
+
+
+    /**
+     * 通过表单名称获取建模ID
+     * @param tableName 表名称
+     * @return 建模ID
+     */
+    public static String getModelIdByName(String tableName) {
+        String sql = "select id from modeinfo where formid = (select id from workflow_bill where tablename = '"+strNull(tableName)+"')";
+        log.writeLog("通过表单名称获取建模ID:"+sql);
+
+        return getFirstValue(sql);
+    }
+
+    /**
+     * 通过表名获取表单ID
+     * @param tableName 表名
+     * @return 表单ID
+     */
+    public static String getTableIdByName(String tableName) {
+        String sql = "select id from workflow_bill where tablename = '"+strNull(tableName)+"'";
+        log.writeLog("通过表名获取表单ID:"+sql);
+        return getFirstValue(sql);
+    }
+
+    /**
+     *  获取流程中下拉框的字段名
+     * @param value 值0,1~
+     * @param workFlowId requestInfo.getWorkflowid()
+     * @param fieldName 字段名
+     * @return 选择的值
+     */
+    public static String getSelectValueOfAction(String value, String workFlowId, String fieldName) {
+
+        String sql = "select SELECTNAME " +
+                "from WORKFLOW_SELECTITEM " +
+                "where SELECTVALUE = "+strNull(value)+" " +
+                "  and fieldid in (select id " +
+                "                  from workflow_billfield " +
+                "                  where billid in " +
+                "                        (select formid from workflow_base where id = "+strNull(workFlowId)+") " +
+                "                    and FIELDNAME = '"+strNull(fieldName)+"' " +
+                "                    and VIEWTYPE = 0)";
+        log.writeLog("获取流程中选择的字段名:"+sql);
+
+        return getFirstValue(sql);
+    }
+
+
+    /**
+     *  获取建模下拉框的字段名
+     * @param value 值0,1~
+     * @param tableName 建模的表名
+     * @param fieldName 字段名
+     * @return 选择的值
+     */
+    public static String getSelectValueOfModel(String value, String tableName, String fieldName) {
+
+
+        String sql = "select SELECTNAME" +
+                " from WORKFLOW_SELECTITEM" +
+                " where SELECTVALUE = "+strNull(value)+"" +
+                "  and fieldid in (select id" +
+                "                  from workflow_billfield" +
+                "                  where billid =(select id from workflow_bill where tablename = '"+strNull(tableName)+"')" +
+                "                    and FIELDNAME = '"+strNull(fieldName)+"'" +
+                "                    and VIEWTYPE = 0)";
+        log.writeLog("获取流程中选择的值:"+sql);
+
+        return getFirstValue(sql);
+    }
+
+
+
+    /**
+     * 获取异常详细信息，知道出了什么错，错在哪个类的第几行 .
+     *
+     * @param ex
+     * @return
+     */
+    public static String getExceptionDetail(Exception ex) {
+        String ret = null;
+        try {
+            ByteArrayOutputStream out = new ByteArrayOutputStream();
+            PrintStream pout = new PrintStream(out);
+            ex.printStackTrace(pout);
+            ret = new String(out.toByteArray());
+            pout.close();
+            out.close();
+        } catch (Exception e) {
+        }
+        return ret;
+    }
+
+        /**
+         * 获取异常详细信息，知道出了什么错，错在哪个类的第几行 .
+         *
+         * @param ex
+         * @return
+         */
+    public static String getExceptionDetail(Error ex) {
+        String ret = null;
+        try {
+            ByteArrayOutputStream out = new ByteArrayOutputStream();
+            PrintStream pout = new PrintStream(out);
+            ex.printStackTrace(pout);
+            ret = new String(out.toByteArray());
+            pout.close();
+            out.close();
+        } catch (Exception e) {
+        }
+        return ret;
+    }
+
+    /**
+     * 获取异常详细信息，知道出了什么错，错在哪个类的第几行 .
+     *
+     * @param
+     * @return
+     */
+    public static String getThrowableDetail(Throwable ex) {
+        StringWriter sw = new StringWriter();
+        try {
+            PrintWriter pw = new PrintWriter(sw, true);
+            ex.printStackTrace(pw);
+            pw.flush();
+            sw.flush();
+        } catch (Exception e) {
+
+        }
+        return sw.toString();
+    }
+
+
+
+    /**
+     * string判空
+     * @param str value
+     * @return "" or value
+     */
+    public static String strNull(String str) {
+        return (null == str) ? "" : str;
+    }
+
+
+
+}
\ No newline at end of file
diff --git a/src/main/youhong_ai_jitu_src/jntchina/util/Decryption.java b/src/main/youhong_ai_jitu_src/jntchina/util/Decryption.java
new file mode 100644
index 0000000..cb5659b
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/util/Decryption.java
@@ -0,0 +1,104 @@
+package jntchina.util;
+
+import javax.crypto.BadPaddingException;
+import javax.crypto.Cipher;
+import javax.crypto.IllegalBlockSizeException;
+import javax.crypto.NoSuchPaddingException;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.security.InvalidKeyException;
+import java.security.Key;
+import java.security.NoSuchAlgorithmException;
+
+/**
+ * ������
+ * 
+ * @author liyang
+ *
+ */
+public class Decryption {
+
+	// RSA���������Ĵ�С
+	private static final int MAX_DECRYPT_BLOCK = 128;
+
+	/**
+	 * symDecrypt �Գƽ���
+	 * 
+	 * @param strkey �Գ���Կ
+	 * @param src ����
+	 * @return ԭ��
+	 * @throws IOException 
+	 * @throws Exception 
+	 */
+	public static String symDecrypt(String strkey, String src) throws Exception {
+
+		String target = null;
+
+		try {
+			Key key = KeysFactory.getSymKey(strkey);
+			// ����
+			Cipher cipher = Cipher.getInstance(CipherConstant.ALGORITHM_AES);
+			cipher.init(Cipher.DECRYPT_MODE, key);
+			byte[] decodeResult = cipher.doFinal(Base64Util.decryptBASE64(src));
+			target = new String(decodeResult);
+
+		} catch (NoSuchAlgorithmException | NoSuchPaddingException | IllegalBlockSizeException | BadPaddingException | InvalidKeyException e) {
+			e.printStackTrace();
+			throw new Exception("����ʧ��" + e.getMessage());
+		}
+
+		return target;
+	}
+
+	/**
+	 * priDecrypt ˽Կ����
+	 * 
+	 * @param priKey ˽Կ
+	 * @param src ����
+	 * @return ԭ��
+	 * @throws IOException 
+	 * @throws Exception 
+	 */
+	public static String priDecrypt(String priKey, String src) throws Exception {
+
+		String target = null;
+		ByteArrayOutputStream out = null;
+		try {
+			Key key = KeysFactory.getPrivateKey(priKey);
+
+			// ����
+			Cipher cipher = Cipher.getInstance(CipherConstant.ALGORITHM_RSA);
+			cipher.init(Cipher.DECRYPT_MODE, key);
+			// byte[] decodeResult = cipher.doFinal(src.getBytes(CHARSET));
+			// target = new String(decodeResult);
+
+			byte[] data = Base64Util.decryptBASE64(src);
+			int inputLen = data.length;
+			out = new ByteArrayOutputStream();
+			int offSet = 0;
+			byte[] cache;
+			int i = 0;
+			// �����ݷֶν���
+			while (inputLen - offSet > 0) {
+				if (inputLen - offSet > MAX_DECRYPT_BLOCK) {
+					cache = cipher.doFinal(data, offSet, MAX_DECRYPT_BLOCK);
+				} else {
+					cache = cipher.doFinal(data, offSet, inputLen - offSet);
+				}
+				out.write(cache, 0, cache.length);
+				i++;
+				offSet = i * MAX_DECRYPT_BLOCK;
+			}
+			target = new String(out.toByteArray());
+			
+		} catch (NoSuchAlgorithmException | NoSuchPaddingException | InvalidKeyException | IllegalBlockSizeException | BadPaddingException e) {
+			e.printStackTrace();
+			throw new Exception("����ʧ��" + e.getMessage());
+		}finally{
+			if(out != null){
+				out.close();
+			}
+		}
+		return target;
+	}
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/util/Encryption.java b/src/main/youhong_ai_jitu_src/jntchina/util/Encryption.java
new file mode 100644
index 0000000..08b0fa6
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/util/Encryption.java
@@ -0,0 +1,106 @@
+package jntchina.util;
+
+import javax.crypto.BadPaddingException;
+import javax.crypto.Cipher;
+import javax.crypto.IllegalBlockSizeException;
+import javax.crypto.NoSuchPaddingException;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.nio.charset.StandardCharsets;
+import java.security.InvalidKeyException;
+import java.security.Key;
+import java.security.NoSuchAlgorithmException;
+import java.security.Provider;
+
+/**
+ * ������
+ * 
+ * @author liyang
+ *
+ */
+public class Encryption {
+
+	private static Provider DEFAULT_Provider =new com.sun.crypto.provider.SunJCE();
+	// RSA���������Ĵ�С
+	private static final int MAX_ENCRYPT_BLOCK = 117;
+
+	/**
+	 * symEncrypt �ԳƼ���
+	 * 
+	 * @param strkey
+	 *            �Գ���Կ
+	 * @param src
+	 *            ԭ��
+	 * @return ����
+	 * @throws BizException
+	 */
+	public static String symEncrypt(String strkey, String src) throws Exception {
+		String target = null;
+		try {
+			Key key = KeysFactory.getSymKey(strkey);
+			// ����
+			Cipher cipher = Cipher.getInstance(CipherConstant.ALGORITHM_AES);
+			cipher.init(Cipher.ENCRYPT_MODE, key);
+			byte[] encodeResult = cipher.doFinal(src.getBytes(StandardCharsets.UTF_8));
+			target = Base64Util.encryptBASE64(encodeResult);
+		} catch (NoSuchAlgorithmException | NoSuchPaddingException | UnsupportedEncodingException | InvalidKeyException | IllegalBlockSizeException
+				| BadPaddingException e) {
+			e.printStackTrace();
+			throw new Exception("����ʧ��" + e.getMessage());
+		}
+		return target;
+	}
+
+	/**
+	 * pubEncrypt ��Կ����
+	 * 
+	 * @param pubKey
+	 *            ��Կ
+	 * @param src
+	 *            ԭ��
+	 * @return ����
+	 * @throws IOException
+	 * @throws Exception
+	 */
+	public static String pubEncrypt(String pubKey, String src) throws Exception {
+		String target = null;
+		ByteArrayOutputStream out = null;
+		try {
+			Key key = KeysFactory.getPublicKey(pubKey);
+
+			Cipher cipher = Cipher.getInstance(CipherConstant.ALGORITHM_RSA);
+//			Cipher cipher = Cipher.getInstance(CipherConstant.ALGORITHM_RSA,DEFAULT_Provider);
+			cipher.init(Cipher.ENCRYPT_MODE, key);
+			System.out.println(cipher.getProvider().getClass().getName());
+			// encodeResult = cipher.doFinal(src.getBytes());
+			byte[] data = src.getBytes();
+			int inputLen = data.length;
+			out = new ByteArrayOutputStream();
+			int offSet = 0;
+			byte[] cache;
+			int i = 0;
+			// �����ݷֶμ���
+			while (inputLen - offSet > 0) {
+				if (inputLen - offSet > MAX_ENCRYPT_BLOCK) {
+					cache = cipher.doFinal(data, offSet, MAX_ENCRYPT_BLOCK);
+				} else {
+					cache = cipher.doFinal(data, offSet, inputLen - offSet);
+				}
+				out.write(cache, 0, cache.length);
+				i++;
+				offSet = i * MAX_ENCRYPT_BLOCK;
+			}
+
+			target = Base64Util.encryptBASE64(out.toByteArray());
+		} catch (NoSuchAlgorithmException | NoSuchPaddingException | InvalidKeyException | IllegalBlockSizeException | BadPaddingException  e) {
+			e.printStackTrace();
+			throw new Exception("����ʧ��" + e.getMessage());
+		}finally{
+			if(out != null){
+				out.close();
+			}
+		}
+		return target;
+	}
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/util/HttpClientConfig.java b/src/main/youhong_ai_jitu_src/jntchina/util/HttpClientConfig.java
new file mode 100644
index 0000000..3797093
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/util/HttpClientConfig.java
@@ -0,0 +1,59 @@
+package jntchina.util;
+
+/**
+ * HttpClientConfig http请求配置
+ */
+public class HttpClientConfig {
+
+    /**
+     * 连接时间 ms
+     */
+    protected int CONNECT_TIMING_OUT = 30000;
+    /**
+     * 请求响应时间 ms
+     */
+    protected int RESPONSE_TIMING_OUT = 30000;
+
+    /**
+     * 发起请求时间 ms
+     */
+    protected int REQUEST_TIMING_OUT = 30000;
+
+    public HttpClientConfig(int CONNECT_TIMING_OUT, int RESPONSE_TIMING_OUT, int REQUEST_TIMING_OUT) {
+        this.CONNECT_TIMING_OUT = CONNECT_TIMING_OUT;
+        this.RESPONSE_TIMING_OUT = RESPONSE_TIMING_OUT;
+        this.REQUEST_TIMING_OUT = REQUEST_TIMING_OUT;
+    }
+
+    public HttpClientConfig(){
+
+    }
+
+    public static HttpClientConfig defaultConfig(){
+        return new HttpClientConfig();
+    }
+
+    public int getCONNECT_TIMING_OUT() {
+        return CONNECT_TIMING_OUT;
+    }
+
+    public void setCONNECT_TIMING_OUT(int CONNECT_TIMING_OUT) {
+        this.CONNECT_TIMING_OUT = CONNECT_TIMING_OUT;
+    }
+
+    public int getRESPONSE_TIMING_OUT() {
+        return RESPONSE_TIMING_OUT;
+    }
+
+    public void setRESPONSE_TIMING_OUT(int RESPONSE_TIMING_OUT) {
+        this.RESPONSE_TIMING_OUT = RESPONSE_TIMING_OUT;
+    }
+
+    public int getREQUEST_TIMING_OUT() {
+        return REQUEST_TIMING_OUT;
+    }
+
+    public void setREQUEST_TIMING_OUT(int REQUEST_TIMING_OUT) {
+        this.REQUEST_TIMING_OUT = REQUEST_TIMING_OUT;
+    }
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/util/HttpClientToDC.java b/src/main/youhong_ai_jitu_src/jntchina/util/HttpClientToDC.java
new file mode 100644
index 0000000..7c0a2e2
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/util/HttpClientToDC.java
@@ -0,0 +1,145 @@
+package jntchina.util;
+
+import selfdev.util.base.TimeCommonUtil;
+import selfdev.util.log.LogTool;
+import weaver.file.Prop;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.weaver.general.Util;
+import org.apache.http.HttpEntity;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.entity.ContentType;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.util.EntityUtils;
+
+/**
+ * 数据中台HTTP接口
+ * KangMD
+ * 2021-05-06
+ */
+public class HttpClientToDC {
+	
+	//获取配置文件中的参数
+	public static final String mode = Prop.getPropValue("DevToDC_jntchina","mode");
+	// 服务器ip：port
+    public static final String baseUrl = Prop.getPropValue("DevToDC_jntchina", mode+"_baseUrl");
+    // 用户名
+    public static final String userName = Prop.getPropValue("DevToDC_jntchina", mode+"_userName");
+    // 密码
+    public static final String password = Prop.getPropValue("DevToDC_jntchina", mode+"_password");
+    // 系统标识
+    public static final String systemCode = Prop.getPropValue("DevToDC_jntchina", mode+"_systemCode");
+    // 秘钥
+    public static final String secretkey = Prop.getPropValue("DevToDC_jntchina", mode+"_secretkey");
+
+    public static LogTool log = new LogTool("/log/selfdev/util", false);
+
+    /**
+     * 获取token
+     * @return
+     * @throws Exception
+     */
+    public static String getToken() {
+        String token = null;
+        try {
+        	//获取当前系统日期
+            String today=TimeCommonUtil.obtainDate(0).substring(0,10).replace("-", "");
+            //加密串
+            String encryptionKey= MD5Utils.encrypt(userName+":"+password+":"+today+":"+secretkey);
+            CloseableHttpClient client = HttpClients.createDefault();
+            HttpPost post = new HttpPost(baseUrl+"/dcoauthedi/oauth/getToken");
+            JSONObject param=new JSONObject();
+            param.put("userName",userName);//用户名
+            param.put("password",password);//密码
+            param.put("systemCode",systemCode);//系统标识
+            param.put("encryptionKey",encryptionKey);//授权类型
+            log.writeLog("调用AccessToken接口传入参数----->"+param.toString());
+            StringEntity  requestentity=new StringEntity(param.toString(),"utf-8");
+            requestentity.setContentType(ContentType.APPLICATION_JSON.toString());
+            post.setEntity(requestentity);
+
+            String responseContent = null; // 响应内容
+            CloseableHttpResponse response = client.execute(post);
+            if (response.getStatusLine().getStatusCode() == 200) {
+                HttpEntity entity = response.getEntity();
+                responseContent = EntityUtils.toString(entity, "UTF-8");
+            }
+            log.writeLog("调用getToken接口返回结果----->"+responseContent);
+            if(!"".equals(responseContent)){
+                JSONObject object_return=JSON.parseObject(responseContent);
+                //接口返回状态
+                String succ=Util.null2String(object_return.getString("succ"));
+                if("true".equals(succ)){
+                	token= Util.null2String(object_return.getString("data"));
+                }
+            }
+        }catch (Exception e) {
+            e.printStackTrace();
+        }
+        
+        return token;
+    }
+
+    /**
+     * 发送POST请求
+     * @param url
+     * @param token
+     * @param parm
+     * @return
+     */
+    public static String sendPostApi(String url,String token,String param) {
+    	String resulet="";
+        try {
+            CloseableHttpClient client = HttpClients.createDefault();
+            HttpPost post = new HttpPost(url);
+            post.addHeader("token", token);
+            log.writeLog("调用【"+url+"】接口传入参数----->"+param.toString());
+            StringEntity  requestentity=new StringEntity(param.toString(),"utf-8");
+            requestentity.setContentType(ContentType.APPLICATION_JSON.toString());
+            post.setEntity(requestentity);
+            CloseableHttpResponse response = client.execute(post);
+            if (response.getStatusLine().getStatusCode() == 200) {
+                HttpEntity entity = response.getEntity();
+                resulet = EntityUtils.toString(entity, "UTF-8");
+            }
+            log.writeLog("调用【"+url+"】接口返回结果----->"+resulet);
+        }catch (Exception e) {
+            e.printStackTrace();
+            log.writeLog("调用【"+url+"】接口异常，错误信息----->"+resulet);
+        }
+        
+        return resulet;
+    }
+
+    /**
+     * 发送POST请求(无Token)
+     * @param url
+     * @param parm
+     * @return
+     */
+    public static String sendPostApiNoToken(String url,String param) {
+        String resulet="";
+        try {
+            CloseableHttpClient client = HttpClients.createDefault();
+            HttpPost post = new HttpPost(url);
+            log.writeLog("调用【"+url+"】接口传入参数----->"+param.toString());
+            StringEntity  requestentity=new StringEntity(param.toString(),"utf-8");
+            requestentity.setContentType(ContentType.APPLICATION_JSON.toString());
+            post.setEntity(requestentity);
+            CloseableHttpResponse response = client.execute(post);
+            if (response.getStatusLine().getStatusCode() == 200) {
+                HttpEntity entity = response.getEntity();
+                resulet = EntityUtils.toString(entity, "UTF-8");
+            }
+            log.writeLog("调用【"+url+"】接口返回结果----->"+resulet);
+        }catch (Exception e) {
+            e.printStackTrace();
+            log.writeLog("调用【"+url+"】接口异常，错误信息----->"+resulet);
+        }
+
+        return resulet;
+    }
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/util/HttpClientToJT.java b/src/main/youhong_ai_jitu_src/jntchina/util/HttpClientToJT.java
new file mode 100644
index 0000000..6c64edf
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/util/HttpClientToJT.java
@@ -0,0 +1,178 @@
+package jntchina.util;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.weaver.general.Util;
+import org.apache.http.HttpEntity;
+import org.apache.http.NameValuePair;
+import org.apache.http.client.entity.UrlEncodedFormEntity;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.entity.ContentType;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.message.BasicNameValuePair;
+import org.apache.http.util.EntityUtils;
+import selfdev.util.base.TimeCommonUtil;
+import weaver.file.Prop;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 数据中台HTTP接口(极兔)
+ * CYQ
+ * 2021-06-15
+ */
+public class HttpClientToJT {
+
+//    //获取配置文件中的参数
+    public static final String mode = Prop.getPropValue("DevToDC_jntchina","mode");
+    // 服务器ip：port
+	public static final String baseUrl = "https://jtdcapi.jtexpress.com.cn";//Prop.getPropValue("DevToDC_jntchina", mode+"_baseUrl");
+//    // 用户名
+//    public static final String userName = Prop.getPropValue("DevToDC_jntchina", mode+"_userName");
+//    // 密码
+//    public static final String password = Prop.getPropValue("DevToDC_jntchina", mode+"_password");
+//    // 系统标识
+//    public static final String systemCode = Prop.getPropValue("DevToDC_jntchina", mode+"_systemCode");
+//    // 秘钥
+//    public static final String secretkey = Prop.getPropValue("DevToDC_jntchina", mode+"_secretkey");
+
+
+
+    // 服务器ip：port
+//    public static final String baseUrl = "https://uat-jtdcapi.jtexpress.com.cn";
+//    public static final String baseUrl = "https://jtdcapi.jtexpress.com.cn";
+    // 用户名
+    public static final String userName = "oa001";
+    // 密码
+    public static final String password = "123456";
+    // 系统标识
+    public static final String systemCode = "oa";
+    // 秘钥
+    public static final String secretkey = "5362448sd132d241e5ae27e318qws11d";
+
+//    public static LogTool log = new LogTool("/log/selfdev/util", false);
+
+    /**
+     * 获取token
+     * @return
+     * @throws Exception
+     */
+    public static String getToken() {
+        String token = null;
+        try {
+            //获取当前系统日期
+            String today= TimeCommonUtil.obtainDate(0).substring(0,10).replace("-", "");
+            //加密串
+            String encryptionKey= MD5Utils.encrypt(userName+":"+password+":"+today+":"+secretkey);
+//            System.out.println(encryptionKey);
+            CloseableHttpClient client = HttpClients.createDefault();
+            System.out.println("baseUrl:" + baseUrl);
+            HttpPost post = new HttpPost(baseUrl+"/dcoauthedi/oauth/getToken");
+            JSONObject param=new JSONObject();
+            param.put("userName",userName);//用户名
+            param.put("password",password);//密码
+            param.put("systemCode",systemCode);//系统标识
+            param.put("encryptionKey",encryptionKey);//授权类型
+//            log.writeLog("调用AccessToken接口传入参数----->"+param.toString());
+            StringEntity  requestentity=new StringEntity(param.toString(),"utf-8");
+            requestentity.setContentType(ContentType.APPLICATION_JSON.toString());
+            post.setEntity(requestentity);
+            String responseContent = null; // 响应内容
+            CloseableHttpResponse response = client.execute(post);
+            if (response.getStatusLine().getStatusCode() == 200) {
+                HttpEntity entity = response.getEntity();
+                responseContent = EntityUtils.toString(entity, "UTF-8");
+            }
+//            log.writeLog("调用getToken接口返回结果----->"+responseContent);
+            if(!"".equals(responseContent)){
+                JSONObject object_return= JSON.parseObject(responseContent);
+                //接口返回状态
+                String succ= Util.null2String(object_return.getString("succ"));
+                if("true".equals(succ)){
+                    token= Util.null2String(object_return.getString("data"));
+                }
+            }
+        }catch (Exception e) {
+            e.printStackTrace();
+        }
+        System.out.println(token);
+        return token;
+    }
+
+
+
+    /**
+     * 发送POST请求
+     *
+     * @param url
+     * @param token
+     * @param params
+     * @return
+     */
+    public static String sendGet(String url, String token, Map<String, Object> params) {
+        String resulet = "";
+        try {
+            CloseableHttpClient client = HttpClients.createDefault();
+            if (params != null && !params.isEmpty()) {
+
+                List<NameValuePair> pairs = new ArrayList<NameValuePair>(params.size());
+
+                for (String key : params.keySet()) {
+                    pairs.add(new BasicNameValuePair(key, params.get(key).toString()));
+                }
+                url += "?" + EntityUtils.toString(new UrlEncodedFormEntity(pairs));
+            }
+            HttpGet httpGet = new HttpGet(url);
+            httpGet.addHeader("token", token);
+            CloseableHttpResponse response = client.execute(httpGet);
+            if (response.getStatusLine().getStatusCode() == 200) {
+                HttpEntity entity = response.getEntity();
+                resulet = EntityUtils.toString(entity, "UTF-8");
+            }
+//            log.writeLog("调用【"+url+"】接口返回结果----->"+resulet);
+        } catch (Exception e) {
+            e.printStackTrace();
+//            log.writeLog("调用【"+url+"】接口异常，错误信息----->"+resulet);
+        }
+
+        return resulet;
+    }
+
+    /**
+     * 发送POST请求
+     *
+     * @param url
+     * @param token
+     * @param param
+     * @return
+     */
+    public static String sendPost(String url, String token, String param) {
+        String resulet = "";
+        try {
+            CloseableHttpClient client = HttpClients.createDefault();
+            HttpPost post = new HttpPost(url);
+            post.addHeader("token", token);
+//            log.writeLog("调用【"+url+"】接口传入参数----->"+param.toString());
+            StringEntity requestentity = new StringEntity(param.toString(), "utf-8");
+            requestentity.setContentType(ContentType.APPLICATION_JSON.toString());
+            post.setEntity(requestentity);
+            CloseableHttpResponse response = client.execute(post);
+            if (response.getStatusLine().getStatusCode() == 200) {
+                HttpEntity entity = response.getEntity();
+                resulet = EntityUtils.toString(entity, "UTF-8");
+            }
+//            log.writeLog("调用【"+url+"】接口返回结果----->"+resulet);
+        } catch (Exception e) {
+            e.printStackTrace();
+//            log.writeLog("调用【"+url+"】接口异常，错误信息----->"+resulet);
+        }
+
+        return resulet;
+    }
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/util/HttpClientToNCC.java b/src/main/youhong_ai_jitu_src/jntchina/util/HttpClientToNCC.java
new file mode 100644
index 0000000..7d40383
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/util/HttpClientToNCC.java
@@ -0,0 +1,359 @@
+package jntchina.util;
+
+import com.google.gson.Gson;
+import org.apache.commons.lang3.StringUtils;
+import selfdev.util.log.LogTool;
+import weaver.file.Prop;
+
+import java.io.*;
+import java.lang.reflect.Type;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.net.URLEncoder;
+import java.nio.charset.Charset;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @Author Administrator
+ * @Description
+ * @Date 2021/2/19  11:21
+ */
+public class HttpClientToNCC {
+	
+	//获取配置文件中的参数
+	public static final String mode = Prop.getPropValue("DevToNCC_jntchina","mode");
+    // app_secret
+    public static final String client_secret = Prop.getPropValue("DevToNCC_jntchina", mode+"_client_secret");
+    // 公钥
+    public static final String pubKey = Prop.getPropValue("DevToNCC_jntchina", mode+"_pubKey");
+    // app_id
+    public static final String client_id = Prop.getPropValue("DevToNCC_jntchina", mode+"_client_id");
+    // ncc用户名
+    public static final String username = null;
+    // ncc用户名密码
+    public static final String pwd = null;
+    // ncc账套
+    public static final String busi_center = Prop.getPropValue("DevToNCC_jntchina", mode+"_busi_center");
+    // 获取token方式：client_credentials、password
+    public static final String grant_type = Prop.getPropValue("DevToNCC_jntchina", mode+"_grant_type");
+    // 服务器ip：port
+    public static final String baseUrl = Prop.getPropValue("DevToNCC_jntchina", mode+"_baseUrl");
+    // 返回值压缩加密级别
+    public static final String secret_level = "L0";
+    // openapi请求路径
+//    public static String apiUrl = "/nccloud/api/jitu/erm/bxbill/insert";
+    // 访问api获取到的access_token
+    public static String token = null;
+    // 重复调用检查
+    public static String repeat_check = null;
+    // 接口调用业务标识
+    public static String busi_id = null;
+
+    public static LogTool log = new LogTool("/log/selfdev/action", false);
+
+    public static void main(String[] args) {
+    	try {
+			System.out.println(getToken());
+		} catch (Exception e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+    }
+    
+    /**
+     * 获取access_token
+     *
+     * @return
+     * @throws Exception
+     */
+    public static String getToken() throws Exception {
+        String token = null;
+        if ("password".equals(grant_type)) {
+            // 密码模式
+            token = getTokenByPWD();
+            log.writeLog("--------密码模式----获取access_token");
+        } else if ("client_credentials".equals(grant_type)) {
+            // 客户端模式
+            token = getTokenByClient();
+            log.writeLog("--------客户端模式----获取access_token");
+        }
+        return token;
+    }
+
+    /**
+     * 客户端模式获取token
+     *
+     * @return
+     * @throws Exception
+     */
+    public static String getTokenByClient() throws Exception {
+        Map<String, String> paramMap = new HashMap<String, String>();
+        // 密码模式认证
+        paramMap.put("grant_type", "client_credentials");
+        // 第三方应用id
+        paramMap.put("client_id", client_id);
+        // 第三方应用secret 公钥加密
+        paramMap.put("client_secret", URLEncoder.encode(Encryption.pubEncrypt(pubKey, client_secret), "utf-8"));
+        // 账套编码
+        paramMap.put("biz_center", busi_center);
+        // 传递数据源和ncc登录用户
+        // paramMap.put("dsname", "TM_0614");
+        // paramMap.put("usercode", "1");
+
+        // 签名
+        String sign = SHA256Util.getSHA256(client_id + client_secret + pubKey);
+        paramMap.put("signature", sign);
+
+        String url = baseUrl + "/nccloud/opm/accesstoken";
+        String mediaType = "application/x-www-form-urlencoded";
+
+        log.writeLog("--------客户端模式获取token-----");
+
+        return doPost(url, paramMap, mediaType, null, "");
+    }
+
+    /**
+     * 密码模式获取token
+     *
+     * @return
+     * @throws Exception
+     */
+    public static String getTokenByPWD() throws Exception {
+        Map<String, String> paramMap = new HashMap<String, String>();
+        // 密码模式认证
+        paramMap.put("grant_type", "password");
+        // 第三方应用id
+        paramMap.put("client_id", client_id);
+        // 第三方应用secret 公钥加密
+        paramMap.put("client_secret", URLEncoder.encode(Encryption.pubEncrypt(pubKey, client_secret), "utf-8"));
+        // ncc用户名
+        paramMap.put("username", username);
+        // 密码 公钥加密
+        paramMap.put("password", URLEncoder.encode(Encryption.pubEncrypt(pubKey, pwd), "utf-8"));
+        // 账套编码
+        paramMap.put("biz_center", busi_center);
+        // 签名
+        String sign = SHA256Util.getSHA256(client_id + client_secret + username + pwd + pubKey);
+        paramMap.put("signature", sign);
+
+        String url = baseUrl + "/nccloud/opm/accesstoken";
+        String mediaType = "application/x-www-form-urlencoded";
+        return doPost(url, paramMap, mediaType, null, "");
+    }
+
+    /**
+     * @param token       token
+     * @param requestBody 请求参数
+     * @return
+     * @throws Exception
+     */
+    public static String sendApi(String token, String requestBody, String apiUrl) throws Exception {
+        // token转对象，获取api访问所用token和secret
+        ResultMessageUtil returnData = new Gson().fromJson(token, (Type) ResultMessageUtil.class);
+        Map<String, String> data = (Map<String, String>) returnData.getData();
+        String access_token = data.get("access_token");
+        String security_key = data.get("security_key");
+        //String refresh_token = data.get("refresh_token");
+        log.writeLog("【ACCESS_TOKEN】:" + access_token);
+
+        // 请求路径
+        String url = baseUrl + apiUrl;
+        // header 参数
+        Map<String, String> headermap = new HashMap<String, String>();
+        headermap.put("access_token", access_token);
+        headermap.put("client_id", client_id);
+
+        StringBuffer sb = new StringBuffer();
+        sb.append(client_id);
+        if (StringUtils.isNotBlank(requestBody)) {
+            sb.append(requestBody);
+        }
+        sb.append(pubKey);
+        String sign = SHA256Util.getSHA256(sb.toString());
+        headermap.put("signature", sign);
+
+        if (StringUtils.isNotBlank(busi_id)) {
+            headermap.put("busi_id", busi_id);
+        }
+        if (StringUtils.isNotBlank(repeat_check)) {
+            headermap.put("repeat_check", repeat_check);
+        }
+        headermap.put("ucg_flag", "y");
+
+        String mediaType = "application/json;charset=utf-8";
+
+        // 表体数据json
+        // 根据安全级别选择加密或压缩请求表体参数
+        String json = dealRequestBody(requestBody, security_key, secret_level);
+
+        log.writeLog("json------->"+json);
+
+        return doPost(url, null, mediaType, headermap, json);
+    }
+
+    /**
+     * 返回值进行过加密和压缩，对返回值进行解压和解密
+     *
+     * @param source
+     * @param security_key
+     * @param level
+     * @return
+     * @throws Exception
+     */
+    public static String dealResponseBody(String source, String security_key, String level) throws Exception {
+        String result = null;
+
+        if (StringUtils.isEmpty(level) || Test.SecretConst.LEVEL0.equals(level)) {
+            result = source;
+        } else if (Test.SecretConst.LEVEL1.equals(level)) {
+            result = Decryption.symDecrypt(security_key, source);
+        } else if (Test.SecretConst.LEVEL2.equals(level)) {
+            result = CompressUtil.gzipDecompress(source);
+        } else if (Test.SecretConst.LEVEL3.equals(level)) {
+            result = CompressUtil.gzipDecompress(Decryption.symDecrypt(security_key, source));
+        } else if (Test.SecretConst.LEVEL4.equals(level)) {
+            result = Decryption.symDecrypt(security_key, CompressUtil.gzipDecompress(source));
+        } else {
+            throw new Exception("无效的安全等级");
+        }
+        return result;
+    }
+
+    // 根据安全级别设置，表体是否加密或压缩
+    public static String dealRequestBody(String source, String security_key, String level) throws Exception {
+        String result = null;
+        if (StringUtils.isEmpty(level) || Test.SecretConst.LEVEL0.equals(level)) {
+            result = source;
+        } else if (Test.SecretConst.LEVEL1.equals(level)) {
+            result = Encryption.symEncrypt(security_key, source);
+        } else if (Test.SecretConst.LEVEL2.equals(level)) {
+            result = CompressUtil.gzipCompress(source);
+        } else if (Test.SecretConst.LEVEL3.equals(level)) {
+            result = Encryption.symEncrypt(security_key, CompressUtil.gzipCompress(source));
+        } else if (Test.SecretConst.LEVEL4.equals(level)) {
+            result = CompressUtil.gzipCompress(Encryption.symEncrypt(security_key, source));
+        } else {
+            throw new Exception("无效的安全等级");
+        }
+
+        return result;
+    }
+
+    /**
+     * 发送post请求
+     *
+     * @param baseUrl
+     * @param paramMap
+     * @param mediaType
+     * @param headers
+     * @param json
+     * @return
+     */
+    public static String doPost(String baseUrl, Map<String, String> paramMap, String mediaType, Map<String, String> headers, String json) {
+
+        HttpURLConnection urlConnection = null;
+        InputStream in = null;
+        OutputStream out = null;
+        BufferedReader bufferedReader = null;
+        String result = null;
+        try {
+            StringBuffer sb = new StringBuffer();
+            sb.append(baseUrl);
+            if (paramMap != null) {
+                sb.append("?");
+                for (Map.Entry<String, String> entry : paramMap.entrySet()) {
+                    String key = entry.getKey();
+                    String value = entry.getValue();
+                    sb.append(key + "=" + value).append("&");
+                }
+                baseUrl = sb.toString().substring(0, sb.toString().length() - 1);
+            }
+
+            URL urlObj = new URL(baseUrl);
+            urlConnection = (HttpURLConnection) urlObj.openConnection();
+            urlConnection.setConnectTimeout(50000);
+            urlConnection.setRequestMethod("POST");
+            urlConnection.setDoOutput(true);
+            urlConnection.setDoInput(true);
+            urlConnection.setUseCaches(false);
+            urlConnection.addRequestProperty("content-type", mediaType);
+            if (headers != null) {
+                for (String key : headers.keySet()) {
+                    urlConnection.addRequestProperty(key, headers.get(key));
+                }
+            }
+            out = urlConnection.getOutputStream();
+            out.write(json.getBytes("utf-8"));
+            out.flush();
+            int resCode = urlConnection.getResponseCode();
+            if (resCode == HttpURLConnection.HTTP_OK || resCode == HttpURLConnection.HTTP_CREATED || resCode == HttpURLConnection.HTTP_ACCEPTED) {
+                in = urlConnection.getInputStream();
+            } else {
+                in = urlConnection.getErrorStream();
+            }
+            bufferedReader = new BufferedReader(new InputStreamReader(in, "utf-8"));
+            StringBuffer temp = new StringBuffer();
+            String line = bufferedReader.readLine();
+            while (line != null) {
+                temp.append(line).append("\r\n");
+                line = bufferedReader.readLine();
+            }
+            String ecod = urlConnection.getContentEncoding();
+            if (ecod == null) {
+                ecod = Charset.forName("utf-8").name();
+            }
+            result = new String(temp.toString().getBytes("utf-8"), ecod);
+        } catch (Exception e) {
+            System.out.println(e);
+        } finally {
+            if (null != bufferedReader) {
+                try {
+                    bufferedReader.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+            if (null != out) {
+                try {
+                    out.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+            if (null != in) {
+                try {
+                    in.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+            urlConnection.disconnect();
+        }
+
+        return result;
+    }
+
+    class SecretConst {
+        /**
+         * LEVEL0 不压缩、不加密
+         */
+        public static final String LEVEL0 = "L0";
+        /**
+         * LEVEL1 只加密、不压缩
+         */
+        public static final String LEVEL1 = "L1";
+        /**
+         * LEVEL2 只压缩、不加密
+         */
+        public static final String LEVEL2 = "L2";
+        /**
+         * LEVEL3 先压缩、后加密
+         */
+        public static final String LEVEL3 = "L3";
+        /**
+         * LEVEL4 先加密、后压缩
+         */
+        public static final String LEVEL4 = "L4";
+    }
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/util/HttpClientUtil.java b/src/main/youhong_ai_jitu_src/jntchina/util/HttpClientUtil.java
new file mode 100644
index 0000000..a198408
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/util/HttpClientUtil.java
@@ -0,0 +1,497 @@
+package jntchina.util;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.serializer.SerializerFeature;
+import jntchina.action.SignHelper;
+import org.apache.http.HttpEntity;
+import org.apache.http.HttpResponse;
+import org.apache.http.NameValuePair;
+import org.apache.http.client.config.RequestConfig;
+import org.apache.http.client.entity.UrlEncodedFormEntity;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.client.methods.HttpPut;
+import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
+import org.apache.http.conn.ssl.TrustStrategy;
+import org.apache.http.entity.ContentType;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClientBuilder;
+import org.apache.http.message.BasicNameValuePair;
+import org.apache.http.ssl.SSLContextBuilder;
+import org.apache.http.util.EntityUtils;
+//import org.slf4j.Logger;
+//import org.slf4j.LoggerFactory;
+import org.springframework.util.CollectionUtils;
+import org.springframework.util.ObjectUtils;
+import selfdev.util.log.LogTool;
+
+import javax.net.ssl.*;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.security.KeyManagementException;
+import java.security.NoSuchAlgorithmException;
+import java.security.cert.CertificateException;
+import java.security.cert.X509Certificate;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.zip.GZIPInputStream;
+import java.util.zip.GZIPOutputStream;
+
+/**
+ * @description:   http请求的工具类
+ * @author: kw
+ * @date: 2020/5/21
+ * @param:
+ * @return:
+ */
+public class HttpClientUtil {
+    //    private static Logger LOGGER = LoggerFactory.getLogger(HttpClientUtil.class);
+    private static final  LogTool log = new LogTool("/log/selfdev/util", false);
+    private static final String DEFAULT_CHARSET_UTF8 = "UTF-8";
+    private static final String DEFAULT_CONTENT_TYPE_JSON = "application/json";
+
+    /**
+     * @param url    请求路径
+     * @param params 请求参数
+     * @return
+     * @throws Exception
+     */
+    public static String get(String url, Map<String, Object> params, HttpClientConfig... configList) throws Exception {
+        CloseableHttpClient httpClient = null;
+        try {
+            httpClient = createClient(url, getHttpConfig(configList));
+            if (params != null) {
+                StringBuilder sb = new StringBuilder();
+                for (Entry<String, Object> entry : params.entrySet()) {
+                    sb.append("&").append(entry.getKey()).append("=").append(entry.getValue());
+                }
+                if (sb.length() > 0) {
+                    if (url.indexOf("?") > -1) {
+                        url = url + sb.toString();
+                    } else {
+                        sb.delete(0, 1);
+                        url = url + "?" + sb.toString();
+                    }
+                }
+            }
+            HttpGet httpGet = new HttpGet(url);
+            HttpResponse httpResponse = httpClient.execute(httpGet);
+            HttpEntity httpEntity = httpResponse.getEntity();
+            return EntityUtils.toString(httpEntity, "UTF-8");
+        } catch (Exception e) {
+            throw new Exception(e.getMessage(), e);
+        } finally {
+            if (httpClient != null) {
+                try {
+                    httpClient.close();
+                } catch (IOException e) {
+                    throw new Exception(e.getMessage(), e);
+                }
+            }
+        }
+    }
+
+
+    /**
+     * @param url    请求路径
+     * @param params 请求参数
+     * @return
+     */
+    public static String post(String url, Map<String, Object> params, HttpClientConfig... configList) throws Exception {
+        CloseableHttpClient httpClient = null;
+        try {
+            httpClient = createClient(url, getHttpConfig(configList));
+            HttpPost httpPost = new HttpPost(url);
+//            LOGGER.info("请求地址："+url);
+//            LOGGER.info("请求参数："+JSON.toJSONString(params).replace("\\",""));
+            httpPost.addHeader("sign", SignHelper.sign((Map)params));
+            if (params != null && params.size() > 0) {
+                List<NameValuePair> pairs = new ArrayList<>();
+                for (Entry<String, Object> entry : params.entrySet()) {
+                    NameValuePair pair = new BasicNameValuePair(entry.getKey(), String.valueOf(entry.getValue()));
+                    pairs.add(pair);
+                }
+                HttpEntity httpEntity = new UrlEncodedFormEntity(pairs, "UTF-8");
+                httpPost.setEntity(httpEntity);
+            }
+            HttpResponse httpResponse = httpClient.execute(httpPost);
+            if (httpResponse.getStatusLine().getStatusCode() < 400) {
+                HttpEntity httpEntity = httpResponse.getEntity();
+                String result = EntityUtils.toString(httpEntity, "UTF-8");
+//                LOGGER.info("返回结果："+result.replace("\\",""));
+                return result;
+            } else {
+                throw new Exception("http请求错误：" + httpResponse.getStatusLine().getStatusCode() + "," + httpResponse.getEntity().toString());
+            }
+        } catch (Exception e) {
+            throw e;
+        } finally {
+            if (httpClient != null) {
+                try {
+                    httpClient.close();
+                } catch (IOException e) {
+                    throw new Exception(e.getMessage(), e);
+                }
+            }
+        }
+    }
+
+    /**
+     * 参数JSON格式 Post
+     *
+     * @param url 请求路径
+     * @return
+     */
+    public static String jsonPost(String url, Object paramVO, HttpClientConfig... configList) throws Exception {
+        CloseableHttpClient httpClient = null;
+        String result = null;
+        try {
+            httpClient = createClient(url, getHttpConfig(configList));
+            HttpPost httpPost = new HttpPost(url);
+            log.writeLog("httppost:"+httpPost);
+            log.writeLog("请求地址："+url);
+            log.writeLog("请求参数："+JSON.toJSONString(paramVO, SerializerFeature.DisableCircularReferenceDetect).replace("\\",""));
+            if (paramVO instanceof Map) {
+                httpPost.addHeader("sign", SignHelper.sign((Map)paramVO));
+            }
+            StringEntity requestEntity = new StringEntity(JSON.toJSONString(paramVO, SerializerFeature.DisableCircularReferenceDetect), "UTF-8");
+            log.writeLog("requestEntity:"+requestEntity);
+            requestEntity.setContentType("application/json");
+            httpPost.setEntity(requestEntity);
+
+            CloseableHttpResponse httpResponse = httpClient.execute(httpPost);
+            log.writeLog("httpResponse:"+httpResponse);
+            HttpEntity httpEntity = httpResponse.getEntity();
+            log.writeLog("httpEntity:"+httpEntity);
+            result = EntityUtils.toString(httpEntity, "UTF-8");
+            log.writeLog("result"+result);
+            EntityUtils.consume(httpEntity);
+            log.writeLog("result:"+result);
+
+            if (httpResponse.getStatusLine().getStatusCode() < 400) {
+                log.writeLog("返回结果："+result.replace("\\",""));
+//                LOGGER.info("返回结果："+result.replace("\\",""));
+                return result;
+            } else {
+                throw new Exception("http请求错误：" + httpResponse.getStatusLine().getStatusCode() + "," + result);
+            }
+        } catch (Exception e) {
+            throw new Exception(e.getMessage(), e);
+        } finally {
+            if (httpClient != null) {
+                try {
+                    httpClient.close();
+                } catch (IOException e) {
+                    throw new Exception(e.getMessage(), e);
+                }
+            }
+        }
+    }
+
+    /**
+     * @param url    请求路径
+     * @param params 请求参数
+     * @return
+     */
+    public static String put(String url, Map<String, Object> params, HttpClientConfig... configList) throws Exception {
+        CloseableHttpClient httpClient = null;
+        try {
+            httpClient = createClient(url, getHttpConfig(configList));
+            HttpPut httpPut = new HttpPut(url);
+            if (params != null && params.size() > 0) {
+                List<NameValuePair> pairs = new ArrayList<>();
+                for (Entry<String, Object> entry : params.entrySet()) {
+                    NameValuePair pair = new BasicNameValuePair(entry.getKey(), String.valueOf(entry.getValue()));
+                    pairs.add(pair);
+                }
+                HttpEntity httpEntity = new UrlEncodedFormEntity(pairs, "UTF-8");
+                httpPut.setEntity(httpEntity);
+            }
+            HttpResponse httpResponse = httpClient.execute(httpPut);
+            if (httpResponse.getStatusLine().getStatusCode() < 400) {
+                HttpEntity httpEntity = httpResponse.getEntity();
+                return EntityUtils.toString(httpEntity, "UTF-8");
+            } else {
+                throw new Exception("http请求错误：" + httpResponse.getStatusLine().getStatusCode());
+            }
+        } catch (Exception e) {
+            throw new Exception(e.getMessage(), e);
+        } finally {
+            if (httpClient != null) {
+                try {
+                    httpClient.close();
+                } catch (IOException e) {
+                    throw new Exception(e.getMessage(), e);
+                }
+            }
+        }
+    }
+
+
+    /**
+     * 发送带head的请求
+     *
+     * @param url
+     * @param headerParam
+     * @param bodyParam
+     * @param contentType
+     * @param charSet
+     * @return
+     * @throws Exception
+     */
+    public static String post(String url, Map<String, String> headerParam, Map<Object, Object> bodyParam, String contentType, String charSet, HttpClientConfig... configList) throws Exception {
+        String content_type = contentType;
+        if (content_type == null || "".equals(content_type)) content_type = DEFAULT_CONTENT_TYPE_JSON;
+
+        String char_set = charSet;
+        if (char_set == null || "".equals(char_set)) char_set = DEFAULT_CHARSET_UTF8;
+
+        HttpPost httpPost = new HttpPost(url);
+
+        //header参数
+        if (headerParam != null && headerParam.size() > 0) {
+//            LOGGER.info("Post请求Header：" + JSON.toJSONString(headerParam));
+            for (String key : headerParam.keySet()) {
+                httpPost.addHeader(key, headerParam.get(key));
+            }
+        }
+
+        //entity数据
+        if (bodyParam != null) {
+            //x-www-form-urlencoded类型
+            if (ContentType.APPLICATION_FORM_URLENCODED.getMimeType().equals(contentType)) {
+                if (bodyParam instanceof Map) {
+
+                    @SuppressWarnings("unchecked")
+                    Map<Object, Object> params = bodyParam;
+                    if (!CollectionUtils.isEmpty(params)) {
+                        List<NameValuePair> pairs = new ArrayList<>();
+                        for (Entry<Object, Object> entry : params.entrySet()) {
+                            NameValuePair pair = new BasicNameValuePair(String.valueOf(entry.getKey()), String.valueOf(entry.getValue()));
+                            pairs.add(pair);
+                        }
+                        HttpEntity httpEntity = new UrlEncodedFormEntity(pairs, "UTF-8");
+                        httpPost.setEntity(httpEntity);
+//                        LOGGER.info("post请求body：" + httpEntity.toString());
+                    }
+                }
+            } else {//json或其他类型
+//                LOGGER.info("Post请求Body：" + JSON.toJSONString(bodyParam));
+                StringEntity entity = new StringEntity(JSON.toJSONString(bodyParam, SerializerFeature.DisableCircularReferenceDetect), char_set);
+                entity.setContentEncoding(char_set);
+                entity.setContentType(content_type);
+
+                httpPost.setEntity(entity);
+            }
+        }
+
+        String resultStr = "";
+        CloseableHttpResponse response = null;
+        try {
+            response = createClient(url, getHttpConfig(configList)).execute(httpPost);
+            resultStr = EntityUtils.toString(response.getEntity(), char_set);
+        } catch (IOException e) {
+            e.printStackTrace();
+        } finally {
+            try {
+                response.close();
+                httpPost.releaseConnection();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+
+//        LOGGER.info("Post请求返回：" + resultStr);
+        return resultStr;
+    }
+
+    /**
+     * 发送Gzip压缩请求
+     *
+     * @param sendurl
+     * @param bytes
+     * @param headMap
+     * @return
+     * @throws Exception
+     */
+    public static byte[] postGzip(String sendurl, byte[] bytes, Map<String, String> headMap, HttpClientConfig... configList) throws Exception {
+        HttpClientConfig httpClientConfig = getHttpConfig(configList);
+        HttpURLConnection con = null;
+        ByteArrayOutputStream baos = null;
+        GZIPInputStream reader = null;
+        GZIPOutputStream zip = null;
+        try {
+            con = getConnection(sendurl);
+            if (headMap != null) {
+                for (Entry<String, String> en : headMap.entrySet()) {
+                    con.setRequestProperty(en.getKey(), en.getValue());
+                }
+            }
+            con.setConnectTimeout(httpClientConfig.CONNECT_TIMING_OUT);
+            con.setReadTimeout(httpClientConfig.RESPONSE_TIMING_OUT);
+            con.setDoInput(true);
+            con.setDoOutput(true);
+            con.setAllowUserInteraction(true);
+            con.setUseCaches(false);
+            con.setRequestMethod("POST");
+            con.setRequestProperty("Content-type", "application/gzip");
+            zip = new GZIPOutputStream(con.getOutputStream());
+            zip.write(bytes);
+            zip.flush();
+            zip.close();
+            reader = new GZIPInputStream(con.getInputStream());
+            baos = new ByteArrayOutputStream();
+            byte[] buffer = new byte[4096];
+            int len = -1;
+            while ((len = reader.read(buffer)) != -1) {
+                baos.write(buffer, 0, len);
+            }
+            con.disconnect();
+            baos.close();
+            return baos.toByteArray();
+        } catch (Exception e) {
+//            LOGGER.error("GzipPost:{}, 出现异常，error: {}", sendurl, e.getMessage());
+            throw new RuntimeException("请求异常：" + e.getMessage());
+        } finally {
+            if (reader != null) {
+                reader.close();
+            }
+            if (zip != null) {
+                zip.close();
+            }
+            if (baos != null) {
+                baos.close();
+            }
+            if (con != null) {
+                con.disconnect();
+            }
+        }
+    }
+
+    private static CloseableHttpClient createHttpsClient(HttpClientConfig config) throws Exception {
+        X509TrustManager xtm = new X509TrustManager() {
+            @Override
+            public X509Certificate[] getAcceptedIssuers() {
+                return new X509Certificate[]{};
+            }
+
+            @Override
+            public void checkServerTrusted(X509Certificate[] chain, String authType) throws CertificateException {
+
+            }
+
+            @Override
+            public void checkClientTrusted(X509Certificate[] chain, String authType) throws CertificateException {
+            }
+
+        };
+        //SSLContext ctx = SSLContext.getInstance("SSL");
+        SSLContext ctx = new SSLContextBuilder().loadTrustMaterial(null, new TrustStrategy() {
+            //信任所有
+            @Override
+            public boolean isTrusted(X509Certificate[] chain, String authType) throws CertificateException {
+                return true;
+            }
+        }).build();
+        //ctx.init(null, new TrustManager[]{xtm}, null);
+        SSLConnectionSocketFactory sslsf = new SSLConnectionSocketFactory(ctx, new HostnameVerifier() {
+
+            @Override
+            public boolean verify(String hostname, SSLSession session) {
+                return true;
+            }
+        });
+        log.writeLog("GGGGGGGGGG:");
+        RequestConfig requestConfig = RequestConfig.custom()
+                .setConnectTimeout(config.CONNECT_TIMING_OUT)
+                .setConnectionRequestTimeout(config.REQUEST_TIMING_OUT)
+                .setSocketTimeout(config.RESPONSE_TIMING_OUT).build();
+        CloseableHttpClient httpClient = HttpClientBuilder.create().setDefaultRequestConfig(requestConfig).setSSLSocketFactory(sslsf).build();
+        log.writeLog("FFFFFFFFFFFFFFF:");
+        log.writeLog("httpClient:"+httpClient);
+        return httpClient;
+
+    }
+
+    private static CloseableHttpClient createHttpClient(HttpClientConfig config) {
+        RequestConfig requestConfig = RequestConfig.custom()
+                .setConnectTimeout(config.CONNECT_TIMING_OUT)
+                .setConnectionRequestTimeout(config.REQUEST_TIMING_OUT)
+                .setSocketTimeout(config.RESPONSE_TIMING_OUT).build();
+
+        CloseableHttpClient httpClient = HttpClientBuilder.create().setDefaultRequestConfig(requestConfig).build();
+        return httpClient;
+    }
+
+    private static CloseableHttpClient createClient(String url, HttpClientConfig config) throws Exception {
+        log.writeLog("555:");
+        if (url.startsWith("https")) {    //https请求
+            log.writeLog("666666:");
+            return createHttpsClient(config);
+        } else {    //http请求
+            return createHttpClient(config);
+        }
+    }
+
+
+    private static HttpURLConnection getConnection(String reqUrl) throws Exception {
+        if (reqUrl.startsWith("https")) {
+
+            log.writeLog("77777777:"+getHttpsConnection(reqUrl));
+            return getHttpsConnection(reqUrl);
+        } else {
+            return getHttpConnection(reqUrl);
+        }
+    }
+
+    private static HttpURLConnection getHttpsConnection(String reqUrl) throws IOException, KeyManagementException, NoSuchAlgorithmException {
+        SSLContext sc = SSLContext.getInstance("SSL");
+        sc.init(null, new TrustManager[]{new TrustAnyTrustManager()}, new java.security.SecureRandom());
+
+        log.writeLog("888888:"+sc);
+        URL url = new URL(reqUrl);
+        HttpsURLConnection conn = (HttpsURLConnection) url.openConnection();
+        conn.setSSLSocketFactory(sc.getSocketFactory());
+        conn.setHostnameVerifier(new TrustAnyHostnameVerifier());
+        log.writeLog("conn:"+conn);
+        return conn;
+    }
+
+    private static HttpURLConnection getHttpConnection(String reqUrl) throws IOException {
+        URL url = new URL(reqUrl);
+        HttpURLConnection conn = (HttpURLConnection) url.openConnection();
+        return conn;
+    }
+
+    private static class TrustAnyTrustManager implements X509TrustManager {
+
+        public void checkClientTrusted(X509Certificate[] chain, String authType) throws CertificateException {
+        }
+
+        public void checkServerTrusted(X509Certificate[] chain, String authType) throws CertificateException {
+        }
+
+        public X509Certificate[] getAcceptedIssuers() {
+            return new X509Certificate[]{};
+        }
+    }
+
+    private static class TrustAnyHostnameVerifier implements HostnameVerifier {
+        public boolean verify(String hostname, SSLSession session) {
+            return true;
+        }
+    }
+
+    private static HttpClientConfig getHttpConfig(HttpClientConfig[] configList) {
+        if (ObjectUtils.isEmpty(configList)) {
+            return HttpClientConfig.defaultConfig();
+        }
+        return configList[0];
+    }
+}
\ No newline at end of file
diff --git a/src/main/youhong_ai_jitu_src/jntchina/util/HttpClientUtils.java b/src/main/youhong_ai_jitu_src/jntchina/util/HttpClientUtils.java
new file mode 100644
index 0000000..9f5bb18
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/util/HttpClientUtils.java
@@ -0,0 +1,247 @@
+package jntchina.util;
+
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.http.Consts;
+import org.apache.http.HttpEntity;
+import org.apache.http.HttpResponse;
+import org.apache.http.NameValuePair;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.config.RequestConfig;
+import org.apache.http.client.config.RequestConfig.Builder;
+import org.apache.http.client.entity.UrlEncodedFormEntity;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.conn.ConnectTimeoutException;
+import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
+import org.apache.http.conn.ssl.SSLContextBuilder;
+import org.apache.http.entity.ContentType;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
+import org.apache.http.message.BasicNameValuePair;
+
+import javax.net.ssl.SSLContext;
+import java.net.SocketTimeoutException;
+import java.security.GeneralSecurityException;
+import java.security.KeyManagementException;
+import java.security.KeyStoreException;
+import java.security.NoSuchAlgorithmException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
+/**
+ * @author Administrator
+ */
+public class HttpClientUtils {
+
+    private static final HttpClient client;
+
+    static {
+        PoolingHttpClientConnectionManager cm = new PoolingHttpClientConnectionManager();
+        cm.setMaxTotal(128);
+        cm.setDefaultMaxPerRoute(128);
+        client = HttpClients.custom().setConnectionManager(cm).build();
+    }
+
+    /**
+     * 发送一个 Post 请求, 使用指定的字符集编码.
+     *
+     * @param url          url
+     * @param body         RequestBody
+     * @param mimeType     例如 application/xml "application/x-www-form-urlencoded" a=1&b=2&c=3
+     * @param CHARSET      编码
+     * @param CONN_TIMEOUT 建立链接超时时间,毫秒.
+     * @param READ_TIMEOUT 响应超时时间,毫秒.
+     * @return ResponseBody, 使用指定的字符集编码.
+     * @throws ConnectTimeoutException 建立链接超时异常
+     * @throws SocketTimeoutException  响应超时
+     * @throws Exception               抛出异常
+     */
+    public static String postStringBody(String url, String body, String mimeType, String CHARSET, Integer CONN_TIMEOUT, Integer READ_TIMEOUT) throws ConnectTimeoutException, SocketTimeoutException, Exception {
+        HttpClient client = null;
+        HttpPost post = new HttpPost(url);
+        String result;
+        try {
+            if (StringUtils.isNotBlank(body)) {
+                HttpEntity entity = new StringEntity(body, ContentType.create(mimeType, CHARSET));
+                post.setEntity(entity);
+            }
+            // 设置参数
+            Builder customReqConf = getBuilder(CONN_TIMEOUT, READ_TIMEOUT);
+            post.setConfig(customReqConf.build());
+
+            HttpResponse res;
+            if (url.startsWith("https")) {
+                // 执行 Https 请求.
+                client = createSSLInsecureClient();
+            } else {
+                // 执行 Http 请求.
+                client = HttpClientUtils.client;
+            }
+            res = client.execute(post);
+            result = IOUtils.toString(res.getEntity().getContent(), CHARSET);
+        } finally {
+            post.releaseConnection();
+            if (url.startsWith("https") && client instanceof CloseableHttpClient) {
+                ((CloseableHttpClient) client).close();
+            }
+        }
+        return result;
+    }
+
+    /**
+     * 提交form表单
+     *
+     * @param url          url
+     * @param params       表体
+     * @param headers      表头
+     * @param CONN_TIMEOUT 建立链接超时时间,毫秒.
+     * @param READ_TIMEOUT 响应超时时间,毫秒.
+     * @return 返回值
+     * @throws ConnectTimeoutException 连接超时异常
+     * @throws SocketTimeoutException  异常
+     * @throws Exception               异常
+     */
+    public static String postForm(String url, Map<String, String> params, Map<String, String> headers, Integer CONN_TIMEOUT, Integer READ_TIMEOUT) throws ConnectTimeoutException,
+            SocketTimeoutException, Exception {
+
+        HttpClient client = null;
+        HttpPost post = new HttpPost(url);
+        try {
+            if (params != null && !params.isEmpty()) {
+                List<NameValuePair> formParams = new ArrayList<>();
+                Set<Entry<String, String>> entrySet = params.entrySet();
+                for (Entry<String, String> entry : entrySet) {
+                    formParams.add(new BasicNameValuePair(entry.getKey(), entry.getValue()));
+                }
+                UrlEncodedFormEntity entity = new UrlEncodedFormEntity(formParams, String.valueOf(Consts.UTF_8));
+                post.setEntity(entity);
+            }
+
+            if (headers != null && !headers.isEmpty()) {
+                for (Entry<String, String> entry : headers.entrySet()) {
+                    post.addHeader(entry.getKey(), entry.getValue());
+                }
+            }
+
+            Builder customReqConf = getBuilder(CONN_TIMEOUT, READ_TIMEOUT);
+            post.setConfig(customReqConf.build());
+
+            HttpResponse res;
+            if (url.startsWith("https")) {
+                // 执行 Https 请求.
+                client = createSSLInsecureClient();
+            } else {
+                // 执行 Http 请求.
+                client = HttpClientUtils.client;
+            }
+            res = client.execute(post);
+            return IOUtils.toString(res.getEntity().getContent(), "UTF-8");
+        } finally {
+            post.releaseConnection();
+            if (url.startsWith("https") && client instanceof CloseableHttpClient) {
+                ((CloseableHttpClient) client).close();
+            }
+        }
+    }
+
+    /**
+     * 发送一个 GET 请求
+     *
+     * @param url          url
+     * @param CHARSET      字符集
+     * @param CONN_TIMEOUT 建立链接超时时间,毫秒.
+     * @param READ_TIMEOUT 响应超时时间,毫秒.
+     * @return 返回值
+     * @throws ConnectTimeoutException 建立链接超时
+     * @throws SocketTimeoutException  响应超时
+     * @throws Exception               抛出异常
+     */
+    public static String get(String url, String CHARSET, Integer CONN_TIMEOUT, Integer READ_TIMEOUT)
+            throws ConnectTimeoutException, SocketTimeoutException, Exception {
+
+        HttpClient client = null;
+        HttpGet get = new HttpGet(url);
+        String result;
+        try {
+            Builder customReqConf = getBuilder(CONN_TIMEOUT, READ_TIMEOUT); // 设置参数
+            get.setConfig(customReqConf.build());
+            HttpResponse res;
+            if (url.startsWith("https")) {
+                // 执行 Https 请求.
+                client = createSSLInsecureClient();
+            } else {
+                // 执行 Http 请求.
+                client = HttpClientUtils.client;
+            }
+            res = client.execute(get);
+            result = IOUtils.toString(res.getEntity().getContent(), CHARSET);
+        } finally {
+            get.releaseConnection();
+            if (url.startsWith("https") && client instanceof CloseableHttpClient) {
+                ((CloseableHttpClient) client).close();
+            }
+        }
+        return result;
+    }
+
+    /**
+     * 获取Builder
+     *
+     * @param CONN_TIMEOUT 建立链接超时时间,毫秒.
+     * @param READ_TIMEOUT 响应超时时间,毫秒.
+     * @return 返回获取Builder
+     */
+    private static Builder getBuilder(Integer CONN_TIMEOUT, Integer READ_TIMEOUT) {
+        // 设置参数
+        Builder customReqConf = RequestConfig.custom();
+        if (CONN_TIMEOUT != null) {
+            customReqConf.setConnectTimeout(CONN_TIMEOUT);
+        }
+        if (READ_TIMEOUT != null) {
+            customReqConf.setSocketTimeout(READ_TIMEOUT);
+        }
+        return customReqConf;
+    }
+
+    /**
+     * 从 response 里获取 CHARSET
+     *
+     * @param ressponse 返回结果
+     * @return 返回值
+     */
+    @SuppressWarnings("unused")
+    private static String getCHARSETFromResponse(HttpResponse ressponse) {
+        // Content-Type:text/html; CHARSET=GBK
+        if (ressponse.getEntity() != null && ressponse.getEntity().getContentType() != null && ressponse.getEntity().getContentType().getValue() != null) {
+            String contentType = ressponse.getEntity().getContentType().getValue();
+            if (contentType.contains("CHARSET=")) {
+                return contentType.substring(contentType.indexOf("CHARSET=") + 8);
+            }
+        }
+        return null;
+    }
+
+
+    /**
+     * 创建 SSL连接
+     *
+     * @return 返回
+     */
+    private static CloseableHttpClient createSSLInsecureClient() throws GeneralSecurityException {
+        SSLContext sslContext;
+        try {
+            sslContext = new SSLContextBuilder().loadTrustMaterial(null, (chain, authType) -> true).build();
+            SSLConnectionSocketFactory sslCsf = new SSLConnectionSocketFactory(sslContext, (arg0, arg1) -> true);
+            return HttpClients.custom().setSSLSocketFactory(sslCsf).build();
+        } catch (NoSuchAlgorithmException | KeyManagementException | KeyStoreException e) {
+            e.printStackTrace();
+            throw e;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/main/youhong_ai_jitu_src/jntchina/util/JTHrmApiUtil.java b/src/main/youhong_ai_jitu_src/jntchina/util/JTHrmApiUtil.java
new file mode 100644
index 0000000..fa91722
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/util/JTHrmApiUtil.java
@@ -0,0 +1,155 @@
+package jntchina.util;
+
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+
+/**
+ * @date 2021年7月16日 01:56:10
+ * @author QGX
+ */
+public class JTHrmApiUtil {
+
+    /** 公司新增*/
+    public final static String companyAddUrl = "/dcoaapi/hr/companyAdd";
+    /** 部门新增、修改*/
+    public final static String deptAddOrEditUrl = "/dcoaapi/hr/deptAdd";
+    /** 部门失效*/
+    public final static String deptInvalidUrl = "/dcoaapi/hr/deptInvalid";
+    /** 岗位新增*/
+    public final static String postApplicationUrl = "/dcoaapi/hr/postApplication";
+    /** 标准岗位新增*/
+    public final static String stdPostApplyUrl = "/dcoaapi/hr/stdPostApply";
+    /** 转正申请*/
+    public final static String becomeRegularUrl = "/dcoaapi/hr/becomeRegular";
+    /** 调动单申请 */
+    public final static String callApplicationUrl = "/dcoaapi/hr/callApplication";
+    /** 离职申请 */
+    public final static String resignationUrl = "/dcoaapi/hr/resignation";
+    /** 合同续签 */
+    public final static String contractRenewalUrl = "/dcoaapi/hr/contractRenewal";
+    /** 用工模式变更 */
+    public final static String factoryChangeUrl = "/dcoaapi/hr/factoryChange";
+    /** 转换值接口 */
+    public final static String translateValueUrl = "/dcoaapi/hr/translateValue";
+
+    /** 公司查询 */
+    public final static String companyQueryUrl = "/dcoaapi/hr/companyQuery";
+    /** 一次性薪酬发放 */
+    public final static String oneTimeSalaryPayUrl = "/dcoaapi/hr/lumpSumSalary";
+
+    /**
+     * 添加公司
+     *
+     * @return
+     */
+    public static JSONObject addCompany(String token, String paramJsonStr) {
+        String url = HttpClientToJT.baseUrl + companyAddUrl;
+        String resultStr = HttpClientToJT.sendPost(url, token, paramJsonStr);
+        JSONObject jsonObject = JSONObject.parseObject(resultStr);
+//        if (jsonObject.getInteger("code").equals(1)) {
+//            JSONObject result = jsonObject.getJSONObject("data");
+//            String company = result.getString("COMPANY");
+//            return company;
+//        }
+        return jsonObject;
+    }
+
+
+    /**
+     *  部门新增、修改
+     * @return
+     */
+    public static JSONObject deptAddOrEdit(String token, String paramJsonStr) {
+        String url = HttpClientToJT.baseUrl + deptAddOrEditUrl;
+        String resultStr = HttpClientToJT.sendPost(url, token, paramJsonStr);
+        JSONObject jsonObject = JSONObject.parseObject(resultStr);
+        return jsonObject;
+//        JSONObject jsonObject = JSONObject.parseObject(resultStr);
+//        if (jsonObject.getInteger("code").equals(1)) {
+//            JSONObject result = jsonObject.getJSONObject("data");
+//            String deptid = jsonObject.getString("DEPTID");
+//            return resultStr;
+//        }
+//        return resultStr;
+    }
+
+
+    /**
+     *  部门失效
+     * @return
+     */
+    public static JSONObject deptInvalid(String token, String paramJsonStr) {
+        String url = HttpClientToJT.baseUrl + deptInvalidUrl;
+        String resultStr = HttpClientToJT.sendPost(url, token, paramJsonStr);
+        JSONObject jsonObject = JSONObject.parseObject(resultStr);
+//        if (jsonObject.getInteger("code").equals(1)) {
+//            JSONObject result = jsonObject.getJSONObject("data");
+//            return true;
+//        }
+        return jsonObject;
+    }
+
+    /**
+     *  标准岗位新增
+     * @return
+     */
+    public static JSONObject stdPostApply(String token, String paramJsonStr) {
+        String url = HttpClientToJT.baseUrl + stdPostApplyUrl;
+        String resultStr = HttpClientToJT.sendPost(url, token, paramJsonStr);
+        JSONObject jsonObject = JSONObject.parseObject(resultStr);
+//        if (jsonObject.getInteger("code").equals(1)) {
+//            JSONObject result = jsonObject.getJSONObject("data");
+//            return resultStr;
+//        }
+        return jsonObject;
+    }
+
+    /**
+     *  岗位新增
+     * @return
+     */
+    public static JSONObject postApplication(String token, String paramJsonStr) {
+        String url = HttpClientToJT.baseUrl + postApplicationUrl;
+        String resultStr = HttpClientToJT.sendPost(url, token, paramJsonStr);
+        JSONObject jsonObject = JSONObject.parseObject(resultStr);
+        return jsonObject;
+    }
+    /**
+     *  转换值
+     * @return
+     */
+    public static JSONArray translateValue(String token, String paramJsonStr) {
+        String url = HttpClientToJT.baseUrl + translateValueUrl;
+        String resultStr = HttpClientToJT.sendPost(url, token, paramJsonStr);
+        JSONObject jsonObject = JSONObject.parseObject(resultStr);
+        if (jsonObject.getInteger("code").equals(1)) {
+            JSONArray result = jsonObject.getJSONArray("data");
+            return result;
+        }
+        return null;
+    }
+    /**
+     * 合同
+     * @return
+     */
+    public static JSONObject contracRenewt(String token, String paramJsonStr) {
+        String url = HttpClientToJT.baseUrl + contractRenewalUrl;
+        String resultStr = HttpClientToJT.sendPost(url, token, paramJsonStr);
+        JSONObject jsonObject = JSONObject.parseObject(resultStr);
+        return jsonObject;
+    }
+
+    /**
+     * 合同
+     * @return
+     */
+    public static JSONObject companyQuery(String token, String paramJsonStr) {
+        String url = HttpClientToJT.baseUrl + companyQueryUrl;
+        String resultStr = HttpClientToJT.sendPost(url, token, paramJsonStr);
+        JSONObject jsonObject = JSONObject.parseObject(resultStr);
+        return jsonObject;
+    }
+
+
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/util/KeyPairs.java b/src/main/youhong_ai_jitu_src/jntchina/util/KeyPairs.java
new file mode 100644
index 0000000..cb03f2f
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/util/KeyPairs.java
@@ -0,0 +1,27 @@
+package jntchina.util;
+
+import java.security.KeyPair;
+
+/**
+ * KeyPairs ������
+ * 
+ * @author liyang
+ * @date: 2019-5-20����4:34:51
+ *
+ */
+public class KeyPairs {
+
+	private KeyPair keyPair;
+	
+	public KeyPairs(KeyPair keyPair){
+		this.keyPair = keyPair;
+	}
+	
+	public String getPublicKey(){
+		return Base64Util.encryptBASE64(keyPair.getPublic().getEncoded());
+	}
+	
+	public String getPrivateKey(){
+		return Base64Util.encryptBASE64(keyPair.getPrivate().getEncoded());
+	}
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/util/KeysFactory.java b/src/main/youhong_ai_jitu_src/jntchina/util/KeysFactory.java
new file mode 100644
index 0000000..4069fac
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/util/KeysFactory.java
@@ -0,0 +1,101 @@
+package jntchina.util;
+
+import javax.crypto.KeyGenerator;
+import javax.crypto.SecretKey;
+import javax.crypto.spec.SecretKeySpec;
+import java.security.*;
+import java.security.spec.PKCS8EncodedKeySpec;
+import java.security.spec.X509EncodedKeySpec;
+
+/**
+ * Key������
+ * 
+ * @author liyang
+ * 
+ */
+public class KeysFactory {
+	
+	/**
+	 * buildAsymKey ����һ��ǶԳ���Կ
+	 * 
+	 * @return KeyPair key��PublicKey��PrivateKey
+	 * @throws NoSuchAlgorithmException
+	 */
+	public static KeyPairs buildAsymKey() throws Exception {
+
+		/* ��ʼ����Կ������ */
+		KeyPairGenerator keyPairGenerator = KeyPairGenerator.getInstance(CipherConstant.ALGORITHM_RSA);
+		keyPairGenerator.initialize(1024, new SecureRandom());
+
+		/* ������Կ */
+		return new KeyPairs(keyPairGenerator.generateKeyPair());
+	}
+
+	/**
+	 * buildAsymKey ����һ���Գ���Կ
+	 * 
+	 * @return �Գ���Կ
+	 * @throws NoSuchAlgorithmException
+	 * @throws Exception
+	 */
+	public static String buildSymKey() throws Exception{
+		// ����Key
+		KeyGenerator keyGenerator = KeyGenerator.getInstance(CipherConstant.ALGORITHM_AES);
+
+		 keyGenerator.init(256, new SecureRandom());
+		// ʹ���������ֳ�ʼ�����������ض�������������Կ���������ܺ��������Ψһ�̶��ġ�
+		SecretKey secretKey = keyGenerator.generateKey();
+
+		return Base64Util.encryptBASE64(secretKey.getEncoded());
+
+	}
+
+	public static Key getPublicKey(String pubKey) throws Exception {
+		Key key = null;
+
+		try {
+			byte[] keyBytes = Base64Util.decryptBASE64(pubKey);
+			KeyFactory keyFactory = KeyFactory.getInstance(CipherConstant.ALGORITHM_RSA);
+
+			X509EncodedKeySpec x509KeySpec = new X509EncodedKeySpec(keyBytes);
+			key = keyFactory.generatePublic(x509KeySpec);
+
+		} catch (Exception e) {
+			throw new Exception("��Ч����Կ  " + e.getMessage());
+		}
+
+		return key;
+	}
+
+	public static Key getPrivateKey(String priKey) throws Exception {
+		Key key = null;
+
+		try {
+			byte[] keyBytes = Base64Util.decryptBASE64(priKey);
+
+			KeyFactory keyFactory = KeyFactory.getInstance(CipherConstant.ALGORITHM_RSA);
+
+			PKCS8EncodedKeySpec pkcs8KeySpec = new PKCS8EncodedKeySpec(keyBytes);
+			key = keyFactory.generatePrivate(pkcs8KeySpec);
+
+		} catch (Exception e) {
+			throw new Exception("��Ч��Կ " + e.getMessage());
+		}
+
+		return key;
+	}
+
+	public static Key getSymKey(String symKey) throws Exception {
+		Key key = null;
+
+		try {
+			byte[] keyBytes = Base64Util.decryptBASE64(symKey);
+			// Keyת��
+			key = new SecretKeySpec(keyBytes, CipherConstant.ALGORITHM_AES);
+		} catch (Exception e) {
+			throw new Exception("��Ч��Կ " + e.getMessage());
+		}
+
+		return key;
+	}
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/util/MD5Utils.java b/src/main/youhong_ai_jitu_src/jntchina/util/MD5Utils.java
new file mode 100644
index 0000000..ada6efc
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/util/MD5Utils.java
@@ -0,0 +1,33 @@
+package jntchina.util;
+
+import java.nio.charset.StandardCharsets;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+
+public class MD5Utils {
+
+    public static String encrypt(String s) {
+        try {
+            MessageDigest md5 = MessageDigest.getInstance("MD5");
+            md5.update(s.getBytes(StandardCharsets.UTF_8));
+            byte[] digest = md5.digest();
+            StringBuilder build = new StringBuilder();
+
+            for (int i = 0; i < digest.length; ++i) {
+                //以16进制形式输出,高位不足补0
+                build.append(String.format("%02X", digest[i]));
+            }
+
+            return build.toString();
+        } catch (NoSuchAlgorithmException var5) {
+            var5.printStackTrace();
+            throw new RuntimeException(var5);
+        }
+    }
+
+    
+    public static void main(String[] args) {
+		String encryptionKey= encrypt("oa001"+":"+"123456"+":"+"20230119"+":"+"5362448sd132d241e5ae27e318qws11d");
+		System.out.println(encryptionKey);
+	}
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/util/NCCUtils.java b/src/main/youhong_ai_jitu_src/jntchina/util/NCCUtils.java
new file mode 100644
index 0000000..af8d266
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/util/NCCUtils.java
@@ -0,0 +1,351 @@
+package jntchina.util;
+
+import com.google.gson.Gson;
+import org.apache.commons.lang3.StringUtils;
+import selfdev.util.log.LogTool;
+
+import java.io.*;
+import java.lang.reflect.Type;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
+import java.util.HashMap;
+import java.util.Map;
+
+
+public class NCCUtils {
+	private static final LogTool log = new LogTool("/log/action/NCC", false);
+
+	// app_secret
+	private static String client_secret = null;
+	// 公钥
+	private static String pubKey = null;
+	// app_id
+	private static String client_id = null;
+	// ncc用户名
+	private static String username = null;
+	// ncc用户名密码
+	private static String pwd = null;
+	// ncc账套
+	private static String busi_center = null;
+	// 获取token方式：client_credentials、password
+	private static String grant_type = null;
+	// 服务器ip：port
+	private static String baseUrl = null;
+	// 请求参数
+	private static String requestBody = null;
+	// 访问api获取到的access_token
+	public static String token = null;
+	// 重复调用检查
+	public static String repeat_check = null;
+	// 接口调用业务标识
+	public static String busi_id = null;
+
+
+
+	/**
+	 * 获取access_token
+	 *
+	 * @return
+	 * @throws Exception
+	 */
+	public static String getToken()  {
+		String token = null;
+		if ("password".equals(grant_type)) {
+			// 密码模式
+			try {
+				token = getTokenByPWD();
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
+		} else if ("client_credentials".equals(grant_type)) {
+			// 客户端模式
+			try {
+				token = getTokenByClient();
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
+		}
+		return token;
+	}
+
+	/**
+	 * 客户端模式获取token
+	 *
+	 * @return
+	 * @throws Exception
+	 */
+	private static String getTokenByClient() throws Exception {
+		Map<String, String> paramMap = new HashMap<String, String>();
+		// 密码模式认证
+		paramMap.put("grant_type", "client_credentials");
+		// 第三方应用id
+		paramMap.put("client_id", client_id);
+		// 第三方应用secret 公钥加密
+		paramMap.put("client_secret", URLEncoder.encode(Encryption.pubEncrypt(pubKey, client_secret), "utf-8"));
+		// 账套编码
+		paramMap.put("biz_center", busi_center);
+
+		// 签名
+		String sign = SHA256Util.getSHA256(client_id + client_secret + pubKey);
+		paramMap.put("signature", sign);
+
+		String url = baseUrl + "/nccloud/opm/accesstoken";
+		String mediaType = "application/x-www-form-urlencoded";
+		String token = doPost(url, paramMap, mediaType, null, "");
+		return token;
+	}
+
+	/**
+	 * 密码模式获取token
+	 *
+	 * @return
+	 * @throws Exception
+	 */
+	@SuppressWarnings("unused")
+	private static String getTokenByPWD() throws Exception {
+		Map<String, String> paramMap = new HashMap<String, String>();
+		// 密码模式认证
+		paramMap.put("grant_type", "password");
+		// 第三方应用id
+		paramMap.put("client_id", client_id);
+		// 第三方应用secret 公钥加密
+		paramMap.put("client_secret", URLEncoder.encode(Encryption.pubEncrypt(pubKey, client_secret), "utf-8"));
+		// ncc用户名
+		paramMap.put("username", username);
+		// 密码 公钥加密
+		paramMap.put("password", URLEncoder.encode(Encryption.pubEncrypt(pubKey, pwd), "utf-8"));
+		// 账套编码
+		paramMap.put("biz_center", busi_center);
+		// 签名
+		String sign = SHA256Util.getSHA256(client_id + client_secret + username + pwd + pubKey);
+		paramMap.put("signature", sign);
+
+		String url = baseUrl + "/nccloud/opm/accesstoken";
+		String mediaType = "application/x-www-form-urlencoded";
+		String token = doPost(url, paramMap, mediaType, null, "");
+		return token;
+	}
+
+	/**
+	 * 请求openapi
+	 * 请求body参数加密压缩用的key
+	 * @throws Exception
+	 */
+	public static String sendApi(String url,String paramJson) {
+		init();
+		String token = getToken();
+		// token转对象，获取api访问所用token和secret
+		ResultMessageUtil returnData = new Gson().fromJson(token, (Type) ResultMessageUtil.class);
+		Map<String, String> data = (Map<String, String>) returnData.getData();
+		String access_token = data.get("access_token");
+//		System.err.println("【ACCESS_TOKEN】:" + access_token);
+//		log.writeLog("【ACCESS_TOKEN】::"+access_token);
+
+
+//		System.err.println("【PARAM_JSON】:"+paramJson);
+//		log.writeLog("【PARAM_JSON】::"+paramJson);
+
+		// header 参数
+		Map<String,String> headermap = new HashMap<>();
+		headermap.put("access_token", access_token);
+		headermap.put("client_id", client_id);
+
+		StringBuilder sb = new StringBuilder();
+		sb.append(client_id);
+		if (StringUtils.isNotBlank(requestBody)) {
+			sb.append(requestBody);
+		}
+		sb.append(pubKey);
+		String sign = SHA256Util.getSHA256(sb.toString());
+		headermap.put("signature", sign);
+
+		if (StringUtils.isNotBlank(busi_id)) {
+			headermap.put("busi_id", busi_id);
+		}
+		if (StringUtils.isNotBlank(repeat_check)) {
+			headermap.put("repeat_check", repeat_check);
+		}
+		headermap.put("ucg_flag", "y");
+
+		String mediaType = "application/json;charset=utf-8";
+
+
+		// 返回值
+		return doPost(url, null, mediaType, headermap, paramJson);
+	}
+
+	/**
+	 * 返回值进行过加密和压缩，对返回值进行解压和解密
+	 *
+	 * @param source
+	 * @param security_key
+	 * @param level
+	 * @return
+	 * @throws Exception
+	 */
+	private static String dealResponseBody(String source, String security_key, String level) throws Exception {
+		String result = null;
+
+		if (StringUtils.isEmpty(level) || SecretConst.LEVEL0.equals(level)) {
+			result = source;
+		} else if (SecretConst.LEVEL1.equals(level)) {
+			result = Decryption.symDecrypt(security_key, source);
+		} else if (SecretConst.LEVEL2.equals(level)) {
+			result = CompressUtil.gzipDecompress(source);
+		} else if (SecretConst.LEVEL3.equals(level)) {
+			result = CompressUtil.gzipDecompress(Decryption.symDecrypt(security_key, source));
+		} else if (SecretConst.LEVEL4.equals(level)) {
+			result = Decryption.symDecrypt(security_key, CompressUtil.gzipDecompress(source));
+		} else {
+			throw new Exception("无效的安全等级");
+		}
+
+		return result;
+	}
+
+	/**
+	 * 初始化参数
+	 */
+	private static void init() {
+
+		try {
+			client_secret = "431355f00fdd4e2bbaf9";
+			client_id = "jms";
+			pubKey = "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDJsSkNagOJi62zfeXVIEegzdFKTQWkd16BD1b4"
+					+"qwwJf8GKtos06e2a3ncM86pNLfQGhDQsBXTF2oemDjBI9xGN55FM0eh5eWRCAGDEp4L4zRrUoZ65"
+					+"Z9b5kSwQmUsgJmXW1ynIc420cd8PiYPf0/tXSg8aB6mR9oYrvUBWHuIlBQIDAQAB";
+			username = "y09";
+			pwd = "1234qwer";
+			busi_center = "jtsd";
+			baseUrl = "http://180.169.229.37:8080";
+			requestBody = "{\"pk_org\":\"0001V1100000000001L6\",\"pk_supplier\":\"1001V1100000000088M1\",\"begindate\":\"2021-04-22\",\"enddate\":\"2021-04-25\"}";
+			grant_type = "client_credentials";
+			repeat_check = "";
+			busi_id = "";
+
+		} catch (Exception e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+	}
+
+
+
+	/**
+	 * 发送post请求
+	 *
+	 * @param baseUrl url
+	 * @param paramMap map
+	 * @param mediaType type
+	 * @param headers
+	 * @param json
+	 * @return
+	 */
+	private static String doPost(String baseUrl, Map<String, String> paramMap, String mediaType, Map<String, String> headers, String json) {
+
+		HttpURLConnection urlConnection = null;
+		InputStream in = null;
+		OutputStream out = null;
+		BufferedReader bufferedReader = null;
+		String result = null;
+		try {
+			StringBuilder sb = new StringBuilder();
+			sb.append(baseUrl);
+			if (paramMap != null) {
+				sb.append("?");
+				for (Map.Entry<String, String> entry : paramMap.entrySet()) {
+					String key = entry.getKey();
+					String value = entry.getValue();
+					sb.append(key).append("=").append(value).append("&");
+				}
+				baseUrl = sb.substring(0, sb.toString().length() - 1);
+			}
+
+			URL urlObj = new URL(baseUrl);
+			urlConnection = (HttpURLConnection) urlObj.openConnection();
+			urlConnection.setConnectTimeout(50000);
+			urlConnection.setRequestMethod("POST");
+			urlConnection.setDoOutput(true);
+			urlConnection.setDoInput(true);
+			urlConnection.setUseCaches(false);
+			urlConnection.addRequestProperty("content-type", mediaType);
+			if (headers != null) {
+				for (String key : headers.keySet()) {
+					urlConnection.addRequestProperty(key, headers.get(key));
+				}
+			}
+			out = urlConnection.getOutputStream();
+			out.write(json.getBytes(StandardCharsets.UTF_8));
+			out.flush();
+			int resCode = urlConnection.getResponseCode();
+			if (resCode == HttpURLConnection.HTTP_OK || resCode == HttpURLConnection.HTTP_CREATED || resCode == HttpURLConnection.HTTP_ACCEPTED) {
+				in = urlConnection.getInputStream();
+			} else {
+				in = urlConnection.getErrorStream();
+			}
+			bufferedReader = new BufferedReader(new InputStreamReader(in, StandardCharsets.UTF_8));
+			StringBuilder temp = new StringBuilder();
+			String line = bufferedReader.readLine();
+			while (line != null) {
+				temp.append(line).append("\r\n");
+				line = bufferedReader.readLine();
+			}
+			String ecod = urlConnection.getContentEncoding();
+			if (ecod == null) {
+				ecod = StandardCharsets.UTF_8.name();
+			}
+			result = new String(temp.toString().getBytes(StandardCharsets.UTF_8), ecod);
+		} catch (Exception ignored) {
+		} finally {
+			if (null != bufferedReader) {
+				try {
+					bufferedReader.close();
+				} catch (IOException e) {
+					e.printStackTrace();
+				}
+			}
+			if (null != out) {
+				try {
+					out.close();
+				} catch (IOException e) {
+					e.printStackTrace();
+				}
+			}
+			if (null != in) {
+				try {
+					in.close();
+				} catch (IOException e) {
+					e.printStackTrace();
+				}
+			}
+			assert urlConnection != null;
+			urlConnection.disconnect();
+		}
+		return result;
+	}
+
+	static class SecretConst {
+		/**
+		 * LEVEL0 不压缩、不加密
+		 */
+		public static final String LEVEL0 = "L0";
+		/**
+		 * LEVEL1 只加密、不压缩
+		 */
+		public static final String LEVEL1 = "L1";
+		/**
+		 * LEVEL2 只压缩、不加密
+		 */
+		public static final String LEVEL2 = "L2";
+		/**
+		 * LEVEL3 先压缩、后加密
+		 */
+		public static final String LEVEL3 = "L3";
+		/**
+		 * LEVEL4 先加密、后压缩
+		 */
+		public static final String LEVEL4 = "L4";
+	}
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/util/ResultMessageUtil.java b/src/main/youhong_ai_jitu_src/jntchina/util/ResultMessageUtil.java
new file mode 100644
index 0000000..9dcfe65
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/util/ResultMessageUtil.java
@@ -0,0 +1,45 @@
+package jntchina.util;
+
+public class ResultMessageUtil {
+	
+	private boolean success;
+
+	private Object data;
+
+	private String code;
+
+	private String errorMessage;
+	
+	public boolean isSuccess() {
+		return success;
+	}
+
+	public void setSuccess(boolean success) {
+		this.success = success;
+	}
+
+	public Object getData() {
+		return data;
+	}
+	
+	public void setData(Object data) {
+		this.data = data;
+	}
+
+	public String getCode() {
+		return code;
+	}
+
+	public void setCode(String code) {
+		this.code = code;
+	}
+
+	public String getErrorMessage() {
+		return errorMessage;
+	}
+
+	public void setErrorMessage(String errorMessage) {
+		this.errorMessage = errorMessage;
+	}
+	
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/util/SHA256Util.java b/src/main/youhong_ai_jitu_src/jntchina/util/SHA256Util.java
new file mode 100644
index 0000000..ab57ae3
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/util/SHA256Util.java
@@ -0,0 +1,36 @@
+package jntchina.util;
+
+import java.nio.charset.StandardCharsets;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+
+public class SHA256Util {
+
+	public static String getSHA256(String str) {
+		MessageDigest messageDigest;
+		String encodestr = "";
+		try {
+			messageDigest = MessageDigest.getInstance("SHA-256");
+			messageDigest.update(str.getBytes(StandardCharsets.UTF_8));
+			encodestr = byte2Hex(messageDigest.digest());
+		} catch (NoSuchAlgorithmException e) {
+			e.printStackTrace();
+		}
+		return encodestr;
+	}
+
+	private static String byte2Hex(byte[] bytes) {
+		StringBuffer stringBuffer = new StringBuffer();
+		String temp = null;
+		for (int i = 0; i < bytes.length; i++) {
+			temp = Integer.toHexString(bytes[i] & 0xFF);
+			if (temp.length() == 1) {
+				// 1瀵版鍩屾稉?缍呴惃鍕箻鐞涘矁藟0閹垮秳缍�?
+				stringBuffer.append("0");
+			}
+			stringBuffer.append(temp);
+		}
+		return stringBuffer.toString();
+	}
+
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/util/Test.java b/src/main/youhong_ai_jitu_src/jntchina/util/Test.java
new file mode 100644
index 0000000..ea19ee1
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/util/Test.java
@@ -0,0 +1,406 @@
+package jntchina.util;
+
+import com.google.gson.Gson;
+import org.apache.commons.lang3.StringUtils;
+
+import java.io.*;
+import java.lang.reflect.Type;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.net.URLEncoder;
+import java.nio.charset.Charset;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+
+/**
+ * 1.从resources/config.properties中读取测试api相关的数据 2.运行程序，测试查看测试结果
+ *
+ * @author lizhmf
+ * @date 2019年6月20日上午10:53:11
+ */
+public class Test {
+
+    // app_secret
+    private static String client_secret = "7f4960d6de4a42bebfc4";
+    // 公钥
+    private static String pubKey = "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCbAEDvatjhVymfI2gubZ72iYaOtbcmLZljJOEfKtl0v3rkwoify8o1qBjqOYkvAh8a7iER/lWzMZgg5iHpbUqS1Plejx4fvUvslQt59B+1gzruLbW+4jDEY9Cl2f7vj7J1HYp9K7OBY0oM2GvzFJzLWnpDnJVjgNNyuEqlqYY5kQIDAQAB";
+    // app_id
+    private static String client_id = "oa";
+    // ncc用户名
+    private static String username = null;
+    // ncc用户名密码
+    private static String pwd = null;
+    // ncc账套
+    private static String busi_center = "JT";
+    // 获取token方式：client_credentials、password
+    private static String grant_type = "client_credentials";
+    // 服务器ip：port
+    private static String baseUrl = "http://180.169.229.37:8080";
+    // 返回值压缩加密级别
+    private static String secret_level = "L0";
+    // 请求参数
+//    private static String requestBody = "{\"pk_org\": \"JTSDCN0001\",\"total\": \"103.00\",\"deptid\": \"SD3300101\",\"djlxbm\": \"264X-Cxx-DGBXD\",\"djrq\": \"2021-02-05 08:17:10\",\"payflag\": \"1\",\"paytarget\": \"0\",\"receiver\": \"yonyou88\",\"jkbxr\": \"yonyou88\",\"operator\": \"yonyou88\",\"jsfs\": \"3\",\"fkyhzh\": \"\",\"jobid\": \"\",\"zy\": \"报销测试\",\"kjqj\": \"02\",\"kjnd\": \"2021\",\"fjzs\":\"0\",\"zyx1\": \"CSBX20210303\",\"zyx2\": \"\",\"zyx3\": \"\",\"zyx5\": \"CSBX20210303\",\"er_busitem\": [{\"jobid\": \"\",\"deptid\": \"SD3300101\",\"amount\": \"103.00\",\"tax_rate\": \"3.00\",\"tax_amount\": \"3.00\",\"tni_amount\": \"100.00\",\"tablecode\": \"arap_bxbusitem\",\"rowno\": \"10\",\"szxmid\": \"\",\"defitem46\":\"\",\"defitem45\": \"\",\"defitem44\": \"\",\"defitem43\": \"\",\"defitem42\": \"\",\"defitem7\": \"SD3300301\"}]}";
+    private static String requestBody = "{pk_org='JTSDCN0001', total='44', deptid='', djlxbm='264X-Cxx-DSBXD', djrq='2021-03-04', payflag='', paytarget='0', receiver='yonyou88', jkbxr='yonyou88', operator='yonyou88', jsfs='3', fkyhzh='', jobid='', zy='这是一天测试费用报销申请单的摘要', kjqj='', kjnd='', fjzs='0', zyx1='CSBX20210313414', zyx2='1', zyx3='', zyx5='728728', er_busitem=[ReimbursementOrderBody{jobid='', deptid='522', amount='44', tax_rate='0.02', tax_amount='2.2', tni_amount='41.8', tablecode='arap_bxbusitem', rowno='10', szxmid='', defitem46='', defitem45='', defitem44='', defitem43='', defitem42='', defitem7='522'}]}";
+    // openapi请求路径
+    private static String apiUrl = "/nccloud/api/jitu/erm/bxbill/insert";
+
+    // 访问api获取到的access_token
+    public static String token = null;
+    // 重复调用检查
+    public static String repeat_check = null;
+    // 接口调用业务标识
+    public static String busi_id = null;
+
+    /**
+     * 启动入口
+     *
+     * @param args
+     */
+    public static void main(String[] args) {
+        try {
+            // 初始化数据
+//            init();
+
+            // 请求token
+            token = getToken();
+            System.out.println("getTokenData:" + token);
+            if (token != null) {
+                // 测试openapi
+                testApi(token);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     * 获取access_token
+     *
+     * @return
+     * @throws Exception
+     */
+    private static String getToken() throws Exception {
+        String token = null;
+        if ("password".equals(grant_type)) {
+            // 密码模式
+            token = getTokenByPWD();
+        } else if ("client_credentials".equals(grant_type)) {
+            // 客户端模式
+            token = getTokenByClient();
+        }
+        return token;
+    }
+
+    /**
+     * 客户端模式获取token
+     *
+     * @return
+     * @throws Exception
+     */
+    private static String getTokenByClient() throws Exception {
+        Map<String, String> paramMap = new HashMap<String, String>();
+        // 密码模式认证
+        paramMap.put("grant_type", "client_credentials");
+        // 第三方应用id
+        paramMap.put("client_id", client_id);
+        // 第三方应用secret 公钥加密
+        paramMap.put("client_secret", URLEncoder.encode(Encryption.pubEncrypt(pubKey, client_secret), "utf-8"));
+        // 账套编码
+        paramMap.put("biz_center", busi_center);
+        // // TODO 传递数据源和ncc登录用户
+        // paramMap.put("dsname", "TM_0614");
+        // paramMap.put("usercode", "1");
+
+        // 签名
+        String sign = SHA256Util.getSHA256(client_id + client_secret + pubKey);
+        paramMap.put("signature", sign);
+
+        String url = baseUrl + "/nccloud/opm/accesstoken";
+        String mediaType = "application/x-www-form-urlencoded";
+        String token = doPost(url, paramMap, mediaType, null, "");
+        return token;
+    }
+
+    /**
+     * 密码模式获取token
+     *
+     * @return
+     * @throws Exception
+     */
+    @SuppressWarnings("unused")
+    private static String getTokenByPWD() throws Exception {
+        Map<String, String> paramMap = new HashMap<String, String>();
+        // 密码模式认证
+        paramMap.put("grant_type", "password");
+        // 第三方应用id
+        paramMap.put("client_id", client_id);
+        // 第三方应用secret 公钥加密
+        paramMap.put("client_secret", URLEncoder.encode(Encryption.pubEncrypt(pubKey, client_secret), "utf-8"));
+        // ncc用户名
+        paramMap.put("username", username);
+        // 密码 公钥加密
+        paramMap.put("password", URLEncoder.encode(Encryption.pubEncrypt(pubKey, pwd), "utf-8"));
+        // 账套编码
+        paramMap.put("biz_center", busi_center);
+        // 签名
+        String sign = SHA256Util.getSHA256(client_id + client_secret + username + pwd + pubKey);
+        paramMap.put("signature", sign);
+
+        String url = baseUrl + "/nccloud/opm/accesstoken";
+        String mediaType = "application/x-www-form-urlencoded";
+        String token = doPost(url, paramMap, mediaType, null, "");
+        return token;
+    }
+
+    /**
+     * 请求openapi
+     *
+     * @param token 请求body参数加密压缩用的key
+     * @throws Exception
+     */
+    private static void testApi(String token) throws Exception {
+        // token转对象，获取api访问所用token和secret
+        ResultMessageUtil returnData = new Gson().fromJson(token, (Type) ResultMessageUtil.class);
+        Map<String, String> data = (Map<String, String>) returnData.getData();
+        String access_token = data.get("access_token");
+        String security_key = data.get("security_key");
+        String refresh_token = data.get("refresh_token");
+        System.out.println("【ACCESS_TOKEN】:" + access_token);
+
+        // 请求路径
+        String url = baseUrl + apiUrl;
+        // header 参数
+        Map<String, String> headermap = new HashMap<>();
+        headermap.put("access_token", access_token);
+        headermap.put("client_id", client_id);
+
+        StringBuffer sb = new StringBuffer();
+        sb.append(client_id);
+        if (StringUtils.isNotBlank(requestBody)) {
+            // sb.append(requestBody.replaceAll("\\s*|\t|\r|\n", "").trim());
+            sb.append(requestBody);
+        }
+        sb.append(pubKey);
+        String sign = SHA256Util.getSHA256(sb.toString());
+        headermap.put("signature", sign);
+
+        if (StringUtils.isNotBlank(busi_id)) {
+            headermap.put("busi_id", busi_id);
+        }
+        if (StringUtils.isNotBlank(repeat_check)) {
+            headermap.put("repeat_check", repeat_check);
+        }
+        headermap.put("ucg_flag", "y");
+
+        String mediaType = "application/json;charset=utf-8";
+
+        // 表体数据json
+        // 根据安全级别选择加密或压缩请求表体参数
+        String json = dealRequestBody(requestBody, security_key, secret_level);
+
+        String result = doPost(url, null, mediaType, headermap, json);
+
+        String result2DecryptAndDecompress = dealResponseBody(result, security_key, secret_level);
+        System.out.println("【RESULT】:" + result);
+        // System.out.println("result解密:" + result2);
+    }
+
+    /**
+     * 返回值进行过加密和压缩，对返回值进行解压和解密
+     *
+     * @param source
+     * @param security_key
+     * @param level
+     * @return
+     * @throws Exception
+     */
+    private static String dealResponseBody(String source, String security_key, String level) throws Exception {
+        String result = null;
+
+        if (StringUtils.isEmpty(level) || SecretConst.LEVEL0.equals(level)) {
+            result = source;
+        } else if (SecretConst.LEVEL1.equals(level)) {
+            result = Decryption.symDecrypt(security_key, source);
+        } else if (SecretConst.LEVEL2.equals(level)) {
+            result = CompressUtil.gzipDecompress(source);
+        } else if (SecretConst.LEVEL3.equals(level)) {
+            result = CompressUtil.gzipDecompress(Decryption.symDecrypt(security_key, source));
+        } else if (SecretConst.LEVEL4.equals(level)) {
+            result = Decryption.symDecrypt(security_key, CompressUtil.gzipDecompress(source));
+        } else {
+            throw new Exception("无效的安全等级");
+        }
+
+        return result;
+    }
+
+    /**
+     * 初始化参数
+     */
+    private static void init() {
+        // TODO Auto-generated method stub
+        Properties properties = new Properties();
+
+        String filepath = "config_info.properties";
+        ClassLoader classloader = Thread.currentThread().getContextClassLoader();
+        InputStream inputStream = classloader.getResourceAsStream(filepath);
+        try {
+            InputStreamReader reader = new InputStreamReader(inputStream, "UTF-8");
+            properties.load(reader);
+
+            client_secret = new String(properties.getProperty("client_secret").getBytes("utf-8"), "utf-8");
+            client_id = properties.getProperty("client_id");
+            pubKey = properties.getProperty("pubKey");
+            username = properties.getProperty("username");
+            pwd = properties.getProperty("pwd");
+            busi_center = properties.getProperty("busi_center");
+            baseUrl = properties.getProperty("baseUrl");
+            requestBody = new String(properties.getProperty("requestBody").getBytes("utf-8"), "utf-8");
+            apiUrl = properties.getProperty("apiUrl");
+            grant_type = properties.getProperty("grant_type");
+            secret_level = properties.getProperty("secret_level");
+            repeat_check = properties.getProperty("repeat_check");
+            busi_id = properties.getProperty("busi_id");
+        } catch (IOException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+    }
+
+    // 根据安全级别设置，表体是否加密或压缩
+    private static String dealRequestBody(String source, String security_key, String level) throws Exception {
+        String result = null;
+        if (StringUtils.isEmpty(level) || SecretConst.LEVEL0.equals(level)) {
+            result = source;
+        } else if (SecretConst.LEVEL1.equals(level)) {
+            result = Encryption.symEncrypt(security_key, source);
+        } else if (SecretConst.LEVEL2.equals(level)) {
+            result = CompressUtil.gzipCompress(source);
+        } else if (SecretConst.LEVEL3.equals(level)) {
+            result = Encryption.symEncrypt(security_key, CompressUtil.gzipCompress(source));
+        } else if (SecretConst.LEVEL4.equals(level)) {
+            result = CompressUtil.gzipCompress(Encryption.symEncrypt(security_key, source));
+        } else {
+            throw new Exception("无效的安全等级");
+        }
+
+        return result;
+    }
+
+    /**
+     * 发送post请求
+     *
+     * @param baseUrl
+     * @param paramMap
+     * @param mediaType
+     * @param headers
+     * @param json
+     * @return
+     */
+    private static String doPost(String baseUrl, Map<String, String> paramMap, String mediaType, Map<String, String> headers, String json) {
+
+        HttpURLConnection urlConnection = null;
+        InputStream in = null;
+        OutputStream out = null;
+        BufferedReader bufferedReader = null;
+        String result = null;
+        try {
+            StringBuffer sb = new StringBuffer();
+            sb.append(baseUrl);
+            if (paramMap != null) {
+                sb.append("?");
+                for (Map.Entry<String, String> entry : paramMap.entrySet()) {
+                    String key = entry.getKey();
+                    String value = entry.getValue();
+                    sb.append(key + "=" + value).append("&");
+                }
+                baseUrl = sb.toString().substring(0, sb.toString().length() - 1);
+            }
+
+            URL urlObj = new URL(baseUrl);
+            urlConnection = (HttpURLConnection) urlObj.openConnection();
+            urlConnection.setConnectTimeout(50000);
+            urlConnection.setRequestMethod("POST");
+            urlConnection.setDoOutput(true);
+            urlConnection.setDoInput(true);
+            urlConnection.setUseCaches(false);
+            urlConnection.addRequestProperty("content-type", mediaType);
+            if (headers != null) {
+                for (String key : headers.keySet()) {
+                    urlConnection.addRequestProperty(key, headers.get(key));
+                }
+            }
+            out = urlConnection.getOutputStream();
+            out.write(json.getBytes("utf-8"));
+            out.flush();
+            int resCode = urlConnection.getResponseCode();
+            if (resCode == HttpURLConnection.HTTP_OK || resCode == HttpURLConnection.HTTP_CREATED || resCode == HttpURLConnection.HTTP_ACCEPTED) {
+                in = urlConnection.getInputStream();
+            } else {
+                in = urlConnection.getErrorStream();
+            }
+            bufferedReader = new BufferedReader(new InputStreamReader(in, "utf-8"));
+            StringBuffer temp = new StringBuffer();
+            String line = bufferedReader.readLine();
+            while (line != null) {
+                temp.append(line).append("\r\n");
+                line = bufferedReader.readLine();
+            }
+            String ecod = urlConnection.getContentEncoding();
+            if (ecod == null) {
+                ecod = Charset.forName("utf-8").name();
+            }
+            result = new String(temp.toString().getBytes("utf-8"), ecod);
+        } catch (Exception e) {
+            System.out.println(e);
+        } finally {
+            if (null != bufferedReader) {
+                try {
+                    bufferedReader.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+            if (null != out) {
+                try {
+                    out.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+            if (null != in) {
+                try {
+                    in.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+            urlConnection.disconnect();
+        }
+        return result;
+    }
+
+    class SecretConst {
+        /**
+         * LEVEL0 不压缩、不加密
+         */
+        public static final String LEVEL0 = "L0";
+        /**
+         * LEVEL1 只加密、不压缩
+         */
+        public static final String LEVEL1 = "L1";
+        /**
+         * LEVEL2 只压缩、不加密
+         */
+        public static final String LEVEL2 = "L2";
+        /**
+         * LEVEL3 先压缩、后加密
+         */
+        public static final String LEVEL3 = "L3";
+        /**
+         * LEVEL4 先加密、后压缩
+         */
+        public static final String LEVEL4 = "L4";
+    }
+}
diff --git a/src/main/youhong_ai_jitu_src/jntchina/util/URLConfigEnum.java b/src/main/youhong_ai_jitu_src/jntchina/util/URLConfigEnum.java
new file mode 100644
index 0000000..1aca2ae
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/jntchina/util/URLConfigEnum.java
@@ -0,0 +1,104 @@
+package jntchina.util;
+
+import weaver.file.Prop;
+
+/**
+ * @description:  url的配置类
+ * @author: kw
+ * @date: 2020/5/21
+ * @param:
+ * @return:
+ */
+public enum URLConfigEnum {
+
+    //如果需要测试其他接口 直接在这里添加枚举即可
+
+    //发票打印
+    TAX_PRINT("/output-tax/api/invoice-his/print?appid="),
+    //开票申请删除
+    INVOICE_APPLY_DEL_URL("/invoiceclient-web/api/invoiceApply/del?appid="),
+    //开票蓝票请求服务
+    INSERT_WITH_ARRAY_URL("/invoiceclient-web/api/invoiceApply/insertWithArray?appid="),
+    //OCR识别接口
+    RECOGNISE("/input-tax/api/ocr/v2/recognise?appid="),
+    //开票状态查询服务
+    QUERY_INBOICE_STATUS("/invoiceclient-web/api/invoiceApply/queryInvoiceStatus?appid="),
+    //开票申请审核通过
+    ISSUE("/invoiceclient-web/api/invoiceApply/issue?appid="),
+    //发票红冲请求服务
+    RED("/invoiceclient-web/api/invoiceApply/red?appid="),
+    //电子发票部分红冲
+    PART_RED("/invoiceclient-web/api/invoiceApply/part-red?appid="),
+    //开票蓝票请求服务--发票拆分
+   INSERT_WITH_SPLIT ("/invoiceclient-web/api/invoiceApply/insertWithSplit?appid="),
+    //识别结果保存台帐
+    OCR_SAVE("/input-tax/api/bill-collections/ocr-save?appid="),
+    //台账报销
+    REIMBURSED("/input-tax/api/bill-collections/reimbursed?appid="),
+    //台账取消报销
+    CANCEL_REIMBURSED("/input-tax/api/bill-collections/cancel-reimbursed?appid="),
+    //台账记账
+    ACCOUNT("/input-tax/api/bill-collections/account?appid="),
+    //台账记账
+    CANCEL_ACCOUNT("/input-tax/api/bill-collections/cancel-account?appid="),
+    //报销台账删除
+    DELETE("/input-tax/api/bill-collections/delete?appid="),
+    //飞机票台账查询
+    AIR("/input-tax/api/bill-collections/air?pagenum=1&pagesize=15&appid="),
+    //火车票台账查询
+    TRAIN("/input-tax/api/bill-collections/train?pagenum=1&pagesize=15&appid="),
+    //出租车台账查询
+    TAXI("/input-tax/api/bill-collections/taxi?pagenum=1&pagesize=15&appid="),
+    //个人票夹提交发票到报销台账_全票种
+    COMMIT("/piaoeda-web/api/bill/v2/commit?appid="),
+    //发票上传
+    UPLOADPDF("/invoiceclient-web/api/reimburseCollection/uploadpdf?appid="),
+    //发票取消上传
+    COLLECTION_DELETE("/invoiceclient-web/api/reimburseCollection/delete?appid="),
+    //发票已报销
+    COLLECTION_REIMBURSED ("/invoiceclient-web/api/reimburseCollection/reimbursed?appid="),
+    //发票取消报销
+    COLLECTION_UNREIMBURSED("/invoiceclient-web/api/reimburseCollection/unreimbursed?appid="),
+    //报销台账查询接口（新）
+    QUERY("/invoiceclient-web/api/reimburseCollection/query?appid="),
+    //入账
+    ACCOUNT_STATUS("/invoiceclient-web/api/reimburseCollection/accountStatus?appid="),
+    //取消入账
+    COLLECTION_CANCEL_ACCOUNT("/invoiceclient-web/api/reimburseCollection/cancelAccount?appid="),
+    //发票上传V2
+    V2_UPLOADPDF("/input-tax/api/reimburseCollection/v2/uploadpdf?appid=");
+    //pro22.pfx为测试环境通讯证书，正式环境需要替换成正式的
+    //KEY_PATH("/usr/weaver/ecology/classbean/jntchina/certificate/pro22.pfx"),
+    //证书密码
+    //PASSWORD("password");
+
+    //获取配置文件中的参数
+    String mode = Prop.getPropValue("DevToTaxCould_jntchina","mode");
+    // 服务器ip：port
+    String baseUrl1 = Prop.getPropValue("DevToTaxCould_jntchina", mode+"_baseURL");
+    String appid1 = Prop.getPropValue("DevToTaxCould_jntchina",mode+"_appid");
+    //证书路径
+    String certpath = Prop.getPropValue("DevToTaxCould_jntchina",mode+"_certpath");
+    //pro22.pfx为测试环境通讯证书，正式环境需要替换成正式的
+    
+    //测试环境有测试appid和证书，正式环境有正式appid和证书，请务必对应使用
+    //测试环境appid就用这个，正式环境需要替换成正式的
+    //  private static String APPID = "";
+    private static String APPID = REIMBURSED.appid1;
+
+    //这个是测试环境的域名，正式环境为https://fapiao.yonyoucloud.com
+    //测试https://yesfp.yonyoucloud.com
+    //   private static String DOMAIN = "https://fapiao.yonyoucloud.com";
+    private static String DOMAIN = REIMBURSED.baseUrl1;
+
+    private String value;
+    URLConfigEnum(String value) {
+        this.value = value;
+    }
+
+    public String getValue() {return value;}
+    public String getUrl() {
+
+        return DOMAIN + value + APPID;
+    }
+}
diff --git a/src/main/youhong_ai_jitu_src/selfdev/util/base/BaseUtil.java b/src/main/youhong_ai_jitu_src/selfdev/util/base/BaseUtil.java
new file mode 100644
index 0000000..38c6a9b
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/selfdev/util/base/BaseUtil.java
@@ -0,0 +1,249 @@
+package selfdev.util.base;
+
+
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.util.HashMap;
+import java.util.Map;
+
+import sun.misc.BASE64Decoder;
+import sun.misc.BASE64Encoder;
+import weaver.conn.RecordSet;
+import weaver.conn.RecordSetDataSource;
+import weaver.general.Util;
+
+public class BaseUtil {
+
+	/**
+	 * 根据字段获取相关信息
+	 * @param fieldName 需要获取的字段
+	 * @param tableName 从哪个表中读取
+	 * @param whereField 根据哪个字段来查询，即where后的字段
+	 * @param whereValue 根据的字段什么值来查询
+	 * @param whereOther 其他查询条件
+	 * @return
+	 */
+	public static String getBaseInfoByParm(String fieldName,String tableName,String whereField,String whereValue,String whereOther){
+		String res = "";
+		RecordSet rs = new RecordSet();
+		try{
+			if(rs.execute("select * from "+tableName+"  where  "+whereField+"='" + whereValue + "' "+whereOther)){
+				if(rs.next()){
+					res = Util.null2String( rs.getString(fieldName) );
+				}
+			}
+		} catch(Exception e){
+			e.printStackTrace();
+		}
+		return res;
+	}
+
+	/**
+	 * 根据字段获取Map
+	 * @param tableName 从哪个表中读取
+	 * @param whereStr where条件
+	 * @param keyFiled Map中的key字段名
+	 * @param valueFiled Map中的value字段名
+	 * @return
+	 */
+	public static Map<String,String> getMapKeyValueInfoByParm(String tableName,String whereStr,String keyFiled,String valueFiled){
+		Map<String,String> map=new HashMap<String, String>();
+		RecordSet rs = new RecordSet();
+		try{
+			String sql="select * from "+tableName;
+			if(!"".equals(whereStr)){
+				sql=sql+" "+whereStr;
+			}
+			rs.execute(sql);
+			while(rs.next()){
+				map.put(Util.null2String(rs.getString(keyFiled)), Util.null2String(rs.getString(valueFiled)));
+			}
+		} catch(Exception e){
+			e.printStackTrace();
+		}
+		return map;
+	}
+
+	/**
+	 * 根据字段获取相关信息
+	 * @param datasourceName 数据源名称
+	 * @param fieldName 需要获取的字段
+	 * @param tableName 从哪个表中读取
+	 * @param whereField 根据哪个字段来查询，即where后的字段
+	 * @param whereValue 根据的字段什么值来查询
+	 * @param whereOther 其他查询条件
+	 * @return
+	 */
+	public static String getBaseInfoByParm_DataSource(String datasourceName,String fieldName,String tableName,String whereField,String whereValue,String whereOther){
+		String res = "";
+		RecordSetDataSource rsds = new RecordSetDataSource(datasourceName);
+		try{
+			if(rsds.execute("select * from "+tableName+"  where  "+whereField+"='" + whereValue + "' "+whereOther)){
+				if(rsds.next()){
+					res = Util.null2String( rsds.getString(fieldName) );
+				}
+			}
+		} catch(Exception e){
+			e.printStackTrace();
+		}
+		return res;
+	}
+
+	/**
+	 * 根据字段获取Map
+	 * @param datasourceName 数据源名称
+	 * @param tableName 从哪个表中读取
+	 * @param whereStr where条件
+	 * @param keyFiled Map中的key字段名
+	 * @param valueFiled Map中的value字段名
+	 * @return
+	 */
+	public static Map<String,String> getMapKeyValueInfoByParm_DataSource(String datasourceName,String tableName,String whereStr,String keyFiled,String valueFiled){
+		Map<String,String> map=new HashMap<String, String>();
+		RecordSetDataSource rsds = new RecordSetDataSource(datasourceName);
+		try{
+			String sql="select * from "+tableName;
+			if(!"".equals(whereStr)){
+				sql=sql+" "+whereStr;
+			}
+			rsds.execute(sql);
+			while(rsds.next()){
+				map.put(Util.null2String(rsds.getString(keyFiled)), Util.null2String(rsds.getString(valueFiled)));
+			}
+		} catch(Exception e){
+			e.printStackTrace();
+		}
+		return map;
+	}
+
+	/**
+	 * XML字符串转译（5个）
+	 * <	&lt;
+	 * >	&gt;
+	 * &	&amp;
+	 * "	&quot;
+	 * '	&apos;
+	 * @return
+	 */
+	public static String XMLConvert(String xml){
+		String str="";
+		str=xml.replaceAll("<", "&lt;").replaceAll(">", "&gt;").replaceAll("&", "&amp;").replaceAll("\"", "&quot;").replaceAll("'", "&apos;");
+		return str;
+	}
+	/**
+	 * 判断字符串是否为数字
+	 * @param str
+	 * @return
+	 */
+	public static boolean isNumeric(String str){
+		for (int i = str.length();--i>=0;){
+			if (!Character.isDigit(str.charAt(i))){
+				return false;
+			}
+		}
+		return true;
+	}
+
+	/**
+	 * base64解码
+	 * @param str
+	 * @return
+	 */
+	public static String base64Decoder(String str){
+		BASE64Decoder decode=new BASE64Decoder();
+		String result="";
+		byte[] b;
+		try {
+			b = decode.decodeBuffer(str);
+			result=new String(b,"UTF-8");//UTF-8编码格式
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+		return result;
+	}
+	/**
+	 * base64编码
+	 * @param str
+	 * @return
+	 */
+	public static String base64Eecoder(String str){
+		BASE64Encoder encode=new BASE64Encoder();
+		String result="";
+		try {
+			result = encode.encode(str.getBytes("UTF-8"));
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+		return result;
+	}
+	/**
+	 * MD5加密
+	 * @param s
+	 * @return
+	 */
+	public final static String MD5(String s) {
+		char hexDigits[]={'0','1','2','3','4','5','6','7','8','9','A','B','C','D','E','F'};
+		try {
+			byte[] btInput = s.getBytes();
+			// 获得MD5摘要算法的 MessageDigest 对象
+			MessageDigest mdInst = MessageDigest.getInstance("MD5");
+			// 使用指定的字节更新摘要
+			mdInst.update(btInput);
+			// 获得密文
+			byte[] md = mdInst.digest();
+			// 把密文转换成十六进制的字符串形式
+			int j = md.length;
+			char str[] = new char[j * 2];
+			int k = 0;
+			for (int i = 0; i < j; i++) {
+				byte byte0 = md[i];
+				str[k++] = hexDigits[byte0 >>> 4 & 0xf];
+				str[k++] = hexDigits[byte0 & 0xf];
+			}
+			return new String(str);
+		} catch (Exception e) {
+			e.printStackTrace();
+			return null;
+		}
+	}
+	/**
+	 * SHA256加密
+	 * @param str 加密后的报文
+	 * @return
+	 */
+	public static String getSHA256(String str) {
+		MessageDigest messageDigest;
+		String encodestr = "";
+		try {
+			messageDigest = MessageDigest.getInstance("SHA-256");
+			messageDigest.update(str.getBytes("UTF-8"));
+			encodestr = byte2Hex(messageDigest.digest());
+		} catch (NoSuchAlgorithmException e) {
+			e.printStackTrace();
+		} catch (UnsupportedEncodingException e) {
+			e.printStackTrace();
+		}
+		return encodestr;
+	}
+
+	/**
+	 * 将byte转为16进制
+	 * @param bytes
+	 * @return
+	 */
+	private static String byte2Hex(byte[] bytes) {
+		StringBuffer stringBuffer = new StringBuffer();
+		String temp = null;
+		for (int i = 0; i < bytes.length; i++) {
+			temp = Integer.toHexString(bytes[i] & 0xFF);
+			if (temp.length() == 1) {
+				// 1得到一位的进行补0操作
+				stringBuffer.append("0");
+			}
+			stringBuffer.append(temp);
+		}
+		return stringBuffer.toString();
+	}
+}
diff --git a/src/main/youhong_ai_jitu_src/selfdev/util/base/TimeCommonUtil.java b/src/main/youhong_ai_jitu_src/selfdev/util/base/TimeCommonUtil.java
new file mode 100644
index 0000000..7be7ff5
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/selfdev/util/base/TimeCommonUtil.java
@@ -0,0 +1,181 @@
+package selfdev.util.base;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Arrays;
+import java.util.Calendar;
+import java.util.Date;
+
+/**
+ * 时间公共类
+ * @author KangMD
+ *
+ */
+public class TimeCommonUtil {
+
+	/**
+	 * 获取当前几天前/几天后的日期
+	 * @param days 负数表示获取多少天前，正数表示获取多少天后
+	 * @return yyyy-MM-dd HH:mm:ss格式
+	 */
+	public static String obtainDate(int days){
+		String dt="";
+		//获得入参的日期
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(new Date());
+        //获取下个月第一天：
+        calendar.add(Calendar.DAY_OF_MONTH, days);
+		SimpleDateFormat sdf =new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+		dt=sdf.format(calendar.getTime());
+		return dt;
+	}
+	
+	/**
+	 * 计算2个日期相差多少天
+	 * @param smdate 开始日期（yyyy-MM-dd格式）
+	 * @param bdate 结束日期（yyyy-MM-dd格式）
+	 * @return 相差天数
+	 * @throws ParseException
+	 */
+	public static int daysBetween(String smdate,String bdate){
+		SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
+		Calendar cal = Calendar.getInstance(); 
+		long between_days=0;
+		try {
+			cal.setTime(sdf.parse(smdate));
+			long time1 = cal.getTimeInMillis();  
+			cal.setTime(sdf.parse(bdate));  
+			long time2 = cal.getTimeInMillis();
+			between_days=(time2-time1)/(1000*3600*24);
+		} catch (ParseException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}  
+		return Integer.parseInt(String.valueOf(between_days));   
+	}
+	/**
+	 * 计算2个日期相差多少个月
+	 * @param smdate 开始日期（yyyy-MM-dd格式）
+	 * @param bdate 结束日期（yyyy-MM-dd格式）
+	 * @return 相差天数
+	 * @throws ParseException
+	 */
+	public static int monthsBetween(String smdate,String bdate){
+		SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
+		long between_months=0;
+		try {
+			Calendar startCalendar = Calendar.getInstance();
+			startCalendar.setTime(sdf.parse(smdate));
+			Calendar endCalendar = Calendar.getInstance();
+			endCalendar.setTime(sdf.parse(bdate));
+			Calendar temp = Calendar.getInstance();
+			temp.setTime(sdf.parse(bdate));
+			temp.add(Calendar.DATE, 1);
+			int year = endCalendar.get(Calendar.YEAR) - startCalendar.get(Calendar.YEAR);
+			int month = endCalendar.get(Calendar.MONTH) - startCalendar.get(Calendar.MONTH);
+			if ((startCalendar.get(Calendar.DATE) == 1)&& (temp.get(Calendar.DATE) == 1)) {
+				between_months= year * 12 + month + 1;
+			} else if ((startCalendar.get(Calendar.DATE) != 1) && (temp.get(Calendar.DATE) == 1)) {
+				between_months= year * 12 + month;
+			} else if ((startCalendar.get(Calendar.DATE) == 1) && (temp.get(Calendar.DATE) != 1)) {
+				between_months= year * 12 + month;
+			} else {
+				between_months= (year * 12 + month - 1) < 0 ? 0 : (year * 12 + month);
+			}
+		} catch (ParseException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}  
+		return Integer.parseInt(String.valueOf(between_months));   
+	}
+	/**
+	   * 获取某月的最后一天
+	   * @Title:getLastDayOfMonth
+	   * @Description:
+	   * @param:@param year
+	   * @param:@param month
+	   * @param:@return
+	   * @return:String
+	   * @throws
+	   */
+	  public static String getLastDayOfMonth(int year,int month){
+	    Calendar cal = Calendar.getInstance();
+	    //设置年份
+	    cal.set(Calendar.YEAR,year);
+	    //设置月份
+	    cal.set(Calendar.MONTH, month);
+	    //
+	    cal.set(Calendar.DAY_OF_MONTH, 0);
+	    //获取某月最大天数
+	    //int lastDay = cal.getActualMaximum(Calendar.DAY_OF_MONTH);
+	    //设置日历中月份的最大天数
+	    //cal.set(Calendar.DAY_OF_MONTH, lastDay);
+	    //格式化日期
+	    SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+	    String lastDayOfMonth = sdf.format(cal.getTime());
+	    return lastDayOfMonth;
+	  }
+	  
+	  /**
+		 * 根据传入的年月获取上个月的年月(若传入为空则获取当前系统上个月的年月)
+		 * @param ny 年月（yyyy-MM格式）
+		 * @return 上个月的年月（yyyy-MM格式）
+		 * @throws ParseException
+		 */
+		public static String loadLastMonth(String ny){
+			SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
+			String ny_last="";
+			try {
+				Calendar cal = Calendar.getInstance();
+				//若传入为空则获取当前系统上个月的年月
+				if(!"".equals(ny)){
+					//设置年份
+					cal.setTime(sdf.parse(ny+"-01"));
+				}
+				//月份-1
+				cal.add(Calendar.MONTH, -1);
+				cal.set(Calendar.DAY_OF_MONTH,1);
+				//获取前一个月第一天
+				String firstDay = sdf.format(cal.getTime()).substring(0,7);
+				ny_last = firstDay.substring(0,7);
+			} catch (Exception e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}  
+			return ny_last;   
+		}
+		 /**
+		 * 获取某个月下所有的日期所对应的是星期几
+		 * @param ny 年月（yyyy-MM格式）
+		 * @return 数组格式
+		 * @throws Exception
+		 */
+		public static String[] loadWeekByYearMonth(String ny){
+			SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
+			String week[]=new String[0];
+			try {
+				Calendar cal = Calendar.getInstance();
+				//若传入为空则获取当前系统上个月的年月
+				if(!"".equals(ny)){
+					//设置年份
+					cal.setTime(sdf.parse(ny+"-01"));
+				}
+				String[] weekDays = {"日", "一", "二", "三", "四", "五", "六"};
+				//获取该月第一天是星期几
+				int w = cal.get(Calendar.DAY_OF_WEEK) - 1;
+				//获取该月有多少天
+				int days=cal.getActualMaximum(Calendar.DAY_OF_MONTH);
+				for(int t=0;t<days;t++){
+					week = Arrays.copyOf(week, (week.length+1));
+					//每周7天一次循环
+					week[week.length-1] = weekDays[w%7];
+					w++;
+				}
+			} catch (Exception e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}  
+			return week;   
+		}
+		
+}
diff --git a/src/main/youhong_ai_jitu_src/selfdev/util/base/TimeUtil.java b/src/main/youhong_ai_jitu_src/selfdev/util/base/TimeUtil.java
new file mode 100644
index 0000000..dd1955b
--- /dev/null
+++ b/src/main/youhong_ai_jitu_src/selfdev/util/base/TimeUtil.java
@@ -0,0 +1,181 @@
+package selfdev.util.base;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Arrays;
+import java.util.Calendar;
+import java.util.Date;
+
+/**
+ * 时间公共类
+ * @author KangMD
+ *
+ */
+public class TimeUtil {
+
+	/**
+	 * 获取当前几天前/几天后的日期
+	 * @param days 负数表示获取多少天前，正数表示获取多少天后
+	 * @return yyyy-MM-dd HH:mm:ss格式
+	 */
+	public static String obtainDate(int days){
+		String dt="";
+		//获得入参的日期
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(new Date());
+        //获取下个月第一天：
+        calendar.add(Calendar.DAY_OF_MONTH, days);
+		SimpleDateFormat sdf =new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+		dt=sdf.format(calendar.getTime());
+		return dt;
+	}
+	
+	/**
+	 * 计算2个日期相差多少天
+	 * @param smdate 开始日期（yyyy-MM-dd格式）
+	 * @param bdate 结束日期（yyyy-MM-dd格式）
+	 * @return 相差天数
+	 * @throws ParseException
+	 */
+	public static int daysBetween(String smdate,String bdate){
+		SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
+		Calendar cal = Calendar.getInstance(); 
+		long between_days=0;
+		try {
+			cal.setTime(sdf.parse(smdate));
+			long time1 = cal.getTimeInMillis();  
+			cal.setTime(sdf.parse(bdate));  
+			long time2 = cal.getTimeInMillis();
+			between_days=(time2-time1)/(1000*3600*24);
+		} catch (ParseException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}  
+		return Integer.parseInt(String.valueOf(between_days));   
+	}
+	/**
+	 * 计算2个日期相差多少个月
+	 * @param smdate 开始日期（yyyy-MM-dd格式）
+	 * @param bdate 结束日期（yyyy-MM-dd格式）
+	 * @return 相差天数
+	 * @throws ParseException
+	 */
+	public static int monthsBetween(String smdate,String bdate){
+		SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
+		long between_months=0;
+		try {
+			Calendar startCalendar = Calendar.getInstance();
+			startCalendar.setTime(sdf.parse(smdate));
+			Calendar endCalendar = Calendar.getInstance();
+			endCalendar.setTime(sdf.parse(bdate));
+			Calendar temp = Calendar.getInstance();
+			temp.setTime(sdf.parse(bdate));
+			temp.add(Calendar.DATE, 1);
+			int year = endCalendar.get(Calendar.YEAR) - startCalendar.get(Calendar.YEAR);
+			int month = endCalendar.get(Calendar.MONTH) - startCalendar.get(Calendar.MONTH);
+			if ((startCalendar.get(Calendar.DATE) == 1)&& (temp.get(Calendar.DATE) == 1)) {
+				between_months= year * 12 + month + 1;
+			} else if ((startCalendar.get(Calendar.DATE) != 1) && (temp.get(Calendar.DATE) == 1)) {
+				between_months= year * 12 + month;
+			} else if ((startCalendar.get(Calendar.DATE) == 1) && (temp.get(Calendar.DATE) != 1)) {
+				between_months= year * 12 + month;
+			} else {
+				between_months= (year * 12 + month - 1) < 0 ? 0 : (year * 12 + month);
+			}
+		} catch (ParseException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}  
+		return Integer.parseInt(String.valueOf(between_months));   
+	}
+	/**
+	   * 获取某月的最后一天
+	   * @Title:getLastDayOfMonth
+	   * @Description:
+	   * @param:@param year
+	   * @param:@param month
+	   * @param:@return
+	   * @return:String
+	   * @throws
+	   */
+	  public static String getLastDayOfMonth(int year,int month){
+	    Calendar cal = Calendar.getInstance();
+	    //设置年份
+	    cal.set(Calendar.YEAR,year);
+	    //设置月份
+	    cal.set(Calendar.MONTH, month);
+	    //
+	    cal.set(Calendar.DAY_OF_MONTH, 0);
+//	    //获取某月最大天数
+//	    int lastDay = cal.getActualMaximum(Calendar.DAY_OF_MONTH);
+//	    //设置日历中月份的最大天数
+//	    cal.set(Calendar.DAY_OF_MONTH, lastDay);
+	    //格式化日期
+	    SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+	    String lastDayOfMonth = sdf.format(cal.getTime());
+	    return lastDayOfMonth;
+	  }
+	  
+	  /**
+		 * 根据传入的年月获取上个月的年月(若传入为空则获取当前系统上个月的年月)
+		 * @param ny 年月（yyyy-MM格式）
+		 * @return 上个月的年月（yyyy-MM格式）
+		 * @throws ParseException
+		 */
+		public static String loadLastMonth(String ny){
+			SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
+			String ny_last="";
+			try {
+				Calendar cal = Calendar.getInstance();
+				//若传入为空则获取当前系统上个月的年月
+				if(!"".equals(ny)){
+					//设置年份
+					cal.setTime(sdf.parse(ny+"-01"));
+				}
+				//月份-1
+				cal.add(Calendar.MONTH, -1);
+				cal.set(Calendar.DAY_OF_MONTH,1);
+				//获取前一个月第一天
+				String firstDay = sdf.format(cal.getTime()).substring(0,7);
+				ny_last = firstDay.substring(0,7);
+			} catch (Exception e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}  
+			return ny_last;   
+		}
+		 /**
+		 * 获取某个月下所有的日期所对应的是星期几
+		 * @param ny 年月（yyyy-MM格式）
+		 * @return 数组格式
+		 * @throws Exception
+		 */
+		public static String[] loadWeekByYearMonth(String ny){
+			SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
+			String week[]=new String[0];
+			try {
+				Calendar cal = Calendar.getInstance();
+				//若传入为空则获取当前系统上个月的年月
+				if(!"".equals(ny)){
+					//设置年份
+					cal.setTime(sdf.parse(ny+"-01"));
+				}
+				String[] weekDays = {"日", "一", "二", "三", "四", "五", "六"};
+				//获取该月第一天是星期几
+				int w = cal.get(Calendar.DAY_OF_WEEK) - 1;
+				//获取该月有多少天
+				int days=cal.getActualMaximum(Calendar.DAY_OF_MONTH);
+				for(int t=0;t<days;t++){
+					week = Arrays.copyOf(week, (week.length+1));
+					//每周7天一次循环
+					week[week.length-1] = weekDays[w%7];
+					w++;
+				}
+			} catch (Exception e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}  
+			return week;   
+		}
+		
+}
diff --git a/src/main/youhong_ai_old_src/com/api/aiy_changeStatus/Impl/ChangeStatusImpl.java b/src/main/youhong_ai_old_src/com/api/aiy_changeStatus/Impl/ChangeStatusImpl.java
new file mode 100644
index 0000000..3978fad
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/aiy_changeStatus/Impl/ChangeStatusImpl.java
@@ -0,0 +1,397 @@
+package com.api.aiy_changeStatus.Impl;
+
+import aiyh.utils.Util;
+import aiyh.utils.zwl.common.ToolUtil;
+import com.api.aiy_changeStatus.Impl.Util.ChangeStatusUtil;
+import com.weaverboot.frame.ioc.anno.classAnno.WeaIocReplaceComponent;
+import com.weaverboot.frame.ioc.anno.methodAnno.WeaReplaceAfter;
+import com.weaverboot.frame.ioc.anno.methodAnno.WeaReplaceBefore;
+import com.weaverboot.frame.ioc.handler.replace.weaReplaceParam.impl.WeaAfterReplaceParam;
+import org.h2.util.StringUtils;
+import weaver.conn.RecordSet;
+
+import java.util.Map;
+
+/**
+ * @author EBU7-dev1-ayh
+ * @create 2021/11/27 0027 13:02
+ * 修改状态
+ */
+
+@WeaIocReplaceComponent("ChangeStatusService")
+public class ChangeStatusImpl {
+
+	/*
+		+++++++++++++++++++++++++++++++++++++++++++修改人员数据Start+++++++++++++++++++++++++++++
+	*/
+
+/*	@WeaReplaceBefore(value = "/api/hrm/finance/save", order = 1, description = "工资福利修改")
+	public void financeBefore(WeaBeforeReplaceParam weaBeforeReplaceParam) {
+		ChangeStatusUtil.changeHrmResourceStatus(weaBeforeReplaceParam, "id", 2);
+	}*/
+
+	@WeaReplaceBefore(value = "/api/hrm/finance/save", order = 1, description = "工资福利修改")
+	public String financeAfter(WeaAfterReplaceParam weaAfterReplaceParam) {
+		try {
+			ChangeStatusUtil.changeHrmResourceStatusAfter(weaAfterReplaceParam, "id", 2);
+
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		return weaAfterReplaceParam.getData();
+	}
+
+	/*@WeaReplaceBefore(value = "/api/hrm/systeminfo/save", order = 1, description = "系统信息修改")
+	public void systeminfoBefore(WeaBeforeReplaceParam weaBeforeReplaceParam) {
+		ChangeStatusUtil.changeHrmResourceStatus(weaBeforeReplaceParam, "id", 2);
+	}*/
+
+	@WeaReplaceAfter(value = "/api/hrm/systeminfo/save", order = 1, description = "系统信息修改")
+	public String systeminfoAfter(WeaAfterReplaceParam weaAfterReplaceParam) {
+		try {
+			ChangeStatusUtil.changeHrmResourceStatusAfter(weaAfterReplaceParam, "id", 2);
+
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		return weaAfterReplaceParam.getData();
+	}
+
+/*	@WeaReplaceBefore(value = "/api/hrm/resource/editResource", order = 1, description = "人员信息修改")
+	public void editResourceBefore(WeaBeforeReplaceParam weaBeforeReplaceParam) {
+		ChangeStatusUtil.changeHrmResourceStatus(weaBeforeReplaceParam, "id", 2);
+	}*/
+
+
+	@WeaReplaceAfter(value = "/api/hrm/resource/editResource", order = 1, description = "人员信息修改")
+	public String editResourceAfter(WeaAfterReplaceParam weaAfterReplaceParam) {
+		try {
+			ChangeStatusUtil.changeHrmResourceStatusAfter(weaAfterReplaceParam, "id", 2);
+
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		return weaAfterReplaceParam.getData();
+	}
+
+/*	@WeaReplaceBefore(value = "/api/hrm/forgotPassword/saveResetPassword", order = 1, description = "重置密码")
+	public void saveResetPasswordBefore(WeaBeforeReplaceParam weaBeforeReplaceParam) {
+		ChangeStatusUtil.changeHrmResourceStatus(weaBeforeReplaceParam, "id", 2);
+	}*/
+
+	@WeaReplaceAfter(value = "/api/hrm/forgotPassword/saveResetPassword", order = 1, description = "重置密码")
+	public String saveResetPasswordAfter(WeaAfterReplaceParam weaAfterReplaceParam) {
+		try {
+			ChangeStatusUtil.changeHrmResourceStatusAfter(weaAfterReplaceParam, "id", 2);
+
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		return weaAfterReplaceParam.getData();
+	}
+
+	/*
+	 * 批量数据修改，数据类型为数组
+	 *
+	 * @param weaBeforeReplaceParam
+	 */
+/*	@WeaReplaceBefore(value = "/api/hrm/batchMaintenanceAdjustEdit/resource/saveBatch", order = 1, description = "批量修改人员数据")
+	public void saveBatchBefore(WeaBeforeReplaceParam weaBeforeReplaceParam) {
+		ChangeStatusUtil.batchChangeHrmResourceStatus(weaBeforeReplaceParam, "id", 2);
+	}*/
+
+	@WeaReplaceAfter(value = "/api/hrm/batchMaintenanceAdjustEdit/resource/saveBatch", order = 1, description = "批量修改人员数据")
+	public String saveBatchAfter(WeaAfterReplaceParam weaAfterReplaceParam) {
+		try {
+			ChangeStatusUtil.batchChangeHrmResourceStatusAfter(weaAfterReplaceParam, "id", 2);
+
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		return weaAfterReplaceParam.getData();
+	}
+
+
+/*
+	@WeaReplaceBefore(value = "/api/hrm/batchMaintenanceAdjustEdit/saveBatchManagerid", order = 1, description = "批量修改直接上级")
+	public void saveBatchManageridBfore(WeaBeforeReplaceParam weaBeforeReplaceParam) {
+		ChangeStatusUtil.changeHrmResourceStatusByIds(weaBeforeReplaceParam, "ids", 2);
+	}
+*/
+
+	@WeaReplaceAfter(value = "/api/hrm/batchMaintenanceAdjustEdit/saveBatchManagerid", order = 1, description = "批量修改直接上级")
+	public String saveBatchManageridAfter(WeaAfterReplaceParam weaAfterReplaceParam) {
+		try {
+			ChangeStatusUtil.changeHrmResourceStatusByIdsAfter(weaAfterReplaceParam, "ids", 2);
+
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		return weaAfterReplaceParam.getData();
+	}
+
+
+/*
+	@WeaReplaceBefore(value = "/api/hrm/batchMaintenanceAdjustEdit/saveBatchJobtitle", order = 1, description = "批量调整职位")
+	public void saveBatchJobtitleBfore(WeaBeforeReplaceParam weaBeforeReplaceParam) {
+		ChangeStatusUtil.changeHrmResourceStatusByIds(weaBeforeReplaceParam, "ids", 2);
+	}
+*/
+
+	@WeaReplaceAfter(value = "/api/hrm/batchMaintenanceAdjustEdit/saveBatchJobtitle", order = 1, description = "批量调整职位")
+	public String saveBatchJobtitleAfter(WeaAfterReplaceParam weaAfterReplaceParam) {
+		try {
+			ChangeStatusUtil.changeHrmResourceStatusByIdsAfter(weaAfterReplaceParam, "ids", 2);
+
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		return weaAfterReplaceParam.getData();
+	}
+
+
+
+/*	@WeaReplaceBefore(value = "/api/hrm/batchMaintenanceAdjustEdit/saveBatchResourceDeptid", order = 1, description = "批量调整部门")
+	public void saveBatchResourceDeptidBfore(WeaBeforeReplaceParam weaBeforeReplaceParam) {
+		ChangeStatusUtil.changeHrmResourceStatusByIds(weaBeforeReplaceParam, "ids", 2);
+	}*/
+
+	@WeaReplaceAfter(value = "/api/hrm/batchMaintenanceAdjustEdit/saveBatchResourceDeptid", order = 1, description = "批量调整部门")
+	public String saveBatchResourceDeptidAfter(WeaAfterReplaceParam weaAfterReplaceParam) {
+		try {
+			ChangeStatusUtil.changeHrmResourceStatusByIdsAfter(weaAfterReplaceParam, "ids", 2);
+
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		return weaAfterReplaceParam.getData();
+	}
+
+
+/*	@WeaReplaceBefore(value = "/api/hrm/batchMaintenanceAdjustEdit/saveBatchAccounttype", order = 1, description = "批量修改主次账号")
+	public void saveBatchAccounttypeBfore(WeaBeforeReplaceParam weaBeforeReplaceParam) {
+		ChangeStatusUtil.changeHrmResourceStatusByIds(weaBeforeReplaceParam, "ids", 2);
+	}*/
+
+	@WeaReplaceAfter(value = "/api/hrm/batchMaintenanceAdjustEdit/saveBatchAccounttype", order = 1, description = "批量修改主次账号")
+	public String saveBatchAccounttypeAfter(WeaAfterReplaceParam weaAfterReplaceParam) {
+		try {
+			ChangeStatusUtil.changeHrmResourceStatusByIdsAfter(weaAfterReplaceParam, "ids", 2);
+
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		return weaAfterReplaceParam.getData();
+	}
+
+
+
+
+/*
+	@WeaReplaceBefore(value = "/api/hrm/batchMaintenanceAdjustEdit/saveBatchPassword", order = 1, description = "批量修改密码")
+	public void saveBatchPasswordBfore(WeaBeforeReplaceParam weaBeforeReplaceParam) {
+		ChangeStatusUtil.changeHrmResourceStatusByIds(weaBeforeReplaceParam, "ids", 2);
+	}
+*/
+
+	@WeaReplaceAfter(value = "/api/hrm/batchMaintenanceAdjustEdit/saveBatchPassword", order = 1, description = "批量修改密码")
+	public String saveBatchPasswordAfter(WeaAfterReplaceParam weaAfterReplaceParam) {
+		try {
+			ChangeStatusUtil.changeHrmResourceStatusByIdsAfter(weaAfterReplaceParam, "ids", 2);
+
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		return weaAfterReplaceParam.getData();
+	}
+
+
+/*	@WeaReplaceBefore(value = "/api/hrm/batchMaintenanceAdjustEdit/saveBatchDefaultPwd", order = 1, description = "批量重置密码")
+	public void saveBatchDefaultPwdBfore(WeaBeforeReplaceParam weaBeforeReplaceParam) {
+		ChangeStatusUtil.changeHrmResourceStatusByIds(weaBeforeReplaceParam, "resourceIds", 2);
+	}*/
+
+	@WeaReplaceAfter(value = "/api/hrm/batchMaintenanceAdjustEdit/saveBatchDefaultPwd", order = 1, description = "批量重置密码")
+	public String saveBatchDefaultPwdAfter(WeaAfterReplaceParam weaAfterReplaceParam) {
+		try {
+			ChangeStatusUtil.changeHrmResourceStatusByIdsAfter(weaAfterReplaceParam, "resourceIds", 2);
+
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		return weaAfterReplaceParam.getData();
+	}
+
+/*
+	@WeaReplaceBefore(value = "/api/hrm/statechange/saveHrmRedeploy", order = 1, description = "人员调动")
+	public void saveHrmRedeployBfore(WeaBeforeReplaceParam weaBeforeReplaceParam) {
+		ChangeStatusUtil.changeHrmResourceStatusByIds(weaBeforeReplaceParam, "tempresourceid", 2);
+	}*/
+
+	@WeaReplaceAfter(value = "/api/hrm/statechange/saveHrmRedeploy", order = 1, description = "人员调动")
+	public String saveHrmRedeployAfter(WeaAfterReplaceParam weaAfterReplaceParam) {
+		try {
+			ChangeStatusUtil.changeHrmResourceStatusByIdsAfter(weaAfterReplaceParam, "tempresourceid", 2);
+
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		return weaAfterReplaceParam.getData();
+	}
+
+
+/*	@WeaReplaceBefore(value = "/api/hrm/statechange/saveHrmExtend", order = 1, description = "人员续签")
+	public void saveHrmExtendBfore(WeaBeforeReplaceParam weaBeforeReplaceParam) {
+		ChangeStatusUtil.changeHrmResourceStatusByIds(weaBeforeReplaceParam, "tempresourceid", 2);
+	}*/
+
+
+	@WeaReplaceAfter(value = "/api/hrm/statechange/saveHrmExtend", order = 1, description = "人员续签")
+	public String saveHrmExtendAfter(WeaAfterReplaceParam weaAfterReplaceParam) {
+		try {
+			ChangeStatusUtil.changeHrmResourceStatusByIdsAfter(weaAfterReplaceParam, "tempresourceid", 2);
+
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		return weaAfterReplaceParam.getData();
+	}
+
+
+/*	@WeaReplaceBefore(value = "/api/hrm/statechange/saveHrmHire", order = 1, description = "人员转正")
+	public void saveHrmHireBfore(WeaBeforeReplaceParam weaBeforeReplaceParam) {
+		ChangeStatusUtil.changeHrmResourceStatusByIds(weaBeforeReplaceParam, "tempresourceid", 2);
+	}*/
+
+	@WeaReplaceAfter(value = "/api/hrm/statechange/saveHrmHire", order = 1, description = "人员转正")
+	public String saveHrmHireAfter(WeaAfterReplaceParam weaAfterReplaceParam) {
+		try {
+			ChangeStatusUtil.changeHrmResourceStatusByIdsAfter(weaAfterReplaceParam, "tempresourceid", 2);
+
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		return weaAfterReplaceParam.getData();
+	}
+
+/*	@WeaReplaceBefore(value = "/api/hrm/batchMaintenanceAdjustEdit/saveBatchUnlockStatus", order = 1, description = "批量解锁人员")
+	public void saveBatchUnlockStatusBfore(WeaBeforeReplaceParam weaBeforeReplaceParam) {
+		ChangeStatusUtil.changeHrmResourceStatusByIds(weaBeforeReplaceParam, "resourceIds", 2);
+	}*/
+
+	/*
+		+++++++++++++++++++++++++++++++++++++++++++修改人员数据END+++++++++++++++++++++++++++++
+	*/
+
+	/*
+		+++++++++++++++++++++++++++++++++++++++++++添加人员数据Start+++++++++++++++++++++++++++++
+	*/
+
+/*
+	@WeaReplaceBefore(value = "/api/hrm/statechange/saveHrmReHire", order = 1, description = "人员返聘")
+	public void saveHrmReHireBefore(WeaBeforeReplaceParam weaBeforeReplaceParam) {
+		ChangeStatusUtil.changeHrmResourceStatus(weaBeforeReplaceParam, "tempresourceid", 1);
+	}
+*/
+
+
+	@WeaReplaceAfter(value = "/api/hrm/statechange/saveHrmReHire", order = 1, description = "人员返聘")
+	public String saveHrmReHireAfter(WeaAfterReplaceParam weaAfterReplaceParam) {
+		try {
+			ChangeStatusUtil.changeHrmResourceStatusAfter(weaAfterReplaceParam, "tempresourceid", 1);
+
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		return weaAfterReplaceParam.getData();
+	}
+
+	@WeaReplaceAfter(value = "/api/hrm/resource/add/save", order = 1, description = "人员添加")
+	public String addResourceAfter(WeaAfterReplaceParam weaAfterReplaceParam) {
+		Map<String, Object> paramMap = weaAfterReplaceParam.getParamMap();
+		String loginId = Util.null2String(paramMap.get("loginid"));
+		String lastName = Util.null2String(paramMap.get("lastname"));
+		ToolUtil toolUtil = new ToolUtil();
+		toolUtil.writeErrorLog(weaAfterReplaceParam.getParamMap().toString());
+		toolUtil.writeErrorLog(loginId);
+		toolUtil.writeErrorLog(lastName);
+		if (StringUtils.isNullOrEmpty(loginId)) {
+//				没有登录id
+			if (!StringUtils.isNullOrEmpty(lastName)) {
+//					查询该名称的最后一名
+				String query = "select id from hrmresource where lastname = ? ORDER BY id desc limit 1";
+				RecordSet rs = new RecordSet();
+				rs.executeQuery(query, lastName);
+				if (rs.next()) {
+					toolUtil.writeErrorLog(rs.getString(1));
+					ChangeStatusUtil.changeStatus(rs.getString(1), 1);
+				}
+			}
+		} else {
+			String query = "select id from hrmresource where loginid = ? ";
+			RecordSet rs = new RecordSet();
+			rs.executeQuery(query, loginId);
+			if (rs.next()) {
+				toolUtil.writeErrorLog(rs.getString(1));
+				ChangeStatusUtil.changeStatus(rs.getString(1), 1);
+			}
+		}
+		return weaAfterReplaceParam.getData();
+	}
+
+
+	/*
+		+++++++++++++++++++++++++++++++++++++++++++添加人员数据END+++++++++++++++++++++++++++++
+	*/
+
+
+	/*
+		+++++++++++++++++++++++++++++++++++++++++++离职人员数据Start+++++++++++++++++++++++++++++
+	*/
+
+/*	@WeaReplaceBefore(value = "/api/hrm/statechange/saveHrmDismiss", order = 1, description = "人员离职")
+	public void saveHrmDismissBefore(WeaBeforeReplaceParam weaBeforeReplaceParam) {
+		ChangeStatusUtil.changeHrmResourceStatus(weaBeforeReplaceParam, "tempresourceid", 3);
+	}*/
+
+	@WeaReplaceAfter(value = "/api/hrm/statechange/saveHrmDismiss", order = 1, description = "人员离职")
+	public String saveHrmDismissAfter(WeaAfterReplaceParam weaAfterReplaceParam) {
+		try {
+			ChangeStatusUtil.changeHrmResourceStatusAfter(weaAfterReplaceParam, "tempresourceid", 3);
+
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		return weaAfterReplaceParam.getData();
+	}
+
+
+
+/*	@WeaReplaceBefore(value = "/api/hrm/statechange/saveHrmFire", order = 1, description = "人员解聘")
+	public void saveHrmFireBefore(WeaBeforeReplaceParam weaBeforeReplaceParam) {
+		ChangeStatusUtil.changeHrmResourceStatus(weaBeforeReplaceParam, "tempresourceid", 3);
+	}*/
+
+	@WeaReplaceAfter(value = "/api/hrm/statechange/saveHrmFire", order = 1, description = "人员解聘")
+	public String saveHrmFireAfter(WeaAfterReplaceParam weaAfterReplaceParam) {
+		try {
+			ChangeStatusUtil.changeHrmResourceStatusAfter(weaAfterReplaceParam, "tempresourceid", 3);
+
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		return weaAfterReplaceParam.getData();
+	}
+
+
+/*
+	@WeaReplaceBefore(value = "/api/hrm/statechange/saveHrmRetire", order = 1, description = "人员退修")
+	public void saveHrmRetireBefore(WeaBeforeReplaceParam weaBeforeReplaceParam) {
+		ChangeStatusUtil.changeHrmResourceStatus(weaBeforeReplaceParam, "tempresourceid", 3);
+	}*/
+
+	/*
+		+++++++++++++++++++++++++++++++++++++++++++离职员数据END+++++++++++++++++++++++++++++
+	*/
+
+}
diff --git a/src/main/youhong_ai_old_src/com/api/aiy_changeStatus/Impl/Util/ChangeStatusUtil.java b/src/main/youhong_ai_old_src/com/api/aiy_changeStatus/Impl/Util/ChangeStatusUtil.java
new file mode 100644
index 0000000..92997de
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/aiy_changeStatus/Impl/Util/ChangeStatusUtil.java
@@ -0,0 +1,128 @@
+package com.api.aiy_changeStatus.Impl.Util;
+
+import aiyh.utils.Util;
+import aiyh.utils.zwl.common.ToolUtil;
+import com.alibaba.fastjson.JSON;
+import com.weaverboot.frame.ioc.handler.replace.weaReplaceParam.impl.WeaAfterReplaceParam;
+import com.weaverboot.frame.ioc.handler.replace.weaReplaceParam.impl.WeaBeforeReplaceParam;
+import org.h2.util.StringUtils;
+import weaver.conn.RecordSet;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author EBU7-dev1-ayh
+ * @create 2021/11/27 0027 13:28
+ * util
+ */
+
+// TODO 去除日志文件打印相关
+public class ChangeStatusUtil {
+	private final static ToolUtil TOOL_UTIL = new ToolUtil();
+
+	private final static RecordSet rs = new RecordSet();
+
+
+	public static void changeHrmResourceStatus(WeaBeforeReplaceParam weaBeforeReplaceParam, String key, int status) {
+		String apiUrl = weaBeforeReplaceParam.getApiUrl();
+		Map<String, Object> paramMap = weaBeforeReplaceParam.getParamMap();
+		String id = Util.null2String(paramMap.get(key));
+		if (!StringUtils.isNullOrEmpty(id)) {
+			ChangeStatusUtil.changeStatus(id, status);
+		}
+		TOOL_UTIL.writeDebuggerLog(String.format("进入拦截请求方法，获取到的api{%s}，请求参数{%s}", apiUrl, JSON.toJSONString(paramMap)));
+	}
+
+	public static void changeHrmResourceStatusByIds(WeaBeforeReplaceParam weaBeforeReplaceParam, String key, int status) {
+		String apiUrl = weaBeforeReplaceParam.getApiUrl();
+		Map<String, Object> paramMap = weaBeforeReplaceParam.getParamMap();
+		String id = Util.null2String(paramMap.get(key));
+		if (!StringUtils.isNullOrEmpty(id)) {
+			ChangeStatusUtil.changeStatusByIds(id, status);
+		}
+		TOOL_UTIL.writeDebuggerLog(String.format("进入拦截请求方法，获取到的api{%s}，请求参数{%s}", apiUrl, JSON.toJSONString(paramMap)));
+	}
+
+	public static void batchChangeHrmResourceStatus(WeaBeforeReplaceParam weaBeforeReplaceParam, String key, int status) {
+		String apiUrl = weaBeforeReplaceParam.getApiUrl();
+		Map<String, Object> paramMap = weaBeforeReplaceParam.getParamMap();
+		List<Map<String, Object>> datas = (List<Map<String, Object>>) paramMap.get("datas");
+		if (datas == null || datas.isEmpty()) {
+			return;
+		}
+		List<String> ids = new ArrayList<>();
+		for (Map<String, Object> data : datas) {
+			String id = Util.null2String(data.get(key));
+			if (!StringUtils.isNullOrEmpty(id)) {
+				ids.add(id);
+			}
+		}
+		if (!ids.isEmpty()) {
+			ChangeStatusUtil.changeStatus(ids, status);
+		}
+		TOOL_UTIL.writeDebuggerLog(String.format("进入拦截请求方法，获取到的api{%s}，请求参数{%s}", apiUrl, JSON.toJSONString(paramMap)));
+	}
+
+
+	public static boolean changeStatus(List<String> ids, int status) {
+		String sql = "update hrmresource set changestatus = ? where id in ( " + String.join(",", ids) + ")";
+		TOOL_UTIL.writeDebuggerLog(sql + " ---------------> " + status);
+		return rs.executeUpdate(sql, status);
+	}
+
+	public static boolean changeStatusByIds(String ids, int status) {
+		String sql = "update hrmresource set changestatus = ? where id in ( " + ids + ")";
+		TOOL_UTIL.writeDebuggerLog(sql + " ---------------> " + status);
+		return rs.executeUpdate(sql, status);
+	}
+
+
+	public static boolean changeStatus(String id, int status) {
+		String sql = "update hrmresource set changestatus = ? where id = ?";
+		TOOL_UTIL.writeDebuggerLog(sql + " ---------------> " + id + "," + status);
+		return rs.executeUpdate(sql, status, id);
+	}
+
+
+	public static void changeHrmResourceStatusAfter(WeaAfterReplaceParam weaAfterReplaceParam, String key, int status) {
+		String apiUrl = weaAfterReplaceParam.getApiUrl();
+		Map<String, Object> paramMap = weaAfterReplaceParam.getParamMap();
+		String id = Util.null2String(paramMap.get(key));
+		if (!StringUtils.isNullOrEmpty(id)) {
+			ChangeStatusUtil.changeStatus(id, status);
+		}
+		TOOL_UTIL.writeDebuggerLog(String.format("进入拦截请求方法，获取到的api{%s}，请求参数{%s}", apiUrl, JSON.toJSONString(paramMap)));
+	}
+
+	public static void batchChangeHrmResourceStatusAfter(WeaAfterReplaceParam weaAfterReplaceParam, String key, int status) {
+		String apiUrl = weaAfterReplaceParam.getApiUrl();
+		Map<String, Object> paramMap = weaAfterReplaceParam.getParamMap();
+		List<Map<String, Object>> datas = (List<Map<String, Object>>) paramMap.get("datas");
+		if (datas == null || datas.isEmpty()) {
+			return;
+		}
+		List<String> ids = new ArrayList<>();
+		for (Map<String, Object> data : datas) {
+			String id = Util.null2String(data.get(key));
+			if (!StringUtils.isNullOrEmpty(id)) {
+				ids.add(id);
+			}
+		}
+		if (!ids.isEmpty()) {
+			ChangeStatusUtil.changeStatus(ids, status);
+		}
+		TOOL_UTIL.writeDebuggerLog(String.format("进入拦截请求方法，获取到的api{%s}，请求参数{%s}", apiUrl, JSON.toJSONString(paramMap)));
+	}
+
+	public static void changeHrmResourceStatusByIdsAfter(WeaAfterReplaceParam weaAfterReplaceParam, String key, int status) {
+		String apiUrl = weaAfterReplaceParam.getApiUrl();
+		Map<String, Object> paramMap = weaAfterReplaceParam.getParamMap();
+		String id = Util.null2String(paramMap.get(key));
+		if (!StringUtils.isNullOrEmpty(id)) {
+			ChangeStatusUtil.changeStatusByIds(id, status);
+		}
+		TOOL_UTIL.writeDebuggerLog(String.format("进入拦截请求方法，获取到的api{%s}，请求参数{%s}", apiUrl, JSON.toJSONString(paramMap)));
+	}
+}
diff --git a/src/main/youhong_ai_old_src/com/api/aiyh_IHG/mobil_ui/controller/CalendarWorkController.java b/src/main/youhong_ai_old_src/com/api/aiyh_IHG/mobil_ui/controller/CalendarWorkController.java
new file mode 100644
index 0000000..c480d79
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/aiyh_IHG/mobil_ui/controller/CalendarWorkController.java
@@ -0,0 +1,106 @@
+package com.api.aiyh_IHG.mobil_ui.controller;
+
+import aiyh.utils.ApiResult;
+import aiyh.utils.Util;
+import aiyh.utils.excention.CustomerException;
+import com.api.aiyh_IHG.mobil_ui.service.CalendarWorkService;
+import com.api.aiyh_IHG.mobil_ui.vo.UserInfoVo;
+import weaver.hrm.HrmUserVarify;
+import weaver.hrm.User;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p></p>
+ * <p>create 2022/6/10 18:08</p>
+ *
+ * @author ayh
+ */
+@Path("/aiyh-calendar")
+public class CalendarWorkController {
+    private CalendarWorkService service = new CalendarWorkService();
+
+    @Path("/work-mark")
+    @GET
+    @Produces(MediaType.APPLICATION_JSON)
+    public String getWorkMarkList(@Context HttpServletRequest request, @Context HttpServletResponse response){
+        try {
+            User user = HrmUserVarify.getUser(request, response);
+            String startDate = request.getParameter("startDate");
+            String endDate = request.getParameter("endDate");
+            List<String> result =  service.getWorkMarkList(user,startDate,endDate);
+            return ApiResult.success(result);
+        }catch (Exception e){
+            Util.getLogger().info("查询日期标记失败！" + Util.getErrString(e));
+            return ApiResult.error("查询日期标记失败！");
+        }
+    }
+
+
+    @Path("/user-info")
+    @GET
+    @Produces(MediaType.APPLICATION_JSON)
+    public String getUserInfo(@Context HttpServletRequest request, @Context HttpServletResponse response){
+        try {
+            String rolesId = request.getParameter("rolesId");
+            User user = HrmUserVarify.getUser(request, response);
+            UserInfoVo userInfoVo = service.getUserInfo(user,rolesId);
+            return ApiResult.success(userInfoVo);
+        }catch (Exception e){
+            Util.getLogger().info("查询用户信息失败！" + Util.getErrString(e));
+            return ApiResult.error("查询用户信息失败！");
+        }
+    }
+
+    @Path("/calendar-works")
+    @GET
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces(MediaType.APPLICATION_JSON)
+    public String getWorkInfo(@Context HttpServletRequest request, @Context HttpServletResponse response){
+        String date = request.getParameter("date");
+        User user = HrmUserVarify.getUser(request, response);
+        try {
+            Map<String,Object> result = service.getWorkInfo(date,user.getUID());
+            return ApiResult.success(result);
+        }catch (Exception e){
+            Util.getLogger().info("查询日程信息失败！" + Util.getErrString(e));
+            return ApiResult.error("查询异常！");
+        }
+    }
+
+    @Path("/every-work")
+    @GET
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces(MediaType.APPLICATION_JSON)
+    public String getEveryDayWork(@Context HttpServletRequest request, @Context HttpServletResponse response){
+        String zq = request.getParameter("zq");
+        String page = request.getParameter("page");
+        String pageSize = request.getParameter("pageSize");
+        String rolesId = request.getParameter("rolesId");
+        User user = HrmUserVarify.getUser(request, response);
+        try {
+            Map<String,Object> result = service.getEveryDayWork(page,pageSize,zq,user.getUID(),rolesId);
+            return ApiResult.success(result);
+        }catch (CustomerException e){
+            Integer code = e.getCode();
+            if(code == 403){
+                return ApiResult.success(new String[]{},403,"无权限查看！");
+            }
+            Util.getLogger().info("查询每日任务失败！" + Util.getErrString(e));
+            return ApiResult.error("查询每日任务失败！");
+        } catch (Exception e){
+            Util.getLogger().info("查询每日任务失败！" + Util.getErrString(e));
+            return ApiResult.error("查询每日任务失败！");
+        }
+    }
+
+}
diff --git a/src/main/youhong_ai_old_src/com/api/aiyh_IHG/mobil_ui/mapper/CalendarWorkMapper.java b/src/main/youhong_ai_old_src/com/api/aiyh_IHG/mobil_ui/mapper/CalendarWorkMapper.java
new file mode 100644
index 0000000..2e1a845
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/aiyh_IHG/mobil_ui/mapper/CalendarWorkMapper.java
@@ -0,0 +1,121 @@
+package com.api.aiyh_IHG.mobil_ui.mapper;
+
+import aiyh.utils.annotation.recordset.ParamMapper;
+import aiyh.utils.annotation.recordset.Select;
+import aiyh.utils.annotation.recordset.SqlMapper;
+import com.api.aiyh_IHG.mobil_ui.vo.EveryWorkVo;
+import com.api.aiyh_IHG.mobil_ui.vo.WorkInfoVo;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p></p>
+ * <p>create 2022/6/10 18:08</p>
+ *
+ * @author ayh
+ */
+
+@SqlMapper
+public interface CalendarWorkMapper {
+
+    /**
+     * 根据状态和日期查询工作日程
+     * @param date 日期
+     * @param i 状态
+     * @param userId 用户ID
+     * @return 工作日程列表
+     */
+    @Select("select id,requestid, begindate, begintime,enddate,endtime,createrid,deptid,subcompanyid,`name`,`status`,( " +
+            "case when type_n = 15 then -1 else type_n end " +
+            ") type_n_order,type_n from workplan " +
+            "where requestid is not null and `status` = #{status} and (#{date} BETWEEN begindate and enddate) " +
+            "and (deleted = 0 or deleted is null) and (CONCAT(',',resourceid,',') like '%,$t{userId},%' or createrid = #{userId}) order by type_n_order")
+    List<WorkInfoVo> selectWorkInfo(@ParamMapper("date") String date, @ParamMapper("status") int i,@ParamMapper("userId") Integer userId);
+
+    /**
+     * 根据日期查询提醒任务日程
+     * @param date 日期
+     * @param userId 用户ID
+     * @return 提醒任务
+     */
+    @Select("select id,requestid, begindate, begintime,enddate,endtime,createrid,deptid,subcompanyid,`name`,`status`,( " +
+            "case when type_n = 15 then -1 else type_n end " +
+            ") type_n_order,type_n from workplan " +
+            "where requestid is null and (#{date} BETWEEN begindate and enddate) " +
+            "and (deleted = 0 or deleted is null) and (CONCAT(',',resourceid,',') like '%,$t{userId},%' or createrid = #{userId}) order by type_n")
+    List<WorkInfoVo> selectReminderWorkInfo(@ParamMapper("date") String date,@ParamMapper("userId") Integer userId);
+
+    /**
+     * 查询任务清单
+     * @param start 开始数量
+     * @param pageSize 结束数量
+     * @param zq 周期
+     * @return 任务清单
+     */
+//    @Select("select * from uf_rwqd where zq = #{zq} order by id desc limit #{start},#{pageSize}")
+    @Select("select * from uf_rwqd where zq = #{zq} and id in ($t{workPackageIdListStr}) order by lb limit #{start},#{pageSize}")
+    List<EveryWorkVo> selectEveryDayWork(@ParamMapper("start") Integer start,
+                                         @ParamMapper("pageSize") Integer pageSize,
+                                         @ParamMapper("zq") String zq,
+                                         @ParamMapper("workPackageIdListStr") String workPackageIdListStr);
+
+    /**
+     * 查询任务清单总数
+     * @param zq 周期
+     * @return 任务清单
+     */
+    @Select("select count(*) from uf_rwqd where zq = #{zq}")
+    Integer selectTotalCount(@ParamMapper("zq") String zq);
+
+    /**
+     * 查询日程标识
+     * @param uid 用户ID
+     * @param startDate 开始时间
+     * @param endDate 结束时间
+     * @return 日程标识
+     */
+    @Select("select distinct begindate from workplan where begindate between #{startDate} and #{endDate} " +
+            "and (deleted = 0 or deleted is null) " +
+            "and (CONCAT(',',resourceid,',') like '%,$t{userId},%' or createrid = #{userId}) " +
+            "union all " +
+            "select distinct enddate from workplan where enddate between #{startDate} and #{endDate} " +
+            "and (deleted = 0 or deleted is null) " +
+            "and (CONCAT(',',resourceid,',') like '%,$t{userId},%' or createrid = #{userId}) and begindate <> enddate")
+    List<String> selectWorkMarkList(@ParamMapper("userId") int uid,
+                                    @ParamMapper("startDate") String startDate,
+                                    @ParamMapper("endDate") String endDate);
+
+    /**
+     * <h2>通过用户ID查询用户对应的酒店ID</h2>
+     * @param userId 用户ID
+     * @return 酒店ID
+     */
+    @Select("select textfield1 from hrmresource where id = #{userId}")
+    String selectHotelId(@ParamMapper("userId") Integer userId);
+
+    /**
+     *  <h2>通过酒店ID查询任务包类型</h2>
+     * @param hotelId 酒店ID
+     * @return 任务包类型
+     */
+    @Select("select rwblx from uf_hotelinfo where holidex = #{hotelId}")
+    String selectWorkPackage(@ParamMapper("hotelId") String hotelId);
+
+    /**
+     * <h2>通过任务包id查询任务包配置表中对应的任务列表</h2>
+     * @param workPackageId 任务包ID
+     * @return 任务列表ids字符串
+     */
+    @Select("select rwlb from uf_rwbpzb where id = #{workPackageId}")
+    String selectWorkPackageList(@ParamMapper("workPackageId") String workPackageId);
+
+    /**
+     * <h2>查询查看每日任务的角色权限</h2>
+     * @param rolesId 角色ID
+     * @return 插叙结果
+     */
+    @Select("select hl.id,hl.rolesname,hl.subcompanyid,hlb.resourcetype,hlb.resourceid,GROUP_CONCAT(hlb.resourceid) resourceids from hrmroles  hl\n" +
+            "left join hrmrolemembers hlb on hl.id = hlb.ROLEID where hl.id = #{rolesId}  GROUP BY hl.id")
+    Map<String,Object> selectRoles(@ParamMapper("rolesId") String rolesId);
+}
diff --git a/src/main/youhong_ai_old_src/com/api/aiyh_IHG/mobil_ui/service/CalendarWorkService.java b/src/main/youhong_ai_old_src/com/api/aiyh_IHG/mobil_ui/service/CalendarWorkService.java
new file mode 100644
index 0000000..da1fb06
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/aiyh_IHG/mobil_ui/service/CalendarWorkService.java
@@ -0,0 +1,170 @@
+package com.api.aiyh_IHG.mobil_ui.service;
+
+import aiyh.utils.Util;
+import aiyh.utils.excention.CustomerException;
+import com.api.aiyh_IHG.mobil_ui.mapper.CalendarWorkMapper;
+import com.api.aiyh_IHG.mobil_ui.vo.EveryWorkVo;
+import com.api.aiyh_IHG.mobil_ui.vo.UserInfoVo;
+import com.api.aiyh_IHG.mobil_ui.vo.WorkInfoVo;
+import weaver.hrm.User;
+import weaver.hrm.company.DepartmentComInfo;
+import weaver.hrm.company.SubCompanyComInfo;
+import weaver.hrm.job.JobTitlesComInfo;
+
+import java.util.*;
+
+/**
+ * <p></p>
+ * <p>create 2022/6/10 18:08</p>
+ *
+ * @author ayh
+ */
+
+public class CalendarWorkService {
+    private final SubCompanyComInfo subCompanyComInfo = new SubCompanyComInfo();
+    private final DepartmentComInfo departmentComInfo = new DepartmentComInfo();
+    private final JobTitlesComInfo jobTitlesComInfo = new JobTitlesComInfo();
+    private final CalendarWorkMapper mapper = Util.getMapper(CalendarWorkMapper.class);
+
+    /**
+     * <h2>获取工作任务信息</h2>
+     * @param date 时间
+     * @param userId 用户ID
+     * @return 工作任务信息
+     */
+    public Map<String,Object> getWorkInfo(String date,Integer userId) {
+
+        Map<String,Object> result = new HashMap<>(8);
+        List<WorkInfoVo> doneWorkInfoVoList = mapper.selectWorkInfo(date,1,userId);
+        if(doneWorkInfoVoList == null){
+            doneWorkInfoVoList = new ArrayList<>();
+        }
+        result.put("done",doneWorkInfoVoList);
+        List<WorkInfoVo> unfinishedWorkInfoVoList = mapper.selectWorkInfo(date, 0,userId);
+        if(unfinishedWorkInfoVoList == null){
+            unfinishedWorkInfoVoList = new ArrayList<>();
+        }
+        result.put("unfinished",unfinishedWorkInfoVoList);
+        List<WorkInfoVo> reminderWorkInfoList = mapper.selectReminderWorkInfo(date,userId);
+        if(reminderWorkInfoList == null){
+            reminderWorkInfoList = new ArrayList<>();
+        }
+        result.put("reminder",reminderWorkInfoList);
+        return result;
+    }
+
+    /**
+     * <h2>查询用户基本信息</h2>
+     * @param user 用户
+     * @param rolesId 角色ID
+     * @return 用户基本信息
+     */
+    public UserInfoVo getUserInfo(User user,String rolesId) {
+        UserInfoVo userInfoVo = new UserInfoVo();
+        userInfoVo.setId(user.getUID());
+        userInfoVo.setUserName(user.getUsername());
+        userInfoVo.setDepartName(departmentComInfo.getDepartmentname(String.valueOf(user.getUserDepartment())));
+        userInfoVo.setSubCompanyName(subCompanyComInfo.getSubCompanyname(String.valueOf(user.getUserSubCompany1())));
+        userInfoVo.setJobTitle(jobTitlesComInfo.getJobTitlesname(user.getJobtitle()));
+        userInfoVo.setJobIds(user.getJobtitle());
+        userInfoVo.setHasViewAuthority(true);
+        try {
+            if(!Util.isNullOrEmpty(rolesId)){
+                userInfoVo.setHasViewAuthority(this.verifyAuthority(rolesId,String.valueOf(user.getUID())));
+            }
+        }catch (CustomerException e){
+            e.printStackTrace();
+            if(e.getCode() == 403){
+                userInfoVo.setHasViewAuthority(false);
+            }
+        }
+        return userInfoVo;
+    }
+
+
+    /**
+     * <h2>获取每日工作计划信息</h2>
+     * @param page 当前页码
+     * @param pageSize 每页数据量大小
+     * @param zq 周期ID
+     * @param userId 用户ID
+     * @param rolesId 角色ID
+     * @return 每日工作计划信息
+     */
+    public Map<String,Object> getEveryDayWork(String page, String pageSize, String zq,Integer userId,String rolesId) {
+        if(!Util.isNullOrEmpty(rolesId)){
+            this.verifyAuthority(rolesId, String.valueOf(userId));
+        }
+        Map<String,Object> result = new HashMap<>(16);
+        int pageNum = Integer.parseInt(page);
+        if(pageNum <= 1){
+            pageNum = 1;
+        }
+        int start = 0;
+        String hotelId = mapper.selectHotelId(userId);
+        if(null == hotelId || "".equals(hotelId)){
+            throw new CustomerException("无法查询酒店ID，人员ID：" + userId);
+        }
+        String workPackageId = mapper.selectWorkPackage(hotelId);
+        if(null == workPackageId || "".equals(workPackageId)){
+            throw new CustomerException("无法查询任务包类型，酒店ID：" + workPackageId);
+        }
+//        TODO 查询任务列表
+        String workPackageListStr = mapper.selectWorkPackageList(workPackageId);
+        if(null == workPackageListStr){
+            throw new CustomerException("没有查询到任务包配置中的任务列表数据！");
+        }
+        start = (pageNum - 1) * Integer.parseInt(pageSize);
+        List<EveryWorkVo> list = mapper.selectEveryDayWork(start,Integer.parseInt(pageSize),zq,workPackageListStr);
+        if(list == null){
+            throw new CustomerException("查询每日工作失败！");
+        }
+        for (EveryWorkVo everyWorkVo : list) {
+            String lb = everyWorkVo.getLb();
+            String selectFiledValueByValue = Util.getSelectFiledValueByValue("uf_rwqd", "lb", lb);
+            everyWorkVo.setLb(selectFiledValueByValue);
+            String zq1 = everyWorkVo.getZq();
+            String selectFiledValueByValue1 = Util.getSelectFiledValueByValue("uf_rwqd", "lb", zq1);
+            everyWorkVo.setZq(selectFiledValueByValue1);
+        }
+        Integer total = mapper.selectTotalCount(zq);
+        result.put("list",list);
+        result.put("totalSize",total);
+        result.put("page",page);
+        result.put("pageSize",pageSize);
+        return result;
+    }
+
+    public List<String> getWorkMarkList(User user, String startDate, String endDate) {
+        return mapper.selectWorkMarkList(user.getUID(),startDate,endDate);
+    }
+
+    /**
+     * <h2>检查是否有权限查看每日任务</h2>
+     * @param rolesId 权限ID
+     * @param userId 人员ID
+     * @return 是否有权限查看
+     */
+    private boolean verifyAuthority(String rolesId,String userId){
+        Map<String,Object> map = mapper.selectRoles(rolesId);
+        if(null == map || map.size() == 0){
+            throw new CustomerException("无权限查看！查询每日任务角色权限为空",403);
+        }
+        String resourceids = String.valueOf(map.get("resourceids"));
+        if(Util.isNullOrEmpty(resourceids)){
+            throw new CustomerException("无权限查看！查询每日任务角色权限中resourcesids为空",403);
+        }
+        String resourcetype = String.valueOf(map.get("resourcetype"));
+        if("1".equals(resourcetype)){
+//            人力资源
+            String resourceId = Arrays.stream(resourceids.split(","))
+                    .filter(v -> v.equals(userId))
+                    .findFirst()
+                    .orElseThrow(() -> new CustomerException("无权限查看！没查找到对应人员的权限", 403));
+            if(Util.isNullOrEmpty(resourceId)){
+                throw new CustomerException("无权限查看！没查找到对应的人员权限在权限角色中",403);
+            }
+        }
+        return true;
+    }
+}
diff --git a/src/main/youhong_ai_old_src/com/api/aiyh_IHG/mobil_ui/vo/EveryWorkVo.java b/src/main/youhong_ai_old_src/com/api/aiyh_IHG/mobil_ui/vo/EveryWorkVo.java
new file mode 100644
index 0000000..62e977a
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/aiyh_IHG/mobil_ui/vo/EveryWorkVo.java
@@ -0,0 +1,27 @@
+package com.api.aiyh_IHG.mobil_ui.vo;
+
+import lombok.Data;
+
+/**
+ * <p></p>
+ * <p>create 2022/6/10 20:14</p>
+ *
+ * @author ayh
+ */
+
+@Data
+public class EveryWorkVo {
+    private Integer id;
+    private String lb;
+    private String zq;
+    private String rwbt;
+    private String rwnr;
+    private String sfxyfanku;
+    private String ksrq;
+    private String kssj;
+    private String jsrq;
+    private String jssj;
+    private String cjr;
+    private String jsr;
+    private String jjcd;
+}
diff --git a/src/main/youhong_ai_old_src/com/api/aiyh_IHG/mobil_ui/vo/UserInfoVo.java b/src/main/youhong_ai_old_src/com/api/aiyh_IHG/mobil_ui/vo/UserInfoVo.java
new file mode 100644
index 0000000..fb2a71d
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/aiyh_IHG/mobil_ui/vo/UserInfoVo.java
@@ -0,0 +1,22 @@
+package com.api.aiyh_IHG.mobil_ui.vo;
+
+import lombok.Data;
+
+/**
+ * <p></p>
+ * <p>create 2022/6/10 18:46</p>
+ *
+ * @author ayh
+ */
+
+@Data
+public class UserInfoVo {
+    private Integer id;
+    private String name;
+    private String subCompanyName;
+    private String departName;
+    private String jobTitle;
+    private String userName;
+    private String jobIds;
+    private boolean hasViewAuthority;
+}
diff --git a/src/main/youhong_ai_old_src/com/api/aiyh_IHG/mobil_ui/vo/WorkInfoVo.java b/src/main/youhong_ai_old_src/com/api/aiyh_IHG/mobil_ui/vo/WorkInfoVo.java
new file mode 100644
index 0000000..d2a981e
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/aiyh_IHG/mobil_ui/vo/WorkInfoVo.java
@@ -0,0 +1,25 @@
+package com.api.aiyh_IHG.mobil_ui.vo;
+
+import lombok.Data;
+
+/**
+ * <p></p>
+ * <p>create 2022/6/10 18:18</p>
+ *
+ * @author ayh
+ */
+
+@Data
+public class WorkInfoVo {
+    private Integer id;
+    private String requestid;
+    private String begindate;
+    private String begintime;
+    private String enddate;
+    private String endtime;
+    private String createrid;
+/*    private String deptid;
+    private String subcompanyid;*/
+    private String name;
+    private String status;
+}
diff --git a/src/main/youhong_ai_old_src/com/api/aiyh_common/multiple_language/MultipleLanguageController.java b/src/main/youhong_ai_old_src/com/api/aiyh_common/multiple_language/MultipleLanguageController.java
new file mode 100644
index 0000000..f64aa3d
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/aiyh_common/multiple_language/MultipleLanguageController.java
@@ -0,0 +1,52 @@
+package com.api.aiyh_common.multiple_language;
+
+import aiyh.utils.ApiResult;
+import aiyh.utils.Util;
+import weaver.hrm.HrmUserVarify;
+import weaver.hrm.User;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>多语言自定义标签接口</p>
+ * <p>create 2022/2/10 0010 10:09</p>
+ *
+ * @author EBU7-dev1-ayh
+ */
+
+@Path("/languageLabel")
+public class MultipleLanguageController {
+
+    MultipleLanguageMapper multipleLanguageMapper = Util.getMapper(MultipleLanguageMapper.class);
+
+    @GET
+    @Path("/getMultipleLanguage/{descLike}")
+    @Produces(MediaType.APPLICATION_JSON)
+    public String getMultipleLanguage(@Context HttpServletRequest request,
+                                      @Context HttpServletResponse response,
+                                      @PathParam("descLike") String descLike) {
+
+        User user = HrmUserVarify.getUser(request, response);
+        List<Map<String, String>> labelList =
+                multipleLanguageMapper.selectCustomerLabel(descLike+"%", user.getLanguage());
+        if (labelList == null) {
+            return ApiResult.success(new HashMap<>(2));
+        }
+        Map<String, String> result = new HashMap<>(16);
+        for (Map<String, String> map : labelList) {
+            result.put(String.valueOf(map.get("id")), map.get("labelname"));
+        }
+        return ApiResult.success(result);
+    }
+
+}
diff --git a/src/main/youhong_ai_old_src/com/api/aiyh_common/multiple_language/MultipleLanguageMapper.java b/src/main/youhong_ai_old_src/com/api/aiyh_common/multiple_language/MultipleLanguageMapper.java
new file mode 100644
index 0000000..a3318f9
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/aiyh_common/multiple_language/MultipleLanguageMapper.java
@@ -0,0 +1,31 @@
+package com.api.aiyh_common.multiple_language;
+
+import aiyh.utils.annotation.recordset.ParamMapper;
+import aiyh.utils.annotation.recordset.Select;
+import aiyh.utils.annotation.recordset.SqlMapper;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p></p>
+ * <p>create 2022/2/10 0010 10:13</p>
+ *
+ * @author EBU7-dev1-ayh
+ */
+
+
+@SqlMapper
+public interface MultipleLanguageMapper {
+
+    /**
+     * 查询自定义的标签信息
+     * @param descLike 描述
+     * @param languageId 语言id
+     * @return 查询到的标签信息
+     */
+    @Select("select hi.id,hf.labelname from htmllabelindex hi " +
+            "left join htmllabelinfo hf on hf.indexid = hi.id " +
+            "where id < 0 and indexdesc like ${descLike} and languageid = #{languageId}")
+    public List<Map<String,String>> selectCustomerLabel(@ParamMapper("descLike") String descLike, @ParamMapper("languageId") int languageId);
+}
diff --git a/src/main/youhong_ai_old_src/com/api/aiyh_ftpfiel/ReadFTPFielController.java b/src/main/youhong_ai_old_src/com/api/aiyh_ftpfiel/ReadFTPFielController.java
new file mode 100644
index 0000000..a02f02f
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/aiyh_ftpfiel/ReadFTPFielController.java
@@ -0,0 +1,78 @@
+package com.api.aiyh_ftpfiel;
+
+import weaver.hrm.HrmUserVarify;
+import weaver.hrm.User;
+import weaver.interfaces.workflow.action.DlWfOutPutFileAction;
+import weaver.interfaces.workflow.action.dloutputfile.util.FTPUtil;
+import weaver.soa.workflow.request.RequestInfo;
+import weaver.workflow.request.RequestManager;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.ws.rs.*;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+
+/**
+ * <p>ftp 下载文件类</p>
+ * <p>create 2022/2/28 0028 18:39</p>
+ *
+ * @author EBU7-dev1-ayh
+ */
+
+@Path("/ftp")
+public class ReadFTPFielController {
+
+    @GET
+    @Path("/down-file/{requestId}/{workflowId}")
+    @Produces(MediaType.APPLICATION_JSON)
+    @Consumes(MediaType.APPLICATION_JSON)
+    public String downFtpFile(@Context HttpServletRequest request, @Context HttpServletResponse response,
+                              @PathParam("requestId") String requestId, @PathParam("workflowId") String workflowId) {
+        FTPUtil.logger.info("进入请求方法！" + String.format("requestId : {%s}, workflowId: {%s}.", request, workflowId));
+        try {
+
+            User user = HrmUserVarify.getUser(request, response);
+            DlWfOutPutFileAction dlWfOutPutFileAction = new DlWfOutPutFileAction();
+            FTPUtil.logger.info("创建action对象");
+            RequestInfo requestInfo = new RequestInfo();
+            FTPUtil.logger.info("创建RequestInfo对象");
+            RequestManager requestManager = new RequestManager();
+            FTPUtil.logger.info("创建RequestManager对象");
+            requestManager.setUser(user);
+            requestManager.setWorkflowid(Integer.parseInt(workflowId));
+            requestManager.setRequestid(Integer.parseInt(requestId));
+            requestInfo.setRequestid(requestId);
+            requestInfo.setWorkflowid(workflowId);
+            requestInfo.setRequestManager(requestManager);
+            FTPUtil.logger.info("设置requestInfo信息");
+            dlWfOutPutFileAction.execute(requestInfo);
+            FTPUtil.logger.info("执行execute方法！");
+        }catch (Exception e){
+            FTPUtil.logger.error("执行失败： " + getErrString(e));
+            return "{\"msg\": \"访问成功,执行失败！\",\"code\": 200}\n";
+        }
+        return "{\"msg\": \"访问成功！\",\"code\": 200}\n";
+    }
+
+    /**
+     * 获取完整的错误信息
+     *
+     * @param throwable 异常
+     * @return 完整堆栈信息
+     */
+    public  String getErrString(Throwable throwable) {
+        StringWriter stringWriter = new StringWriter();
+        throwable.printStackTrace(new PrintWriter(stringWriter, true));
+        String errStr = stringWriter.getBuffer().toString();
+        try {
+            stringWriter.close();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return errStr;
+    }
+}
diff --git a/src/main/youhong_ai_old_src/com/api/aiyh_fute/sign_in/controller/SignFTController.java b/src/main/youhong_ai_old_src/com/api/aiyh_fute/sign_in/controller/SignFTController.java
new file mode 100644
index 0000000..7736ed9
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/aiyh_fute/sign_in/controller/SignFTController.java
@@ -0,0 +1,120 @@
+package com.api.aiyh_fute.sign_in.controller;
+
+
+import aiyh.utils.ApiResult;
+import aiyh.utils.Util;
+import aiyh.utils.excention.CustomerException;
+import com.alibaba.fastjson.JSON;
+import com.api.aiyh_fute.sign_in.service.SignFtService;
+import io.swagger.v3.oas.annotations.parameters.RequestBody;
+import org.apache.log4j.Logger;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.ws.rs.*;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import java.net.URI;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 登录福特系统接口
+ *
+ * @author aoey.oct.22
+ */
+
+@Path("/sign-in/")
+public class SignFTController {
+
+    /**
+     * service 逻辑处理
+     */
+    private final SignFtService signFtService = new SignFtService();
+    /**
+     * 日志
+     */
+    private final Logger logger = Util.getLogger();
+
+
+    /**
+     * 跳转到福特链接
+     *
+     * @param request  请求体
+     * @param response 响应体
+     * @return 响应对象
+     */
+    @Path("/to-fute")
+    @Produces(MediaType.APPLICATION_JSON)
+    @GET
+    public Response toFtRedirect(@Context HttpServletRequest request, @Context HttpServletResponse response) {
+        try {
+            URI uri = signFtService.createJumpUri(request, response);
+            return Response.temporaryRedirect(uri).build();
+        } catch (Exception e) {
+            e.printStackTrace();
+            return Response.ok(ApiResult.error(e.getMessage())).build();
+        }
+    }
+
+
+    /**
+     * 通过secret和ID获取token
+     *
+     * @param params 传递的参数信息
+     * @return token数据
+     */
+    @Path("/get-token")
+    @Produces(MediaType.APPLICATION_JSON)
+    @Consumes(MediaType.APPLICATION_JSON)
+    @POST
+    public String getToken(@RequestBody Map<String, Object> params) {
+        try {
+            Map<String, Object> success = signFtService.getToken(params);
+            return JSON.toJSONString(success);
+        } catch (Exception e) {
+            e.printStackTrace();
+            Map<String, String> err = new HashMap<>(2);
+            err.put("error", "500 There is an internal error in the server. Please contact the administrator or operation and maintenance staff of the other party. ");
+            return JSON.toJSONString(err);
+        }
+    }
+
+
+    /**
+     * 获取用户信息
+     * @param request 请求题
+     * @param response 响应体
+     * @param params 请求参数
+     * @param authorization 请求头中的验证信息
+     * @return 用户数据
+     */
+    @Path("/user")
+    @Produces(MediaType.APPLICATION_JSON)
+    @Consumes(MediaType.APPLICATION_JSON)
+    @POST
+    public String getUserInfo(@Context HttpServletRequest request, @Context HttpServletResponse response,
+                              @RequestBody Map<String,String> params,@HeaderParam("Authorization") String authorization) {
+
+        Map<String, Object> result = new HashMap<>(8);
+        try {
+            Map<String,Object> userInfo = signFtService.getUserInfo(authorization,params);
+            return JSON.toJSONString(userInfo );
+        } catch (CustomerException e){
+            e.printStackTrace();
+            result.put("result_message", e.getMessage());
+            result.put("result_code", "1001");
+            result.put("result", null);
+            result.put("success", false);
+            return JSON.toJSONString(result);
+        }catch (Exception e) {
+            logger.error(Util.getErrString(e));
+            result.put("result_message", "500 There is an internal error in the server. Please contact the administrator or operation and maintenance staff of the other party. ");
+            result.put("result_code", "500");
+            result.put("result", null);
+            result.put("success", false);
+            return JSON.toJSONString(result);
+        }
+    }
+}
diff --git a/src/main/youhong_ai_old_src/com/api/aiyh_fute/sign_in/mapper/SignFtMapper.java b/src/main/youhong_ai_old_src/com/api/aiyh_fute/sign_in/mapper/SignFtMapper.java
new file mode 100644
index 0000000..6c9b382
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/aiyh_fute/sign_in/mapper/SignFtMapper.java
@@ -0,0 +1,56 @@
+package com.api.aiyh_fute.sign_in.mapper;
+
+import aiyh.utils.annotation.recordset.*;
+
+import java.util.Map;
+
+/**
+ * <p> 查询数据库</p>
+ * <p>create 2022/3/9 10:57 AM</p>
+ *
+ * @author ayh
+ */
+
+@SqlMapper
+public interface SignFtMapper {
+
+    /**
+     * 更新数据信息
+     * @param dataId 数据ID
+     * @param jumpCode 跳转码
+     * @param jumpCodeTime 跳转码过期时间
+     * @param uid 用户ID
+     */
+    @Update("update uf_jump_code set user_id = #{uid}, jump_code = #{jumpCode}, effective_time = #{effectiveTime}" +
+            " where id = #{dataId}")
+    public void updateFtJumpCode(@ParamMapper("dataId") int dataId,
+                                 @ParamMapper("jumpCode") String jumpCode,
+                                 @ParamMapper("effectiveTime") Long jumpCodeTime,
+                                 @ParamMapper("uid") int uid);
+
+
+    /**
+     * 查询是否拥有处于有效期内的用户跳转码
+     * @param jumpCode 用户跳转码
+     * @param jumpCodeTime 跳转码过期时间
+     * @return 用户id
+     */
+    @Select("select user_id from uf_jump_code where jump_code = #{jumpCode} and effective_time >= #{effectiveTime}")
+    int selectFtJumpCodeExist(@ParamMapper("jumpCode") String jumpCode, @ParamMapper("effectiveTime") Long jumpCodeTime);
+
+    /**
+     * 查询是否存在记录
+     * @param uid 用户ID
+     * @return 数据id
+     */
+    @Select("select id from uf_jump_code where user_id = #{uid}")
+    int selectFtJumpCodeId(@ParamMapper("uid") int uid);
+
+    /**
+     * 查询人员数据
+     * @param userId 用户ID
+     * @return 用户信息
+     */
+    @Select("select * from hrmresource where id = #{userId}")
+    Map<String, String> selectUser(@ParamMapper("userId") int userId);
+}
diff --git a/src/main/youhong_ai_old_src/com/api/aiyh_fute/sign_in/service/SignFtService.java b/src/main/youhong_ai_old_src/com/api/aiyh_fute/sign_in/service/SignFtService.java
new file mode 100644
index 0000000..6ebd83a
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/aiyh_fute/sign_in/service/SignFtService.java
@@ -0,0 +1,260 @@
+package com.api.aiyh_fute.sign_in.service;
+
+import aiyh.utils.Util;
+import aiyh.utils.excention.CustomerException;
+import cn.hutool.core.lang.UUID;
+import com.alibaba.fastjson.JSON;
+import com.api.aiyh_fute.sign_in.mapper.SignFtMapper;
+import com.api.aiyh_fute.sign_in.util.TokenUtils;
+import com.auth0.jwt.algorithms.Algorithm;
+import com.weaver.general.TimeUtil;
+import org.apache.log4j.Logger;
+import org.h2.util.StringUtils;
+import weaver.formmode.data.ModeDataIdUpdate;
+import weaver.hrm.HrmUserVarify;
+import weaver.hrm.User;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.UnsupportedEncodingException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * <p></p>
+ * <p>create 2022/3/9 10:50 AM</p>
+ *
+ * @author ayh
+ */
+
+public class SignFtService {
+	
+	private final SignFtMapper signFtMapper = Util.getMapper(SignFtMapper.class);
+	private final String ftConfigTable = "uf_jump_code";
+	private final Logger logger = Util.getLogger();
+	private final Map<String, String> secretMap = new HashMap<>();
+	private final TokenUtils tokenUtils = new TokenUtils();
+	
+	
+	/**
+	 * 生成跳转码
+	 *
+	 * @param user 用户信息
+	 * @return 跳转码
+	 */
+	public String createJumpCode(User user) {
+		String jumpCode = UUID.randomUUID().toString();
+		String jumpCodeTimeConfig = Util.getCusConfigValueNullOrEmpty("FT_JUMP_CODE_TIME", "0");
+		int jumpCodeTimeConfigNum = Integer.parseInt(jumpCodeTimeConfig);
+		if (jumpCodeTimeConfigNum <= 1000) {
+			jumpCodeTimeConfigNum = 1000 * 60;
+		}
+		int dataId = signFtMapper.selectFtJumpCodeId(user.getUID());
+		if (dataId <= 0) {
+//            生成新的数据id
+			ModeDataIdUpdate mdu = ModeDataIdUpdate.getInstance();
+			String formModeId = Util.getCusConfigValueNullOrEmpty("FT_FORM_MODE_ID", "9");
+			dataId = mdu.getModeDataNewId(ftConfigTable, Util.getIntValue(formModeId, -1), 1, 0, TimeUtil.getCurrentDateString(), TimeUtil.getOnlyCurrentTimeString());
+		}
+		long currentTime = System.currentTimeMillis();
+		Long jumpCodeTime = currentTime + jumpCodeTimeConfigNum;
+//        存在就跟新
+		signFtMapper.updateFtJumpCode(dataId, jumpCode, jumpCodeTime, user.getUID());
+		return jumpCode;
+	}
+	
+	/**
+	 * 创建链接对象URI
+	 *
+	 * @param request  用户请求
+	 * @param response 响应体
+	 * @return URI对象
+	 */
+	public URI createJumpUri(HttpServletRequest request, HttpServletResponse response) {
+		User user = HrmUserVarify.getUser(request, response);
+		String jumpCode = createJumpCode(user);
+		URI uri = null;
+		String ftUri = Util.getCusConfigValueNullOrEmpty("FU_TE_URI", "");
+		String newFtUri = ftUri.replaceAll("#\\{\\s*jumpCode\\s*}", jumpCode);
+		try {
+			uri = new URI(newFtUri);
+		} catch (URISyntaxException e) {
+			throw new CustomerException("福特跳转链接失败！链接：" + newFtUri, e);
+		}
+		return uri;
+	}
+	
+	/**
+	 * 获取token
+	 *
+	 * @param params 请求参数
+	 * @return 响应参数
+	 */
+	public Map<String, Object> getToken(Map<String, Object> params) {
+		verifySecret();
+		String clientId = String.valueOf(params.get("clientid"));
+		String clientSecret = String.valueOf(params.get("clientsecret"));
+		if (!clientId.equals(secretMap.get("clientId"))) {
+			logger.error("clientId 错误：" + JSON.toJSONString(params));
+			return new HashMap<String, Object>(2) {{
+				put("error", "clientId it doesn't exist.");
+			}};
+		}
+		if (!clientSecret.equals(secretMap.get("clientSecret"))) {
+			logger.error("clientSecret 错误：" + JSON.toJSONString(params));
+			return new HashMap<String, Object>(2) {{
+				put("error", "clientSecret error.");
+			}};
+		}
+		Map<String, String> claims = new HashMap<>(4);
+		claims.put("clientId", clientId);
+		claims.put("clientSecret", clientSecret);
+		Map<String, Object> result = new HashMap<>(16);
+		try {
+			tokenUtils.setAlgorithm(Algorithm.HMAC256(clientSecret));
+		} catch (UnsupportedEncodingException e) {
+			throw new RuntimeException(e);
+		}
+		String tokenExpires = Util.getCusConfigValueNullOrEmpty("TOKEN_EXPIRES", "3600");
+		int expiresTime = Integer.parseInt(tokenExpires);
+		tokenUtils.setExpiresAt(new Date(System.currentTimeMillis() + 1000L * expiresTime));
+		tokenUtils.setIssuer("FU_TE");
+		tokenUtils.setSecret(clientSecret);
+		tokenUtils.setClaims(claims);
+		String token = tokenUtils.getToken();
+		result.put("access_token", token);
+		result.put("expires_in", String.valueOf(expiresTime));
+		result.put("token_type", "Bearer");
+		result.put("scope", "");
+		return result;
+	}
+	
+	/**
+	 * 通过token获取用户信息
+	 *
+	 * @param authorization token字符串
+	 * @param params        请求参数，跳转码
+	 * @return 请求响应消息
+	 */
+	public Map<String, Object> getUserInfo(String authorization, Map<String, String> params) {
+		String token = authorization == null ? "" : authorization.replace("Bearer", "").trim();
+		Map<String, Object> result = new HashMap<>(16);
+		if (StringUtils.isNullOrEmpty(token)) {
+			result.put("result_message", "token不存在，请生成token后重新调用！");
+			result.put("result_code", "401");
+			result.put("result", null);
+			result.put("success", false);
+			return result;
+		}
+		if (tokenUtils.verifyTokenValid(token)) {
+			result.put("result_message", "token已过期，请重新生成token！");
+			result.put("result_code", "403");
+			result.put("result", null);
+			result.put("success", false);
+			return result;
+		}
+		verifySecret();
+		Map<String, String> claims = new HashMap<>(4);
+		claims.put("clientId", secretMap.get("lientId"));
+		claims.put("clientSecret", secretMap.get("clientSecret"));
+		try {
+			try {
+				tokenUtils.setAlgorithm(Algorithm.HMAC256(secretMap.get("clientSecret")));
+			} catch (UnsupportedEncodingException e) {
+				throw new RuntimeException(e);
+			}
+			tokenUtils.setExpiresAt(new Date());
+			tokenUtils.setIssuer("FU_TE");
+			tokenUtils.setSecret(secretMap.get("clientSecret"));
+			tokenUtils.setClaims(claims);
+			if (tokenUtils.verifyToken(token)) {
+				result.put("result_message", "success");
+				result.put("result_code", "code_cracked");
+				result.put("result", getUserInfoByJumpCode(params.get("code")));
+				result.put("success", true);
+				return result;
+			}
+			throw new CustomerException("token验证失败！");
+		} catch (CustomerException e) {
+			e.printStackTrace();
+			result.clear();
+			if (e.getCode() == 404) {
+				result.put("result_message", "跳转码失效或不存在，请重新生成跳转码！");
+				result.put("result_code", "404");
+			} else if (e.getCode() == 500) {
+				result.put("result_message", "内部服务出错，请联系系统管理员或运维人员！");
+				result.put("result_code", "500");
+			} else {
+				result.put("result_message", "token不存在，请重新生成token后调用！");
+				result.put("result_code", "401");
+			}
+			result.put("result", null);
+			result.put("success", false);
+			return result;
+		}
+	}
+	
+	/**
+	 * 获取secret信息
+	 */
+	private void verifySecret() {
+		try {
+			if (secretMap.isEmpty()) {
+				Map<String, Object> proper = Util.readProperties2Map("ftClientSecret", "aiyh.client");
+				for (Map.Entry<String, Object> entry : proper.entrySet()) {
+					secretMap.put(entry.getKey(), String.valueOf(entry.getValue()));
+				}
+			}
+		} catch (Exception e) {
+			throw new CustomerException("未读取到配置文件WEB-INF/pro/prop2map/ftClientSecret.properties;", e);
+		}
+	}
+	
+	
+	/**
+	 * 查询用户信息
+	 *
+	 * @param jumpCode 跳转码
+	 * @return 用户信息
+	 */
+	private Map<String, Object> getUserInfoByJumpCode(String jumpCode) {
+		int userId = signFtMapper.selectFtJumpCodeExist(jumpCode, System.currentTimeMillis());
+		if (userId <= 0) {
+			throw new CustomerException("跳转码实效或不存在，请重新生成跳转码！", 404);
+		}
+		Map<String, String> user = signFtMapper.selectUser(userId);
+		if (Objects.isNull(user)) {
+			throw new CustomerException("未查询到用户，请检查用户是否为系统管理员, 用户ID： " + userId, 500);
+		}
+		Map<String, Object> sqlMapper;
+		Map<String, Object> result = new HashMap<>(8);
+		try {
+			sqlMapper = Util.readProperties2Map("ftClientSecret", "aiyh.sqlMapper");
+			for (Map.Entry<String, Object> entry : sqlMapper.entrySet()) {
+				String pattern = "#\\{\\s*(?<field>\\S+)\\s*}";
+				Pattern compile = Pattern.compile(pattern);
+				Matcher matcher = compile.matcher(String.valueOf(entry.getValue()));
+				if (matcher.find()) {
+					String field = matcher.group("field");
+					if (user.containsKey(field)) {
+						result.put(entry.getKey(), user.get(field));
+					} else {
+						result.put(entry.getKey(), user.get(field.toUpperCase()));
+					}
+					continue;
+				}
+				result.put(entry.getKey(), entry.getValue());
+			}
+			result.put("ee_no", String.valueOf(result.get("org_code")) + result.get("ee_no"));
+			return result;
+		} catch (Exception e) {
+			throw new CustomerException("未读取到配置文件WEB-INF/pro/prop2map/ftClientSecret.properties;", e);
+		}
+	}
+}
diff --git a/src/main/youhong_ai_old_src/com/api/aiyh_fute/sign_in/util/TokenUtils.java b/src/main/youhong_ai_old_src/com/api/aiyh_fute/sign_in/util/TokenUtils.java
new file mode 100644
index 0000000..13769fd
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/aiyh_fute/sign_in/util/TokenUtils.java
@@ -0,0 +1,114 @@
+package com.api.aiyh_fute.sign_in.util;
+
+import aiyh.utils.excention.CustomerException;
+import com.auth0.jwt.JWT;
+import com.auth0.jwt.JWTCreator;
+import com.auth0.jwt.JWTVerifier;
+import com.auth0.jwt.algorithms.Algorithm;
+import com.auth0.jwt.interfaces.DecodedJWT;
+import com.auth0.jwt.interfaces.Verification;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import java.util.Map;
+
+/**
+ * <p>token 工具类</p>
+ * <p>create 2022/3/9 5:32 PM</p>
+ *
+ * @author ayh
+ */
+
+@Setter
+@Getter
+@AllArgsConstructor
+@NoArgsConstructor
+public class TokenUtils {
+	
+	private String secret;
+	private Algorithm algorithm;
+	private Map<String, String> claims;
+	private String issuer;
+	private Date expiresAt;
+	
+	
+	/**
+	 * 获取根据设置的属性获取token
+	 *
+	 * @return token字符串
+	 */
+	public String getToken() {
+		try {
+			JWTCreator.Builder builder = JWT.create()
+					                             .withExpiresAt(expiresAt)
+					                             .withIssuer(issuer);
+			for (Map.Entry<String, String> claim : claims.entrySet()) {
+				builder.withClaim(claim.getKey(), claim.getValue());
+			}
+			return builder.sign(algorithm);
+		} catch (NullPointerException e) {
+			throw new CustomerException("缺少生成token的必要参数！");
+		}
+	}
+	
+	/**
+	 * 根据自定义数据生成token
+	 *
+	 * @param secret    验签字符串
+	 * @param claims    索赔
+	 * @param expiresAt 过期时间
+	 * @param issuer    创建者信息
+	 * @return token字符串
+	 */
+	public String getToken(String secret, Map<String, String> claims, Date expiresAt, String issuer) {
+		this.secret = secret;
+		try {
+			this.algorithm = Algorithm.HMAC256(secret);
+		} catch (UnsupportedEncodingException e) {
+			throw new RuntimeException(e);
+		}
+		this.claims = claims;
+		this.expiresAt = expiresAt;
+		this.issuer = issuer;
+		return this.getToken();
+	}
+	
+	
+	/**
+	 * 验证token的有效性
+	 *
+	 * @param token token
+	 * @return 是否有效
+	 */
+	public boolean verifyTokenValid(String token) {
+		DecodedJWT jwt = JWT.decode(token);
+		Date expiresAt = jwt.getExpiresAt();
+		Date currentTime = new Date();
+		return !currentTime.before(expiresAt);
+	}
+	
+	/**
+	 * 验证token的有效性
+	 *
+	 * @param token token字符串
+	 * @return 是否有效
+	 */
+	public boolean verifyToken(String token) {
+		try {
+			Verification verification = JWT.require(this.algorithm)
+					                            .withIssuer(this.issuer);
+			for (Map.Entry<String, String> claim : this.claims.entrySet()) {
+				verification.withClaim(claim.getKey(), claim.getValue());
+			}
+			JWTVerifier jwtVerifier = verification.build();
+			jwtVerifier.verify(token);
+		} catch (Exception e) {
+			return false;
+		}
+		return true;
+	}
+}
diff --git a/src/main/youhong_ai_old_src/com/api/aiyh_guijiu/dao/ConflictWorkflowDao.java b/src/main/youhong_ai_old_src/com/api/aiyh_guijiu/dao/ConflictWorkflowDao.java
new file mode 100644
index 0000000..7edfa63
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/aiyh_guijiu/dao/ConflictWorkflowDao.java
@@ -0,0 +1,212 @@
+package com.api.aiyh_guijiu.dao;
+
+import aiyh.utils.Util;
+import aiyh.utils.zwl.common.ToolUtil;
+import com.api.aiyh_guijiu.pojo.UfWorkflowConflicDt1DTO;
+import com.api.aiyh_guijiu.pojo.WorkflowBaseInfoDTO;
+import com.api.aiyh_guijiu.pojo.WorkflowConfigDTO;
+import com.api.aiyh_guijiu.vo.ConfigInfoVo;
+import org.h2.util.StringUtils;
+import weaver.conn.RecordSet;
+import weaver.workflow.workflow.WorkflowVersion;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author EBU7-dev1-ayh
+ * @create 2021/9/10 0010 11:27
+ * 查询配置信息
+ */
+
+
+public class ConflictWorkflowDao {
+
+	RecordSet rs = new RecordSet();
+	ToolUtil toolUtil = new ToolUtil();
+
+	public List<WorkflowConfigDTO> queryConfig(String workflowId) {
+
+		String query = "select * from uf_workflow_conflic_dt1 " +
+				"where workflow_type in (select id from workflow_base " +
+				"where activeVersionID in (select activeVersionID " +
+				"from workflow_base where id = ?) or id = ?)";
+		rs.executeQuery(query, workflowId, workflowId);
+		UfWorkflowConflicDt1DTO ufWorkflowConflicDt1DTO = Util.recordeSet2Entity(rs, UfWorkflowConflicDt1DTO.class, true);
+		if (ufWorkflowConflicDt1DTO == null) {
+			return null;
+		}
+//		String ids = WorkflowVersion.getVersionStringByWfid(workflowId);
+		query = "select dt.id,dt.workflow_type,main.enable,wf.tablename,wf.fieldname  start_date_field, " +
+				"wf1.fieldname  start_time_field,wf2.fieldname  end_date_field,wf4.fieldname  hrm_field, " +
+				"wf3.fieldname  end_time_field from uf_workflow_conflic  main " +
+				"left join uf_workflow_conflic_dt1  dt on dt.mainid = main.id  " +
+				"left join workflow_field_table_view  wf on wf.id = dt.start_date_field " +
+				"left join workflow_field_table_view  wf1 on wf1.id = dt.start_time_field " +
+				"left join workflow_field_table_view  wf2 on wf2.id = dt.end_date_field " +
+				"left join workflow_field_table_view  wf3 on wf3.id = dt.end_time_field " +
+				"left join workflow_field_table_view  wf4 on wf4.id = dt.hrm_field " +
+				"where main.id = ? and main.enable = 0";
+//		and dt.workflow_type not in (" + ids + ")
+		rs.executeQuery(query, ufWorkflowConflicDt1DTO.getMainid());
+		return Util.recordeSet2Array(rs, WorkflowConfigDTO.class, true);
+	}
+
+	public List<WorkflowBaseInfoDTO> queryConflict(WorkflowConfigDTO workflowConfigDTO, String startTime
+			, String startDate, String endTime, String endDate, String hrmId, String requestId) {
+//	    (a,b)(c,d)  == > (2021-09-10 12:00:23 , 2021-09-10 20:00:23) (2021-09-10 15:00:23 , 2021-09-10 19:00:23)
+//		select * from table where (hrm = ? or hrm like "%?%") and a <= d and b >= c and requestid != requestId;
+		String query = "select id from " + workflowConfigDTO.getTablename() +
+				" where (',' || " + workflowConfigDTO.getHrmField() +" || ',') like  ('%,' || '" + hrmId + "' || ',%')  " +
+				" and requestid != " + requestId + " and " + workflowConfigDTO.getStartDateField() + " is not null " +
+				" and " + workflowConfigDTO.getEndDateField() + " is not null" +
+				(StringUtils.isNullOrEmpty(workflowConfigDTO.getStartTimeField()) ? "" : " and " + workflowConfigDTO.getStartTimeField() + " is not null") +
+				(StringUtils.isNullOrEmpty(workflowConfigDTO.getEndTimeField()) ? "" : " and " + workflowConfigDTO.getEndTimeField() + " is not null");
+		rs.executeQuery(query);
+		List<String> integers = Util.recordeSet2Array(rs, String.class);
+		String ids = String.join(",", integers);
+		if(StringUtils.isNullOrEmpty(ids)){
+			ids = "-1";
+		}
+		query = "select * from " +
+				workflowConfigDTO.getTablename() +
+				" where to_date(concat(" +
+				workflowConfigDTO.getStartDateField() +
+				" || ' ' ," +
+				(StringUtils.isNullOrEmpty(workflowConfigDTO.getStartTimeField()) ? "'00:00:00'" : workflowConfigDTO.getStartTimeField()) +
+				"), 'yyyy-mm-dd hh24:mi:ss') <=  to_date('" +
+				endDate +
+				" " +
+				(StringUtils.isNullOrEmpty(endTime) ? "23:59:59" : endTime) +
+				"', 'yyyy-mm-dd hh24:mi:ss')" +
+				" and to_date(concat(" +
+				workflowConfigDTO.getEndDateField() +
+				" || ' ' ," +
+				(StringUtils.isNullOrEmpty(workflowConfigDTO.getEndTimeField()) ? "'23:59:59'" : workflowConfigDTO.getEndTimeField()) +
+				"), 'yyyy-mm-dd hh24:mi:ss') >= to_date('" +
+				startDate +
+				" " +
+				(StringUtils.isNullOrEmpty(startTime) ? "00:00:00" : startTime) +
+				"', 'yyyy-mm-dd hh24:mi:ss')  " +
+				" and  id in (" + ids + ")";
+		/*query = "select * from " +
+				workflowConfigDTO.getTablename() +
+				" where to_date(concat(" +
+				workflowConfigDTO.getStartDateField() +
+				" || ' ' ," +
+				(StringUtils.isNullOrEmpty(workflowConfigDTO.getStartTimeField()) ? "'00:00:00'" : workflowConfigDTO.getStartTimeField()) +
+				"), 'yyyy-mm-dd hh24:mi:ss') <=  to_date('" +
+				endDate +
+				" " +
+				(StringUtils.isNullOrEmpty(endTime) ? "23:59:59" : endTime) +
+				"', 'yyyy-mm-dd hh24:mi:ss')" +
+				" and to_date(concat(" +
+				workflowConfigDTO.getEndDateField() +
+				" || ' ' ," +
+				(StringUtils.isNullOrEmpty(workflowConfigDTO.getEndTimeField()) ? "'23:59:59'" : workflowConfigDTO.getEndTimeField()) +
+				"), 'yyyy-mm-dd hh24:mi:ss') >= to_date('" +
+				startDate +
+				" " +
+				(StringUtils.isNullOrEmpty(startTime) ? "00:00:00" : startTime) +
+				"', 'yyyy-mm-dd hh24:mi:ss')  " +
+				" and " + " (',' || " + workflowConfigDTO.getHrmField() + " || ',') like " +  " ('%,' || '" + hrmId + "' || ',%') "  +
+				" and requestid != " + requestId;*/
+				/*hrmId +
+				" in (select regexp_substr(hrm_str, '[^,]+', 1, level) " +
+				"from dual connect by regexp_substr(hrm_str, '[^,]+', 1, level) is not null)" +
+				" and requestid != " + requestId;*/
+//		toolUtil.writeErrorLog(query);
+
+//		System.out.println(query);
+		/*query = "select * from " + workflowConfigDTO.getTablename() + " where to_date(concat("
+				+ workflowConfigDTO.getStartDateField() + " || ' ' ," + workflowConfigDTO.getStartTimeField()
+				+ "), 'yyyy-mm-dd hh24:mi:ss') <=  to_date(concat("
+				+ endDate + " " + endTime + "), 'yyyy-mm-dd hh24:mi:ss')"
+				+ " and " + workflowConfigDTO.getEndDateField() + " || ' ' ," + workflowConfigDTO.getEndTimeField()
+				+ "), 'yyyy-mm-dd hh24:mi:ss') >= to_date(concat("
+				+ startDate + " " + startTime + "), 'yyyy-mm-dd hh24:mi:ss') " + hrmId
+				+ " and in (select regexp_substr(hrm_str, '[^,]+', 1, level) " +
+				"from dual connect by regexp_substr(hrm_str, '[^,]+', 1, level) is not null)";*/
+		try {
+			rs.executeQuery(query);
+		}catch (Exception e){
+			toolUtil.writeErrorLog("查询重复的流程错误，错误信息:" + e);
+		}
+		List<WorkflowBaseInfoDTO> list = new ArrayList<>();
+		while(rs.next()){
+//			存在时间段冲突的数据，查询冲突数据的流程信息
+			RecordSet rsT = new RecordSet();
+			requestId = Util.null2String(rs.getString("requestid"));
+			query = "select distinct  wrb.requestid,wrb.workflowid,wrb.requestnamenew,wb.workflowname, " +
+					"(case when hr.lastname is null and wrb.creater != 1 then '未知'  " +
+					"when wrb.creater = 1 then '系统管理员' else hr.lastname  end)  creater,  " +
+					"wrb.createdate,wrb.createtime from workflow_requestbase  wrb  " +
+					"left join HrmResource  hr on wrb.creater = hr.id " +
+					"left join workflow_base  wb on wb.id = wrb.workflowid " +
+					"where wrb.requestid = ?";
+			rsT.executeQuery(query, requestId);
+			WorkflowBaseInfoDTO workflowBaseInfoDTO = Util.recordeSet2Entity(rsT, WorkflowBaseInfoDTO.class, true);
+			list.add(workflowBaseInfoDTO);
+		}
+//		if (rs.next()) {
+//			toolUtil.writeDebuggerLog("into next;");
+////			存在时间段冲突的数据，查询冲突数据的流程信息
+//			requestId = Util.null2String(rs.getString("requestid"));
+//			query = "select wrb.workflowid,wrb.requestid,wrb.requestnamenew,wb.workflowname, " +
+//					"(case when hr.lastname is null and wrb.creater != 1 then '未知'  " +
+//					"when wrb.creater = 1 then '系统管理员' else hr.lastname  end)  creater,  " +
+//					"wrb.createdate,wrb.createtime from workflow_requestbase  wrb  " +
+//					"left join HrmResource  hr on wrb.creater = hr.id " +
+//					"left join workflow_base  wb on wb.id = wrb.workflowid " +
+//					"where wrb.requestid = ?";
+//			rs.executeQuery(query, requestId);
+//			return Util.recordeSet2Entity(rs, WorkflowBaseInfoDTO.class, true);
+//		}
+		if(list.size() == 0){
+			return null;
+		}
+		return list;
+	}
+
+	public List<Integer> getWatermarkConfig(String workflowId) {
+		String query = "select id from workflow_base " +
+				"where activeVersionID in (select activeVersionID " +
+				"from workflow_base where id = ?) or id = ?";
+		rs.executeQuery(query, workflowId, workflowId);
+		return Util.recordeSet2Array(rs, Integer.class);
+	}
+
+	public WorkflowConfigDTO getWorkflowConfig(String workflowId){
+		String query = "select * from uf_workflow_conflic_dt1 " +
+				"where workflow_type in (select id from workflow_base " +
+				"where activeVersionID in (select activeVersionID " +
+				"from workflow_base where id = ?) or id = ?)";
+		rs.executeQuery(query, workflowId, workflowId);
+		UfWorkflowConflicDt1DTO ufWorkflowConflicDt1DTO = Util.recordeSet2Entity(rs, UfWorkflowConflicDt1DTO.class, true);
+		if (ufWorkflowConflicDt1DTO == null) {
+			return null;
+		}
+		String ids = WorkflowVersion.getVersionStringByWfid(workflowId);
+		query = "select dt.id,main.enable,wf.tablename,wf.fieldname  start_date_field, " +
+				"wf1.fieldname  start_time_field,wf2.fieldname  end_date_field,wf4.fieldname  hrm_field, " +
+				"wf3.fieldname  end_time_field from uf_workflow_conflic  main " +
+				"left join uf_workflow_conflic_dt1  dt on dt.mainid = main.id  " +
+				"left join workflow_field_table_view  wf on wf.id = dt.start_date_field " +
+				"left join workflow_field_table_view  wf1 on wf1.id = dt.start_time_field " +
+				"left join workflow_field_table_view  wf2 on wf2.id = dt.end_date_field " +
+				"left join workflow_field_table_view  wf3 on wf3.id = dt.end_time_field " +
+				"left join workflow_field_table_view  wf4 on wf4.id = dt.hrm_field " +
+				"where main.id = ? and main.enable = 0 and dt.workflow_type in (" + ids + ")";
+		rs.executeQuery(query, ufWorkflowConflicDt1DTO.getMainid());
+		return Util.recordeSet2Entity(rs,WorkflowConfigDTO.class,true);
+	}
+
+
+	public ConfigInfoVo getConfigInfo(String tableName,String workflowId){
+		String query = "select cf.workflow_type ,cf.workflow_node ,cf.enable ,wf.fieldname workflow_field  from " + tableName +
+				" cf left join workflow_field_table_view  wf on wf.id = cf.workflow_field " +
+				" where cf.workflow_type = ?";
+		rs.executeQuery(query,workflowId);
+		return Util.recordeSet2Entity(rs, ConfigInfoVo.class, true);
+	}
+}
diff --git a/src/main/youhong_ai_old_src/com/api/aiyh_guijiu/pojo/UfWorkflowConflicDt1DTO.java b/src/main/youhong_ai_old_src/com/api/aiyh_guijiu/pojo/UfWorkflowConflicDt1DTO.java
new file mode 100644
index 0000000..926fac0
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/aiyh_guijiu/pojo/UfWorkflowConflicDt1DTO.java
@@ -0,0 +1,83 @@
+
+package com.api.aiyh_guijiu.pojo; 
+
+
+public class UfWorkflowConflicDt1DTO {
+
+	private int id;
+	private int mainid;
+	private int workflowType;
+	private String startDateField;
+	private String startTimeField;
+	private String endDateField;
+	private String endTimeField;
+
+	public void setId(int id){
+		this.id = id;
+	}
+
+	public void setMainid(int mainid){
+		this.mainid = mainid;
+	}
+
+	public void setWorkflowType(int workflowType){
+		this.workflowType = workflowType;
+	}
+
+	public void setStartDateField(String startDateField){
+		this.startDateField = startDateField;
+	}
+
+	public void setStartTimeField(String startTimeField){
+		this.startTimeField = startTimeField;
+	}
+
+	public void setEndDateField(String endDateField){
+		this.endDateField = endDateField;
+	}
+
+	public void setEndTimeField(String endTimeField){
+		this.endTimeField = endTimeField;
+	}
+
+	public int getId(){
+		return this.id;
+	}
+
+	public int getMainid(){
+		return this.mainid;
+	}
+
+	public int getWorkflowType(){
+		return this.workflowType;
+	}
+
+	public String getStartDateField(){
+		return this.startDateField;
+	}
+
+	public String getStartTimeField(){
+		return this.startTimeField;
+	}
+
+	public String getEndDateField(){
+		return this.endDateField;
+	}
+
+	public String getEndTimeField(){
+		return this.endTimeField;
+	}
+
+	@Override
+	public String toString() {
+		return "UfWorkflowConflicDt1DTO{" +
+				"id='" + id + '\'' +
+				", mainid='" + mainid + '\'' +
+				", workflowType='" + workflowType + '\'' +
+				", startDateField='" + startDateField + '\'' +
+				", startTimeField='" + startTimeField + '\'' +
+				", endDateField='" + endDateField + '\'' +
+				", endTimeField='" + endTimeField + '\'' +
+				'}';
+	}
+}
\ No newline at end of file
diff --git a/src/main/youhong_ai_old_src/com/api/aiyh_guijiu/pojo/WorkflowBaseInfoDTO.java b/src/main/youhong_ai_old_src/com/api/aiyh_guijiu/pojo/WorkflowBaseInfoDTO.java
new file mode 100644
index 0000000..9f38ea5
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/aiyh_guijiu/pojo/WorkflowBaseInfoDTO.java
@@ -0,0 +1,83 @@
+
+package com.api.aiyh_guijiu.pojo; 
+
+
+public class WorkflowBaseInfoDTO {
+
+	private int workflowid;
+	private int requestid;
+	private String requestnamenew;
+	private String workflowname;
+	private String creater;
+	private String createdate;
+	private String createtime;
+
+	public void setWorkflowid(int workflowid){
+		this.workflowid = workflowid;
+	}
+
+	public void setRequestid(int requestid){
+		this.requestid = requestid;
+	}
+
+	public void setRequestnamenew(String requestnamenew){
+		this.requestnamenew = requestnamenew;
+	}
+
+	public void setWorkflowname(String workflowname){
+		this.workflowname = workflowname;
+	}
+
+	public void setCreater(String creater){
+		this.creater = creater;
+	}
+
+	public void setCreatedate(String createdate){
+		this.createdate = createdate;
+	}
+
+	public void setCreatetime(String createtime){
+		this.createtime = createtime;
+	}
+
+	public int getWorkflowid(){
+		return this.workflowid;
+	}
+
+	public int getRequestid(){
+		return this.requestid;
+	}
+
+	public String getRequestnamenew(){
+		return this.requestnamenew;
+	}
+
+	public String getWorkflowname(){
+		return this.workflowname;
+	}
+
+	public String getCreater(){
+		return this.creater;
+	}
+
+	public String getCreatedate(){
+		return this.createdate;
+	}
+
+	public String getCreatetime(){
+		return this.createtime;
+	}
+
+	@Override
+	public String toString() {
+		return "WorkflowBaseInfoDTO{" +
+				"workflowid='" + workflowid + '\'' +
+				", requestid='" + requestid + '\'' +
+				", requestnamenew='" + requestnamenew + '\'' +
+				", workflowname='" + workflowname + '\'' +
+				", creater='" + creater + '\'' +
+				", createdate='" + createdate + '\'' +
+				", createtime='" + createtime + '\'' +
+				'}';
+	}
+}
\ No newline at end of file
diff --git a/src/main/youhong_ai_old_src/com/api/aiyh_guijiu/pojo/WorkflowConfigDTO.java b/src/main/youhong_ai_old_src/com/api/aiyh_guijiu/pojo/WorkflowConfigDTO.java
new file mode 100644
index 0000000..c27e94c
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/aiyh_guijiu/pojo/WorkflowConfigDTO.java
@@ -0,0 +1,103 @@
+
+package com.api.aiyh_guijiu.pojo; 
+
+
+public class WorkflowConfigDTO {
+
+	private int id;
+	private int enable;
+	private int workflowType;
+	private String tablename;
+	private String startDateField;
+	private String startTimeField;
+	private String endDateField;
+	private String endTimeField;
+	private String hrmField;
+
+	public int getWorkflowType() {
+		return workflowType;
+	}
+
+	public void setWorkflowType(int workflowType) {
+		this.workflowType = workflowType;
+	}
+
+	public String getHrmField() {
+		return hrmField;
+	}
+
+	public void setHrmField(String hrmField) {
+		this.hrmField = hrmField;
+	}
+
+	public void setId(int id){
+		this.id = id;
+	}
+
+	public void setEnable(int enable){
+		this.enable = enable;
+	}
+
+	public void setTablename(String tablename){
+		this.tablename = tablename;
+	}
+
+	public void setStartDateField(String startDateField){
+		this.startDateField = startDateField;
+	}
+
+	public void setStartTimeField(String startTimeField){
+		this.startTimeField = startTimeField;
+	}
+
+	public void setEndDateField(String endDateField){
+		this.endDateField = endDateField;
+	}
+
+	public void setEndTimeField(String endTimeField){
+		this.endTimeField = endTimeField;
+	}
+
+	public int getId(){
+		return this.id;
+	}
+
+	public int getEnable(){
+		return this.enable;
+	}
+
+	public String getTablename(){
+		return this.tablename;
+	}
+
+	public String getStartDateField(){
+		return this.startDateField;
+	}
+
+	public String getStartTimeField(){
+		return this.startTimeField;
+	}
+
+	public String getEndDateField(){
+		return this.endDateField;
+	}
+
+	public String getEndTimeField(){
+		return this.endTimeField;
+	}
+
+	@Override
+	public String toString() {
+		return "WorkflowConfigDTO{" +
+				"id=" + id +
+				", enable=" + enable +
+				", workflowType=" + workflowType +
+				", tablename='" + tablename + '\'' +
+				", startDateField='" + startDateField + '\'' +
+				", startTimeField='" + startTimeField + '\'' +
+				", endDateField='" + endDateField + '\'' +
+				", endTimeField='" + endTimeField + '\'' +
+				", hrmField='" + hrmField + '\'' +
+				'}';
+	}
+}
\ No newline at end of file
diff --git a/src/main/youhong_ai_old_src/com/api/aiyh_guijiu/service/WorkflowQueueService.java b/src/main/youhong_ai_old_src/com/api/aiyh_guijiu/service/WorkflowQueueService.java
new file mode 100644
index 0000000..6fec1b8
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/aiyh_guijiu/service/WorkflowQueueService.java
@@ -0,0 +1,488 @@
+package com.api.aiyh_guijiu.service;
+
+import aiyh.utils.ApiResult;
+import aiyh.utils.Util;
+import aiyh.utils.fileUtil.WatermarkPoint;
+import aiyh.utils.fileUtil.WatermarkPointEnum;
+import aiyh.utils.fileUtil.WritWatermark;
+import aiyh.utils.mapUtil.ParaMap;
+import aiyh.utils.sqlUtil.sqlResult.impl.PrepSqlResultImpl;
+import aiyh.utils.zwl.common.ToolUtil;
+import com.api.aiyh_guijiu.dao.ConflictWorkflowDao;
+import com.api.aiyh_guijiu.pojo.WorkflowBaseInfoDTO;
+import com.api.aiyh_guijiu.pojo.WorkflowConfigDTO;
+import com.api.aiyh_guijiu.vo.ConfigInfoVo;
+import com.api.aiyh_guijiu.vo.PicPsVO;
+import com.api.workflow.constant.RequestAuthenticationConstant;
+import com.drew.imaging.ImageMetadataReader;
+import com.drew.imaging.ImageProcessingException;
+import com.drew.metadata.Directory;
+import com.drew.metadata.Metadata;
+import com.drew.metadata.Tag;
+import com.engine.workflow.biz.requestForm.FileBiz;
+import com.fasterxml.jackson.databind.JavaType;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.log4j.Logger;
+import org.h2.util.StringUtils;
+import weaver.conn.RecordSet;
+import weaver.docs.docs.DocManager;
+import weaver.file.ImageFileManager;
+import weaver.hrm.User;
+
+import java.awt.*;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.List;
+import java.util.*;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.stream.Collectors;
+
+/**
+ * @author EBU7-dev1-ayh
+ * @create 2021/9/7 0007 12:43
+ * workflow queue
+ */
+
+
+public class WorkflowQueueService {
+	ToolUtil toolUtil = new ToolUtil();
+	ObjectMapper mapper = new ObjectMapper();
+	ConflictWorkflowDao conflictWorkflowDao = new ConflictWorkflowDao();
+    private Logger log = Util.getLogger();
+
+	/**
+	 * 查询ps配置参数
+	 *
+	 * @return 配置信息
+	 */
+	public String getPicIsPsConfig(String workflowId) {
+		ConfigInfoVo ufPsNodeConfig = conflictWorkflowDao.getConfigInfo("uf_ps__node_config", workflowId);
+		if (ufPsNodeConfig == null) {
+			return ApiResult.successNoData();
+		}
+		return ApiResult.success(ufPsNodeConfig);
+//		String picPsWorkflowId = toolUtil.getSystemParamValue("PIC_PS_WORKFLOW_ID");
+//		if (StringUtils.isNullOrEmpty(picPsWorkflowId)) {
+//			return ApiResult.successNoData();
+//		}
+//		String nodeId = toolUtil.getSystemParamValue("PIC_PS_NODE_ID");
+//		String fieldName = toolUtil.getSystemParamValue("PIC_PS_FIELD_NAME");
+//		List<Integer> watermarkConfig = conflictWorkflowDao.getWatermarkConfig(picPsWorkflowId);
+//		Map<String, Object> map = new HashMap<>();
+//		map.put("workflowIds", watermarkConfig);
+//		map.put("nodeId", nodeId);
+//		map.put("fieldName", fieldName);
+//		return ApiResult.success(map);
+	}
+
+	/**
+	 * 查询图片是否经过ps
+	 *
+	 * @param imgIds 需要查询的图片的id
+	 * @return 是否进行ps的分析结果
+	 */
+	public String getPicIsPs(String imgIds) {
+//		通过docId查询到物理文件的id
+		String query = "select imagefileid,imagefilename,docid from docimagefile where docid in ( " + imgIds + ")";
+		RecordSet rs = new RecordSet();
+		rs.executeQuery(query);
+		List<PicPsVO> list = new ArrayList<>();
+		while (rs.next()) {
+			int id = rs.getInt(1);
+			String name = rs.getString(2);
+			int docId = rs.getInt(3);
+			PicPsVO picPsVO = PicPsVO.PicPsVOBuilder.aPicPsVO()
+					.docId(docId)
+					.fileId(id)
+					.fileName(name)
+					.build();
+//			通过物理文件的id进行获取对应的输入流信息。
+//			ImageFileManager imageFileManager = new ImageFileManager();
+			//		通过文件id获取输入流
+			InputStream inputStreamById = ImageFileManager.getInputStreamById(id);
+			try {
+//				获取媒体数据
+				Metadata metadata = ImageMetadataReader.readMetadata(inputStreamById);
+//				遍历Directory对象，每个对象里面包含标签
+				for (Directory directory : metadata.getDirectories()) {
+					String directoryName = directory.getName();
+					log.info(directory);
+					if ("Photoshop".equalsIgnoreCase(directoryName) || "Adobe JPEG".equalsIgnoreCase(directoryName)
+							|| directoryName.contains("Adobe")) {
+						if (picPsVO.getScore() > 90) {
+							continue;
+						}
+						picPsVO.setDescribe("图片经过Adobe Photoshop软件，注意审核！");
+						picPsVO.setScore(90);
+					}
+					String model = "";
+					for (Tag tag : directory.getTags()) {
+					    log.info(tag);
+						if (tag.getDescription() != null && tag.getDescription().toLowerCase().contains("Adobe".toLowerCase())) {
+							picPsVO.setDescribe("图片经过Adobe Photoshop软件，注意审核！");
+							picPsVO.setScore(70);
+							if (picPsVO.getScore() > 70) {
+								continue;
+							}
+						}
+						if ("Software".equalsIgnoreCase(tag.getTagName())) {
+							if (tag.getDescription().toLowerCase().contains("Adobe".toLowerCase())
+									|| tag.getDescription().toLowerCase().contains("Photoshop".toLowerCase())) {
+								picPsVO.setDescribe("图片经过Adobe Photoshop软件，注意审核！");
+								picPsVO.setScore(100);
+							} else {
+								if (picPsVO.getScore() > 70) {
+									continue;
+								}
+								picPsVO.setDescribe("图片经过" + tag.getDescription() + "软件，注意审核！");
+								picPsVO.setScore(70);
+							}
+							if (!StringUtils.isNullOrEmpty(model) && picPsVO.getDescribe().contains(model)) {
+								picPsVO.setDescribe("");
+								picPsVO.setScore(-1);
+							}
+						}
+						if ("Model".equalsIgnoreCase(tag.getTagName())) {
+							model = tag.getDescription();
+							if (!StringUtils.isNullOrEmpty(picPsVO.getDescribe())) {
+								if (picPsVO.getDescribe().contains(tag.getDescription())) {
+									picPsVO.setDescribe("");
+									picPsVO.setScore(-1);
+								}
+							}
+						}
+						if ("User Comment".equalsIgnoreCase(tag.getTagName())) {
+							try {
+								if (picPsVO.getScore() > 80) {
+									continue;
+								}
+								com.alibaba.fastjson.JSONObject.parseObject(tag.getDescription());
+								picPsVO.setDescribe("图片经过手机端图片处理软件，软件未知！请注意审核！");
+								picPsVO.setScore(80);
+							} catch (Exception e) {
+								if (picPsVO.getScore() > 40) {
+									continue;
+								}
+								picPsVO.setDescribe("图片可能经过未知软件！请注意审核！");
+								picPsVO.setScore(40);
+							}
+						}
+					}
+				}
+			} catch (ImageProcessingException | IOException e) {
+				e.printStackTrace();
+				toolUtil.writeErrorLog("图片识别异常！");
+			}
+			if (picPsVO.getScore() > 0){
+                list.add(picPsVO);
+            }
+		}
+		List<PicPsVO> collect = list.stream().filter(item -> item.getScore() > 0).collect(Collectors.toList());
+//		log.info("最终识别后的数组：" + collect);
+		return ApiResult.success(collect);
+	}
+
+	public String getWorkflowQueue(Map<String, String> param) {
+		String workflowId = param.get("workflowId");
+		String requestId = param.get("requestId");
+		List<Integer> watermarkConfig = conflictWorkflowDao.getWatermarkConfig(workflowId);
+		List<WorkflowConfigDTO> workflowConfigDTOS = conflictWorkflowDao.queryConfig(workflowId);
+		if (workflowConfigDTOS == null || workflowConfigDTOS.size() == 0) {
+			return ApiResult.successNoData();
+		}
+		WorkflowConfigDTO nowConfig = workflowConfigDTOS.stream().filter(item -> {
+			AtomicBoolean flag = new AtomicBoolean(false);
+			watermarkConfig.forEach(id -> {
+				if (id == item.getWorkflowType()) {
+					flag.set(true);
+				}
+			});
+			return flag.get();
+		}).collect(Collectors.toList()).get(0);
+
+//		获取当前流程填写的时间信息
+		String startTime = param.get("startTime");
+		String startDate = param.get("startDate");
+		String endTime = param.get("endTime");
+		String endDate = param.get("endDate");
+		String hrmStr = param.get("hrmStr");
+//		如果当前的requestid不是创建节点，则查询数据库信息作为对比条件
+		if (!"-1".equals(requestId)) {
+			String hrmField = Util.null2String(nowConfig.getHrmField());
+			String query = "select * from " + nowConfig.getTablename() + " where requestid = ?";
+			RecordSet rs = new RecordSet();
+			rs.executeQuery(query, requestId);
+			rs.next();
+			hrmStr = rs.getString(hrmField);
+			startDate = rs.getString(nowConfig.getStartDateField());
+			startTime = rs.getString(nowConfig.getStartTimeField());
+			endTime = rs.getString(nowConfig.getEndTimeField());
+			endDate = rs.getString(nowConfig.getEndDateField());
+		}
+
+		List<WorkflowBaseInfoDTO> list = new ArrayList<>();
+//		循环查询流程中时间是否存在冲突
+		for (WorkflowConfigDTO workflowConfigDTO : workflowConfigDTOS) {
+//          查询冲突的流程数据	 流程相关人 查询数据库
+			toolUtil.writeErrorLog(hrmStr);
+			toolUtil.writeErrorLog(workflowConfigDTO.toString() + "\n");
+			for (String hrmId : hrmStr.split(",")) {
+				List<WorkflowBaseInfoDTO> workflowBaseInfoDTOList = conflictWorkflowDao.queryConflict(workflowConfigDTO, startTime,
+						startDate, endTime, endDate, hrmId, requestId);
+				toolUtil.writeErrorLog(workflowBaseInfoDTOList + "\n");
+				if (workflowBaseInfoDTOList != null) {
+//					toolUtil.writeErrorLog(workflowBaseInfoDTOList.toString());
+					list.addAll(workflowBaseInfoDTOList);
+				}
+			}
+		}
+		if (list.size() == 0) {
+			return ApiResult.successNoData();
+		}
+		ArrayList<WorkflowBaseInfoDTO> collect = list.stream().collect(
+				Collectors.collectingAndThen(
+						Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(WorkflowBaseInfoDTO::getRequestid))), ArrayList::new)
+		);
+//		将查询到的信息进行返回给前端
+		return ApiResult.success(collect);
+	}
+
+
+	/**
+	 * 给图片添加水印信息
+	 *
+	 * @param user  user对象
+	 * @param param 请求参数
+	 * @return 添加水印后的文档信息
+	 */
+	public String addWaterMark(User user, Map<String, String> param) {
+		String fileIds = param.get("fileIds");
+		String location = param.get("location");
+		String time = param.get("time");
+		if (StringUtils.isNullOrEmpty(time)) {
+			time = Util.getTime("yyyy-MM-dd HH:mm:ss");
+		}
+		String pressText = "地点：" + location + "\n" + "时间：" + time;
+		String watermarkColor = toolUtil.getSystemParamValue("WATERMARK_COLOR");
+		if (StringUtils.isNullOrEmpty(watermarkColor)) {
+			watermarkColor = "0,0,0";
+		}
+		//		处理文字水印的RGB颜色
+		String[] RGBStr = watermarkColor.replace("，", ",").split(",");
+		int[] RGB = Arrays.stream(RGBStr).mapToInt(Integer::parseInt).toArray();
+		if (RGB.length < 3) {
+			RGB = new int[]{0, 0, 0};
+		}
+		int R = RGB[0];
+		int G = RGB[1];
+		int B = RGB[2];
+		if (R < 0) {
+			R = 0;
+		}
+		if (R > 255) {
+			R = 255;
+		}
+		if (G < 0) {
+			G = 0;
+		}
+		if (G > 255) {
+			G = 255;
+		}
+		if (B < 0) {
+			B = 0;
+		}
+		if (B > 255) {
+			B = 255;
+		}
+		Color color = new Color(R, G, B);
+		String fontName = toolUtil.getSystemParamValue("FONT_NAME");
+		if (StringUtils.isNullOrEmpty(fontName)) {
+			fontName = "Microsoft YaHei";
+		}
+		int fontSize = Util.getIntValue(toolUtil.getSystemParamValue("FONT_SIZE"), 10);
+		StringBuilder newIds = new StringBuilder();
+		int index = 0;
+		//根据fileId 查询物理文件
+		String query = "select imagefileid from docimagefile where docid in ( " + fileIds + ")";
+		RecordSet rs = new RecordSet();
+		rs.executeQuery(query);
+
+		while (rs.next()) {
+			int id = rs.getInt(1);
+			int newId;
+			try {
+				toolUtil.writeDebuggerLog("开始添加水印，传递字体大小！");
+				newId = WritWatermark.addTextWatermarkById(id, pressText, color, fontName, Font.PLAIN, fontSize
+						, new WatermarkPoint(WatermarkPointEnum.RIGHT_BOTTOM), 0, 1, 1.3);
+			} catch (IOException e) {
+				return ApiResult.error("图片水印添加失败！");
+			}
+			if (index == 0) {
+				newIds.append(newId);
+			} else {
+				newIds.append(",").append(newId);
+			}
+			index++;
+		}
+		//复制原图的权限信息等
+		//复制原来的文件信息，并将现有的信息进行绑定
+		DocManager docManager = new DocManager();
+		String[] picIdStrArr = fileIds.split(",");
+		String[] newImgArr = newIds.toString().split(",");
+		int[] picIdArr = Arrays.stream(picIdStrArr).mapToInt(Integer::parseInt).toArray();
+		StringBuilder newDocIds = new StringBuilder();
+		for (int i = 0; i < picIdArr.length; i++) {
+			docManager.setId(picIdArr[i]);
+//				复制文件
+			int newId = 0;
+			try {
+				newId = docManager.copyDoc(false);
+			} catch (Exception e) {
+				e.printStackTrace();
+				toolUtil.writeErrorLog("file copy fail!");
+			}
+			if (i == 0) {
+				newDocIds.append(newId);
+			} else {
+				newDocIds.append(",").append(newId);
+			}
+//				替换复制出来的数据的物理文件关联关系
+			PrepSqlResultImpl prepSqlResult = aiyh.utils.Util.createSqlBuilder().updateSql("docimagefile"
+					, ParaMap.create().put("imagefileid", newImgArr[i])
+					, aiyh.utils.Util.createPrepWhereImpl().whereAnd("docid").whereEqual(newId));
+			rs.executeUpdate(prepSqlResult.getSqlStr(), prepSqlResult.getArgs());
+		}
+
+		// 替换原来图片的字段
+		String isSaveResource = toolUtil.getSystemParamValue("SAVE_RESOURCE");
+		String sourceField = toolUtil.getSystemParamValue("RESOURCE_FIELD");
+		if (StringUtils.isNullOrEmpty(isSaveResource)) {
+			isSaveResource = "0";
+		}
+		String fieldName = param.get("fieldName");
+		String tableName = param.get("tableName");
+		String isWrite = param.get("isWrite");
+		String isAppend = param.get("isAppend");
+//		String sourceField = param.get("sourceField");
+		String requestId = param.get("requestId");
+		String oldFileIds = param.get("oldFileIds");
+		if ("true".equals(isWrite)) {
+			if ("true".equals(isAppend)) {
+//			//		查询原字段是否存在图片
+//				String queryStr = "";
+//				try {
+//					queryStr = "select " + fieldName + " from " + tableName + " where requestid = ?";
+//					rs.executeQuery(queryStr, requestId);
+//					rs.next();
+//					String oldImg = Util.null2String(rs.getString(1));
+//					if (!StringUtils.isNullOrEmpty(oldImg)) {
+				newDocIds.append(",").append(oldFileIds);
+//					}
+//				}catch (Exception e){
+//					toolUtil.writeErrorLog("查询错误：" + queryStr);
+//				}
+			}
+			if ("0".equals(isSaveResource)) {
+				// 不保存原来的图片
+				String update = "update " +
+						tableName +
+						" set " +
+						fieldName +
+						" = '" +
+						newDocIds +
+						"' where " +
+						" requestid = ?";
+				rs.executeUpdate(update, requestId);
+			} else {
+				String update = "update " +
+						tableName +
+						" set " +
+						fieldName +
+						" = '" +
+						newDocIds +
+						"' , " +
+						sourceField +
+						" = '" +
+						fileIds +
+						"' where " +
+						" requestid = ?";
+				rs.executeUpdate(update, requestId);
+			}
+		}
+
+		// 查询新文件信息
+		String listType = Util.null2String(String.valueOf(param.get("listType")), "list");
+		int requestid = Util.getIntValue(Util.null2String(String.valueOf(param.get("requestid"))), -1);
+		int desrequestid = Util.getIntValue(Util.null2String(String.valueOf(param.get("desrequestid"))), -1);
+		int isprint = Util.getIntValue(Util.null2String(String.valueOf(param.get("isprint"))), 0);
+		int workflowid = Util.getIntValue(Util.null2String(String.valueOf(param.get("workflowid"))), 0);
+		String f_weaver_belongto_userid = Util.null2String(String.valueOf(param.get("f_weaver_belongto_userid")));
+		String f_weaver_belongto_usertype = Util.null2String(String.valueOf(param.get("f_weaver_belongto_usertype")));
+		String authStr = Util.null2String(String.valueOf(param.get(RequestAuthenticationConstant.AUTHORITY_STRING)));
+		String authSignatureStr = Util.null2String(String.valueOf(param.get(RequestAuthenticationConstant.AUTHORITY_SIGNATURESTRING)));
+		Map<String, Object> paramsMap = new HashMap<>();
+		paramsMap.put("user", user);
+		Map<String, Object> retobj;
+		try {
+			retobj = FileBiz.getFileDatas(Util.null2String(newDocIds.toString()), listType, requestid, desrequestid,
+					isprint, f_weaver_belongto_userid, f_weaver_belongto_usertype, true, false, authStr, authSignatureStr, paramsMap);
+		} catch (Exception e) {
+			e.printStackTrace();
+			return ApiResult.error("查询附件信息失败：" + e);
+		}
+		Map<String, Object> result = new HashMap<>();
+		result.put("fileData", retobj);
+		result.put("fileIds", newDocIds.toString());
+		return ApiResult.success(result);
+	}
+
+
+	/**
+	 * 获取某个流程需要添加水印的字段和全版本的流程id
+	 *
+	 * @return 配置信息
+	 */
+	public String getWatermarkConfig(String workflowId) {
+		ConfigInfoVo configInfo = conflictWorkflowDao.getConfigInfo("uf_watermark_cofig", workflowId);
+		if (configInfo == null) {
+			return ApiResult.successNoData();
+		}
+		return ApiResult.success(configInfo);
+//		Map<String, Object> map = new HashMap<>();
+//		String workflowId = toolUtil.getSystemParamValue("PIC_WATERMARK_WORKFLOW_ID");
+//		List<Integer> list = conflictWorkflowDao.getWatermarkConfig(workflowId);
+//		String picWatermarkField = toolUtil.getSystemParamValue("PIC_WATERMARK_FIELD_NAME");
+//		String nodeId = toolUtil.getSystemParamValue("PIC_WATERMARK_NODE_ID");
+//		map.put("fieldName", picWatermarkField);
+//		map.put("workflowIds", list);
+//		map.put("nodeId", nodeId);
+//		return ApiResult.success(map);
+	}
+
+	/**
+	 * 获取泛型的Collection Type
+	 *
+	 * @param collectionClass 泛型的Collection
+	 * @param elementClasses  元素类
+	 * @return JavaType Java类型
+	 */
+	public JavaType getCollectionType(Class<?> collectionClass, Class<?>... elementClasses) {
+		return mapper.getTypeFactory().constructParametricType(collectionClass, elementClasses);
+	}
+
+
+	/**
+	 * 查询需要排查流程时间片段冲突的配置信息
+	 *
+	 * @param workflowId 流程id
+	 * @return 配置信息
+	 */
+	public String getWorkflowConflictConfig(String workflowId) {
+		Map<String, Object> map = new HashMap<>();
+		List<Integer> watermarkConfig = conflictWorkflowDao.getWatermarkConfig(workflowId);
+		WorkflowConfigDTO workflowConfig = conflictWorkflowDao.getWorkflowConfig(workflowId);
+		map.put("workflowIds", watermarkConfig);
+		map.put("workflowConfig", workflowConfig);
+		return ApiResult.success(map);
+	}
+}
diff --git a/src/main/youhong_ai_old_src/com/api/aiyh_guijiu/vo/ConfigInfoVo.java b/src/main/youhong_ai_old_src/com/api/aiyh_guijiu/vo/ConfigInfoVo.java
new file mode 100644
index 0000000..b7c56cf
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/aiyh_guijiu/vo/ConfigInfoVo.java
@@ -0,0 +1,67 @@
+package com.api.aiyh_guijiu.vo;
+
+/**
+ * @author EBU7-dev1-ayh
+ * @create 2021/9/14 0014 21:28
+ * peizhi xinxi  Vo
+ */
+
+
+public class ConfigInfoVo {
+	int workflowType;
+	String workflowField;
+	String workflowNode;
+	int enable;
+
+	public ConfigInfoVo() {
+	}
+
+	public ConfigInfoVo(int workflowType, String workflowField, String workflowNode, int enable) {
+		this.workflowType = workflowType;
+		this.workflowField = workflowField;
+		this.workflowNode = workflowNode;
+		this.enable = enable;
+	}
+
+	public int getWorkflowType() {
+		return workflowType;
+	}
+
+	public void setWorkflowType(int workflowType) {
+		this.workflowType = workflowType;
+	}
+
+	public String getWorkflowField() {
+		return workflowField;
+	}
+
+	public void setWorkflowField(String workflowField) {
+		this.workflowField = workflowField;
+	}
+
+	public String getWorkflowNode() {
+		return workflowNode;
+	}
+
+	public void setWorkflowNode(String workflowNode) {
+		this.workflowNode = workflowNode;
+	}
+
+	public int getEnable() {
+		return enable;
+	}
+
+	public void setEnable(int enable) {
+		this.enable = enable;
+	}
+
+	@Override
+	public String toString() {
+		return "ConfigInfoVo{" +
+				"workflowType=" + workflowType +
+				", workflowField='" + workflowField + '\'' +
+				", workflowNode='" + workflowNode + '\'' +
+				", enable=" + enable +
+				'}';
+	}
+}
diff --git a/src/main/youhong_ai_old_src/com/api/aiyh_guijiu/vo/PicPsVO.java b/src/main/youhong_ai_old_src/com/api/aiyh_guijiu/vo/PicPsVO.java
new file mode 100644
index 0000000..e1b8c9c
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/aiyh_guijiu/vo/PicPsVO.java
@@ -0,0 +1,120 @@
+package com.api.aiyh_guijiu.vo;
+
+/**
+ * @author EBU7-dev1-ayh
+ * @create 2021/9/10 0010 16:50
+ * pic ps vo
+ */
+
+
+public class PicPsVO {
+	private int docId;
+	private int fileId;
+	private String fileName;
+	private int score;
+	private String describe;
+
+	public PicPsVO(int docId, int fileId, String fileName, int score, String describe) {
+		this.docId = docId;
+		this.fileId = fileId;
+		this.fileName = fileName;
+		this.score = score;
+		this.describe = describe;
+	}
+
+	public int getDocId() {
+		return docId;
+	}
+
+	public void setDocId(int docId) {
+		this.docId = docId;
+	}
+
+	public int getFileId() {
+		return fileId;
+	}
+
+	public void setFileId(int fileId) {
+		this.fileId = fileId;
+	}
+
+	public String getFileName() {
+		return fileName;
+	}
+
+	public void setFileName(String fileName) {
+		this.fileName = fileName;
+	}
+
+	public int getScore() {
+		return score;
+	}
+
+	public void setScore(int score) {
+		this.score = score;
+	}
+
+	public String getDescribe() {
+		return describe;
+	}
+
+	public void setDescribe(String describe) {
+		this.describe = describe;
+	}
+
+
+	public static final class PicPsVOBuilder {
+		private int docId;
+		private int fileId;
+		private String fileName;
+		private int score;
+		private String describe;
+
+		private PicPsVOBuilder() {
+		}
+
+		public static PicPsVOBuilder aPicPsVO() {
+			return new PicPsVOBuilder();
+		}
+
+		public PicPsVOBuilder docId(int docId) {
+			this.docId = docId;
+			return this;
+		}
+
+		public PicPsVOBuilder fileId(int fileId) {
+			this.fileId = fileId;
+			return this;
+		}
+
+		public PicPsVOBuilder fileName(String fileName) {
+			this.fileName = fileName;
+			return this;
+		}
+
+		public PicPsVOBuilder score(int score) {
+			this.score = score;
+			return this;
+		}
+
+		public PicPsVOBuilder describe(String describe) {
+			this.describe = describe;
+			return this;
+		}
+
+		public PicPsVO build() {
+			return new PicPsVO(docId, fileId, fileName, score, describe);
+		}
+	}
+
+	@Override
+	public String toString() {
+		return "PicPsVO{" +
+				"docId=" + docId +
+				", fileId=" + fileId +
+				", fileName='" + fileName + '\'' +
+				", score=" + score +
+				", describe='" + describe + '\'' +
+				'}';
+	}
+}
diff --git a/src/main/youhong_ai_old_src/com/api/aiyh_guijiu/web/ConflictWorkflowController.java b/src/main/youhong_ai_old_src/com/api/aiyh_guijiu/web/ConflictWorkflowController.java
new file mode 100644
index 0000000..35f3546
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/aiyh_guijiu/web/ConflictWorkflowController.java
@@ -0,0 +1,157 @@
+package com.api.aiyh_guijiu.web;
+
+import aiyh.utils.ApiResult;
+import aiyh.utils.zwl.common.ToolUtil;
+import com.api.aiyh_guijiu.service.WorkflowQueueService;
+import io.swagger.v3.oas.annotations.parameters.RequestBody;
+import weaver.hrm.HrmUserVarify;
+import weaver.hrm.User;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.ws.rs.*;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import java.util.Map;
+
+/**
+ * @author EBU7-dev1-ayh
+ * @create 2021/9/3 0003 12:08
+ * 查询同一时段内的指定流程
+ */
+
+
+@Path("/change2Workflow")
+public class ConflictWorkflowController {
+
+	private final WorkflowQueueService workflowQueueService = new WorkflowQueueService();
+	private final ToolUtil toolUtil = new ToolUtil();
+	private final String className = "QueryWorkflow";
+
+	/**
+	 * 查询需要前端判断添加水印的流程和流程字段
+	 *
+	 * @return 前端必要的配置参数
+	 */
+	@Path("/queryWatermark/{workflowId}")
+	@GET
+	@Consumes(MediaType.APPLICATION_JSON)
+	@Produces(MediaType.APPLICATION_JSON)
+	public String queryWatermark(@PathParam("workflowId") String workflowId) {
+		try {
+			return workflowQueueService.getWatermarkConfig(workflowId);
+		}catch (Exception e){
+			toolUtil.writeErrorLog(className + "======> queryWatermark",e.toString());
+			return ApiResult.error(e.toString());
+		}
+	}
+
+
+	/**
+	 * 图片添加水印请求
+	 *
+	 * @param request  请求体
+	 * @param response 响应对象
+	 * @param param    请求参数
+	 * @return 添加水印后的图片信息
+	 */
+	@Path("/addWatermark")
+	@POST
+	@Consumes(MediaType.APPLICATION_JSON)
+	@Produces(MediaType.APPLICATION_JSON)
+	public String addWatermark(@Context HttpServletRequest request, @Context HttpServletResponse response,
+	                           @RequestBody Map<String, String> param) {
+
+		User user = HrmUserVarify.getUser(request, response);
+		try {
+			return workflowQueueService.addWaterMark(user, param);
+		}catch (Exception e){
+			toolUtil.writeErrorLog(className + "======> addWatermark",e.toString());
+			return ApiResult.error(e.toString());
+		}
+	}
+
+
+	/**
+	 * 查询流程冲突前端需要拦截和必要的字段
+	 *
+	 * @param workflowId 流程id
+	 * @return 配置信息
+	 */
+	@Path("/queryWorkflow/config/{workflowId}")
+	@GET
+	@Consumes(MediaType.APPLICATION_JSON)
+	@Produces(MediaType.APPLICATION_JSON)
+	public String queryWorkflowConfig(@PathParam("workflowId") String workflowId) {
+
+		try {
+			return workflowQueueService.getWorkflowConflictConfig(workflowId);
+		}catch (Exception e){
+			toolUtil.writeErrorLog(className + "======> queryWorkflowConfig",e.toString());
+			return ApiResult.error(e.toString());
+		}
+	}
+
+	/**
+	 * 查询冲突流程
+	 *
+	 * @param param 请求参数
+	 * @return 冲突流程的基本数据
+	 */
+	@Path("/queryConflict")
+	@POST
+	@Consumes(MediaType.APPLICATION_JSON)
+	@Produces(MediaType.APPLICATION_JSON)
+	public String queryWorkflowQueue(@RequestBody Map<String, String> param) {
+
+		try {
+			return workflowQueueService.getWorkflowQueue(param);
+		}catch (Exception e){
+			toolUtil.writeErrorLog(className + "======> queryWorkflowQueue",e.toString());
+			e.printStackTrace();
+			return ApiResult.error(e.toString());
+		}
+	}
+
+	/**
+	 * 判断图片是否经过ps
+	 *
+	 * @param imgIds 需要判断的图片
+	 * @return 查询ps的结果
+	 */
+	@Path("/picIsPs/{imgIds}")
+	@GET
+	@Consumes(MediaType.APPLICATION_JSON)
+	@Produces(MediaType.APPLICATION_JSON)
+	public String queryPicIsPs(@PathParam("imgIds") String imgIds) {
+		try {
+			return workflowQueueService.getPicIsPs(imgIds);
+		}catch (Exception e){
+			toolUtil.writeErrorLog(className + "======> queryPicIsPs",e.toString());
+			return ApiResult.error(e.toString());
+		}
+	}
+
+
+
+
+	/**
+	 * 查询需要校验ps的节点等信息
+	 *
+	 * @return 配置信息
+	 */
+	@Path("/queryPicPsConfig/{workflowId}")
+	@GET
+	@Consumes(MediaType.APPLICATION_JSON)
+	@Produces(MediaType.APPLICATION_JSON)
+	public String queryPicPsConfig(@PathParam("workflowId") String workflowId) {
+		try {
+			return workflowQueueService.getPicIsPsConfig(workflowId);
+		}catch (Exception e){
+			toolUtil.writeErrorLog(className + "======> queryPicPsConfig",e.toString());
+			return ApiResult.error(e.toString());
+		}
+
+	}
+
+}
diff --git a/src/main/youhong_ai_old_src/com/api/aiyh_jifen/controller/MaintenanceWorkOrderController.java b/src/main/youhong_ai_old_src/com/api/aiyh_jifen/controller/MaintenanceWorkOrderController.java
new file mode 100644
index 0000000..2fdd848
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/aiyh_jifen/controller/MaintenanceWorkOrderController.java
@@ -0,0 +1,13 @@
+package com.api.aiyh_jifen.controller;
+
+
+/**
+ * <h1>${description}</h1>
+ *
+ * @author EBU7-dev-1 aiyh
+ * <p>create: ${YEAR}-${MONTH}-${DAY} ${HOUR}:${MINUTE}</p>
+ */
+public class MaintenanceWorkOrderController {
+
+
+}
diff --git a/src/main/youhong_ai_old_src/com/api/aiyh_jitu/fadada/controller/CallbackController.java b/src/main/youhong_ai_old_src/com/api/aiyh_jitu/fadada/controller/CallbackController.java
new file mode 100644
index 0000000..024cb98
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/aiyh_jitu/fadada/controller/CallbackController.java
@@ -0,0 +1,90 @@
+package com.api.aiyh_jitu.fadada.controller;
+
+import aiyh.utils.Util;
+import aiyh.utils.excention.CustomerException;
+import com.alibaba.fastjson.JSON;
+import com.api.aiyh_jitu.fadada.service.CallbackService;
+import io.swagger.v3.oas.annotations.parameters.RequestBody;
+import org.apache.log4j.Logger;
+
+import javax.ws.rs.Consumes;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * <h1>法大大实名认证回调</h1>
+ *
+ * <p>create: 2022-08-14 15:24</p>
+ *
+ * @author aiyh EBU7-dev-1
+ */
+
+@Path("/aiyh/fadada/callback")
+public class CallbackController {
+
+    private final CallbackService service = new CallbackService();
+    private final Logger log = Util.getLogger();
+
+    /**
+     * <h2>实名认证回调地址</h2>
+     *
+     * @param params 回调参数
+     * @return 回调接口响应消息
+     */
+    @Path("/real-name-authentication")
+    @POST
+    public String realNameAuthenticationCallback(@RequestBody Map<String, Object> params) {
+        Map<String, Object> result = new HashMap<>(8);
+        try {
+            service.realNameAuthenticationCallback(params);
+            result.put("code", 0);
+            result.put("msg", "success");
+        } catch (CustomerException e) {
+            result.put("code", 5);
+            result.put("msg", e.getMessage());
+        } catch (IllegalArgumentException e) {
+            result.put("code", 4);
+            result.put("msg", e.getMessage());
+        } catch (Exception e) {
+            result.put("code", 4);
+            result.put("msg", e.getMessage());
+            log.error("call back error ! error msg :" + e.getMessage() + "\n" + Util.getErrString(e));
+        }
+        return JSON.toJSONString(result);
+    }
+
+
+    /**
+     * <h2>手动签署回调</h2>
+     *
+     * @param params 回调参数
+     * @return 回调接口响应消息
+     */
+    @Path("/manual-sign/callback")
+    @POST
+    @Produces(MediaType.APPLICATION_JSON)
+    @Consumes(MediaType.APPLICATION_JSON)
+    public String manualSignCallback(@RequestBody Map<String, Object> params) {
+        Map<String, Object> result = new HashMap<>(8);
+        try {
+            service.manualSignCallback(params);
+            result.put("code", 0);
+            result.put("msg", "success");
+        } catch (CustomerException e) {
+            result.put("code", 5);
+            result.put("msg", e.getMessage());
+        } catch (IllegalArgumentException e) {
+            result.put("code", 4);
+            result.put("msg", e.getMessage());
+        } catch (Exception e) {
+            result.put("code", 4);
+            result.put("msg", e.getMessage());
+            log.error("call back error ! error msg :" + e.getMessage() + "\n" + Util.getErrString(e));
+        }
+        return JSON.toJSONString(result);
+    }
+}
diff --git a/src/main/youhong_ai_old_src/com/api/aiyh_jitu/fadada/controller/WidgetsController.java b/src/main/youhong_ai_old_src/com/api/aiyh_jitu/fadada/controller/WidgetsController.java
new file mode 100644
index 0000000..3ad8ba8
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/aiyh_jitu/fadada/controller/WidgetsController.java
@@ -0,0 +1,45 @@
+package com.api.aiyh_jitu.fadada.controller;
+
+import aiyh.utils.ApiResult;
+import aiyh.utils.Util;
+import com.api.aiyh_jitu.fadada.service.WidgetsService;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import java.util.List;
+
+/**
+ * <h1>获取控件列表</h1>
+ *
+ * <p>create: 2022-08-17 15:12</p>
+ *
+ * @author aiyh EBU7-dev-1
+ */
+
+@Path("/aiyh/fadada/widgets")
+public class WidgetsController {
+
+    private final WidgetsService service = new WidgetsService();
+
+    /**
+     * <h2>查询控件列表</h2>
+     *
+     * @param contractId 合同模板ID
+     * @return 控件列表
+     */
+    @Path("/get/{id}")
+    @GET
+    @Produces(MediaType.APPLICATION_JSON)
+    public String getWidgets(@PathParam("id") String contractId) {
+        try {
+            List<Object> widgets = service.getWidgets(contractId);
+            return ApiResult.success(widgets);
+        } catch (Exception e) {
+            Util.getLogger().error("fetch widgetList error, error msg is " + e.getMessage() + "\n" + Util.getErrString(e));
+            return ApiResult.error(e.getMessage());
+        }
+    }
+}
diff --git a/src/main/youhong_ai_old_src/com/api/aiyh_jitu/fadada/mapper/CallbackMapper.java b/src/main/youhong_ai_old_src/com/api/aiyh_jitu/fadada/mapper/CallbackMapper.java
new file mode 100644
index 0000000..eb83a62
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/aiyh_jitu/fadada/mapper/CallbackMapper.java
@@ -0,0 +1,75 @@
+package com.api.aiyh_jitu.fadada.mapper;
+
+import aiyh.utils.annotation.recordset.*;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <h1></h1>
+ *
+ * <p>create: 2022-08-14 18:32</p>
+ *
+ * @author aiyh EBU7-dev-1
+ */
+
+@SqlMapper
+public interface CallbackMapper {
+    /**
+     * <h2>插入回调日志</h2>
+     *
+     * @param sqlString    更新SQL语句
+     * @param insertParams 插入的参数
+     * @return 是否插入成功
+     */
+    @Select(custom = true)
+    boolean updateCallbackLog(@SqlString String sqlString, Map<String, Object> insertParams);
+
+    /**
+     * <h2>删除插入失败的数据</h2>
+     *
+     * @param dataId 数据ID
+     */
+    @Delete("delete from uf_fdd_callback_log where id = #{id}")
+    void deleteLogId(@ParamMapper("id") int dataId);
+
+    /**
+     * <h2>更新实名认证状态</h2>
+     *
+     * @param customerIdOaField     customerID字段
+     * @param customerId            customerId
+     * @param registerStatusOaField 注册状态字段
+     * @param registerStatus        实名认证状态
+     * @return 是否更新成功！
+     */
+    @Update("update cus_fielddata set $t{registerStatusOaField} = #{registerStatus} where $t{customerIdOaField} = #{customerId}")
+    boolean updateCusFieldDataRegisterStatus(@ParamMapper("customerIdOaField") String customerIdOaField, @ParamMapper("customerId") String customerId,
+                                             @ParamMapper("registerStatusOaField") String registerStatusOaField, @ParamMapper("registerStatus") Integer registerStatus);
+
+    /**
+     * <h2>查询配置信息</h2>
+     *
+     * @param workflowIds 全流程版本
+     * @return 配置明细表信息
+     */
+    @Select("select * from uf_manual_sign_conf main " +
+            "inner join uf_manual_sign_conf_dt1 dt on dt.mainid = main.id " +
+            "where workflow_type in (${workflowIds})")
+    List<Map<String, Object>> queryWritBackWorkflowConfig(
+            @ParamMapper("workflowIds") String[] workflowIds);
+
+    /**
+     * <h2>查询合同信息中间表获取流程信息</h2>
+     *
+     * @param contractNo 合同编号
+     * @return 流程信息
+     */
+    @Select("select id, request_id, contract_no, workflow_table, workflow_field " +
+            "from uf_jt_contract_info where contract_no = #{contractNo}")
+    Map<String, Object> queryWorkflowInfo(
+            @ParamMapper("contractNo") String contractNo);
+
+    @Update(custom = true)
+    boolean updateCallbackParams(
+            @SqlString String sqlString, Map<String, Object> params);
+}
diff --git a/src/main/youhong_ai_old_src/com/api/aiyh_jitu/fadada/service/CallbackService.java b/src/main/youhong_ai_old_src/com/api/aiyh_jitu/fadada/service/CallbackService.java
new file mode 100644
index 0000000..e8204cb
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/aiyh_jitu/fadada/service/CallbackService.java
@@ -0,0 +1,136 @@
+package com.api.aiyh_jitu.fadada.service;
+
+import aiyh.utils.Util;
+import aiyh.utils.excention.CustomerException;
+import cn.hutool.core.lang.Assert;
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.serializer.SerializerFeature;
+import com.api.aiyh_jitu.fadada.mapper.CallbackMapper;
+import org.apache.log4j.Logger;
+import weaver.aiyh_jitu.schedule.registerfadada.constants.FaDaDaConstants;
+import weaver.workflow.workflow.WorkflowVersion;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <h1>回调业务处理</h1>
+ *
+ * <p>create: 2022-08-14 16:00</p>
+ *
+ * @author aiyh EBU7-dev-1
+ */
+
+public class CallbackService {
+
+    private final CallbackMapper mapper = Util.getMapper(CallbackMapper.class);
+
+
+    private final Logger log = Util.getLogger();
+
+    /**
+     * <h2>实名认证回调地址</h2>
+     *
+     * @param params 回调参数
+     */
+    public void realNameAuthenticationCallback(Map<String, Object> params) {
+        String customerIdOaField = Util.getCusConfigValue(FaDaDaConstants.CUSTOMER_ID_OA_FIELD);
+        String registerStatusOaField = Util.getCusConfigValue(FaDaDaConstants.REGISTER_STATUS_OA_FIELD);
+        String customerId = Util.null2String(params.get("customerId"));
+        Assert.notEmpty(customerId, "customerId is empty!");
+        String status = Util.null2String(params.get("status"));
+        Assert.notEmpty(status, "status is empty!");
+        Integer registerStatus = Integer.parseInt(status) + 2;
+        writeLog(0, params);
+        int n = 0;
+        // 将认证回调状态写入到自定义人员卡片中
+        while (mapper.updateCusFieldDataRegisterStatus(customerIdOaField, customerId, registerStatusOaField, registerStatus)) {
+            n++;
+            if (n > 5) {
+                return;
+            }
+        }
+        throw new CustomerException("business failure! code : 001");
+    }
+
+
+    /**
+     * <h2>将回调数据写入日志表中</h2>
+     *
+     * @param type   回调类型
+     * @param params 回调参数
+     */
+    private void writeLog(Integer type, Map<String, Object> params) {
+        Map<String, Object> insertParams = new HashMap<>(16);
+        insertParams.put("callback_time", Util.getTime("yyyy-MM-dd HH:mm:ss"));
+        insertParams.put("callback_params", JSONObject.toJSONString(params, SerializerFeature.PrettyFormat, SerializerFeature.WriteDateUseDateFormat));
+        insertParams.put("callback_type", type);
+        if (type == 0) {
+            String customerId = Util.null2String(params.get("customerId"));
+            insertParams.put("customer_id", customerId);
+        }
+        String modelId = Util.getModeIdByTableName("uf_fdd_callback_log");
+        int dataId = Util.getModeDataId("uf_fdd_callback_log", Integer.parseInt(modelId), 1);
+        StringBuilder sb = new StringBuilder();
+        sb.append("update uf_fdd_callback_log set ");
+        for (Map.Entry<String, Object> entry : insertParams.entrySet()) {
+            sb.append(entry.getKey())
+                    .append(" = #{")
+                    .append(entry.getKey())
+                    .append("}, ");
+        }
+        StringBuilder replace = sb.replace(sb.lastIndexOf(","), sb.length() - 1, "");
+        replace.append(" where id = #{id}");
+        insertParams.put("id", dataId);
+        boolean success = mapper.updateCallbackLog(replace.toString(), insertParams);
+        if (!success) {
+            mapper.deleteLogId(dataId);
+            return;
+        }
+        Util.rebuildModeDataShare(1, Integer.valueOf(modelId), dataId);
+    }
+
+    /**
+     * <h2>签署合同回调</h2>
+     *
+     * @param params 回调请求参数
+     */
+    public void manualSignCallback(Map<String, Object> params) {
+        String contractNo = Util.null2String(params.get("docNo"));
+        Assert.notEmpty(contractNo, "docNo not be null!");
+        writeLog(1, params);
+        //    TODO 建模表让客户定义回调结果参数映射到那个流程字段中
+        Map<String, Object> workflowInfo = mapper.queryWorkflowInfo(contractNo);
+        Assert.notEmpty(workflowInfo, "can not find uf_jt_contract_info for " + contractNo);
+        String workflowType = Util.null2String(workflowInfo.get("workflowType"));
+        String workflowTable = Util.null2String(workflowInfo.get("workflowTable"));
+        String requestId = Util.null2String(workflowInfo.get("requestId"));
+        String workflowVersionIds = Util.null2String(WorkflowVersion.getVersionStringByWfid(workflowType));
+        List<Map<String, Object>> configList = mapper.queryWritBackWorkflowConfig(workflowVersionIds.split(","));
+        Assert.notEmpty(configList, "not query config data,uf_manual_sign_conf config data can not to be empty!");
+        StringBuilder sb = new StringBuilder();
+        sb.append("update ")
+                .append(workflowTable)
+                .append(" set ");
+        for (Map<String, Object> rowConfig : configList) {
+            String workflowFieldName = Util.null2String(rowConfig.get("workflowFieldName"));
+            String resultField = Util.null2String(rowConfig.get("callbackField"));
+            sb.append(workflowFieldName)
+                    .append(" = #{")
+                    .append(resultField)
+                    .append("},");
+        }
+        StringBuilder replace = sb.replace(sb.lastIndexOf(","), sb.length() - 1, "");
+        replace.append(" where requestid = ")
+                .append(requestId);
+        int n = 0;
+        while (mapper.updateCallbackParams(replace.toString(), params)) {
+            n++;
+            if (n > 5) {
+                log.error("回写签署回调信息失败！" + replace);
+                return;
+            }
+        }
+    }
+}
diff --git a/src/main/youhong_ai_old_src/com/api/aiyh_jitu/fadada/service/WidgetsService.java b/src/main/youhong_ai_old_src/com/api/aiyh_jitu/fadada/service/WidgetsService.java
new file mode 100644
index 0000000..35a47b9
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/aiyh_jitu/fadada/service/WidgetsService.java
@@ -0,0 +1,40 @@
+package com.api.aiyh_jitu.fadada.service;
+
+import aiyh.utils.Util;
+import cn.hutool.core.lang.Assert;
+import weaver.aiyh_jitu.schedule.registerfadada.constants.FaDaDaConstants;
+import weaver.aiyh_jitu.schedule.registerfadada.util.JiTuFaDaDaUtil;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <h1></h1>
+ *
+ * <p>create: 2022-08-17 15:17</p>
+ *
+ * @author aiyh EBU7-dev-1
+ */
+
+public class WidgetsService {
+
+
+    /**
+     * <h2>获取控件列表</h2>
+     *
+     * @param contractId 合同模板ID
+     * @return 控件列表
+     */
+    public List<Object> getWidgets(String contractId) {
+        Map<String, Object> configMap = Util.readProperties2Map(FaDaDaConstants.FDD_CONFIG_FILE_NAME, FaDaDaConstants.FDD_CONFIG_FIEL_PREFIX);
+        Assert.notEmpty(configMap, "can not read config file [{}], check you config file!", FaDaDaConstants.FDD_CONFIG_FILE_NAME);
+        String url = configMap.get(FaDaDaConstants.FDD_BASE_URL_KEY) + "/online-template/widget/list";
+        Map<String, Object> params = new HashMap<>(8);
+        params.put("id", contractId);
+        Map<String, Object> result = JiTuFaDaDaUtil.fetchOnlineWidgetDetailList(url, params);
+        Assert.notEmpty(result, "can not fetch onlineWidgetDetailList!");
+        List<Object> data = (List<Object>) result.get("data");
+        return data;
+    }
+}
diff --git a/src/main/youhong_ai_old_src/com/api/aiyh_jitu/pushdata/controller/ClearPushDataActionTokenCache.java b/src/main/youhong_ai_old_src/com/api/aiyh_jitu/pushdata/controller/ClearPushDataActionTokenCache.java
new file mode 100644
index 0000000..3370680
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/aiyh_jitu/pushdata/controller/ClearPushDataActionTokenCache.java
@@ -0,0 +1,26 @@
+package com.api.aiyh_jitu.pushdata.controller;
+
+import aiyh.utils.ApiResult;
+import weaver.aiyh_jitu.pushdata.util.JiTuTokenUtil;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+
+/**
+ * <h1>清除token缓存</h1>
+ *
+ * <p>create: 2022-08-15 14:41</p>
+ *
+ * @author aiyh EBU7-dev-1
+ */
+
+@Path("/aiyh/token-cache")
+public class ClearPushDataActionTokenCache {
+
+    @Path("/clear")
+    @GET
+    public String clearToken() {
+        JiTuTokenUtil.clearToken();
+        return ApiResult.successNoData();
+    }
+}
diff --git a/src/main/youhong_ai_old_src/com/api/aiyh_kafang/dao/InvoiceMapping.java b/src/main/youhong_ai_old_src/com/api/aiyh_kafang/dao/InvoiceMapping.java
new file mode 100644
index 0000000..050dbba
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/aiyh_kafang/dao/InvoiceMapping.java
@@ -0,0 +1,103 @@
+package com.api.aiyh_kafang.dao;
+
+import aiyh.utils.Util;
+import aiyh.utils.sqlUtil.sqlResult.impl.PrepSqlResultImpl;
+import aiyh.utils.sqlUtil.whereUtil.Where;
+import aiyh.utils.zwl.common.ToolUtil;
+import com.api.aiyh_kafang.entity.UfInvoiceConfigDTO;
+import weaver.conn.RecordSet;
+import weaver.workflow.workflow.WorkflowVersion;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author EBU7-dev1-ayh
+ * @create 2021/11/9 0009 14:38
+ */
+
+
+public class InvoiceMapping {
+	private RecordSet rs = new RecordSet();
+	private ToolUtil toolUtil = new ToolUtil();
+	private final String ModeTable = "uf_fpyzjb";
+	private final String ModeDetailTable = "uf_fpyzjb_dt1";
+
+	public UfInvoiceConfigDTO getConfigInfo(String workflowId) {
+		String versionStringByWfid = WorkflowVersion.getVersionStringByWfid(workflowId);
+		String query = "select ic.id,ic.invoice_browse,ic.workflow_nodes,ic.workflow_type, " +
+				"dtv.tablename invoice_detail_table,ftv.fieldname invoice_field,ftv1.fieldname invoice_price " +
+				"from uf_invoice_config ic " +
+				"left join workflow_detail_table_view dtv on ic.invoice_detail_table = dtv.id " +
+				"left join workflow_field_table_view ftv on ic.invoice_field = ftv.id " +
+				"left join workflow_field_table_view ftv1 on ic.invoice_price = ftv1.id " +
+				" where workflow_type in (" + workflowId + " )";
+		rs.executeQuery(query);
+		UfInvoiceConfigDTO ufInvoiceConfigDTO = Util.recordeSet2Entity(rs, UfInvoiceConfigDTO.class, true);
+		if (ufInvoiceConfigDTO != null) {
+			ufInvoiceConfigDTO.setWorkflowType(versionStringByWfid);
+		}
+		return ufInvoiceConfigDTO;
+	}
+
+	public void saveInvoiceInfo(int dataId, String tableName, String requestId) {
+//		主表数据
+		Map<String, Object> update = Util.createUtilHashMap()
+				.uPut("lc", requestId)
+				.uPut("sm", "发票扫描自动添加实体发票信息！");
+		Where where = Util.createPrepWhereImpl().whereAnd("id").whereEqual(dataId);
+		PrepSqlResultImpl sqlResult = Util.createSqlBuilder().updateSql(tableName, update, where);
+		toolUtil.writeErrorLog("SQL：" + sqlResult.getSqlStr() + " ---->参数：" + sqlResult.getArgs());
+		rs.executeUpdate(sqlResult.getSqlStr(), sqlResult.getArgs());
+	}
+
+	public void saveInvoiceDetail(Map<String, Object> insert, String modeTable) {
+		PrepSqlResultImpl sqlResult = Util.createSqlBuilder().insertSql(modeTable, insert);
+		toolUtil.writeErrorLog("SQL：" + sqlResult.getSqlStr() + " ---->参数：" + sqlResult.getArgs());
+		rs.executeUpdate(sqlResult.getSqlStr(), sqlResult.getArgs());
+	}
+
+	public String getMainId(String requestId) {
+		String query = "select * from uf_fpyzjb where lc = ?";
+		rs.executeQuery(query, requestId);
+		rs.next();
+		return rs.getString("id");
+	}
+
+	public List<Map<String, Object>> selectModeInfo(String mainId) {
+		RecordSet rs = new RecordSet();
+		String query = "select * from " + ModeDetailTable + " where mainid = ?";
+		rs.executeQuery(query, mainId);
+		return Util.recordSet2MapList(rs);
+	}
+
+
+	public List<Map<String, Object>> selectWorkflowData(String workflowId, String requestId, UfInvoiceConfigDTO configInfo) {
+//		根据流程id查询流程主表
+		String mainTable = Util.getMainTable(workflowId);
+		String query = "select * from " + mainTable + "  where requestid = ?";
+		rs.executeQuery(query, requestId);
+		rs.next();
+		String mainId = rs.getString("id");
+//		查询明细表数据
+		RecordSet rs = new RecordSet();
+		query = "select * from " + configInfo.getInvoiceDetailTable() + " where mainid = ?";
+		rs.executeQuery(query, mainId);
+		return Util.recordSet2MapList(rs);
+	}
+
+	public String getWorkflowCode(String workflowCodeId, String invoiceTable) {
+		String query = "select * from " + invoiceTable + " where id = ?";
+		rs.executeQuery(query, workflowCodeId);
+		if (rs.next()) {
+			return rs.getString("invoicenumber");
+		} else {
+			throw new RuntimeException("发票不存在！");
+		}
+	}
+
+	public boolean selectExist(String main, String number) {
+		rs.executeQuery("select * from " + ModeDetailTable + " where mainid = ? and fphm2 = ?",main,number);
+		return rs.next();
+	}
+}
\ No newline at end of file
diff --git a/src/main/youhong_ai_old_src/com/api/aiyh_kafang/entity/UfInvoiceConfigDTO.java b/src/main/youhong_ai_old_src/com/api/aiyh_kafang/entity/UfInvoiceConfigDTO.java
new file mode 100644
index 0000000..46fa3d0
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/aiyh_kafang/entity/UfInvoiceConfigDTO.java
@@ -0,0 +1,93 @@
+
+package com.api.aiyh_kafang.entity;
+
+
+public class UfInvoiceConfigDTO {
+
+	private int id;
+	private int requestId;
+	private String workflowType;
+	private String workflowNodes;
+	private String invoiceField;
+	private String invoicePrice;
+	private int invoiceBrowse;
+	private String invoiceDetailTable;
+
+	public void setId(int id) {
+		this.id = id;
+	}
+
+	public void setRequestId(int requestId) {
+		this.requestId = requestId;
+	}
+
+	public void setWorkflowType(String workflowType) {
+		this.workflowType = workflowType;
+	}
+
+	public void setWorkflowNodes(String workflowNodes) {
+		this.workflowNodes = workflowNodes;
+	}
+
+	public void setInvoiceField(String invoiceField) {
+		this.invoiceField = invoiceField;
+	}
+
+	public void setInvoicePrice(String invoicePrice) {
+		this.invoicePrice = invoicePrice;
+	}
+
+	public void setInvoiceBrowse(int invoiceBrowse) {
+		this.invoiceBrowse = invoiceBrowse;
+	}
+
+	public void setInvoiceDetailTable(String invoiceDetailTable) {
+		this.invoiceDetailTable = invoiceDetailTable;
+	}
+
+	public int getId() {
+		return this.id;
+	}
+
+	public int getRequestId() {
+		return this.requestId;
+	}
+
+	public String getWorkflowType() {
+		return this.workflowType;
+	}
+
+	public String getWorkflowNodes() {
+		return this.workflowNodes;
+	}
+
+	public String getInvoiceField() {
+		return this.invoiceField;
+	}
+
+	public String getInvoicePrice() {
+		return this.invoicePrice;
+	}
+
+	public int getInvoiceBrowse() {
+		return this.invoiceBrowse;
+	}
+
+	public String getInvoiceDetailTable() {
+		return this.invoiceDetailTable;
+	}
+
+	@Override
+	public String toString() {
+		return "UfInvoiceConfigDTO{" +
+				"id='" + id + '\'' +
+				", requestId='" + requestId + '\'' +
+				", workflowType='" + workflowType + '\'' +
+				", workflowNodes='" + workflowNodes + '\'' +
+				", invoiceField='" + invoiceField + '\'' +
+				", invoicePrice='" + invoicePrice + '\'' +
+				", invoiceBrowse='" + invoiceBrowse + '\'' +
+				", invoiceDetailTable='" + invoiceDetailTable + '\'' +
+				'}';
+	}
+}
\ No newline at end of file
diff --git a/src/main/youhong_ai_old_src/com/api/aiyh_kafang/service/InvoiceService.java b/src/main/youhong_ai_old_src/com/api/aiyh_kafang/service/InvoiceService.java
new file mode 100644
index 0000000..6af3aa0
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/aiyh_kafang/service/InvoiceService.java
@@ -0,0 +1,314 @@
+package com.api.aiyh_kafang.service;
+
+import aiyh.utils.Util;
+import aiyh.utils.sqlUtil.sqlResult.impl.BatchSqlResultImpl;
+import aiyh.utils.zwl.common.ToolUtil;
+import com.api.aiyh_kafang.dao.InvoiceMapping;
+import com.api.aiyh_kafang.entity.UfInvoiceConfigDTO;
+import com.sun.image.codec.jpeg.JPEGCodec;
+import com.weaver.general.TimeUtil;
+import net.sf.json.JSONArray;
+import net.sf.json.JSONObject;
+import org.h2.util.StringUtils;
+import weaver.conn.RecordSet;
+import weaver.file.ImageFileManager;
+import weaver.fna.invoice.utils.HttpUtil;
+import weaver.formmode.data.ModeDataIdUpdate;
+import weaver.formmode.setup.ModeRightInfo;
+import weaver.hrm.User;
+
+import javax.imageio.IIOException;
+import javax.imageio.ImageIO;
+import java.awt.image.BufferedImage;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.*;
+
+/**
+ * @author EBU7-dev1-ayh
+ * @create 2021/11/2 0002 15:17
+ * 检查发票
+ */
+
+
+public class InvoiceService {
+
+    private final InvoiceMapping invoiceMapping = new InvoiceMapping();
+    private final ModeDataIdUpdate mdu = ModeDataIdUpdate.getInstance();
+    private final RecordSet rs = new RecordSet();
+    private final ToolUtil toolUtil = new ToolUtil();
+    private final String ModeTable = "uf_fpyzjb";
+    private final String ModeDetailTable = "uf_fpyzjb_dt1";
+    private final String ModeDetailTableErr = "uf_fpyzjb_dt3";
+    private String formModeId = "17";
+    private final String invoiceTable = "fnainvoiceledger";
+
+    public InvoiceService() {
+        String formModeId = toolUtil.getSystemParamValue("formModeId");
+        if (!StringUtils.isNullOrEmpty(formModeId)) {
+            this.formModeId = formModeId;
+        }
+    }
+
+    /**
+     * 查询发票信息，OCR识别
+     *
+     * @param user
+     * @param fileId
+     * @return
+     * @throws IOException
+     */
+    public JSONObject getInvoiceInfo(User user, int fileId) throws Exception {
+//		方法一
+/*		InputStream inputStreamById = ImageFileManager.getInputStreamById(fileId);
+		byte[] bytes;
+		bytes = IOUtils.toByteArray(inputStreamById);
+		JSONObject jsonObject = HttpUtil.postImage(bytes, user);*/
+
+//		方法二
+/*		String fileData = FnaInvoiceUploadUtil.changeFileTobase64(fileId);
+		byte[] imageBytes = ImageUtil.transformImage(fileData);
+		JSONObject jsonObject = HttpUtil.postImage(imageBytes, user);*/
+
+
+//		方法三
+        try {
+            InputStream inputStreamById = ImageFileManager.getInputStreamById(fileId);
+            BufferedImage imageBuffer = ImageIO.read(inputStreamById);
+            ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
+            boolean jpeg = ImageIO.write(imageBuffer, "jpeg", byteArrayOutputStream);
+            if (!jpeg) {
+                toolUtil.writeErrorLog("图片转化转化失败！");
+            }
+            byte[] bytes = byteArrayOutputStream.toByteArray();
+            //		toolUtil.writeErrorLog(jsonObject.toString());
+            return HttpUtil.postImage(bytes, user);
+        } catch (IIOException e) {
+            InputStream inputStreamById = ImageFileManager.getInputStreamById(fileId);
+            BufferedImage imageBuffer = JPEGCodec.createJPEGDecoder(inputStreamById).decodeAsBufferedImage();
+            ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
+            boolean jpeg = ImageIO.write(imageBuffer, "jpeg", byteArrayOutputStream);
+            if (!jpeg) {
+                toolUtil.writeErrorLog("图片转化转化失败！");
+            }
+            byte[] bytes = byteArrayOutputStream.toByteArray();
+            //		toolUtil.writeErrorLog(jsonObject.toString());
+            return HttpUtil.postImage(bytes, user);
+        }
+    }
+
+    /**
+     * 对比合同信息
+     */
+    public Map<String, Object> contrastInvoiceInfo(Map<String, Object> params) {
+//		获取到流程表中的明细数据，对比建模表中的发票信息，查验数量是否一致以及发票的钱
+//		List<String> fileIdList = (List<String>) params.get("fileIdList");
+        String requestId = Util.null2String(params.get("requestId"));
+        String workflowId = Util.null2String(params.get("workflowId"));
+//		查询建模表数据
+        String mainId = invoiceMapping.getMainId(requestId);
+        List<Map<String, Object>> modeData = invoiceMapping.selectModeInfo(mainId);
+//		查询配置表信息
+        UfInvoiceConfigDTO configInfo = invoiceMapping.getConfigInfo(workflowId);
+//		查询流程中的发票数据
+        List<Map<String, Object>> workflowData = invoiceMapping.selectWorkflowData(workflowId, requestId, configInfo);
+//	    对比合同信息，查询出相差的发票
+        List<Map<String, Object>> priceNotEqual = new ArrayList<>();
+        List<Map<String, Object>> workflowDataRm = new ArrayList<>();
+        List<Map<String, Object>> modeDataRm = new ArrayList<>();
+        if (configInfo.getInvoiceBrowse() == 1) {
+//			属于浏览框
+            for (Map<String, Object> workflowDatum : workflowData) {
+                String workflowCodeId = Util.null2String(workflowDatum.get(configInfo.getInvoiceField()));
+                String workflowCode = "";
+                String workflowInvoicePrice = Util.null2String(workflowDatum.get(configInfo.getInvoicePrice()));
+                try {
+                    workflowCode = invoiceMapping.getWorkflowCode(workflowCodeId, invoiceTable);
+                    workflowDatum.put(configInfo.getInvoiceField(), workflowCode);
+                    workflowDatum.put("fphm2", workflowCode);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                    toolUtil.writeErrorLog("发票不存在：" + e);
+                }
+                for (Map<String, Object> modeDatum : modeData) {
+                    String modeCode = Util.null2String(modeDatum.get("fphm2"));
+                    String modePrice = Util.null2String(modeDatum.get("fpje"));
+                    if (workflowCode.equals(modeCode)) {
+//                      发票号码相等，校验发票金额
+                        if (!workflowInvoicePrice.equals(modePrice)) {
+//							金额不相等
+//							添加校验失败数据到数组中
+                            priceNotEqual.add(modeDatum);
+                        }
+//						求差集
+                        workflowDataRm.add(workflowDatum);
+                        modeDataRm.add(modeDatum);
+                        break;
+                    }
+                }
+            }
+//			求差
+//			建模表中多余的发票信息
+            modeData.removeAll(modeDataRm);
+//			流程中有但是建模表中没有的发票信息
+            workflowData.removeAll(workflowDataRm);
+
+        } else {
+//			不属于浏览框
+            for (Map<String, Object> workflowDatum : workflowData) {
+                String workflowCode = Util.null2String(workflowDatum.get(configInfo.getInvoiceField()));
+                String workflowInvoicePrice = Util.null2String(workflowDatum.get(configInfo.getInvoicePrice()));
+                for (Map<String, Object> modeDatum : modeData) {
+                    String modeCode = Util.null2String(modeDatum.get("fphm2"));
+                    String modePrice = Util.null2String(modeDatum.get("fpje"));
+                    if (workflowCode.equals(modeCode)) {
+//                      发票号码相等，校验发票金额
+                        if (!workflowInvoicePrice.equals(modePrice)) {
+//							金额不相等
+//							添加校验失败数据到数组中
+                            priceNotEqual.add(modeDatum);
+                        }
+//						求差集
+                        workflowDataRm.add(workflowDatum);
+                        modeDataRm.add(modeDatum);
+                        break;
+                    }
+                }
+            }
+//			求差
+//			建模表中多余的发票信息
+            modeData.removeAll(modeDataRm);
+//			流程中有但是建模表中没有的发票信息
+            workflowData.removeAll(workflowDataRm);
+        }
+
+        List<LinkedHashMap<String, Object>> insertList = new ArrayList<>();
+//		将价格不一样的数据保存到建模表明细3中，并标识错误原因为价格不一致
+        for (Map<String, Object> map : priceNotEqual) {
+            LinkedHashMap<String, Object> data = new LinkedHashMap<>();
+            data.put("fphm1", map.get("fphm2"));
+            data.put("sbyy", "流程发票明细信息表中的发票与扫描识别发票的发票金额不一致！");
+            data.put("mainid", mainId);
+            insertList.add(data);
+        }
+//		将建模表多的发票保存到建模表明细3中，并标识错误原因为流程中不存在改发票信息
+        for (Map<String, Object> map : modeData) {
+            LinkedHashMap<String, Object> data = new LinkedHashMap<>();
+            data.put("fphm1", map.get("fphm2"));
+            data.put("sbyy", "流程中不存在该发票信息，但扫描发票中存在改发票！");
+            data.put("mainid", mainId);
+            insertList.add(data);
+        }
+//		将流程中多的发票保存到建模表明细3中，并标识错误原因为，扫描发票中不存在改发票信息
+        for (Map<String, Object> map : workflowData) {
+            LinkedHashMap<String, Object> data = new LinkedHashMap<>();
+            data.put("fphm1", Util.null2String(map.get(configInfo.getInvoiceField())));
+            data.put("sbyy", "流程中存在改发票，但是扫描发票中没有发现该发票信息！");
+            data.put("mainid", mainId);
+            insertList.add(data);
+        }
+        RecordSet rs = new RecordSet();
+        BatchSqlResultImpl batchSqlResult = Util.createSqlBuilder().insertBatchSql(ModeDetailTableErr, insertList);
+        toolUtil.writeErrorLog("SQL：" + batchSqlResult.getSqlStr() + " ---->参数：" + batchSqlResult.getBatchList());
+        System.out.println("SQL：" + batchSqlResult.getSqlStr() + " ---->参数：" + batchSqlResult.getBatchList());
+/*		for (List list : batchSqlResult.getBatchList()) {
+			rs.executeUpdate(batchSqlResult.getSqlStr(),list);
+		}*/
+        try {
+            rs.executeBatchSql(batchSqlResult.getSqlStr(), batchSqlResult.getBatchList());
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        Map<String, Object> result = new HashMap<>();
+        result.put("priceNotEqual", priceNotEqual);
+        result.put("workflowData", workflowData);
+        result.put("modeData", modeData);
+        return result;
+    }
+
+    /**
+     * 获取配置信息
+     *
+     * @param workflowId
+     * @return
+     */
+    public UfInvoiceConfigDTO getConfigInfo(String workflowId) {
+        return invoiceMapping.getConfigInfo(workflowId);
+    }
+
+    /**
+     * 保存合同信息
+     *
+     * @param invoiceInfo
+     * @param requestId
+     */
+    public void saveInvoiceInfo(JSONObject invoiceInfo, String requestId) {
+//		 查询是否已经存在，不存在则新增，存在则更新
+        String query = "select * from " + ModeTable + " where lc = ?";
+        rs.executeQuery(query, requestId);
+        if (rs.next()) {
+//			存在，往明细表中添加数据
+            saveInvoiceDetail(invoiceInfo, requestId, rs.getString("id"));
+            return;
+        }
+//		添加主表数据，并且添加明细
+        int dataId = mdu.getModeDataNewId(ModeTable,
+                Util.getIntValue(formModeId, -1),
+                1, 0, TimeUtil.getCurrentDateString(),
+                TimeUtil.getOnlyCurrentTimeString());
+//		 插入数据库信息
+        invoiceMapping.saveInvoiceInfo(dataId, ModeTable, requestId);
+        saveInvoiceDetail(invoiceInfo, requestId, String.valueOf(dataId));
+        ModeRightInfo mri = new ModeRightInfo();
+        mri.rebuildModeDataShareByEdit(1, Util.getIntValue(formModeId, -1), dataId);
+    }
+
+    /**
+     * 保存发票信息到建模明细表
+     *
+     * @param invoiceInfo
+     * @param requestId
+     * @param mainId
+     */
+    public void saveInvoiceDetail(JSONObject invoiceInfo, String requestId, String mainId) {
+        String main = mainId;
+        if (StringUtils.isNullOrEmpty(main)) {
+//		    查询主表数据
+            String query = "select * from " + ModeTable + " where lc = ?";
+            rs.executeQuery(query, requestId);
+            rs.next();
+            main = rs.getString("id");
+        }
+//		保存明细表数据
+        JSONObject returnInfo = (JSONObject) invoiceInfo.get("returnInfo");
+        toolUtil.writeErrorLog("returnInfo：" + returnInfo);
+        if (returnInfo == null) {
+            throw new RuntimeException("发票数据获取失败：" + invoiceInfo);
+        }
+        JSONObject response = (JSONObject) returnInfo.get("response");
+        JSONObject data = (JSONObject) response.get("data");
+        JSONArray identifyResults = (JSONArray) data.get("identify_results");
+        for (int i = 0; i < identifyResults.size(); i++) {
+            JSONObject item = (JSONObject) identifyResults.get(i);
+            JSONObject details = (JSONObject) item.get("details");
+//			查询是否存在该发票，不存在则添加
+            if (invoiceMapping.selectExist(main, Util.null2String(details.get("number")))) {
+                return;
+            }
+            //		明细表数据
+            Map<String, Object> insert = Util.createUtilHashMap()
+//				发票号码
+                    .uPut("fphm2", details.get("number"))
+//			    费用日期
+                    .uPut("fyrq", details.get("date"))
+//				服务内容
+                    .uPut("fwnr", details.get("item_names"))
+//				发票金额
+                    .uPut("fpje", details.get("total"))
+                    .uPut("mainid", main);
+            toolUtil.writeErrorLog("insert：" + insert);
+            invoiceMapping.saveInvoiceDetail(insert, ModeDetailTable);
+        }
+    }
+}
diff --git a/src/main/youhong_ai_old_src/com/api/aiyh_kafang/service/UploadByBase64Service.java b/src/main/youhong_ai_old_src/com/api/aiyh_kafang/service/UploadByBase64Service.java
new file mode 100644
index 0000000..746320f
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/aiyh_kafang/service/UploadByBase64Service.java
@@ -0,0 +1,32 @@
+package com.api.aiyh_kafang.service;
+
+
+import aiyh.utils.zwl.common.ToolUtil;
+import org.apache.axiom.util.base64.Base64Utils;
+import weaver.file.ImageFileManager;
+
+import java.util.Map;
+import java.util.UUID;
+
+/**
+ * @author EBU7-dev1-ayh
+ * @create 2021/10/8 0008 13:36
+ * 业务逻辑处理
+ */
+
+
+public class UploadByBase64Service {
+	public int uploadImage(Map<String, String> param) {
+		ToolUtil toolUtil = new ToolUtil();
+		String base64 = String.valueOf(param.get("base64")).replaceAll(" ", "+");;
+		ImageFileManager fileManager = new ImageFileManager();
+		byte[] data = null;
+		data = Base64Utils.decode(base64);
+		fileManager.setData(data);
+		String fileName = "" + System.currentTimeMillis() + UUID.randomUUID() + ".jpg";
+		fileManager.setImagFileName(fileName);
+		int i = fileManager.saveImageFile();
+		toolUtil.writeErrorLog("生成的图片的id：" + i);
+		return i;
+	}
+}
diff --git a/src/main/youhong_ai_old_src/com/api/aiyh_kafang/web/InvoiceController.java b/src/main/youhong_ai_old_src/com/api/aiyh_kafang/web/InvoiceController.java
new file mode 100644
index 0000000..7d1b380
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/aiyh_kafang/web/InvoiceController.java
@@ -0,0 +1,36 @@
+package com.api.aiyh_kafang.web;
+
+import aiyh.utils.ApiResult;
+import com.api.aiyh_kafang.service.InvoiceService;
+import io.swagger.v3.oas.annotations.parameters.RequestBody;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import java.util.Map;
+
+/**
+ * @author EBU7-dev1-ayh
+ * @create 2021/9/27 0027 10:29
+ * 发票相关控制器
+ */
+
+@Path("/kafang/invoiceCheck")
+public class InvoiceController {
+	private InvoiceService invoiceService = new InvoiceService();
+
+	@Path("/check/contrast")
+	@POST
+	@Consumes(MediaType.APPLICATION_JSON)
+	@Produces(MediaType.APPLICATION_JSON)
+	public String check(@Context HttpServletRequest request, @Context HttpServletResponse response,
+	                    @RequestBody Map<String, Object> params) {
+		Map<String, Object> result = invoiceService.contrastInvoiceInfo(params);
+		return ApiResult.success(result);
+	}
+}
diff --git a/src/main/youhong_ai_old_src/com/api/aiyh_kafang/web/UploadByBase64.java b/src/main/youhong_ai_old_src/com/api/aiyh_kafang/web/UploadByBase64.java
new file mode 100644
index 0000000..d87977a
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/aiyh_kafang/web/UploadByBase64.java
@@ -0,0 +1,97 @@
+package com.api.aiyh_kafang.web;
+
+import aiyh.utils.ApiResult;
+import aiyh.utils.zwl.common.ToolUtil;
+import com.api.aiyh_kafang.entity.UfInvoiceConfigDTO;
+import com.api.aiyh_kafang.service.InvoiceService;
+import com.api.aiyh_kafang.service.UploadByBase64Service;
+import io.swagger.v3.oas.annotations.parameters.RequestBody;
+import net.sf.json.JSONObject;
+import org.apache.commons.io.IOUtils;
+import weaver.file.ImageFileManager;
+import weaver.hrm.HrmUserVarify;
+import weaver.hrm.User;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.ws.rs.*;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.StreamingOutput;
+import java.io.InputStream;
+import java.util.Map;
+
+/**
+ * @author EBU7-dev1-ayh
+ * @create 2021/9/27 0027 14:13
+ * upload invoice by base64 arr
+ */
+
+
+@Path("/kafang/upload")
+public class UploadByBase64 {
+	private final ToolUtil toolUtil = new ToolUtil();
+	private final UploadByBase64Service uploadByBase64Service = new UploadByBase64Service();
+	private final InvoiceService invoiceService = new InvoiceService();
+
+	@Path("/uploadImage/byBase64")
+	@POST
+	@Consumes(MediaType.APPLICATION_JSON)
+	@Produces(MediaType.APPLICATION_JSON)
+	public String uploadImage(@Context HttpServletRequest request, @Context HttpServletResponse response,
+	                          @RequestBody Map<String, String> base64Map) {
+		int i = uploadByBase64Service.uploadImage(base64Map);
+//		 上传完成过后，调用发票识别接口，将数据保存到建模表中
+		User user = HrmUserVarify.getUser(request, response);
+		JSONObject invoiceInfo = null;
+		try {
+			invoiceInfo = invoiceService.getInvoiceInfo(user, i);
+			if (invoiceInfo == null || "1".equals(String.valueOf(invoiceInfo.get("status")))) {
+				throw new RuntimeException(invoiceInfo == null ? "识别数据为空！" : invoiceInfo.toString());
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
+			toolUtil.writeErrorLog("发票识别失败！" + e + invoiceInfo);
+			return ApiResult.error("发票识别失败！");
+		}
+		try {
+			invoiceService.saveInvoiceInfo(invoiceInfo, base64Map.get("requestId"));
+		} catch (Exception e) {
+			e.printStackTrace();
+			toolUtil.writeErrorLog("发票保存失败！" + e);
+			return ApiResult.error("发票保存失败！");
+		}
+		return ApiResult.success(i);
+	}
+
+	@Path("/getConfigInfo/{workflowId}")
+	@GET
+	@Consumes(MediaType.APPLICATION_JSON)
+	@Produces(MediaType.APPLICATION_JSON)
+	public String getWorkflowId(@PathParam("workflowId") String workflowId) {
+		UfInvoiceConfigDTO configInfo = invoiceService.getConfigInfo(workflowId);
+		return ApiResult.success(configInfo);
+	}
+
+
+	@Path("/download/img/{fileId}")
+	@GET
+	@Produces(MediaType.APPLICATION_OCTET_STREAM)
+	public Response downloadFile(@PathParam("fileId") int fileId){
+		try {
+			InputStream inputStreamById = ImageFileManager.getInputStreamById(fileId);
+			byte[] bytes = IOUtils.toByteArray(inputStreamById);
+			StreamingOutput output = outputStream -> {
+                outputStream.write(bytes);
+                outputStream.close();
+            };
+			Response.ResponseBuilder header = Response.ok(output, MediaType.APPLICATION_OCTET_STREAM)
+					.header("Content-Disposition",
+							"attachment; filename=image_from_server.jpg");
+			return header.build();
+		} catch (Exception e) {
+			return Response.ok(ApiResult.error("异常" + e), MediaType.APPLICATION_JSON).build();
+		}
+	}
+}
diff --git a/src/main/youhong_ai_old_src/com/api/aiyh_logincheck/controller/DynamicCodeController.java b/src/main/youhong_ai_old_src/com/api/aiyh_logincheck/controller/DynamicCodeController.java
new file mode 100644
index 0000000..edcf2cd
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/aiyh_logincheck/controller/DynamicCodeController.java
@@ -0,0 +1,86 @@
+package com.api.aiyh_logincheck.controller;
+
+import aiyh.utils.ApiResult;
+import aiyh.utils.Util;
+import aiyh.utils.excention.CustomerException;
+import com.api.aiyh_logincheck.service.DynamicCodeService;
+import com.engine.common.util.ParamUtil;
+import io.swagger.v3.oas.annotations.parameters.RequestBody;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.ws.rs.*;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import java.util.Map;
+
+/**
+ * create 2022/1/17 0017 16:34
+ *
+ * @author EBU7-dev1-ayh
+ */
+
+
+@Path("/dynamicCode")
+public class DynamicCodeController {
+	private final DynamicCodeService dynamicCodeService = new DynamicCodeService();
+	
+	/**
+	 * 生成动态验证码
+	 *
+	 * @param loginId 登录id
+	 * @return 是否成功
+	 */
+	@Path("/getCode/{loginId}")
+	@GET
+	@Produces(MediaType.APPLICATION_JSON)
+	public String getCode(@PathParam("loginId") String loginId) {
+		try {
+			return ApiResult.success(dynamicCodeService.getCode(loginId));
+		} catch (Exception e) {
+			Util.getLogger().error("获取动态验证码失败 ！", e);
+			return ApiResult.error("获取动态验证码失败");
+		}
+	}
+	
+	/**
+	 * 验证动态码是否正确
+	 *
+	 * @param request 请求体
+	 * @return 验证结果
+	 */
+	@Path("/checkCode")
+	@POST
+	@Produces(MediaType.APPLICATION_JSON)
+	public String checkCode(@Context HttpServletRequest request, @Context HttpServletResponse response) {
+		@SuppressWarnings("unchecked")
+		Map<String, Object> params = ParamUtil.request2Map(request);
+		Util.getLogger().debug(params);
+		try {
+			int i = dynamicCodeService.checkDynamicCode(String.valueOf(params.get("loginId")),
+					String.valueOf(params.get("dynamicCode")), request, response);
+			return ApiResult.success(i);
+		} catch (Exception e) {
+			Util.getLogger().error("检查动态验证码出错 ！", e);
+		}
+		return ApiResult.error("检查动态验证码出错");
+	}
+	
+	
+	@Path("/getUncheck")
+	@POST
+	@Produces(MediaType.APPLICATION_JSON)
+	public String getUncheck(@RequestBody Map<String, Object> userInfo) {
+		try {
+			return ApiResult.success(dynamicCodeService.getUncheck(userInfo));
+			
+		} catch (CustomerException e) {
+			if (e.getCode() == 403) {
+				return ApiResult.error(403, "用户名或密码错误！");
+			}
+		} catch (Exception e) {
+			Util.getLogger().error("检查是否开启动态码或获取白名单 ！", e);
+		}
+		return ApiResult.error("检查动态验证码出错");
+	}
+}
diff --git a/src/main/youhong_ai_old_src/com/api/aiyh_logincheck/enumType/CodeStatus.java b/src/main/youhong_ai_old_src/com/api/aiyh_logincheck/enumType/CodeStatus.java
new file mode 100644
index 0000000..baf30b2
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/aiyh_logincheck/enumType/CodeStatus.java
@@ -0,0 +1,36 @@
+package com.api.aiyh_logincheck.enumType;
+
+/**
+ * create 2022/1/17 0017 17:24
+ *
+ * @author EBU7-dev1-ayh
+ */
+
+public enum CodeStatus {
+
+    /**
+     * 没有动态验证码，验证码过期
+     */
+    withoutDynamicCode(-1),
+    /**
+     * 动态 验证码错误
+     */
+    dynamicCodeErr(-2),
+    /**
+     * 验证通过
+     */
+    success(0);
+
+    private final int value;
+
+
+
+    CodeStatus(int value){
+        this.value = value;
+    }
+
+    public int getValue(){
+        return this.value;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/youhong_ai_old_src/com/api/aiyh_logincheck/mapper/DynamicCodeMapper.java b/src/main/youhong_ai_old_src/com/api/aiyh_logincheck/mapper/DynamicCodeMapper.java
new file mode 100644
index 0000000..e4291f8
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/aiyh_logincheck/mapper/DynamicCodeMapper.java
@@ -0,0 +1,29 @@
+package com.api.aiyh_logincheck.mapper;
+
+import aiyh.utils.annotation.recordset.ParamMapper;
+import aiyh.utils.annotation.recordset.Select;
+import aiyh.utils.annotation.recordset.SqlMapper;
+
+/**
+ * create 2022/1/17 0017 16:57
+ *
+ * @author EBU7-dev1-ayh
+ */
+
+@SqlMapper
+public interface DynamicCodeMapper {
+	
+	@Select("select email from hrmresource where loginid = #{loginId}")
+	public String selectEmail(@ParamMapper("loginId") String loginId);
+	
+	/**
+	 * <h2>查询用户</h2>
+	 *
+	 * @param user       用户loginId
+	 * @param mdPassword 用户加密后的密码
+	 * @return 用户 id
+	 */
+	@Select("select id from hrmresource where loginid = #{loginId} and password = #{password}")
+	Integer selectUser(@ParamMapper("loginId") String user,
+	                   @ParamMapper("password") String mdPassword);
+}
diff --git a/src/main/youhong_ai_old_src/com/api/aiyh_logincheck/service/DynamicCodeService.java b/src/main/youhong_ai_old_src/com/api/aiyh_logincheck/service/DynamicCodeService.java
new file mode 100644
index 0000000..9058784
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/aiyh_logincheck/service/DynamicCodeService.java
@@ -0,0 +1,137 @@
+package com.api.aiyh_logincheck.service;
+
+import aiyh.utils.Util;
+import aiyh.utils.excention.CustomerException;
+import aiyh.utils.zwl.common.ToolUtil;
+import cn.hutool.core.util.RandomUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.api.aiyh_logincheck.enumType.CodeStatus;
+import com.api.aiyh_logincheck.mapper.DynamicCodeMapper;
+import com.api.login.util.LoginUtil;
+import com.cloudstore.dev.api.util.Util_DataCache;
+import com.weaver.formmodel.util.EncryptHelper;
+import org.apache.commons.lang.StringUtils;
+import org.apache.log4j.Logger;
+import weaver.email.EmailWorkRunnable;
+import weaver.general.BaseBean;
+import weaver.sm.SM4Utils;
+
+import javax.servlet.ServletContext;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Base64;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * create 2022/1/17 0017 16:38
+ *
+ * @author EBU7-dev1-ayh
+ */
+
+
+public class DynamicCodeService {
+	private final DynamicCodeMapper dynamicCodeMapper = Util.getMapper(DynamicCodeMapper.class);
+	private final Logger log = Util.getLogger();
+	private final ToolUtil toolUtil = new ToolUtil();
+	
+	/**
+	 * 生成动态 验证码并发送邮箱
+	 *
+	 * @param loginId 登录id
+	 * @return 验证码
+	 */
+	public boolean getCode(String loginId) {
+		String code = RandomUtil.randomString(6);
+		Util_DataCache.setObjVal(loginId, code, 60 * 3);
+		String emailAddress = dynamicCodeMapper.selectEmail(loginId);
+		if ("".equals(emailAddress) || emailAddress == null) {
+			return false;
+		}
+		String dynamicCodeTitle = toolUtil.getSystemParamValue("dynamicCodeTitle");
+		if (StringUtils.isBlank(dynamicCodeTitle)) {
+			dynamicCodeTitle = "OA办公系统登录邮箱验证码";
+		}
+		String dynamicCodeContent = toolUtil.getSystemParamValue("dynamicCodeContent");
+		if (StringUtils.isBlank(dynamicCodeContent)) {
+			dynamicCodeContent = "您的登录验证码为：<u>${code}</u>！3分钟内有效！";
+		}
+		String content = dynamicCodeContent.replaceAll("\\$\\{\\s*code\\s*}", code);
+		content = content.replaceAll("\\$\\{\\s*time\\s*}", Util.getTime("yyyy-MM-dd HH:mm:ss"));
+//        发送邮件
+		try {
+			EmailWorkRunnable.threadModeReminder(emailAddress, "", "",
+					dynamicCodeTitle,
+					content);
+			return true;
+		} catch (Exception e) {
+			log.error("发送邮件错误！", e);
+		}
+		return false;
+	}
+	
+	/**
+	 * 检验动态验证码是否正确
+	 *
+	 * @param loginId 登录id
+	 * @param code    动态验证码
+	 * @return 状态代码
+	 */
+	public int checkDynamicCode(String loginId, String code, HttpServletRequest request, HttpServletResponse response) {
+		Object dynamicCode = Util.null2DefaultStr(Util_DataCache.getObjVal(loginId), "");
+		if ("".equals(dynamicCode)) {
+			ServletContext application = request.getSession().getServletContext();
+			new LoginUtil().checkLogout(application, request, response);
+			return CodeStatus.withoutDynamicCode.getValue();
+		}
+		if (code.equals(dynamicCode)) {
+			return CodeStatus.success.getValue();
+		}
+		ServletContext application = request.getSession().getServletContext();
+		new LoginUtil().checkLogout(application, request, response);
+		return CodeStatus.dynamicCodeErr.getValue();
+	}
+	
+	/**
+	 * 不通过二次验证的登录名
+	 *
+	 * @return 不通过二次 验证的登录名
+	 */
+	public Map<String, Object> getUncheck(Map<String, Object> userInfo) {
+		if (Objects.isNull(userInfo)) {
+			throw new CustomerException("userInfo no can be null!");
+		}
+		String userStr = Util.null2String(userInfo.get("userInfo"));
+		if (userStr.isEmpty()) {
+			throw new CustomerException("userInfoStr is null!");
+		}
+		userStr = userStr.substring(10);
+		userStr = userStr.substring(0, 10) + userStr.substring(20);
+		userStr = new String(Base64.getDecoder().decode(userStr.getBytes()));
+		JSONObject jsonObject = JSON.parseObject(userStr);
+		String user = jsonObject.getString("user");
+		String password = jsonObject.getString("password");
+		if (password.endsWith("_random_")) {
+			SM4Utils sm4 = new SM4Utils();
+			BaseBean bb = new BaseBean();
+			String key = weaver.general.Util.null2String(bb.getPropValue("weaver_client_pwd", "key"));
+			if (!"".equals(key)) {
+				password = password.substring(0, password.lastIndexOf("_random_"));
+				password = sm4.decrypt(password, key);
+			}
+		}
+		String mdPassword = EncryptHelper.encodeMd5(password).toUpperCase();
+		Integer userId = dynamicCodeMapper.selectUser(user, mdPassword);
+		if (Objects.isNull(userId) || userId < 0) {
+			throw new CustomerException("账号或密码错误！", 403);
+		}
+		String uncheckList = toolUtil.getSystemParamValue("uncheckList");
+		String isEnable = toolUtil.getSystemParamValue("enableDynamicCode");
+		Map<String, Object> map = new HashMap<>(4);
+		map.put("uncheckList", Util.null2DefaultStr(uncheckList, "").split(","));
+		map.put("isEnable", Boolean.valueOf(isEnable));
+		return map;
+	}
+}
diff --git a/src/main/youhong_ai_old_src/com/api/aiyh_pcn/async_organization/ExportExcel.java b/src/main/youhong_ai_old_src/com/api/aiyh_pcn/async_organization/ExportExcel.java
new file mode 100644
index 0000000..adc6f1a
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/aiyh_pcn/async_organization/ExportExcel.java
@@ -0,0 +1,159 @@
+package com.api.aiyh_pcn.async_organization;
+
+import aiyh.utils.zwl.common.ToolUtil;
+import km.org.apache.poi.hssf.usermodel.HSSFCellStyle;
+import km.org.apache.poi.hssf.util.HSSFColor;
+import org.apache.poi.ss.usermodel.*;
+import org.apache.poi.ss.util.CellRangeAddress;
+import org.apache.poi.xssf.streaming.SXSSFWorkbook;
+import weaver.aiyh_pcn.async_organization.model.Department;
+import weaver.aiyh_pcn.async_organization.model.Employee;
+import weaver.aiyh_pcn.async_organization.model.Position;
+import weaver.aiyh_pcn.async_organization.result.GetOrganizationResult;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author EBU7-dev1-ayh
+ * @create 2021/8/8 0008 16:06
+ * 导出api请求数据的表格
+ */
+
+@Path("/asyncOrganization")
+public class ExportExcel {
+
+	@GET
+	@Path("/exportExcel")
+	@Produces(MediaType.APPLICATION_OCTET_STREAM)
+	public Response exportExcel(@Context HttpServletRequest request, @Context HttpServletResponse response) {
+		ToolUtil toolUtil = new ToolUtil();
+		GetOrganizationResult getOrganizationResult = new GetOrganizationResult();
+		List<Employee> employeeList = getOrganizationResult.getEmployeeList();
+		SXSSFWorkbook sxssfWorkbook = new SXSSFWorkbook();
+		CellStyle cellStyle = sxssfWorkbook.createCellStyle();
+		// 设置单元格居中对齐
+		cellStyle.setAlignment(HorizontalAlignment.forInt(HSSFCellStyle.ALIGN_CENTER));
+		Font font = sxssfWorkbook.createFont();
+		font.setColor(HSSFColor.RED.index);
+		cellStyle.setFont(font);
+		Sheet sheet = sxssfWorkbook.createSheet("人员信息");
+		Row desc = sheet.createRow(0);
+		sheet.addMergedRegion(new CellRangeAddress(0, 0, 0, 13));
+		Cell cell2 = desc.createCell(0);
+		cell2.setCellValue("员工信息表，同步数据时，按照岗位id进行排序同步！");
+		cell2.setCellStyle(cellStyle);
+		Row th = sheet.createRow(1);
+		th.createCell(0).setCellValue("员工ID");
+		th.createCell(1).setCellValue("名（英文）");
+		th.createCell(2).setCellValue("姓（英文）");
+		th.createCell(3).setCellValue("中文姓名");
+		th.createCell(4).setCellValue("英文名");
+		th.createCell(5).setCellValue("员工编号");
+		th.createCell(6).setCellValue("岗位ID");
+		th.createCell(7).setCellValue("部门ID");
+		th.createCell(8).setCellValue("部门名称");
+		th.createCell(9).setCellValue("成本中心编码");
+		th.createCell(10).setCellValue("邮箱");
+		th.createCell(11).setCellValue("公司实体");
+		th.createCell(12).setCellValue("电话号");
+		th.createCell(13).setCellValue("座机号");
+		try {
+			for (int i = 0; i < employeeList.size(); i++) {
+				Employee e = employeeList.get(i);
+//				toolUtil.writeErrorLog("item数据库：" + e);
+				if (e.getJOBCODEID() == null || e.getJOBCODEID() == 0){
+//					toolUtil.writeErrorLog("数据出现错误：" + e);
+                    e.setJOBCODEID(-0L);
+//					continue;
+				}
+				Row row = sheet.createRow(i + 2);
+				row.createCell(0).setCellValue(e.getUserID());
+				row.createCell(1).setCellValue(e.getFIRSTNAMEEN());
+				row.createCell(2).setCellValue(e.getLASTNAMEEN());
+				row.createCell(3).setCellValue(e.getUSERNAMECN());
+				row.createCell(4).setCellValue(e.getPreferred_Name());
+				row.createCell(5).setCellValue(e.getUSERCODE());
+				row.createCell(6).setCellValue(e.getJOBCODEID());
+				row.createCell(7).setCellValue(e.getDEPARTMENTID());
+				row.createCell(8).setCellValue(e.getDEPARTMENTNAME());
+				row.createCell(9).setCellValue(e.getCOSTCENTERCODE());
+				row.createCell(10).setCellValue(e.getEMAIL());
+				row.createCell(11).setCellValue(e.getORGANIZATION());
+				row.createCell(12).setCellValue(e.getMOBILENO());
+				row.createCell(13).setCellValue(e.getTEL());
+			}
+		}catch (Exception e){
+			toolUtil.writeErrorLog("出现异常："+e);
+		}
+
+		List<Department> departmentList = getOrganizationResult.getDepartmentList();
+		Sheet depSheet = sxssfWorkbook.createSheet("部门信息");
+		Row depdesc = depSheet.createRow(0);
+		depSheet.addMergedRegion(new CellRangeAddress(0, 0, 0, 2));
+		Cell cell1 = depdesc.createCell(0);
+		cell1.setCellValue("部门信息表，同步数据时按照该上级部门id进行排序同步！红色字体为根部门！");
+		cell1.setCellStyle(cellStyle);
+		Row depTh = depSheet.createRow(1);
+		depTh.createCell(0).setCellValue("部门ID");
+		depTh.createCell(1).setCellValue("部门名称");
+		depTh.createCell(2).setCellValue("上级部门");
+		for (int i = 0; i < departmentList.size(); i++) {
+			Row row = depSheet.createRow(i + 2);
+			Department d = departmentList.get(i);
+			row.createCell(0).setCellValue(d.getDEPARTMENTID());
+			row.createCell(1).setCellValue(d.getDEPARTMENTNAME());
+			Cell cell = row.createCell(2);
+			cell.setCellValue(d.getPARENTDEPARTMENDID());
+			if (d.getPARENTDEPARTMENDID() == 0) {
+				cell.setCellStyle(cellStyle);
+			}
+		}
+
+		List<Position> positionList = getOrganizationResult.getPositionList();
+		Sheet posSheet = sxssfWorkbook.createSheet("职位信息");
+		Row posdesc = posSheet.createRow(0);
+		posSheet.addMergedRegion(new CellRangeAddress(0, 0, 0, 3));
+		Cell cell3 = posdesc.createCell(0);
+		cell3.setCellValue("职位信息表，职位同步过程中以上级岗位id升序排序进行同步！");
+		cell3.setCellStyle(cellStyle);
+		Row posTh = posSheet.createRow(1);
+		posTh.createCell(0).setCellValue("岗位编号");
+		posTh.createCell(1).setCellValue("岗位编号");
+		posTh.createCell(2).setCellValue("岗位描述");
+		posTh.createCell(3).setCellValue("上级岗位ID");
+		for (int i = 0; i < positionList.size(); i++) {
+			Row row = posSheet.createRow(i + 2);
+			Position p = positionList.get(i);
+			row.createCell(0).setCellValue(p.getJOBCODEID());
+			row.createCell(1).setCellValue(p.getJOBCODE());
+			row.createCell(2).setCellValue(p.getJOBFUNCTION());
+			row.createCell(3).setCellValue(p.getSUPERIORJOBCODEID());
+		}
+		SimpleDateFormat newsdf = new SimpleDateFormat("yyyy-MM-dd-HHmmss");
+		String date = newsdf.format(new Date());
+		ByteArrayOutputStream bos = new ByteArrayOutputStream();
+		try {
+			sxssfWorkbook.write(bos);
+			return Response.ok(bos.toByteArray(), "application/msexcel;charset=UTF-8")
+					.header("Content-Disposition", "attachment;filename=\""
+							+ new String(("CMS人员同步接口数据" + date + ".xlsx").getBytes("GBK"),
+							"ISO8859_1") + "\"")
+					.build();
+		} catch (IOException e) {
+			e.printStackTrace();
+			throw new RuntimeException(e);
+		}
+	}
+}
diff --git a/src/main/youhong_ai_old_src/com/api/aiyh_pcn/common_fadada/contraller/CommonFaCallbackController.java b/src/main/youhong_ai_old_src/com/api/aiyh_pcn/common_fadada/contraller/CommonFaCallbackController.java
new file mode 100644
index 0000000..7068961
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/aiyh_pcn/common_fadada/contraller/CommonFaCallbackController.java
@@ -0,0 +1,34 @@
+package com.api.aiyh_pcn.common_fadada.contraller;
+
+import com.alibaba.fastjson.JSON;
+import io.swagger.v3.oas.annotations.parameters.RequestBody;
+
+import javax.ws.rs.Consumes;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * <p>回调</p>
+ * <p>create 2022/4/26 11:02 AM</p>
+ *
+ * @author ayh
+ */
+
+@Path("/common_fadada/callback")
+public class CommonFaCallbackController {
+
+    @Path("/dealers/callback")
+    @POST
+    @Produces(MediaType.APPLICATION_JSON)
+    @Consumes(MediaType.APPLICATION_JSON)
+    public String dealersCallback(@RequestBody Map<String, Object> params) {
+        Map<String, Object> result = new HashMap<>();
+        result.put("code", 200);
+        result.put("msg", "操作成功！");
+        return JSON.toJSONString(result);
+    }
+}
diff --git a/src/main/youhong_ai_old_src/com/api/aiyh_pcn/common_fadada/contraller/CommonFaController.java b/src/main/youhong_ai_old_src/com/api/aiyh_pcn/common_fadada/contraller/CommonFaController.java
new file mode 100644
index 0000000..0ba3004
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/aiyh_pcn/common_fadada/contraller/CommonFaController.java
@@ -0,0 +1,108 @@
+package com.api.aiyh_pcn.common_fadada.contraller;
+
+import aiyh.utils.ApiResult;
+import aiyh.utils.Util;
+import aiyh.utils.mapUtil.ParaMap;
+import com.api.aiyh_pcn.common_fadada.service.CommonFaService;
+import io.swagger.v3.oas.annotations.parameters.RequestBody;
+import weaver.hrm.HrmUserVarify;
+import weaver.hrm.User;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.ws.rs.*;
+import javax.ws.rs.core.Context;
+import java.util.Map;
+
+/**
+ * <p>公共发大大请求方法</p>
+ * <p>create 2022/4/14 10:25 AM</p>
+ *
+ * @author ayh
+ */
+
+
+@Path("/fadada/common")
+public class CommonFaController {
+
+    private final CommonFaService service = new CommonFaService();
+
+    @Path("/create-contract")
+    @POST
+    public String createContract(@Context HttpServletRequest request, @Context HttpServletResponse response,
+                                 @RequestBody Map<String, Object> params) {
+        User user = HrmUserVarify.getUser(request, response);
+        Map<String, Object> result = service.createContract(user, params);
+        return ApiResult.success(result);
+    }
+
+    @Path("/sign-contract")
+    @POST
+    public String signContract(@Context HttpServletRequest request, @Context HttpServletResponse response,
+                               @RequestBody Map<String, Object> params) {
+        User user = HrmUserVarify.getUser(request, response);
+        Map<String, Object> result = service.signContract(user, params);
+        return ApiResult.success(result);
+    }
+
+    @POST
+    @Path("/sign-oneself")
+    public String signOneself(@Context HttpServletRequest request, @Context HttpServletResponse response,
+                              @RequestBody Map<String, Object> params) {
+        User user = HrmUserVarify.getUser(request, response);
+        Map<String, Object> result = service.signOneself(user, params);
+        return ApiResult.success(result);
+    }
+
+    @POST
+    @Path("/download-contract")
+    public String downloadContract(@Context HttpServletRequest request, @Context HttpServletResponse response,
+                                   @RequestBody Map<String, Object> params) {
+        User user = HrmUserVarify.getUser(request, response);
+        Map<String, Object> result = service.downloadContract(user, params);
+        return ApiResult.success(result);
+    }
+
+    @POST
+    @Path("/pigeonhole-contract")
+    public String pigeonholeContract(@Context HttpServletRequest request, @Context HttpServletResponse response,
+                                     @RequestBody Map<String, Object> params) {
+        User user = HrmUserVarify.getUser(request, response);
+        Map<String, Object> result = service.pigeonholeContract(user, params);
+        return ApiResult.success(result);
+    }
+
+    @POST
+    @Path("/resign-contract")
+    @Produces("application/json")
+    @Consumes("application/json")
+    public String getContract(@Context HttpServletRequest request, @Context HttpServletResponse response,
+                              @RequestBody Map<String, Object> params) {
+        User user = HrmUserVarify.getUser(request, response);
+        Map<String, Object> result;
+        try {
+            service.resignContract(user, params);
+            result = ParaMap.create().put("success", true).put("msg", "推送成功");
+        } catch (Exception e) {
+            e.printStackTrace();
+            result = ParaMap.create().put("success", false).put("msg", "推送失败");
+        }
+        return ApiResult.success(result);
+    }
+
+    @GET
+    @Path("/get-contract-button/{workflowId}/{markOnly}")
+    @Produces("application/json")
+    public String getContractStatus(@Context HttpServletRequest request, @Context HttpServletResponse response,
+                                    @PathParam("workflowId") String workflowId,
+                                    @PathParam("markOnly") String markOnly) {
+        Map<String, Object> result;
+        try {
+            result = service.getContractButton(workflowId,markOnly);
+        }catch (Exception e){
+            Util.getLogger().error("查询流程添加节点配置出错：" + workflowId + " ==  " + markOnly + "\n" + Util.getErrString(e));
+            result = ParaMap.create().put("allVersion",new String[]{}).put("allVersion",new String[]{});
+        }
+        return ApiResult.success(result);
+    }
+}
diff --git a/src/main/youhong_ai_old_src/com/api/aiyh_pcn/common_fadada/mapper/ContractMapper.java b/src/main/youhong_ai_old_src/com/api/aiyh_pcn/common_fadada/mapper/ContractMapper.java
new file mode 100644
index 0000000..afaf31f
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/aiyh_pcn/common_fadada/mapper/ContractMapper.java
@@ -0,0 +1,49 @@
+package com.api.aiyh_pcn.common_fadada.mapper;
+
+import aiyh.utils.annotation.recordset.ParamMapper;
+import aiyh.utils.annotation.recordset.SqlMapper;
+import aiyh.utils.annotation.recordset.Update;
+
+/**
+ * <p></p>
+ * <p>create 2022/4/14 10:44 PM</p>
+ *
+ * @author ayh
+ */
+
+@SqlMapper
+public interface ContractMapper {
+
+
+    /**
+     * 更新合同号
+     *
+     * @param tableName     表名
+     * @param contractField 合同字段
+     * @param contractNo    合同号
+     * @param requestId     流程类型
+     * @return 是否更新成功
+     */
+    @Update
+    boolean updateContractInMainTable(@ParamMapper("tableName") String tableName,
+                                      @ParamMapper("contractField") String contractField,
+                                      @ParamMapper("contractNo") String contractNo,
+                                      @ParamMapper("requestId") String requestId);
+
+
+    /**
+     * 更新合同号
+     *
+     * @param tableName     表名
+     * @param contractField 合同字段
+     * @param contractNo    合同号
+     * @param detailId      明细表ID
+     * @return 是否更新成功
+     */
+    @Update
+    boolean updateContractInDetailTable(@ParamMapper("tableName") String tableName,
+                                        @ParamMapper("contractField") String contractField,
+                                        @ParamMapper("contractNo") String contractNo,
+                                        @ParamMapper("detailId") String detailId);
+
+}
diff --git a/src/main/youhong_ai_old_src/com/api/aiyh_pcn/common_fadada/service/CommonFaService.java b/src/main/youhong_ai_old_src/com/api/aiyh_pcn/common_fadada/service/CommonFaService.java
new file mode 100644
index 0000000..87c7da8
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/aiyh_pcn/common_fadada/service/CommonFaService.java
@@ -0,0 +1,249 @@
+package com.api.aiyh_pcn.common_fadada.service;
+
+import aiyh.utils.Util;
+import aiyh.utils.entity.WorkflowNodeConfig;
+import aiyh.utils.excention.CustomerException;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.google.common.base.Strings;
+import org.jetbrains.annotations.Nullable;
+import weaver.aiyh_pcn.common_fadada.action.PushContractInfoAction;
+import weaver.aiyh_pcn.common_fadada.entity.FaResultEntity;
+import weaver.aiyh_pcn.common_fadada.mapper.ActionMapper;
+import weaver.aiyh_pcn.common_fadada.service.*;
+import weaver.hrm.User;
+import weaver.interfaces.workflow.action.Action;
+import weaver.soa.workflow.request.RequestInfo;
+import weaver.soa.workflow.request.RequestService;
+import weaver.workflow.workflow.WorkflowVersion;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p></p>
+ * <p>create 2022/4/14 1:55 PM</p>
+ *
+ * @author ayh
+ */
+
+public class CommonFaService {
+    private final ActionMapper mapper = Util.getMapper(ActionMapper.class);
+
+    public Map<String, Object> createContract(User user, Map<String, Object> params) {
+        List<FaResultEntity> resultList = null;
+        try {
+            resultList = requestFaDaDa(user, params, new CreateContractService());
+        } catch (JsonProcessingException e) {
+            throw new CustomerException("合同创建失败！");
+        }
+        String requestId = String.valueOf(params.get("requestId"));
+        String workflowId = String.valueOf(params.get("workflowId"));
+        String contractNoField = String.valueOf(params.get("contractNoField"));
+        String billTable = Util.getMainTable(workflowId);
+        for (FaResultEntity result : resultList) {
+            writeBackContractNo(result, contractNoField, requestId, billTable);
+        }
+        return null;
+    }
+
+    private void writeBackContractNo(FaResultEntity result, String contractNoField, String requestId, String billTable) {
+        Map<String, Object> entityMap = null;
+        try {
+            entityMap = result.getResponeVo().getEntityMap();
+        } catch (JsonProcessingException e) {
+            throw new CustomerException("获取合同号失败，JSON转换错误");
+        }
+        Map<String, Object> data = (Map<String, Object>) entityMap.get("data");
+        String contractNo = String.valueOf(data.get("contractNo"));
+        if (result.getType() == 1) {
+//            回写主表
+            boolean flag = mapper.updateContractInMainTable(billTable, contractNoField, contractNo, requestId);
+            if (!flag) {
+                throw new CustomerException("回写主表失败,更新语句执行false");
+            }
+            return;
+        }
+//        回写明细表
+        mapper.updateContractInDetailTable(result.getDetailTable(), contractNoField, contractNo, String.valueOf(result.getDetailId()));
+    }
+
+
+    public Map<String, Object> pigeonholeContract(User user, Map<String, Object> params) {
+        List<FaResultEntity> resultList = null;
+        try {
+            resultList = requestFaDaDa(user, params, new PigeonholeContractService());
+        } catch (JsonProcessingException e) {
+            e.printStackTrace();
+        }
+        for (FaResultEntity result : resultList) {
+            Map<String, Object> entityMap = null;
+            try {
+                entityMap = result.getResponeVo().getEntityMap();
+            } catch (JsonProcessingException e) {
+                throw new CustomerException("合同归档失败！");
+            }
+            String code = String.valueOf(entityMap.get("code"));
+            if (!"200".equals(code)) {
+                throw new CustomerException("合同归档失败！");
+            }
+        }
+//        String requestId = String.valueOf(params.get("requestId"));
+//        Util.submitWorkflow(Integer.valueOf(requestId), 1, "流程自动提交！");
+        return null;
+    }
+
+    public Map<String, Object> downloadContract(User user, Map<String, Object> params) {
+        List<FaResultEntity> resultList = null;
+        try {
+            resultList = requestFaDaDa(user, params, new DownloadContractService());
+        } catch (JsonProcessingException e) {
+            e.printStackTrace();
+        }
+        String requestId = String.valueOf(params.get("requestId"));
+        String workflowId = String.valueOf(params.get("workflowId"));
+        String contractField = String.valueOf(params.get("contractField"));
+        int userId = user.getUID();
+        for (FaResultEntity result : resultList) {
+            Map<String, Object> entityMap = null;
+            try {
+                entityMap = result.getResponeVo().getEntityMap();
+            } catch (JsonProcessingException e) {
+                throw new CustomerException("合同签署失败！");
+            }
+            String code = String.valueOf(entityMap.get("code"));
+            if (!"200".equals(code)) {
+                throw new CustomerException("合同签署失败！");
+            }
+//            获取result中的responeVo中的imageFileId并命名为imageFileId
+            int imageFileId = result.getImageFileId();
+//            调用Util中的方法获取目录id
+            writeBackContractFile(String.valueOf(imageFileId),result,contractField,workflowId,requestId,userId);
+        }
+        return null;
+    }
+
+    private boolean writeBackContractFile(String imgFileId,FaResultEntity result,String contractField ,String workflowId,String requestId,int userId) {
+        if (result.getType() == 1) {
+//            回写到主表
+            String docCategorys = Util.getDocCategorysByTable(workflowId, contractField,"");
+            String[] docCategoryArr = docCategorys.split(",");
+            int docId = 0;
+            try {
+                docId = Util.createDocByImageFileId(Integer.parseInt(docCategoryArr[docCategoryArr.length - 1]), Integer.parseInt(imgFileId),userId);
+            } catch (Exception e) {
+                throw new CustomerException("生成文档信息失败");
+            }
+            String billTable = Util.getWorkflowMainTable(workflowId);
+            return mapper.updateContractInMainTable(billTable, contractField, String.valueOf(docId), requestId);
+        }
+        //        回写明细表
+        String docCategorys = Util.getDocCategorysByTable(workflowId, contractField, result.getDetailTable());
+        String[] docCategoryArr = docCategorys.split(",");
+        int docId = 0;
+        try {
+            docId = Util.createDocByImageFileId(Integer.parseInt(docCategoryArr[docCategoryArr.length - 1]), Integer.parseInt(imgFileId),userId);
+        } catch (Exception e) {
+            throw new CustomerException("生成文档信息失败");
+        }
+        return mapper.updateContractInDetailTable(result.getDetailTable(), contractField, String.valueOf(docId), String.valueOf(result.getDetailId()));
+    }
+
+    public Map<String, Object> signOneself(User user, Map<String, Object> params) {
+        List<FaResultEntity> resultList = null;
+        try {
+            resultList = requestFaDaDa(user, params, new OneselfSignContractService());
+        } catch (JsonProcessingException e) {
+            throw new CustomerException("合同签署失败！");
+        }
+        for (FaResultEntity result : resultList) {
+            Map<String, Object> entityMap = null;
+            try {
+                entityMap = result.getResponeVo().getEntityMap();
+            } catch (JsonProcessingException e) {
+                throw new CustomerException("合同签署失败！");
+            }
+            String code = String.valueOf(entityMap.get("code"));
+            if (!"200".equals(code)) {
+                throw new CustomerException("合同签署失败！");
+            }
+        }
+//        String requestId = String.valueOf(params.get("requestId"));
+//        Util.submitWorkflow(Integer.valueOf(requestId),1,"流程自动提交！");
+        return null;
+    }
+
+    public Map<String, Object> signContract(User user, Map<String, Object> params) {
+        List<FaResultEntity> resultList = null;
+        try {
+            resultList = requestFaDaDa(user, params, new SignContractService());
+        } catch (JsonProcessingException e) {
+            e.printStackTrace();
+        }
+        for (FaResultEntity result : resultList) {
+            Map<String, Object> entityMap = null;
+            try {
+                entityMap = result.getResponeVo().getEntityMap();
+            } catch (JsonProcessingException e) {
+                throw new CustomerException("合同签署失败！");
+            }
+            String code = String.valueOf(entityMap.get("code"));
+            if (!"200".equals(code)) {
+                throw new CustomerException("合同签署失败！");
+            }
+        }
+        return null;
+    }
+
+    @Nullable
+    private List<FaResultEntity> requestFaDaDa(User user, Map<String, Object> params, IFaIntegration utilService) throws JsonProcessingException {
+        String requestId = String.valueOf(params.get("requestId"));
+        String workflowId = String.valueOf(params.get("workflowId"));
+        int userId = user.getUID();
+        return utilService.execute(workflowId, requestId, userId);
+    }
+
+    /**
+     * 重新推送合同数据到d-flow
+     * @param user 当前用户
+     * @param params 请求参数
+     */
+    public void resignContract(User user, Map<String, Object> params) {
+        String requestId = Util.null2DefaultStr(params.get("requestId"), "");
+        String dealersConfigMark = Util.null2String(params.get("dealersConfigMark"));
+        String apiKey = Util.null2String(params.get("apiKey"));
+        if(Strings.isNullOrEmpty(requestId) || Strings.isNullOrEmpty(dealersConfigMark) || Strings.isNullOrEmpty(apiKey)) {
+            throw new CustomerException("请求参数不能为空！");
+        }
+        RequestService requestService = new RequestService();
+        RequestInfo req = requestService.getRequest(Integer.parseInt(requestId));
+        req.getRequestManager().setUser(user);
+        PushContractInfoAction pushContractInfoAction = new PushContractInfoAction();
+        pushContractInfoAction.setApikey(apiKey);
+        pushContractInfoAction.setDealersConfigMark(dealersConfigMark);
+        try {
+            String execute = pushContractInfoAction.execute(req);
+            if(Action.FAILURE_AND_CONTINUE.equals(execute)) {
+                throw new CustomerException("重新推送合同数据到d-flow失败！");
+            }
+        }catch (Exception e){
+            throw new CustomerException("重新推送合同数据到d-flow失败！",e);
+        }
+    }
+
+    public Map<String, Object> getContractButton(String workflowId,String markOnly) {
+        String allVersion = WorkflowVersion.getVersionStringByWfid(workflowId);
+        WorkflowNodeConfig workflowNodeConfig = Util.selectNodeConfig(allVersion,markOnly);
+        Util.getLogger().info("查询到的数据：" + workflowNodeConfig);
+        if(workflowNodeConfig == null){
+            return null;
+        }
+        String workflowType = workflowNodeConfig.getWorkflowType();
+        allVersion = WorkflowVersion.getVersionStringByWfid(workflowType);
+        Map<String, Object> map = new HashMap<>(8);
+        map.put("nodes", workflowNodeConfig.getWorkflowNodes().split(","));
+        map.put("allVersion", allVersion.split(","));
+        Util.getLogger().info("最终数据：" + map);
+        return map;
+    }
+}
diff --git a/src/main/youhong_ai_old_src/com/api/aiyh_pcn/copy_attachment/dao/ConfigTableData.java b/src/main/youhong_ai_old_src/com/api/aiyh_pcn/copy_attachment/dao/ConfigTableData.java
new file mode 100644
index 0000000..efa90a8
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/aiyh_pcn/copy_attachment/dao/ConfigTableData.java
@@ -0,0 +1,101 @@
+package com.api.aiyh_pcn.copy_attachment.dao;
+
+import aiyh.utils.zwl.common.ToolUtil;
+import com.api.aiyh_pcn.copy_attachment.model.ConfigEmpty;
+import weaver.conn.RecordSet;
+import weaver.general.Util;
+
+/**
+ * @author EBU7-dev1-ayh
+ * @create 2021/8/26 0026 18:21
+ * config
+ */
+
+
+public class ConfigTableData {
+
+	public static ConfigEmpty getConfig(String workflowId) {
+		ToolUtil toolUtil = new ToolUtil();
+		RecordSet rs = new RecordSet();
+//		查询配置表，获取配置数据
+		String querySql = "select ufta.id,ufta.workflow_type,wftva.fieldname as template_field,  " +
+				"wftvb.fieldname as attachment_field,wftv.fieldname as show_field, wftvb.id as attachment_field_id,  " +
+				"ufta.is_template_show,ufta.model_table_name, ufta.model_field,wsl.selectvalue as show_value,  " +
+				"wftv.tablename as show_table_name,wftva.tablename as template_table_name,wftvb.tablename as attachment_table_name,  " +
+				"wsla.selectvalue as hidden_value from uf_temp_attachment as ufta  " +
+				"left join workflow_selectitem as wsl on wsl.id = ufta.show_value " +
+				"left join workflow_selectitem as wsla on wsla.id = ufta.hidden_value " +
+				"left join workflow_field_table_view as wftv on wftv.id = ufta.show_field " +
+				"left join workflow_field_table_view as wftva on wftva.id = ufta.template_field " +
+				"left join workflow_field_table_view as wftvb on wftvb.id = ufta.attachment_field " +
+				"where workflow_type in " +
+				"(select id from workflow_base where activeVersionID in " +
+				"(select activeVersionID  from workflow_base where id = ?) or id = ?) and attachment_type = ?";
+		rs.executeQuery(querySql, workflowId, workflowId,0);
+		if(rs.next()){
+//			id
+			int id = Util.getIntValue(rs.getString("id"));
+//			显示值
+			int showValue = Util.getIntValue(rs.getString("show_value"));
+//			隐藏值
+			int hiddenValue = Util.getIntValue(rs.getString("hidden_value"));
+//			流程id
+			String workflowType = rs.getString("workflow_type");
+//			模板字段
+			String templateField = rs.getString("template_field");
+//			附件字段
+			String attachmentField = rs.getString("attachment_field");
+//			是否用字段控制模板
+			String isTemplateShow = rs.getString("is_template_show");
+//			模板建模表表名
+			String modelTableName = rs.getString("model_table_name");
+//			控制模板显示与否的字段
+			String showField = rs.getString("show_field");
+//			建模表福建模板字段
+			String modelField = rs.getString("model_field");
+//			控制显示所在表
+			String showTableName = rs.getString("show_table_name");
+//			模板字段所在表
+			String templateTableName = rs.getString("template_table_name");
+//			附件字段所在表
+			String attachmentTableName = rs.getString("attachment_table_name");
+//			附件字段id
+			String attachmentFieldId = rs.getString("attachment_field_id");
+			toolUtil.writeDebuggerLog("已经查询到数据！");
+			return ConfigEmpty.create()
+					.id(id)
+					.showValue(showValue)
+					.hiddenValue(hiddenValue)
+					.workflowType(workflowType)
+					.templateField(templateField)
+					.attachmentField(attachmentField)
+					.isTemplateShow(isTemplateShow)
+					.modelTableName(modelTableName)
+					.showField(showField)
+					.modelField(modelField)
+					.showTableName(showTableName)
+					.templateTableName(templateTableName)
+					.attachmentTableName(attachmentTableName)
+					.attachmentFieldId(attachmentFieldId)
+					.builder();
+		}
+		return null;
+	}
+
+
+	public static String[] getTemplateData(String tableName, String fieldName, String configId){
+		RecordSet rs = new RecordSet();
+		String queryBuilder = "select " + fieldName +
+				" from " +
+				tableName +
+				" where id = ?";
+		ToolUtil toolUtil = new ToolUtil();
+		rs.executeQuery(queryBuilder,configId);
+		if(rs.next()){
+			String docIds = Util.null2String(rs.getString(1));
+			return docIds.split(",");
+		}
+		return new String[0];
+	}
+
+}
diff --git a/src/main/youhong_ai_old_src/com/api/aiyh_pcn/copy_attachment/dao/DocTemplateDao.java b/src/main/youhong_ai_old_src/com/api/aiyh_pcn/copy_attachment/dao/DocTemplateDao.java
new file mode 100644
index 0000000..9826126
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/aiyh_pcn/copy_attachment/dao/DocTemplateDao.java
@@ -0,0 +1,158 @@
+package com.api.aiyh_pcn.copy_attachment.dao;
+
+import aiyh.utils.Util;
+import aiyh.utils.sqlUtil.sqlResult.impl.PrepSqlResultImpl;
+import aiyh.utils.sqlUtil.whereUtil.Where;
+import aiyh.utils.zwl.common.ToolUtil;
+import org.apache.axiom.util.base64.Base64Utils;
+import org.apache.commons.io.IOUtils;
+import weaver.conn.RecordSet;
+import weaver.docs.docs.DocManager;
+import weaver.file.ImageFileManager;
+import weaver.hrm.User;
+import weaver.hrm.resource.ResourceComInfo;
+import weaver.soa.workflow.FileProcessor;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author EBU7-dev1-ayh
+ * @create 2021/8/26 0026 11:14
+ * copy mybatisTest.dao
+ */
+
+
+public class DocTemplateDao {
+	ToolUtil toolUtil = new ToolUtil();
+	private int userId;
+
+	public int[] copyFile(User user,String tableName, String fieldName, String configId,String workflowId, String fileFieldId){
+		this.userId = user.getUID();
+		String[] templateData = ConfigTableData.getTemplateData(tableName, fieldName, configId);
+		String joinId = String.join(",", templateData);
+//		查询物理文件id
+		String query = "select imagefileid,imagefilename from docimagefile where docid in (" + joinId + ")";
+		RecordSet rs = new RecordSet();
+		rs.executeQuery(query);
+		FileProcessor fileProcessor = new FileProcessor();
+		String docCategorys = Util.getDocCategorys(workflowId, fileFieldId);
+		List<Integer> docIds = new ArrayList<>();
+		while (rs.next()){
+//			获取物理文件id和物理文件名
+			String id = rs.getString("imagefileid");
+			String name = rs.getString("imagefilename");
+			InputStream inputStreamById = ImageFileManager.getInputStreamById(Integer.parseInt(id));
+			byte[] bytes = new byte[0];
+			try {
+				bytes = IOUtils.toByteArray(inputStreamById);
+			} catch (IOException e) {
+				e.printStackTrace();
+				toolUtil.writeErrorLog("复制文件时，文件转为base64出错，文件转换出错！" + e);
+			}
+			String base64 = Base64Utils.encode(bytes);
+			int docid = fileProcessor.Process("base64:" + base64, docCategorys, user, name);
+			docIds.add(docid);
+		}
+		Integer[] strings = docIds.toArray(new Integer[0]);
+		return Arrays.stream(strings).mapToInt(Integer::valueOf).toArray();
+//		return ;
+	}
+
+	public int[] copyFile(int userId, String tableName, String fieldName, String configId) {
+		this.userId = userId;
+		String[] templateData = ConfigTableData.getTemplateData(tableName, fieldName, configId);
+		int[] array = Arrays.stream(templateData).mapToInt(Integer::parseInt).toArray();
+		return this.copyFile(array);
+	}
+
+	private int[] copyFile(int... ids) {
+		RecordSet rs = new RecordSet();
+//		传入需要拷贝的附件的id
+		DocManager docManager = new DocManager();
+		int[] docIds = new int[ids.length];
+		try {
+			for (int i = 0; i < ids.length; i++) {
+				//		设置需要拷贝的附件的id
+				docManager.setId(ids[i]);
+				//			进行附件的拷贝
+				docManager.copyDocNew();
+				//			获取到新拷贝的附件的id
+				docIds[i] = docManager.getId();
+//				对新文档进行权限重置
+				rs.executeProc("DocSecCategoryShare_SBySecCate", String.valueOf(docManager.getId()));
+			}
+			return docIds;
+		} catch (Exception e) {
+			this.toolUtil.writeErrorLog("复制错误" + e);
+			return null;
+		}
+	}
+
+	public boolean updateFileInfo(String workflowId, String fileFieldId, int... ids) {
+		RecordSet rs = new RecordSet();
+//		通过流程查询到该流程对应的目录
+		String query = "select catelogType, (case when catelogType = 9 then " +
+				"(select docCategory from workflow_base where id = ?) else docCategory end )" +
+				" as docCategory from workflow_fileupload " +
+				"where workflowid = ? and fieldid = ?";
+
+		rs.executeQuery(query, workflowId, workflowId, fileFieldId);
+		String catelogType = "";
+		String docCategory = "";
+		if (rs.next()) {
+			catelogType = rs.getString("catelogType");
+			docCategory = rs.getString("docCategory");
+		}
+		this.toolUtil.writeDebuggerLog(catelogType + "," + docCategory);
+		if (!"1".equals(catelogType)) {
+			List<Object> list = new ArrayList<>();
+			for (int id : ids) {
+				list.add(id);
+			}
+			ResourceComInfo resourceComInfo = null;
+			try {
+				resourceComInfo = new ResourceComInfo();
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
+			String departmentID = resourceComInfo.getDepartmentID(String.valueOf(this.userId));
+//			附件目录不为自己选择，更新文件的目录信息和其他信息
+			Map<String, Object> updateMap = Util.createUtilHashMap().uPut("ownerid", this.userId)
+					.uPut("maincategory", 0)
+					.uPut("subcategory", 0)
+					.uPut("docstatus", 0)
+					.uPut("shareroleid", this.userId)
+					.uPut("doccreaterid", this.userId)
+					.uPut("doclastmoduserid", this.userId)
+					.uPut("docdepartmentid", departmentID)
+					.uPut("doclastmoddate", Util.getTime("yyyy-MM-dd"))
+					.uPut("doccreatedate", Util.getTime("yyyy-MM-dd"))
+					.uPut("doclastmodtime", Util.getTime("HH:mm:ss"))
+					.uPut("doccreatetime", Util.getTime("HH:mm:ss"))
+					.uPut("seccategory", docCategory.split(",")[docCategory.split(",").length - 1]);
+			Where whereIn = Util.createPrepWhereImpl().whereAnd("id").whereInList(list);
+			PrepSqlResultImpl updateResult = Util.createSqlBuilder().updateSql("docdetail", updateMap, whereIn);
+			return rs.executeUpdate(updateResult.getSqlStr(), updateResult.getArgs());
+		}
+		return false;
+	}
+
+	public boolean deleteFile(int... ids) throws Exception {
+		DocManager docManager = new DocManager();
+		for (int id : ids) {
+			try {
+				docManager.setId(id);
+				docManager.DeleteDocInfo();
+			} catch (Exception e) {
+				e.printStackTrace();
+				throw e;
+			}
+		}
+		return true;
+	}
+}
diff --git a/src/main/youhong_ai_old_src/com/api/aiyh_pcn/copy_attachment/model/ConfigEmpty.java b/src/main/youhong_ai_old_src/com/api/aiyh_pcn/copy_attachment/model/ConfigEmpty.java
new file mode 100644
index 0000000..d61f3e4
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/aiyh_pcn/copy_attachment/model/ConfigEmpty.java
@@ -0,0 +1,257 @@
+package com.api.aiyh_pcn.copy_attachment.model;
+
+/**
+ * @author EBU7-dev1-ayh
+ * @create 2021/8/26 0026 19:48
+ */
+
+
+public class ConfigEmpty {
+	/**
+	 * id
+	 */
+	private int id;
+	/**
+	 * 流程id
+	 */
+	private String workflowType;
+	/**
+	 * 模板字段
+	 */
+	private String templateField;
+	/**
+	 * 附件字段
+	 */
+	private String attachmentField;
+	/**
+	 * 是否控制模板字段
+	 */
+	private String isTemplateShow;
+	/**
+	 * 控制模板字段字段
+	 */
+	private String showField;
+	/**
+	 * 显示模板值
+	 */
+	private int showValue;
+	/**
+	 * 隐藏模板值
+	 */
+	private int hiddenValue;
+	/**
+	 * 模板表表名
+	 */
+	private String modelTableName;
+	/**
+	 * 模板表附件字段
+	 */
+	private String modelField;
+	/**
+	 * 控制模板字段字段所在表
+	 */
+	private String showTableName;
+	/**
+	 * 模板字段所在表
+	 */
+	private String templateTableName;
+	/**
+	 * 附件字段所在表
+	 */
+	private String attachmentTableName;
+	/**
+	 * 附件字段id
+	 */
+	private String attachmentFieldId;
+
+
+
+	public ConfigEmpty(Builder builder) {
+		this.id = builder.id;
+		this.workflowType = builder.workflowType;
+		this.templateField = builder.templateField;
+		this.attachmentField = builder.attachmentField;
+		this.isTemplateShow = builder.isTemplateShow;
+		this.showField = builder.showField;
+		this.showValue = builder.showValue;
+		this.hiddenValue = builder.hiddenValue;
+		this.modelTableName = builder.modelTableName;
+		this.modelField = builder.modelField;
+		this.showTableName = builder.showTableName;
+		this.templateTableName = builder.templateTableName;
+		this.attachmentTableName = builder.attachmentTableName;
+		this.attachmentFieldId = builder.attachmentFieldId;
+	}
+
+	@Override
+	public String toString() {
+		return "ConfigEmpty{" +
+				"id=" + id +
+				", workflowType='" + workflowType + '\'' +
+				", templetField='" + templateField + '\'' +
+				", attachmentField='" + attachmentField + '\'' +
+				", isTempletShow='" + isTemplateShow + '\'' +
+				", showField='" + showField + '\'' +
+				", showValue=" + showValue +
+				", hiddenValue=" + hiddenValue +
+				", modelTableName='" + modelTableName + '\'' +
+				", modelField='" + modelField + '\'' +
+				", showTableName='" + showTableName + '\'' +
+				", templateTableName='" + templateTableName + '\'' +
+				", attachmentTableName='" + attachmentTableName + '\'' +
+				", attachmentFieldId='" + attachmentFieldId + '\'' +
+				'}';
+	}
+
+	public String getAttachmentFieldId() {
+		return attachmentFieldId;
+	}
+
+	public int getId() {
+		return id;
+	}
+
+	public String getWorkflowType() {
+		return workflowType;
+	}
+
+	public String getTemplateField() {
+		return templateField;
+	}
+
+	public String getAttachmentField() {
+		return attachmentField;
+	}
+
+	public String getIsTemplateShow() {
+		return isTemplateShow;
+	}
+
+	public String getShowField() {
+		return showField;
+	}
+
+	public int getShowValue() {
+		return showValue;
+	}
+
+	public int getHiddenValue() {
+		return hiddenValue;
+	}
+
+	public String getModelTableName() {
+		return modelTableName;
+	}
+
+	public String getModelField() {
+		return modelField;
+	}
+
+	public String getShowTableName() {
+		return showTableName;
+	}
+
+	public String attachmentFieldId() {
+		return attachmentFieldId;
+	}
+
+	public String getTemplateTableName() {
+		return templateTableName;
+	}
+
+	public String getAttachmentTableName() {
+		return attachmentTableName;
+	}
+
+	public static Builder create(){
+		return new Builder();
+	}
+
+	public static class Builder{
+		private int id;
+		private String workflowType;
+		private String templateField;
+		private String attachmentField;
+		private String isTemplateShow;
+		private String showField;
+		private int showValue;
+		private int hiddenValue;
+		private String modelTableName;
+		private String modelField;
+		String showTableName;
+		String templateTableName;
+		String attachmentTableName;
+		String attachmentFieldId;
+
+		public  ConfigEmpty builder(){
+			return new ConfigEmpty(this);
+		}
+
+		public  Builder id(int id) {
+			this.id = id;
+			return this;
+		}
+		public  Builder showTableName(String showTableName) {
+			this.showTableName = showTableName;
+			return this;
+		}
+		public  Builder templateTableName(String templateTableName) {
+			this.templateTableName = templateTableName;
+			return this;
+		}
+		public  Builder attachmentTableName(String attachmentTableName) {
+			this.attachmentTableName = attachmentTableName;
+			return this;
+		}
+
+		public  Builder attachmentFieldId(String attachmentFieldId) {
+			this.attachmentFieldId = attachmentFieldId;
+			return this;
+		}
+
+		public  Builder workflowType(String workflowType) {
+			this.workflowType = workflowType;
+			return this;
+		}
+
+		public  Builder templateField(String templateField) {
+			this.templateField = templateField;
+			return this;
+		}
+
+		public  Builder attachmentField(String attachmentField) {
+			this.attachmentField = attachmentField;
+			return this;
+		}
+
+		public  Builder isTemplateShow(String isTemplateShow) {
+			this.isTemplateShow = isTemplateShow;
+			return this;
+		}
+
+		public  Builder showField(String showField) {
+			this.showField = showField;
+			return this;
+		}
+
+		public  Builder showValue(int showValue) {
+			this.showValue = showValue;
+			return this;
+		}
+
+		public  Builder hiddenValue(int hiddenValue) {
+			this.hiddenValue = hiddenValue;
+			return this;
+		}
+
+		public  Builder modelTableName(String modelTableName) {
+			this.modelTableName = modelTableName;
+			return this;
+		}
+
+		public  Builder modelField(String modelField) {
+			this.modelField = modelField;
+			return this;
+		}
+	}
+}
diff --git a/src/main/youhong_ai_old_src/com/api/aiyh_pcn/copy_attachment/service/CopyAttachmentService.java b/src/main/youhong_ai_old_src/com/api/aiyh_pcn/copy_attachment/service/CopyAttachmentService.java
new file mode 100644
index 0000000..2a42a12
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/aiyh_pcn/copy_attachment/service/CopyAttachmentService.java
@@ -0,0 +1,99 @@
+package com.api.aiyh_pcn.copy_attachment.service;
+
+import aiyh.utils.ApiResult;
+import aiyh.utils.zwl.common.ToolUtil;
+import com.api.aiyh_pcn.copy_attachment.dao.DocTemplateDao;
+import com.api.workflow.constant.RequestAuthenticationConstant;
+import com.engine.workflow.biz.requestForm.FileBiz;
+import weaver.general.Util;
+import weaver.hrm.User;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @author EBU7-dev1-ayh
+ * @create 2021/8/27 0027 14:52
+ * copyservice
+ */
+
+
+public class CopyAttachmentService {
+    public static String copyFile(User user, Map<String, Object> params) {
+        ToolUtil toolUtil = new ToolUtil();
+//		建模表名称
+        String tableName = String.valueOf(params.get("tableName"));
+//		建模字段名
+        String fieldName = String.valueOf(params.get("fieldName"));
+//		附件字段id
+        String fileFieldId = String.valueOf(params.get("fileFieldId"));
+//		配置id
+        String configId = String.valueOf(params.get("configId"));
+//		流程id
+        String workflowId = String.valueOf(params.get("workflowId"));
+        DocTemplateDao docTemplateDao = new DocTemplateDao();
+        int[] docIds = null;
+        try {
+//			docIds = docTemplateDao.copyFile(user.getUID(), tableName, fieldName, configId);
+            docIds = docTemplateDao.copyFile(user, tableName, fieldName, configId, workflowId, fileFieldId);
+        } catch (Exception e) {
+            toolUtil.writeErrorLog("复制文件出错： " + e);
+            return ApiResult.error("复制文件出错！");
+        }
+        if (docIds == null) {
+            return ApiResult.error("未查询到附件模板！");
+        }
+		/*try{
+			docTemplateDao.updateFileInfo(workflowId,fileFieldId,docIds);
+		}catch(Exception e){
+		   toolUtil.writeErrorLog("复制文件更新权限和目录出错： " + e);
+			return null;
+		}*/
+        toolUtil.writeDebuggerLog("数据更新成功！" + Arrays.toString(docIds));
+        return ApiResult.success(docIds);
+    }
+
+    public static String deleteFile(String docIdStr) {
+        String[] docIds = docIdStr.split(",");
+        DocTemplateDao docTemplateDao = new DocTemplateDao();
+        int[] array = Arrays.stream(docIds).mapToInt(Integer::parseInt).toArray();
+        try {
+            docTemplateDao.deleteFile(array);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return ApiResult.error("删除失败！");
+        }
+        return ApiResult.success(array, "删除成功！");
+    }
+
+    /**
+     * 查询文档信息
+     *
+     * @param user   user对象
+     * @param params 前端参数
+     * @return 文档信息
+     */
+    public static String queryFilesData(User user, Map<String, Object> params) {
+        String listType = Util.null2String(String.valueOf(params.get("listType")), "list");
+        int requestid = Util.getIntValue(Util.null2String(String.valueOf(params.get("requestid"))), -1);
+        int desrequestid = Util.getIntValue(Util.null2String(String.valueOf(params.get("desrequestid"))), -1);
+        int isprint = Util.getIntValue(Util.null2String(String.valueOf(params.get("isprint"))), 0);
+        int workflowid = Util.getIntValue(Util.null2String(String.valueOf(params.get("workflowid"))), 0);
+        String f_weaver_belongto_userid = Util.null2String(String.valueOf(params.get("f_weaver_belongto_userid")));
+        String f_weaver_belongto_usertype = Util.null2String(String.valueOf(params.get("f_weaver_belongto_usertype")));
+        String authStr = Util.null2String(String.valueOf(params.get(RequestAuthenticationConstant.AUTHORITY_STRING)));
+        String authSignatureStr = Util.null2String(String.valueOf(params.get(RequestAuthenticationConstant.AUTHORITY_SIGNATURESTRING)));
+        Map<String, Object> paramsMap = new HashMap<>();
+        paramsMap.put("user", user);
+        Map<String, Object> retobj;
+        try {
+            retobj = FileBiz.getFileDatas(Util.null2String(params.get("docIds")), listType, requestid, desrequestid,
+                    isprint, f_weaver_belongto_userid, f_weaver_belongto_usertype, true, false, authStr, authSignatureStr, paramsMap);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return ApiResult.error("查询附件信息失败：" + e);
+        }
+        return ApiResult.success(retobj);
+    }
+}
diff --git a/src/main/youhong_ai_old_src/com/api/aiyh_pcn/copy_attachment/web/CopyAttachment.java b/src/main/youhong_ai_old_src/com/api/aiyh_pcn/copy_attachment/web/CopyAttachment.java
new file mode 100644
index 0000000..b0b9040
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/aiyh_pcn/copy_attachment/web/CopyAttachment.java
@@ -0,0 +1,67 @@
+package com.api.aiyh_pcn.copy_attachment.web;
+
+
+import aiyh.utils.ApiResult;
+import aiyh.utils.zwl.common.ToolUtil;
+import com.api.aiyh_pcn.copy_attachment.service.CopyAttachmentService;
+import com.api.aiyh_pcn.copy_attachment.dao.ConfigTableData;
+import io.swagger.v3.oas.annotations.parameters.RequestBody;
+import weaver.hrm.HrmUserVarify;
+import weaver.hrm.User;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.ws.rs.*;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import java.util.Map;
+
+/**
+ * @author EBU7-dev1-ayh
+ * @create 2021/8/26 0026 10:16
+ * copy ttachment to workflow
+ */
+
+
+@Path("/aiyh/copyAttachment")
+public class CopyAttachment {
+	
+	ToolUtil toolUtil = new ToolUtil();
+	
+	@POST
+	@Path("/copy")
+	@Consumes(MediaType.APPLICATION_JSON)
+	@Produces(MediaType.APPLICATION_JSON)
+	public String copyAttachment(@Context HttpServletRequest request, @Context HttpServletResponse response,
+	                             @RequestBody Map<String, Object> params) {
+		User user = HrmUserVarify.getUser(request, response);
+		return CopyAttachmentService.copyFile(user, params);
+	}
+	
+	@Path("/deleteFile/{docIds}")
+	@GET
+	@Consumes(MediaType.APPLICATION_JSON)
+	@Produces(MediaType.APPLICATION_JSON)
+	public String deleteFile(@Context HttpServletRequest request, @Context HttpServletResponse response,
+	                         @PathParam("docIds") String docIds) {
+		return CopyAttachmentService.deleteFile(docIds);
+	}
+	
+	@Path("/queryConfig/{workflowId}")
+	@GET
+	@Consumes(MediaType.APPLICATION_JSON)
+	@Produces(MediaType.APPLICATION_JSON)
+	public String queryConfig(@PathParam("workflowId") String workflowId) {
+		return ApiResult.success(ConfigTableData.getConfig(workflowId));
+	}
+	
+	@Path("/queryFilesData")
+	@POST
+	@Consumes(MediaType.APPLICATION_JSON)
+	@Produces(MediaType.APPLICATION_JSON)
+	public String queryFilesData(@Context HttpServletRequest request, @Context HttpServletResponse response,
+	                             @RequestBody Map<String, Object> params) {
+		User user = HrmUserVarify.getUser(request, response);
+		return CopyAttachmentService.queryFilesData(user, params);
+	}
+}
diff --git a/src/main/youhong_ai_old_src/com/api/aiyh_pcn/copy_multiple_file/dto/CopyFileParam.java b/src/main/youhong_ai_old_src/com/api/aiyh_pcn/copy_multiple_file/dto/CopyFileParam.java
new file mode 100644
index 0000000..631bcb8
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/aiyh_pcn/copy_multiple_file/dto/CopyFileParam.java
@@ -0,0 +1,29 @@
+package com.api.aiyh_pcn.copy_multiple_file.dto;
+
+import com.api.aiyh_pcn.copy_multiple_file.vo.MultipleCopyConfigDetailVO;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * create 2021/12/23 0023 11:42
+ * 复制附件时，需要专递的参数
+ *
+ * @author EBU7-dev1-ayh
+ */
+
+
+@Getter
+@Setter
+@ToString
+public class CopyFileParam {
+    private int workflowType;
+    private int requestId;
+    private int browseValue;
+    private String modeTable;
+    private List<MultipleCopyConfigDetailVO> fileMapperList;
+    private Map<String,Object> queryFileInfoMap;
+}
diff --git a/src/main/youhong_ai_old_src/com/api/aiyh_pcn/copy_multiple_file/enumType/EnableType.java b/src/main/youhong_ai_old_src/com/api/aiyh_pcn/copy_multiple_file/enumType/EnableType.java
new file mode 100644
index 0000000..9efc99e
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/aiyh_pcn/copy_multiple_file/enumType/EnableType.java
@@ -0,0 +1,9 @@
+package com.api.aiyh_pcn.copy_multiple_file.enumType;
+
+/**
+ * @author @author EBU7-dev1-ay
+ * create 2021/12/22 0022 16:34
+ */
+
+public enum EnableType {
+}
diff --git a/src/main/youhong_ai_old_src/com/api/aiyh_pcn/copy_multiple_file/mapper/MultipleCopyMapper.java b/src/main/youhong_ai_old_src/com/api/aiyh_pcn/copy_multiple_file/mapper/MultipleCopyMapper.java
new file mode 100644
index 0000000..7450b82
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/aiyh_pcn/copy_multiple_file/mapper/MultipleCopyMapper.java
@@ -0,0 +1,61 @@
+package com.api.aiyh_pcn.copy_multiple_file.mapper;
+
+import aiyh.utils.annotation.recordset.*;
+import com.api.aiyh_pcn.copy_multiple_file.pojo.CopyMultipleDetail;
+import com.api.aiyh_pcn.copy_multiple_file.pojo.CopyMultipleMain;
+import com.api.aiyh_pcn.copy_multiple_file.pojo.ImageFileInfo;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author EBU7-dev1-ayh
+ * create 2021/12/22 0022 16:18
+ */
+
+@SqlMapper
+public interface MultipleCopyMapper {
+
+    /**
+     * 查询配置表主表数据，通过全版本的workflowId
+     * @param workflowIds 全版本的workflowid
+     * @return 查询到的数据
+     */
+    @Select("select uf.id,uf.workflow_type,bv.tablename mode_table,wv.fieldname browse_box, " +
+            "uf.is_enable from uf_copy_multiple uf " +
+            "left join workflow_field_table_view wv on uf.browse_box = wv.id " +
+            "left join mode_bill_info_view bv on uf.mode_table = bv.id " +
+            "where workflow_type in (${workflowIds}) and uf.is_enable = 1")
+    public List<CopyMultipleMain> selectMainData(@ParamMapper("workflowIds") String[] workflowIds);
+
+    /**
+     * 查询配置表明细表数据
+     * @param mainId 配置表主表id
+     * @return 明细表数据
+     */
+    @Select("select wv.fieldname workflow_file,wvm.fieldname mode_file,is_enable " +
+            "from uf_copy_multiple_dt1 uf " +
+            "left join workflow_field_table_view wv on wv.id = uf.workflow_file " +
+            "left join workflow_field_table_view wvm on wvm.id = uf.mode_file " +
+            "where mainid = #{mainId} and uf.is_enable = 1")
+    public List<CopyMultipleDetail> selectDetailData(@ParamMapper("mainId") Integer mainId);
+
+
+    /**
+     * 查询建模表中的附件信息
+     * @param modeTable 建模表表名
+     * @param browseValue 浏览库值
+     * @return 建模表数据
+     */
+    @Select("select * from $t{modeTable} where id = #{browseValue}")
+    Map<String,Object> selectModelFiles(@ParamMapper("modeTable") String modeTable,
+                                        @ParamMapper("browseValue") int browseValue);
+
+    /**
+     * 查询物理文件的信息
+     * @param modeFileVal doc id字符串
+     * @return 物理文件的信息
+     */
+    @Select("select imagefileid id,imagefilename image_file_name from docimagefile where docid in (${modeFileVal})")
+    List<ImageFileInfo> selectImageFileId(String[] modeFileVal);
+}
diff --git a/src/main/youhong_ai_old_src/com/api/aiyh_pcn/copy_multiple_file/pojo/CopyMultipleDetail.java b/src/main/youhong_ai_old_src/com/api/aiyh_pcn/copy_multiple_file/pojo/CopyMultipleDetail.java
new file mode 100644
index 0000000..bcc52c1
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/aiyh_pcn/copy_multiple_file/pojo/CopyMultipleDetail.java
@@ -0,0 +1,16 @@
+package com.api.aiyh_pcn.copy_multiple_file.pojo;
+
+import lombok.Data;
+
+/**
+ * @author EBU7-dev1-ayh
+ * create 2021/12/22 0022 16:32
+ */
+
+
+@Data
+public class CopyMultipleDetail {
+    private String workflowFile;
+    private String modeFile;
+    private Integer isEnable;
+}
\ No newline at end of file
diff --git a/src/main/youhong_ai_old_src/com/api/aiyh_pcn/copy_multiple_file/pojo/CopyMultipleMain.java b/src/main/youhong_ai_old_src/com/api/aiyh_pcn/copy_multiple_file/pojo/CopyMultipleMain.java
new file mode 100644
index 0000000..94be1cc
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/aiyh_pcn/copy_multiple_file/pojo/CopyMultipleMain.java
@@ -0,0 +1,20 @@
+package com.api.aiyh_pcn.copy_multiple_file.pojo;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author EBU7-dev1-ayh
+ * create 2021/12/22 0022 16:32
+ */
+
+@Data
+public class CopyMultipleMain {
+    private Integer id;
+    private Integer workflowType;
+    private String modeTable;
+    private String browseBox;
+    private Integer isEnable;
+    private List<CopyMultipleDetail> detailList;
+}
diff --git a/src/main/youhong_ai_old_src/com/api/aiyh_pcn/copy_multiple_file/pojo/ImageFileInfo.java b/src/main/youhong_ai_old_src/com/api/aiyh_pcn/copy_multiple_file/pojo/ImageFileInfo.java
new file mode 100644
index 0000000..57d9cff
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/aiyh_pcn/copy_multiple_file/pojo/ImageFileInfo.java
@@ -0,0 +1,20 @@
+package com.api.aiyh_pcn.copy_multiple_file.pojo;
+
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+/**
+ * create 2021/12/23 0023 18:33
+ *
+ * @author EBU7-dev1-ayh
+ */
+
+
+@Getter
+@Setter
+@ToString
+public class ImageFileInfo {
+    private Integer id;
+    private String imageFileName;
+}
diff --git a/src/main/youhong_ai_old_src/com/api/aiyh_pcn/copy_multiple_file/services/MultipleCopyService.java b/src/main/youhong_ai_old_src/com/api/aiyh_pcn/copy_multiple_file/services/MultipleCopyService.java
new file mode 100644
index 0000000..2c3750a
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/aiyh_pcn/copy_multiple_file/services/MultipleCopyService.java
@@ -0,0 +1,210 @@
+package com.api.aiyh_pcn.copy_multiple_file.services;
+
+import aiyh.utils.Util;
+import aiyh.utils.zwl.common.ToolUtil;
+import aiyh.utils.tool.cn.hutool.core.bean.BeanUtil;
+import com.alibaba.fastjson.JSON;
+import com.api.aiyh_pcn.copy_multiple_file.dto.CopyFileParam;
+import com.api.aiyh_pcn.copy_multiple_file.mapper.MultipleCopyMapper;
+import com.api.aiyh_pcn.copy_multiple_file.pojo.CopyMultipleDetail;
+import com.api.aiyh_pcn.copy_multiple_file.pojo.CopyMultipleMain;
+import com.api.aiyh_pcn.copy_multiple_file.pojo.ImageFileInfo;
+import com.api.aiyh_pcn.copy_multiple_file.vo.CopyResult;
+import com.api.aiyh_pcn.copy_multiple_file.vo.MultipleCopyConfigDetailVO;
+import com.api.aiyh_pcn.copy_multiple_file.vo.MultipleCopyConfigVO;
+import com.api.workflow.constant.RequestAuthenticationConstant;
+import com.engine.workflow.biz.requestForm.FileBiz;
+import org.apache.axiom.util.base64.Base64Utils;
+import org.apache.commons.io.IOUtils;
+import weaver.docs.docs.DocManager;
+import weaver.file.ImageFileManager;
+import weaver.hrm.User;
+import weaver.soa.workflow.FileProcessor;
+import weaver.workflow.workflow.WorkflowVersion;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.*;
+
+/**
+ * @author EBU7-dev1-ayh
+ * create 2021/12/22 0022 16:17
+ */
+
+
+public class MultipleCopyService {
+	private final MultipleCopyMapper mapper;
+	private final ToolUtil toolUtil = new ToolUtil();
+	
+	{
+		mapper = Util.getMapper(MultipleCopyMapper.class);
+	}
+	
+	/**
+	 * 查询配置表信息
+	 *
+	 * @param workflowId 当前查询流程的流程id
+	 * @return 配置表信息
+	 */
+	public List<MultipleCopyConfigVO> getConfigInfo(String workflowId) {
+		String versionIds = WorkflowVersion.getVersionStringByWfid(workflowId);
+//        获取动态代理对象
+//        查询主表配置信息数据
+		List<CopyMultipleMain> copyMultipleMainList = this.mapper.selectMainData(versionIds.split(","));
+		if (copyMultipleMainList == null) {
+			return null;
+		}
+//        查询明细表配置信息数据
+		List<MultipleCopyConfigVO> configResult = new ArrayList<>();
+		for (CopyMultipleMain copyMultipleMain : copyMultipleMainList) {
+			List<CopyMultipleDetail> copyMultipleDetails = this.mapper.selectDetailData(copyMultipleMain.getId());
+			copyMultipleMain.setDetailList(copyMultipleDetails);
+			MultipleCopyConfigVO multipleCopyConfigVO = new MultipleCopyConfigVO();
+//        进行数据拷贝
+			BeanUtil.copyProperties(copyMultipleMain, multipleCopyConfigVO);
+			configResult.add(multipleCopyConfigVO);
+		}
+		
+		return configResult;
+	}
+	
+	
+	/**
+	 * 复制文件附件文件，同时返回文件信息
+	 *
+	 * @param user          当前操作用户
+	 * @param copyFileParam 复制文件所需要的参数信息
+	 * @return 复制后的新文档的信息
+	 */
+	public List<CopyResult> copyMultipleFile(User user, CopyFileParam copyFileParam) {
+		if (copyFileParam == null || copyFileParam.getFileMapperList().isEmpty() || copyFileParam.getBrowseValue() <= 0) {
+			return null;
+		}
+//        查询模板文件
+		toolUtil.writeDebuggerLog(copyFileParam.toString());
+		Map<String, Object> modelFileMap = this.mapper.selectModelFiles(copyFileParam.getModeTable(), copyFileParam.getBrowseValue());
+		if (modelFileMap == null) {
+			toolUtil.writeDebuggerLog("查询到参数为null ");
+			return null;
+		}
+		List<MultipleCopyConfigDetailVO> fileMapperList = copyFileParam.getFileMapperList();
+		List<CopyResult> copyResultList = new ArrayList<>();
+		for (MultipleCopyConfigDetailVO multipleCopyConfigDetailVO : fileMapperList) {
+//            复制新的附件
+			List<Integer> docIdList = copyFileHandler(multipleCopyConfigDetailVO, modelFileMap, copyFileParam.getWorkflowType(), user);
+			CopyResult copyResult = new CopyResult();
+//            TODO 解决bug 使用List<Integer>  无法进行join
+			copyResult.setFileId(Util.intJoin(docIdList, ","));
+			copyResult.setWorkflowFile(multipleCopyConfigDetailVO.getWorkflowFile());
+//            获取查询附件列表参数
+			Map<String, Object> queryFileInfoMap = copyFileParam.getQueryFileInfoMap();
+			queryFileInfoMap.put("docIds", copyResult.getFileId());
+//            查询附件列表参数
+			Map<String, Object> fileInfoMap = queryFilesData(user, queryFileInfoMap);
+			if (fileInfoMap == null) {
+				toolUtil.writeErrorLog("查询文件信息出错，查询数据：" + JSON.toJSONString(queryFileInfoMap));
+				throw new RuntimeException("查询文件信息出错！");
+			}
+			copyResult.setFileInfo(fileInfoMap);
+			copyResultList.add(copyResult);
+		}
+		return copyResultList;
+	}
+	
+	
+	/**
+	 * 复制文件的具体操作，复制出来的文档，权限根据流程字段所属的目录的权限进行初始化
+	 *
+	 * @param multipleCopyConfigDetailVO 复制文件的明细配置信息
+	 * @param modelFileMap               复制文件的建模表的的查询数据（浏览框值对应的建模数据）
+	 * @param workflowId                 流程id
+	 * @param user                       当前用户
+	 * @return 复制文件后的全新的文档id
+	 */
+	public List<Integer> copyFileHandler(MultipleCopyConfigDetailVO multipleCopyConfigDetailVO,
+	                                     Map<String, Object> modelFileMap, int workflowId,
+	                                     User user) {
+		toolUtil.writeDebuggerLog("配置明细表数据：" + multipleCopyConfigDetailVO);
+		toolUtil.writeDebuggerLog("查询到的文件模板数据信息：" + modelFileMap);
+		String modeFile = multipleCopyConfigDetailVO.getModeFile();
+		String modeFileVal = Objects.isNull(modelFileMap.get(modeFile)) ? "" : String.valueOf(modelFileMap.get(modeFile));
+		List<ImageFileInfo> imageFileInfos = mapper.selectImageFileId(modeFileVal.split(","));
+		FileProcessor fileProcessor = new FileProcessor();
+		String docCategorys = Util.getDocCategorys(workflowId, multipleCopyConfigDetailVO.getWorkflowFile());
+		List<Integer> docIdList = new ArrayList<>();
+		for (ImageFileInfo imageFileInfo : imageFileInfos) {
+			InputStream inputStreamById = ImageFileManager.getInputStreamById(imageFileInfo.getId());
+			byte[] bytes = new byte[0];
+			try {
+				bytes = IOUtils.toByteArray(inputStreamById);
+			} catch (IOException e) {
+				e.printStackTrace();
+				toolUtil.writeErrorLog("复制文件时，文件转为base64出错，文件转换出错！" + e);
+			}
+			String base64 = Base64Utils.encode(bytes);
+			int docId = fileProcessor.Process("base64:" + base64, docCategorys, user, imageFileInfo.getImageFileName());
+			if (docId <= 0) {
+				toolUtil.writeErrorLog("复制文件时，文件Process复制出错！");
+				return null;
+			}
+			docIdList.add(docId);
+		}
+		return docIdList;
+	}
+	
+	
+	/**
+	 * 查询文件列表信息，用于前端进行附件上传浏览框赋值
+	 *
+	 * @param user   当前用户
+	 * @param params 查询文件列表信息的查询参数
+	 * @return 文件信息对象
+	 */
+	public Map<String, Object> queryFilesData(User user, Map<String, Object> params) {
+		String listType = Util.null2String(String.valueOf(params.get("listType")), "list");
+		int requestId = Util.getIntValue(Util.null2String(String.valueOf(params.get("requestid"))), -1);
+		int desrequestId = Util.getIntValue(Util.null2String(String.valueOf(params.get("desrequestid"))), -1);
+		int isprint = Util.getIntValue(Util.null2String(String.valueOf(params.get("isprint"))), 0);
+		String weaverBelongtoUserid = Util.null2String(String.valueOf(params.get("f_weaver_belongto_userid")));
+		String weaverBelongtoUsertype = Util.null2String(String.valueOf(params.get("f_weaver_belongto_usertype")));
+		String authStr = Util.null2String(String.valueOf(params.get(RequestAuthenticationConstant.AUTHORITY_STRING)));
+		String authSignatureStr = Util.null2String(String.valueOf(params.get(RequestAuthenticationConstant.AUTHORITY_SIGNATURESTRING)));
+		Map<String, Object> paramsMap = new HashMap<>();
+		paramsMap.put("user", user);
+		Map<String, Object> retobj;
+		try {
+			retobj = FileBiz.getFileDatas(Util.null2String(params.get("docIds")), listType, requestId, desrequestId,
+					isprint, weaverBelongtoUserid, weaverBelongtoUsertype, true, false, authStr, authSignatureStr, paramsMap);
+		} catch (Exception e) {
+			e.printStackTrace();
+			return null;
+		}
+		return retobj;
+	}
+	
+	
+	/**
+	 * 删除文件
+	 *
+	 * @param docIds 需要删除的文件的docId
+	 * @return 是否删除成功
+	 */
+	public boolean deleteFile(String docIds) {
+		DocManager docManager = new DocManager();
+		if (docIds == null) {
+			return false;
+		}
+		String[] split = docIds.split(",");
+		int[] array = Arrays.stream(split).mapToInt(Integer::parseInt).toArray();
+		for (int id : array) {
+			try {
+				docManager.setId(id);
+				docManager.DeleteDocInfo();
+			} catch (Exception e) {
+				toolUtil.writeErrorLog("文件删除错误：" + id);
+				return false;
+			}
+		}
+		return true;
+	}
+}
diff --git a/src/main/youhong_ai_old_src/com/api/aiyh_pcn/copy_multiple_file/vo/CopyResult.java b/src/main/youhong_ai_old_src/com/api/aiyh_pcn/copy_multiple_file/vo/CopyResult.java
new file mode 100644
index 0000000..81c7a9d
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/aiyh_pcn/copy_multiple_file/vo/CopyResult.java
@@ -0,0 +1,23 @@
+package com.api.aiyh_pcn.copy_multiple_file.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+import java.util.Map;
+
+/**
+ * create 2021/12/23 0023 12:11
+ *
+ * @author EBU7-dev1-ayh
+ */
+
+
+@Getter
+@Setter
+@ToString
+public class CopyResult {
+    private String workflowFile;
+    private String fileId;
+    private Map<String, Object> fileInfo;
+}
diff --git a/src/main/youhong_ai_old_src/com/api/aiyh_pcn/copy_multiple_file/vo/MultipleCopyConfigDetailVO.java b/src/main/youhong_ai_old_src/com/api/aiyh_pcn/copy_multiple_file/vo/MultipleCopyConfigDetailVO.java
new file mode 100644
index 0000000..478f657
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/aiyh_pcn/copy_multiple_file/vo/MultipleCopyConfigDetailVO.java
@@ -0,0 +1,14 @@
+package com.api.aiyh_pcn.copy_multiple_file.vo;
+
+import lombok.Data;
+
+/**
+ * @author EBU7-dev1-ayh
+ * create 2021/12/22 0022 18:08
+ */
+
+@Data
+public class MultipleCopyConfigDetailVO {
+    private String workflowFile;
+    private String modeFile;
+}
diff --git a/src/main/youhong_ai_old_src/com/api/aiyh_pcn/copy_multiple_file/vo/MultipleCopyConfigVO.java b/src/main/youhong_ai_old_src/com/api/aiyh_pcn/copy_multiple_file/vo/MultipleCopyConfigVO.java
new file mode 100644
index 0000000..ddaeb33
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/aiyh_pcn/copy_multiple_file/vo/MultipleCopyConfigVO.java
@@ -0,0 +1,19 @@
+package com.api.aiyh_pcn.copy_multiple_file.vo;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * create 2021/12/22 0022 18:06
+ *
+ * @author EBU7-dev1-ayh
+ */
+
+@Data
+public class MultipleCopyConfigVO {
+    private Integer workflowType;
+    private String modeTable;
+    private String browseBox;
+    private List<MultipleCopyConfigDetailVO> detailList;
+}
diff --git a/src/main/youhong_ai_old_src/com/api/aiyh_pcn/copy_multiple_file/web/MultipleCopyController.java b/src/main/youhong_ai_old_src/com/api/aiyh_pcn/copy_multiple_file/web/MultipleCopyController.java
new file mode 100644
index 0000000..166241c
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/aiyh_pcn/copy_multiple_file/web/MultipleCopyController.java
@@ -0,0 +1,109 @@
+package com.api.aiyh_pcn.copy_multiple_file.web;
+
+import aiyh.utils.ApiResult;
+import aiyh.utils.Util;
+import aiyh.utils.zwl.common.ToolUtil;
+import com.api.aiyh_pcn.copy_multiple_file.dto.CopyFileParam;
+import com.api.aiyh_pcn.copy_multiple_file.services.MultipleCopyService;
+import com.api.aiyh_pcn.copy_multiple_file.vo.CopyResult;
+import com.api.aiyh_pcn.copy_multiple_file.vo.MultipleCopyConfigVO;
+import io.swagger.v3.oas.annotations.parameters.RequestBody;
+import weaver.hrm.HrmUserVarify;
+import weaver.hrm.User;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import javax.ws.rs.*;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import java.util.List;
+
+/**
+ * @author EBU7-dev1-ayh
+ * create 2021/12/22 0022 11:12
+ */
+
+
+@Path("/aiyh/browseBox/copyMultipleFile")
+public class MultipleCopyController {
+	
+	private final MultipleCopyService multipleCopyService = new MultipleCopyService();
+	private final ToolUtil toolUtil = new ToolUtil();
+	
+	
+	/**
+	 * 根据workflowId查询配置信息
+	 *
+	 * @param workflowId 流程id
+	 * @return 配置信息
+	 */
+	@Path("/getConfig/{workflowId}")
+	@GET
+	@Consumes(MediaType.APPLICATION_JSON)
+	@Produces(MediaType.APPLICATION_JSON)
+	public String getConfigInfo(@PathParam("workflowId") String workflowId) {
+		try {
+			List<MultipleCopyConfigVO> configInfo = multipleCopyService.getConfigInfo(workflowId);
+			return ApiResult.success(configInfo);
+		} catch (Exception e) {
+			toolUtil.writeErrorLog(Util.getErrString(e));
+			return ApiResult.error(e.toString());
+		}
+	}
+	
+	
+	/**
+	 * 复制模板文件为新的文件附件
+	 *
+	 * @param request       请求对象
+	 * @param response      响应对象
+	 * @param copyFileParam 复制文件所需要的参数信息
+	 * @return 复制后的附件的列表信息
+	 */
+	@Path("/copy")
+	@POST
+	@Consumes(MediaType.APPLICATION_JSON)
+	@Produces(MediaType.APPLICATION_JSON)
+	public String copyMultipleFile(@Context HttpServletRequest request,
+	                               @Context HttpServletResponse response,
+	                               @RequestBody CopyFileParam copyFileParam) {
+		User user = HrmUserVarify.getUser(request, response);
+		try {
+			List<CopyResult> result = multipleCopyService.copyMultipleFile(user, copyFileParam);
+			return ApiResult.success(result);
+		} catch (Exception e) {
+			toolUtil.writeErrorLog(Util.getErrString(e));
+			return ApiResult.error(e.toString());
+		}
+	}
+	
+	/**
+	 * 删除文件
+	 *
+	 * @param docIds 需要删除的文件id
+	 * @return 是否删除成功
+	 */
+	@Path("/delete/{docIds}")
+	@GET
+	@Consumes(MediaType.APPLICATION_JSON)
+	@Produces(MediaType.APPLICATION_JSON)
+	public String deleteMultipleFile(@PathParam("docIds") String docIds) {
+		try {
+			boolean b = multipleCopyService.deleteFile(docIds);
+			return ApiResult.success(b);
+		} catch (Exception e) {
+			toolUtil.writeErrorLog("删除文件时出错！ " + e);
+			return ApiResult.error("删除文件出错！");
+		}
+	}
+	
+	@GET
+	@Path("/getTest")
+	@Produces(MediaType.APPLICATION_JSON)
+	@Consumes(MediaType.APPLICATION_JSON)
+	public String testGet() {
+		return ApiResult.success("能访问到的！");
+	}
+	
+}
diff --git a/src/main/youhong_ai_old_src/com/api/aiyh_pcn/dealers_contract/DealersContractController.java b/src/main/youhong_ai_old_src/com/api/aiyh_pcn/dealers_contract/DealersContractController.java
new file mode 100644
index 0000000..1c6d66a
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/aiyh_pcn/dealers_contract/DealersContractController.java
@@ -0,0 +1,52 @@
+package com.api.aiyh_pcn.dealers_contract;
+
+import aiyh.utils.Util;
+import com.alibaba.fastjson.JSON;
+import io.swagger.v3.oas.annotations.parameters.RequestBody;
+
+import javax.ws.rs.Consumes;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * <p></p>
+ * <p>create 2022/4/19 2:39 PM</p>
+ *
+ * @author ayh
+ */
+
+@Path("/v3/fadada")
+public class DealersContractController {
+	
+	private final DealersContractService dealersContractService = new DealersContractService();
+	
+	
+	@Path("/d-flow/callback-contract")
+	@POST
+	@Consumes(MediaType.APPLICATION_JSON)
+	@Produces(MediaType.APPLICATION_JSON)
+	public String callback(@RequestBody Map<String, Object> params) {
+		Map<String, Object> result = new HashMap<>(16);
+		try {
+			Util.getLogger().info("callback params:" + JSON.toJSONString(params));
+			dealersContractService.callback(params);
+			Util.getLogger().info("处理回调请求完成！");
+			result.put("code", 1);
+			result.put("errorMessage", "success");
+			result.put("callbackStatus", "success");
+			Util.getLogger().info("回调处理成功！======================================");
+		} catch (Exception e) {
+			Util.getLogger().error("处理请求失败了，开始准备返回消息！");
+			result.put("code", 0);
+			result.put("errorMessage", e.getMessage());
+			result.put("callbackStatus", "fail");
+			Util.getLogger().error("回调处理失败==========================================" + Util.getErrString(e));
+		}
+		return JSON.toJSONString(result);
+	}
+	
+}
diff --git a/src/main/youhong_ai_old_src/com/api/aiyh_pcn/dealers_contract/DealersContractMapper.java b/src/main/youhong_ai_old_src/com/api/aiyh_pcn/dealers_contract/DealersContractMapper.java
new file mode 100644
index 0000000..99f1c37
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/aiyh_pcn/dealers_contract/DealersContractMapper.java
@@ -0,0 +1,35 @@
+package com.api.aiyh_pcn.dealers_contract;
+
+import aiyh.utils.annotation.recordset.*;
+
+import java.util.Map;
+
+/**
+ * <p>mappr</p>
+ * <p>create 2022/4/19 3:51 PM</p>
+ *
+ * @author ayh
+ */
+
+@SqlMapper
+public interface DealersContractMapper {
+
+    @Select("select * from uf_contract_log where contract_id = #{contractId}")
+    @CaseConversion(false)
+    Map<String, Object> selectContractInfo(@ParamMapper("contractId") String contractId);
+
+    @Update(custom = true)
+    boolean updateContractSignStatus(@SqlString String sql, Map<String, Object> updateMap);
+
+    @Select("select $t{submitStatusField} from $t{workflowTable} where requestid = #{requestId}")
+    Integer selectSubmitStatus(@ParamMapper("workflowTable") String workflowTable,
+                               @ParamMapper("submitStatusField") String submitStatusField,
+                               @ParamMapper("requestId") String requestId);
+
+    @Update("update $t{workflowTable} set $t{submitStatusField} = #{status} where requestid = #{requestId}")
+    boolean updateSubmitStatus(@ParamMapper("workflowTable") String workflowTable,
+                               @ParamMapper("submitStatusField") String submitStatusField,
+                               @ParamMapper("requestId") String requestId,
+                               @ParamMapper("status") int status);
+}
+
diff --git a/src/main/youhong_ai_old_src/com/api/aiyh_pcn/dealers_contract/DealersContractService.java b/src/main/youhong_ai_old_src/com/api/aiyh_pcn/dealers_contract/DealersContractService.java
new file mode 100644
index 0000000..d8e59a6
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/aiyh_pcn/dealers_contract/DealersContractService.java
@@ -0,0 +1,117 @@
+package com.api.aiyh_pcn.dealers_contract;
+
+import aiyh.utils.Util;
+import aiyh.utils.excention.CustomerException;
+import com.google.common.base.Strings;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * <p></p>
+ * <p>create 2022/4/19 2:49 PM</p>
+ *
+ * @author ayh
+ */
+
+public class DealersContractService {
+	
+	DealersContractMapper mapper = Util.getMapper(DealersContractMapper.class);
+	
+	public void callback(Map<String, Object> params) {
+//        合同编号
+		String contractNo = Util.null2String(params.get("contractNo"));
+//        是否签署 1-签署中 2-拒绝签署 3-已签署
+		int isSeal = Integer.parseInt(Util.null2String(params.get("isSeal")));
+//        d-flow生成的唯一 使用String.valueOf转换为String
+		String data = Util.null2String(params.get("data"));
+		// todo msg的键是多少
+		String msg = Util.null2String(params.get("rejectedReason"));
+		String rejectedEmail = Util.null2String(params.get("rejectedBy"));
+		Map<String, Object> map = mapper.selectContractInfo(contractNo);
+		String workflowTable = Util.null2String(map.get("workflow_table"));
+		if (Strings.isNullOrEmpty(workflowTable)) {
+			throw new CustomerException("无法获取表明！请检查日志表中是否存在该流程的记录！");
+		}
+		String workflowDetailTable = Util.null2String(map.get("workflow_detail_table"));
+		String requestId = Util.null2String(map.get("request_id"));
+
+//        获取回调签署状态 1 主表 0 明细表
+		String dealersContractCallbackType = Util.getCusConfigValue(workflowTable + "_dealers_contract_callback_type");
+//        回写签署值
+		String dealersSignValue = Util.getCusConfigValue(workflowTable + "_dealers_sign_value");
+//        回写正在签署值
+		String dealersSigningValue = Util.getCusConfigValue(workflowTable + "_dealers_signing_value");
+//        回写不签署值
+		String dealersNotSignValue = Util.getCusConfigValue(workflowTable + "_dealers_not_sign_value");
+//        签署字段
+		String dealersSingStatusField = Util.getCusConfigValue(workflowTable + "_dealers_sing_status_field");
+//        原因字段
+		String dealersSingMessageField = Util.getCusConfigValue(workflowTable + "_dealers_sing_message_field");
+//        拒签邮箱
+		String dealersSingEmailField = Util.getCusConfigValue(workflowTable + "_dealers_sing_email_field");
+//        d-flow-id字段
+		String dealersD_FlowIdField = Util.getCusConfigValue(workflowTable + "_dealers_d-flow_id_field");
+//        合同字段
+		String contractField = Util.getCusConfigValue(workflowTable + "_dealers_contract_field");
+//        自动提交字段状态标识字段
+		String submitStatusField = Util.getCusConfigValue(workflowTable + "_submit_status_field");
+		Map<String, Object> updateMap = new HashMap<>(16);
+		if (1 == isSeal) {
+			updateMap.put(dealersSingStatusField, dealersSigningValue);
+		} else if (2 == isSeal) {
+			updateMap.put(dealersSingStatusField, dealersNotSignValue);
+		} else if (3 == isSeal) {
+			updateMap.put(dealersSingStatusField, dealersSignValue);
+		}
+		if (!Strings.isNullOrEmpty(dealersD_FlowIdField)) {
+			updateMap.put(dealersD_FlowIdField, data);
+		}
+		if (!Strings.isNullOrEmpty(dealersSingMessageField)) {
+			updateMap.put(dealersSingMessageField, msg);
+		}
+		if (!Strings.isNullOrEmpty(dealersSingEmailField)) {
+			updateMap.put(dealersSingEmailField, rejectedEmail);
+		}
+		if ("1".equals(dealersContractCallbackType.trim())) {
+			String sql = Util.builderUpdateSql(workflowTable, updateMap);
+			sql += " where  " + contractField + " = #{" + contractField + "}";
+			updateMap.put(contractField, contractNo);
+//            回写到主表
+			Util.getLogger().info("回写到主表sql:" + sql);
+			if (!mapper.updateContractSignStatus(sql, updateMap)) {
+				throw new CustomerException("回写到主表失败");
+			}
+			submitWorkflow(workflowTable, requestId, submitStatusField);
+		} else {
+			String sql = Util.builderUpdateSql(workflowDetailTable, updateMap);
+			sql += " where  " + contractField + " = #{" + contractField + "}";
+			updateMap.put(contractField, contractNo);
+			Util.getLogger().info("回写到明细表sql:" + sql);
+//            回写到明细表
+			if (!mapper.updateContractSignStatus(sql, updateMap)) {
+				throw new CustomerException("回写到明细表失败");
+			}
+			submitWorkflow(workflowTable, requestId, submitStatusField);
+		}
+		
+	}
+	
+	private void submitWorkflow(String workflowTable, String requestId, String submitStatusField) {
+		int n = 0;
+		Integer status = mapper.selectSubmitStatus(workflowTable, submitStatusField, requestId);
+		if (status <= 0) {
+			while (!Util.submitWorkflow(Integer.valueOf(requestId), 1, "流程自动提交")) {
+				n++;
+				if (n > 5) {
+					Util.getLogger().error("流程自动提交失败，回调失败！");
+					throw new CustomerException("流程已经提交，请勿重复调用！");
+				}
+			}
+			//                修改值
+			while (!mapper.updateSubmitStatus(workflowTable, submitStatusField, requestId, 1) && n <= 10) {
+				n++;
+			}
+		}
+	}
+}
diff --git a/src/main/youhong_ai_old_src/com/api/aiyh_pcn/fadada/dao/FaDDContractMapping.java b/src/main/youhong_ai_old_src/com/api/aiyh_pcn/fadada/dao/FaDDContractMapping.java
new file mode 100644
index 0000000..80f4c4f
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/aiyh_pcn/fadada/dao/FaDDContractMapping.java
@@ -0,0 +1,206 @@
+package com.api.aiyh_pcn.fadada.dao;
+
+import aiyh.utils.Util;
+import aiyh.utils.zwl.common.ToolUtil;
+import com.api.aiyh_pcn.fadada.entity.FaDaDaConfigDTO;
+import com.api.aiyh_pcn.fadada.entity.PushAPushEmailEntity;
+import com.api.aiyh_pcn.fadada.entity.UfContractInfoDTO;
+import com.api.aiyh_pcn.fadada.typeEnum.DisableEnableType;
+import weaver.aiyh_pcn.fadada.entity.FileInfo;
+import weaver.conn.RecordSet;
+import weaver.workflow.workflow.WorkflowVersion;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author EBU7-dev1-ayh
+ * @create 2021/11/3 0003 14:56
+ */
+
+
+public class FaDDContractMapping {
+    private final RecordSet rs = new RecordSet();
+    private final ToolUtil toolUtil = new ToolUtil();
+
+    /**
+     * 查询合同相关的配置信息
+     *
+     * @param workflowId 流程id
+     * @param type       配置的类型
+     * @return 配置信息
+     */
+    public FaDaDaConfigDTO queryConfig(String workflowId, int type) {
+        String versionStringByWfid = WorkflowVersion.getVersionStringByWfid(workflowId);
+        String query = "select main.id,main.workflow_type,main.api_type, main.params_config," +
+                "main.signed_type,wf2.fieldname field_control1," +
+                "wf.fieldname field_control, wf1.fieldname contract_doc, " +
+                "(select GROUP_CONCAT('',selectvalue,'') selectvalue from workflow_selectitem " +
+                "where FIND_IN_SET(id,main.only_own)) only_own, " +
+                "(select GROUP_CONCAT('',selectvalue,'') selectvalue from workflow_selectitem " +
+                "where FIND_IN_SET(id,main.only_other)) only_other, " +
+                "(select GROUP_CONCAT('',selectvalue,'') selectvalue from workflow_selectitem " +
+                "where FIND_IN_SET(id,main.both_all)) both_all, " +
+                "(select GROUP_CONCAT('',selectvalue,'') selectvalue from workflow_selectitem " +
+                "where FIND_IN_SET(id,main.check_personal)) check_personal, " +
+                "(select GROUP_CONCAT('',selectvalue,'') selectvalue from workflow_selectitem " +
+                "where FIND_IN_SET(id,main.check_enterprise)) check_enterprise," +
+                "main.check_source_type,wdt.tablename check_source " +
+                "from uf_contract_config  main " +
+                "left join workflow_field_table_view  wf on wf.id = main.field_control " +
+                "left join workflow_field_table_view  wf1 on wf1.id = main.contract_doc " +
+                "left join workflow_field_table_view  wf2 on wf2.id = main.field_control1 " +
+                "left join workflow_detail_table_view wdt on wdt.id = main.check_source and " +
+                "wdt.workflow_id = main.workflow_type " +
+                "where main.workflow_type in ( " + versionStringByWfid + ") and api_type = ?";
+        rs.executeQuery(query, type);
+        return Util.recordeSet2Entity(rs, FaDaDaConfigDTO.class, true);
+    }
+
+
+    /**
+     * 获取全版本的workflowId
+     *
+     * @param versionStringByWfid 全版本的workflowId
+     * @return
+     */
+    public String getAllVersion(String versionStringByWfid) {
+        String query = "select distinct workflow_type from uf_contract_config where workflow_type in (" + versionStringByWfid + ")";
+        rs.executeQuery(query);
+        rs.next();
+        return rs.getString(1);
+    }
+
+    /**
+     * 获取节点信息
+     *
+     * @param versionStringByWfid 全版本的流程
+     * @return
+     */
+    public String getNodes(String versionStringByWfid,String  markOnly) {
+        String query = "select workflow_nodes from uf_node_config where workflow_type in (" + versionStringByWfid + ") and enable_nodes = ? and mark_only = ?";
+        rs.executeQuery(query, 1,markOnly);
+        String nodes = "";
+        while (rs.next()){
+            if("".equals(nodes)){
+                nodes += rs.getString(1);
+            }else{
+                String node = Util.null2String(rs.getString(1));
+                nodes += "".equals(node) ? "" : "," + node;
+            }
+        }
+        return nodes;
+    }
+
+    /**
+     * 获取流程主表
+     *
+     * @param workflowId
+     * @return
+     */
+    public String getMainTable(String workflowId) {
+        String versionStringByWfid = WorkflowVersion.getVersionStringByWfid(workflowId);
+        String query = "select tablename from workflow_bill " +
+                " where id in (select formid from workflow_base " +
+                " where id in (" + versionStringByWfid + ") )";
+        rs.executeQuery(query);
+        rs.next();
+        String mainTable = rs.getString(1);
+        toolUtil.writeDebuggerLog("mainTable:" + mainTable);
+        return mainTable;
+    }
+
+    /**
+     * 获取配置的明细表
+     *
+     * @param workflowId
+     * @param type
+     * @return
+     */
+    public String getDetailTable(String workflowId, int type) {
+        FaDaDaConfigDTO faDaDaConfigDTO = this.queryConfig(workflowId, type);
+        String detailTable = faDaDaConfigDTO.getCheckSource();
+        toolUtil.writeDebuggerLog("detailTable:" + detailTable);
+        return detailTable;
+    }
+
+    /**
+     * 根据主表和请求id查询主表数据
+     *
+     * @param requestId     请求id
+     * @param mainTableName 主表表名
+     * @return
+     */
+    public Map<String, Object> queryMainMap(String requestId, String mainTableName) {
+        String query = "select * from " + mainTableName + " where requestid = ?";
+        RecordSet rs = new RecordSet();
+        rs.executeQuery(query, requestId);
+        return Util.recordSet2Map(rs);
+    }
+
+    /**
+     * 查询明细数据
+     *
+     * @param mainId    主表id
+     * @param tableName 明细表表名
+     * @return
+     */
+    public List<Map<String, Object>> queryDetailMaps(String mainId, String tableName) {
+        String query = "select * from " + tableName + " where mainid = ?";
+        RecordSet rs = new RecordSet();
+        rs.executeQuery(query, mainId);
+        return Util.recordSet2MapList(rs);
+    }
+
+
+    /**
+     * 查询合同的配置信息
+     *
+     * @param workflowId
+     * @return
+     */
+/*	public Map<String, Object> queryContractConfig(String workflowId) {
+		String versionStringByWfid = WorkflowVersion.getVersionStringByWfid(workflowId);
+		RecordSet rs = new RecordSet();
+		rs.executeQuery("select * from uf_contract_config where workflow_type in ( " + versionStringByWfid + " ) and api_type = ?", 2);
+		return Util.recordSet2Map(rs);
+	}*/
+
+    /**
+     * 根据文件的id查询物理文件的id
+     *
+     * @param fileIds
+     * @return
+     */
+    public List<FileInfo> queryImgFileIdByDocIds(String fileIds) {
+        String query = "select imagefileid,imagefilename from docimagefile where docid in ( " + fileIds + " )";
+        rs.executeQuery(query);
+        return Util.recordeSet2Array(rs, FileInfo.class);
+    }
+
+    public UfContractInfoDTO queryContractInfo(String contractNo) {
+        String query = "select * from uf_contract_info where contract_no = ?";
+        RecordSet rs = new RecordSet();
+        rs.executeQuery(query, contractNo);
+        return Util.recordeSet2Entity(rs, UfContractInfoDTO.class, true);
+    }
+
+    public UfContractInfoDTO queryContractInfoByRequestId(String requestId) {
+        String query = "select * from uf_contract_info where workflow_request_id = ?";
+        RecordSet rs = new RecordSet();
+        rs.executeQuery(query, requestId);
+        return Util.recordeSet2Entity(rs, UfContractInfoDTO.class, true);
+    }
+
+    public PushAPushEmailEntity queryEmailInfo(int workflowType) {
+        String query = "select * from uf_push_a_push where workflow_type = ? and disable_enable = ?";
+        RecordSet rs = new RecordSet();
+        rs.executeQuery(query, workflowType, DisableEnableType.enable.getValue());
+        return Util.recordeSet2Entity(rs, PushAPushEmailEntity.class, true);
+    }
+
+    public boolean updateBackInfo(String workflowMainTable, String workflowRequestId, String backWritField,String fieldValue) {
+        String update = "update " + workflowMainTable + " set " + backWritField + " = ? where requestid = ?" ;
+        return rs.executeUpdate(update, fieldValue, workflowRequestId);
+    }
+}
diff --git a/src/main/youhong_ai_old_src/com/api/aiyh_pcn/fadada/dao/FaDDServiceMapping.java b/src/main/youhong_ai_old_src/com/api/aiyh_pcn/fadada/dao/FaDDServiceMapping.java
new file mode 100644
index 0000000..047955e
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/aiyh_pcn/fadada/dao/FaDDServiceMapping.java
@@ -0,0 +1,173 @@
+package com.api.aiyh_pcn.fadada.dao;
+
+import aiyh.utils.Util;
+import aiyh.utils.sqlUtil.sqlResult.impl.PrepSqlResultImpl;
+import aiyh.utils.sqlUtil.whereUtil.Where;
+import aiyh.utils.zwl.common.ToolUtil;
+import com.api.aiyh_pcn.fadada.entity.FaDaDaConfigDTO;
+import weaver.aiyh_pcn.fadada.entity.FileInfo;
+import weaver.conn.RecordSet;
+import weaver.workflow.workflow.WorkflowVersion;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author EBU7-dev1-ayh
+ * @create 2021/9/30 0030 11:18
+ * 数据
+ */
+
+
+public class FaDDServiceMapping {
+	private final RecordSet rs = new RecordSet();
+	private final ToolUtil toolUtil = new ToolUtil();
+
+//	private final String MAIN_TABLE = "formtable_main_17";
+//	private final String DETAIL_TABLE = "formtable_main_17_dt1";
+
+	public FaDaDaConfigDTO queryConfig(String workflowId, int type) {
+		String versionStringByWfid = WorkflowVersion.getVersionStringByWfid(workflowId);
+		String query = "select main.id,main.workflow_type,main.api_type, main.params_config, " +
+				"wf.fieldname field_control, " +
+				"(select GROUP_CONCAT('',selectvalue,'') selectvalue from workflow_selectitem where FIND_IN_SET(id,main.check_personal)) check_personal, " +
+				"(select GROUP_CONCAT('',selectvalue,'') selectvalue from workflow_selectitem where FIND_IN_SET(id,main.check_enterprise)) check_enterprise,  " +
+				"main.check_source_type,wdt.tablename check_source " +
+				"from uf_contract_config  main " +
+				"left join workflow_field_table_view  wf on wf.id = main.field_control " +
+				"left join workflow_detail_table_view wdt on wdt.id = main.check_source and wdt.workflow_id = main.workflow_type " +
+				"where main.workflow_type in ( " + versionStringByWfid + ") and api_type = ?";
+		rs.executeQuery(query, type);
+		return Util.recordeSet2Entity(rs, FaDaDaConfigDTO.class, true);
+	}
+
+	public List<FileInfo> queryImgFileIdByDocIds(String fileIds) {
+		String query = "select imagefileid,imagefilename from docimagefile where docid in ( " + fileIds + " )";
+		rs.executeQuery(query);
+		return Util.recordeSet2Array(rs, FileInfo.class);
+	}
+
+	public List<Map<String, Object>> queryDetailInfo(String requestId,String workflowId,int type) {
+
+		String mainTable = this.getMainTable(workflowId);
+		toolUtil.writeDebuggerLog("进入查询数据库方法");
+		String query = "select id from " + mainTable + " where requestid = ?";
+		rs.executeQuery(query, requestId);
+		rs.next();
+		String mainId = rs.getString("id");
+		String detailTable = this.getDetailTable(workflowId, type);
+		query = "select * from " + detailTable + " where mainid = ? and ( contract_status in (1,6) or contract_status is null) ";
+		this.toolUtil.writeDebuggerLog(query);
+		RecordSet rs = new RecordSet();
+		rs.executeQuery(query, mainId);
+		List<Map<String, Object>> maps = null;
+		try {
+			maps = Util.recordSet2MapList(rs);
+			toolUtil.writeDebuggerLog("查询到状态：" + maps);
+		} catch (Exception e) {
+			e.printStackTrace();
+			toolUtil.writeErrorLog("工具类出现异常：" + e);
+		}
+		return maps == null ? new ArrayList<>() : maps;
+	}
+
+	public List<Map<String, Object>> queryDetailDownInfo(String requestId,String workflowId,int type) {
+
+		String mainTable = this.getMainTable(workflowId);
+		toolUtil.writeDebuggerLog("进入查询数据库方法");
+		String query = "select id from " + mainTable + " where requestid = ?";
+		rs.executeQuery(query, requestId);
+		rs.next();
+		String mainId = rs.getString("id");
+		String detailTable = this.getDetailTable(workflowId, type);
+		query = "select * from " + detailTable + " where mainid = ?";
+		this.toolUtil.writeDebuggerLog(query);
+		RecordSet rs = new RecordSet();
+		rs.executeQuery(query, mainId);
+		List<Map<String, Object>> maps = null;
+		try {
+			maps = Util.recordSet2MapList(rs);
+			toolUtil.writeDebuggerLog("查询到状态：" + maps);
+		} catch (Exception e) {
+			e.printStackTrace();
+			toolUtil.writeErrorLog("工具类出现异常：" + e);
+		}
+		return maps == null ? new ArrayList<>() : maps;
+	}
+
+
+	public List<Map<String, Object>> querySignedInfo(String requestId, String workflowId) {
+		String mainTable = this.getMainTable(workflowId);
+		String query = "select id from " + mainTable + " where requestid = ? and signed_oneself = 1";
+		rs.executeQuery(query, requestId);
+		return Util.recordSet2MapList(rs);
+	}
+
+	public void updateContractStatus(Map<String, Object> map,String workflowId,int type) {
+		String detailTable = this.getDetailTable(workflowId,type);
+		Map<String, Object> updateData = new HashMap<>();
+		updateData.put("contract_status", map.get("contract_status"));
+		Where where = Util.createPrepWhereImpl().whereAnd("id").whereEqual(map.get("id"));
+		PrepSqlResultImpl sqlResult = Util.createSqlBuilder().updateSql(detailTable, updateData, where);
+		rs.executeUpdate(sqlResult.getSqlStr(), sqlResult.getArgs());
+	}
+
+	public String getAllVersion(String versionStringByWfid) {
+		String query = "select distinct workflow_type from uf_contract_config where workflow_type in (" + versionStringByWfid +  ")";
+		rs.executeQuery(query);
+		rs.next();
+		return rs.getString(1);
+	}
+
+	public String getMainTable(String workflowId){
+		String versionStringByWfid = WorkflowVersion.getVersionStringByWfid(workflowId);
+		String query = "select tablename from workflow_bill " +
+				" where id in (select formid from workflow_base " +
+				" where id in (" + versionStringByWfid + ") )";
+		rs.executeQuery(query);
+		rs.next();
+		String mainTable = rs.getString(1);
+		toolUtil.writeDebuggerLog("mainTable:" + mainTable);
+		return mainTable;
+	}
+
+	public String getDetailTable(String workflowId, int type){
+		FaDaDaConfigDTO faDaDaConfigDTO = this.queryConfig(workflowId, type);
+		String detailTable = faDaDaConfigDTO.getCheckSource();
+		toolUtil.writeDebuggerLog("detailTable:" + detailTable);
+		return detailTable;
+	}
+
+	public String getNodes(String versionStringByWfid, String markOnly) {
+		String query = "select workflow_nodes from uf_node_config where workflow_type in (" + versionStringByWfid + ") and mark_only = ?";
+		rs.executeQuery(query,markOnly);
+		rs.next();
+		return rs.getString(1);
+	}
+
+/*	public FaDDConfigMainDTO getConfigParam(String workflowId) {
+		String versionStringByWfid = WorkflowVersion.getVersionStringByWfid(workflowId);
+		System.out.println(versionStringByWfid);
+		String query = "select main.id,main.workflow_type, wf.fieldname field_control, " +
+				"(select GROUP_CONCAT('',selectvalue,'') selectvalue from workflow_selectitem where FIND_IN_SET(id,main.check_personal)) check_personal, " +
+				"(select GROUP_CONCAT('',selectvalue,'') selectvalue from workflow_selectitem where FIND_IN_SET(id,main.check_enterprise)) check_enterprise, " +
+				"main.check_source_type,wdt.tablename check_source " +
+				"from uf_attestation_conf  main " +
+				"left join workflow_field_table_view  wf on wf.id = main.field_control " +
+				"left join workflow_detail_table_view wdt on wdt.id = main.check_source and wdt.workflow_id = main.workflow_type " +
+				"where main.workflow_type in ( " + versionStringByWfid + ")";
+		rs.executeQuery(query);
+		FaDDConfigMainDTO faDDConfigMainDTO = Util.recordeSet2Entity(rs, FaDDConfigMainDTO.class, true);
+		query = "select dt.id,dt.line_num,dt.param_name,dt.param_type,dt.object_child,dt.parent_line,dt.change_rule, " +
+				"dt.param_value,wf.fieldname workflow_field,wf.tablename tablename,dt.array_sql,dt.api_type " +
+				"from uf_attestation_conf_dt1 dt " +
+				"left join workflow_field_table_view wf on wf.id = dt.workflow_field  " +
+				"where dt.mainid = ?";
+		rs.executeQuery(query, faDDConfigMainDTO.getId());
+		List<FaDDConfigDetailDTO> faDDConfigDetailDTOS = Util.recordeSet2Array(rs, FaDDConfigDetailDTO.class, true);
+		faDDConfigMainDTO.setList(faDDConfigDetailDTOS);
+		return faDDConfigMainDTO;
+	}*/
+}
diff --git a/src/main/youhong_ai_old_src/com/api/aiyh_pcn/fadada/entity/FaDaDaConfigDTO.java b/src/main/youhong_ai_old_src/com/api/aiyh_pcn/fadada/entity/FaDaDaConfigDTO.java
new file mode 100644
index 0000000..370b673
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/aiyh_pcn/fadada/entity/FaDaDaConfigDTO.java
@@ -0,0 +1,144 @@
+
+package com.api.aiyh_pcn.fadada.entity; 
+
+
+public class FaDaDaConfigDTO {
+
+	private int id;
+	private int workflowType;
+	private int apiType;
+	private String paramsConfig;
+	private String fieldControl;
+	private int checkSourceType;
+	private String checkSource;
+	private String contractDoc;
+	private int signedType;
+	private String fieldControl1;
+	private int onlyOwn;
+	private int onlyOther;
+	private int bothAll;
+
+
+	public void setId(int id){
+		this.id = id;
+	}
+
+	public void setWorkflowType(int workflowType){
+		this.workflowType = workflowType;
+	}
+
+	public void setApiType(int apiType){
+		this.apiType = apiType;
+	}
+
+	public void setParamsConfig(String paramsConfig){
+		this.paramsConfig = paramsConfig;
+	}
+
+	public void setFieldControl(String fieldControl){
+		this.fieldControl = fieldControl;
+	}
+
+	public void setCheckSourceType(int checkSourceType){
+		this.checkSourceType = checkSourceType;
+	}
+
+	public void setCheckSource(String checkSource){
+		this.checkSource = checkSource;
+	}
+
+	public int getId(){
+		return this.id;
+	}
+
+	public int getWorkflowType(){
+		return this.workflowType;
+	}
+
+	public int getApiType(){
+		return this.apiType;
+	}
+
+	public String getParamsConfig(){
+		return this.paramsConfig;
+	}
+
+	public String getFieldControl(){
+		return this.fieldControl;
+	}
+
+	public int getCheckSourceType(){
+		return this.checkSourceType;
+	}
+
+	public String getCheckSource(){
+		return this.checkSource;
+	}
+
+	public String getContractDoc() {
+		return contractDoc;
+	}
+
+	public void setContractDoc(String contractDoc) {
+		this.contractDoc = contractDoc;
+	}
+
+	public int getSignedType() {
+		return signedType;
+	}
+
+	public void setSignedType(int signedType) {
+		this.signedType = signedType;
+	}
+
+	public String getFieldControl1() {
+		return fieldControl1;
+	}
+
+	public void setFieldControl1(String fieldControl1) {
+		this.fieldControl1 = fieldControl1;
+	}
+
+	public int getOnlyOwn() {
+		return onlyOwn;
+	}
+
+	public void setOnlyOwn(int onlyOwn) {
+		this.onlyOwn = onlyOwn;
+	}
+
+	public int getOnlyOther() {
+		return onlyOther;
+	}
+
+	public void setOnlyOther(int onlyOther) {
+		this.onlyOther = onlyOther;
+	}
+
+	public int getBothAll() {
+		return bothAll;
+	}
+
+	public void setBothAll(int bothAll) {
+		this.bothAll = bothAll;
+	}
+
+	@Override
+	public String toString() {
+		return "FaDaDaConfigDTO{" +
+				"id=" + id +
+				", workflowType=" + workflowType +
+				", apiType=" + apiType +
+				", paramsConfig='" + paramsConfig + '\'' +
+				", fieldControl='" + fieldControl + '\'' +
+				", checkSourceType=" + checkSourceType +
+				", checkSource='" + checkSource + '\'' +
+				", contractDoc='" + contractDoc + '\'' +
+				", signedType=" + signedType +
+				", fieldControl1='" + fieldControl1 + '\'' +
+				", onlyOwn=" + onlyOwn +
+				", onlyOther=" + onlyOther +
+				", bothAll=" + bothAll +
+				'}';
+	}
+}
\ No newline at end of file
diff --git a/src/main/youhong_ai_old_src/com/api/aiyh_pcn/fadada/entity/PushAPushEmailEntity.java b/src/main/youhong_ai_old_src/com/api/aiyh_pcn/fadada/entity/PushAPushEmailEntity.java
new file mode 100644
index 0000000..4547567
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/aiyh_pcn/fadada/entity/PushAPushEmailEntity.java
@@ -0,0 +1,21 @@
+package com.api.aiyh_pcn.fadada.entity;
+
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+/**
+ * @author EBU7-dev1-ayh
+ * create 2021/12/13 0013 14:54
+ */
+
+@Getter
+@Setter
+@ToString
+public class PushAPushEmailEntity {
+    private Integer workflowType;
+    private Integer disableEnable;
+    private String emailAddress;
+    private String emailTitle;
+    private String emailContent;
+}
diff --git a/src/main/youhong_ai_old_src/com/api/aiyh_pcn/fadada/entity/TreeEntity.java b/src/main/youhong_ai_old_src/com/api/aiyh_pcn/fadada/entity/TreeEntity.java
new file mode 100644
index 0000000..ff3e6f2
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/aiyh_pcn/fadada/entity/TreeEntity.java
@@ -0,0 +1,29 @@
+package com.api.aiyh_pcn.fadada.entity;
+
+import java.util.List;
+
+/**
+ * @author EBU7-dev1-ayh
+ * @create 2021/10/12 0012 11:16
+ * 树形结构
+ */
+
+
+public class TreeEntity<T> {
+	private List<T> children;
+
+	public List<T> getChildren() {
+		return children;
+	}
+
+	public void setChildren(List<T> children) {
+		this.children = children;
+	}
+
+	@Override
+	public String toString() {
+		return "TreeEntity{" +
+				"children=" + children +
+				'}';
+	}
+}
diff --git a/src/main/youhong_ai_old_src/com/api/aiyh_pcn/fadada/entity/UfContractInfoDTO.java b/src/main/youhong_ai_old_src/com/api/aiyh_pcn/fadada/entity/UfContractInfoDTO.java
new file mode 100644
index 0000000..e620d60
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/aiyh_pcn/fadada/entity/UfContractInfoDTO.java
@@ -0,0 +1,222 @@
+package com.api.aiyh_pcn.fadada.entity;
+
+
+public class UfContractInfoDTO {
+
+    private int id;
+    private int requestId;
+    private int workflowType;
+    private String contractNo;
+    private String fileNo;
+    private String fileName;
+    private int signedNum;
+    private int shouldSignedNum;
+    private int contractStatus;
+    private String contractViewUrl;
+    private String contractDownUrl;
+    private String workflowMainTable;
+    private int queueSigned;
+    private int singleContractFileNum;
+    private int singleSignedNum;
+    private String workflowRequestId;
+    private String workflowDetailTable;
+    private String signedType;
+    private String userInfo;
+    private String contractSignedUrl;
+    private int mainId;
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public void setRequestId(int requestId) {
+        this.requestId = requestId;
+    }
+
+    public void setWorkflowType(int workflowType) {
+        this.workflowType = workflowType;
+    }
+
+    public void setContractNo(String contractNo) {
+        this.contractNo = contractNo;
+    }
+
+    public void setFileNo(String fileNo) {
+        this.fileNo = fileNo;
+    }
+
+    public void setFileName(String fileName) {
+        this.fileName = fileName;
+    }
+
+    public void setSignedNum(int signedNum) {
+        this.signedNum = signedNum;
+    }
+
+    public void setShouldSignedNum(int shouldSignedNum) {
+        this.shouldSignedNum = shouldSignedNum;
+    }
+
+    public void setContractStatus(int contractStatus) {
+        this.contractStatus = contractStatus;
+    }
+
+    public void setContractViewUrl(String contractViewUrl) {
+        this.contractViewUrl = contractViewUrl;
+    }
+
+    public void setContractDownUrl(String contractDownUrl) {
+        this.contractDownUrl = contractDownUrl;
+    }
+
+    public void setWorkflowMainTable(String workflowMainTable) {
+        this.workflowMainTable = workflowMainTable;
+    }
+
+    public void setQueueSigned(int queueSigned) {
+        this.queueSigned = queueSigned;
+    }
+
+    public void setSingleContractFileNum(int singleContractFileNum) {
+        this.singleContractFileNum = singleContractFileNum;
+    }
+
+    public void setSingleSignedNum(int singleSignedNum) {
+        this.singleSignedNum = singleSignedNum;
+    }
+
+    public void setWorkflowRequestId(String workflowRequestId) {
+        this.workflowRequestId = workflowRequestId;
+    }
+
+    public void setWorkflowDetailTable(String workflowDetailTable) {
+        this.workflowDetailTable = workflowDetailTable;
+    }
+
+    public void setMainId(int mainId) {
+        this.mainId = mainId;
+    }
+
+    public int getId() {
+        return this.id;
+    }
+
+    public int getRequestId() {
+        return this.requestId;
+    }
+
+    public int getWorkflowType() {
+        return this.workflowType;
+    }
+
+    public String getContractNo() {
+        return this.contractNo;
+    }
+
+    public String getFileNo() {
+        return this.fileNo;
+    }
+
+    public String getFileName() {
+        return this.fileName;
+    }
+
+    public int getSignedNum() {
+        return this.signedNum;
+    }
+
+    public int getShouldSignedNum() {
+        return this.shouldSignedNum;
+    }
+
+    public int getContractStatus() {
+        return this.contractStatus;
+    }
+
+    public String getContractViewUrl() {
+        return this.contractViewUrl;
+    }
+
+    public String getContractDownUrl() {
+        return this.contractDownUrl;
+    }
+
+    public String getWorkflowMainTable() {
+        return this.workflowMainTable;
+    }
+
+    public int getQueueSigned() {
+        return this.queueSigned;
+    }
+
+    public int getSingleContractFileNum() {
+        return this.singleContractFileNum;
+    }
+
+    public int getSingleSignedNum() {
+        return this.singleSignedNum;
+    }
+
+    public String getWorkflowRequestId() {
+        return this.workflowRequestId;
+    }
+
+    public String getWorkflowDetailTable() {
+        return this.workflowDetailTable;
+    }
+
+    public int getMainId() {
+        return this.mainId;
+    }
+
+    public String getSignedType() {
+        return signedType;
+    }
+
+    public void setSignedType(String signedType) {
+        this.signedType = signedType;
+    }
+
+    public String getUserInfo() {
+        return userInfo;
+    }
+
+    public void setUserInfo(String userInfo) {
+        this.userInfo = userInfo;
+    }
+
+    public String getContractSignedUrl() {
+        return contractSignedUrl;
+    }
+
+    public void setContractSignedUrl(String contractSignedUrl) {
+        this.contractSignedUrl = contractSignedUrl;
+    }
+
+    @Override
+    public String toString() {
+        return "UfContractInfoDTO{" +
+                "id=" + id +
+                ", requestId=" + requestId +
+                ", workflowType=" + workflowType +
+                ", contractNo='" + contractNo + '\'' +
+                ", fileNo='" + fileNo + '\'' +
+                ", fileName='" + fileName + '\'' +
+                ", signedNum=" + signedNum +
+                ", shouldSignedNum=" + shouldSignedNum +
+                ", contractStatus=" + contractStatus +
+                ", contractViewUrl='" + contractViewUrl + '\'' +
+                ", contractDownUrl='" + contractDownUrl + '\'' +
+                ", workflowMainTable='" + workflowMainTable + '\'' +
+                ", queueSigned=" + queueSigned +
+                ", singleContractFileNum=" + singleContractFileNum +
+                ", singleSignedNum=" + singleSignedNum +
+                ", workflowRequestId='" + workflowRequestId + '\'' +
+                ", workflowDetailTable='" + workflowDetailTable + '\'' +
+                ", signedType='" + signedType + '\'' +
+                ", userInfo='" + userInfo + '\'' +
+                ", contractSignedUrl='" + contractSignedUrl + '\'' +
+                ", mainId=" + mainId +
+                '}';
+    }
+}
\ No newline at end of file
diff --git a/src/main/youhong_ai_old_src/com/api/aiyh_pcn/fadada/service/IFaDDService.java b/src/main/youhong_ai_old_src/com/api/aiyh_pcn/fadada/service/IFaDDService.java
new file mode 100644
index 0000000..ffa3d57
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/aiyh_pcn/fadada/service/IFaDDService.java
@@ -0,0 +1,17 @@
+package com.api.aiyh_pcn.fadada.service;
+
+import com.api.aiyh_pcn.fadada.vo.TableFieldMappingVO;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author @author EBU7-dev1-ay
+ * @create 2021/9/30 0030 11:19
+ * 接口
+ */
+
+public interface IFaDDService {
+	Map<String,Object> getConfigParam(String workflowId);
+	Map<String, Object> checkCertification(Map<String, Object> params);
+}
diff --git a/src/main/youhong_ai_old_src/com/api/aiyh_pcn/fadada/service/impl/FaDDContractService.java b/src/main/youhong_ai_old_src/com/api/aiyh_pcn/fadada/service/impl/FaDDContractService.java
new file mode 100644
index 0000000..c2903e3
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/aiyh_pcn/fadada/service/impl/FaDDContractService.java
@@ -0,0 +1,1255 @@
+package com.api.aiyh_pcn.fadada.service.impl;
+
+import aiyh.utils.Util;
+import aiyh.utils.entity.ApiConfigDetailDTO;
+import aiyh.utils.entity.ApiConfigMainDTO;
+import aiyh.utils.httpUtil.ResponeVo;
+import aiyh.utils.mapUtil.ParaMap;
+import aiyh.utils.sqlUtil.sqlResult.impl.PrepSqlResultImpl;
+import aiyh.utils.zwl.common.ToolUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.TypeReference;
+import com.alibaba.fastjson.serializer.SerializerFeature;
+import com.api.aiyh_pcn.fadada.dao.FaDDContractMapping;
+import com.api.aiyh_pcn.fadada.entity.FaDaDaConfigDTO;
+import com.api.aiyh_pcn.fadada.entity.PushAPushEmailEntity;
+import com.api.aiyh_pcn.fadada.entity.UfContractInfoDTO;
+import com.api.aiyh_pcn.fadada.util.FaDDRequestUtils;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.google.common.base.Strings;
+import org.apache.axiom.util.base64.Base64Utils;
+import org.apache.http.HttpEntity;
+import org.h2.util.StringUtils;
+import weaver.conn.RecordSet;
+import weaver.email.EmailWorkRunnable;
+import weaver.general.xcommon.IOUtils;
+import weaver.hrm.User;
+import weaver.soa.workflow.FileProcessor;
+import weaver.workflow.workflow.WorkflowVersion;
+
+import javax.ws.rs.core.StreamingOutput;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipOutputStream;
+
+/**
+ * 法大大集成
+ *
+ * @author EBU7-dev1-ayh
+ * @create 2021/11/3 0003 14:51
+ */
+
+
+// 写这个代码的时候只有我和上帝知道在写啥 2021/11/10
+
+// 好了，现在只有上帝知道了 2022/02/16
+
+/*
+ * 2022/02/18
+ *你可能觉得自己看懂下面的代码了，
+ 
+ *然而你并没有，相信我。
+ 
+ *糊弄过去算了，不然你会好多个晚上睡不着觉，
+ 
+ *嘴里骂着这段注释，觉得自己很聪明，
+ 
+ *真能“优化”下面的代码。
+ 
+ *现在关上文件，去玩点别的吧。
+ 
+ */
+
+/*
+ * 听说你要改这里面的逻辑
+ *
+ * 听一句劝，别试图在一座屎山上面拉屎
+ *
+ * 当屎山崩塌的时候，没有一个拉屎的是无辜的
+ *
+ * 当你决定动这个文件的时候，你就要面对无尽的折磨
+ *
+ * */
+public class FaDDContractService {
+	private final ToolUtil toolUtil = new ToolUtil();
+	private final String contractInfoTable = "uf_contract_info";
+	private final FaDDContractMapping faDDContractMapping = new FaDDContractMapping();
+	
+	/**
+	 * 获取全版本的流程id，节点id
+	 *
+	 * @param workflowId
+	 * @return
+	 */
+	public Map<String, Object> getAllVersion(String workflowId, String markOnly) {
+		Map<String, Object> data = new HashMap<>();
+		if (Strings.isNullOrEmpty(workflowId)) {
+			data.put("workflowIds", new String[0]);
+			data.put("nodeIds", new String[0]);
+			return data;
+		}
+		String versionStringByWfid = WorkflowVersion.getVersionStringByWfid(workflowId);
+		String newWorkflowId = faDDContractMapping.getAllVersion(versionStringByWfid);
+		if (Strings.isNullOrEmpty(newWorkflowId)) {
+			data.put("workflowIds", new String[0]);
+			data.put("nodeIds", new String[0]);
+			return data;
+		}
+		String allVersion = WorkflowVersion.getVersionStringByWfid(newWorkflowId);
+		if (allVersion == null) {
+			allVersion = "";
+		}
+		String[] split = allVersion.split(",");
+		String[] nodes = this.getNodes(workflowId, markOnly);
+		data.put("workflowIds", split);
+		data.put("nodeIds", nodes);
+		return data;
+	}
+	
+	/**
+	 * 获取节点id
+	 *
+	 * @param workflowId
+	 * @return
+	 */
+	public String[] getNodes(String workflowId, String markOnly) {
+		String versionStringByWfid = WorkflowVersion.getVersionStringByWfid(workflowId);
+		String nods = faDDContractMapping.getNodes(versionStringByWfid, markOnly);
+		if (nods == null) {
+			nods = "";
+		}
+		return nods.split(",");
+	}
+	
+	/**
+	 * 获取替换SQL的数据
+	 *
+	 * @param requestId
+	 * @param workflowId
+	 * @param mainTableName
+	 * @param tableName
+	 * @return
+	 */
+	public List<Map<String, Object>> getDataArr(
+			String requestId, String workflowId, String mainTableName, String tableName) {
+		Map<String, Object> mainMap = faDDContractMapping.queryMainMap(requestId, mainTableName);
+		String mainId = Util.null2String(mainMap.get("id"));
+		List<Map<String, Object>> detailMaps = faDDContractMapping.queryDetailMaps(mainId, tableName);
+		return getDataArr(requestId, workflowId, tableName, mainMap, detailMaps);
+	}
+	
+	public List<Map<String, Object>> getDataArr(
+			String requestId,
+			String workflowId,
+			String mainTableName,
+			String tableName,
+			List<Map<String, Object>> detailMaps) {
+		Map<String, Object> mainMap = faDDContractMapping.queryMainMap(requestId, mainTableName);
+		String mainId = Util.null2String(mainMap.get("id"));
+		return getDataArr(requestId, workflowId, tableName, mainMap, detailMaps);
+	}
+	
+	public List<Map<String, Object>> getDataArr(
+			String requestId,
+			String workflowId,
+			String tableName,
+			Map<String, Object> mainMap,
+			List<Map<String, Object>> detailMaps) {
+		List<Map<String, Object>> dataArr = new ArrayList<>();
+		String dt = tableName.substring(tableName.indexOf("_dt") + 3);
+		String main = "main.";
+		String detail = "detail_" + dt + ".";
+		for (Map<String, Object> detailMap : detailMaps) {
+			Map<String, Object> data = new HashMap<>();
+			for (Map.Entry<String, Object> entry : mainMap.entrySet()) {
+				data.put(main + entry.getKey(), entry.getValue());
+			}
+			for (Map.Entry<String, Object> entry : detailMap.entrySet()) {
+				data.put(detail + entry.getKey(), entry.getValue());
+			}
+			data.put("requestId", requestId);
+			data.put("workflowId", workflowId);
+			dataArr.add(data);
+		}
+		return dataArr;
+	}
+	
+	/**
+	 * 获取处理object和List类型后的参数
+	 *
+	 * @param treeList
+	 * @param dataArr
+	 * @return
+	 */
+	public List<Map<String, Object>> objectAndListHandle(
+			List<ApiConfigDetailDTO> treeList, List<Map<String, Object>> dataArr) {
+		List<Map<String, Object>> params = new ArrayList<>();
+		for (Map<String, Object> dataMap : dataArr) {
+			Map<String, Object> param = new HashMap<>();
+			for (ApiConfigDetailDTO apiConfigDetailDTO : treeList) {
+				Object value;
+				if (apiConfigDetailDTO.getParamType() == 3) {
+					Map<String, Object> map = new HashMap<>();
+					//                  object类型
+					for (ApiConfigDetailDTO child : apiConfigDetailDTO.getChildren()) {
+						if (child.getChildren() == null || child.getChildren().size() == 0) {
+							//							  handleChild(child.getChildren(), dataMap)
+							map.put(child.getParamName(), changeRuleHandle(child, dataMap));
+						} else {
+							map.put(child.getParamName(), handleChild(child.getChildren(), dataMap));
+						}
+					}
+					value = map;
+				} else if (apiConfigDetailDTO.getParamType() == 4) {
+					String sql = apiConfigDetailDTO.getArraySql();
+					String parsingSq = aiyh.utils.Util.parsingSq(sql, dataMap);
+					//				    list类型
+					if (parsingSq.contains("delete")
+							    || parsingSq.contains("update")
+							    || parsingSq.contains("exec")
+							    || parsingSq.contains("drop")
+							    || parsingSq.contains("truncate")) {
+						value = new ArrayList<>();
+					} else {
+						RecordSet rs = new RecordSet();
+						String replace =
+								parsingSq
+										.replace("ｓｅｌｅｃｔ ", "select ")
+										.replaceAll(" ａｎｄ ", " and ")
+										.replaceAll(" ｏｒ ", " or ")
+										.replaceAll(" ｊｏｉｎ ", " join ")
+										.replaceAll(" ｉｎ ", " in ");
+						rs.executeQuery(replace);
+						value = aiyh.utils.Util.recordeSet2Array(rs, String.class);
+					}
+				} else {
+					value = changeRuleHandle(apiConfigDetailDTO, dataMap);
+				}
+				param.put(apiConfigDetailDTO.getParamName(), value);
+			}
+			params.add(param);
+		}
+		return params;
+	}
+	
+	/**
+	 * 处理子类
+	 *
+	 * @param children
+	 * @param dataMap
+	 * @return
+	 */
+	private Object handleChild(List<ApiConfigDetailDTO> children, Map<String, Object> dataMap) {
+		Map<String, Object> params = new HashMap<>();
+		for (ApiConfigDetailDTO child : children) {
+			Object value;
+			if (child.getChildren() != null) {
+				value = handleChild(child.getChildren(), dataMap);
+			} else {
+				value = changeRuleHandle(child, dataMap);
+			}
+			params.put(child.getParamName(), value);
+		}
+		return params;
+	}
+	
+	/**
+	 * 根据转换规则生成对应的参数值
+	 *
+	 * @param apiConfigDetailDTO
+	 * @param dataMap
+	 * @return
+	 */
+	private Object changeRuleHandle(
+			ApiConfigDetailDTO apiConfigDetailDTO, Map<String, Object> dataMap) {
+		Object value;
+		String tableName;
+		String table;
+		String sql;
+		String resultSql;
+		//			判断参数的转换规则
+		switch (apiConfigDetailDTO.getChangeRule()) {
+			case 0:
+				//					不转换
+			case 2:
+				//					流程字段值
+				table = apiConfigDetailDTO.getTablename();
+				if (!table.contains("_dt")) {
+					//			        表示字段属于主表
+					tableName = "main";
+				} else {
+					//			        字段属于明细表
+					String dt = table.substring(table.indexOf("_dt") + 3);
+					tableName = "detail_" + dt;
+				}
+				value = dataMap.get(tableName + "." + apiConfigDetailDTO.getWorkflowField());
+				break;
+			case 1:
+				//					固定值
+				value = apiConfigDetailDTO.getParamValue();
+				break;
+			case 3:
+				//					系统日期
+				value = aiyh.utils.Util.getTime("yyyy-MM-dd");
+				break;
+			case 4:
+				//					系统时间
+				value = aiyh.utils.Util.getTime("HH:mm:ss");
+				break;
+			case 5:
+				//					系统日期-时间
+				value = aiyh.utils.Util.getTime("yyyy-MM-dd HH:mm:ss");
+				break;
+			case 6:
+				//					自定义SQL
+			case 7:
+				//					流程字段转SQL
+				sql = apiConfigDetailDTO.getParamValue();
+				resultSql = aiyh.utils.Util.parsingSq(sql, dataMap);
+				if (resultSql.contains("delete ")
+						    || resultSql.contains("update ")
+						    || resultSql.contains("exec ")
+						    || resultSql.contains("drop ")
+						    || resultSql.contains("truncate ")) {
+					value = null;
+				} else {
+					RecordSet rs = new RecordSet();
+					String replace =
+							resultSql
+									.replace("ｓｅｌｅｃｔ ", "select ")
+									.replaceAll(" ａｎｄ ", " and ")
+									.replaceAll(" ｏｒ ", " or ")
+									.replaceAll(" ｊｏｉｎ ", " join ")
+									.replaceAll(" ｉｎ ", " in ");
+					rs.executeQuery(replace);
+					rs.next();
+					value = aiyh.utils.Util.null2String(rs.getString(1));
+				}
+				break;
+			case 8:
+				//
+				//					流程名称
+				value = aiyh.utils.Util.getWorkflowNameById(String.valueOf(dataMap.get("workflowid")));
+				break;
+			case 9:
+				//
+				//					请求标题
+				value = aiyh.utils.Util.getRequestTitleById(String.valueOf(dataMap.get("requestid")));
+				break;
+			case 10:
+				//					流程requestId
+				value = dataMap.get("requestid");
+				break;
+			default:
+				value = null;
+				break;
+		}
+		if (apiConfigDetailDTO.getParamType() == 1) {
+			//			Integer
+			value = Integer.parseInt(String.valueOf(value));
+		} else if (apiConfigDetailDTO.getParamType() == 2) {
+			//          Boolean
+			value = Boolean.parseBoolean(String.valueOf(value));
+		}
+		return value;
+	}
+	
+	/**
+	 * 合同签署回调逻辑处理
+	 *
+	 * @param contractNo
+	 */
+	public void signedCallBack(String contractNo) {
+		//		查询合同信息表中的数据
+		UfContractInfoDTO ufContractInfoDTO = faDDContractMapping.queryContractInfo(contractNo);
+		toolUtil.writeDebuggerLog("回调，获取到合同信息参数：" + JSON.toJSONString(ufContractInfoDTO));
+		Map<String, Object> update = new HashMap<>();
+		if (ufContractInfoDTO.getQueueSigned() == 1) {
+			//			属于顺序签署合同,更新单份合同已签蜀几个文件
+			update.put("single_signed_num", ufContractInfoDTO.getSingleSignedNum() + 1);
+			toolUtil.writeDebuggerLog("单份合同签署成功");
+			//			如果单份合同签署数量等于合同文件数量，表示已经签署完成
+			if (ufContractInfoDTO.getSingleSignedNum() + 1
+					    == ufContractInfoDTO.getSingleContractFileNum()) {
+				toolUtil.writeDebuggerLog("单份合同全部签署成功");
+				update.put("signed_num", ufContractInfoDTO.getSignedNum() + 1);
+				//				查询下一位合同方并发起签署
+				if (ufContractInfoDTO.getSignedNum() + 1 < ufContractInfoDTO.getShouldSignedNum()) {
+					toolUtil.writeDebuggerLog(
+							"应签署合同比签署合同数量多，需要再次签署！" + (ufContractInfoDTO.getSignedNum() + 1));
+					update.put("single_signed_num", 0);
+					nextContractSigned(ufContractInfoDTO);
+				}
+			}
+			//			如果合同已签数量和应签数量相同，则状态为本方待签
+			if (ufContractInfoDTO.getSignedNum() + 1 == ufContractInfoDTO.getShouldSignedNum()) {
+				update.put("contract_status", 3);
+				//		判断是否控制签署规则 1-仅本方签署，2-仅对方签署，3-都签署
+				if ("1".equals(Util.null2String(ufContractInfoDTO.getSignedType()))) {
+					update.put("contract_status", 4);
+				}
+				if ("2".equals(Util.null2String(ufContractInfoDTO.getSignedType()))) {
+					update.put("contract_status", 4);
+					//					 仅对方签署完成后，添加用户信息
+					//		        获取配置表信息
+					FaDaDaConfigDTO faDaDaConfigDTO =
+							faDDContractMapping.queryConfig(
+									String.valueOf(ufContractInfoDTO.getWorkflowType()), 4);
+					RecordSet rs = new RecordSet();
+					String userInfo = ufContractInfoDTO.getUserInfo();
+					User user = JSON.parseObject(userInfo, new TypeReference<User>() {
+					});
+					//		获取流程中的合同字段的文档目录id
+					rs.executeQuery(
+							"select formid from workflow_base where id = ?", ufContractInfoDTO.getWorkflowType());
+					String formId = Util.recordeSet2Entity(rs, String.class);
+					String query =
+							"select doccategory from workflow_fileupload where fieldid = (select id from workflow_billfield where fieldname = ? and billid = ?)";
+					rs.executeQuery(query, faDaDaConfigDTO.getContractDoc(), formId);
+					String docCategorys = Util.null2String(Util.recordeSet2Entity(rs, String.class));
+					if (StringUtils.isNullOrEmpty(docCategorys)) {
+						query = "select doccategory from workflow_base where id = ?";
+						rs.executeQuery(query, ufContractInfoDTO.getWorkflowType());
+						rs.next();
+						docCategorys = Util.null2String(rs.getString(1));
+					}
+					if (StringUtils.isNullOrEmpty(docCategorys)) {
+						docCategorys = ",,1";
+					}
+					//		            String[] docSplit = docCategorys.split(",");
+					//		            String category = docSplit[docSplit.length - 1];
+					//		            下载合同到文件服务器中
+					String docIds = "";
+					try {
+						docIds = downloadContract2FileSystem(ufContractInfoDTO, docCategorys, user);
+					} catch (Exception e) {
+						toolUtil.writeErrorLog("创建文档发生错误：" + e);
+					}
+					toolUtil.writeDebuggerLog("生成的文档的id：" + docIds);
+					//	将id保存到流程字段中
+					PrepSqlResultImpl sqlResult =
+							Util.createSqlBuilder()
+									.updateSql(
+											ufContractInfoDTO.getWorkflowMainTable(),
+											ParaMap.create().put(faDaDaConfigDTO.getContractDoc(), docIds),
+											Util.createPrepWhereImpl()
+													.whereAnd("id")
+													.whereEqual(ufContractInfoDTO.getMainId()));
+					toolUtil.writeDebuggerLog(sqlResult.getSqlStr() + "，参数：" + sqlResult.getArgs());
+					rs.executeUpdate(sqlResult.getSqlStr(), sqlResult.getArgs());
+				}
+			}
+		} else {
+			//		    全部合同一起发送的签署信息
+			//			直接合同已签署+1
+			update.put("signed_num", ufContractInfoDTO.getSignedNum() + 1);
+			//			如果已签文件数等于需要签署的合同数乘以合同文件数相等，则代表对方已经签署完毕
+			if (ufContractInfoDTO.getSignedNum() + 1
+					    == ufContractInfoDTO.getShouldSignedNum()
+							       * ufContractInfoDTO.getSingleContractFileNum()) {
+				update.put("contract_status", 3);
+				//		判断是否控制签署规则 1-仅本方签署，2-仅对方签署，3-都签署
+				if ("1".equals(Util.null2String(ufContractInfoDTO.getSignedType()))) {
+					update.put("contract_status", 4);
+				}
+				if ("2".equals(Util.null2String(ufContractInfoDTO.getSignedType()))) {
+					update.put("contract_status", 4);
+					//					 仅对方签署完成后，添加用户信息
+					//		        获取配置表信息
+					FaDaDaConfigDTO faDaDaConfigDTO =
+							faDDContractMapping.queryConfig(
+									String.valueOf(ufContractInfoDTO.getWorkflowType()), 4);
+					RecordSet rs = new RecordSet();
+					String userInfo = ufContractInfoDTO.getUserInfo();
+					User user = JSON.parseObject(userInfo, new TypeReference<User>() {
+					});
+					//		获取流程中的合同字段的文档目录id
+					rs.executeQuery(
+							"select formid from workflow_base where id = ?", ufContractInfoDTO.getWorkflowType());
+					String formId = Util.recordeSet2Entity(rs, String.class);
+					String query =
+							"select doccategory from workflow_fileupload where fieldid = (select id from workflow_billfield where fieldname = ? and billid = ?)";
+					rs.executeQuery(query, faDaDaConfigDTO.getContractDoc(), formId);
+					String docCategorys = Util.null2String(Util.recordeSet2Entity(rs, String.class));
+					if (StringUtils.isNullOrEmpty(docCategorys)) {
+						query = "select doccategory from workflow_base where id = ?";
+						rs.executeQuery(query, ufContractInfoDTO.getWorkflowType());
+						rs.next();
+						docCategorys = Util.null2String(rs.getString(1));
+					}
+					if (StringUtils.isNullOrEmpty(docCategorys)) {
+						docCategorys = ",,1";
+					}
+					//		            String[] docSplit = docCategorys.split(",");
+					//		            String category = docSplit[docSplit.length - 1];
+					//		            下载合同到文件服务器中
+					String docIds = "";
+					try {
+						docIds = downloadContract2FileSystem(ufContractInfoDTO, docCategorys, user);
+					} catch (Exception e) {
+						toolUtil.writeErrorLog("创建文档发生错误：" + e);
+					}
+					toolUtil.writeDebuggerLog("生成的文档的id：" + docIds);
+					//		             将id保存到流程字段中
+					PrepSqlResultImpl sqlResult =
+							Util.createSqlBuilder()
+									.updateSql(
+											ufContractInfoDTO.getWorkflowMainTable(),
+											ParaMap.create().put(faDaDaConfigDTO.getContractDoc(), docIds),
+											Util.createPrepWhereImpl()
+													.whereAnd("id")
+													.whereEqual(ufContractInfoDTO.getMainId()));
+					toolUtil.writeDebuggerLog(sqlResult.getSqlStr() + "，参数：" + sqlResult.getArgs());
+					rs.executeUpdate(sqlResult.getSqlStr(), sqlResult.getArgs());
+				}
+			}
+		}
+		
+		//		更新状态
+		PrepSqlResultImpl sqlResult =
+				Util.createSqlBuilder()
+						.updateSql(
+								"uf_contract_info",
+								update,
+								Util.createPrepWhereImpl().whereAnd("id").whereEqual(ufContractInfoDTO.getId()));
+		RecordSet rs = new RecordSet();
+		toolUtil.writeDebuggerLog(
+				String.format(
+						"合同签署回调，更新合同状态，更新语句{%s},更新参数{%s}", sqlResult.getSqlStr(), sqlResult.getArgs()));
+		rs.executeUpdate(sqlResult.getSqlStr(), sqlResult.getArgs());
+		//		查询合同状态，更新明细表
+    /*	Map<String,Object> data = new HashMap<>();
+    		data.put("contractNo","6a265befb3944d93a7a8b32b8d5ca33d");
+    		Map<String, Object> faResult = null;
+    		try {
+    			faResult = FaDDRequestUtils.queryDetailContractStatus(data);
+    			String code = Util.null2String(faResult.get("code"));
+    			if(!"200".equals(code)){
+    				throw new RuntimeException("查询合同失败，失败原因：" + faResult);
+    			}
+    			Map<String,Object> resultData = (Map<String, Object>) faResult.get("data");
+    			List<Map<String, Object>> contractSignerList = (List<Map<String, Object>>) resultData.get("contractSignerList");
+    			for (Map<String, Object> signer : contractSignerList) {
+    				if("-1".equals(signer.get("isSender"))){
+    					continue;
+    				}
+    				String customerId = Util.null2String(signer.get("customerId"));
+    				String signStatus = Util.null2String(signer.get("signStatus"));
+    				if(!"1".equals(signStatus)){
+    					continue;
+    				}
+    //				更新数据库
+    				update.clear();
+    				update.put("signed_status",2);
+    //				查询明细表id
+    			}
+    		} catch (JsonProcessingException e) {
+    			e.printStackTrace();
+    			toolUtil.writeErrorLog("查询合同失败，失败原因：" + e);
+    		}*/
+	}
+	
+	
+	public void signedCallBackError(Map<String, Object> params) {
+		String contractNo = String.valueOf(params.get("docNo"));
+		UfContractInfoDTO ufContractInfoDTO = faDDContractMapping.queryContractInfo(contractNo);
+		toolUtil.writeDebuggerLog("回调，获取到合同信息参数：" + JSON.toJSONString(ufContractInfoDTO));
+		String backWritField = Util.getCusConfigValue(ufContractInfoDTO.getWorkflowMainTable());
+		if (StringUtils.isNullOrEmpty(backWritField)) {
+			return;
+		}
+		String formatJson = JSONObject.toJSONString(params, SerializerFeature.PrettyFormat, SerializerFeature.WriteDateUseDateFormat);
+		boolean flag = faDDContractMapping.updateBackInfo(ufContractInfoDTO.getWorkflowMainTable(),
+				ufContractInfoDTO.getWorkflowRequestId(), backWritField, formatJson);
+		if (!flag) {
+			toolUtil.writeDebuggerLog("回调信息回写表单失败！" + params);
+		}
+	}
+	
+	public void resigned(Map<String, Object> params) {
+		String contractNo = String.valueOf(params.get("docNo"));
+		String requestId = String.valueOf(params.get("requestId"));
+		UfContractInfoDTO ufContractInfoDTO = faDDContractMapping.queryContractInfo(contractNo);
+		
+		toolUtil.writeDebuggerLog("重新签署，获取到合同信息参数：" + JSON.toJSONString(ufContractInfoDTO));
+		String query =
+				"select * from "
+						+ ufContractInfoDTO.getWorkflowDetailTable()
+						+ " where mainid = ? and signed_status is not null";
+		RecordSet rs = new RecordSet();
+		rs.executeQuery(query, ufContractInfoDTO.getMainId());
+		List<Map<String, Object>> detailMaps = Util.recordSet2MapList(rs);
+		toolUtil.writeDebuggerLog("查询到明细数据：" + JSON.toJSONString(detailMaps));
+		query = "select * from " + ufContractInfoDTO.getWorkflowMainTable() + " where requestid = ?";
+		RecordSet rs1 = new RecordSet();
+		rs1.executeQuery(query, ufContractInfoDTO.getWorkflowRequestId());
+		Map<String, Object> mainMap = Util.recordSet2Map(rs1);
+		if (mainMap == null) {
+			toolUtil.writeErrorLog("mainMap 查询到null -------> " + JSON.toJSONString(ufContractInfoDTO));
+			throw new RuntimeException("mainMap查询到null!");
+		}
+		//		        获取配置表信息
+		FaDaDaConfigDTO faDaDaConfigDTO =
+				faDDContractMapping.queryConfig(String.valueOf(ufContractInfoDTO.getWorkflowType()), 3);
+		//              查询接口配置树形结构
+		ApiConfigMainDTO apiConfigMainDTO = Util.queryApiConfigTree(faDaDaConfigDTO.getParamsConfig());
+		//		查询签署数据
+		List<Map<String, Object>> dataArr =
+				getDataArr(
+						ufContractInfoDTO.getWorkflowRequestId(),
+						String.valueOf(ufContractInfoDTO.getWorkflowType()),
+						ufContractInfoDTO.getWorkflowMainTable(),
+						ufContractInfoDTO.getWorkflowDetailTable(),
+						detailMaps);
+		//				处理数据
+		List<Map<String, Object>> maps = objectAndListHandle(apiConfigMainDTO.getDetails(), dataArr);
+		if (maps == null) {
+			toolUtil.writeDebuggerLog("service签署合同错误，错误原因：maps为null!");
+			throw new RuntimeException("service签署合同错误，错误原因：maps为null！");
+		}
+		if (maps.size() == 0) {
+			return;
+		}
+		Map<String, Object> updateData = new HashMap<>();
+		Map<String, Object> map = maps.get(maps.size() - 1);
+		//		如果进行控制签署规则
+		if (faDaDaConfigDTO.getSignedType() == 1) {
+			if (Integer.parseInt(Util.null2String(mainMap.get(faDaDaConfigDTO.getFieldControl1())))
+					    == faDaDaConfigDTO.getOnlyOther()) {
+				//				仅对方签署
+				if (maps.size() == 1) {
+					//					map.put("signType", 1);
+					//					如果是最后一个人了，就直接归档
+					map.put("autoArchive", 1);
+				}
+			}
+		}
+    /*		if (faDaDaConfigDTO.getSignedType() == 1) {
+    //			需要控制签署规则
+    			if (Integer.parseInt(Util.null2String(mainMap.get(faDaDaConfigDTO.getFieldControl1()))) == faDaDaConfigDTO.getOnlyOther()) {
+    //				只需要对方签署
+    				map.put("autoArchive", 1);
+    			}
+    //			双方签署
+    		}*/
+		//		签署下一次
+		toolUtil.writeDebuggerLog("下一个供应商签署合同，签署数据：" + JSON.toJSONString(map));
+		List<Map<String, Object>> resultList = signedRequest(map, apiConfigMainDTO);
+		List<String> signedList = new ArrayList<>();
+		//            遍历将数据保存到合同信息表中
+		for (Map<String, Object> result : resultList) {
+			signedList.add(String.valueOf(result.get("signerUrl")));
+		}
+		//			将合同签署地址保存到建模信息中
+		updateData.put("contract_signed_url", String.join(" ; ", signedList));
+		//			    将合同签署信息更新到合同信息表中
+		updateData.put("single_signed_num", 0);
+		PrepSqlResultImpl sqlResult =
+				Util.createSqlBuilder()
+						.updateSql(
+								contractInfoTable,
+								updateData,
+								Util.createPrepWhereImpl()
+										.whereAnd("workflow_request_id")
+										.whereEqual(ufContractInfoDTO.getWorkflowRequestId()));
+		rs.executeUpdate(sqlResult.getSqlStr(), sqlResult.getArgs());
+		updateData.clear();
+		//			    更新明细表合同信息  明细表添加字段，signed_status（合同方签署状态）
+		//			    签署状态，1 已发送待签署，2 已签蜀
+		updateData.put("signed_status", 1);
+		sqlResult =
+				Util.createSqlBuilder()
+						.updateSql(
+								ufContractInfoDTO.getWorkflowDetailTable(),
+								updateData,
+								Util.createPrepWhereImpl()
+										.whereAnd("id")
+										.whereEqual(String.valueOf(map.get("id"))));
+		rs.executeUpdate(sqlResult.getSqlStr(), sqlResult.getArgs());
+	}
+	
+	/**
+	 * 查询下一个合同方并发起合同签署
+	 *
+	 * @param ufContractInfoDTO
+	 */
+	private void nextContractSigned(UfContractInfoDTO ufContractInfoDTO) {
+		String query =
+				"select * from "
+						+ ufContractInfoDTO.getWorkflowDetailTable()
+						+ " where mainid = ? and signed_status is null";
+		RecordSet rs = new RecordSet();
+		rs.executeQuery(query, ufContractInfoDTO.getMainId());
+		List<Map<String, Object>> detailMaps = Util.recordSet2MapList(rs);
+		toolUtil.writeDebuggerLog("查询到明细数据：" + JSON.toJSONString(detailMaps));
+		query = "select * from " + ufContractInfoDTO.getWorkflowMainTable() + " where requestid = ?";
+		RecordSet rs1 = new RecordSet();
+		rs1.executeQuery(query, ufContractInfoDTO.getWorkflowRequestId());
+		Map<String, Object> mainMap = Util.recordSet2Map(rs1);
+		if (mainMap == null) {
+			toolUtil.writeErrorLog("mainMap 查询到null -------> " + JSON.toJSONString(ufContractInfoDTO));
+			throw new RuntimeException("mainMap查询到null!");
+		}
+		//		        获取配置表信息
+		FaDaDaConfigDTO faDaDaConfigDTO =
+				faDDContractMapping.queryConfig(String.valueOf(ufContractInfoDTO.getWorkflowType()), 3);
+		//              查询接口配置树形结构
+		ApiConfigMainDTO apiConfigMainDTO = Util.queryApiConfigTree(faDaDaConfigDTO.getParamsConfig());
+		//		查询签署数据
+		List<Map<String, Object>> dataArr =
+				getDataArr(
+						ufContractInfoDTO.getWorkflowRequestId(),
+						String.valueOf(ufContractInfoDTO.getWorkflowType()),
+						ufContractInfoDTO.getWorkflowMainTable(),
+						ufContractInfoDTO.getWorkflowDetailTable(),
+						detailMaps);
+		//				处理数据
+		List<Map<String, Object>> maps = objectAndListHandle(apiConfigMainDTO.getDetails(), dataArr);
+		if (maps == null) {
+			toolUtil.writeDebuggerLog("service签署合同错误，错误原因：maps为null!");
+			throw new RuntimeException("service签署合同错误，错误原因：maps为null！");
+		}
+		if (maps.size() == 0 || maps.size() <= 1) {
+			return;
+		}
+		Map<String, Object> updateData = new HashMap<>();
+		Map<String, Object> map = maps.get(1);
+		//		如果进行控制签署规则
+		if (faDaDaConfigDTO.getSignedType() == 1) {
+			if (Integer.parseInt(Util.null2String(mainMap.get(faDaDaConfigDTO.getFieldControl1())))
+					    == faDaDaConfigDTO.getOnlyOther()) {
+				//				仅对方签署
+				if (maps.size() == 1) {
+					//					map.put("signType", 1);
+					//					如果是最后一个人了，就直接归档
+					map.put("autoArchive", 1);
+				}
+			}
+		}
+    /*		if (faDaDaConfigDTO.getSignedType() == 1) {
+    //			需要控制签署规则
+    			if (Integer.parseInt(Util.null2String(mainMap.get(faDaDaConfigDTO.getFieldControl1()))) == faDaDaConfigDTO.getOnlyOther()) {
+    //				只需要对方签署
+    				map.put("autoArchive", 1);
+    			}
+    //			双方签署
+    		}*/
+		//		签署下一次
+		toolUtil.writeDebuggerLog("下一个供应商签署合同，签署数据：" + JSON.toJSONString(map));
+		List<Map<String, Object>> resultList = signedRequest(map, apiConfigMainDTO);
+		List<String> signedList = new ArrayList<>();
+		//            遍历将数据保存到合同信息表中
+		for (Map<String, Object> result : resultList) {
+			signedList.add(String.valueOf(result.get("signerUrl")));
+		}
+		//			将合同签署地址保存到建模信息中
+		updateData.put("contract_signed_url", String.join(" ; ", signedList));
+		//			    将合同签署信息更新到合同信息表中
+		updateData.put("single_signed_num", 0);
+		PrepSqlResultImpl sqlResult =
+				Util.createSqlBuilder()
+						.updateSql(
+								contractInfoTable,
+								updateData,
+								Util.createPrepWhereImpl()
+										.whereAnd("workflow_request_id")
+										.whereEqual(ufContractInfoDTO.getWorkflowRequestId()));
+		rs.executeUpdate(sqlResult.getSqlStr(), sqlResult.getArgs());
+		updateData.clear();
+		//			    更新明细表合同信息  明细表添加字段，signed_status（合同方签署状态）
+		//			    签署状态，1 已发送待签署，2 已签蜀
+		updateData.put("signed_status", 1);
+		sqlResult =
+				Util.createSqlBuilder()
+						.updateSql(
+								ufContractInfoDTO.getWorkflowDetailTable(),
+								updateData,
+								Util.createPrepWhereImpl()
+										.whereAnd("id")
+										.whereEqual(String.valueOf(map.get("id"))));
+		rs.executeUpdate(sqlResult.getSqlStr(), sqlResult.getArgs());
+	}
+	
+	/**
+	 * 合同签署发送请求
+	 *
+	 * @param map
+	 * @param apiConfigMainDTO
+	 */
+	private List<Map<String, Object>> signedRequest(Map<String, Object> map, ApiConfigMainDTO apiConfigMainDTO) {
+		String contractNos = Util.null2String(map.get("contractNo"));
+		String[] split = contractNos.split(",");
+		List<Map<String, Object>> resultList = new ArrayList<>();
+		//		RecordSet rs = new RecordSet();
+		for (String s : split) {
+			map.put("contractNo", s);
+			ResponeVo responeVo = FaDDRequestUtils.signedContract(map, apiConfigMainDTO.getApiUrl());
+			Map<String, Object> response = null;
+			try {
+				response = responeVo.getEntityMap();
+			} catch (JsonProcessingException e) {
+				e.printStackTrace();
+			}
+			if (!"200".equals(response.get("code"))) {
+				toolUtil.writeDebuggerLog("法大大接口签署合同失败！");
+				throw new RuntimeException("法大大接口签署合同失败!");
+			}
+			resultList.add((Map<String, Object>) response.get("data"));
+		}
+		return resultList;
+	}
+	
+	/**
+	 * 查询合同的状态信息
+	 *
+	 * @param requestId
+	 * @return
+	 */
+	public Map<String, Object> querySignedStatus(String requestId) {
+		//		查询合同状态
+		String query = "select * from " + contractInfoTable + " where workflow_request_id = ?";
+		RecordSet rs = new RecordSet();
+		rs.executeQuery(query, requestId);
+		Map<String, Object> result = Util.recordSet2Map(rs);
+		boolean isAllSinged = false;
+		boolean isSingedOneself = false;
+		if (result == null) {
+			toolUtil.writeDebuggerLog("查询到状态为null；sql：" + query + " ---> " + requestId);
+			return ParaMap.create().put("isAllSinged", false).put("isSingedOneself", false);
+		}
+		//        this.toolUtil.writeDebuggerLog(result.toString());
+		//		等待对方签署
+    /*		if("2".equals(result.get("contract_status"))){
+    	isAllSinged = false;
+    }*/
+		//		等待我方签署
+		if ("3".equals(Util.null2String(result.get("contract_status")))) {
+			isAllSinged = true;
+		}
+		//		签署完毕
+		if ("4".equals(Util.null2String(result.get("contract_status")))) {
+			isAllSinged = true;
+			isSingedOneself = true;
+		}
+		return ParaMap.create().put("isAllSinged", isAllSinged).put("isSingedOneself", isSingedOneself);
+	}
+	
+	public void signedContractOwn(String requestId, User user) {
+		//		查询合同信息
+		UfContractInfoDTO ufContractInfoDTO =
+				faDDContractMapping.queryContractInfoByRequestId(requestId);
+		//		        获取配置表信息
+		FaDaDaConfigDTO faDaDaConfigDTO =
+				faDDContractMapping.queryConfig(String.valueOf(ufContractInfoDTO.getWorkflowType()), 4);
+		//              查询接口配置树形结构
+		ApiConfigMainDTO apiConfigMainDTO = Util.queryApiConfigTree(faDaDaConfigDTO.getParamsConfig());
+		//		查询签署数据
+		List<Map<String, Object>> dataArr =
+				getDataArr(
+						ufContractInfoDTO.getWorkflowRequestId(),
+						String.valueOf(ufContractInfoDTO.getWorkflowType()),
+						ufContractInfoDTO.getWorkflowMainTable(),
+						ufContractInfoDTO.getWorkflowDetailTable());
+		//				处理数据
+		List<Map<String, Object>> maps = objectAndListHandle(apiConfigMainDTO.getDetails(), dataArr);
+		if (maps == null) {
+			toolUtil.writeErrorLog("service签署合同错误，错误原因：maps为null!");
+			throw new RuntimeException("service签署合同错误，错误原因：maps为null！");
+		}
+		if (maps.size() == 0) {
+			return;
+		}
+		Map<String, Object> data = maps.get(0);
+		String contractNos = String.valueOf(data.get("contractNo"));
+		String[] split = contractNos.split(",");
+		List<String> downloadUrlList = new ArrayList<>();
+		List<String> viewUrlList = new ArrayList<>();
+		for (String s : split) {
+			data.put("contractNo", s);
+			ResponeVo responeVo = FaDDRequestUtils.signedContract(data, apiConfigMainDTO.getApiUrl());
+			Map<String, Object> response = null;
+			try {
+				response = responeVo.getEntityMap();
+			} catch (JsonProcessingException e) {
+				e.printStackTrace();
+			}
+			if (!"200".equals(response.get("code"))) {
+				this.toolUtil.writeErrorLog("签署参数：" + responeVo.getEntityString());
+				throw new RuntimeException("本方签署失败！法大大请求接口错误！");
+			} else {
+				Map<String, Object> result = (Map<String, Object>) response.get("data");
+				downloadUrlList.add(Util.null2String(result.get("downloadUrl")));
+				viewUrlList.add(Util.null2String(result.get("viewUrl")));
+			}
+		}
+		//		更新合同状态
+		RecordSet rs = new RecordSet();
+		Map<String, Object> update = new HashMap<>();
+		update.put("contract_status", 4);
+		update.put("contract_view_url", String.join(";", viewUrlList));
+		update.put("contract_down_url", String.join(";", downloadUrlList));
+		PrepSqlResultImpl sqlResult =
+				Util.createSqlBuilder()
+						.updateSql(
+								contractInfoTable,
+								update,
+								Util.createPrepWhereImpl().whereAnd("workflow_request_id").whereEqual(requestId));
+		toolUtil.writeDebuggerLog(sqlResult.getSqlStr() + "，参数：" + sqlResult.getArgs());
+		rs.executeUpdate(sqlResult.getSqlStr(), sqlResult.getArgs());
+		//		获取流程中的合同字段的文档目录id
+		rs.executeQuery(
+				"select formid from workflow_base where id = ?", ufContractInfoDTO.getWorkflowType());
+		String formId = Util.recordeSet2Entity(rs, String.class);
+		String query =
+				"select doccategory from workflow_fileupload where fieldid = (select id from workflow_billfield where fieldname = ? and billid = ?)";
+		rs.executeQuery(query, faDaDaConfigDTO.getContractDoc(), formId);
+		String docCategorys = Util.null2String(Util.recordeSet2Entity(rs, String.class));
+		if (StringUtils.isNullOrEmpty(docCategorys)) {
+			query = "select doccategory from workflow_base where id = ?";
+			rs.executeQuery(query, ufContractInfoDTO.getWorkflowType());
+			rs.next();
+			docCategorys = Util.null2String(rs.getString(1));
+		}
+		if (StringUtils.isNullOrEmpty(docCategorys)) {
+			docCategorys = ",,1";
+		}
+		//		String[] docSplit = docCategorys.split(",");
+		//		String category = docSplit[docSplit.length - 1];
+		//		下载合同到文件服务器中
+		String docIds = "";
+		try {
+			docIds = downloadContract2FileSystem(ufContractInfoDTO, docCategorys, user);
+		} catch (Exception e) {
+			toolUtil.writeErrorLog("创建文档发生错误：" + e);
+		}
+		toolUtil.writeDebuggerLog("生成的文档的id：" + docIds);
+		//		将id保存到流程字段中
+		sqlResult =
+				Util.createSqlBuilder()
+						.updateSql(
+								ufContractInfoDTO.getWorkflowMainTable(),
+								ParaMap.create().put(faDaDaConfigDTO.getContractDoc(), docIds),
+								Util.createPrepWhereImpl()
+										.whereAnd("id")
+										.whereEqual(ufContractInfoDTO.getMainId()));
+		toolUtil.writeDebuggerLog(sqlResult.getSqlStr() + "，参数：" + sqlResult.getArgs());
+		rs.executeUpdate(sqlResult.getSqlStr(), sqlResult.getArgs());
+	}
+	
+	public String downloadContract2FileSystem(
+			UfContractInfoDTO ufContractInfoDTO, String category, User user) {
+
+    /*	ImageFileManager fileManager = new ImageFileManager();
+    int fileId = fileManager.saveImageFileByInputStream(downloadContract(ufContractInfoDTO.getContractNo(),
+    		String.valueOf(ufContractInfoDTO.getWorkflowType())), ufContractInfoDTO.getFileName());*/
+		//		 获取配置表信息
+		FaDaDaConfigDTO faDaDaConfigDTO =
+				faDDContractMapping.queryConfig(String.valueOf(ufContractInfoDTO.getWorkflowType()), 5);
+		ApiConfigMainDTO apiConfigMainDTO = Util.queryApiConfig(faDaDaConfigDTO.getParamsConfig());
+		String contractNos = Util.null2String(ufContractInfoDTO.getContractNo());
+		String[] split = contractNos.split(",");
+		List<String> docIds = new ArrayList<>();
+		for (String contractNo : split) {
+			//			InputStream inputStream = downloadContract(s,
+			// String.valueOf(ufContractInfoDTO.getWorkflowType()));
+			Map<String, Object> data = new HashMap<>();
+			data.put("contractNo", contractNo);
+			AtomicReference<InputStream> content = new AtomicReference<>();
+			FaDDRequestUtils.downContract(
+					data,
+					response -> {
+						HttpEntity entity = response.getEntity();
+						if (response.getStatusLine().getStatusCode() != 200) {
+							throw new RuntimeException("法大大请求接口错误！");
+						}
+						try {
+							content.set(entity.getContent());
+						} catch (IOException e) {
+							e.printStackTrace();
+						}
+						byte[] byteArray = null;
+						try {
+							byteArray = IOUtils.toByteArray(content.get());
+						} catch (IOException e) {
+							e.printStackTrace();
+							toolUtil.writeErrorLog("文件流处理错误，将inputStream转换为byte数组出错：" + e);
+						}
+						this.toolUtil.writeErrorLog(ufContractInfoDTO.toString());
+						String base64 = Base64Utils.encode(byteArray);
+						FileProcessor fileProcessor = new FileProcessor();
+						//				toolUtil.writeDebuggerLog("base64：" + "base64:" + base64);
+						toolUtil.writeDebuggerLog("category：" + category);
+						//				toolUtil.writeDebuggerLog("user：" + JSON.toJSONString(user));
+						toolUtil.writeDebuggerLog("fileName：" + ufContractInfoDTO.getFileName());
+						docIds.add(
+								String.valueOf(
+										fileProcessor.Process(
+												"base64:" + base64, category, user, ufContractInfoDTO.getFileName())));
+					},
+					apiConfigMainDTO.getApiUrl());
+		}
+		return String.join(",", docIds);
+	}
+	
+	public InputStream downloadContract(String contractNo, String workflowId) {
+		//		 获取配置表信息
+		FaDaDaConfigDTO faDaDaConfigDTO = faDDContractMapping.queryConfig(workflowId, 5);
+		ApiConfigMainDTO apiConfigMainDTO = Util.queryApiConfig(faDaDaConfigDTO.getParamsConfig());
+		Map<String, Object> data = new HashMap<>();
+		data.put("contractNo", contractNo);
+		AtomicReference<InputStream> content = new AtomicReference<>();
+		FaDDRequestUtils.downContract(
+				data,
+				response -> {
+					HttpEntity entity = response.getEntity();
+					if (response.getStatusLine().getStatusCode() != 200) {
+						throw new RuntimeException("法大大请求接口错误！");
+					}
+					try {
+						content.set(entity.getContent());
+					} catch (IOException e) {
+						e.printStackTrace();
+					}
+				},
+				apiConfigMainDTO.getApiUrl());
+		return content.get();
+	}
+	
+	/**
+	 * 直接从法大大系统下载文件
+	 *
+	 * @param ufContractInfoDTO 合同相关信息
+	 * @return
+	 */
+	public StreamingOutput download4mFDD(UfContractInfoDTO ufContractInfoDTO) {
+		//		 获取配置表信息
+		FaDaDaConfigDTO faDaDaConfigDTO =
+				faDDContractMapping.queryConfig(String.valueOf(ufContractInfoDTO.getWorkflowType()), 5);
+		ApiConfigMainDTO apiConfigMainDTO = Util.queryApiConfig(faDaDaConfigDTO.getParamsConfig());
+		//		查询合同信息
+		//		UfContractInfoDTO ufContractInfoDTO =
+		// faDDContractMapping.queryContractInfoByRequestId(requestId);
+		String contractNos = Util.null2String(ufContractInfoDTO.getContractNo());
+		String fileNames = Util.null2String(ufContractInfoDTO.getFileName());
+		String[] contractNoArr = contractNos.split(",");
+		String[] fileNameArr = fileNames.split(",");
+		toolUtil.writeDebuggerLog("下载合同download4mFDD！");
+		if (contractNoArr.length >= 2) {
+			//			多个文件，需要下载压缩包
+			return outputStream -> {
+				ZipOutputStream zipOut = new ZipOutputStream(outputStream);
+				int catchLen = 10 * 1024;
+				for (int i = 0; i < contractNoArr.length; i++) {
+					//					InputStream inputStream = downloadContract(contractNoArr[i],
+					// String.valueOf(ufContractInfoDTO.getWorkflowType()));
+					Map<String, Object> data = new HashMap<>();
+					data.put("contractNo", contractNoArr[i]);
+					AtomicReference<InputStream> content = new AtomicReference<>();
+					int finalI = i;
+					FaDDRequestUtils.downContract(
+							data,
+							response -> {
+								HttpEntity entity = response.getEntity();
+								if (response.getStatusLine().getStatusCode() != 200) {
+									throw new RuntimeException("法大大请求接口错误！");
+								}
+								try {
+									content.set(entity.getContent());
+									zipOut.putNextEntry(new ZipEntry(fileNameArr[finalI]));
+									byte[] buffer = new byte[catchLen];
+									int len = 0;
+									while ((len = content.get().read(buffer)) != -1) {
+										zipOut.write(buffer, 0, len);
+									}
+									content.get().close();
+									zipOut.closeEntry();
+								} catch (IOException e) {
+									e.printStackTrace();
+									toolUtil.writeErrorLog("文件压缩处理出现问题！" + e);
+								}
+							},
+							apiConfigMainDTO.getApiUrl());
+				}
+				zipOut.flush();
+				zipOut.close();
+				outputStream.flush();
+				outputStream.close();
+			};
+		}
+		return outputStream -> {
+			toolUtil.writeDebuggerLog("download4mFDD单文件下载！");
+			//			InputStream inputStream =
+			// downloadContract(contractNos,String.valueOf(ufContractInfoDTO.getWorkflowType()));
+			Map<String, Object> data = new HashMap<>();
+			data.put("contractNo", contractNos);
+			AtomicReference<InputStream> content = new AtomicReference<>();
+			FaDDRequestUtils.downContract(
+					data,
+					response -> {
+						HttpEntity entity = response.getEntity();
+						if (response.getStatusLine().getStatusCode() != 200) {
+							throw new RuntimeException("法大大请求接口错误！");
+						}
+						try {
+							content.set(entity.getContent());
+							int catchLen = 10 * 1024;
+							byte[] buffer = new byte[catchLen];
+							int len = 0;
+							while ((len = content.get().read(buffer)) != -1) {
+								outputStream.write(buffer, 0, len);
+							}
+							content.get().close();
+							outputStream.flush();
+							outputStream.close();
+						} catch (IOException e) {
+							e.printStackTrace();
+							toolUtil.writeErrorLog("单文件下载处理出现问题！" + e);
+						}
+					},
+					apiConfigMainDTO.getApiUrl());
+		};
+	}
+	
+	public void pushAPush(String requestId) {
+		UfContractInfoDTO ufContractInfoDTO = faDDContractMapping.queryContractInfoByRequestId(requestId);
+		String signedUrls = Util.null2String(ufContractInfoDTO.getContractSignedUrl());
+		PushAPushEmailEntity pushAPushEmailEntity = queryEmailInfo(ufContractInfoDTO.getWorkflowType(),
+				ufContractInfoDTO.getWorkflowRequestId());
+		String content = pushAPushEmailEntity.getEmailContent().replaceAll("#\\{info.signedUrls}", signedUrls);
+		try {
+			EmailWorkRunnable.threadModeReminder(pushAPushEmailEntity.getEmailAddress(), "", "",
+					pushAPushEmailEntity.getEmailTitle(),
+					content);
+		} catch (Exception e) {
+			toolUtil.writeDebuggerLog(e.toString());
+		}
+	}
+	
+	private PushAPushEmailEntity queryEmailInfo(int workflowType, String requestId) {
+		PushAPushEmailEntity pushAPushEmailEntity = faDDContractMapping.queryEmailInfo(workflowType);
+		Map<String, Object> workflowData = getWorkflowData(String.valueOf(workflowType), requestId);
+		String parsingTitle = parsingValue(pushAPushEmailEntity.getEmailTitle(), workflowData);
+		pushAPushEmailEntity.setEmailTitle(parsingTitle);
+		String parsingEmail = parsingValue(pushAPushEmailEntity.getEmailAddress(), workflowData);
+		pushAPushEmailEntity.setEmailAddress(parsingEmail);
+		try {
+			String parsingContent = parsingValue(pushAPushEmailEntity.getEmailContent(), workflowData);
+			pushAPushEmailEntity.setEmailContent(parsingContent);
+		} catch (Exception e) {
+			toolUtil.writeDebuggerLog("解析出错：" + e);
+		}
+		return pushAPushEmailEntity;
+	}
+	
+	public String parsingValue(String str, Map<String, Object> workflowData) {
+		String regEx = "\\$\\{(?<key>\\S+?)}";
+		Pattern compile = Pattern.compile(regEx);
+		Matcher matcher = compile.matcher(str);
+		String parsingValue = str;
+		parsingValue = parsingValue.replaceAll("\\$\\{sys\\.data}", Util.getTime("yyyy-MM-dd"));
+		parsingValue = parsingValue.replaceAll("\\$\\{sys\\.time}", Util.getTime("HH:mm:ss"));
+		parsingValue = parsingValue.replaceAll("\\$\\{sys\\.dataTime}", Util.getTime("yyyy-MM-dd HH:mm:ss"));
+		while (matcher.find()) {
+			String key = matcher.group("key");
+			String value = Util.null2String(workflowData.get(key));
+			parsingValue = parsingValue.replaceFirst(regEx, value);
+		}
+		regEx = "#sql\\{\\{(?<key>(\\S\\s)+?)}}";
+		compile = Pattern.compile(regEx);
+		matcher = compile.matcher(str);
+		while (matcher.find()) {
+			String key = matcher.group("key");
+			String value = parsingSql(key, workflowData);
+			parsingValue = parsingValue.replaceFirst(regEx, value);
+		}
+		return parsingValue;
+	}
+	
+	private String parsingSql(String str, Map<String, Object> workflowData) {
+		RecordSet rs = new RecordSet();
+		String sqlRegEx = "#\\{(?<key>\\S+?)}";
+		Pattern sqlCompile = Pattern.compile(sqlRegEx);
+		Matcher sqlMatcher = sqlCompile.matcher(str);
+		String parsingSql = str;
+		parsingSql = parsingSql.replaceAll("#\\{sys\\.data}", "'" + Util.getTime("yyyy-MM-dd") + "'");
+		parsingSql = parsingSql.replaceAll("#\\{sys\\.time}", "'" + Util.getTime("HH:mm:ss") + "'");
+		parsingSql = parsingSql.replaceAll("#\\{sys\\.dataTime}", "'" + Util.getTime("yyyy-MM-dd HH:mm:ss") + "'");
+		List<String> args = new ArrayList<>();
+		while (sqlMatcher.find()) {
+			String key = sqlMatcher.group("key");
+			String value = Util.null2String(workflowData.get(key));
+			parsingSql = parsingSql.replaceFirst(sqlRegEx, "?");
+			args.add(value);
+		}
+		String value = "";
+		if (str.toLowerCase().trim().startsWith("select")) {
+			rs.executeQuery(parsingSql, args);
+			if (rs.next()) {
+				value = rs.getString(1);
+			}
+		}
+		return value;
+	}
+	
+	public Map<String, Object> getWorkflowData(String workflowId, String requestId) {
+		String queryMainTable = "select base.id,base.workflowname,base.formid,bill.tablename " +
+				                        "from workflow_bill bill join workflow_base base on base.formid = bill.id " +
+				                        "where base.id = ?";
+		RecordSet rs = new RecordSet();
+		rs.executeQuery(queryMainTable, workflowId);
+		String mainTable = "";
+		if (rs.next()) {
+			mainTable = rs.getString("tablename");
+		} else {
+			toolUtil.writeDebuggerLog("表查询到数据为null，" + mainTable + "---》" + queryMainTable);
+		}
+		String queryDetailTable = "select bill.id bill_id, base.workflowname,base.formid " +
+				                          "main_formid,bill.tablename,bill.orderid from workflow_billdetailtable bill " +
+				                          "join workflow_base base on base.formid = bill.billid where base.id = ?";
+		rs.executeQuery(queryDetailTable, workflowId);
+		List<Map<String, String>> detailTableList = new ArrayList<>();
+		while (rs.next()) {
+			Map<String, String> map = new HashMap<>();
+			map.put("tableName", rs.getString("tablename"));
+			map.put("tableOrderId", rs.getString("orderid"));
+			detailTableList.add(map);
+		}
+		//        查询主表数据
+		String queryMainData = "select * from " + mainTable + " where requestid = ?";
+		rs.executeQuery(queryMainData, requestId);
+		Map<String, Object> mainData = Util.recordSet2Map(rs);
+		if (mainData == null) {
+			toolUtil.writeDebuggerLog("查询到数据为null，" + mainData + "---》" + queryMainData);
+			return null;
+		}
+		//        查询明细表数据
+		for (Map<String, String> detailTable : detailTableList) {
+			String queryDetailData = "select * from " + detailTable.get("tableName") + " where mainid = ?";
+			rs.executeQuery(queryDetailData, String.valueOf(mainData.get("id")));
+			Map<String, Object> detailData = Util.recordSet2Map(rs);
+			if (detailData == null) {
+				continue;
+			}
+			for (Map.Entry<String, Object> entry : detailData.entrySet()) {
+				mainData.put("detail_" + detailTable.get("tableOrderId") + "." + entry.getKey(), entry.getValue());
+			}
+		}
+		mainData.put("requestId", requestId);
+		mainData.put("workflowId", workflowId);
+		return mainData;
+	}
+	
+	
+}
+
+
+
diff --git a/src/main/youhong_ai_old_src/com/api/aiyh_pcn/fadada/service/impl/FaDDServiceImpl.java b/src/main/youhong_ai_old_src/com/api/aiyh_pcn/fadada/service/impl/FaDDServiceImpl.java
new file mode 100644
index 0000000..b734522
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/aiyh_pcn/fadada/service/impl/FaDDServiceImpl.java
@@ -0,0 +1,588 @@
+package com.api.aiyh_pcn.fadada.service.impl;
+
+import aiyh.utils.Util;
+import aiyh.utils.entity.ApiConfigDetailDTO;
+import aiyh.utils.entity.ApiConfigMainDTO;
+import aiyh.utils.httpUtil.ResponeVo;
+import aiyh.utils.zwl.common.ToolUtil;
+import com.alibaba.fastjson.JSONObject;
+import com.api.aiyh_pcn.fadada.dao.FaDDServiceMapping;
+import com.api.aiyh_pcn.fadada.entity.FaDaDaConfigDTO;
+import com.api.aiyh_pcn.fadada.service.IFaDDService;
+import com.api.aiyh_pcn.fadada.util.FaDDRequestUtils;
+import com.api.aiyh_pcn.fadada.vo.TableFieldMappingVO;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import org.apache.http.Header;
+import org.apache.http.HeaderElement;
+import org.apache.http.HttpEntity;
+import org.apache.http.NameValuePair;
+import weaver.conn.RecordSet;
+import weaver.workflow.workflow.WorkflowVersion;
+
+import javax.ws.rs.core.StreamingOutput;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipOutputStream;
+
+/**
+ * @author EBU7-dev1-ayh
+ * @create 2021/9/30 0030 11:12 core
+ */
+public class FaDDServiceImpl implements IFaDDService {
+    private final FaDDServiceMapping faDDServiceMapping = new FaDDServiceMapping();
+    private final ToolUtil toolUtil = new ToolUtil();
+    // private final String MAIN_TABLE = "formtable_main_17";
+
+    @Override
+    public Map<String, Object> getConfigParam(String workflowId) {
+        FaDaDaConfigDTO faDaDaConfigDTO = faDDServiceMapping.queryConfig(workflowId, 0);
+        ApiConfigMainDTO apiConfigMainDTO = Util.queryApiConfig(faDaDaConfigDTO.getParamsConfig());
+        List<TableFieldMappingVO> tableFieldMappingVOS = new ArrayList<>();
+        List<ApiConfigDetailDTO> details = apiConfigMainDTO.getDetails();
+        for (ApiConfigDetailDTO detail : details) {
+            TableFieldMappingVO tableFieldMappingVO = new TableFieldMappingVO();
+            String tableName = "";
+            String fieldName = "";
+            int id = detail.getId();
+            String table = detail.getTablename();
+            if (!table.contains("_dt")) {
+                // 表示字段属于主表
+                tableName = "main";
+            } else {
+                // 字段属于明细表
+                String dt = table.substring(table.indexOf("_dt") + 3);
+                tableName = "detail_" + dt;
+            }
+            tableFieldMappingVO.setTableName(tableName);
+            tableFieldMappingVO.setId(id);
+            int changeRule = detail.getChangeRule();
+            if (changeRule == 0) {
+                // 不转换，需要获取到流程字段，前端获取流程字段对应的值
+                fieldName = detail.getWorkflowField();
+                tableFieldMappingVO.setField(fieldName);
+                tableFieldMappingVOS.add(tableFieldMappingVO);
+            } else if (changeRule == 2) {
+                // 流程字段值，与不转换一至
+                fieldName = detail.getWorkflowField();
+                tableFieldMappingVO.setField(fieldName);
+                tableFieldMappingVOS.add(tableFieldMappingVO);
+            }
+            if (changeRule == 7 || changeRule == 6) {
+                // 7 自定义SQL，与流程转SQL一样
+                List<TableFieldMappingVO> tableFieldMappingVOList = new ArrayList<>();
+                // 6 流程字段转SQL，需要获取SQL中的字段变量，前端通过字段变量获取值
+                // 解析SQL
+                Map<String, List<String>> result = Util.parsingSq2Map(detail.getParamValue());
+                for (Map.Entry<String, List<String>> entry : result.entrySet()) {
+                    for (String field : entry.getValue()) {
+                        TableFieldMappingVO tf = new TableFieldMappingVO();
+                        tf.setTableName(entry.getKey());
+                        tf.setField(field);
+                        tf.setId(id);
+                        tableFieldMappingVOList.add(tf);
+                    }
+                }
+                tableFieldMappingVOS.addAll(tableFieldMappingVOList);
+            }
+            if (detail.getParamType() == 4) {
+                // 数组类型的，需要解析数组sql
+                List<TableFieldMappingVO> tableFieldMappingVOList = new ArrayList<>();
+                Map<String, List<String>> result = Util.parsingSq2Map(detail.getArraySql());
+                for (Map.Entry<String, List<String>> entry : result.entrySet()) {
+                    for (String field : entry.getValue()) {
+                        TableFieldMappingVO tf = new TableFieldMappingVO();
+                        tf.setTableName(entry.getKey());
+                        tf.setField(field);
+                        tf.setId(id);
+                        tableFieldMappingVOList.add(tf);
+                    }
+                }
+                tableFieldMappingVOS.addAll(tableFieldMappingVOList);
+            }
+        }
+        List<TableFieldMappingVO> doDeWeight =
+            Util.deWeight(tableFieldMappingVOS, e -> e.getTableName() + e.getField());
+        Map<String, Object> map = new HashMap<>();
+        map.put("tableFieldMappings", doDeWeight);
+        String checkSource = faDaDaConfigDTO.getCheckSource();
+        String sourceTable;
+        if (!checkSource.contains("_dt")) {
+            // 表示字段属于主表
+            sourceTable = "main";
+            map.put("isMain", true);
+        } else {
+            // 字段属于明细表
+            String dt = checkSource.substring(checkSource.indexOf("_dt") + 3);
+            sourceTable = "detail_" + dt;
+            map.put("isMain", false);
+        }
+        map.put("sourceTable", sourceTable);
+        return map;
+    }
+
+    @Override
+    public Map<String, Object> checkCertification(Map<String, Object> params) {
+        Map<String, Object> resultMap = new HashMap<>();
+        String workflowId = String.valueOf(params.get("workflowId"));
+        FaDaDaConfigDTO faDaDaConfigDTO = faDDServiceMapping.queryConfig(workflowId, 0);
+        ApiConfigMainDTO apiConfigMainDTO = Util.queryApiConfigTree(faDaDaConfigDTO.getParamsConfig());
+        List<Map<String, Object>> dataArr = (List<Map<String, Object>>)params.get("dataArr");
+        List<ApiConfigDetailDTO> details = apiConfigMainDTO.getDetails();
+        List<Map<String, Object>> datas = objectAndListHandle(details, dataArr);
+        List<Map<String, Object>> errorList = new ArrayList<>();
+        List<Map<String, Object>> nonsupportList = new ArrayList<>();
+        for (Map<String, Object> data : datas) {
+            System.out.println(JSONObject.toJSONString(data));
+            Map<String, Object> result = FaDDRequestUtils.checkCompanyInfo(data);
+            if (result == null) {
+                // 未查询到数据
+                errorList.add(data);
+            } else {
+                if ("1001005".equals(String.valueOf(result.get("code")))
+                    || !"200".equals(String.valueOf(result.get("code")))) {
+                    // 企业信息不存在或者未认证
+                    nonsupportList.add(data);
+                }
+            }
+        }
+        if (errorList.size() == 0 && nonsupportList.size() == 0) {
+            // 所有的都通过
+            resultMap.put("allPass", true);
+        } else {
+            resultMap.put("allPass", false);
+            resultMap.put("errorList", errorList);
+            resultMap.put("nonsupportList", nonsupportList);
+        }
+        return resultMap;
+    }
+
+    private List<Map<String, Object>> objectAndListHandle(List<ApiConfigDetailDTO> treeList,
+        List<Map<String, Object>> dataArr) {
+        List<Map<String, Object>> params = new ArrayList<>();
+        for (Map<String, Object> dataMap : dataArr) {
+            Map<String, Object> param = new HashMap<>();
+            for (ApiConfigDetailDTO apiConfigDetailDTO : treeList) {
+                Object value;
+                if (apiConfigDetailDTO.getParamType() == 3) {
+                    Map<String, Object> map = new HashMap<>();
+                    // object类型
+                    for (ApiConfigDetailDTO child : apiConfigDetailDTO.getChildren()) {
+                        if (child.getChildren() == null || child.getChildren().size() == 0) {
+                            // handleChild(child.getChildren(), dataMap)
+                            map.put(child.getParamName(), changeRuleHandle(child, dataMap));
+                        } else {
+                            map.put(child.getParamName(), handleChild(child.getChildren(), dataMap));
+                        }
+                    }
+                    value = map;
+                } else if (apiConfigDetailDTO.getParamType() == 4) {
+                    String sql = apiConfigDetailDTO.getArraySql();
+                    String parsingSq = Util.parsingSq(sql, dataMap);
+                    // list类型
+                    if (parsingSq.contains("delete") || parsingSq.contains("update") || parsingSq.contains("exec")
+                        || parsingSq.contains("drop") || parsingSq.contains("truncate")) {
+                        value = new ArrayList<>();
+                    } else {
+                        RecordSet rs = new RecordSet();
+                        rs.executeQuery(parsingSq.replace("ｓｅｌｅｃｔ", "select"));
+                        value = Util.recordeSet2Array(rs, String.class);
+                    }
+                } else {
+                    value = changeRuleHandle(apiConfigDetailDTO, dataMap);
+                }
+                param.put(apiConfigDetailDTO.getParamName(), value);
+            }
+            params.add(param);
+        }
+        return params;
+    }
+
+    private Object handleChild(List<ApiConfigDetailDTO> children, Map<String, Object> dataMap) {
+        Map<String, Object> params = new HashMap<>();
+        for (ApiConfigDetailDTO child : children) {
+            Object value;
+            if (child.getChildren() != null) {
+                value = handleChild(child.getChildren(), dataMap);
+            } else {
+                value = changeRuleHandle(child, dataMap);
+            }
+            params.put(child.getParamName(), value);
+        }
+        return params;
+    }
+
+    private Object changeRuleHandle(ApiConfigDetailDTO apiConfigDetailDTO, Map<String, Object> dataMap) {
+        Object value;
+        String tableName;
+        String table;
+        String sql;
+        String resultSql;
+        // 判断参数的转换规则
+        switch (apiConfigDetailDTO.getChangeRule()) {
+            case 0:
+                // 不转换
+            case 2:
+                // 流程字段值
+                table = apiConfigDetailDTO.getTablename();
+                if (!table.contains("_dt")) {
+                    // 表示字段属于主表
+                    tableName = "main";
+                } else {
+                    // 字段属于明细表
+                    String dt = table.substring(table.indexOf("_dt") + 3);
+                    tableName = "detail_" + dt;
+                }
+                value = dataMap.get(tableName + "." + apiConfigDetailDTO.getWorkflowField());
+                break;
+            case 1:
+                // 固定值
+                value = apiConfigDetailDTO.getParamValue();
+                break;
+            case 3:
+                // 系统日期
+                value = Util.getTime("yyyy-MM-dd");
+                break;
+            case 4:
+                // 系统时间
+                value = Util.getTime("HH:mm:ss");
+                break;
+            case 5:
+                // 系统日期-时间
+                value = Util.getTime("yyyy-MM-dd HH:mm:ss");
+                break;
+            case 6:
+                // 自定义SQL
+            case 7:
+                // 流程字段转SQL
+                sql = apiConfigDetailDTO.getParamValue();
+                resultSql = Util.parsingSq(sql, dataMap);
+                toolUtil.writeErrorLog(dataMap.toString());
+                if (resultSql.contains("delete ") || resultSql.contains("update ") || resultSql.contains("exec ")
+                    || resultSql.contains("drop ") || resultSql.contains("truncate ")) {
+                    value = null;
+                } else {
+                    RecordSet rs = new RecordSet();
+                    rs.executeQuery(resultSql.replace("ｓｅｌｅｃｔ", "select"));
+                    rs.next();
+                    value = Util.null2String(rs.getString(1));
+                    toolUtil.writeErrorLog("转换值：" + value);
+                    toolUtil.writeErrorLog("转换SQL：" + resultSql.replace("ｓｅｌｅｃｔ", "select"));
+                }
+                break;
+            case 8:
+                //
+                // 流程名称
+                value = Util.getWorkflowNameById(String.valueOf(dataMap.get("workflowid")));
+                break;
+            case 9:
+                //
+                // 请求标题
+                value = Util.getRequestTitleById(String.valueOf(dataMap.get("requestid")));
+                break;
+            case 10:
+                //
+                // 流程requestId
+                value = dataMap.get("requestid");
+                break;
+            default:
+                value = null;
+                break;
+        }
+        if (apiConfigDetailDTO.getParamType() == 1) {
+            // Integer
+            value = Integer.parseInt(String.valueOf(value));
+        } else if (apiConfigDetailDTO.getParamType() == 2) {
+            // Boolean
+            value = Boolean.parseBoolean(String.valueOf(value));
+        }
+        return value;
+    }
+
+    public void queryContractStatus(String workflowId, String requestId, int type) {
+        List<Map<String, Object>> maps = faDDServiceMapping.queryDetailInfo(requestId, workflowId, 2);
+        toolUtil.writeErrorLog("maps+:" + maps);
+        List<Map<String, Object>> notSignedContracts = new ArrayList<>();
+        // 查询是是否签署
+        for (Map<String, Object> map : maps) {
+            // 发送请求查询合同信息
+            Map<String, Object> data = new HashMap<>();
+            String contracts = String.valueOf(map.get("contract_no"));
+            if (contracts == null) {
+                contracts = "";
+            }
+            String[] split = contracts.split(",");
+            for (String s : split) {
+                toolUtil.writeErrorLog(s);
+                data.put("contractNo", s);
+                Map<String, Object> result = null;
+                // List<String> statusList = new ArrayList<>();
+                try {
+                    Map<String, Object> response = FaDDRequestUtils.queryContractStatus(data);
+                    if (!"200".equals(response.get("code"))) {
+                        throw new RuntimeException("法大大请求接口错误！");
+                    }
+                    result = (Map<String, Object>)response.get("data");
+                    this.toolUtil.writeErrorLog("催一催：" + result);
+                } catch (RuntimeException e) {
+                    e.printStackTrace();
+                    throw e;
+                } catch (JsonProcessingException e) {
+                    toolUtil.writeDebuggerLog("转换错误：" + e);
+                }
+                if ("1".equals(String.valueOf(result.get("status")))
+                    || "6".equals(String.valueOf(result.get("status")))) {
+                    // 发送请求催一下 签署合同
+                    notSignedContracts.add(map);
+                } else {
+                    // 合同状态发生改变，需要修改数据库中的状态信息 百分百会出问题
+                    map.put("contract_status", result.get("status"));
+                    // statusList.add()
+                    faDDServiceMapping.updateContractStatus(map, workflowId, 3);
+                }
+            }
+        }
+        if (type == 0) {
+            signedContract(workflowId, requestId, notSignedContracts);
+        }
+    }
+
+    public void signedContract(String workflowId, String requestId, List<Map<String, Object>> detailMaps) {
+        String mainTable = faDDServiceMapping.getMainTable(workflowId);
+        RecordSet rs = new RecordSet();
+        String query = "select * from " + mainTable + " where requestid = ?";
+        rs.executeQuery(query, requestId);
+        Map<String, Object> mainMap;
+        mainMap = Util.recordSet2Map(rs);
+        String mainId = "";
+        if (mainMap != null) {
+            mainId = String.valueOf(mainMap.get("id"));
+        } else {
+            toolUtil.writeErrorLog("没有查询到相关的请求id的数据！");
+        }
+        String detailTable1 = faDDServiceMapping.getDetailTable(workflowId, 3);
+        query = "select * from " + detailTable1 + " where mainid = ?";
+        rs.executeQuery(query, mainId);
+        /*List<Map<String,Object>> detailMaps;
+        detailMaps = Util.recordSet2MapList(rs);
+        if (detailMaps == null) {
+        	toolUtil.writeErrorLog("查询明细失败！maps为null");
+        	return;
+        }*/
+        FaDaDaConfigDTO faDaDaConfigDTO = faDDServiceMapping.queryConfig(workflowId, 3);
+        ApiConfigMainDTO apiConfigMainDTO = Util.queryApiConfigTree(faDaDaConfigDTO.getParamsConfig());
+        List<Map<String, Object>> dataArr = new ArrayList<>();
+        String detailTable;
+        String dt = detailTable1.substring(detailTable1.indexOf("_dt") + 3);
+        detailTable = "detail_" + dt;
+        for (Map<String, Object> detailMap : detailMaps) {
+            Map<String, Object> dataMap = new HashMap<>();
+            for (Map.Entry<String, Object> entry : detailMap.entrySet()) {
+                dataMap.put(detailTable + "." + entry.getKey(), entry.getValue());
+            }
+            for (Map.Entry<String, Object> entry : mainMap.entrySet()) {
+                dataMap.put("main" + "." + entry.getKey(), entry.getValue());
+            }
+            dataArr.add(dataMap);
+        }
+        List<Map<String, Object>> maps = objectAndListHandle(apiConfigMainDTO.getDetails(), dataArr);
+        for (Map<String, Object> map : maps) {
+            toolUtil.writeErrorLog(map.toString());
+            String contractNos = Util.null2String(map.get("contractNo"));
+            String[] split = contractNos.split(",");
+            for (String s : split) {
+                map.put("contractNo", s);
+                ResponeVo responeVo = FaDDRequestUtils.signedContract(map, apiConfigMainDTO.getApiUrl());
+                Map<String, Object> response = null;
+                try {
+                    response = responeVo.getEntityMap();
+                } catch (JsonProcessingException e) {
+                    e.printStackTrace();
+                }
+                if (!"200".equals(response.get("code"))) {
+                    throw new RuntimeException("法大大请求接口错误！");
+                }
+            }
+        }
+    }
+
+    public StreamingOutput contractDownload(String requestId, String workflowId) {
+        toolUtil.writeErrorLog("进入service方法！");
+        List<Map<String, Object>> maps = null;
+        // 查询合同信息
+        try {
+            maps = faDDServiceMapping.queryDetailDownInfo(requestId, workflowId, 2);
+        } catch (Exception e) {
+            toolUtil.writeErrorLog(String.valueOf(faDDServiceMapping));
+            toolUtil.writeErrorLog("调用错误" + e);
+        }
+        toolUtil.writeErrorLog(String.valueOf(maps));
+        toolUtil.writeErrorLog(JSONObject.toJSONString(maps));
+        List<Map<String, Object>> finalMaps = maps;
+        String versionStringByWfid = WorkflowVersion.getVersionStringByWfid(workflowId);
+        RecordSet rs = new RecordSet();
+        rs.executeQuery(
+            "select * from uf_contract_config where workflow_type in ( " + versionStringByWfid + " ) and api_type = ?",
+            5);
+        rs.next();
+        ApiConfigMainDTO apiConfigMainDTO = Util.queryApiConfig(rs.getString("params_config"));
+        return outputStream -> {
+            ZipOutputStream zipOut = new ZipOutputStream(outputStream);
+            toolUtil.writeErrorLog("进入方法！");
+            int catchLen = 10 * 1024;
+            String base = "";
+            for (Map<String, Object> map : finalMaps) {
+                base = base + map.get("gyshtfmczw") + "/";
+                // 获取合同id
+                String contractNoStr = String.valueOf(map.get("contract_no"));
+                String contractNameStr = String.valueOf(map.get("file_name"));
+                String[] contractNos = contractNoStr.split(",");
+                String[] contractNames = contractNameStr.split(",");
+                for (int i = 0; i < contractNos.length; i++) {
+                    String contractNo = contractNos[i];
+                    String contractName = contractNames[i];
+                    Map<String, Object> data = new HashMap<>();
+                    data.put("contractNo", contractNo);
+                    // 下载合同
+                    String finalBase = base;
+                    FaDDRequestUtils.downContract(data, response -> {
+                        HttpEntity entity = response.getEntity();
+                        if (response.getStatusLine().getStatusCode() != 200) {
+                            throw new RuntimeException("法大大请求接口错误！");
+                        }
+                        InputStream content = null;
+                        try {
+                            content = entity.getContent();
+                            Header contentHeader = response.getFirstHeader("Content-disposition");
+                            String filename = contractName.substring(0, contractName.indexOf(".")) + ".pdf";
+                            if (contentHeader != null) {
+                                HeaderElement[] values = contentHeader.getElements();
+                                NameValuePair param = values[0].getParameterByName("filename");
+                                filename = param.getValue();
+                            }
+                            zipOut.putNextEntry(new ZipEntry(finalBase + filename));
+                            byte[] buffer = new byte[catchLen];
+                            int len = 0;
+                            while ((len = content.read(buffer)) != -1) {
+                                zipOut.write(buffer, 0, len);
+                            }
+                            zipOut.closeEntry();
+                        } catch (IOException e) {
+                            e.printStackTrace();
+                            toolUtil.writeErrorLog("压缩错误！" + e + "\n");
+                        }
+                    }, apiConfigMainDTO.getApiUrl());
+                }
+            }
+            zipOut.flush();
+            zipOut.close();
+        };
+    }
+
+    public boolean isAllSinged(String requestId, String workflowId) {
+        List<Map<String, Object>> maps = faDDServiceMapping.queryDetailInfo(requestId, workflowId, 2);
+        if (maps == null || maps.size() == 0) {
+            return true;
+        }
+        return false;
+    }
+
+    public boolean isSingedOneself(String requestId, String workflowId) {
+        List<Map<String, Object>> maps = faDDServiceMapping.querySignedInfo(requestId, workflowId);
+        if (maps == null || maps.size() == 0) {
+            return false;
+        }
+        return true;
+    }
+
+    public void signedContractOwn(String workflowId, String requestId) {
+        String mainTable = faDDServiceMapping.getMainTable(workflowId);
+        RecordSet rs = new RecordSet();
+        String query = "select * from " + mainTable + " where requestid = ?";
+        rs.executeQuery(query, requestId);
+        Map<String, Object> mainMap;
+        mainMap = Util.recordSet2Map(rs);
+        String mainId = "";
+        if (mainMap != null) {
+            mainId = String.valueOf(mainMap.get("id"));
+        } else {
+            toolUtil.writeErrorLog("没有查询到相关的请求id的数据！");
+        }
+        String detailTable1 = faDDServiceMapping.getDetailTable(workflowId, 4);
+        query = "select * from " + detailTable1 + " where mainid = ?";
+        rs.executeQuery(query, mainId);
+        List<Map<String, Object>> detailMaps;
+        detailMaps = Util.recordSet2MapList(rs);
+        this.toolUtil.writeErrorLog("查询到的数据：" + detailMaps.toString());
+        if (detailMaps == null) {
+            toolUtil.writeErrorLog("查询明细失败！maps为null");
+            return;
+        }
+        FaDaDaConfigDTO faDaDaConfigDTO = faDDServiceMapping.queryConfig(workflowId, 4);
+        ApiConfigMainDTO apiConfigMainDTO = Util.queryApiConfigTree(faDaDaConfigDTO.getParamsConfig());
+        List<Map<String, Object>> dataArr = new ArrayList<>();
+        String detailTable;
+        String dt = detailTable1.substring(detailTable1.indexOf("_dt") + 3);
+        detailTable = "detail_" + dt;
+        toolUtil.writeErrorLog("明细表：" + detailTable);
+        for (Map<String, Object> detailMap : detailMaps) {
+            Map<String, Object> dataMap = new HashMap<>();
+            for (Map.Entry<String, Object> entry : detailMap.entrySet()) {
+                dataMap.put(detailTable + "." + entry.getKey(), entry.getValue());
+            }
+            for (Map.Entry<String, Object> entry : mainMap.entrySet()) {
+                dataMap.put("main" + "." + entry.getKey(), entry.getValue());
+            }
+            dataArr.add(dataMap);
+        }
+        toolUtil.writeErrorLog("替换参数值：" + dataArr.toString());
+        List<Map<String, Object>> maps = objectAndListHandle(apiConfigMainDTO.getDetails(), dataArr);
+        for (Map<String, Object> map : maps) {
+            this.toolUtil.writeErrorLog("签署参数：" + map.toString());
+            String contractNos = Util.null2String(map.get("contractNo"));
+            String[] split = contractNos.split(",");
+            for (String s : split) {
+                map.put("contractNo", s);
+                ResponeVo responeVo = FaDDRequestUtils.signedContract(map, apiConfigMainDTO.getApiUrl());
+                Map<String, Object> response = null;
+                try {
+                    response = responeVo.getEntityMap();
+                } catch (JsonProcessingException e) {
+                    e.printStackTrace();
+                }
+                if (!"200".equals(response.get("code"))) {
+                    // throw new RuntimeException("法大大请求接口错误！");
+                    this.toolUtil.writeErrorLog("签署参数：" + responeVo.getEntityString());
+                }
+            }
+        }
+    }
+
+    public Map<String, Object> getAllVersion(String workflowId, String markOnly) {
+        String versionStringByWfid = WorkflowVersion.getVersionStringByWfid(workflowId);
+        String newWorkflowId = faDDServiceMapping.getAllVersion(versionStringByWfid);
+        String allVersion = WorkflowVersion.getVersionStringByWfid(newWorkflowId);
+        if (allVersion == null) {
+            allVersion = "";
+        }
+        String[] split = allVersion.split(",");
+        Map<String, Object> data = new HashMap<>();
+        String[] nodes = this.getNodes(workflowId, markOnly);
+        data.put("workflowIds", split);
+        data.put("nodeIds", nodes);
+        return data;
+    }
+
+    public String[] getNodes(String workflowId, String markOnly) {
+        String versionStringByWfid = WorkflowVersion.getVersionStringByWfid(workflowId);
+        String nods = faDDServiceMapping.getNodes(versionStringByWfid, markOnly);
+        if (nods == null) {
+            nods = "";
+        }
+        return nods.split(",");
+    }
+}
diff --git a/src/main/youhong_ai_old_src/com/api/aiyh_pcn/fadada/typeEnum/DisableEnableType.java b/src/main/youhong_ai_old_src/com/api/aiyh_pcn/fadada/typeEnum/DisableEnableType.java
new file mode 100644
index 0000000..b23db12
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/aiyh_pcn/fadada/typeEnum/DisableEnableType.java
@@ -0,0 +1,27 @@
+package com.api.aiyh_pcn.fadada.typeEnum;
+
+/**
+ * @author EBU7-dev1-ayh
+ * create 2021/12/13 0013 16:07
+ */
+
+
+public enum DisableEnableType {
+    /**
+     * 不启用
+     */
+    disable(0),
+    /**
+     * 启用
+     */
+    enable(1);
+    private final int value;
+
+    DisableEnableType(int value) {
+        this.value = value;
+    }
+
+    public int getValue() {
+        return this.value;
+    }
+}
diff --git a/src/main/youhong_ai_old_src/com/api/aiyh_pcn/fadada/typeEnum/EmailType.java b/src/main/youhong_ai_old_src/com/api/aiyh_pcn/fadada/typeEnum/EmailType.java
new file mode 100644
index 0000000..d096c74
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/aiyh_pcn/fadada/typeEnum/EmailType.java
@@ -0,0 +1,29 @@
+package com.api.aiyh_pcn.fadada.typeEnum;
+
+/**
+ * @author @author EBU7-dev1-ay
+ * create 2021/12/13 0013 15:01
+ */
+
+public enum EmailType {
+    /**
+     * 固定值
+     */
+    fixedValue(0),
+    /**
+     * 查询你SQL
+     */
+    querySql(1);
+
+    private final int value;
+
+    private EmailType(int value) {
+        this.value = value;
+    }
+
+    public int getValue() {
+        return this.value;
+    }
+    
+
+}
diff --git a/src/main/youhong_ai_old_src/com/api/aiyh_pcn/fadada/util/FaDDRequestUtils.java b/src/main/youhong_ai_old_src/com/api/aiyh_pcn/fadada/util/FaDDRequestUtils.java
new file mode 100644
index 0000000..64eb101
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/aiyh_pcn/fadada/util/FaDDRequestUtils.java
@@ -0,0 +1,243 @@
+package com.api.aiyh_pcn.fadada.util;
+
+import aiyh.utils.Util;
+import aiyh.utils.httpUtil.HttpArgsType;
+import aiyh.utils.httpUtil.ResponeVo;
+import aiyh.utils.httpUtil.util.HttpUtils;
+import aiyh.utils.zwl.common.ToolUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.util.URLUtil;
+import cn.hutool.json.JSONUtil;
+import com.alibaba.fastjson.JSONObject;
+import com.api.aiyh_pcn.fadada.dao.FaDDServiceMapping;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import org.apache.commons.codec.binary.Hex;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.h2.util.StringUtils;
+import weaver.aiyh_pcn.fadada.entity.FileInfo;
+
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.util.Base64;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.TreeMap;
+import java.util.function.Consumer;
+
+/**
+ * @author EBU7-dev1-ayh
+ * @create 2021/10/13 0013 11:46
+ * 法大大请求方法
+ */
+
+
+public class FaDDRequestUtils {
+	private final static HttpUtils httpUtils = new HttpUtils();
+	private final static Map<String, String> header = httpUtils.getGlobalCache().header;
+	private final static FaDDServiceMapping faDDServiceMapping = new FaDDServiceMapping();
+	private final static ToolUtil TOOL_UTIL = new ToolUtil();
+
+	static {
+		String appId = TOOL_UTIL.getSystemParamValue("FDD_appId");
+		if (StringUtils.isNullOrEmpty(appId)) {
+			appId = "100001";
+			TOOL_UTIL.writeErrorLog("查询到的FDD_appId为空！");
+		}
+		header.put("appId", appId);
+		header.put("signType", "SHA256");
+		String apiKey = TOOL_UTIL.getSystemParamValue("FDD_apiKey");
+		if (StringUtils.isNullOrEmpty(apiKey)) {
+			apiKey = "TulQxnZSRKeHoQfmeZzOUzGn6KpTDkDK";
+			TOOL_UTIL.writeErrorLog("查询到的FDD_apiKey为空！");
+		}
+		header.put("apikey", apiKey);
+		header.put("Content-Type", HttpArgsType.APPLICATION_JSON);
+		TOOL_UTIL.writeErrorLog(JSONObject.toJSONString(header));
+	}
+
+	//	查询企业认证状态
+	public static Map<String, Object> checkCompanyInfo(Map<String, Object> data) {
+		header.put("sign", builderSign(data));
+		try {
+			ResponeVo responeVo = httpUtils.apiPost("http://apigwaws-lite.porsche-cloudservice.com/env-101/econtract/econtract/contract/api/v1/account/company/info",
+					data, null);
+			TOOL_UTIL.writeDebuggerLog("查询企业认真状态：" + JSONObject.toJSONString(data));
+			TOOL_UTIL.writeDebuggerLog(responeVo.getEntityString() + "\n");
+			if (responeVo.getCode() != 200) {
+				return null;
+			}
+			return responeVo.getEntityMap();
+		} catch (IOException e) {
+			e.printStackTrace();
+			return null;
+		}
+	}
+
+
+	//	创建合同
+
+    /**
+     * 创建合同接口
+     * @param fileInfo 创建合同文件对象
+     * @param url 创建合同地址
+     * @return 返回值
+     */
+	public static synchronized ResponeVo createContract(FileInfo fileInfo, String url) {
+		Map<String, Object> data = new HashMap<>();
+		data.put("contractExtension", fileInfo.getContractExtension());
+		data.put("contractTitle", fileInfo.getContractTitle());
+		data.put("uploadType", fileInfo.getUploadType());
+		data.put("customerNo", fileInfo.getCustomerNo());
+		header.put("sign", builderSign(data));
+		header.put("Content-Type", "multipart/form-data");
+		ResponeVo responeVo = null;
+		try {
+			responeVo = httpUtils.apiUploadFile(url,
+					fileInfo.getFile(), "file", fileInfo.getImagefilename(), data, null);
+			TOOL_UTIL.writeDebuggerLog("创建合同：" + JSONObject.toJSONString(data));
+			TOOL_UTIL.writeDebuggerLog("返回信息：" + responeVo.getEntityString() + "\t 状态码：" + responeVo.getCode());
+		} catch (IOException e) {
+			e.printStackTrace();
+			TOOL_UTIL.writeErrorLog(e.toString());
+		}
+		return responeVo;
+	}
+
+    /**
+     *  签署合同
+     * @param data 签署合同参数
+     * @param url 签署合同地址
+     * @return 返回
+     */
+	public static synchronized ResponeVo  signedContract(Map<String, Object> data, String url) {
+		header.put("sign", builderSign(data));
+		header.put("Content-Type", "application/json");
+		ResponeVo responeVo = null;
+		try {
+			responeVo = httpUtils.apiPost(url,
+					data, null);
+			TOOL_UTIL.writeDebuggerLog("签署合同：" + JSONObject.toJSONString(data));
+			TOOL_UTIL.writeDebuggerLog(responeVo.getEntityString() + "\n");
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+		return responeVo;
+	}
+
+    /**
+     * 下载合同
+     * @param data 下载合同参数
+     * @param consumer 下载合同回调
+     * @param url 下载合同地址
+     */
+	public static void downContract(Map<String, Object> data, Consumer<CloseableHttpResponse> consumer, String url) {
+		header.put("sign", builderSign(data));
+		header.put("Content-Type", "application/json");
+		System.out.println(JSONObject.toJSONString(data));
+		try {
+			httpUtils.apiPost(url,
+					data, null, consumer);
+			TOOL_UTIL.writeDebuggerLog("下载合同文件：" + JSONObject.toJSONString(data));
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+	}
+
+    /**
+     * 查询合同状态
+     * @param data 请求参数
+     * @return 请求结果封装
+     * @throws JsonProcessingException json转换异常
+     */
+	public static Map<String, Object> queryContractStatus(Map<String, Object> data) throws JsonProcessingException {
+		header.put("sign", builderSign(data));
+		ResponeVo responeVo = null;
+		try {
+			responeVo = httpUtils.apiPost("https://apigwaws-lite.porsche-cloudservice.com/env-101/econtract/econtract/contract/api/v1/contract/sign/status/view",
+					data, null);
+			TOOL_UTIL.writeDebuggerLog("查询合同状态：" + JSONObject.toJSONString(data));
+			TOOL_UTIL.writeDebuggerLog(responeVo.getEntityString() + "\n");
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+		return responeVo.getEntityMap();
+	}
+
+    /**
+     * 查询合同详细信息
+     * @param data 请求参数
+     * @return 返回结果
+     * @throws JsonProcessingException
+     */
+	public static Map<String, Object> queryDetailContractStatus(Map<String, Object> data) throws JsonProcessingException {
+		header.put("sign", builderSign(data));
+		ResponeVo responeVo = null;
+		try {
+			responeVo = httpUtils.apiPost("https://apigwaws.porsche-cloudservice.com/env-101/por-econtract/econtract/contract/api/v1/contract/sign/detail/view",
+					data, null);
+			TOOL_UTIL.writeDebuggerLog("查询合同状态：" + JSONObject.toJSONString(data));
+			TOOL_UTIL.writeDebuggerLog(responeVo.getEntityString() + "\n");
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+		return responeVo.getEntityMap();
+	}
+
+
+	private static String builderSign(Map<String, Object> data) {
+		header.put("timestamp", Util.getTime("yyyy-MM-dd HH:mm:ss"));
+		header.put("bizContent", builderBizContent(data));
+		String signStr = "appId=" + header.get("appId") +
+				"&bizContent=" + header.get("bizContent") +
+				"&signType=" + header.get("signType") +
+				"&timestamp=" + header.get("timestamp");
+		String appKey = TOOL_UTIL.getSystemParamValue("FDD_appKey");
+		if (StringUtils.isNullOrEmpty(appKey)) {
+			TOOL_UTIL.writeErrorLog("查询到的FDD_appKey为空！");
+			appKey = "L7P59oqA2An0XgJ1LeMN0fRu1";
+		}
+		TOOL_UTIL.writeDebuggerLog("app签名：" + appKey);
+		TOOL_UTIL.writeDebuggerLog("signStr：" + signStr);
+		TOOL_UTIL.writeDebuggerLog("请求头信息：" + JSONObject.toJSONString(header));
+		String sha256 = string2SHA256(signStr) + appKey;
+		return Base64.getEncoder().encodeToString(string2SHA256(sha256).getBytes(StandardCharsets.UTF_8));
+	}
+    /**
+     * 压缩请求信息
+     * @param data 请求数据
+     * @return 压缩结果
+     */
+    public static String builderBizContent(Map<String, Object> data) {
+        String jsonString = JSONUtil.toJsonStr(data);
+        TOOL_UTIL.writeDebuggerLog("bizContent进行JSON编码：" + jsonString);
+        TreeMap<String,Object> treeMap = JSONUtil.parseObj(jsonString).toBean(TreeMap.class);
+        jsonString = JSONUtil.toJsonStr(treeMap);
+        TOOL_UTIL.writeDebuggerLog("排序后json编码：" + jsonString);
+        String encode;
+        encode = URLUtil.encodeAll(jsonString, StandardCharsets.UTF_8);
+        TOOL_UTIL.writeDebuggerLog("bizContent进行JSON编码后URLEncoder编码：" + encode);
+        String s = cn.hutool.core.codec.Base64.encode(StrUtil.bytes(encode, StandardCharsets.UTF_8));
+        TOOL_UTIL.writeDebuggerLog("bizContent进行JSON编码后URLEncoder编码后进行base64编码：" + s);
+        return s;
+    }
+
+	private static String string2SHA256(String str) {
+		MessageDigest messageDigest;
+		String encdeStr = "";
+		try {
+			messageDigest = MessageDigest.getInstance("SHA-256");
+			byte[] hash = messageDigest.digest(str.getBytes(StandardCharsets.UTF_8));
+			encdeStr = Hex.encodeHexString(hash);
+			TOOL_UTIL.writeDebuggerLog("进行SHA-256加密：" + encdeStr);
+		} catch (NoSuchAlgorithmException e) {
+			e.printStackTrace();
+		}
+		String s = encdeStr.toUpperCase();
+		TOOL_UTIL.writeDebuggerLog("进行SHA-256加密后转为全大写：" + s);
+		return s;
+	}
+
+}
+
diff --git a/src/main/youhong_ai_old_src/com/api/aiyh_pcn/fadada/vo/TableFieldMappingVO.java b/src/main/youhong_ai_old_src/com/api/aiyh_pcn/fadada/vo/TableFieldMappingVO.java
new file mode 100644
index 0000000..e285df5
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/aiyh_pcn/fadada/vo/TableFieldMappingVO.java
@@ -0,0 +1,47 @@
+package com.api.aiyh_pcn.fadada.vo;
+
+/**
+ * @author EBU7-dev1-ayh
+ * @create 2021/10/11 0011 15:11
+ * 表名和表映射、
+ */
+
+
+public class TableFieldMappingVO {
+	private String tableName;
+	private String field;
+	private int id;
+
+	public int getId() {
+		return id;
+	}
+
+	public void setId(int id) {
+		this.id = id;
+	}
+
+	public String getTableName() {
+		return tableName;
+	}
+
+	public void setTableName(String tableName) {
+		this.tableName = tableName;
+	}
+
+	public String getField() {
+		return field;
+	}
+
+	public void setField(String field) {
+		this.field = field;
+	}
+
+	@Override
+	public String toString() {
+		return "TableFieldMappingVO{" +
+				"tableName='" + tableName + '\'' +
+				", field='" + field + '\'' +
+				", id=" + id +
+				'}';
+	}
+}
diff --git a/src/main/youhong_ai_old_src/com/api/aiyh_pcn/fadada/web/FaDDContractController.java b/src/main/youhong_ai_old_src/com/api/aiyh_pcn/fadada/web/FaDDContractController.java
new file mode 100644
index 0000000..e9faf0c
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/aiyh_pcn/fadada/web/FaDDContractController.java
@@ -0,0 +1,208 @@
+package com.api.aiyh_pcn.fadada.web;
+
+import aiyh.utils.ApiResult;
+import aiyh.utils.LabelHtmlUtils;
+import aiyh.utils.Util;
+import aiyh.utils.entity.LabelHtmlIndex;
+import aiyh.utils.zwl.common.ToolUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.serializer.SerializerFeature;
+import com.api.aiyh_pcn.fadada.dao.FaDDContractMapping;
+import com.api.aiyh_pcn.fadada.entity.UfContractInfoDTO;
+import com.api.aiyh_pcn.fadada.service.impl.FaDDContractService;
+import io.swagger.v3.oas.annotations.parameters.RequestBody;
+import org.h2.util.StringUtils;
+import weaver.hrm.HrmUserVarify;
+import weaver.hrm.User;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.ws.rs.*;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.StreamingOutput;
+import java.nio.charset.StandardCharsets;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @author EBU7-dev1-ayh
+ * @create 2021/11/3 0003 14:49 fadada
+ */
+@Path("/v2/fadada")
+public class FaDDContractController {
+	
+	private final FaDDContractService faDDService = new FaDDContractService();
+	private final FaDDContractMapping faDDContractMapping = new FaDDContractMapping();
+	private final ToolUtil toolUtil = new ToolUtil();
+	private final LabelHtmlUtils labelHtmlUtils = new LabelHtmlUtils("aiyh.htmlLabel.porsche.FaDDContractController");
+	
+	/**
+	 * 获取流程全版本
+	 *
+	 * @param workflowId 流程id
+	 * @return 流程全版本id
+	 */
+	@Path("/getAllVersion/{workflowId}/{markOnly}")
+	@GET
+	@Produces(MediaType.APPLICATION_JSON)
+	@Consumes(MediaType.APPLICATION_JSON)
+	public String getAllVersion(@PathParam("workflowId") String workflowId, @PathParam("markOnly") String markOnly) {
+		try {
+			Map<String, Object> allVersion = faDDService.getAllVersion(workflowId, markOnly);
+			return ApiResult.success(allVersion);
+		} catch (Exception e) {
+			toolUtil.writeErrorLog("错误：" + e);
+			return ApiResult.error(e.toString());
+		}
+	}
+	
+	/**
+	 * 合同签署回调
+	 *
+	 * @param params
+	 * @return
+	 */
+	@Path("/callback/signed")
+	@POST
+	@Produces(MediaType.APPLICATION_JSON)
+	@Consumes(MediaType.APPLICATION_JSON)
+	public String signedCallBack(@RequestBody Map<String, Object> params) {
+		JSONObject.toJSONString(params, SerializerFeature.PrettyFormat, SerializerFeature.WriteDateUseDateFormat);
+		Map<String, Object> result = new HashMap<>();
+		result.put("code", 200);
+		result.put("msg", "操作成功！");
+		try {
+			toolUtil.writeErrorLog("回调方法，获取到的请求参数：" + JSON.toJSONString(params));
+			String resultCode = String.valueOf(params.get("resultCode"));
+			if (!"1".equals(resultCode)) {
+				// 签署失败
+				toolUtil.writeErrorLog("合同回调：签署失败，失败信息：" + JSON.toJSONString(params));
+				faDDService.signedCallBackError(params);
+				return JSON.toJSONString(result);
+			}
+			String contractNo = String.valueOf(params.get("docNo"));
+			faDDService.signedCallBack(contractNo);
+		} catch (Exception e) {
+			toolUtil.writeErrorLog(e.toString());
+			return JSON.toJSONString(result);
+		}
+		return JSON.toJSONString(result);
+	}
+	
+	/**
+	 * 是否签署完毕
+	 *
+	 * @param requestId
+	 * @param workflowId
+	 * @return
+	 */
+	@Path("/isAllSigned/{workflowId}/{requestId}")
+	@GET
+	@Produces(MediaType.APPLICATION_JSON)
+	@Consumes(MediaType.APPLICATION_JSON)
+	public String querySignedStatus(@PathParam("requestId") String requestId,
+	                                @PathParam("workflowId") String workflowId) {
+		Map<String, Object> result = faDDService.querySignedStatus(requestId);
+		return ApiResult.success(result);
+	}
+	
+	/**
+	 * 本方签署
+	 *
+	 * @param workflowId 流程id
+	 * @param requestId  请求id
+	 * @return 本方签署结果
+	 */
+	@Path("/signedContract/own/{requestId}/{workflowId}")
+	@GET
+	@Consumes(MediaType.APPLICATION_JSON)
+	@Produces(MediaType.APPLICATION_JSON)
+	public String signedContractOwn(@Context HttpServletRequest request, @Context HttpServletResponse response,
+	                                @PathParam("workflowId") String workflowId, @PathParam("requestId") String requestId) {
+		// TODO 更换labelIndex
+		User user = HrmUserVarify.getUser(request, response);
+		try {
+			faDDService.signedContractOwn(requestId, user);
+		} catch (Exception e) {
+			return ApiResult.error(Util.getHtmlLabelName(-87658, user.getLanguage(), "合同签署失败！"));
+		}
+		return ApiResult.success(Util.getHtmlLabelName(-87657, user.getLanguage(), "本方签署成功！"));
+	}
+	
+	/**
+	 * 催一催
+	 *
+	 * @param requestId 请求id
+	 * @return 催一催
+	 */
+	@Path("/signedContract/{requestId}")
+	@GET
+	@Consumes(MediaType.APPLICATION_JSON)
+	@Produces(MediaType.APPLICATION_JSON)
+	public String signedContract(@Context HttpServletRequest request, @Context HttpServletResponse response,
+	                             @PathParam("requestId") String requestId) {
+		User user = HrmUserVarify.getUser(request, response);
+		try {
+			faDDService.pushAPush(requestId);
+		} catch (Exception e) {
+			LabelHtmlIndex pushErr = labelHtmlUtils.getLabelHtmlIndex("pushErr");
+			toolUtil.writeDebuggerLog(e.toString());
+			return ApiResult.error(Util.getHtmlLabelName(pushErr, user));
+		}
+		LabelHtmlIndex pushSuccess = labelHtmlUtils.getLabelHtmlIndex("pushSuccess");
+		return ApiResult.success(Util.getHtmlLabelName(pushSuccess, user));
+	}
+	
+	/**
+	 * 合同下载
+	 *
+	 * @param requestId 请求id
+	 * @return 合同问价压缩包
+	 */
+	@Path("/contract/download/{requestId}")
+	@GET
+	@Produces(MediaType.APPLICATION_OCTET_STREAM)
+	public Response contractDownload(@PathParam("requestId") String requestId) {
+		try {
+			UfContractInfoDTO ufContractInfoDTO = faDDContractMapping.queryContractInfoByRequestId(requestId);
+			StreamingOutput contractZipStream = faDDService.download4mFDD(ufContractInfoDTO);
+			// String requestTitle =
+			// Util.null2String(Util.getRequestTitleById(String.valueOf(requestId)));
+			String requestTitle = ufContractInfoDTO.getFileName();
+			if (StringUtils.isNullOrEmpty(requestTitle)) {
+				requestTitle = "contracts.pdf";
+			}
+			if (Util.null2String(ufContractInfoDTO.getContractNo()).split(",").length >= 2) {
+				// 多文件
+				return Response.ok(contractZipStream, MediaType.APPLICATION_OCTET_STREAM).type("application/zip")
+						       .header("Content-Disposition", "attachment;filename=\"" +
+								                                      new String(requestTitle.getBytes("GBK"), StandardCharsets.ISO_8859_1) + ".zip" + "\"").build();
+			} else {
+				// 单文件
+				return Response.ok(contractZipStream, MediaType.APPLICATION_OCTET_STREAM).type("application/pdf")
+						       .header("Content-Disposition", "attachment;filename=\"" +
+								                                      new String(requestTitle.getBytes("GBK"), StandardCharsets.ISO_8859_1) + "\"").build();
+			}
+		} catch (Exception e) {
+			toolUtil.writeErrorLog("文件流转换失败，" + Util.getErrString(e));
+			return Response.ok(ApiResult.error("出现错误，错误原因: " + e), MediaType.TEXT_PLAIN).build();
+		}
+	}
+	
+	@POST
+	@Path("/resigned")
+	@Produces(MediaType.APPLICATION_JSON)
+	@Consumes(MediaType.APPLICATION_JSON)
+	public String resigned(@RequestBody Map<String, Object> params) {
+		try {
+			faDDService.resigned(params);
+			return ApiResult.success(true);
+		} catch (Exception e) {
+			e.printStackTrace();
+			return ApiResult.error("系统出错！" + e);
+		}
+	}
+}
diff --git a/src/main/youhong_ai_old_src/com/api/aiyh_pcn/fadada/web/FaDDController.java b/src/main/youhong_ai_old_src/com/api/aiyh_pcn/fadada/web/FaDDController.java
new file mode 100644
index 0000000..3fc77cd
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/aiyh_pcn/fadada/web/FaDDController.java
@@ -0,0 +1,262 @@
+package com.api.aiyh_pcn.fadada.web;
+
+import aiyh.utils.ApiResult;
+import aiyh.utils.Util;
+import aiyh.utils.mapUtil.ParaMap;
+import aiyh.utils.sqlUtil.sqlResult.impl.PrepSqlResultImpl;
+import aiyh.utils.zwl.common.ToolUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.api.aiyh_pcn.fadada.dao.FaDDServiceMapping;
+import com.api.aiyh_pcn.fadada.service.impl.FaDDServiceImpl;
+import io.swagger.v3.oas.annotations.parameters.RequestBody;
+import org.h2.util.StringUtils;
+import weaver.conn.RecordSet;
+import weaver.hrm.HrmUserVarify;
+import weaver.hrm.User;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.ws.rs.*;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.StreamingOutput;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.nio.charset.StandardCharsets;
+import java.util.Base64;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @author EBU7-dev1-ayh
+ * @create 2021/9/28 0028 16:05 法大大相关接口
+ */
+@Path("/fadada")
+public class FaDDController {
+    private final FaDDServiceImpl faDDService = new FaDDServiceImpl();
+    private final FaDDServiceMapping faDDServiceMapping = new FaDDServiceMapping();
+    private final ToolUtil toolUtil = new ToolUtil();
+
+    /**
+     * 查询配置信息
+     *
+     * @param workflowId
+     *            流程id
+     * @return 配置信息
+     */
+    @GET
+    @Path("/getConfig/{workflowId}")
+    public String getConfig(@PathParam("workflowId") String workflowId) {
+        try {
+            Map<String, Object> configParam = faDDService.getConfigParam(workflowId);
+            return ApiResult.success(configParam);
+        } catch (Exception e) {
+            return ApiResult.error(e.toString());
+        }
+    }
+
+    /**
+     * 验证企业签署状态
+     *
+     * @param params
+     *            查验参数
+     * @return 企业验证的状态
+     */
+    @Path("/signature")
+    @POST
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces(MediaType.APPLICATION_JSON)
+    public String checkCertification(@RequestBody Map<String, Object> params) {
+        try {
+            Map<String, Object> certificationResult = faDDService.checkCertification(params);
+            return ApiResult.success(certificationResult);
+        } catch (Exception e) {
+            return ApiResult.error(e.toString());
+        }
+    }
+
+    /**
+     * 催一催
+     *
+     * @param workflowId
+     *            流程id
+     * @param requestId
+     *            请求id
+     * @return 催一催
+     */
+    @Path("/signedContract/{languageGroupId}/{requestId}/{workflowId}")
+    @GET
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces(MediaType.APPLICATION_JSON)
+    public String signedContract(@Context HttpServletRequest request, @Context HttpServletResponse response,
+        @PathParam("workflowId") String workflowId, @PathParam("requestId") String requestId,
+        @PathParam("languageGroupId") int languageGroupId) {
+        User user = HrmUserVarify.getUser(request, response);
+        try {
+            faDDService.queryContractStatus(workflowId, requestId, 0);
+            Map<String, String> language = Util.queryLanguage(languageGroupId, user.getLanguage());
+            String info = language.get("rushInfo");
+            return ApiResult.success(info);
+        } catch (Exception e) {
+            toolUtil.writeErrorLog("错误：" + e);
+            return ApiResult.error(e.toString());
+        }
+    }
+
+    /**
+     * 本方签署
+     *
+     * @param workflowId
+     *            流程id
+     * @param requestId
+     *            请求id
+     * @return 本方签署结果
+     */
+    @Path("/signedContract/own/{languageGroupId}/{requestId}/{workflowId}")
+    @GET
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces(MediaType.APPLICATION_JSON)
+    public String signedContractOwn(@Context HttpServletRequest request, @Context HttpServletResponse response,
+        @PathParam("workflowId") String workflowId, @PathParam("requestId") String requestId,
+        @PathParam("languageGroupId") int languageGroupId) {
+        User user = HrmUserVarify.getUser(request, response);
+        try {
+            faDDService.signedContractOwn(workflowId, requestId);
+            String mainTable = faDDServiceMapping.getMainTable(workflowId);
+            // TODO 更新本方签署
+            PrepSqlResultImpl sqlResult =
+                Util.createSqlBuilder().updateSql(mainTable, ParaMap.create().put("signed_oneself", 1),
+                    Util.createPrepWhereImpl().whereAnd("requestid").whereEqual(requestId));
+            RecordSet rs = new RecordSet();
+            rs.executeUpdate(sqlResult.getSqlStr(), sqlResult.getArgs());
+            Map<String, String> language = Util.queryLanguage(languageGroupId, user.getLanguage());
+            String info = language.get("contractSignedInfo");
+            return ApiResult.success(info);
+        } catch (Exception e) {
+            toolUtil.writeErrorLog("错误：" + e.toString());
+            return ApiResult.error(e.toString());
+        }
+    }
+
+    /**
+     * 合同下载
+     *
+     * @param requestId
+     *            请求id
+     * @return 合同问价压缩包
+     */
+    @Path("/contract/download/{workflowId}/{requestId}")
+    @GET
+    @Produces(MediaType.APPLICATION_OCTET_STREAM)
+    public Response contractDownload(@PathParam("requestId") String requestId,
+        @PathParam("workflowId") String workflowId) {
+        toolUtil.writeErrorLog("进入请求方法，获取到请求id：" + requestId);
+        try {
+            StreamingOutput contractZipStream = faDDService.contractDownload(requestId, workflowId);
+            return Response.ok(contractZipStream, MediaType.APPLICATION_OCTET_STREAM).type("application/zip")
+                .header("Content-Disposition", "attachment;filename=contracts.zip").build();
+        } catch (Exception e) {
+            toolUtil.writeErrorLog("转换失败，" + e.toString());
+            return Response.ok(ApiResult.error("出现错误，错误原因: " + e), MediaType.APPLICATION_JSON).build();
+        }
+    }
+
+    /**
+     * 获取流程全版本
+     *
+     * @param workflowId
+     *            流程id
+     * @return 流程全版本id
+     */
+    @Path("/getAllVersion/{workflowId}/{markOnly}")
+    @GET
+    @Produces(MediaType.APPLICATION_JSON)
+    @Consumes(MediaType.APPLICATION_JSON)
+    public String getAllVersion(@PathParam("workflowId") String workflowId, @PathParam("markOnly") String markOnly) {
+        try {
+            Map<String, Object> allVersion = faDDService.getAllVersion(workflowId, markOnly);
+            return ApiResult.success(allVersion);
+        } catch (Exception e) {
+            toolUtil.writeErrorLog("错误：" + e.toString());
+            return ApiResult.error(e.toString());
+        }
+    }
+
+    /**
+     * 查验是否全部签订完毕
+     *
+     * @param requestId
+     *            请求id
+     * @return 查验结果
+     */
+    @Path("/isAllSigned/{workflowId}/{requestId}")
+    @GET
+    @Produces(MediaType.APPLICATION_JSON)
+    @Consumes(MediaType.APPLICATION_JSON)
+    public String isAllSinged(@PathParam("requestId") String requestId, @PathParam("workflowId") String workflowId) {
+        try {
+            faDDService.queryContractStatus(workflowId, requestId, 1);
+            boolean isAllSinged = faDDService.isAllSinged(requestId, workflowId);
+            boolean isSingedOneself = faDDService.isSingedOneself(requestId, workflowId);
+            Map<String, Object> result =
+                ParaMap.create().put("isAllSinged", isAllSinged).put("isSingedOneself", isSingedOneself);
+            return ApiResult.success(result);
+        } catch (Exception e) {
+            toolUtil.writeErrorLog("错误：" + e);
+            return ApiResult.error(e.toString());
+        }
+    }
+
+    @Path("/getLanguage/{languageGroupId}")
+    @GET
+    @Produces(MediaType.APPLICATION_JSON)
+    public String getLanguage(@Context HttpServletRequest request, @Context HttpServletResponse response,
+        @PathParam("languageGroupId") int languageGroupId) {
+        User user = HrmUserVarify.getUser(request, response);
+        Map<String, String> map = Util.queryLanguage(languageGroupId, user.getLanguage());
+        return ApiResult.success(map);
+    }
+
+    @Path("/callback/signed")
+    @POST
+    @Produces(MediaType.APPLICATION_JSON)
+    @Consumes(MediaType.APPLICATION_JSON)
+    public String callBackSigned(@RequestBody Map<String, Object> params) {
+        toolUtil.writeErrorLog("回调方法：" + JSONObject.toJSONString(params));
+        Map<String, Object> result = new HashMap<>();
+        String bizContent = String.valueOf(params.get("bizContent"));
+        if (StringUtils.isNullOrEmpty(bizContent)) {
+            toolUtil.writeErrorLog("参数没获取到！");
+            result.put("code", "200");
+            result.put("msg", "操作失败！");
+            return JSONObject.toJSONString(result);
+        }
+        byte[] decode = Base64.getDecoder().decode(bizContent.getBytes(StandardCharsets.UTF_8));
+        String decodeStr = null;
+        try {
+            decodeStr = new String(decode, "UTF-8");
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
+        String jsonStr = null;
+        try {
+            jsonStr = URLDecoder.decode(decodeStr, "UTF-8");
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
+        JSONObject jsonObject = JSON.parseObject(jsonStr);
+        String resultCode = String.valueOf(jsonObject.getString("resultCode"));
+        String docNo = String.valueOf(jsonObject.getString("docNo"));
+        if (!"1".equals(resultCode)) {
+            toolUtil.writeErrorLog("重复签署合同！" + docNo);
+        }
+        // Util.createSqlBuilder().updateSql()
+
+        this.toolUtil.writeErrorLog(jsonObject.toJSONString());
+        result.put("code", "200");
+        result.put("msg", "操作成功！");
+        return JSONObject.toJSONString(result);
+    }
+}
diff --git a/src/main/youhong_ai_old_src/com/api/aiyh_pcn/multiple_language/MultipleLanguageController.java b/src/main/youhong_ai_old_src/com/api/aiyh_pcn/multiple_language/MultipleLanguageController.java
new file mode 100644
index 0000000..2dba688
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/aiyh_pcn/multiple_language/MultipleLanguageController.java
@@ -0,0 +1,54 @@
+package com.api.aiyh_pcn.multiple_language;
+
+import aiyh.utils.ApiResult;
+import aiyh.utils.Util;
+import weaver.hrm.HrmUserVarify;
+import weaver.hrm.User;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.ws.rs.*;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>多语言自定义标签接口</p>
+ * <p>create 2022/2/10 0010 10:09</p>
+ *
+ * @author EBU7-dev1-ayh
+ */
+
+@Path("/languageLabel")
+public class MultipleLanguageController {
+
+    MultipleLanguageMapper multipleLanguageMapper = Util.getMapper(MultipleLanguageMapper.class);
+
+    @GET
+    @Path("/getMultipleLanguage/{descLike}")
+    @Produces(MediaType.APPLICATION_JSON)
+    public String getMultipleLanguage(@Context HttpServletRequest request,
+                                      @Context HttpServletResponse response,
+                                      @PathParam("descLike") String descLike) {
+
+        try {
+            User user = HrmUserVarify.getUser(request, response);
+            List<Map<String, String>> labelList =
+                    multipleLanguageMapper.selectCustomerLabel(descLike + "%", user.getLanguage());
+            if (labelList == null) {
+                return ApiResult.success(new HashMap<>(2));
+            }
+            Map<String, String> result = new HashMap<>(16);
+            for (Map<String, String> map : labelList) {
+                result.put(String.valueOf(map.get("id")), map.get("labelname"));
+            }
+            return ApiResult.success(result);
+        }catch (Exception e){
+            Util.getLogger().error("获取用户信息失败！无法获取用户信息，请检查用户是否登录成功！" + Util.getErrString(e));
+            return ApiResult.error("获取多语言数据失败！");
+        }
+    }
+
+}
diff --git a/src/main/youhong_ai_old_src/com/api/aiyh_pcn/multiple_language/MultipleLanguageMapper.java b/src/main/youhong_ai_old_src/com/api/aiyh_pcn/multiple_language/MultipleLanguageMapper.java
new file mode 100644
index 0000000..49709d9
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/aiyh_pcn/multiple_language/MultipleLanguageMapper.java
@@ -0,0 +1,31 @@
+package com.api.aiyh_pcn.multiple_language;
+
+import aiyh.utils.annotation.recordset.ParamMapper;
+import aiyh.utils.annotation.recordset.Select;
+import aiyh.utils.annotation.recordset.SqlMapper;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p></p>
+ * <p>create 2022/2/10 0010 10:13</p>
+ *
+ * @author EBU7-dev1-ayh
+ */
+
+
+@SqlMapper
+public interface MultipleLanguageMapper {
+
+    /**
+     * 查询自定义的标签信息
+     * @param descLike 描述
+     * @param languageId 语言id
+     * @return 查询到的标签信息
+     */
+    @Select("select hi.id,hf.labelname from htmllabelindex hi " +
+            "left join htmllabelinfo hf on hf.indexid = hi.id " +
+            "where id < 0 and indexdesc like ${descLike} and languageid = #{languageId}")
+    public List<Map<String,String>> selectCustomerLabel(@ParamMapper("descLike") String descLike, @ParamMapper("languageId") int languageId);
+}
diff --git a/src/main/youhong_ai_old_src/com/api/aiyh_pcn/organization/annotation/FieldMapping.java b/src/main/youhong_ai_old_src/com/api/aiyh_pcn/organization/annotation/FieldMapping.java
new file mode 100755
index 0000000..bd3137a
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/aiyh_pcn/organization/annotation/FieldMapping.java
@@ -0,0 +1,19 @@
+package com.api.aiyh_pcn.organization.annotation;
+
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+
+/**
+ * @author XiaoBokang
+ * @create 2022/5/2 14:02
+ */
+
+@Target(ElementType.FIELD)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface FieldMapping {
+    String value();
+}
diff --git a/src/main/youhong_ai_old_src/com/api/aiyh_pcn/organization/cmd/OrganizationCmd.java b/src/main/youhong_ai_old_src/com/api/aiyh_pcn/organization/cmd/OrganizationCmd.java
new file mode 100755
index 0000000..0f57d40
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/aiyh_pcn/organization/cmd/OrganizationCmd.java
@@ -0,0 +1,392 @@
+package com.api.aiyh_pcn.organization.cmd;
+
+import com.api.aiyh_pcn.organization.annotation.FieldMapping;
+import com.api.aiyh_pcn.organization.entity.OrganizationEntity;
+import com.api.aiyh_pcn.organization.utils.LogUtil;
+import org.apache.log4j.Logger;
+import weaver.conn.RecordSet;
+import weaver.general.Util;
+import weaver.zwl.common.ToolUtil;
+
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author XiaoBokang
+ * @create 2022/5/2 13:03
+ */
+
+public class OrganizationCmd {
+
+    private final Logger log = LogUtil.getLogger();
+
+    public List<OrganizationEntity> queryList() {
+        RecordSet recordSet = new RecordSet();
+        String dbType = recordSet.getDBType();
+        List<OrganizationEntity> organizationList = new ArrayList<>();
+        // 查询总部信息
+        String querySql = "select companyname orgName,id orgCode, " +
+                "(select count(*) from hrmresource where (belongTo is null or belongTo = -1)) totalCount, " +
+                "(select count(*) from hrmresource where (belongTo is null or belongTo = -1) and status in (0,1,2,3)) employeeCount " +
+                "from hrmcompany";
+        recordSet.executeQuery(querySql);
+        if (recordSet.next()) {
+            String companyLeader = new ToolUtil().getSystemParamValue("companyLeader");
+            String userId = "";
+            String messageUrl = "";
+            String orgLeader = "";
+            if (!"".equals(companyLeader)) {
+                String queryManage = "select id,lastname,messagerurl from hrmresource where id = ?";
+                RecordSet queryRecordSet = new RecordSet();
+                queryRecordSet.executeQuery(queryManage, companyLeader);
+                if (queryRecordSet.next()) {
+                    userId = queryRecordSet.getString("id");
+                    messageUrl = queryRecordSet.getString("messagerurl");
+                    orgLeader = queryRecordSet.getString("lastname");
+                }
+            }
+            OrganizationEntity organizationEntity = new OrganizationEntity();
+            organizationEntity.setOrgName(recordSet.getString("orgName"));
+            organizationEntity.setOrgCode("sub_0");
+            organizationEntity.setHighLevelOrg("root");
+            organizationEntity.setSign("3");
+            organizationEntity.setTotalCount(recordSet.getString("totalCount"));
+            organizationEntity.setEmployeeCount(recordSet.getString("employeeCount"));
+            organizationEntity.setUserId(userId);
+            organizationEntity.setMessageUrl(messageUrl);
+            organizationEntity.setOrgLeader(orgLeader);
+            organizationList.add(organizationEntity);
+        }
+        // 查询分部信息
+        querySql = "select  " +
+                "sub.id,sub.subcompanyname orgName,hrm.id userId,hrm.lastname orgLeader,hrm.messagerurl messageUrl, " +
+                this.getConcatStr(dbType, "'sub_'", "sub.id") + " orgCode," +
+                this.getConcatStr(dbType, "'sub_'", "sub.supsubcomid") + " highLevelOrg, " +
+//                "concat(\"sub_\",sub.id) orgCode,concat(\"sub_\",sub.supsubcomid) highLevelOrg, " +
+                "(select count(*) from hrmresource where subcompanyid1 = sub.id and (belongTo is null or belongTo = -1)) totalCount, " +
+                "(select count(*) from hrmresource where subcompanyid1 = sub.id and (belongTo is null or belongTo = -1) and status in (0,1,2,3)) employeeCount " +
+                "from hrmsubcompany sub " +
+                "left join matrixtable_1 m1 on sub.id = m1.id " +
+                "left join hrmresource hrm on m1.fbfzr = hrm.id " +
+                "where sub.canceled is null or sub.canceled =0 ";
+        recordSet.executeQuery(querySql);
+        while (recordSet.next()) {
+            OrganizationEntity organizationEntity = recordSetToEntityByEntity(recordSet, OrganizationEntity.class);
+            organizationEntity.setSign("0");
+            organizationList.add(organizationEntity);
+        }
+        // 查询部门信息
+        querySql = "select  " +
+                "depart.id,depart.departmentname orgName,hrm.id userId,hrm.lastName orgLeader,hrm.messagerurl messageUrl, " +
+                this.getConcatStr(dbType, "'dep_'", "depart.id") + " orgCode, " +
+//                "concat(\"dep_\",depart.id) orgCode, " +
+                "( " +
+                " case  " +
+                "  when supdepid <= 0 or supdepid is null then " +
+                this.getConcatStr(dbType, "'sub_'", "depart.subcompanyid1") +
+//                " concat(\"sub_\",depart.subcompanyid1)  " +
+                "  else " + this.getConcatStr(dbType, "'dep_'", "depart.supdepid") +
+                " end " +
+                ") highLevelOrg, " +
+                "(select count(*) from hrmresource where departmentid = depart.id and (belongTo is null or belongTo = -1)) totalCount, " +
+                "(select count(*) from hrmresource where departmentid = depart.id and (belongTo is null or belongTo = -1) and status in (0,1,2,3)) employeeCount " +
+                "from hrmdepartment depart " +
+                "inner join hrmsubcompany sub on depart.subcompanyid1 = sub.id " +
+                "left join matrixtable_2 m2 on depart.id = m2.id " +
+                "left join hrmresource hrm on m2.bmfzr = hrm.id " +
+                "where (depart.canceled is null or depart.canceled =0) and (sub.canceled is null or sub.canceled =0) ";
+        recordSet.executeQuery(querySql);
+        while (recordSet.next()) {
+            OrganizationEntity organizationEntity = recordSetToEntityByEntity(recordSet, OrganizationEntity.class);
+            organizationEntity.setSign("1");
+            organizationList.add(organizationEntity);
+        }
+        return organizationList;
+    }
+
+    /**
+     * 查询总部信息
+     *
+     * @return
+     */
+    public OrganizationEntity getCompanyMsg() {
+        RecordSet recordSet = new RecordSet();
+        OrganizationEntity organizationEntity = null;
+        // 查询总部信息
+        String querySql = "select companyname orgName,id orgCode, " +
+                "(select count(*) from hrmresource where (belongTo is null or belongTo = -1)) totalCount, " +
+                "(select count(*) from hrmresource where (belongTo is null or belongTo = -1) and status in (0,1,2,3)) employeeCount " +
+                "from hrmcompany";
+        recordSet.executeQuery(querySql);
+        if (recordSet.next()) {
+            String companyLeader = new ToolUtil().getSystemParamValue("companyLeader");
+            String userId = "";
+            String messageUrl = "";
+            String orgLeader = "";
+            if (!"".equals(companyLeader)) {
+                String queryManage = "select id,lastname,messagerurl from hrmresource where id = ?";
+                RecordSet queryRecordSet = new RecordSet();
+                queryRecordSet.executeQuery(queryManage, companyLeader);
+                if (queryRecordSet.next()) {
+                    userId = queryRecordSet.getString("id");
+                    messageUrl = queryRecordSet.getString("messagerurl");
+                    orgLeader = queryRecordSet.getString("lastname");
+                }
+            }
+            organizationEntity = new OrganizationEntity();
+            organizationEntity.setOrgName(recordSet.getString("orgName"));
+            organizationEntity.setOrgCode("sub_0");
+            organizationEntity.setId("sub_0");
+            organizationEntity.setHaveChildren("0");
+            organizationEntity.setHighLevelOrg("root");
+            organizationEntity.setSign("3");
+            organizationEntity.setTotalCount(recordSet.getString("totalCount"));
+            organizationEntity.setEmployeeCount(recordSet.getString("employeeCount"));
+            organizationEntity.setUserId(userId);
+            organizationEntity.setMessageUrl(messageUrl);
+            organizationEntity.setOrgLeader(orgLeader);
+        }
+        return organizationEntity;
+    }
+
+    /**
+     * 通过参数查询部门的信息
+     *
+     * @param param 查询条件
+     * @return
+     */
+    public List<OrganizationEntity> getSubCompanyListByParam(Map<String, Object> param, String sourcePath) {
+        List<OrganizationEntity> organizationList = new ArrayList<>();
+        RecordSet recordSet = new RecordSet();
+        String dbType = recordSet.getDBType();
+        // 查询分部信息
+        String querySql = "select  " +
+                "sub.id,sub.subcompanyname orgName,hrm.id userId,hrm.lastname orgLeader,hrm.messagerurl messageUrl, " +
+                this.getConcatStr(dbType, "'sub_'", "sub.id") + " orgCode," +
+                this.getConcatStr(dbType, "'sub_'", "sub.supsubcomid") + " highLevelOrg, " +
+//                "concat(\"sub_\",sub.id) orgCode,concat(\"sub_\",sub.supsubcomid) highLevelOrg, " +
+                "(select count(*) from hrmresource where subcompanyid1 = sub.id and (belongTo is null or belongTo = -1)) totalCount, " +
+                "(select count(*) from hrmresource where subcompanyid1 = sub.id and (belongTo is null or belongTo = -1) and status in (0,1,2,3)) employeeCount " +
+                "from hrmsubcompany sub " +
+                "left join matrixtable_1 m1 on sub.id = m1.id " +
+                "left join hrmresource hrm on m1.fbfzr = hrm.id " +
+                "where (sub.canceled is null or sub.canceled =0) ";
+        List<Object> paramList = new ArrayList<>();
+        String whereSql = this.buildWhereSql("", param, paramList);
+        querySql += whereSql;
+        log.info("通过参数查询分部信息：" + querySql + "  paramList ==>" + paramList);
+        recordSet.executeQuery(querySql, paramList);
+        while (recordSet.next()) {
+            String mainId = recordSet.getString("id");
+            OrganizationEntity organizationEntity = recordSetToEntityByEntity(recordSet, OrganizationEntity.class);
+            organizationEntity.setSign("0");
+            int companyChildCount = getCompanyChildCount(mainId);
+            int companyDepartChildCount = getCompanyDepartChildCount(mainId);
+            if (companyChildCount > 0 || companyDepartChildCount > 0) {
+                organizationEntity.setHaveChildren("0");
+            } else {
+                organizationEntity.setHaveChildren("1");
+            }
+            organizationList.add(organizationEntity);
+        }
+        return organizationList;
+    }
+
+
+    /**
+     * 通过参数查询部门的信息
+     *
+     * @param param 查询条件
+     * @return
+     */
+    public List<OrganizationEntity> getDepartListByParam(Map<String, Object> param, String sourcePath) {
+        List<OrganizationEntity> organizationList = new ArrayList<>();
+        RecordSet recordSet = new RecordSet();
+        String dbType = recordSet.getDBType();
+        // 查询部门信息
+        String querySql = "select  " +
+                "job.JOBTITLENAME jobTitleName  ,depart.id,depart.departmentname orgName,hrm.id userId,hrm.lastName orgLeader,hrm.messagerurl messageUrl, " +
+                this.getConcatStr(dbType, "'dep_'", "depart.id") + " orgCode, " +
+                "( " +
+                " case  " +
+                "  when supdepid <= 0 or supdepid is null then " +
+                this.getConcatStr(dbType, "'sub_'", "depart.subcompanyid1") +
+                "  else " + this.getConcatStr(dbType, "'dep_'", "depart.supdepid") +
+                " end " +
+                ") highLevelOrg, " +
+                "(select count(*) from hrmresource where departmentid = depart.id and (belongTo is null or belongTo = -1)) totalCount, " +
+                "(select count(*) from hrmresource where departmentid = depart.id and (belongTo is null or belongTo = -1) and status in (0,1,2,3)) employeeCount " +
+                "from hrmdepartment depart " +
+                "inner join hrmsubcompany sub on depart.subcompanyid1 = sub.id " +
+                "left join matrixtable_2 m2 on depart.id = m2.id " +
+                "left join hrmresource hrm on m2.bmfzr = hrm.id " +
+                "left join hrmjobtitles job on job.id = hrm.jobtitle " +
+                "where (depart.canceled is null or depart.canceled =0) and (sub.canceled is null or sub.canceled =0) ";
+        List<Object> paramList = new ArrayList<>();
+        String paramSql = "";
+        if (param.containsKey("paramSql")) {
+            paramSql = Util.null2String(param.get("paramSql"));
+            param.remove("paramSql");
+        }
+        String whereSql = this.buildWhereSql("", param, paramList);
+        log.info("通过参数查询部门信息：" + querySql + paramSql + whereSql + "  paramList ==>" + paramList);
+        recordSet.executeQuery(querySql + paramSql + whereSql, paramList);
+        int index = 0;
+        while (recordSet.next()) {
+            String mainId = recordSet.getString("id");
+            OrganizationEntity organizationEntity = recordSetToEntityByEntity(recordSet, OrganizationEntity.class);
+            organizationEntity.setSign("1");
+            int departChildCount = getDepartChildCount(mainId);
+            if (departChildCount > 0) {
+                organizationEntity.setHaveChildren("0");
+            } else {
+                organizationEntity.setHaveChildren("1");
+            }
+            organizationEntity.setPath(sourcePath + index++ + "_");
+            organizationList.add(organizationEntity);
+        }
+        return organizationList;
+    }
+
+    /**
+     * 构建查询sql语句
+     *
+     * @param tempSql
+     * @param whereParam     查询条件
+     * @param whereParamList 参数信息
+     * @return
+     */
+    public String buildWhereSql(String tempSql, Map<String, Object> whereParam, List<Object> whereParamList) {
+        StringBuilder whereBuilder = new StringBuilder(tempSql);
+        whereParam.forEach((k, v) -> {
+            if (v == null) {
+                whereBuilder.append(" and ").append(k);
+            } else {
+                whereBuilder.append(" and ").append(k).append(" = ? ");
+                whereParamList.add(v);
+            }
+        });
+        return whereBuilder.toString();
+    }
+
+    /**
+     * 通过列名将数据库结果集转换成指定的实体类
+     *
+     * @param recordSet 数据库结果集
+     * @param tClass    实体类文件
+     * @param <T>       泛型
+     * @return
+     */
+    public <T> T recordSetToEntityByEntity(RecordSet recordSet, Class<T> tClass) {
+        T res = null;
+        try {
+            String[] columnNames = recordSet.getColumnName();
+            if (tClass.equals(Map.class)) {
+                Map<String, Object> tempRes = new HashMap<>();
+                for (String columnName : columnNames) {
+                    tempRes.put(columnName, recordSet.getString(columnName));
+                }
+                res = (T) tempRes;
+            } else {
+                Field[] declaredFields = tClass.getDeclaredFields();
+                res = tClass.newInstance();
+                for (Field field : declaredFields) {
+                    field.setAccessible(true);
+                    FieldMapping annotation = field.getAnnotation(FieldMapping.class);
+                    if (annotation != null) {
+                        String value = annotation.value();
+                        String s = recordSet.getString(value);
+                        field.set(res, s);
+                    }
+                }
+            }
+        } catch (Exception e) {
+            log.info("实体类转换异常：", e);
+        }
+        return res;
+    }
+
+    /**
+     * 根据数据库类型拼接字符串
+     *
+     * @param dbType    数据库类型
+     * @param prefixStr 前缀
+     * @param suffixStr 后缀
+     * @return
+     */
+    public String getConcatStr(String dbType, String prefixStr, String suffixStr) {
+        String res = "";
+        StringBuilder stringBuilder = new StringBuilder();
+        if ("mysql".equals(dbType) || "oracle".equals(dbType)) {
+            stringBuilder.append("concat(")
+                    .append(prefixStr).append(",")
+                    .append(suffixStr).append(")");
+            res = stringBuilder.toString();
+        } else if ("sqlserver".equals(dbType)) {
+            stringBuilder.append("CONVERT(varchar(255),")
+                    .append(prefixStr).append(")").append("+")
+                    .append("CONVERT(varchar(255),")
+                    .append(suffixStr).append(")");
+            res = stringBuilder.toString();
+        }
+        return res;
+    }
+
+    /**
+     * 查询对应部门子部门数量
+     *
+     * @param departmentId 部门id
+     * @return
+     */
+    public int getDepartChildCount(String departmentId) {
+        int count = 0;
+        String querySql = "select count(*) from hrmdepartment where supdepid = ? and (canceled is null or canceled =0 )";
+//        log.info("查询对应部门子部门数量："+querySql+" departmentId:"+departmentId);
+        RecordSet recordSet = new RecordSet();
+        recordSet.executeQuery(querySql, departmentId);
+        if (recordSet.next()) {
+            count = Util.getIntValue(recordSet.getString(1), 0);
+        }
+        return count;
+    }
+
+    /**
+     * 查询对应分部子部门数量
+     *
+     * @param subCompanyId 分部id
+     * @return
+     */
+    public int getCompanyDepartChildCount(String subCompanyId) {
+        int count = 0;
+        String querySql = "select count(*) from hrmdepartment where subcompanyid1 = ? and (canceled is null or canceled =0 ) and (supdepid <= 0 or supdepid is null)";
+//        log.info("查询对应分部子部门数量："+querySql+" subCompanyId:"+subCompanyId);
+        RecordSet recordSet = new RecordSet();
+        recordSet.executeQuery(querySql, subCompanyId);
+        if (recordSet.next()) {
+            count = Util.getIntValue(recordSet.getString(1), 0);
+        }
+        return count;
+    }
+
+    /**
+     * 查询下级分部数量
+     *
+     * @param subCompanyId 分部id
+     * @return
+     */
+    public int getCompanyChildCount(String subCompanyId) {
+        int count = 0;
+        String querySql = "select count(*) from hrmsubcompany where supsubcomid = ? and (canceled is null or canceled =0 )";
+//        log.info("查询下级分部数量："+querySql+" subCompanyId:"+subCompanyId);
+        RecordSet recordSet = new RecordSet();
+        recordSet.executeQuery(querySql, subCompanyId);
+        if (recordSet.next()) {
+            count = Util.getIntValue(recordSet.getString(1), 0);
+        }
+        return count;
+    }
+
+}
diff --git a/src/main/youhong_ai_old_src/com/api/aiyh_pcn/organization/entity/OrganizationEntity.java b/src/main/youhong_ai_old_src/com/api/aiyh_pcn/organization/entity/OrganizationEntity.java
new file mode 100755
index 0000000..f899ee1
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/aiyh_pcn/organization/entity/OrganizationEntity.java
@@ -0,0 +1,94 @@
+package com.api.aiyh_pcn.organization.entity;
+
+import com.api.aiyh_pcn.organization.annotation.FieldMapping;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author XiaoBokang
+ * @create 2022/5/2 13:33
+ */
+
+@Data
+public class OrganizationEntity {
+
+    /**
+     * 唯一标识
+     */
+    @FieldMapping("orgCode")
+    private String id;
+
+    /**
+     * 部门、分部名称
+     */
+    @FieldMapping("orgName")
+    private String orgName;
+
+    /**
+     * 部门、分部编码
+     */
+    @FieldMapping("orgCode")
+    private String orgCode;
+
+    /**
+     * 标识，0:分部，1:部门
+     */
+    private String sign;
+
+    /**
+     * 部门、分部负责人名称
+     */
+    @FieldMapping("orgLeader")
+    private String orgLeader;
+
+    /**
+     * 部门、分部负责人ID
+     */
+    @FieldMapping("userId")
+    private String userId;
+
+    /**
+     * 部门、分部负责人头像
+     */
+    @FieldMapping("messageUrl")
+    private String messageUrl;
+
+    /**
+     * 上级机构
+     */
+    @FieldMapping("highLevelOrg")
+    private String highLevelOrg;
+
+    /**
+     * 在职人数
+     */
+    @FieldMapping("employeeCount")
+    private String employeeCount;
+
+    /**
+     * 总人数
+     */
+    @FieldMapping("totalCount")
+    private String totalCount;
+
+    /**
+     * 是否有下级机构 0:存在，1:不存在
+     */
+    private String haveChildren;
+
+    /**
+     * 路径
+     */
+    private String path;
+
+
+    /**
+     * 岗位名称
+     */
+    @FieldMapping("jobTitleName")
+    private String jobTitleName;
+
+    private List<OrganizationEntity> children;
+
+}
diff --git a/src/main/youhong_ai_old_src/com/api/aiyh_pcn/organization/exception/RequestException.java b/src/main/youhong_ai_old_src/com/api/aiyh_pcn/organization/exception/RequestException.java
new file mode 100755
index 0000000..34666ba
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/aiyh_pcn/organization/exception/RequestException.java
@@ -0,0 +1,21 @@
+package com.api.aiyh_pcn.organization.exception;
+
+/**
+ * @author XiaoBokang
+ * @create 2022/1/12 11:06
+ */
+
+public class RequestException extends RuntimeException {
+    public RequestException(String message) {
+        super(message);
+    }
+
+    public RequestException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    @Override
+    public synchronized Throwable fillInStackTrace() {
+        return super.fillInStackTrace();
+    }
+}
diff --git a/src/main/youhong_ai_old_src/com/api/aiyh_pcn/organization/service/OrganizationService.java b/src/main/youhong_ai_old_src/com/api/aiyh_pcn/organization/service/OrganizationService.java
new file mode 100755
index 0000000..1e62386
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/aiyh_pcn/organization/service/OrganizationService.java
@@ -0,0 +1,38 @@
+package com.api.aiyh_pcn.organization.service;
+
+import com.api.aiyh_pcn.organization.entity.OrganizationEntity;
+import weaver.hrm.User;
+
+import java.util.List;
+
+/**
+ * @author XiaoBokang
+ * @create 2022/5/2 13:02
+ */
+
+public interface OrganizationService {
+
+    List<OrganizationEntity> queryList(User user);
+
+    /**
+     * 查询组织架构信息两层信息
+     *
+     * @return
+     */
+    List<OrganizationEntity> initList();
+
+    /**
+     * 查询所有顶层分部
+     *
+     * @return
+     */
+    List<OrganizationEntity> getTopList(User user);
+
+    /**
+     * 查询子级机构信息
+     *
+     * @return
+     */
+    List<OrganizationEntity> getChildList(OrganizationEntity organizationEntity);
+
+}
diff --git a/src/main/youhong_ai_old_src/com/api/aiyh_pcn/organization/service/impl/OrganizationServiceImpl.java b/src/main/youhong_ai_old_src/com/api/aiyh_pcn/organization/service/impl/OrganizationServiceImpl.java
new file mode 100755
index 0000000..623bce5
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/aiyh_pcn/organization/service/impl/OrganizationServiceImpl.java
@@ -0,0 +1,153 @@
+package com.api.aiyh_pcn.organization.service.impl;
+
+import com.api.aiyh_pcn.organization.cmd.OrganizationCmd;
+import com.api.aiyh_pcn.organization.entity.OrganizationEntity;
+import com.api.aiyh_pcn.organization.service.OrganizationService;
+import com.api.aiyh_pcn.organization.utils.CommonUtil;
+import org.h2.util.StringUtils;
+import weaver.hrm.User;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author XiaoBokang
+ * @create 2022/5/2 13:03
+ */
+
+public class OrganizationServiceImpl implements OrganizationService {
+
+    private final OrganizationCmd organizationCmd = new OrganizationCmd();
+
+    @Override
+    public List<OrganizationEntity> queryList(User user) {
+        int subcompany = user.getUserSubCompany1();
+        List<OrganizationEntity> organizationEntityList = organizationCmd.queryList();
+        List<OrganizationEntity> organizationTree = CommonUtil.listToTree(organizationEntityList, OrganizationEntity::getOrgCode, OrganizationEntity::getHighLevelOrg,
+                OrganizationEntity::getChildren, OrganizationEntity::setChildren,
+                supCode -> StringUtils.isNullOrEmpty(supCode) || "root".equals(supCode));
+        return organizationTree;
+    }
+
+    @Override
+    public List<OrganizationEntity> initList() {
+        List<OrganizationEntity> organizationEntityList = new ArrayList<>();
+        OrganizationEntity companyMsg = organizationCmd.getCompanyMsg();
+        if (companyMsg != null) {
+            companyMsg.setPath("");
+            organizationEntityList.add(companyMsg);
+            Map<String, Object> param = new HashMap<>();
+            // 查询顶层分部
+            param.put("sub.supsubcomid", 0);
+            List<OrganizationEntity> topSubCompanyList = organizationCmd.getSubCompanyListByParam(param, "");
+            organizationEntityList.addAll(topSubCompanyList);
+            for (OrganizationEntity organizationEntity : topSubCompanyList) {
+                String orgCode = organizationEntity.getOrgCode();
+                String supId = orgCode.substring(orgCode.lastIndexOf("_") + 1);
+                // 查询下级分部
+                Map<String, Object> queryParam = new HashMap<>();
+                queryParam.put("sub.supsubcomid", supId);
+                List<OrganizationEntity> subCompanyListByParam = organizationCmd.getSubCompanyListByParam(queryParam, "");
+                organizationEntityList.addAll(subCompanyListByParam);
+                // 查询下级部门
+                queryParam.clear();
+                queryParam.put("depart.subcompanyid1", supId);
+                queryParam.put("paramSql", " and (supdepid <= 0 or supdepid is null)");
+                List<OrganizationEntity> departListByParam = organizationCmd.getDepartListByParam(queryParam, "");
+                organizationEntityList.addAll(departListByParam);
+            }
+        }
+        List<OrganizationEntity> organizationTree = CommonUtil.listToTree(organizationEntityList, OrganizationEntity::getOrgCode, OrganizationEntity::getHighLevelOrg,
+                OrganizationEntity::getChildren, OrganizationEntity::setChildren,
+                supCode -> StringUtils.isNullOrEmpty(supCode) || "root".equals(supCode));
+        initPath(organizationTree, "");
+        return organizationTree;
+    }
+
+    @Override
+    public List<OrganizationEntity> getTopList(User user) {
+        List<OrganizationEntity> organizationEntityList = new ArrayList<>();
+        Map<String, Object> param = new HashMap<>();
+        // 查询顶层分部
+        int userId = user.getUID();
+        if (userId == 1) {
+            param.put("sub.supsubcomid", 0);
+        } else {
+            param.put("(sub.id = " +
+                    (user.getUserSubCompany1() <= 0 ? user.getUserSubCompany2() : user.getUserSubCompany1())
+                    + " or sub.supsubcomid = " +
+                    (user.getUserSubCompany1() <= 0 ? user.getUserSubCompany2() : user.getUserSubCompany1()) + ")", null);
+        }
+        List<OrganizationEntity> topSubCompanyList = organizationCmd.getSubCompanyListByParam(param, "");
+        organizationEntityList.addAll(topSubCompanyList);
+        for (OrganizationEntity organizationEntity : topSubCompanyList) {
+            String orgCode = organizationEntity.getOrgCode();
+            String supId = orgCode.substring(orgCode.lastIndexOf("_") + 1);
+            // 查询下级分部
+            Map<String, Object> queryParam = new HashMap<>();
+            queryParam.put("sub.supsubcomid", supId);
+            List<OrganizationEntity> subCompanyListByParam = organizationCmd.getSubCompanyListByParam(queryParam, "");
+            organizationEntityList.addAll(subCompanyListByParam);
+            // 查询下级部门
+            queryParam.clear();
+            queryParam.put("depart.subcompanyid1", supId);
+            queryParam.put("paramSql", " and (supdepid <= 0 or supdepid is null)");
+            List<OrganizationEntity> departListByParam = organizationCmd.getDepartListByParam(queryParam, "");
+            organizationEntityList.addAll(departListByParam);
+        }
+        List<OrganizationEntity> organizationTree = CommonUtil.listToTree(organizationEntityList, OrganizationEntity::getOrgCode, OrganizationEntity::getHighLevelOrg,
+                OrganizationEntity::getChildren, OrganizationEntity::setChildren,
+                supCode -> StringUtils.isNullOrEmpty(supCode) || "sub_0".equals(supCode));
+        initPath(organizationTree, "");
+        return organizationTree;
+    }
+
+    /**
+     * 初始化path
+     *
+     * @param organizationTree 组织结构树
+     */
+    private void initPath(List<OrganizationEntity> organizationTree, String parentPath) {
+        int i = 0;
+        for (OrganizationEntity organizationEntity : organizationTree) {
+            List<OrganizationEntity> children = organizationEntity.getChildren();
+            organizationEntity.setPath(parentPath + i++ + "_");
+            if (children == null || children.size() == 0) {
+                continue;
+            }
+            initPath(children, organizationEntity.getPath());
+        }
+    }
+
+    @Override
+    public List<OrganizationEntity> getChildList(OrganizationEntity organizationEntity) {
+        List<OrganizationEntity> organizationEntityList = new ArrayList<>();
+        String sign = organizationEntity.getSign();
+        String orgCode = organizationEntity.getOrgCode();
+        String orgId = orgCode.substring(orgCode.lastIndexOf("_") + 1);
+        String sourcePath = organizationEntity.getPath();
+        if ("0".equals(sign)) {
+            // 查询下级分部
+            Map<String, Object> queryParam = new HashMap<>();
+            queryParam.put("sub.supsubcomid", orgId);
+            List<OrganizationEntity> subCompanyListByParam = organizationCmd.getSubCompanyListByParam(queryParam, sourcePath);
+            organizationEntityList.addAll(subCompanyListByParam);
+            // 查询下级部门
+            queryParam.clear();
+            queryParam.put("depart.subcompanyid1", orgId);
+            queryParam.put("paramSql", " and (supdepid <= 0 or supdepid is null)");
+            List<OrganizationEntity> departListByParam = organizationCmd.getDepartListByParam(queryParam, sourcePath);
+            organizationEntityList.addAll(departListByParam);
+        } else {
+            // 查询下级部门
+            Map<String, Object> queryParam = new HashMap<>();
+            queryParam.put("depart.supdepid", orgId);
+            List<OrganizationEntity> departListByParam = organizationCmd.getDepartListByParam(queryParam, sourcePath);
+            organizationEntityList.addAll(departListByParam);
+        }
+        return organizationEntityList;
+    }
+
+}
diff --git a/src/main/youhong_ai_old_src/com/api/aiyh_pcn/organization/utils/CommonUtil.java b/src/main/youhong_ai_old_src/com/api/aiyh_pcn/organization/utils/CommonUtil.java
new file mode 100755
index 0000000..616c11e
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/aiyh_pcn/organization/utils/CommonUtil.java
@@ -0,0 +1,112 @@
+package com.api.aiyh_pcn.organization.utils;
+
+import java.util.*;
+import java.util.function.BiConsumer;
+import java.util.function.Function;
+import java.util.function.Predicate;
+
+/**
+ * @author XiaoBokang
+ * @create 2022/5/2 17:18
+ */
+
+public class CommonUtil {
+    /**
+     * 将list转化为树形list
+     *
+     * @param dataList    元数据
+     * @param getIdFn     获取元数据的id
+     * @param getParentId 获取父类id的方法
+     * @param setChildFn  设置子结点方法
+     * @param getChildFn  获取子结点方法
+     * @param predicate   判断是否属于根结点的方法
+     * @param <T>         list的泛型
+     * @param <K>         元数据id的泛型
+     * @return 树形的list
+     */
+    public static <T, K> List<T> listToTree(List<T> dataList, Function<T, K> getIdFn,
+                                            Function<T, K> getParentId, Function<T, List<T>> getChildFn,
+                                            BiConsumer<T, List<T>> setChildFn, Predicate<K> predicate) {
+        if (dataList == null || dataList.isEmpty() || dataList.size() == 1) {
+            return dataList;
+        }
+        return buildTree(dataList, new HashMap<>(dataList.size()), new HashMap<>(dataList.size()),
+                0, getIdFn, getParentId, getChildFn, setChildFn, predicate);
+    }
+
+    /**
+     * 将list转为树形list
+     *
+     * @param dataList    元数据list
+     * @param dataMap     数据map
+     * @param childMap    已添加过的子元素
+     * @param index       从第几个开始格式化
+     * @param getIdFn     获取id的方法
+     * @param getParentId 获取父类id的方法
+     * @param getChildFn  获取子结点方法
+     * @param setChildFn  设置孩子节点的方法
+     * @param predicate   判断是否属于根节点的方法
+     * @param <T>         list的泛型
+     * @param <K>         泛型的id的类型
+     * @return 树形结构
+     */
+    private static <T, K> List<T> buildTree(List<T> dataList, Map<K, T> dataMap, Map<K, T> childMap, int index, Function<T, K> getIdFn,
+                                            Function<T, K> getParentId, Function<T, List<T>> getChildFn,
+                                            BiConsumer<T, List<T>> setChildFn, Predicate<K> predicate) {
+        List<T> treeList = new ArrayList<>(dataList.size());
+        while (index < dataList.size()) {
+            T item = dataList.get(index);
+            index++;
+            K id = getIdFn.apply(item);
+            K parentId = getParentId.apply(item);
+            if (dataMap.containsKey(id)) {
+                continue;
+            }
+            dataMap.put(id, item);
+//            判断是否属于根节点，如果是根节点，则将数据添加到树中
+            if (predicate.test(parentId)) {
+                if (childMap.containsKey(id)) {
+                    continue;
+                }
+                treeList.add(item);
+                childMap.put(id, item);
+            } else {
+//             如果不是根节点，则通过id查找到父级
+                T parent = dataMap.get(parentId);
+                if (Objects.isNull(parent)) {
+//                    如果父级为空，则说明他的父级还没有遍历到,需要从之后的数据进行遍历，直到找到父级为止
+                    List<T> list = buildTree(dataList, dataMap, childMap, index, getIdFn, getParentId, getChildFn, setChildFn, predicate);
+                    parent = dataMap.get(parentId);
+                    if (Objects.isNull(parent)) {
+//                        如果还是没有查询到父节点，则表明是顶层节点，将他添加到顶层节点中
+                        treeList.add(item);
+                    } else {
+//                        如果找到了父节点，则将自己挂到父节点上
+                        if (childMap.containsKey(id)) {
+                            continue;
+                        }
+                        List<T> childList = Optional.ofNullable(getChildFn.apply(parent)).orElse(new ArrayList<>());
+                        childList.add(item);
+                        setChildFn.accept(parent, childList);
+                        childMap.put(id, item);
+                    }
+//                    如果查找的list不为空并且有值，那就说明属于根节点
+                    if (list != null && list.size() > 0) {
+                        treeList.addAll(list);
+                    }
+                } else {
+//                        如果找到了父节点，则将自己挂到父节点上
+                    if (childMap.containsKey(id)) {
+                        continue;
+                    }
+                    List<T> childList = Optional.ofNullable(getChildFn.apply(parent)).orElse(new ArrayList<>());
+                    childList.add(item);
+                    setChildFn.accept(parent, childList);
+                    childMap.put(id, item);
+                }
+            }
+        }
+        return treeList;
+    }
+
+}
diff --git a/src/main/youhong_ai_old_src/com/api/aiyh_pcn/organization/utils/JsonResult.java b/src/main/youhong_ai_old_src/com/api/aiyh_pcn/organization/utils/JsonResult.java
new file mode 100755
index 0000000..9d36723
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/aiyh_pcn/organization/utils/JsonResult.java
@@ -0,0 +1,75 @@
+package com.api.aiyh_pcn.organization.utils;
+
+import com.alibaba.fastjson.JSONObject;
+
+
+/**
+ * @author XiaoBokang
+ * @create 2021/9/9 19:33
+ */
+
+public class JsonResult {
+
+    private Integer code;
+    private String message;
+    private Object Data;
+
+    public JsonResult(Integer code, String message, Object data) {
+        this.code = code;
+        this.message = message;
+        Data = data;
+    }
+
+    public static String success(String message) {
+        return JSONObject.toJSONString(new JsonResult(200, message, null));
+    }
+
+    public static String success() {
+        return JSONObject.toJSONString(new JsonResult(200, "success", null));
+    }
+
+    public static String successData(String message, Object data) {
+        return JSONObject.toJSONString(new JsonResult(200, message, data));
+    }
+
+    public static String successData(Object data) {
+        return JSONObject.toJSONString(new JsonResult(200, "success", data));
+    }
+
+    public static String error(int code, String message) {
+        return JSONObject.toJSONString(new JsonResult(code, message, null));
+    }
+
+    public static String error(String message) {
+        return JSONObject.toJSONString(new JsonResult(500, message, null));
+    }
+
+    public static String error() {
+        return JSONObject.toJSONString(new JsonResult(500, "fail", null));
+    }
+
+
+    public Integer getCode() {
+        return code;
+    }
+
+    public void setCode(Integer code) {
+        this.code = code;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+
+    public Object getData() {
+        return Data;
+    }
+
+    public void setData(Object data) {
+        Data = data;
+    }
+}
diff --git a/src/main/youhong_ai_old_src/com/api/aiyh_pcn/organization/utils/LogUtil.java b/src/main/youhong_ai_old_src/com/api/aiyh_pcn/organization/utils/LogUtil.java
new file mode 100755
index 0000000..0a95780
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/aiyh_pcn/organization/utils/LogUtil.java
@@ -0,0 +1,45 @@
+package com.api.aiyh_pcn.organization.utils;
+
+import org.apache.log4j.*;
+
+import java.io.File;
+
+/**
+ * @author XiaoBokang
+ * @create 2022/3/3 14:16
+ */
+
+public class LogUtil {
+
+    private static volatile Logger log = null;
+
+    /**
+     * 获取日志对象
+     *
+     * @return 日志对象
+     */
+    public static Logger getLogger() {
+        if (log == null) {
+            synchronized (LogUtil.class) {
+                if (log == null) {
+                    DailyRollingFileAppender appender = new DailyRollingFileAppender();
+                    log = Logger.getLogger("xbk_cus");
+                    appender.setName("xbk_cus");
+                    appender.setEncoding("UTF-8");
+                    appender.setDatePattern("'_'yyyyMMdd'.log'");
+                    appender.setFile(weaver.general.GCONST.getLogPath() + "cus" + File.separator + "util_cus" + File.separator + "cus.log");
+                    appender.setThreshold(Priority.DEBUG);
+                    appender.setLayout(new PatternLayout("[%-5p] [%d{yyyy-MM-dd HH:mm:ss,SSS}] [%r] [Thread:%t][%F.%M:%L] ==> : %m %x %n"));
+                    appender.setAppend(true);
+                    appender.activateOptions();
+                    log.addAppender(appender);
+                    boolean enableDebug = true;
+                    if (!enableDebug) {
+                        log.setLevel(Level.INFO);
+                    }
+                }
+            }
+        }
+        return log;
+    }
+}
diff --git a/src/main/youhong_ai_old_src/com/api/aiyh_pcn/organization/web/OrganizationController.java b/src/main/youhong_ai_old_src/com/api/aiyh_pcn/organization/web/OrganizationController.java
new file mode 100755
index 0000000..945b627
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/aiyh_pcn/organization/web/OrganizationController.java
@@ -0,0 +1,84 @@
+package com.api.aiyh_pcn.organization.web;
+
+import com.alibaba.fastjson.JSON;
+import com.api.aiyh_pcn.organization.entity.OrganizationEntity;
+import com.api.aiyh_pcn.organization.service.OrganizationService;
+import com.api.aiyh_pcn.organization.service.impl.OrganizationServiceImpl;
+import com.api.aiyh_pcn.organization.utils.JsonResult;
+import com.api.aiyh_pcn.organization.utils.LogUtil;
+import io.swagger.v3.oas.annotations.parameters.RequestBody;
+import org.apache.log4j.Logger;
+import weaver.hrm.HrmUserVarify;
+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;
+import javax.ws.rs.core.MediaType;
+import java.util.List;
+
+
+/**
+ * @author XiaoBokang
+ * @create 2022/5/2 12:52
+ */
+
+@Path("/xbk/organization")
+public class OrganizationController {
+
+    private final Logger log = LogUtil.getLogger();
+    private final OrganizationService organizationService = new OrganizationServiceImpl();
+
+    @GET
+    @Path(("/getList"))
+    @Produces(MediaType.APPLICATION_JSON)
+    public String getOrganization(@Context HttpServletRequest request, @Context HttpServletResponse response) {
+        log.info("进入请求成功");
+        try {
+            User user = HrmUserVarify.getUser(request, response);
+            List<OrganizationEntity> organizationEntityList = organizationService.queryList(user);
+            log.info("组织结构数据查询结果：" + JSON.toJSONString(organizationEntityList));
+            return JsonResult.successData(organizationEntityList);
+        } catch (Exception e) {
+            log.info("请求出现异常：", e);
+            return JsonResult.error();
+        }
+
+    }
+
+    @GET
+    @Path(("/getOrgList"))
+    @Produces(MediaType.APPLICATION_JSON)
+    public String getOrganizationList(@Context HttpServletRequest request, @Context HttpServletResponse response) {
+        log.info("进入请求成功");
+        User user = HrmUserVarify.getUser(request, response);
+        try {
+            List<OrganizationEntity> organizationEntityList = organizationService.getTopList(user);
+            log.info("组织结构数据查询结果：" + JSON.toJSONString(organizationEntityList));
+            return JsonResult.successData(organizationEntityList);
+        } catch (Exception e) {
+            log.info("请求出现异常：", e);
+            return JsonResult.error();
+        }
+    }
+
+    @POST
+    @Path(("/getChildList"))
+    @Produces(MediaType.APPLICATION_JSON)
+    public String getOrgChildList(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody OrganizationEntity organizationEntity) {
+        log.info("进入请求成功,param ==>" + organizationEntity);
+        try {
+            List<OrganizationEntity> organizationEntityList = organizationService.getChildList(organizationEntity);
+            log.info("子级组织结构数据查询结果：" + JSON.toJSONString(organizationEntityList));
+            return JsonResult.successData(organizationEntityList);
+        } catch (Exception e) {
+            log.info("请求出现异常：", e);
+            return JsonResult.error();
+        }
+
+    }
+}
diff --git a/src/main/youhong_ai_old_src/com/api/aiyh_pcn/patentWall/controller/ClassificationWallController.java b/src/main/youhong_ai_old_src/com/api/aiyh_pcn/patentWall/controller/ClassificationWallController.java
new file mode 100644
index 0000000..212ef7f
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/aiyh_pcn/patentWall/controller/ClassificationWallController.java
@@ -0,0 +1,56 @@
+package com.api.aiyh_pcn.patentWall.controller;
+
+import aiyh.utils.ApiResult;
+import aiyh.utils.Util;
+import com.api.aiyh_pcn.patentWall.dao.GovernmentSourceDto;
+import com.api.aiyh_pcn.patentWall.service.ClassificationWallService;
+import com.api.aiyh_pcn.patentWall.vo.ClassificationWallVo;
+import io.swagger.v3.oas.annotations.parameters.RequestBody;
+import weaver.hrm.HrmUserVarify;
+import weaver.hrm.User;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.ws.rs.*;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+
+/**
+ * <p>分类源墙</p>
+ * <p>create 2022/5/20 17:30</p>
+ *
+ * @author ayh
+ */
+
+@Path("/aiyh/classification-source")
+public class ClassificationWallController {
+
+    private ClassificationWallService service = new ClassificationWallService();
+
+
+    @Path("/source-list")
+    @POST
+    @Produces(MediaType.APPLICATION_JSON)
+    @Consumes(MediaType.APPLICATION_JSON)
+    public String getSource(@Context HttpServletRequest request, @Context HttpServletResponse response,
+                            @RequestBody GovernmentSourceDto governmentSourceDto){
+        try {
+            User user = HrmUserVarify.getUser(request, response);
+            ClassificationWallVo classificationWallVo = service.getSource(governmentSourceDto,user);
+            return ApiResult.success(classificationWallVo);
+        }catch (Exception e){
+            e.printStackTrace();
+            Util.getLogger().error("==================查询政府资源失败!===================");
+            return ApiResult.error("查询失败！");
+        }
+    }
+
+    @GET
+    @Path("/clear-catch")
+    @Produces(MediaType.APPLICATION_JSON)
+    @Consumes(MediaType.APPLICATION_JSON)
+    public String clearCatchConfig(){
+        service.clearSourceWallConf();
+        return ApiResult.success(true);
+    }
+}
diff --git a/src/main/youhong_ai_old_src/com/api/aiyh_pcn/patentWall/controller/GovernmentSourceController.java b/src/main/youhong_ai_old_src/com/api/aiyh_pcn/patentWall/controller/GovernmentSourceController.java
new file mode 100644
index 0000000..b5789f5
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/aiyh_pcn/patentWall/controller/GovernmentSourceController.java
@@ -0,0 +1,56 @@
+package com.api.aiyh_pcn.patentWall.controller;
+
+import aiyh.utils.ApiResult;
+import aiyh.utils.Util;
+import com.api.aiyh_pcn.patentWall.dao.GovernmentSourceDto;
+import com.api.aiyh_pcn.patentWall.service.GovernmentSourceService;
+import com.api.aiyh_pcn.patentWall.vo.GovernmentSourceVo;
+import io.swagger.v3.oas.annotations.parameters.RequestBody;
+import weaver.hrm.HrmUserVarify;
+import weaver.hrm.User;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.ws.rs.*;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+
+/**
+ * <p>政府资源墙</p>
+ * <p>create 2022/5/20 17:30</p>
+ *
+ * @author ayh
+ */
+
+@Path("/aiyh/government-source")
+public class GovernmentSourceController {
+
+    private final GovernmentSourceService service = new GovernmentSourceService();
+
+
+    @Path("/source-list")
+    @POST
+    @Produces(MediaType.APPLICATION_JSON)
+    @Consumes(MediaType.APPLICATION_JSON)
+    public String getSource(@Context HttpServletRequest request, @Context HttpServletResponse response,
+                            @RequestBody GovernmentSourceDto governmentSourceDto){
+        try {
+            User user = HrmUserVarify.getUser(request, response);
+            GovernmentSourceVo governmentSourceVo = service.getSource(governmentSourceDto,user);
+            return ApiResult.success(governmentSourceVo);
+        }catch (Exception e){
+            e.printStackTrace();
+            Util.getLogger().error("==================查询政府资源失败!===================");
+            return ApiResult.error("查询失败！");
+        }
+    }
+
+    @GET
+    @Path("/clear-catch")
+    @Produces(MediaType.APPLICATION_JSON)
+    @Consumes(MediaType.APPLICATION_JSON)
+    public String clearCatchConfig(){
+        service.clearSourceWallConf();
+        return ApiResult.success(true);
+    }
+}
diff --git a/src/main/youhong_ai_old_src/com/api/aiyh_pcn/patentWall/controller/PatentWallController.java b/src/main/youhong_ai_old_src/com/api/aiyh_pcn/patentWall/controller/PatentWallController.java
new file mode 100644
index 0000000..725022d
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/aiyh_pcn/patentWall/controller/PatentWallController.java
@@ -0,0 +1,71 @@
+package com.api.aiyh_pcn.patentWall.controller;
+
+import aiyh.utils.ApiResult;
+import aiyh.utils.Util;
+import com.api.aiyh_pcn.patentWall.dto.FilterWhere;
+import com.api.aiyh_pcn.patentWall.service.PatentWallService;
+import com.api.aiyh_pcn.patentWall.vo.PatentVO;
+import com.api.aiyh_pcn.patentWall.vo.SearchInputVO;
+import io.swagger.v3.oas.annotations.parameters.RequestBody;
+import org.apache.log4j.Logger;
+import weaver.hrm.HrmUserVarify;
+import weaver.hrm.User;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.ws.rs.*;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import java.util.List;
+
+/**
+ * @author EBU7-dev1-ayh
+ * @create 2021/11/25 0025 15:18
+ * 专利墙请求入口
+ */
+
+
+@Path("/patten/")
+public class PatentWallController {
+	private  final PatentWallService patentWallService = new PatentWallService();
+	private final Logger logger =  Util.getLogger();
+
+	@Path("/getSearchList/{prefix}")
+	@GET
+	@Produces(MediaType.APPLICATION_JSON)
+	public String getPatentList(@Context HttpServletRequest request, @Context HttpServletResponse response,
+	                            @PathParam("prefix") String prefix){
+		try {
+            User user = HrmUserVarify.getUser(request, response);
+            int languageId = user.getLanguage();
+            List<SearchInputVO> result = patentWallService.getSearchList(prefix,languageId);
+            return ApiResult.success(result);
+        }catch (Exception e){
+            logger.error("捕获到异常信息：" + Util.getErrString(e));
+            return ApiResult.error("捕获到调用异常信息");
+        }
+	}
+
+	@Path("/getList/{prefix}")
+	@POST
+	@Produces(MediaType.APPLICATION_JSON)
+	@Consumes(MediaType.APPLICATION_JSON)
+	public String getPatentList(@RequestBody List<FilterWhere> filterWheres, @PathParam("prefix") String prefix){
+	    try {
+            List<PatentVO> result = patentWallService.getList(filterWheres,prefix);
+            return ApiResult.success(result);
+        }catch (Exception e){
+	       logger.error("捕获到异常信息：" + Util.getErrString(e));
+	        return ApiResult.error("捕获到调用异常信息");
+        }
+	}
+
+	@Path("/clearConf")
+	@GET
+	@Produces(MediaType.APPLICATION_JSON)
+	public String clearPatentWallConf(){
+		patentWallService.clearPatentWallConf();
+		patentWallService.clearPatentWallSerachConf();
+		return ApiResult.success("清除配置缓存成功！");
+	}
+}
diff --git a/src/main/youhong_ai_old_src/com/api/aiyh_pcn/patentWall/dao/ClassificationWallMapper.java b/src/main/youhong_ai_old_src/com/api/aiyh_pcn/patentWall/dao/ClassificationWallMapper.java
new file mode 100644
index 0000000..575dde6
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/aiyh_pcn/patentWall/dao/ClassificationWallMapper.java
@@ -0,0 +1,71 @@
+package com.api.aiyh_pcn.patentWall.dao;
+
+import aiyh.utils.annotation.recordset.ParamMapper;
+import aiyh.utils.annotation.recordset.Select;
+import aiyh.utils.annotation.recordset.SqlMapper;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p></p>
+ * <p>create 2022/5/22 17:03</p>
+ *
+ * @author ayh
+ */
+
+@SqlMapper
+public interface ClassificationWallMapper {
+
+    @Select("SELECT u2.* " +
+            "FROM( " +
+            "     SELECT  " +
+            " @ids AS p_ids, " +
+            " (SELECT @ids := GROUP_CONCAT(id) FROM $t{table} WHERE FIND_IN_SET(sjleib, @ids)) AS c_ids, " +
+            " @l := @l+1 AS LEVEL " +
+            "     FROM $t{table}, (SELECT @ids := #{dataId}, @l := 0 ) b  " +
+//            "     WHERE @ids IS NOT NULL " +
+            "    ) u1 " +
+            "JOIN $t{table} u2 " +
+            "ON FIND_IN_SET(u2.id, u1.p_ids) limit #{start},#{size}")
+    List<Map<String,Object>> selectDataList(
+            @ParamMapper("table") String tableName,
+            @ParamMapper("start") Integer start,
+            @ParamMapper("size") Integer size,
+            @ParamMapper("dataId") Integer dataId
+    );
+
+    /**
+     * <h2>查询总数</h2>
+     * @param tableName 表明
+     * @param dataId 数据ID
+     * @return
+     */
+    @Select("SELECT count(u2.id) " +
+            "FROM( " +
+            "     SELECT  " +
+            " @ids AS p_ids, " +
+            " (SELECT @ids := GROUP_CONCAT(id) FROM $t{table} WHERE FIND_IN_SET(sjleib, @ids)) AS c_ids, " +
+            " @l := @l+1 AS LEVEL " +
+            "     FROM $t{table}, (SELECT @ids := #{dataId}, @l := 0 ) b  " +
+//            "     WHERE @ids IS NOT NULL " +
+            "    ) u1 " +
+            "JOIN $t{table} u2 " +
+            "ON FIND_IN_SET(u2.id, u1.p_ids) ")
+    Integer selectDataCount(
+            @ParamMapper("table") String tableName,
+            @ParamMapper("dataId") Integer dataId
+    );
+
+    @Select("select * from $t{tableName}  limit #{start},#{size}")
+    List<Map<String, Object>> selectAllDataList(
+            @ParamMapper("tableName") String tableName,
+            @ParamMapper("start") Integer start,
+            @ParamMapper("size") Integer size
+    );
+
+    @Select("select count(id) from $t{tableName}")
+    Integer selectAllDataCount(
+            @ParamMapper("tableName") String tableName
+    );
+}
diff --git a/src/main/youhong_ai_old_src/com/api/aiyh_pcn/patentWall/dao/GovernmentSourceDto.java b/src/main/youhong_ai_old_src/com/api/aiyh_pcn/patentWall/dao/GovernmentSourceDto.java
new file mode 100644
index 0000000..da0fb85
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/aiyh_pcn/patentWall/dao/GovernmentSourceDto.java
@@ -0,0 +1,18 @@
+package com.api.aiyh_pcn.patentWall.dao;
+
+import lombok.Data;
+
+/**
+ * <p></p>
+ * <p>create 2022/5/22 15:32</p>
+ *
+ * @author ayh
+ */
+
+@Data
+public class GovernmentSourceDto {
+
+    private Integer page;
+    private Integer pageSize;
+    private Integer dataId;
+}
diff --git a/src/main/youhong_ai_old_src/com/api/aiyh_pcn/patentWall/dao/PatentWallMapping.java b/src/main/youhong_ai_old_src/com/api/aiyh_pcn/patentWall/dao/PatentWallMapping.java
new file mode 100644
index 0000000..106f6b0
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/aiyh_pcn/patentWall/dao/PatentWallMapping.java
@@ -0,0 +1,44 @@
+package com.api.aiyh_pcn.patentWall.dao;
+
+import aiyh.utils.Util;
+import aiyh.utils.zwl.common.ToolUtil;
+import weaver.conn.RecordSet;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author EBU7-dev1-ayh
+ * @create 2021/11/25 0025 15:28
+ */
+
+public class PatentWallMapping {
+    private final ToolUtil toolUtil = new ToolUtil();
+
+    public List<Map<String, Object>> getAllList(String tableName) {
+        RecordSet rs = new RecordSet();
+        String query = "select * from " + tableName;
+        rs.executeQuery(query);
+        return Util.recordSet2MapList(rs);
+    }
+
+    public List<Map<String, Object>> getListByFilterWhere(StringBuilder whereBuilder, List<String> args,
+        String tableName) {
+        RecordSet rs = new RecordSet();
+        String query = "select * from " + tableName + whereBuilder.toString().replace(" where  add ", " where ");
+        rs.executeQuery(query, args);
+        toolUtil.writeDebuggerLog(String.format("执行SQL： {%s} ---> 参数： {%s}", query, args));
+        return Util.recordSet2MapList(rs);
+    }
+
+    public List<Map<String, Object>> getSelectOptions(String dataResource, String dbFieldName) {
+        RecordSet rs = new RecordSet();
+        String query = "select wbf.id,wbf.fieldname,wbf.fieldlabel,wb.tablename, " + "ws.selectname,ws.selectvalue "
+            + "from workflow_billfield wbf " + "left join workflow_bill wb on wbf.billid = wb.id "
+            + "left join workflow_selectitem ws on ws.fieldid = wbf.id " + "where wb.tablename = ? and fieldname = ? ";
+        rs.executeQuery(query, dataResource, dbFieldName);
+        toolUtil
+            .writeDebuggerLog(String.format("执行SQL： {%s} ---> 参数： {%s}", query, dataResource + " -- " + dbFieldName));
+        return Util.recordSet2MapList(rs);
+    }
+}
diff --git a/src/main/youhong_ai_old_src/com/api/aiyh_pcn/patentWall/dao/SourceWallMapper.java b/src/main/youhong_ai_old_src/com/api/aiyh_pcn/patentWall/dao/SourceWallMapper.java
new file mode 100644
index 0000000..0f3b596
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/aiyh_pcn/patentWall/dao/SourceWallMapper.java
@@ -0,0 +1,65 @@
+package com.api.aiyh_pcn.patentWall.dao;
+
+import aiyh.utils.annotation.recordset.ParamMapper;
+import aiyh.utils.annotation.recordset.Select;
+import aiyh.utils.annotation.recordset.SqlMapper;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p></p>
+ * <p>create 2022/5/22 17:03</p>
+ *
+ * @author ayh
+ */
+
+@SqlMapper
+public interface SourceWallMapper {
+
+    @Select("SELECT u2.* " +
+            "FROM( " +
+            "     SELECT  " +
+            " @ids AS p_ids, " +
+            " (SELECT @ids := GROUP_CONCAT(id) FROM uf_zfzy WHERE FIND_IN_SET(sj, @ids)) AS c_ids, " +
+            " @l := @l+1 AS LEVEL " +
+            "     FROM uf_zfzy, (SELECT @ids := #{dataId}, @l := 0 ) b  " +
+//            "     WHERE @ids IS NOT NULL " +
+            "    ) u1 " +
+            "JOIN uf_zfzy u2 " +
+            "ON FIND_IN_SET(u2.id, u1.p_ids) limit #{start},#{size}")
+    List<Map<String,Object>> selectDataList(
+            @ParamMapper("tableName") String tableName,
+            @ParamMapper("start") Integer start,
+            @ParamMapper("size") Integer size,
+            @ParamMapper("dataId") Integer dataId
+    );
+
+    @Select("SELECT count(u2.id) " +
+            "FROM( " +
+            "     SELECT  " +
+            " @ids AS p_ids, " +
+            " (SELECT @ids := GROUP_CONCAT(id) FROM uf_zfzy WHERE FIND_IN_SET(sj, @ids)) AS c_ids, " +
+            " @l := @l+1 AS LEVEL " +
+            "     FROM uf_zfzy, (SELECT @ids := #{dataId}, @l := 0 ) b  " +
+//            "     WHERE @ids IS NOT NULL " +
+            "    ) u1 " +
+            "JOIN uf_zfzy u2 " +
+            "ON FIND_IN_SET(u2.id, u1.p_ids) ")
+    Integer selectDataCount(
+            @ParamMapper("tableName") String tableName,
+            @ParamMapper("dataId") Integer dataId
+    );
+
+    @Select("select * from $t{tableName}  limit #{start},#{size}")
+    List<Map<String, Object>> selectAllDataList(
+            @ParamMapper("tableName") String tableName,
+            @ParamMapper("start") Integer start,
+            @ParamMapper("size") Integer size
+    );
+
+    @Select("select count(id) from $t{tableName}")
+    Integer selectAllDataCount(
+            @ParamMapper("tableName") String tableName
+    );
+}
diff --git a/src/main/youhong_ai_old_src/com/api/aiyh_pcn/patentWall/dto/FilterWhere.java b/src/main/youhong_ai_old_src/com/api/aiyh_pcn/patentWall/dto/FilterWhere.java
new file mode 100644
index 0000000..2373ab2
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/aiyh_pcn/patentWall/dto/FilterWhere.java
@@ -0,0 +1,20 @@
+package com.api.aiyh_pcn.patentWall.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+/**
+ * @author EBU7-dev1-ayh
+ * @create 2021/11/26 0026 11:35
+ * 查询列表筛选条件
+ */
+
+@Setter
+@Getter
+@ToString
+public class FilterWhere {
+	private int searchType;
+	private String dbField;
+	private String value;
+}
diff --git a/src/main/youhong_ai_old_src/com/api/aiyh_pcn/patentWall/entity/PatentEntity.java b/src/main/youhong_ai_old_src/com/api/aiyh_pcn/patentWall/entity/PatentEntity.java
new file mode 100644
index 0000000..0fae9be
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/aiyh_pcn/patentWall/entity/PatentEntity.java
@@ -0,0 +1,14 @@
+package com.api.aiyh_pcn.patentWall.entity;
+
+/**
+ * @author EBU7-dev1-ayh
+ * create 2021/11/25 0025 15:30
+ *
+ */
+
+
+public class PatentEntity {
+	private String id;
+	private String icon;
+	private String linkUrl;
+}
diff --git a/src/main/youhong_ai_old_src/com/api/aiyh_pcn/patentWall/service/ClassificationWallService.java b/src/main/youhong_ai_old_src/com/api/aiyh_pcn/patentWall/service/ClassificationWallService.java
new file mode 100644
index 0000000..bde0f1c
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/aiyh_pcn/patentWall/service/ClassificationWallService.java
@@ -0,0 +1,198 @@
+package com.api.aiyh_pcn.patentWall.service;
+
+import aiyh.utils.Util;
+import aiyh.utils.excention.CustomerException;
+import com.api.aiyh_pcn.patentWall.dao.ClassificationWallMapper;
+import com.api.aiyh_pcn.patentWall.dao.GovernmentSourceDto;
+import com.api.aiyh_pcn.patentWall.vo.ClassificationWallVo;
+import com.api.aiyh_pcn.patentWall.vo.LinkUrlVO;
+import com.api.aiyh_pcn.patentWall.vo.PatentVO;
+import org.apache.log4j.Logger;
+import weaver.conn.RecordSet;
+import weaver.hrm.User;
+
+import java.beans.BeanInfo;
+import java.beans.IntrospectionException;
+import java.beans.Introspector;
+import java.beans.PropertyDescriptor;
+import java.lang.reflect.InvocationTargetException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * <p>分类墙业务处理</p>
+ * <p>create 2022/5/22 15:10</p>
+ *
+ * @author ayh
+ */
+public class ClassificationWallService {
+
+    private Map<String, Object> classificationWallConfig;
+    private final Logger logger = Util.getLogger();
+
+    private final ClassificationWallMapper mapper = Util.getMapper(ClassificationWallMapper.class);
+    /**
+     * 获取单例的配置文件信息
+     *
+     * @return
+     */
+    private Map<String, Object> getSourceWallSearchConf(String prefix) {
+        if (this.classificationWallConfig != null) {
+            return this.classificationWallConfig;
+        }
+        synchronized (this) {
+            if (this.classificationWallConfig == null) {
+                this.classificationWallConfig = Util.readProperties2Map("classificationWall", "aiyh.classificationWall." + prefix);
+            }
+            if (this.classificationWallConfig == null) {
+                return new HashMap<>(0);
+            }
+            return new HashMap<>(this.classificationWallConfig);
+        }
+    }
+
+    public void clearSourceWallConf() {
+        this.classificationWallConfig = null;
+    }
+
+    public ClassificationWallVo getSource(GovernmentSourceDto governmentSourceDto, User user) {
+        logger.info("获取到查询参数：" + governmentSourceDto);
+        Map<String, Object> voMapping = this.getSourceWallSearchConf("voMapping");
+        logger.info("获取配置文件信息："+voMapping);
+        Integer page = governmentSourceDto.getPage();
+        Integer pageSize = governmentSourceDto.getPageSize();
+        if (pageSize == null || pageSize <= 0){
+            pageSize = 10;
+        }
+        if(page == null || page < 0){
+            page = 0;
+        }
+        Integer dataId = governmentSourceDto.getDataId();
+        String dataResource = Util.null2DefaultStr(voMapping.get("dataResource"),"");
+        String buttonUrl = Util.null2DefaultStr(voMapping.get("addSourceUrl"),"");
+        String addSourceLabelIndex = Util.null2DefaultStr(voMapping.get("addSourceLabelIndex"),"");
+        String addSourceLabelName = Util.null2DefaultStr(voMapping.get("addSourceLabelName"),"");
+        List<Map<String, Object>> dataList;
+        Integer total;
+        Integer start = page * pageSize;
+        if(dataId == null || dataId <= 0){
+//            查询全部
+            dataList = mapper.selectAllDataList(dataResource,start,pageSize);
+            total = mapper.selectAllDataCount(dataResource);
+        }else{
+            dataList = mapper.selectDataList(dataResource,start,pageSize,dataId);
+            logger.info("查询子级所有数据：" + dataList);
+            total = mapper.selectDataCount(dataResource, dataId);
+        }
+        List<PatentVO> list = new ArrayList<>();
+        List<String> args = new ArrayList<>();
+        for (Map<String, Object> data : dataList) {
+            Map<String, Object> config = new HashMap<>(voMapping);
+            for (Map.Entry<String, Object> entry : voMapping.entrySet()) {
+                String patentVoField = entry.getKey();
+                //				linkList
+                String parsing = null;
+                //				值解析
+                if ("linkList".equals(patentVoField)) {
+                    List<LinkUrlVO> linkUrlVOS = new ArrayList<>();
+                    List<Map<String, Object>> linkUrlList = (List<Map<String, Object>>) entry.getValue();
+                    for (Map<String, Object> linkUrlMap : linkUrlList) {
+                        LinkUrlVO linkUrlVO = new LinkUrlVO();
+                        BeanInfo beanInfo = null;
+                        try {
+                            beanInfo = Introspector.getBeanInfo(LinkUrlVO.class, Object.class);
+                        } catch (IntrospectionException e) {
+                            throw  new CustomerException("ClassificationWallService:获取beanInfo错误",e);
+                        }
+                        PropertyDescriptor[] propertyDescriptors = beanInfo.getPropertyDescriptors();
+                        for (PropertyDescriptor propertyDescriptor : propertyDescriptors) {
+                            String keyName = propertyDescriptor.getName();
+                            String parsingValue = String.valueOf(linkUrlMap.get(keyName));
+                            parsingValue = handleParsingConf(parsingValue, data, args);
+                            //				清除参数信息
+                            args.clear();
+                            if (propertyDescriptor.getPropertyType().equals(Integer.class)) {
+                                try {
+                                    propertyDescriptor
+                                            .getWriteMethod()
+                                            .invoke(linkUrlVO, Integer.valueOf(parsingValue));
+                                } catch (IllegalAccessException | InvocationTargetException e) {
+                                    throw new CustomerException("ClassificationWallService:设置值失败，调用beanInfo的set方法错误",e);
+                                }
+                            } else {
+                                try {
+                                    propertyDescriptor.getWriteMethod().invoke(linkUrlVO, parsingValue);
+                                } catch (IllegalAccessException | InvocationTargetException e) {
+                                    throw  new CustomerException("ClassificationWallService:设置值失败，调用beanInfo的set方法错误",e);
+                                }
+                            }
+                        }
+                        linkUrlVOS.add(linkUrlVO);
+                    }
+                    config.replace(patentVoField, linkUrlVOS);
+                } else {
+                    parsing = String.valueOf(entry.getValue());
+                    parsing = handleParsingConf(parsing, data, args);
+                    //				修改数据
+                    config.replace(patentVoField, parsing);
+                    //				清除参数信息
+                    args.clear();
+                }
+            }
+            PatentVO patentVO = null;
+            try {
+                patentVO = Util.mapToObject(config, PatentVO.class);
+                patentVO.setLinkList((List<LinkUrlVO>) config.get("linkList"));
+                int language = user.getLanguage();
+                if (language == 8){
+                    patentVO.setTitle(patentVO.getTitleEn());
+                }
+            } catch (Exception e) {
+                throw new CustomerException("ClassificationWallService:map转为PatentVO失败！",e);
+            }
+            list.add(patentVO);
+        }
+        ClassificationWallVo classificationWallVo = new ClassificationWallVo();
+        classificationWallVo.setAddSourceUrl(buttonUrl);
+        classificationWallVo.setAddSourceLabelIndex(addSourceLabelIndex);
+        classificationWallVo.setAddSourceLabelName(addSourceLabelName);
+        classificationWallVo.setSourceList(list);
+        classificationWallVo.setTotal(total);
+        return classificationWallVo;
+    }
+
+    public String handleParsingConf(String parsing, Map<String, Object> data, List<String> args) {
+        //				 值解析
+        //				解析 ${}类型的参数，直接替换
+        String pattern = "\\$\\{(?<field>(\\s|\\S)+?)}";
+        Pattern compile = Pattern.compile(pattern);
+        Matcher matcher = compile.matcher(parsing);
+        while (matcher.find()) {
+            parsing = parsing.replaceFirst(pattern, Util.null2String(data.get(matcher.group("field"))));
+        }
+        //				解析#{}类型的参数，替换为?并按照顺序收集args
+        pattern = "#\\{(?<field>(\\s|\\S)+?)}";
+        compile = Pattern.compile(pattern);
+        matcher = compile.matcher(parsing);
+        while (matcher.find()) {
+            parsing = parsing.replaceFirst(pattern, "?");
+            args.add(Util.null2String(data.get(matcher.group("field"))));
+        }
+        //				解析#sql{}类型的参数，并执行SQL，获取到SQL的值
+        pattern = "#sql\\{(?<sqlStr>([\\s\\S])+?)}";
+        compile = Pattern.compile(pattern);
+        matcher = compile.matcher(parsing);
+        RecordSet rs = new RecordSet();
+        while (matcher.find()) {
+            String sqlStr = matcher.group("sqlStr");
+            rs.executeQuery(sqlStr, args);
+            rs.next();
+            parsing = parsing.replaceFirst(pattern, Util.null2String(rs.getString(1)));
+        }
+        return parsing;
+    }
+}
diff --git a/src/main/youhong_ai_old_src/com/api/aiyh_pcn/patentWall/service/GovernmentSourceService.java b/src/main/youhong_ai_old_src/com/api/aiyh_pcn/patentWall/service/GovernmentSourceService.java
new file mode 100644
index 0000000..6e93c9f
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/aiyh_pcn/patentWall/service/GovernmentSourceService.java
@@ -0,0 +1,199 @@
+package com.api.aiyh_pcn.patentWall.service;
+
+import aiyh.utils.Util;
+import aiyh.utils.excention.CustomerException;
+import com.api.aiyh_pcn.patentWall.dao.GovernmentSourceDto;
+import com.api.aiyh_pcn.patentWall.dao.SourceWallMapper;
+import com.api.aiyh_pcn.patentWall.vo.GovernmentSourceVo;
+import com.api.aiyh_pcn.patentWall.vo.LinkUrlVO;
+import com.api.aiyh_pcn.patentWall.vo.PatentVO;
+import org.apache.log4j.Logger;
+import weaver.conn.RecordSet;
+import weaver.hrm.User;
+
+import java.beans.BeanInfo;
+import java.beans.IntrospectionException;
+import java.beans.Introspector;
+import java.beans.PropertyDescriptor;
+import java.lang.reflect.InvocationTargetException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * <p></p>
+ * <p>create 2022/5/22 15:10</p>
+ *
+ * @author ayh
+ */
+//governmentSourceWall
+public class GovernmentSourceService {
+
+    private Map<String, Object> governmentSourceConfig;
+    private final Logger logger = Util.getLogger();
+
+    private final SourceWallMapper mapper = Util.getMapper(SourceWallMapper.class);
+    /**
+     * 获取单例的配置文件信息
+     *
+     * @return
+     */
+    private Map<String, Object> getSourceWallSearchConf(String prefix) {
+        if (this.governmentSourceConfig != null) {
+            return this.governmentSourceConfig;
+        }
+        synchronized (this) {
+            if (this.governmentSourceConfig == null) {
+                this.governmentSourceConfig = Util.readProperties2Map("governmentSourceWall", "aiyh.sourceWall." + prefix);
+            }
+            if (this.governmentSourceConfig == null) {
+                return new HashMap<>(0);
+            }
+            return new HashMap<>(this.governmentSourceConfig);
+        }
+    }
+
+    public void clearSourceWallConf() {
+        this.governmentSourceConfig = null;
+    }
+
+    public GovernmentSourceVo getSource(GovernmentSourceDto governmentSourceDto, User user) {
+        logger.info("获取到查询参数：" + governmentSourceDto);
+        Map<String, Object> voMapping = this.getSourceWallSearchConf("voMapping");
+        logger.info("获取配置文件信息："+voMapping);
+        Integer page = governmentSourceDto.getPage();
+        Integer pageSize = governmentSourceDto.getPageSize();
+        if (pageSize == null || pageSize <= 0){
+            pageSize = 10;
+        }
+        if(page == null || page < 0){
+            page = 0;
+        }
+        Integer dataId = governmentSourceDto.getDataId();
+        String dataResource = Util.null2DefaultStr(voMapping.get("dataResource"),"");
+        String buttonUrl = Util.null2DefaultStr(voMapping.get("addSourceUrl"),"");
+        String addSourceLabelIndex = Util.null2DefaultStr(voMapping.get("addSourceLabelIndex"),"");
+        String addSourceLabelName = Util.null2DefaultStr(voMapping.get("addSourceLabelName"),"");
+        List<Map<String, Object>> dataList;
+        Integer total;
+        Integer start = page * pageSize;
+        if(dataId == null || dataId <= 0){
+//            查询全部
+            dataList = mapper.selectAllDataList(dataResource,start,pageSize);
+            total = mapper.selectAllDataCount(dataResource);
+        }else{
+            dataList = mapper.selectDataList(dataResource,start,pageSize,dataId);
+            logger.info("查询子级所有数据：" + dataList);
+            total = mapper.selectDataCount(dataResource, dataId);
+        }
+        List<PatentVO> list = new ArrayList<>();
+        List<String> args = new ArrayList<>();
+        for (Map<String, Object> data : dataList) {
+            Map<String, Object> config = new HashMap<>(voMapping);
+            for (Map.Entry<String, Object> entry : voMapping.entrySet()) {
+                String patentVoField = entry.getKey();
+                //				linkList
+                String parsing = null;
+                //				值解析
+                if ("linkList".equals(patentVoField)) {
+                    List<LinkUrlVO> linkUrlVOS = new ArrayList<>();
+                    List<Map<String, Object>> linkUrlList = (List<Map<String, Object>>) entry.getValue();
+                    for (Map<String, Object> linkUrlMap : linkUrlList) {
+                        LinkUrlVO linkUrlVO = new LinkUrlVO();
+                        BeanInfo beanInfo = null;
+                        try {
+                            beanInfo = Introspector.getBeanInfo(LinkUrlVO.class, Object.class);
+                        } catch (IntrospectionException e) {
+                            throw  new CustomerException("GovernmentSourceService:获取beanInfo错误",e);
+                        }
+                        PropertyDescriptor[] propertyDescriptors = beanInfo.getPropertyDescriptors();
+                        for (PropertyDescriptor propertyDescriptor : propertyDescriptors) {
+                            String keyName = propertyDescriptor.getName();
+                            String parsingValue = String.valueOf(linkUrlMap.get(keyName));
+                            parsingValue = handleParsingConf(parsingValue, data, args);
+                            //				清除参数信息
+                            args.clear();
+                            if (propertyDescriptor.getPropertyType().equals(Integer.class)) {
+                                try {
+                                    propertyDescriptor
+                                            .getWriteMethod()
+                                            .invoke(linkUrlVO, Integer.valueOf(parsingValue));
+                                } catch (IllegalAccessException | InvocationTargetException e) {
+                                    throw new CustomerException("GovernmentSourceService:设置值失败，调用beanInfo的set方法错误",e);
+                                }
+                            } else {
+                                try {
+                                    propertyDescriptor.getWriteMethod().invoke(linkUrlVO, parsingValue);
+                                } catch (IllegalAccessException | InvocationTargetException e) {
+                                    throw  new CustomerException("GovernmentSourceService:设置值失败，调用beanInfo的set方法错误",e);
+                                }
+                            }
+                        }
+                        linkUrlVOS.add(linkUrlVO);
+                    }
+                    config.replace(patentVoField, linkUrlVOS);
+                } else {
+                    parsing = String.valueOf(entry.getValue());
+                    parsing = handleParsingConf(parsing, data, args);
+                    //				修改数据
+                    config.replace(patentVoField, parsing);
+                    //				清除参数信息
+                    args.clear();
+                }
+            }
+            PatentVO patentVO = null;
+            try {
+                patentVO = Util.mapToObject(config, PatentVO.class);
+                patentVO.setLinkList((List<LinkUrlVO>) config.get("linkList"));
+                int language = user.getLanguage();
+                if (language == 8){
+                    patentVO.setTitle(patentVO.getTitleEn());
+                }
+            } catch (Exception e) {
+                throw new CustomerException("GovernmentSourceService:map转为PatentVO失败！",e);
+            }
+            list.add(patentVO);
+        }
+        GovernmentSourceVo governmentSourceVo = new GovernmentSourceVo();
+        governmentSourceVo.setAddSourceUrl(buttonUrl);
+        governmentSourceVo.setAddSourceLabelIndex(addSourceLabelIndex);
+        governmentSourceVo.setAddSourceLabelName(addSourceLabelName);
+        governmentSourceVo.setSourceList(list);
+        governmentSourceVo.setTotal(total);
+        return governmentSourceVo;
+    }
+
+    public String handleParsingConf(String parsing, Map<String, Object> data, List<String> args) {
+        //				 值解析
+        //				解析 ${}类型的参数，直接替换
+        String pattern = "\\$\\{(?<field>(\\s|\\S)+?)}";
+        Pattern compile = Pattern.compile(pattern);
+        Matcher matcher = compile.matcher(parsing);
+        while (matcher.find()) {
+            parsing = parsing.replaceFirst(pattern, Util.null2String(data.get(matcher.group("field"))));
+        }
+        //				解析#{}类型的参数，替换为?并按照顺序收集args
+        pattern = "#\\{(?<field>(\\s|\\S)+?)}";
+        compile = Pattern.compile(pattern);
+        matcher = compile.matcher(parsing);
+        while (matcher.find()) {
+            parsing = parsing.replaceFirst(pattern, "?");
+            args.add(Util.null2String(data.get(matcher.group("field"))));
+        }
+        //				解析#sql{}类型的参数，并执行SQL，获取到SQL的值
+        pattern = "#sql\\{(?<sqlStr>([\\s\\S])+?)}";
+        compile = Pattern.compile(pattern);
+        matcher = compile.matcher(parsing);
+        RecordSet rs = new RecordSet();
+        while (matcher.find()) {
+            String sqlStr = matcher.group("sqlStr");
+            rs.executeQuery(sqlStr, args);
+            rs.next();
+            parsing = parsing.replaceFirst(pattern, Util.null2String(rs.getString(1)));
+        }
+        return parsing;
+    }
+}
diff --git a/src/main/youhong_ai_old_src/com/api/aiyh_pcn/patentWall/service/PatentWallService.java b/src/main/youhong_ai_old_src/com/api/aiyh_pcn/patentWall/service/PatentWallService.java
new file mode 100644
index 0000000..dceb055
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/aiyh_pcn/patentWall/service/PatentWallService.java
@@ -0,0 +1,373 @@
+package com.api.aiyh_pcn.patentWall.service;
+
+import aiyh.utils.Util;
+import aiyh.utils.zwl.common.ToolUtil;
+import com.api.aiyh_pcn.patentWall.dao.PatentWallMapping;
+import com.api.aiyh_pcn.patentWall.dto.FilterWhere;
+import com.api.aiyh_pcn.patentWall.vo.LinkUrlVO;
+import com.api.aiyh_pcn.patentWall.vo.PatentVO;
+import com.api.aiyh_pcn.patentWall.vo.SearchInputVO;
+import com.api.aiyh_pcn.patentWall.vo.SelectOptionsVo;
+import org.apache.log4j.Logger;
+import weaver.conn.RecordSet;
+
+import java.beans.BeanInfo;
+import java.beans.IntrospectionException;
+import java.beans.Introspector;
+import java.beans.PropertyDescriptor;
+import java.lang.reflect.InvocationTargetException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * @author EBU7-dev1-ayh
+ * @create 2021/11/25 0025 15:23
+ */
+public class PatentWallService {
+    private final PatentWallMapping patentWallMapping = new PatentWallMapping();
+    private final ToolUtil toolUtil = new ToolUtil();
+    private final RecordSet rs = new RecordSet();
+    private Map<String, Object> patentWallConf;
+    private Map<String, Object> patentWallSearchConf;
+    private final Logger logger = Util.getLogger();
+
+    /**
+     * 查询搜索框配置信息
+     *
+     * @param prefix 前缀
+     * @return 配置信息
+     */
+    public List<SearchInputVO> getSearchList(String prefix, int languageId) {
+        Map<String, Object> patentWallSearchConf = getPatentWallSearchConf(prefix + ".search");
+        String dataResource = String.valueOf(patentWallSearchConf.get("dataResource"));
+        List<Map<String, Object>> inputs =
+                (List<Map<String, Object>>) patentWallSearchConf.get("inputs");
+        List<SearchInputVO> searchInputList = new ArrayList<>();
+        for (Map<String, Object> input : inputs) {
+            SearchInputVO searchInputVO = new SearchInputVO();
+            int type = Integer.parseInt(Util.null2DefaultStr(input.get("type"), "0"));
+            String dbFieldName = Util.null2String(input.get("dbFieldName"));
+            String value = Util.null2String(input.get("value"));
+            String labelName = Util.null2String(input.get("labelName"));
+            Integer labelIndex = Integer.valueOf(Util.null2DefaultStr(input.get("labelIndex"), "0"));
+            Integer searchType = Integer.valueOf(Util.null2DefaultStr(input.get("searchType"), "0"));
+            Boolean multiple = Boolean.valueOf(Util.null2DefaultStr(input.get("multiple"), "false"));
+            searchInputVO.setType(type);
+            searchInputVO.setLabelName(labelName);
+            searchInputVO.setSearchType(searchType);
+            searchInputVO.setDbFieldName(dbFieldName);
+            searchInputVO.setLabelIndex(labelIndex);
+            searchInputVO.setLabelIndex(labelIndex);
+            searchInputVO.setMultiple(multiple);
+            searchInputVO.setValue(value);
+            searchInputList.add(searchInputVO);
+            switch (type) {
+                case 1:
+                    //					下拉框 查询options
+                    List<SelectOptionsVo> optionsVos =
+                            getSelectOptions(dataResource, dbFieldName, languageId);
+                    searchInputVO.setSelectOptions(optionsVos);
+                case 2:
+                    //					单行文本
+                    break;
+                case 3:
+                    //                  日期
+                case 4:
+                    //                  单人力资源
+                    break;
+                case 5:
+                    //                  多人力资源
+                    break;
+                case 6:
+                    //                  流程路径
+                    break;
+                case 7:
+                    //                  多流程路径
+                    break;
+                default:
+                    toolUtil.writeDebuggerLog("未匹配输入框类型！请检查配置文件是否正确！");
+                    break;
+            }
+        }
+        return searchInputList;
+    }
+
+    private List<SelectOptionsVo> getSelectOptions(
+            String dataResource, String dbFieldName, int languageId) {
+        List<Map<String, Object>> selectOptions =
+                patentWallMapping.getSelectOptions(dataResource, dbFieldName);
+        List<SelectOptionsVo> optionsVos = new ArrayList<>();
+        SelectOptionsVo optionsDefault = new SelectOptionsVo();
+        optionsDefault.setSelected(true);
+        optionsDefault.setKey("");
+        optionsDefault.setShowname("");
+        optionsVos.add(optionsDefault);
+        for (Map<String, Object> selectOption : selectOptions) {
+            SelectOptionsVo optionsVo = new SelectOptionsVo();
+            optionsVo.setSelected(false);
+            optionsVo.setKey(Util.null2DefaultStr(selectOption.get("selectvalue"), ""));
+            String selectName = Util.null2DefaultStr(selectOption.get("selectname"), "");
+            String showName = selectName;
+            if (selectName.startsWith("~`~`") && selectName.endsWith("`~`~")) {
+                String pattern = "(`~`" + languageId + " )(?<label>(\\w*|\\W*|[\\u4e00-\\u9fa5]*))(`~`)";
+                Pattern compile = Pattern.compile(pattern);
+                Matcher matcher = compile.matcher(selectName);
+                if (matcher.find()) {
+                    showName = matcher.group("label");
+                }
+            }
+            optionsVo.setShowname(showName);
+            optionsVos.add(optionsVo);
+        }
+        return optionsVos;
+    }
+
+    /**
+     * 查询结果信息
+     *
+     * @param filterWheres 结果过滤条件
+     * @param prefix       前缀
+     * @return 查询结果
+     */
+    public List<PatentVO> getList(List<FilterWhere> filterWheres, String prefix) {
+        Map<String, Object> patentWallConf = getPatentWallConf(prefix + ".voMapping");
+        List<Map<String, Object>> dataList;
+        if (filterWheres == null || filterWheres.isEmpty()) {
+            //			查询全部
+            dataList = patentWallMapping.getAllList(Util.null2String(patentWallConf.get("dataResource")));
+        } else {
+            //			筛选查询
+            dataList =
+                    handleFilterWhere(filterWheres, Util.null2String(patentWallConf.get("dataResource")));
+        }
+        List<PatentVO> list = new ArrayList<>();
+        List<String> args = new ArrayList<>();
+        for (Map<String, Object> data : dataList) {
+            Map<String, Object> config = new HashMap<>(patentWallConf);
+            for (Map.Entry<String, Object> entry : patentWallConf.entrySet()) {
+                String patentVoField = entry.getKey();
+                //				linkList
+                String parsing = null;
+                //				值解析
+                if ("linkList".equals(patentVoField)) {
+                    List<LinkUrlVO> linkUrlVOS = new ArrayList<>();
+                    List<Map<String, Object>> linkUrlList = (List<Map<String, Object>>) entry.getValue();
+                    for (Map<String, Object> linkUrlMap : linkUrlList) {
+                        LinkUrlVO linkUrlVO = new LinkUrlVO();
+                        BeanInfo beanInfo = null;
+                        try {
+                            beanInfo = Introspector.getBeanInfo(LinkUrlVO.class, Object.class);
+                        } catch (IntrospectionException e) {
+                            e.printStackTrace();
+                            toolUtil.writeDebuggerLog("获取beanInfo错误");
+                            continue;
+                        }
+                        PropertyDescriptor[] propertyDescriptors = beanInfo.getPropertyDescriptors();
+                        for (PropertyDescriptor propertyDescriptor : propertyDescriptors) {
+                            String keyName = propertyDescriptor.getName();
+                            String parsingValue = String.valueOf(linkUrlMap.get(keyName));
+                            parsingValue = handleParsingConf(parsingValue, data, args);
+                            //				清除参数信息
+                            args.clear();
+                            if (propertyDescriptor.getPropertyType().equals(Integer.class)) {
+                                try {
+                                    propertyDescriptor
+                                            .getWriteMethod()
+                                            .invoke(linkUrlVO, Integer.valueOf(parsingValue));
+                                } catch (IllegalAccessException | InvocationTargetException e) {
+                                    toolUtil.writeErrorLog("设置值失败，调用beanInfo的set方法错误");
+                                    e.printStackTrace();
+                                }
+                            } else {
+                                try {
+                                    propertyDescriptor.getWriteMethod().invoke(linkUrlVO, parsingValue);
+                                } catch (IllegalAccessException | InvocationTargetException e) {
+                                    e.printStackTrace();
+                                    toolUtil.writeErrorLog("设置值失败，调用beanInfo的set方法错误");
+                                }
+                            }
+                        }
+                        linkUrlVOS.add(linkUrlVO);
+                    }
+                    config.replace(patentVoField, linkUrlVOS);
+                } else {
+                    parsing = String.valueOf(entry.getValue());
+                    parsing = handleParsingConf(parsing, data, args);
+                    //				修改数据
+                    config.replace(patentVoField, parsing);
+                    //				清除参数信息
+                    args.clear();
+                }
+            }
+            PatentVO patentVO = null;
+            try {
+                patentVO = Util.mapToObject(config, PatentVO.class);
+                patentVO.setLinkList((List<LinkUrlVO>) config.get("linkList"));
+            } catch (Exception e) {
+                e.printStackTrace();
+                toolUtil.writeErrorLog("map转为PatentVO失败！");
+            }
+            list.add(patentVO);
+        }
+        return list;
+    }
+
+    public String handleParsingConf(String parsing, Map<String, Object> data, List<String> args) {
+        //				 值解析
+        //				解析 ${}类型的参数，直接替换
+        String pattern = "\\$\\{(?<field>(\\s|\\S)+?)}";
+        Pattern compile = Pattern.compile(pattern);
+        Matcher matcher = compile.matcher(parsing);
+        while (matcher.find()) {
+            parsing = parsing.replaceFirst(pattern, Util.null2String(data.get(matcher.group("field"))));
+        }
+        //				解析#{}类型的参数，替换为?并按照顺序收集args
+        pattern = "#\\{(?<field>(\\s|\\S)+?)}";
+        compile = Pattern.compile(pattern);
+        matcher = compile.matcher(parsing);
+        while (matcher.find()) {
+            parsing = parsing.replaceFirst(pattern, "?");
+            args.add(Util.null2String(data.get(matcher.group("field"))));
+        }
+        //				解析#sql{}类型的参数，并执行SQL，获取到SQL的值
+        pattern = "#sql\\{(?<sqlStr>([\\s\\S])+?)}";
+        compile = Pattern.compile(pattern);
+        matcher = compile.matcher(parsing);
+        while (matcher.find()) {
+            String sqlStr = matcher.group("sqlStr");
+            toolUtil.writeDebuggerLog(String.format("执行SQL： {%s} ---> 参数： {%s}", sqlStr, args));
+            rs.executeQuery(sqlStr, args);
+            rs.next();
+            parsing = parsing.replaceFirst(pattern, Util.null2String(rs.getString(1)));
+        }
+        return parsing;
+    }
+
+    public List<Map<String, Object>> handleFilterWhere(
+            List<FilterWhere> filterWheres, String tableName) {
+        StringBuilder whereBuilder = new StringBuilder(" where ");
+        List<String> args = new ArrayList<>();
+        for (FilterWhere filterWhere : filterWheres) {
+            whereBuilder.append(" add ");
+            if (filterWhere.getSearchType() == 1) {
+                //				等于
+                whereBuilder.append(filterWhere.getDbField()).append(" = ? ");
+                args.add(filterWhere.getValue());
+                continue;
+            }
+            if (filterWhere.getSearchType() == 2) {
+                //				大于
+                whereBuilder.append(filterWhere.getDbField()).append(" > ?");
+                args.add(filterWhere.getValue());
+                continue;
+            }
+            if (filterWhere.getSearchType() == 3) {
+                //              小于
+                whereBuilder.append(filterWhere.getDbField()).append(" < ?");
+                args.add(filterWhere.getValue());
+                continue;
+            }
+            if (filterWhere.getSearchType() == 4) {
+                //				in
+                whereBuilder
+                        .append(filterWhere.getDbField())
+                        .append(" in ( ")
+                        .append(filterWhere.getValue())
+                        .append(") ");
+                continue;
+            }
+            if (filterWhere.getSearchType() == 5) {
+                //				日期大于
+                whereBuilder
+                        .append(" DATE_FORMAT(")
+                        .append(filterWhere.getDbField())
+                        .append(",'%y-%m-%d') > ")
+                        .append("DATE_FORMAT(?,'%y-%m-%d')");
+                args.add(filterWhere.getValue());
+                continue;
+            }
+            if (filterWhere.getSearchType() == 6) {
+                //				日期小于
+                whereBuilder
+                        .append(" DATE_FORMAT(")
+                        .append(filterWhere.getDbField())
+                        .append(",'%y-%m-%d') < ")
+                        .append("DATE_FORMAT(?,'%y-%m-%d')");
+                args.add(filterWhere.getValue());
+                continue;
+            }
+            if (filterWhere.getSearchType() == 7) {
+                //				日期等于
+                whereBuilder
+                        .append(" DATE_FORMAT(")
+                        .append(filterWhere.getDbField())
+                        .append(",'%y-%m-%d') = ")
+                        .append("DATE_FORMAT(?,'%y-%m-%d')");
+                args.add(filterWhere.getValue());
+                continue;
+            }
+            if (filterWhere.getSearchType() == 8) {
+                //				日期范围
+                whereBuilder
+                        .append(" DATE_FORMAT(")
+                        .append(filterWhere.getDbField())
+                        .append(",'%y-%m-%d')  between ")
+                        .append("DATE_FORMAT(?,'%y-%m-%d')")
+                        .append(" and DATE_FORMAT(?,'%y-%m-%d')");
+                args.add(filterWhere.getValue().split("&")[0]);
+                args.add(filterWhere.getValue().split("&")[1]);
+                continue;
+            }
+        }
+        return patentWallMapping.getListByFilterWhere(whereBuilder, args, tableName);
+    }
+
+    /**
+     * 获取单例的配置文件信息
+     *
+     * @return
+     */
+    private Map<String, Object> getPatentWallConf(String prefix) {
+        synchronized (this) {
+            if (this.patentWallConf == null) {
+                this.patentWallConf = Util.readProperties2Map("PatentWall", "aiyh." + prefix);
+            }
+            if (this.patentWallConf == null) {
+                return new HashMap<>(0);
+            }
+            return new HashMap<>(this.patentWallConf);
+        }
+    }
+
+    public void clearPatentWallConf() {
+        this.patentWallConf = null;
+    }
+
+    /**
+     * 获取单例的配置文件信息
+     *
+     * @return
+     */
+    private Map<String, Object> getPatentWallSearchConf(String prefix) {
+        if (this.patentWallSearchConf != null) {
+            return this.patentWallSearchConf;
+        }
+        synchronized (this) {
+            if (this.patentWallSearchConf == null) {
+                this.patentWallSearchConf = Util.readProperties2Map("PatentWall", "aiyh." + prefix);
+            }
+            if (this.patentWallSearchConf == null) {
+                return new HashMap<>(0);
+            }
+            return new HashMap<>(this.patentWallSearchConf);
+        }
+    }
+
+    public void clearPatentWallSerachConf() {
+        this.patentWallSearchConf = null;
+    }
+}
diff --git a/src/main/youhong_ai_old_src/com/api/aiyh_pcn/patentWall/vo/ClassificationWallVo.java b/src/main/youhong_ai_old_src/com/api/aiyh_pcn/patentWall/vo/ClassificationWallVo.java
new file mode 100644
index 0000000..bafe294
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/aiyh_pcn/patentWall/vo/ClassificationWallVo.java
@@ -0,0 +1,21 @@
+package com.api.aiyh_pcn.patentWall.vo;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * <p></p>
+ * <p>create 2022/5/22 15:37</p>
+ *
+ * @author ayh
+ */
+
+@Data
+public class ClassificationWallVo {
+    private String addSourceUrl;
+    private String addSourceLabelIndex;
+    private String addSourceLabelName;
+    private List<PatentVO> sourceList;
+    private Integer total;
+}
diff --git a/src/main/youhong_ai_old_src/com/api/aiyh_pcn/patentWall/vo/GovernmentSourceVo.java b/src/main/youhong_ai_old_src/com/api/aiyh_pcn/patentWall/vo/GovernmentSourceVo.java
new file mode 100644
index 0000000..f5a782a
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/aiyh_pcn/patentWall/vo/GovernmentSourceVo.java
@@ -0,0 +1,21 @@
+package com.api.aiyh_pcn.patentWall.vo;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * <p></p>
+ * <p>create 2022/5/22 15:37</p>
+ *
+ * @author ayh
+ */
+
+@Data
+public class GovernmentSourceVo {
+    private String addSourceUrl;
+    private String addSourceLabelIndex;
+    private String addSourceLabelName;
+    private List<PatentVO> sourceList;
+    private Integer total;
+}
diff --git a/src/main/youhong_ai_old_src/com/api/aiyh_pcn/patentWall/vo/LinkUrlVO.java b/src/main/youhong_ai_old_src/com/api/aiyh_pcn/patentWall/vo/LinkUrlVO.java
new file mode 100644
index 0000000..15b4a74
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/aiyh_pcn/patentWall/vo/LinkUrlVO.java
@@ -0,0 +1,19 @@
+package com.api.aiyh_pcn.patentWall.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+/**
+ * @author EBU7-dev1-ayh
+ * @create 2021/12/6 0006 10:59
+ */
+
+@Getter
+@Setter
+@ToString
+public class LinkUrlVO {
+	private String labelName;
+	private Integer labelIndex;
+	private String linkUrl;
+}
diff --git a/src/main/youhong_ai_old_src/com/api/aiyh_pcn/patentWall/vo/PatentVO.java b/src/main/youhong_ai_old_src/com/api/aiyh_pcn/patentWall/vo/PatentVO.java
new file mode 100644
index 0000000..64b51d0
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/aiyh_pcn/patentWall/vo/PatentVO.java
@@ -0,0 +1,27 @@
+package com.api.aiyh_pcn.patentWall.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+import java.util.List;
+
+/**
+ * @author EBU7-dev1-ayh
+ * @create 2021/11/25 0025 15:31
+ */
+
+@Getter
+@Setter
+@ToString
+public class PatentVO {
+	private String id;
+	private String icon;
+	private String activeIcon;
+//	private String linkUrl;
+	private List<LinkUrlVO> linkList;
+	private String title;
+	private String docId;
+	private String imageFileId;
+    private String titleEn;
+}
diff --git a/src/main/youhong_ai_old_src/com/api/aiyh_pcn/patentWall/vo/SearchInputVO.java b/src/main/youhong_ai_old_src/com/api/aiyh_pcn/patentWall/vo/SearchInputVO.java
new file mode 100644
index 0000000..269c95d
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/aiyh_pcn/patentWall/vo/SearchInputVO.java
@@ -0,0 +1,27 @@
+package com.api.aiyh_pcn.patentWall.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+import java.util.List;
+
+/**
+ * @author EBU7-dev1-ayh
+ * @create 2021/11/29 0029 18:27
+ * 搜索框VO
+ */
+
+@Getter
+@Setter
+@ToString
+public class SearchInputVO {
+	private Integer type;
+	private String dbFieldName;
+	private String labelName;
+	private String value;
+	private Integer labelIndex;
+	private Integer searchType;
+	private Boolean multiple;
+	private List<SelectOptionsVo> selectOptions;
+}
diff --git a/src/main/youhong_ai_old_src/com/api/aiyh_pcn/patentWall/vo/SelectOptionsVo.java b/src/main/youhong_ai_old_src/com/api/aiyh_pcn/patentWall/vo/SelectOptionsVo.java
new file mode 100644
index 0000000..007c675
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/aiyh_pcn/patentWall/vo/SelectOptionsVo.java
@@ -0,0 +1,19 @@
+package com.api.aiyh_pcn.patentWall.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+/**
+ * @author EBU7-dev1-ayh
+ * @create 2021/11/29 0029 18:37
+ */
+
+@Getter
+@Setter
+@ToString
+public class SelectOptionsVo {
+	private String key;
+	private boolean selected;
+	private String showname;
+}
diff --git a/src/main/youhong_ai_old_src/com/api/aiyh_quanshi/service/Impl/CancelMetingServiceImpl.java b/src/main/youhong_ai_old_src/com/api/aiyh_quanshi/service/Impl/CancelMetingServiceImpl.java
new file mode 100644
index 0000000..87e48e5
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/aiyh_quanshi/service/Impl/CancelMetingServiceImpl.java
@@ -0,0 +1,74 @@
+package com.api.aiyh_quanshi.service.Impl;
+
+import aiyh.utils.zwl.common.ToolUtil;
+import com.weaverboot.frame.ioc.anno.classAnno.WeaIocReplaceComponent;
+import com.weaverboot.frame.ioc.anno.methodAnno.WeaReplaceAfter;
+import com.weaverboot.frame.ioc.anno.methodAnno.WeaReplaceBefore;
+import com.weaverboot.frame.ioc.handler.replace.weaReplaceParam.impl.WeaAfterReplaceParam;
+import com.weaverboot.frame.ioc.handler.replace.weaReplaceParam.impl.WeaBeforeReplaceParam;
+import weaver.aiyh_quanshi.RequestApi;
+import weaver.aiyh_quanshi.entity.QsResponse;
+import weaver.conn.RecordSet;
+
+import java.util.Map;
+
+/**
+ * 如不标注名称，则按类的全路径注入
+ */
+@WeaIocReplaceComponent("cancelMetingService")
+public class CancelMetingServiceImpl {
+	ToolUtil toolUtil = new ToolUtil();
+	RequestApi requestApi = new RequestApi();
+	boolean flag = true;
+
+	/**
+	 * 这是接口前置方法，这个方法会在接口执行前执行
+	 * 前值方法必须用@WeaReplaceBefore,这里面有两个参数，第一个叫value，是你的api地址
+	 * 第二个参数叫order，如果你有很多方法拦截的是一个api，那么这个就决定了执行顺序
+	 * 前置方法的参数为WeaBeforeReplaceParam 这个类，里面有四个参数，request，response，请求参数的map，api的地址
+	 */
+	@WeaReplaceBefore(value = "/api/meeting/base/cancelMeeting", order = 1, description = "会议接口前拦截")
+	public void before(WeaBeforeReplaceParam weaBeforeReplaceParam) {
+//		获取会议id
+		Map paramMap = weaBeforeReplaceParam.getParamMap();
+		String id = String.valueOf(paramMap.get("meetingid"));
+//		通过会议id获取全时会议id
+		String query = "select * from meeting where id = ?";
+		RecordSet rs = new RecordSet();
+		rs.executeQuery(query, id);
+		rs.next();
+		String quanShiId = rs.getString("quan_shi_id");
+		String hrmId = rs.getString("contacter");
+		query = "select * from hrmresource where id = ?";
+		rs.executeQuery(query, hrmId);
+		rs.next();
+		String creatorEmail = rs.getString("email");
+//		通过全时会议id对会议进行取消
+		QsResponse qsResponse = requestApi.cancelConference(quanShiId, creatorEmail);
+		if(!"0".equals(qsResponse.getStatus())){
+//			取消失败
+			flag = false;
+		}
+
+	}
+
+	/**
+	 * 这个是接口后置方法，大概的用法跟前置方法差不多，稍有差别
+	 * 注解名称为WeaReplaceAfter
+	 * 返回类型必须为String
+	 * 参数叫WeaAfterReplaceParam，这个类前四个参数跟前置方法的那个相同，不同的是多了一个叫data的String，这个是那个接口执行完返回的报文
+	 * 你可以对那个报文进行操作，然后在这个方法里return回去
+	 */
+	@WeaReplaceAfter(value = "/api/meeting/base/cancelMeeting", order = 1)
+	public String after(WeaAfterReplaceParam weaAfterReplaceParam) {
+		//这个就是接口执行完的报文
+		String data = weaAfterReplaceParam.getData();
+		if(!flag){
+//			取消会议失败
+		}else{
+
+		}
+
+		return data;
+	}
+}
\ No newline at end of file
diff --git a/src/main/youhong_ai_old_src/com/api/aiyh_quanshi/service/Impl/DeleteMetingServiceImpl.java b/src/main/youhong_ai_old_src/com/api/aiyh_quanshi/service/Impl/DeleteMetingServiceImpl.java
new file mode 100644
index 0000000..2e0ee06
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/aiyh_quanshi/service/Impl/DeleteMetingServiceImpl.java
@@ -0,0 +1,72 @@
+package com.api.aiyh_quanshi.service.Impl;
+
+import aiyh.utils.zwl.common.ToolUtil;
+import com.weaverboot.frame.ioc.anno.classAnno.WeaIocReplaceComponent;
+import com.weaverboot.frame.ioc.anno.methodAnno.WeaReplaceAfter;
+import com.weaverboot.frame.ioc.anno.methodAnno.WeaReplaceBefore;
+import com.weaverboot.frame.ioc.handler.replace.weaReplaceParam.impl.WeaAfterReplaceParam;
+import com.weaverboot.frame.ioc.handler.replace.weaReplaceParam.impl.WeaBeforeReplaceParam;
+import weaver.aiyh_quanshi.RequestApi;
+import weaver.aiyh_quanshi.entity.QsResponse;
+import weaver.conn.RecordSet;
+
+import java.util.Map;
+
+/**
+ * 如不标注名称，则按类的全路径注入
+ */
+@WeaIocReplaceComponent("deleteMetingService")
+public class DeleteMetingServiceImpl {
+	ToolUtil toolUtil = new ToolUtil();
+	RequestApi requestApi = new RequestApi();
+	boolean flag = true;
+
+	/**
+	 * 这是接口前置方法，这个方法会在接口执行前执行
+	 * 前值方法必须用@WeaReplaceBefore,这里面有两个参数，第一个叫value，是你的api地址
+	 * 第二个参数叫order，如果你有很多方法拦截的是一个api，那么这个就决定了执行顺序
+	 * 前置方法的参数为WeaBeforeReplaceParam 这个类，里面有四个参数，request，response，请求参数的map，api的地址
+	 */
+	@WeaReplaceBefore(value = "/api/meeting/monitor/delete", order = 1, description = "会议接口前拦截")
+	public void before(WeaBeforeReplaceParam weaBeforeReplaceParam) {
+//		获取会议id
+		Map paramMap = weaBeforeReplaceParam.getParamMap();
+		String ids = String.valueOf(paramMap.get("meetingids"));
+//		通过会议id获取全时会议id
+		String query = "select * from meeting where id in (" + ids + ") and cancel != 1 and meetingstatus not in (2,4)";
+		RecordSet rs = new RecordSet();
+		rs.executeQuery(query);
+//		获取删除的会议的所有对应的全时id以及创建人
+		while (rs.next()) {
+			String quanShiId = rs.getString("quan_shi_id");
+			String hrmId = rs.getString("contacter");
+			query = "select * from hrmresource where id = ?";
+			rs.executeQuery(query, hrmId);
+			rs.next();
+			String creatorEmail = rs.getString("email");
+			QsResponse qsResponse = requestApi.cancelConference(quanShiId, creatorEmail);
+//		    通过全时会议id对会议进行取消
+			if (!"0".equals(qsResponse.getStatus())) {
+//			    取消失败
+				flag = false;
+			}
+		}
+	}
+
+	/**
+	 * 这个是接口后置方法，大概的用法跟前置方法差不多，稍有差别
+	 * 注解名称为WeaReplaceAfter
+	 * 返回类型必须为String
+	 * 参数叫WeaAfterReplaceParam，这个类前四个参数跟前置方法的那个相同，不同的是多了一个叫data的String，这个是那个接口执行完返回的报文
+	 * 你可以对那个报文进行操作，然后在这个方法里return回去
+	 */
+	@WeaReplaceAfter(value = "/api/meeting/monitor/delete", order = 1)
+	public String after(WeaAfterReplaceParam weaAfterReplaceParam) {
+		//这个就是接口执行完的报文
+		String data = weaAfterReplaceParam.getData();
+		if (!flag) {
+//			取消会议失败
+		}
+		return data;
+	}
+}
\ No newline at end of file
diff --git a/src/main/youhong_ai_old_src/com/api/aiyh_quanshi/service/Impl/NewMetingServiceImpl.java b/src/main/youhong_ai_old_src/com/api/aiyh_quanshi/service/Impl/NewMetingServiceImpl.java
new file mode 100644
index 0000000..42d657b
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/aiyh_quanshi/service/Impl/NewMetingServiceImpl.java
@@ -0,0 +1,186 @@
+package com.api.aiyh_quanshi.service.Impl;
+
+import aiyh.utils.httpUtil.staticUtil.HttpStaticUtils;
+import aiyh.utils.zwl.common.ToolUtil;
+import com.alibaba.fastjson.JSONObject;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.weaverboot.frame.ioc.anno.classAnno.WeaIocReplaceComponent;
+import com.weaverboot.frame.ioc.anno.methodAnno.WeaReplaceAfter;
+import com.weaverboot.frame.ioc.anno.methodAnno.WeaReplaceBefore;
+import com.weaverboot.frame.ioc.handler.replace.weaReplaceParam.impl.WeaAfterReplaceParam;
+import com.weaverboot.frame.ioc.handler.replace.weaReplaceParam.impl.WeaBeforeReplaceParam;
+import weaver.aiyh_quanshi.RequestApi;
+import weaver.aiyh_quanshi.entity.QsConfParty;
+import weaver.aiyh_quanshi.entity.QsResponse;
+import weaver.conn.RecordSet;
+import weaver.hrm.HrmUserVarify;
+import weaver.hrm.User;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.text.SimpleDateFormat;
+import java.util.*;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
+
+/**
+ * 如不标注名称，则按类的全路径注入
+ */
+@WeaIocReplaceComponent("newMetingService")
+public class NewMetingServiceImpl {
+	ToolUtil toolUtil = new ToolUtil();
+	RequestApi requestApi = new RequestApi();
+	SimpleDateFormat simpleFormat = new SimpleDateFormat("yyyy-MM-dd hh:mm");
+	QsResponse meting = null;
+	private final Lock lock = new ReentrantLock();
+
+
+	/**
+	 * 这是接口前置方法，这个方法会在接口执行前执行
+	 * 前值方法必须用@WeaReplaceBefore,这里面有两个参数，第一个叫value，是你的api地址
+	 * 第二个参数叫order，如果你有很多方法拦截的是一个api，那么这个就决定了执行顺序
+	 * 前置方法的参数为WeaBeforeReplaceParam 这个类，里面有四个参数，request，response，请求参数的map，api的地址
+	 */
+	@WeaReplaceBefore(value = "/api/meeting/base/newMeeting", order = 1, description = "会议接口前拦截")
+	public void before(WeaBeforeReplaceParam weaBeforeReplaceParam) {
+		try {
+//			加锁
+			lock.lock();
+			RecordSet rs = new RecordSet();
+			String query;
+			// 同步会议到全时
+//		String path = Objects.requireNonNull(this.getClass().getResource("")).getPath();
+//		 获取请求参数
+			Map paramMap = weaBeforeReplaceParam.getParamMap();
+//		获取会议标题
+			String title = String.valueOf(paramMap.get("name"));
+//		会议内容
+			String desc_n = String.valueOf(paramMap.get("desc_n"));
+//		获取会议创建人
+			String creator = String.valueOf(paramMap.get("contacter"));
+//		获取会议创建人邮件
+			query = "select * from hrmresource where id = ?";
+			rs.executeQuery(query, creator);
+			rs.next();
+			String creatorEmail = rs.getString("email");
+//		获取会议开始日期
+			String startDate = String.valueOf(paramMap.get("begindate"));
+//		获取会议开始时间
+			String startTime = String.valueOf(paramMap.get("begintime"));
+			Date start = simpleFormat.parse(startDate + " " + startTime);
+
+//		获取会议结束日期
+			String endDate = String.valueOf(paramMap.get("enddate"));
+//		获取会议结束时间
+			String endTime = String.valueOf(paramMap.get("endtime"));
+			Date end = simpleFormat.parse(endDate + " " + endTime);
+
+//		计算会议时长
+			int length = new Long((end.getTime() - start.getTime()) / (1000 * 60)).intValue();
+//		获取会议参与人
+			String hrmStr = String.valueOf(paramMap.get("hrmmembers"));
+//	    处理会议参与人
+			List<QsConfParty> list = new ArrayList<>();
+			query = "select * from hrmresource where id in ( " + hrmStr + ")";
+			rs.executeQuery(query);
+			while (rs.next()) {
+				QsConfParty qsConfParty = new QsConfParty();
+				qsConfParty.setEmail(rs.getString("email"));
+				list.add(qsConfParty);
+			}
+			toolUtil.writeErrorLog(list.toString());
+			toolUtil.writeErrorLog(String.valueOf(length));
+//		调取接口
+			meting = requestApi.createMeting(creatorEmail, title, length, startDate + " " + startTime + ":00 ", list);
+			toolUtil.writeErrorLog(meting.toString());
+			if (meting != null) {
+//			请求失败
+				if (!"0".equals(meting.getStatus())) {
+					meting = null;
+				}
+			}
+		} catch (Exception e) {
+			toolUtil.writeErrorLog(e.toString());
+		} finally {
+			HttpStaticUtils.executorService.execute(() -> {
+				try {
+					Thread.sleep(20 * 1000);
+				} catch (InterruptedException e) {
+					e.printStackTrace();
+				} finally {
+					try {
+						lock.unlock();
+					} catch (IllegalMonitorStateException e) {
+//						锁已经被释放
+					}
+				}
+			});
+
+		}
+//		TODO 在after方法中更新会议id进入meting表中
+	}
+
+	/**
+	 * apiCost: 688
+	 * api_status: true
+	 * meetingid: "8"
+	 * retstatus: true
+	 * status: true
+	 * 这个是接口后置方法，大概的用法跟前置方法差不多，稍有差别
+	 * 注解名称为WeaReplaceAfter
+	 * 返回类型必须为String
+	 * 参数叫WeaAfterReplaceParam，这个类前四个参数跟前置方法的那个相同，不同的是多了一个叫data的String，这个是那个接口执行完返回的报文
+	 * 你可以对那个报文进行操作，然后在这个方法里return回去
+	 */
+	@WeaReplaceAfter(value = "/api/meeting/base/newMeeting", order = 1)
+	public String after(WeaAfterReplaceParam weaAfterReplaceParam) {
+		String data = weaAfterReplaceParam.getData();
+		HttpServletRequest request = weaAfterReplaceParam.getRequest();
+		HttpServletResponse response = weaAfterReplaceParam.getResponse();
+		User user = HrmUserVarify.getUser(request, response);
+
+
+		Map<String, Object> jsonObject = new HashMap<>();
+		try {
+			ObjectMapper mapper = new ObjectMapper();
+			Map<String, Object> map = mapper.readValue(data, Map.class);
+
+			if (map == null) {
+				lock.unlock();
+//			转换失败或数据为空
+				return data;
+			}
+			if (Boolean.parseBoolean(String.valueOf(map.get("status")))) {
+//			添加成功
+				if (meting != null) {
+//				更新全时会议id进入meting表中
+					String update = "update meeting set quan_shi_id = ? where id = ?";
+					RecordSet rs = new RecordSet();
+					Map<String, Object> resultMap;
+					resultMap = mapper.readValue(meting.getResult(), Map.class);
+					rs.executeUpdate(update, String.valueOf(resultMap.get("conferenceId")), String.valueOf(map.get("meetingid")));
+					toolUtil.writeErrorLog(resultMap.get("conferenceId") + " -:- " +
+							resultMap.get("pcode1") + " -:- " + resultMap.get("pcode2") + " -:- " + map.get("meetingid"));
+				} else {
+//					添加失败
+					toolUtil.writeErrorLog("添加失败！");
+					jsonObject.put("api_status", false);
+					jsonObject.put("api_errormsg", "全时会议添加失败！");
+					lock.unlock();
+					toolUtil.writeErrorLog(jsonObject.toString());
+					return JSONObject.toJSONString(jsonObject);
+				}
+			}
+			return jsonObject.toString();
+		} catch (Exception e) {
+			toolUtil.writeErrorLog(e.toString());
+			jsonObject.put("api_status", false);
+			jsonObject.put("api_errormsg", e.toString());
+			return JSONObject.toJSONString(jsonObject);
+		} finally {
+			//		释放锁
+			lock.unlock();
+			toolUtil.writeErrorLog(data);
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/main/youhong_ai_old_src/com/api/aiyh_saiao/controller/FrozenCalculationController.java b/src/main/youhong_ai_old_src/com/api/aiyh_saiao/controller/FrozenCalculationController.java
new file mode 100644
index 0000000..31cd4d7
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/aiyh_saiao/controller/FrozenCalculationController.java
@@ -0,0 +1,33 @@
+package com.api.aiyh_saiao.controller;
+
+import com.api.aiyh_saiao.service.FrozenCalculationService;
+import io.swagger.v3.oas.annotations.parameters.RequestBody;
+
+import javax.ws.rs.Consumes;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import java.util.Map;
+
+/**
+ * <p>金额冻结计算</p>
+ * <p>create 2022/3/30 2:27 PM</p>
+ *
+ * @author ayh
+ */
+
+@Path("/frozen-calcula")
+public class FrozenCalculationController {
+
+    private final FrozenCalculationService service = new FrozenCalculationService();
+
+    @Path("/current-amount")
+    @POST
+    @Produces(MediaType.APPLICATION_JSON)
+    @Consumes(MediaType.APPLICATION_JSON)
+    public String getCurrentAmount(@RequestBody Map<String,Object> params){
+//        service.getCurrentAmount(params);
+        return "";
+    }
+}
diff --git a/src/main/youhong_ai_old_src/com/api/aiyh_saiao/service/FrozenCalculationService.java b/src/main/youhong_ai_old_src/com/api/aiyh_saiao/service/FrozenCalculationService.java
new file mode 100644
index 0000000..4258dc4
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/aiyh_saiao/service/FrozenCalculationService.java
@@ -0,0 +1,11 @@
+package com.api.aiyh_saiao.service;
+
+/**
+ * <p>计算冻结金额业务处理</p>
+ * <p>create 2022/3/30 2:32 PM</p>
+ *
+ * @author ayh
+ */
+
+public class FrozenCalculationService {
+}
diff --git a/src/main/youhong_ai_old_src/com/api/aiyh_yihong/stagediagram/controller/StageDiagramController.java b/src/main/youhong_ai_old_src/com/api/aiyh_yihong/stagediagram/controller/StageDiagramController.java
new file mode 100644
index 0000000..de1383b
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/aiyh_yihong/stagediagram/controller/StageDiagramController.java
@@ -0,0 +1,53 @@
+package com.api.aiyh_yihong.stagediagram.controller;
+
+import aiyh.utils.ApiResult;
+import aiyh.utils.Util;
+import com.alibaba.fastjson.JSON;
+import com.api.aiyh_yihong.stagediagram.service.StageDiagramService;
+import com.api.aiyh_yihong.stagediagram.vo.NodeInfoVo;
+import org.apache.log4j.Logger;
+
+import javax.ws.rs.*;
+import javax.ws.rs.core.MediaType;
+import java.util.List;
+
+/**
+ * <h1>阶段图请求处理方法</h1>
+ *
+ * <p>create: 2022-11-10 16:30</p>
+ *
+ * @author youHong.ai
+ */
+
+@Path("/aiyh/stage-diagram/")
+public class StageDiagramController {
+
+    private final Logger log = Util.getLogger();
+
+    private final StageDiagramService service = new StageDiagramService();
+
+
+    /**
+     * <h2查询阶段图配置信息</h2>
+     *
+     * @param onlyMark  唯一标识
+     * @param projectId 项目id
+     * @return 配置表信息
+     */
+    @Path("/get/config")
+    @GET
+    @Produces(MediaType.APPLICATION_JSON)
+    public String getStageDiagramConfig(@QueryParam("onlyMark") String onlyMark,
+                                        @QueryParam("projectId") String projectId) {
+        log.info(Util.logStr("进入请求，获取到请求数据onlyMark:[{}],projectId:[{}]", onlyMark, projectId));
+        try {
+            List<NodeInfoVo> stageDiagramConfig = service.getStageDiagramConfig(onlyMark, projectId);
+            log.info(JSON.toJSONString(stageDiagramConfig));
+            log.info(ApiResult.success(stageDiagramConfig));
+            return ApiResult.success(stageDiagramConfig);
+        } catch (Exception e) {
+            log.error("获取阶段图配置参数错误，错误信息：" + e.getMessage(), e);
+            return ApiResult.error("获取阶段图配置错误！");
+        }
+    }
+}
diff --git a/src/main/youhong_ai_old_src/com/api/aiyh_yihong/stagediagram/dto/NodeInfoDto.java b/src/main/youhong_ai_old_src/com/api/aiyh_yihong/stagediagram/dto/NodeInfoDto.java
new file mode 100644
index 0000000..9e9ef7b
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/aiyh_yihong/stagediagram/dto/NodeInfoDto.java
@@ -0,0 +1,96 @@
+package com.api.aiyh_yihong.stagediagram.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+import java.util.List;
+
+/**
+ * <h1>节点信息实体</h1>
+ *
+ * <p>create: 2022-11-11 15:35</p>
+ *
+ * @author youHong.ai
+ */
+
+@Setter
+@Getter
+@ToString
+public class NodeInfoDto {
+	/**
+	 * 节点序号
+	 */
+	private Integer nodeNo;
+	
+	/**
+	 * 前置节点
+	 */
+	private String beforeNode;
+	/**
+	 * 开启条件
+	 */
+	private Integer openConditions;
+	
+	/**
+	 * 节点名称
+	 */
+	private String text;
+	/**
+	 * 节点状态
+	 */
+	private Integer status;
+	/**
+	 * 完成状态点击的链接
+	 */
+	private String finishLink;
+	/**
+	 * 未完成状态点击的链接
+	 */
+	private String notStartLink;
+	/**
+	 * 点击链接
+	 */
+	private String clickUrl;
+	/**
+	 * 下一节点
+	 */
+	private NodeInfoDto next;
+	
+	/**
+	 * 进行中 状态值
+	 */
+	private Integer doingStatus;
+	/**
+	 * 已完成 状态值
+	 */
+	private Integer finishStatus;
+	
+	/**
+	 * 子节点们
+	 */
+	private List<NodeInfoDto> children;
+	
+	/**
+	 * 是否可以点击
+	 */
+	private Boolean canClick;
+	
+	/**
+	 * 父级状态信息
+	 */
+	private List<Integer> parentsStatus;
+	
+	
+	/** 建模表日期字段 */
+	private String dateFieldName;
+	
+	/** 节点对应日期 */
+	private String date;
+	
+	private String managerUserFieldName;
+	
+	private String managerUserId;
+	
+	private String managerUserName;
+}
diff --git a/src/main/youhong_ai_old_src/com/api/aiyh_yihong/stagediagram/mapper/StageDiagramMapper.java b/src/main/youhong_ai_old_src/com/api/aiyh_yihong/stagediagram/mapper/StageDiagramMapper.java
new file mode 100644
index 0000000..7af9634
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/aiyh_yihong/stagediagram/mapper/StageDiagramMapper.java
@@ -0,0 +1,59 @@
+package com.api.aiyh_yihong.stagediagram.mapper;
+
+import aiyh.utils.annotation.recordset.ParamMapper;
+import aiyh.utils.annotation.recordset.Select;
+import aiyh.utils.annotation.recordset.SqlMapper;
+import com.api.aiyh_yihong.stagediagram.pojo.ModelInfo;
+import com.api.aiyh_yihong.stagediagram.pojo.NodeConfigItem;
+
+import java.util.List;
+
+/**
+ * <h1>阶段图查询数据库</h1>
+ *
+ * <p>create: 2022-11-10 17:15</p>
+ *
+ * @author youHong.ai
+ */
+
+@SqlMapper
+public interface StageDiagramMapper {
+	
+	
+	/**
+	 * <h2>根据唯一标识查询配置表主表ID </h2>
+	 *
+	 * @param onlyMark 唯一标识
+	 * @return 主表id
+	 */
+	@Select("select id from uf_yh_stage_diagram where only_mark = #{onlyMark}")
+	Integer selectConfigMainId(@ParamMapper("onlyMark") String onlyMark);
+	
+	
+	/**
+	 * <h2>查询配置表明细表信息</h2>
+	 *
+	 * @param mainId 主表ID
+	 * @return 明细id
+	 */
+	@Select("select * from uf_yh_stage_diagram_dt1 where mainid = #{mainId}")
+	List<NodeConfigItem> selectDetailConfig(@ParamMapper("mainId") Integer mainId);
+	
+	/**
+	 * <h2>查询建模表项目状态信息</h2>
+	 *
+	 * @param modelTableName       建模表表名
+	 * @param projectFieldName     建模表项目字段字段名
+	 * @param modelStatusFieldName 建模表当前阶段项目状态字段名
+	 * @param projectId            项目id
+	 * @return 项目在当前建模表中的状态
+	 */
+	@Select("select id,$t{modelStatusFieldName} status $t{dateFieldName} $t{managerUserFieldName} from $t{modelTableName} where $t{projectFieldName} = #{projectId}")
+	ModelInfo selectProjectStatus(@ParamMapper("modelTableName") String modelTableName,
+	                              @ParamMapper("projectFieldName") String projectFieldName,
+	                              @ParamMapper("modelStatusFieldName") String modelStatusFieldName,
+	                              @ParamMapper("dateFieldName") String dateFieldName,
+	                              @ParamMapper("managerUserFieldName") String managerUserFieldName,
+	                              @ParamMapper("projectId") String projectId);
+}
+
diff --git a/src/main/youhong_ai_old_src/com/api/aiyh_yihong/stagediagram/mapstruct/StageDiagramMapStructMapper.java b/src/main/youhong_ai_old_src/com/api/aiyh_yihong/stagediagram/mapstruct/StageDiagramMapStructMapper.java
new file mode 100644
index 0000000..99a57dd
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/aiyh_yihong/stagediagram/mapstruct/StageDiagramMapStructMapper.java
@@ -0,0 +1,50 @@
+package com.api.aiyh_yihong.stagediagram.mapstruct;
+
+import com.api.aiyh_yihong.stagediagram.dto.NodeInfoDto;
+import com.api.aiyh_yihong.stagediagram.pojo.NodeConfigItem;
+import com.api.aiyh_yihong.stagediagram.vo.NodeInfoVo;
+import org.mapstruct.Mapper;
+import org.mapstruct.Mapping;
+import org.mapstruct.factory.Mappers;
+
+/**
+ * <h1>实体类映射转换</h1>
+ *
+ * <p>create: 2022-11-11 15:41</p>
+ *
+ * @author youHong.ai
+ */
+
+@Mapper
+public interface StageDiagramMapStructMapper {
+	/**
+	 * 代理对象
+	 */
+	StageDiagramMapStructMapper INSTANCE = Mappers.getMapper(StageDiagramMapStructMapper.class);
+	
+	/**
+	 * <h2>将NodeConfigItem 转换为NodeInfoDto</h2>
+	 *
+	 * @param item NodeConfigItem对象
+	 * @return NodeInfoDto对象
+	 */
+	@Mapping(target = "managerUserId", ignore = true)
+	@Mapping(target = "date", ignore = true)
+	@Mapping(target = "clickUrl", ignore = true)
+	@Mapping(target = "canClick", ignore = true)
+	@Mapping(target = "status", ignore = true)
+	@Mapping(target = "parentsStatus", ignore = true)
+	@Mapping(target = "next", ignore = true)
+	@Mapping(target = "children", ignore = true)
+	@Mapping(target = "text", source = "nodeName")
+	NodeInfoDto nodeConfigItemToNodeInfoDto(NodeConfigItem item);
+	
+	
+	/**
+	 * <h2>将NodeInfoDto 转换为NoDeInfoVo对象</h2>
+	 *
+	 * @param source NodeInfoDto对象
+	 * @return NodeInfoVo 对象
+	 */
+	NodeInfoVo nodeInfoDtoToNodeInfoVo(NodeInfoDto source);
+}
diff --git a/src/main/youhong_ai_old_src/com/api/aiyh_yihong/stagediagram/pojo/ModelInfo.java b/src/main/youhong_ai_old_src/com/api/aiyh_yihong/stagediagram/pojo/ModelInfo.java
new file mode 100644
index 0000000..3a8e13d
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/aiyh_yihong/stagediagram/pojo/ModelInfo.java
@@ -0,0 +1,30 @@
+package com.api.aiyh_yihong.stagediagram.pojo;
+
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+/**
+ * <h1>建模表基本信息</h1>
+ *
+ * <p>create: 2022-11-16 13:06</p>
+ *
+ * @author youHong.ai
+ */
+
+@Setter
+@Getter
+@ToString
+public class ModelInfo {
+	private Integer id;
+	private Integer status;
+	
+	
+	private Integer formId;
+	
+	private String date;
+	
+	private String tableName;
+	
+	private String managerUserId;
+}
diff --git a/src/main/youhong_ai_old_src/com/api/aiyh_yihong/stagediagram/pojo/NodeConfigItem.java b/src/main/youhong_ai_old_src/com/api/aiyh_yihong/stagediagram/pojo/NodeConfigItem.java
new file mode 100644
index 0000000..be50691
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/aiyh_yihong/stagediagram/pojo/NodeConfigItem.java
@@ -0,0 +1,85 @@
+package com.api.aiyh_yihong.stagediagram.pojo;
+
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+/**
+ * <h1>节点配置明细表行</h1>
+ *
+ * <p>create: 2022-11-10 17:02</p>
+ *
+ * @author youHong.ai
+ */
+@Getter
+@Setter
+@ToString
+public class NodeConfigItem {
+	/**
+	 * id
+	 */
+	private Integer id;
+	/**
+	 * 节点序号
+	 */
+	private Integer nodeNo;
+	/**
+	 * 建模表ID
+	 */
+	private Integer modelTable;
+	/**
+	 * 建模状态字段id
+	 */
+	private Integer modelStatusField;
+	/**
+	 * 建模项目字段id
+	 */
+	private Integer projectField;
+	/**
+	 * 进行中 状态值
+	 */
+	private Integer doingStatus;
+	/**
+	 * 已完成 状态值
+	 */
+	private Integer finishStatus;
+	/**
+	 * 前置节点
+	 */
+	private String beforeNode;
+	/**
+	 * 开启条件
+	 */
+	private Integer openConditions;
+	/**
+	 * 完成状态点击的链接
+	 */
+	private String finishLink;
+	/**
+	 * 未完成状态点击的链接
+	 */
+	private String notStartLink;
+	/**
+	 * 节点名称
+	 */
+	private String nodeName;
+	/**
+	 * 建模表表名称
+	 */
+	private String modelTableName;
+	/**
+	 * 建模表状态字段字段名称
+	 */
+	private String modelStatusFieldName;
+	/**
+	 * 建模表项目字段字段名称
+	 */
+	private String projectFieldName;
+	
+	/** 建模表日期字段 */
+	private String dateFieldName;
+	
+	/** 经办人字段 */
+	private String managerUserFieldName;
+	
+}
diff --git a/src/main/youhong_ai_old_src/com/api/aiyh_yihong/stagediagram/service/StageDiagramService.java b/src/main/youhong_ai_old_src/com/api/aiyh_yihong/stagediagram/service/StageDiagramService.java
new file mode 100644
index 0000000..b325174
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/aiyh_yihong/stagediagram/service/StageDiagramService.java
@@ -0,0 +1,297 @@
+package com.api.aiyh_yihong.stagediagram.service;
+
+import aiyh.utils.Util;
+import aiyh.utils.excention.CustomerException;
+import com.alibaba.fastjson.JSON;
+import com.api.aiyh_yihong.stagediagram.dto.NodeInfoDto;
+import com.api.aiyh_yihong.stagediagram.mapper.StageDiagramMapper;
+import com.api.aiyh_yihong.stagediagram.mapstruct.StageDiagramMapStructMapper;
+import com.api.aiyh_yihong.stagediagram.pojo.ModelInfo;
+import com.api.aiyh_yihong.stagediagram.pojo.NodeConfigItem;
+import com.api.aiyh_yihong.stagediagram.vo.NodeInfoVo;
+import com.google.common.base.Strings;
+import weaver.hrm.User;
+
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * <h1>阶段图service层</h1>
+ *
+ * <p>create: 2022-11-10 16:38</p>
+ *
+ * @author youHong.ai
+ */
+
+public class StageDiagramService {
+	
+	private final StageDiagramMapper mapper = Util.getMapper(StageDiagramMapper.class);
+	
+	
+	/**
+	 * <h2>获取电梯阶段图配置信息</h2>
+	 *
+	 * @param onlyMark  唯一标识
+	 * @param projectId 项目id
+	 * @return 阶段图信息
+	 */
+	public List<NodeInfoVo> getStageDiagramConfig(String onlyMark, String projectId) {
+		Integer mainId = mapper.selectConfigMainId(onlyMark);
+		if (mainId < 0) {
+			throw new CustomerException(Util.logStr("can not query config data，onlyMark:[{}] does not exist!", onlyMark));
+		}
+		List<NodeConfigItem> nodeConfigItems = mapper.selectDetailConfig(mainId);
+		if (Objects.isNull(nodeConfigItems) || nodeConfigItems.isEmpty()) {
+			throw new CustomerException("can not query config detail item! config detail table is empty!");
+		}
+		Util.getLogger().info(JSON.toJSONString(nodeConfigItems));
+		// 对配置明细表进行链表转换
+		// 1. 将顶层筛选出来
+		List<NodeInfoDto> hasMoreBeforeNodes = new ArrayList<>();
+		List<NodeInfoDto> rootNodeList = new ArrayList<>();
+		for (NodeConfigItem nodeConfigItem : nodeConfigItems) {
+			NodeInfoDto nodeInfoDto = StageDiagramMapStructMapper.INSTANCE.nodeConfigItemToNodeInfoDto(nodeConfigItem);
+			String modelStatusFieldName = nodeConfigItem.getModelStatusFieldName();
+			// 查询项目状态
+			ModelInfo modelInfo = mapper.selectProjectStatus(nodeConfigItem.getModelTableName(),
+					nodeConfigItem.getProjectFieldName(),
+					modelStatusFieldName,
+					Strings.isNullOrEmpty(nodeConfigItem.getDateFieldName()) ? "" : "," + nodeConfigItem.getDateFieldName() + " date",
+					Strings.isNullOrEmpty(nodeConfigItem.getManagerUserFieldName()) ? "" : "," + nodeConfigItem.getManagerUserFieldName() + " manager_user_id",
+					projectId);
+			if (!Objects.isNull(modelInfo)) {
+				nodeInfoDto.setDate(modelInfo.getDate());
+				nodeInfoDto.setManagerUserId(modelInfo.getManagerUserId());
+				if (modelInfo.getManagerUserId() != null && !"".equals(modelInfo.getManagerUserId())) {
+					nodeInfoDto.setManagerUserName(new User(Integer.parseInt(modelInfo.getManagerUserId())).getLastname());
+				}
+				modelInfo.setTableName(nodeConfigItem.getModelTableName());
+				modelInfo.setFormId(nodeConfigItem.getModelTable());
+			}
+			nodeInfoDto.setStatus(replaceLink(projectId, nodeInfoDto, modelInfo));
+			nodeInfoDto.setCanClick(true);
+			this.setClickLink(nodeInfoDto);
+			if (null == nodeConfigItem.getBeforeNode() || "".equals(nodeConfigItem.getBeforeNode())) {
+				this.setClickLink(nodeInfoDto);
+				rootNodeList.add(nodeInfoDto);
+			} else if (nodeConfigItem.getBeforeNode().replaceAll("，", ",").split(",").length > 0) {
+				hasMoreBeforeNodes.add(nodeInfoDto);
+			}
+		}
+		nodeConfigItems.sort(Comparator.comparingInt(NodeConfigItem::getNodeNo));
+		// 2. 对顶层数据查找出所有的子节点
+		for (NodeInfoDto rootNode : rootNodeList) {
+			List<NodeInfoDto> nextNodes = this.findNextNode(nodeConfigItems, rootNode, 0, projectId, hasMoreBeforeNodes);
+			List<Integer> parentStatus = new ArrayList<Integer>() {{
+				add(rootNode.getStatus());
+			}};
+			if (nextNodes.isEmpty()) {
+				continue;
+			}
+			for (NodeInfoDto nextNode : nextNodes) {
+				Integer openConditions = nextNode.getOpenConditions();
+				nextNode.setCanClick(this.getCanClick(Collections.singletonList(rootNode), openConditions));
+				this.setClickLink(nextNode);
+				nextNode.setParentsStatus(parentStatus);
+			}
+			if (nextNodes.size() == 1) {
+				rootNode.setNext(nextNodes.get(0));
+			} else {
+				rootNode.setChildren(nextNodes);
+			}
+		}
+		
+		List<NodeInfoVo> nodeInfoVoList = new ArrayList<>();
+		for (NodeInfoDto nodeInfoDto : rootNodeList) {
+			NodeInfoVo nodeInfoVo = StageDiagramMapStructMapper.INSTANCE.nodeInfoDtoToNodeInfoVo(nodeInfoDto);
+			nodeInfoVoList.add(nodeInfoVo);
+		}
+		
+		return nodeInfoVoList;
+	}
+	
+	/**
+	 * <h2>设置点击链接</h2>
+	 *
+	 * @param nodeInfoDto 设置点击的点击对象
+	 */
+	private void setClickLink(NodeInfoDto nodeInfoDto) {
+		if (nodeInfoDto.getStatus() == null) {
+			if (nodeInfoDto.getCanClick()) {
+				nodeInfoDto.setClickUrl(nodeInfoDto.getNotStartLink());
+			}
+		} else if (nodeInfoDto.getStatus().equals(nodeInfoDto.getFinishStatus())) {
+			//    完成状态
+			nodeInfoDto.setClickUrl(nodeInfoDto.getFinishLink());
+		} else if (nodeInfoDto.getStatus().equals(nodeInfoDto.getDoingStatus())) {
+			nodeInfoDto.setClickUrl(nodeInfoDto.getFinishLink());
+		} else {
+			nodeInfoDto.setClickUrl(nodeInfoDto.getNotStartLink());
+		}
+	}
+	
+	/**
+	 * @param nodeInfoDtoList 父节点数组
+	 * @param openConditions  当前节点开放条件
+	 * @return 是否可以点击开放
+	 */
+	private Boolean getCanClick(List<NodeInfoDto> nodeInfoDtoList, Integer openConditions) {
+		switch (openConditions) {
+			// (所有)前置节点已完成
+			case 0: {
+				for (NodeInfoDto nodeInfoDto : nodeInfoDtoList) {
+					if (nodeInfoDto.getStatus() == null || !nodeInfoDto.getStatus().equals(nodeInfoDto.getFinishStatus())) {
+						return false;
+					}
+				}
+				return true;
+			}
+			default:
+				return false;
+		}
+	}
+	
+	/**
+	 * <h2>查找节点的子节点</h2>
+	 *
+	 * @param nodeConfigItems    所有节点信息
+	 * @param currentNode        当前节点信息
+	 * @param startIndex         开始寻找的索引
+	 * @param projectId          项目id
+	 * @param hasMoreBeforeNodes 拥有多个父节点的子节点
+	 * @return 所有子节点
+	 */
+	private List<NodeInfoDto> findNextNode(List<NodeConfigItem> nodeConfigItems, NodeInfoDto currentNode, int startIndex,
+	                                       String projectId, List<NodeInfoDto> hasMoreBeforeNodes) {
+		List<NodeInfoDto> nodeInfoDtos = new ArrayList<>();
+		for (int i = startIndex; i < nodeConfigItems.size(); i++) {
+			NodeConfigItem nodeConfigItem = nodeConfigItems.get(i);
+			// 通过商机寻找到下级节点，上级节点编号等于当前节点的节点编号
+			if (String.valueOf(currentNode.getNodeNo()).equals(nodeConfigItem.getBeforeNode())) {
+				NodeInfoDto nodeInfoDto = StageDiagramMapStructMapper.INSTANCE.nodeConfigItemToNodeInfoDto(nodeConfigItem);
+				nodeInfoDtos.add(nodeInfoDto);
+				// 查询出子节点的项目状态信息
+				ModelInfo modelInfo = mapper.selectProjectStatus(nodeConfigItem.getModelTableName(),
+						nodeConfigItem.getProjectFieldName(),
+						nodeConfigItem.getModelStatusFieldName(),
+						Strings.isNullOrEmpty(nodeConfigItem.getDateFieldName()) ? "" : "," + nodeConfigItem.getDateFieldName() + " date",
+						Strings.isNullOrEmpty(nodeConfigItem.getManagerUserFieldName()) ? "" : "," + nodeConfigItem.getManagerUserFieldName() + " manager_user_id",
+						projectId);
+				Integer status = -1;
+				if (!Objects.isNull(modelInfo)) {
+					nodeInfoDto.setDate(modelInfo.getDate());
+					nodeInfoDto.setManagerUserId(modelInfo.getManagerUserId());
+					if (modelInfo.getManagerUserId() != null && !"".equals(modelInfo.getManagerUserId())) {
+						nodeInfoDto.setManagerUserName(new User(Integer.parseInt(modelInfo.getManagerUserId())).getLastname());
+					}
+					modelInfo.setTableName(nodeConfigItem.getModelTableName());
+					modelInfo.setFormId(nodeConfigItem.getModelTable());
+				}
+				status = replaceLink(projectId, nodeInfoDto, modelInfo);
+				nodeInfoDto.setCanClick(this.getCanClick(Collections.singletonList(currentNode), nodeInfoDto.getOpenConditions()));
+				this.setClickLink(nodeInfoDto);
+				// 递归查找当前子节点的子节点
+				// List<NodeInfoDto> nextNodeList = this.findNextNode(nodeConfigItems, nodeInfoDto, i + 1, projectId, hasMoreBeforeNodes);
+				List<NodeInfoDto> nextNodeList = this.findNextNode(nodeConfigItems, nodeInfoDto, 0, projectId, hasMoreBeforeNodes);
+				if (nextNodeList.isEmpty()) {
+					continue;
+				}
+				// 将子结点的项目状态当做子结点的子结点的父级状态
+				Integer finalStatus = status;
+				List<Integer> parentStatus = new ArrayList<Integer>() {{
+					add(finalStatus);
+				}};
+				// 如果只查询到一个子结点的子结点，设置到子结点的next属性中
+				if (nextNodeList.size() == 1) {
+					NodeInfoDto next = nextNodeList.get(0);
+					next.setParentsStatus(parentStatus);
+					// 判断是否可以点击当前节点
+					next.setCanClick(this.getCanClick(Collections.singletonList(nodeInfoDto), next.getOpenConditions()));
+					this.setClickLink(next);
+					nodeInfoDto.setNext(next);
+				} else {
+					// 设置父级状态和子结点是否可以点击
+					List<Integer> nextParentStatus = new ArrayList<>();
+					nextNodeList.forEach(item -> {
+						item.setParentsStatus(parentStatus);
+						nextParentStatus.add(item.getStatus());
+						// 判断是否可以点击
+						item.setCanClick(this.getCanClick(Collections.singletonList(nodeInfoDto), item.getOpenConditions()));
+						this.setClickLink(item);
+					});
+					NodeInfoDto nodeInfoChildren = new NodeInfoDto();
+					nodeInfoChildren.setChildren(nextNodeList);
+					nodeInfoDto.setNext(nodeInfoChildren);
+					
+					// 寻找出所有的子结点的节点编号并且排序
+					List<Integer> nextNodeNoList = nextNodeList.stream().map(NodeInfoDto::getNodeNo).sorted().collect(Collectors.toList());
+					String nextNodeNosStr = Util.intJoin(nextNodeNoList, ",");
+					// 寻找是否是多个当前多个节点的子节点
+					for (NodeInfoDto beforeNode : hasMoreBeforeNodes) {
+						String beforeNodeNos = beforeNode.getBeforeNode();
+						List<Integer> beforeNodeNosList = Arrays.stream(
+										beforeNodeNos.replaceAll("，", ",").split(",")
+								)
+								                                  .map(Integer::parseInt).sorted().collect(Collectors.toList());
+						String beforeNodeNosStr = Util.intJoin(beforeNodeNosList, ",");
+						if (nextNodeNosStr.equals(beforeNodeNosStr)) {
+							// 设置子节点的父节点状态
+							beforeNode.setParentsStatus(nextParentStatus);
+							beforeNode.setCanClick(this.getCanClick(nextNodeList, beforeNode.getOpenConditions()));
+							if (beforeNode.getCanClick()) {
+								this.setClickLink(beforeNode);
+							}
+							nodeInfoChildren.setNext(beforeNode);
+							// List<NodeInfoDto> beforeNextList = findNextNode(nodeConfigItems, beforeNode, i + 1, projectId, hasMoreBeforeNodes);
+							List<NodeInfoDto> beforeNextList = findNextNode(nodeConfigItems, beforeNode, 0, projectId, hasMoreBeforeNodes);
+							//    ignore 目前貌似不需要处理多个的问题，并且这个分支按照业务逻辑也不会符合
+							NodeInfoDto beforeNodeNext = beforeNextList.get(0);
+							beforeNodeNext.setParentsStatus(Collections.singletonList(beforeNode.getStatus()));
+							beforeNodeNext.setCanClick(this.getCanClick(Collections.singletonList(beforeNode), beforeNodeNext.getOpenConditions()));
+							if (beforeNodeNext.getCanClick()) {
+								this.setClickLink(beforeNodeNext);
+							}
+							beforeNode.setNext(beforeNodeNext);
+						}
+					}
+				}
+			}
+		}
+		return nodeInfoDtos;
+	}
+	
+	/**
+	 * <h2>替换占链接中的占位符</h2>
+	 *
+	 * @param projectId   项目id
+	 * @param nodeInfoDto 节点信息
+	 * @param modelInfo   建模数据信息
+	 * @return 状态值
+	 */
+	private Integer replaceLink(String projectId, NodeInfoDto nodeInfoDto, ModelInfo modelInfo) {
+		Integer status = -1;
+		if (modelInfo != null) {
+			status = modelInfo.getStatus();
+			nodeInfoDto.setFinishLink(nodeInfoDto.getFinishLink()
+					                          .replace("$billId$",
+							                          String.valueOf(modelInfo.getId()))
+					                          .replace("$projectId$", projectId)
+					                          .replace("$modeId$", Util.getModeIdByTableName(modelInfo.getTableName()))
+					                          .replace("$formId$", Util.null2String(modelInfo.getFormId())));
+			nodeInfoDto.setNotStartLink(nodeInfoDto.getNotStartLink()
+					                            .replace("$billId$",
+							                            String.valueOf(modelInfo.getId()))
+					                            .replace("$projectId$", projectId)
+					                            .replace("$modeId$", Util.getModeIdByTableName(modelInfo.getTableName()))
+					                            .replace("$formId$", Util.null2String(modelInfo.getFormId())));
+			nodeInfoDto.setStatus(status);
+		} else {
+			nodeInfoDto.setFinishLink(nodeInfoDto.getFinishLink()
+					                          .replace("$projectId$", projectId));
+			nodeInfoDto.setNotStartLink(nodeInfoDto.getNotStartLink()
+					                            .replace("$projectId$", projectId));
+			nodeInfoDto.setStatus(status);
+		}
+		return status;
+	}
+}
diff --git a/src/main/youhong_ai_old_src/com/api/aiyh_yihong/stagediagram/vo/NodeInfoVo.java b/src/main/youhong_ai_old_src/com/api/aiyh_yihong/stagediagram/vo/NodeInfoVo.java
new file mode 100644
index 0000000..67381ee
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/aiyh_yihong/stagediagram/vo/NodeInfoVo.java
@@ -0,0 +1,62 @@
+package com.api.aiyh_yihong.stagediagram.vo;
+
+import lombok.Builder;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+import java.util.List;
+
+/**
+ * <h1></h1>
+ *
+ * <p>create: 2022-11-10 16:46</p>
+ *
+ * @author youHong.ai
+ */
+
+@Getter
+@Setter
+@ToString
+@Builder
+public class NodeInfoVo {
+	/**
+	 * 节点名称
+	 */
+	private String text;
+	/**
+	 * 节点状态
+	 */
+	private Integer status;
+	/**
+	 * 点击链接
+	 */
+	private String clickUrl;
+	/**
+	 * 下一节点
+	 */
+	private NodeInfoVo next;
+	/**
+	 * 进行中 状态值
+	 */
+	private Integer doingStatus;
+	/**
+	 * 已完成 状态值
+	 */
+	private Integer finishStatus;
+	/**
+	 * 子节点们
+	 */
+	private List<NodeInfoVo> children;
+	
+	/**
+	 * 是否可以点击
+	 */
+	private Boolean canClick;
+	
+	/** 建模表日期 */
+	private String date;
+	
+	private String managerUserId;
+	private String managerUserName;
+}
diff --git a/src/main/youhong_ai_old_src/com/api/cms/xiao/utils/PreMap.java b/src/main/youhong_ai_old_src/com/api/cms/xiao/utils/PreMap.java
new file mode 100644
index 0000000..2c4500e
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/cms/xiao/utils/PreMap.java
@@ -0,0 +1,26 @@
+package com.api.cms.xiao.utils;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @author XiaoBokang
+ * @create 2021/8/20 14:01
+ */
+
+public class PreMap extends HashMap<String,Object> implements Map<String,Object> {
+
+    public PreMap(){
+        super();
+    }
+
+    public static PreMap create(){
+        return new PreMap();
+    }
+
+    @Override
+    public PreMap put(String key,Object value){
+        super.put(key,value);
+        return this;
+    }
+}
diff --git a/src/main/youhong_ai_old_src/com/api/cms/xiao/utils/RequestBaseInfo.java b/src/main/youhong_ai_old_src/com/api/cms/xiao/utils/RequestBaseInfo.java
new file mode 100644
index 0000000..be3b9e2
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/cms/xiao/utils/RequestBaseInfo.java
@@ -0,0 +1,70 @@
+package com.api.cms.xiao.utils;
+
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @author XiaoBokang
+ * @create 2021/8/23 16:34
+ */
+
+public class RequestBaseInfo{
+
+    private String type;
+    private String url;
+    private Map<String,Object> params;
+    private Map<String,String > headers;
+
+    private static final Map<String,String > HEADER_NORMAL = new HashMap<>();
+    private static final Map<String,Object > PARAMS_NORMAL = new HashMap<>();
+
+    public String getUrl() {
+        return url;
+    }
+
+    public void setUrl(String url) {
+        this.url = url;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public Map<String, Object> getParams() {
+        return params;
+    }
+
+    public void setParams(Map<String, Object> params) {
+        this.params = params;
+    }
+
+    public Map<String, String> getHeaders() {
+        return headers;
+    }
+
+    public void setHeaders(Map<String, String> headers) {
+        this.headers = headers;
+    }
+
+    public static RequestBaseInfo create(String type, String url){
+        return create(type,url,HEADER_NORMAL,PARAMS_NORMAL);
+    }
+
+    public static RequestBaseInfo create(String type, String url, Map<String, String> headers){
+        return create(type,url,headers,PARAMS_NORMAL);
+    }
+
+    public static RequestBaseInfo create(String type, String url, Map<String, String> headers, Map<String, Object> params){
+        RequestBaseInfo requestInfo =  new RequestBaseInfo();
+        requestInfo.setType(type.toUpperCase());
+        requestInfo.setUrl(url);
+        requestInfo.setParams(params);
+        requestInfo.setHeaders(headers);
+        return requestInfo;
+    }
+}
diff --git a/src/main/youhong_ai_old_src/com/api/cms/xiao/utils/RequestUtil.java b/src/main/youhong_ai_old_src/com/api/cms/xiao/utils/RequestUtil.java
new file mode 100644
index 0000000..3be1881
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/cms/xiao/utils/RequestUtil.java
@@ -0,0 +1,81 @@
+package com.api.cms.xiao.utils;
+
+import com.alibaba.fastjson.JSON;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.http.HttpEntity;
+import org.apache.http.client.methods.*;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.DefaultHttpClient;
+import org.apache.http.util.EntityUtils;
+import weaver.wechat.request.HttpManager;
+
+import java.io.IOException;
+import java.util.Map;
+
+
+/**
+ * @author XiaoBokang
+ * @create 2021/8/9 10:09
+ */
+
+public class RequestUtil {
+
+    public static <T> T apiRequest(RequestBaseInfo requestInfo,Class<T> tClass){
+
+        Map<String,String> headers = requestInfo.getHeaders();
+        T result = null;
+
+        switch(requestInfo.getType()){
+            case "GET" :{
+                HttpGet httpGet = new HttpGet(requestInfo.getUrl());
+                headers.forEach(httpGet::setHeader);
+                result = apiSend(httpGet,tClass);
+                }break;
+            case "POST" :{
+                HttpPost httpPost = new HttpPost(requestInfo.getUrl());
+                headers.forEach(httpPost::setHeader);
+                httpPost.setEntity(new StringEntity(JSON.toJSONString(requestInfo.getParams()),"UTF-8"));
+                result = apiSend(httpPost,tClass);}break;
+            case "PUT" :{
+                HttpPut httpPut = new HttpPut(requestInfo.getUrl());
+                headers.forEach(httpPut::setHeader);
+                httpPut.setEntity(new StringEntity(JSON.toJSONString(requestInfo.getParams()),"UTF-8"));
+                result = apiSend(httpPut,tClass);}break;
+        }
+
+        return result;
+    }
+
+    public static <T> T apiSend(
+            HttpUriRequest httpRequest,
+            Class<T> resClass
+    ){
+        DefaultHttpClient httpClient = HttpManager.getHttpClient();
+        CloseableHttpResponse execute = null;
+        T res = null;
+        try {
+            execute = httpClient.execute(httpRequest);
+            if(execute.getStatusLine().getStatusCode() == 200){
+                HttpEntity entity = execute.getEntity();
+                String response= EntityUtils.toString(entity,"utf-8");
+//                ObjectMapper mapper = new ObjectMapper();
+//                CollectionType listType = mapper.getTypeFactory().constructCollectionType(ArrayList.class, Map.class);
+//                List<Map<String,Object>> list = mapper.readValue(response, listType);
+//                result.put("res",list);
+                ObjectMapper objectMapper = new ObjectMapper();
+                res = objectMapper.readValue(response,resClass);
+            }
+        } catch (IOException e) {
+            try {
+                if(execute != null) {
+                    execute.close();
+                }
+            } catch (IOException ioException) {
+                ioException.printStackTrace();
+            }
+            e.printStackTrace();
+        }
+        return res;
+    }
+
+}
diff --git a/src/main/youhong_ai_old_src/com/api/cms/xiao/utils/SqlUtil.java b/src/main/youhong_ai_old_src/com/api/cms/xiao/utils/SqlUtil.java
new file mode 100644
index 0000000..e7ae0dd
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/cms/xiao/utils/SqlUtil.java
@@ -0,0 +1,82 @@
+package com.api.cms.xiao.utils;
+
+import java.lang.reflect.Field;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author XiaoBokang
+ * @create 2021/8/13 17:43
+ */
+
+public class SqlUtil {
+
+    /**
+     * 构建插入的sql语句
+     * @param tableName
+     * @param param
+     * @param params
+     * @return
+     */
+    public static String buildInsert(String tableName, Map<String ,Object> param,List<Object> params){
+
+        StringBuilder keyBuilder = new StringBuilder();
+        StringBuilder valueBuilder = new StringBuilder();
+
+        keyBuilder.append("insert into ")
+                .append(tableName)
+                .append(" (");
+        valueBuilder.append(" values (");
+        param.forEach((key,value) ->{
+            keyBuilder.append(key);
+            keyBuilder.append(",");
+            valueBuilder.append("?");
+            valueBuilder.append(",");
+            params.add(value);
+        });
+        String keySql = keyBuilder.substring(0,keyBuilder.length()-1);
+        String valueSql = valueBuilder.substring(0,valueBuilder.length()-1);
+
+        return keySql+") "+valueSql+")";
+    }
+
+    public static String buildUpdate(String tableName, Map<String ,Object> param,List<Object> params){
+
+        StringBuilder updateBuilder = new StringBuilder();
+
+        updateBuilder.append("update ")
+                .append(tableName)
+                .append(" set ");
+        param.forEach((k,v)->{
+            updateBuilder.append(k).append(" = ?,");
+            params.add(v);
+
+        });
+        String updateSql = updateBuilder.substring(0,updateBuilder.length()-1)+" ";
+
+        return updateSql;
+    }
+
+    public static String buildUpdate(String tableName, Object obj,List<Object> params){
+
+        StringBuilder updateBuilder = new StringBuilder();
+
+        updateBuilder.append("update ")
+                .append(tableName)
+                .append(" set ");
+        Field[] fields = obj.getClass().getFields();
+        try{
+            for (Field field : fields) {
+                field.setAccessible(true);
+                updateBuilder.append(field.getName()).append(" = ?,");
+                params.add(field.get(obj));
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+        String updateSql = updateBuilder.substring(0,updateBuilder.length()-1)+" ";
+
+        return updateSql;
+    }
+
+}
diff --git a/src/main/youhong_ai_old_src/com/api/cms/xiao/utils/entity/RateEntity.java b/src/main/youhong_ai_old_src/com/api/cms/xiao/utils/entity/RateEntity.java
new file mode 100644
index 0000000..e6121d8
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/cms/xiao/utils/entity/RateEntity.java
@@ -0,0 +1,56 @@
+package com.api.cms.xiao.utils.entity;
+
+/**
+ * @author XiaoBokang
+ * @create 2021/9/2 11:19
+ */
+
+public class RateEntity {
+
+    private String currency;
+    private String localCurrency;
+    private Double rate;
+    private String validDate;
+
+    @Override
+    public String toString() {
+        return "RateEntity{" +
+                "currency='" + currency + '\'' +
+                ", localCurrency='" + localCurrency + '\'' +
+                ", rate=" + rate +
+                ", validDate='" + validDate + '\'' +
+                '}';
+    }
+
+    public String getCurrency() {
+        return currency;
+    }
+
+    public void setCurrency(String currency) {
+        this.currency = currency;
+    }
+
+    public String getLocalCurrency() {
+        return localCurrency;
+    }
+
+    public void setLocalCurrency(String localCurrency) {
+        this.localCurrency = localCurrency;
+    }
+
+    public Double getRate() {
+        return rate;
+    }
+
+    public void setRate(Double rate) {
+        this.rate = rate;
+    }
+
+    public String getValidDate() {
+        return validDate;
+    }
+
+    public void setValidDate(String validDate) {
+        this.validDate = validDate;
+    }
+}
diff --git a/src/main/youhong_ai_old_src/com/api/cms/xiao/utils/entity/RateRes.java b/src/main/youhong_ai_old_src/com/api/cms/xiao/utils/entity/RateRes.java
new file mode 100644
index 0000000..ecc2955
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/cms/xiao/utils/entity/RateRes.java
@@ -0,0 +1,58 @@
+package com.api.cms.xiao.utils.entity;
+
+import java.util.List;
+
+/**
+ * @author XiaoBokang
+ * @create 2021/9/2 11:17
+ */
+
+public class RateRes {
+
+    private Boolean code;
+    private String errorMessage;
+    private String traceId;
+    private List<RateEntity> items;
+
+    @Override
+    public String toString() {
+        return "RateRes{" +
+                "code=" + code +
+                ", errorMessage='" + errorMessage + '\'' +
+                ", traceId='" + traceId + '\'' +
+                ", items=" + items +
+                '}';
+    }
+
+    public Boolean getCode() {
+        return code;
+    }
+
+    public void setCode(Boolean code) {
+        this.code = code;
+    }
+
+    public String getErrorMessage() {
+        return errorMessage;
+    }
+
+    public void setErrorMessage(String errorMessage) {
+        this.errorMessage = errorMessage;
+    }
+
+    public String getTraceId() {
+        return traceId;
+    }
+
+    public void setTraceId(String traceId) {
+        this.traceId = traceId;
+    }
+
+    public List<RateEntity> getItems() {
+        return items;
+    }
+
+    public void setItems(List<RateEntity> items) {
+        this.items = items;
+    }
+}
diff --git a/src/main/youhong_ai_old_src/com/api/cms/xiao/web/SyncRate.java b/src/main/youhong_ai_old_src/com/api/cms/xiao/web/SyncRate.java
new file mode 100644
index 0000000..cab26fd
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/cms/xiao/web/SyncRate.java
@@ -0,0 +1,25 @@
+package com.api.cms.xiao.web;
+
+import weaver.workflow.cms.xiao.schedule.RateSchedule;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.core.Context;
+
+/**
+ * @author XiaoBokang
+ * @create 2021/9/2 19:18
+ */
+@Path("/syncRate")
+public class SyncRate {
+
+    @GET
+    @Path("/sync")
+    public String rateSync(@Context HttpServletRequest request, @Context HttpServletResponse response){
+        RateSchedule rateSchedule = new RateSchedule();
+        rateSchedule.execute();
+        return "success";
+    }
+}
diff --git a/src/main/youhong_ai_old_src/com/api/doc/search/util/DocListUtil.java b/src/main/youhong_ai_old_src/com/api/doc/search/util/DocListUtil.java
new file mode 100644
index 0000000..dc37b5d
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/doc/search/util/DocListUtil.java
@@ -0,0 +1,800 @@
+package com.api.doc.search.util;
+
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+
+import com.api.browser.bean.SearchConditionOption;
+import com.api.browser.util.ConditionType;
+import com.engine.doc.util.CheckPermission;
+import com.engine.doc.util.TimeZoneUtil;
+import com.engine.hrm.biz.HrmClassifiedProtectionBiz;
+
+import weaver.docs.docs.DocManager;
+import weaver.general.BaseBean;
+import weaver.general.TimeUtil;
+import weaver.general.Util;
+import weaver.hrm.User;
+import weaver.systeminfo.setting.HrmUserSettingComInfo;
+
+/**
+ * sqlwhere条件拼装
+ *
+ * @author wangqs
+ */
+public class DocListUtil {
+
+  private String sqlWhere = " t1.id=t2.sourceid ";
+  private boolean needRight = true;
+
+  public DocListUtil(HttpServletRequest request, User user, DocTableType docTableType) {
+    this.packageCondition(request, user, docTableType);
+  }
+
+  public DocListUtil(
+      HttpServletRequest request, User user, DocTableType docTableType, boolean needRight) {
+    if (!needRight || user == null) { // user为null，登录前门户元素more页面
+      sqlWhere = "";
+      this.needRight = false;
+    }
+    this.packageCondition(request, user, docTableType);
+  }
+
+  /** 封装查询条件 */
+  private void packageCondition(HttpServletRequest request, User user, DocTableType docTableType) {
+
+    String belongtoids = "";
+    if (needRight) {
+      HrmUserSettingComInfo userSetting = new HrmUserSettingComInfo();
+      String belongtoshow = userSetting.getBelongtoshowByUserId(user.getUID() + "");
+      belongtoids = user.getBelongtoids();
+      if ("1".equals(belongtoshow) && "0".equals(user.getAccount_type()) && !"".equals(belongtoids))
+        belongtoids += "," + user.getUID();
+      else belongtoids = "";
+    }
+
+    Enumeration paramNames = request.getParameterNames();
+
+    String docstatus = "";
+    String customSql = "";
+    if (docTableType == DocTableType.DOC_COPYMOVE) {
+      sqlWhere = " t1.seccategory = " + request.getParameter("sourceId");
+    }
+    while (paramNames.hasMoreElements()) {
+      String paramName = (String) paramNames.nextElement();
+      String paramValue = Util.null2String(request.getParameter(paramName));
+
+      boolean isCustom = true; // 是否是自定义字段
+
+      for (DocCondition condition : DocCondition.values()) {
+        if (paramValue.isEmpty()) continue;
+
+        if (condition.getConditionType() == ConditionType.DATE) {
+          if (paramName.equals(condition.getName() + ConditionUtil.DATE_SELECT)
+              && !"6".equals(paramValue)) { // 只有6-时间范围，页面才传开始到结束时间，这里需要自己处理
+            sqlWhere += packDateType(condition.getName(), paramValue, condition);
+          } else if (paramName.equals(condition.getName() + ConditionUtil.DATE_FROM)) {
+            //						if(paramValue.equals(request.getParameter(condition.getName() +
+            // ConditionUtil.DATE_TO))){ //开始日期==结束日期
+            //							paramValue = TimeZoneUtil.getServerDate1(paramValue,"begin");
+            //							sqlWhere += " and " + condition.getName() + "='" +  paramValue + "'";
+            //						}else{
+            String time_paramValue = TimeZoneUtil.getServerDate1(paramValue, "begin");
+            //							if(!paramValue.equals(time_paramValue)){
+            //								time_paramValue = paramValue;
+            //							}
+            if ("doclastmoddate".equals(condition.getName())
+                || "doccreatedate".equals(condition.getName())) {
+              String doclastmodtime = TimeZoneUtil.getServertime1(paramValue, "begin");
+              sqlWhere +=
+                  TimeZoneUtil.handDateCondition(
+                      "6", paramValue, "", condition.getName(), "", false);
+            } else {
+              sqlWhere +=
+                  " and "
+                      + condition.getName()
+                      + ">='"
+                      + time_paramValue
+                      + "'"; // + " and " + condition.getName() + "=" + paramValue;
+            }
+
+            //						}
+          } else if (paramName.equals(condition.getName() + ConditionUtil.DATE_TO)) {
+            //						if(!paramValue.equals(request.getParameter(condition.getName() +
+            // ConditionUtil.DATE_FROM))){ //开始日期!=结束日期
+            //							paramValue = TimeZoneUtil.getServerDate1(paramValue,"end");
+            String time_paramValue = TimeZoneUtil.getServerDate1(paramValue, "end");
+            //							if(!paramValue.equals(time_paramValue)){
+            //								time_paramValue = paramValue;
+            //							}
+            if ("doclastmoddate".equals(condition.getName())
+                || "doccreatedate".equals(condition.getName())) {
+              String doclastmodtime = TimeZoneUtil.getServertime1(paramValue, "end");
+              sqlWhere +=
+                  TimeZoneUtil.handDateCondition(
+                      "6", "", paramValue, condition.getName(), "", false);
+              //								sqlWhere += " and (" + condition.getName() + "<='" +  time_paramValue + "'"
+              // + " and " + "doclastmodtime<='"+ doclastmodtime +"')";
+            } else {
+              sqlWhere +=
+                  " and "
+                      + condition.getName()
+                      + "<='"
+                      + time_paramValue
+                      + "'"; // + " and " + condition.getName() + "=" + paramValue;
+            }
+            //							sqlWhere += " and " + condition.getName() + "<='" +  time_paramValue + "'";
+            //						}
+          }
+          continue;
+        }
+
+        if (condition.getConditionType() == ConditionType.SCOPE) {
+          if (paramName.equals(DocCondition.REPLAY_DOC_COUNT + ConditionUtil.INTERVAL_FROM)) {
+            String _val = Util.getIntValue(paramValue, 0) + "";
+            if (condition.getDbType() != DbType.INT) {
+              _val = "'" + _val.replace("'", "'") + "'";
+            }
+            sqlWhere += " and " + condition.getName() + " >= " + _val;
+          } else if (paramName.equals(DocCondition.REPLAY_DOC_COUNT + ConditionUtil.INTERVAL_TO)) {
+            String _val = Util.getIntValue(paramValue, 0) + "";
+            if (condition.getDbType() != DbType.INT) {
+              _val = "'" + _val.replace("'", "'") + "'";
+            }
+            sqlWhere += " and " + condition.getName() + " <= " + _val;
+          }
+        }
+
+        if (condition.getName().equals(paramName)) {
+          isCustom = false;
+          if (condition.getLogic() == LogicOperation.CUSTOM) {
+            if (paramName.equals(DocCondition.DOC_SUBJECT.getName())) { // 标题
+              sqlWhere += " and " + getDocSubjectSql(paramValue);
+            } else if (paramName.equals(DocCondition.KEYWORD.getName())) { // 关键字
+              sqlWhere += " and " + getKeyWordSql(paramValue);
+            } else if (paramName.equals(DocCondition.DEPARTMENT_ID.getName())) { // 创建部门
+              sqlWhere +=
+                  " and exists(select 1 from HrmResource where departmentid="
+                      + paramValue
+                      + " and id=t1.doccreaterid)";
+            } else if (paramName.equals(DocCondition.CREATER_SUBCOMPANY_ID.getName())) { // 创建人分部
+              sqlWhere +=
+                  " and exists(select 1 from HrmResource where subcompanyid1="
+                      + paramValue
+                      + " and id=t1.doccreaterid)";
+            } else if (paramName.equals(DocCondition.OWNER_DEPARTMENT_ID.getName())) { // 所有者部门
+              sqlWhere +=
+                  " and exists(select 1 from HrmResource where departmentid="
+                      + paramValue
+                      + " and id=t1.ownerid)";
+            } else if (paramName.equals(DocCondition.OWNER_SUBCOMPANY_ID.getName())) { // 所有者分部
+              sqlWhere +=
+                  " and exists(select 1 from HrmResource where subcompanyid1="
+                      + paramValue
+                      + " and id=t1.ownerid)";
+            } else if (paramName.equals(DocCondition.DATE2DURING.getName())) { // 修改期间
+              if (Util.getIntValue(paramValue, 0) > 36
+                  || Util.getIntValue(paramValue, 0) < 1) { // 表示全部
+                continue;
+              }
+              sqlWhere +=
+                  " and t1.doclastmoddate>='"
+                      + getDate2During(Util.getIntValue(paramValue, 0))
+                      + "'";
+            } else if (paramName.equals(DocCondition.DOC_STATUS.getName())) { // 文档状态
+              docstatus = paramValue;
+            } else if (paramName.equals(DocCondition.TREE_DOC_FIELD_ID.getName())) { // 虚拟目录
+              paramValue = paramValue.startsWith(",") ? paramValue.substring(1) : paramValue;
+              paramValue =
+                  paramValue.endsWith(",")
+                      ? paramValue.substring(0, paramValue.length() - 1)
+                      : paramValue;
+
+              paramValue =
+                  paramValue.indexOf(",") == -1
+                      ? (" = " + paramValue)
+                      : (" in (" + paramValue + ")");
+
+              sqlWhere +=
+                  " and exists(select 1 from DocDummyDetail where docid=t1.id and catelogid "
+                      + paramValue
+                      + ")";
+            }
+
+          } else if (condition.getLogic() == LogicOperation.EQ_OR_IN) {
+            paramValue = paramValue.startsWith(",") ? paramValue.substring(1) : paramValue;
+            paramValue =
+                paramValue.endsWith(",")
+                    ? paramValue.substring(0, paramValue.length() - 1)
+                    : paramValue;
+            // 分为文档订阅部分的高级搜索条件拼接
+            if (paramValue.indexOf(",") == -1) {
+              if (condition.getDbType() == DbType.VARCHAR)
+                paramValue = "'" + paramValue.replace("'", "''") + "'";
+              paramValue = " = " + paramValue;
+            } else {
+              if (condition.getDbType() == DbType.VARCHAR)
+                paramValue = "'" + paramValue.replace("'", "''").replace(",", "','") + "'";
+              paramValue = " in (" + paramValue + ")";
+            }
+
+            if (condition == DocCondition.SUBSCRIPTION_APPROVE_DATE
+                || condition == DocCondition.SUBSCRIPTION_DATE
+                || condition == DocCondition.SUBSCRIPTION_STATE) {
+              sqlWhere += " and ds." + paramName + paramValue;
+            } else {
+
+              sqlWhere += " and t1." + paramName + paramValue;
+            }
+
+          } else if (condition.getLogic() != null) { // 分为文档订阅部分的高级搜索条件拼接
+            String _code = condition.getLogic().getCode();
+            if (_code == null) continue;
+
+            if (condition.getDbType() == DbType.VARCHAR) {
+              if (_code.indexOf("{#}") > -1) {
+                paramValue = paramValue.replace("'", "''");
+              } else {
+                paramValue = "'" + paramValue.replace("'", "''") + "'";
+              }
+            }
+            if (condition == DocCondition.SUBSCRIPTION_APPROVE_DATE
+                || condition == DocCondition.SUBSCRIPTION_DATE
+                || condition == DocCondition.SUBSCRIPTION_STATE) {
+              sqlWhere +=
+                  " and ds."
+                      + paramName
+                      + (_code.indexOf("{#}") > -1
+                          ? _code.replace("{#}", paramValue)
+                          : (_code + paramValue));
+            } else {
+              sqlWhere +=
+                  " and t1."
+                      + paramName
+                      + (_code.indexOf("{#}") > -1
+                          ? _code.replace("{#}", paramValue)
+                          : (_code + paramValue));
+            }
+          }
+          break;
+        }
+      }
+
+      // 处理自定义字段
+      // 如果开启了自定义查询，当前的条件是自定义字段中的值，则进行检查
+      if (isCustom
+          && ConditionUtil.isCustomParamNameNew(paramName)
+          && ConditionUtil.isCustomParamValue(paramName)) {
+        String id = ConditionUtil.getCustomIdNew(paramName);
+
+        int secid = Util.getIntValue(Util.null2String(request.getParameter("seccategory")));
+        if (docTableType == DocTableType.DOC_COPYMOVE) {
+          sqlWhere = " t1.seccategory = " + request.getParameter("sourceId");
+        }
+
+        String fieldValue = paramValue;
+        String fieldOpt =
+            Util.null2String(
+                request.getParameter(
+                    ConditionUtil.CUSTOM_KEY_PREV + id + ConditionUtil.CUSTOM_KEY_OPT),
+                "-1");
+
+        String customSqlWhere = ConditionUtil.getCustomSql(id, secid, user, fieldValue, fieldOpt);
+        if (!customSqlWhere.isEmpty()) {
+          customSql += " and " + customSqlWhere;
+        }
+      }
+    }
+
+    String eqOrInBelongtoidsForSql =
+        needRight
+            ? (belongtoids.isEmpty() ? (" = " + user.getUID()) : (" in (" + belongtoids + ")"))
+            : "";
+
+    // 处理特殊字段
+    docstatus = docstatus.startsWith(",") ? docstatus.substring(1) : docstatus;
+    docstatus =
+        docstatus.endsWith(",") ? docstatus.substring(0, docstatus.length() - 1) : docstatus;
+    if (docTableType == DocTableType.MY_DOC_TABLE) { // 我的文档
+      if (docstatus.isEmpty()) {
+        sqlWhere += " and t1.docstatus != 8 and t1.docstatus != 9 and t1.docstatus <=9";
+      } else {
+        sqlWhere +=
+            " and t1.docstatus "
+                + (docstatus.indexOf(",") > -1 ? ("in (" + docstatus + ")") : ("=" + docstatus));
+      }
+
+      sqlWhere +=
+          " and (t1.doccreaterid "
+              + eqOrInBelongtoidsForSql
+              + " or t1.ownerid "
+              + eqOrInBelongtoidsForSql
+              + ")";
+    } else if (docTableType == DocTableType.DOC_BATCHSHARE) { // 批量共享
+      if (needRight) {
+        // sqlWhere += " and (t1.docstatus in(1,2,5) or (t1.docstatus=7  and (sharelevel>1 or
+        // (t1.doccreaterid="+user.getUID()+" or t1.ownerid="+user.getUID()+"))))";
+        sqlWhere +=
+            " and (t1.docstatus in(1,2,5) or (t1.docstatus=7  and (t1.doccreaterid="
+                + user.getUID()
+                + " or t1.ownerid="
+                + user.getUID()
+                + ")))";
+      } else {
+        sqlWhere += " and t1.docstatus in(1,2,5,7) ";
+      }
+    } else if (docTableType == DocTableType.DOC_COPYMOVE
+        || docTableType == DocTableType.ENGINE_DOC_BATCHSHARE) { // 复制、移动   后台批量调整共享
+      if (docstatus.isEmpty()) {
+        sqlWhere += " and t1.docstatus in(1,2,5,7)";
+      } else {
+        docstatus = docstatus.equals("1") ? "1,2" : docstatus; // 页面查询条件1表示 同时查询 正常、生效两种状态
+        sqlWhere +=
+            " and t1.docstatus "
+                + (docstatus.indexOf(",") > -1 ? ("in (" + docstatus + ")") : ("=" + docstatus));
+      }
+    } else if (docTableType == DocTableType.DOC_RECYCLE) { // 文档回收站
+      if (!docstatus.isEmpty()) {
+        docstatus = docstatus.equals("1") ? "1,2" : docstatus; // 页面查询条件1表示 同时查询 正常、生效两种状态
+        sqlWhere +=
+            " and t1.docstatus "
+                + (docstatus.indexOf(",") > -1 ? ("in (" + docstatus + ")") : ("=" + docstatus));
+      }
+    } else if (docTableType == DocTableType.ENGINE_DOC_RECYCLE) { // 文档回收(后台)
+      if (!docstatus.isEmpty()) {
+        docstatus = docstatus.equals("1") ? "1,2" : docstatus; // 页面查询条件1表示 同时查询 正常、生效两种状态
+        sqlWhere +=
+            " and t1.docstatus "
+                + (docstatus.indexOf(",") > -1 ? ("in (" + docstatus + ")") : ("=" + docstatus));
+      }
+    } else if (docTableType == DocTableType.DOC_SUBSCRIPTION_HISTORY) { // 文档订阅历史
+      if (docstatus.isEmpty()) {
+        //	sqlWhere += " and t1.docstatus in(1,2,5) ";
+        if (needRight) {
+          // sqlWhere += " and (t1.docstatus in(1,2,5) or (t1.docstatus=7  and (sharelevel>1 or
+          // (t1.doccreaterid="+user.getUID()+" or t1.ownerid="+user.getUID()+"))))";
+          // ayh 默认可以查看全部文档，包括非正常状态的文档
+
+          /*          sqlWhere +=
+          " and (t1.docstatus in(1,2,5) or (t1.docstatus=7  and (t1.doccreaterid="
+              + user.getUID()
+              + " or t1.ownerid="
+              + user.getUID()
+              + ")))";*/
+          sqlWhere +=
+              " and (t1.docstatus in(1,2,3,4,5,6,7,8,9) or (t1.docstatus=7  and (t1.doccreaterid="
+                  + user.getUID()
+                  + " or t1.ownerid="
+                  + user.getUID()
+                  + ")))";
+        } else {
+//          ayh 默认可以参看全部文档，包括处于非正常状态的文档
+//          sqlWhere += " and t1.docstatus in(1,2,5) ";
+            sqlWhere += " and t1.docstatus in(1,2,3,4,5,6,7,8,9) ";
+        }
+      } else {
+        docstatus = docstatus.equals("1") ? "1,2" : docstatus; // 页面查询条件1表示 同时查询 正常、生效两种状态
+        sqlWhere +=
+            " and t1.docstatus "
+                + (docstatus.indexOf(",") > -1 ? ("in (" + docstatus + ")") : ("=" + docstatus));
+      }
+
+      if (docTableType == DocTableType.NEWEST_DOC
+          || docTableType == DocTableType.NO_READ_DOC) { // 最新文档（未读文档）
+        sqlWhere +=
+            " and t1.doccreaterid "
+                + (belongtoids.isEmpty()
+                    ? ("<> " + user.getUID())
+                    : ("not in (" + belongtoids + ")"));
+      }
+    } else if (docTableType == DocTableType.ENGINE_DOC_PROP_SET) { // 文档弹出窗口设置
+      sqlWhere += " and t1.docstatus in(1,2,5) and t1.docextendname = 'html'";
+    } else {
+      if (docstatus.isEmpty()) {
+        //	sqlWhere += " and t1.docstatus in(1,2,5) ";
+        if (needRight) {
+          // sqlWhere += " and (t1.docstatus in(1,2,5) or (t1.docstatus=7  and (sharelevel>1 or
+          // (t1.doccreaterid="+user.getUID()+" or t1.ownerid="+user.getUID()+"))))";
+//          ayh
+//          sqlWhere +=
+//              " and (t1.docstatus in(1,2,5) or (t1.docstatus=7  and (t1.doccreaterid="
+//                  + user.getUID()
+//                  + " or t1.ownerid="
+//                  + user.getUID()
+//                  + ")))";
+          sqlWhere +=
+                  " and (t1.docstatus in(1,2,3,4,5,6,7,8,9) or (t1.docstatus=7  and (t1.doccreaterid="
+                          + user.getUID()
+                          + " or t1.ownerid="
+                          + user.getUID()
+                          + ")))";
+        } else {
+//          ayh
+//          sqlWhere += " and t1.docstatus in(1,2,5) ";
+          sqlWhere += " and t1.docstatus in(1,2,3,4,5,6,7,8,9) ";
+        }
+      } else {
+        docstatus = docstatus.equals("1") ? "1,2" : docstatus; // 页面查询条件1表示 同时查询 正常、生效两种状态
+        sqlWhere +=
+            " and t1.docstatus "
+                + (docstatus.indexOf(",") > -1 ? ("in (" + docstatus + ")") : ("=" + docstatus));
+      }
+
+      if (docTableType == DocTableType.NEWEST_DOC
+          || docTableType == DocTableType.NO_READ_DOC) { // 最新文档（未读文档）
+        sqlWhere +=
+            " and t1.doccreaterid "
+                + (belongtoids.isEmpty()
+                    ? ("<> " + user.getUID())
+                    : ("not in (" + belongtoids + ")"));
+      }
+    }
+
+    String isNew = Util.null2String(request.getParameter("isNew"));
+    if ("yes".equals(isNew)
+        || docTableType == DocTableType.NEWEST_DOC
+        || docTableType == DocTableType.NO_READ_DOC) {
+      sqlWhere +=
+          " and not exists(select 1 from docReadTag where t1.id=docid and userid "
+              + eqOrInBelongtoidsForSql
+              + " and usertype=1)";
+    }
+
+    if (!customSql.isEmpty()) {
+      sqlWhere +=
+          " and exists(select 1 from cus_fielddata tcm where scope='"
+              + ConditionUtil.CUSTOM_SCOPE
+              + "' and id=t1.id "
+              + customSql
+              + ")";
+    }
+
+    if (docTableType == DocTableType.DOC_BATCHSHARE && needRight) { // 批量共享(不需要权限的是后台批量共享)
+      // sqlWhere += " and sharelevel=3 and exists(select 1 from DocSecCategory where
+      // DocSecCategory.id=t1.secCategory and DocSecCategory.shareable='1')";
+      sqlWhere +=
+          " and exists(select 1 from DocSecCategory where DocSecCategory.id=t1.secCategory and DocSecCategory.shareable='1')";
+    }
+
+    // if(needRight){
+    if (docTableType == DocTableType.DOC_OUT_TABLE) { // 登录前门户more(只取内部)
+      boolean secretFlag = CheckPermission.isOpenSecret();
+      if (secretFlag) sqlWhere += " and t1.secretLevel=" + DocManager.DEFAILT_SECRET_LEVEL;
+    } else {
+      sqlWhere += DocListUtil.getSecretSql(user, " and t1.secretLevel");
+    }
+    // }
+
+    // 统一过滤字段
+    if (docTableType != DocTableType.DOC_SUBSCRIPTION_HISTORY
+        && docTableType != DocTableType.DOC_SUBSCRIPTION_APPROVE
+        && docTableType != DocTableType.DOC_SUBSCRIPTION_BACK
+        && docTableType != DocTableType.DOC_RECYCLE) { // 非文档订阅过虑历史文件 、 非回收站
+      sqlWhere += " and (t1.ishistory is null or t1.ishistory = 0)";
+    }
+
+    if (docTableType == DocTableType.DOC_RECYCLE) { // 文档回收站
+      sqlWhere += " and t1.ishistory != 1 ";
+      sqlWhere += " and t1.docdeleteuserid=" + user.getUID();
+    } else if (docTableType == DocTableType.ENGINE_DOC_RECYCLE) { // 文档回收站(后台)
+      sqlWhere += " and t1.ishistory != 1 ";
+    } else {
+      sqlWhere += " and (t1.isreply is null or t1.isreply='' or t1.isreply='0')";
+    }
+
+    sqlWhere = sqlWhere.trim().startsWith("and") ? sqlWhere.substring(4) : sqlWhere;
+
+    // 初次进入列表，代入默认值条件
+    packDefaultValue(request, user, docTableType);
+  }
+
+  public static String getSecretSql(User user, String column) {
+    boolean secretFlag = CheckPermission.isOpenSecret();
+    if (secretFlag) {
+      HrmClassifiedProtectionBiz hcpb = new HrmClassifiedProtectionBiz();
+      String userSecretLevel = user == null ? "" : hcpb.getMaxResourceSecLevel(user);
+      return column + ">=" + Util.getIntValue(userSecretLevel, DocManager.DEFAILT_SECRET_LEVEL); //
+    }
+    return "";
+  }
+
+  public static Map<String, String> getCreateDate(HttpServletRequest request) {
+    String select =
+        request.getParameter(DocCondition.DOC_CREATEDATE_SELECT + ConditionUtil.DATE_SELECT);
+    String from =
+        request.getParameter(DocCondition.DOC_CREATEDATE_SELECT + ConditionUtil.DATE_FROM);
+    String to = request.getParameter(DocCondition.DOC_CREATEDATE_SELECT + ConditionUtil.DATE_TO);
+
+    Map<String, String> dateMap = new HashMap<String, String>();
+    if ("0".equals(select)) {
+      return dateMap;
+    }
+    dateMap = packDate(select, from, to);
+
+    from = dateMap.get("from");
+    to = dateMap.get("to");
+
+    if (from != null && !from.isEmpty()) {
+      from = new TimeZoneUtil().getServerDate(from + " 00:00:00");
+    }
+    if (to != null && !to.isEmpty()) {
+      to = new TimeZoneUtil().getServerDate(to + " 23:59:59");
+    }
+
+    dateMap.put(DocCondition.DOC_CREATEDATE_SELECT.getName() + ConditionUtil.DATE_FROM, from);
+    dateMap.put(DocCondition.DOC_CREATEDATE_SELECT.getName() + ConditionUtil.DATE_TO, to);
+
+    return dateMap;
+  }
+
+  /**
+   * 初始进入列表，代入默认值条件
+   *
+   * @author wangqs
+   */
+  public void packDefaultValue(HttpServletRequest request, User user, DocTableType docTableType) {
+
+    //
+    /***
+     * String during = request.getParameter(DocCondition.DATE2DURING.getName());
+     * if(during == null){
+     * List<SearchConditionOption> options = ConditionUtil.getDateSelectDuring(user.getLanguage());
+     * int date = 0;
+     * for(SearchConditionOption option : options){
+     * if(option.isSelected()){
+     * date = Util.getIntValue(option.getKey(),0);
+     * }
+     * }
+     * if(date >= 1 && date <= 36){
+     *
+     * sqlWhere += " and t1.doclastmoddate>='" + getDate2During(date) + "'";
+     * }
+     * }
+     *
+     ***/
+
+    // 最新文档有tab页，未读文档没有tab页
+    if (docTableType == DocTableType.NEWEST_DOC) { // 最新文档
+      try {
+        sqlWhere += this.packSearchTabDate(request.getParameter(ConditionUtil.TAB_REQ_NAME));
+      } catch (Exception e) {
+        e.printStackTrace();
+      }
+    } else if (docTableType == DocTableType.MY_DOC_TABLE
+        || docTableType == DocTableType.SEARCH_DOC_TABLE
+        || docTableType == DocTableType.CATEGORY_DOC_TABLE) { // 我的文档、查询文档、文档目录
+      try {
+        // 0-全部，1-今天，2-本周，3-本月，4-本季，5-本年
+
+        int tab =
+            Util.getIntValue(
+                request.getParameter(ConditionUtil.TAB_REQ_NAME), ConditionUtil.TAB_DATE_DEFAULT);
+
+        String updateDate =
+            Util.null2String(
+                request.getParameter(
+                    DocCondition.DOC_LAST_MODDATE.getName() + ConditionUtil.DATE_SELECT));
+
+        if (updateDate.isEmpty()) { // 没有修改日期，取默认时间
+          //	sqlWhere += packDateType(DocCondition.DOC_LAST_MODDATE.getName(),tab + "");
+        }
+
+      } catch (Exception e) {
+        e.printStackTrace();
+      }
+    }
+
+    sqlWhere = sqlWhere.trim().startsWith("and") ? sqlWhere.substring(4) : sqlWhere;
+  }
+
+  /** 处理修改期间(最近n月)条件的查询 */
+  public static String getDate2During(int month) {
+    Calendar calendar = Calendar.getInstance();
+    calendar.add(Calendar.DATE, -30 * month);
+    Date cDate = new Date(calendar.getTimeInMillis());
+    return new SimpleDateFormat("yyyy-MM-dd").format(cDate);
+  }
+
+  /** 处理特殊时间类型(今天、本周、本月....)条件查询 0-全部，1-今天，2-本周，3-本月，7-上个月，4-本季，5-本年，8-上一年，6-指定日期范围 */
+  public static String packDateType(String column, String value, DocCondition condition) {
+    Map<String, String> dateMap = packDate(value, "", "");
+    String sdate = Util.null2String(dateMap.get("from"));
+    String edate = Util.null2String(dateMap.get("to"));
+
+    if ("0".equals(value)) {
+      return "";
+    }
+
+    if (condition == DocCondition.SUBSCRIPTION_APPROVE_DATE
+        || condition == DocCondition.SUBSCRIPTION_DATE
+        || condition == DocCondition.SUBSCRIPTION_STATE) {
+      if (!sdate.isEmpty()) {
+        if ("8".equals(value)) {
+          return TimeZoneUtil.handDateCondition(value, sdate, edate, column, "ds", false, true);
+        } else {
+          return TimeZoneUtil.handDateCondition(value, sdate, edate, column, "ds", false, true);
+        }
+        //				if(sdate.equals(edate)){
+        ////					return TimeZoneUtil.handDateCondition(value,sdate,"",column,"ds",false,true);
+        //					return " and ds." + column + "='" + sdate + "'";
+        //				}else{
+        ////					return TimeZoneUtil.handDateCondition(value,sdate,"",column,"ds",false,true);
+        //					String test = " and ds." + column + ">='" + sdate + "' and ds." + column + "<='" +
+        // edate + "'";
+        //					return test;
+        //				}
+      }
+    } else {
+      if (!sdate.isEmpty()) {
+        if ("8".equals(value)) {
+          return TimeZoneUtil.handDateCondition(value, sdate, edate, column, "t1", false, true);
+        } else {
+          return TimeZoneUtil.handDateCondition(value, sdate, edate, column, "t1", false, true);
+        }
+        //				if(sdate.equals(edate)){
+        //					return " and t1." + column + "='" + sdate + "'";
+        //				}else{
+        //					String test = " and t1." + column + ">='" + sdate + "' and t1." + column + "<='" +
+        // edate + "'";
+        //					return test;
+        //				}
+      }
+    }
+
+    return "";
+  }
+
+  /**
+   * 处理特殊时间类型(今天、本周、本月....)条件查询 0-全部，1-今天，2-本周，3-本月，7-上个月，4-本季，5-本年，8-上一年，6-指定日期范围
+   *
+   * @author wangqs
+   * @params select-类型值，from-指定类型的开始日期，to-指定日期的结束日期
+   */
+  public static Map<String, String> packDate(String select, String from, String to) {
+    Map<String, String> dateMap = new HashMap<String, String>();
+
+    String sdate = "";
+    String edate = TimeUtil.getCurrentDateString();
+    switch (Util.getIntValue(select, 0)) {
+      case 1:
+        sdate = TimeUtil.getCurrentDateString();
+        break;
+      case 2:
+        sdate = TimeUtil.getFirstDayOfWeek();
+        break;
+      case 3:
+        sdate = TimeUtil.getFirstDayOfMonth();
+        break;
+      case 4:
+        sdate = TimeUtil.getFirstDayOfSeason();
+        break;
+      case 5:
+        sdate = TimeUtil.getFirstDayOfTheYear();
+        break;
+      case 6:
+        sdate = from;
+        edate = to;
+      case 7:
+        sdate = TimeUtil.getLastMonthBeginDay();
+        edate = TimeUtil.getLastMonthEndDay();
+        break;
+      case 8:
+        sdate = TimeUtil.getFirstDayOfLastYear();
+        edate = TimeUtil.getEndDayOfLastYear();
+        break;
+      default:
+        break;
+    }
+
+    //		TimeZoneUtil timeZoneUtil = new TimeZoneUtil();
+    //		//多时区转换
+    //		sdate = timeZoneUtil.getServerDate(sdate,"begin");
+    //		edate = timeZoneUtil.getServerDate(edate,"end");
+
+    dateMap.put("from", sdate);
+    dateMap.put("to", edate);
+
+    return dateMap;
+  }
+
+  /** 根据规则 处理有主题条件的查询 */
+  private String getDocSubjectSql(String docsubject) {
+    String tmpString = "";
+    docsubject = docsubject.replaceAll("'", "''").replaceAll("\"", "&quot;");
+    if ((docsubject.indexOf(" ") == -1 && docsubject.indexOf("+") == -1)
+        || (docsubject.indexOf(" ") != -1 && docsubject.indexOf("+") != -1)) {
+      tmpString += " t1.docsubject like '%" + docsubject + "%'";
+    } else if (docsubject.indexOf(" ") != -1 && docsubject.indexOf("+") == -1) {
+      String orArray[] = Util.TokenizerString2(docsubject, " ");
+      if (orArray.length > 0) {
+        tmpString += "  ( ";
+      }
+      for (int i = 0; i < orArray.length; i++) {
+        tmpString += " t1.docsubject like '%" + orArray[i] + "%'";
+        if (i + 1 < orArray.length) {
+          tmpString += " or ";
+        }
+      }
+      if (orArray.length > 0) {
+        tmpString += " ) ";
+      }
+    } else if (docsubject.indexOf(" ") == -1 && docsubject.indexOf("+") != -1) {
+      String andArray[] = Util.TokenizerString2(docsubject, "+");
+      for (int i = 0; i < andArray.length; i++) {
+        tmpString += " t1.docsubject like '%" + andArray[i] + "%'";
+        if (i + 1 < andArray.length) {
+          tmpString += " and ";
+        }
+      }
+    }
+    return tmpString;
+  }
+
+  /** 根据规则 处理有关键字条件的查询 */
+  private String getKeyWordSql(String keyword) {
+    String keywordSql = "";
+    keyword = keyword.trim().replaceAll("'", "''");
+    ArrayList keywordList = Util.TokenizerString(keyword, " ");
+    if (keywordList != null && keywordList.size() > 0) {
+      for (int i = 0; i < keywordList.size(); i++) {
+        String tempkeyword = (String) keywordList.get(i);
+        keywordSql +=
+            keywordSql.equals("")
+                ? " t1.keyword like '%" + tempkeyword + "%' "
+                : " or t1.keyword like '%" + tempkeyword + "%' ";
+      }
+      if (!keywordSql.equals("")) {
+        keywordSql = " (" + keywordSql + ") ";
+      }
+    }
+    return keywordSql;
+  }
+
+  /**
+   * 最新文档tab页转换成 sql条件
+   *
+   * @author wangqs
+   */
+  private String packSearchTabDate(String tabValue) throws Exception {
+    String sql = "";
+
+    switch (Util.getIntValue(tabValue, ConditionUtil.TAB_DEFAULT_VALUE)) {
+      case ConditionUtil.TAB_TODAY_VALUE:
+        sql = " and t1.doccreatedate='" + TimeUtil.getCurrentDateString() + "'";
+        break;
+      case ConditionUtil.TAB_WEEK_VALUE:
+        sql = " and t1.doccreatedate>='" + TimeUtil.getFirstDayOfWeek() + "'";
+        sql += " and t1.doccreatedate<='" + TimeUtil.getLastDayOfWeek() + "'";
+        break;
+      case ConditionUtil.TAB_MONTH_VALUE:
+        sql = " and t1.doccreatedate>='" + TimeUtil.getFirstDayOfMonth() + "'";
+        sql += " and t1.doccreatedate<='" + TimeUtil.getLastDayOfMonth() + "'";
+        break;
+      case ConditionUtil.TAB_SESSION_VALUE:
+        sql = " and t1.doccreatedate>='" + TimeUtil.getFirstDayOfSeason() + "'";
+        sql += " and t1.doccreatedate<='" + TimeUtil.getLastDayDayOfSeason() + "'";
+        break;
+      case ConditionUtil.TAB_YEAR_VALUE:
+        sql = " and t1.doccreatedate>='" + TimeUtil.getFirstDayOfTheYear() + "'";
+        sql += " and t1.doccreatedate<='" + TimeUtil.getLastDayOfYear() + "'";
+        break;
+      default:
+        break;
+    }
+
+    return sql;
+  }
+
+  public String getSqlWhere() {
+//    ayh
+    new BaseBean().writeLog("create sql string from docListUtil, sqlWhere is :" + this.sqlWhere);
+    return this.sqlWhere;
+  }
+}
diff --git a/src/main/youhong_ai_old_src/com/api/doc/search/web/SearchListAction.java b/src/main/youhong_ai_old_src/com/api/doc/search/web/SearchListAction.java
new file mode 100644
index 0000000..f1e6fb4
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/doc/search/web/SearchListAction.java
@@ -0,0 +1,1018 @@
+package com.api.doc.search.web;
+
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.serializer.SerializerFeature;
+import com.api.browser.bean.BrowserBean;
+import com.api.browser.bean.SearchConditionItem;
+import com.api.browser.service.impl.DocCategoryService;
+import com.api.browser.service.impl.DocFullSearchUtil;
+import com.api.doc.category.service.CategoryService;
+import com.api.doc.mobile.systemDoc.util.CategoryUtil;
+import com.api.doc.search.bean.CustomFieldExt;
+import com.api.doc.search.bean.RightMenu;
+import com.api.doc.search.service.DocNewsService;
+import com.api.doc.search.service.DocSearchService;
+import com.api.doc.search.util.*;
+import com.engine.common.util.ParamUtil;
+import com.engine.doc.util.CheckPermission;
+import com.engine.doc.util.DocApplySettingUtil;
+import com.engine.portal.biz.menuinfo.MenuInfoCommonBiz;
+import weaver.conn.RecordSet;
+import weaver.general.BaseBean;
+import weaver.general.TimeUtil;
+import weaver.general.Util;
+import weaver.hrm.HrmUserVarify;
+import weaver.hrm.User;
+import weaver.hrm.moduledetach.ManageDetachComInfo;
+import weaver.systeminfo.SystemEnv;
+
+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;
+import javax.ws.rs.core.MediaType;
+import java.util.*;
+
+@Path("/doc/searchlist")
+public class SearchListAction {
+	/**
+	 * 列表
+	 * @author wangqs
+	 * */
+	@GET
+	@Path("/list")
+	@Produces(MediaType.TEXT_PLAIN)
+	public String getDataList(@Context HttpServletRequest request, @Context HttpServletResponse response) throws Exception {
+		Map<String,Object> apidatas = new HashMap<String,Object>();
+		try{
+			User user = HrmUserVarify.getUser (request , response) ;
+
+
+			String getMost = request.getParameter("getMost");
+			boolean noFullSearch = false; //微搜不支持，只能走sql
+			
+			if("reply".equals(getMost) || "read".equals(getMost) || "download".equals(getMost) || "score".equals(getMost)){
+				noFullSearch = true;
+			}
+			
+			//当前选中tab
+			int tabInfo = Util.getIntValue(request.getParameter(ConditionUtil.TAB_REQ_NAME),ConditionUtil.TAB_LIST_DEFAULT);
+			
+			boolean fromProtal = false;
+			String protalViewcondition = "";
+			DocTableType docTableType = null;
+			
+			if(tabInfo == ConditionUtil.TAB_LIST_MY){
+				docTableType = DocTableType.MY_DOC_TABLE;
+			}else if(tabInfo == ConditionUtil.TAB_LIST_NO_READ){
+				docTableType = DocTableType.NO_READ_DOC;
+				noFullSearch = true;
+			}else if(tabInfo >= ConditionUtil.TAB_LIST_ALL){
+				docTableType = DocTableType.SEARCH_DOC_TABLE;
+			}
+			//外部用户暂不支持微搜
+			if("2".equals(user.getLogintype())){
+				noFullSearch=true;
+			}
+			
+			DocSearchService docSearchService = new DocSearchService();
+			boolean useFullSearch = noFullSearch ? false : DocSearchService.useFullSearch();
+			//boolean hasFullSearch = noFullSearch ? false : DocFullSearchUtil.isUseFullSearch(user.getLanguage() + "");
+
+			String elementmore = Util.null2String(request.getParameter("elementmore"));
+
+			String secIds = "";
+			String dumids = "";
+			String cenids = "";
+			String poids = "";
+			String toids = "";
+			String order = "";
+			String orderBy = "";
+
+			if(!elementmore.isEmpty())
+			{
+				//net.sf.json.JSONArray arry = net.sf.json.JSONArray.fromObject(elementmore);
+				//net.sf.json.JSONObject jb = arry.getJSONObject(0);
+				net.sf.json.JSONObject jb = net.sf.json.JSONObject.fromObject(elementmore);
+				
+				if(jb.get(DocNewsService.NEWS_CATEGORY_IDS) != null){
+					useFullSearch = false;
+					String jonStr = jb.getString(DocNewsService.NEWS_CATEGORY_IDS);
+					net.sf.json.JSONArray arry = net.sf.json.JSONArray.fromObject(jonStr);
+					for(int i = 0;i < arry.size();i++){
+						secIds += "," + arry.getInt(i);
+					}
+					secIds = secIds.isEmpty() ? "" : secIds.substring(1);
+				}
+				
+				if(jb.get(DocNewsService.NEWS_VIRTUAL_IDS) != null){
+					useFullSearch = false;
+					String jonStr = jb.getString(DocNewsService.NEWS_VIRTUAL_IDS);
+					net.sf.json.JSONArray arry = net.sf.json.JSONArray.fromObject(jonStr);
+					for(int i = 0;i < arry.size();i++){
+						dumids += "," + arry.getInt(i);
+					}
+					dumids = dumids.isEmpty() ? "" : dumids.substring(1);
+				}
+				
+				if(jb.get(DocNewsService.NEWS_CENTER_IDS) != null){
+					useFullSearch = false;
+					String jonStr = jb.getString(DocNewsService.NEWS_CENTER_IDS);
+					net.sf.json.JSONArray arry = net.sf.json.JSONArray.fromObject(jonStr);
+					for(int i = 0;i < arry.size();i++){
+						cenids += "," + arry.getInt(i);
+					}
+					cenids = cenids.isEmpty() ? "" : cenids.substring(1);
+				}
+				
+				if(jb.get(DocNewsService.NEWS_APPOINT_IND) != null){
+					useFullSearch = false;
+					String jonStr = jb.getString(DocNewsService.NEWS_APPOINT_IND);
+					net.sf.json.JSONArray arry = net.sf.json.JSONArray.fromObject(jonStr);
+					for(int i = 0;i < arry.size();i++){
+						poids += "," + arry.getInt(i);
+					}
+					poids = poids.isEmpty() ? "" : poids.substring(1);
+				}
+				
+				if(jb.get(DocNewsService.NEWS_TOP_IDS) != null){
+					useFullSearch = false;
+					String jonStr = jb.getString(DocNewsService.NEWS_TOP_IDS);
+					net.sf.json.JSONArray arry = net.sf.json.JSONArray.fromObject(jonStr);
+					for(int i = 0;i < arry.size();i++){
+						toids += "," + arry.getInt(i);
+					}
+					toids = toids.isEmpty() ? "" : toids.substring(1);
+				}
+				
+				order = "";
+				orderBy = "";
+			}
+			
+			String secid = Util.null2String(request.getParameter("secid"));
+			if(!secid.isEmpty()){
+				secIds += secIds.isEmpty() ? secid : ("," + secid);
+			}
+			String menuid = Util.null2String(request.getParameter("menuidforportal"));
+			if (!menuid.isEmpty()){
+				String paramsStr = new MenuInfoCommonBiz().getLeftMenuParams(menuid);
+				secid = getUrlParams(paramsStr,"secid");
+				int viewcondition = Util.getIntValue(getUrlParams(paramsStr,"viewcondition"));
+				if(!secid.isEmpty()){
+					secIds += secIds.isEmpty() ? secid : ("," + secid);
+				}
+				if(viewcondition == ConditionUtil.TAB_LIST_MY){
+					docTableType = DocTableType.MY_DOC_TABLE;
+					fromProtal = true;
+					protalViewcondition = ConditionUtil.TAB_LIST_MY+"";
+				}else if(viewcondition == ConditionUtil.TAB_LIST_NO_READ){
+					docTableType = DocTableType.NO_READ_DOC;
+					fromProtal = true;
+					protalViewcondition = ConditionUtil.TAB_LIST_NO_READ+"";
+					useFullSearch = false;
+				}else if(viewcondition >= ConditionUtil.TAB_LIST_ALL){
+					docTableType = DocTableType.SEARCH_DOC_TABLE;
+					fromProtal = true;
+					protalViewcondition = ConditionUtil.TAB_LIST_ALL+"";
+				}
+
+			}
+			
+			apidatas.put("secids",secIds); 
+			apidatas.put("elementmore",elementmore);
+			if(useFullSearch){
+				Map<String,Object> params = new HashMap<String,Object>();
+				String groupid = request.getParameter("groupid");   //自定义查询
+				ConditionUtil condition = new ConditionUtil();
+				if(tabInfo > ConditionUtil.TAB_LIST_ALL && groupid != null && !groupid.isEmpty()){
+					Map<String,String> defaultValues = condition.getConditionMouldDetail(groupid, user);
+					for(String key : defaultValues.keySet()){
+						params.put(key, defaultValues.get(key));
+					}
+				}else{
+					params = getRequestMap(request);
+				}
+
+				if(!secIds.isEmpty())
+				{
+					params.put("secCategory", secIds);
+
+				}
+				apidatas = docSearchService.getDocListByFullSearch(docTableType,user,params);
+				apidatas.put("useType", "datasource");
+			}else{
+				DocListUtil docListUtil = new DocListUtil(request,user,docTableType);
+				String detailWhere = docListUtil.getSqlWhere();
+//				ayh
+//				new BaseBean().writeLog("docListUtil get sql string！");
+
+				String moreWhere = "";
+				if(!secIds.isEmpty())
+				{
+					moreWhere += " or t1.seccategory in ("+secIds+")";
+				}
+				if(!dumids.isEmpty()){
+					moreWhere += " or exists (select 1 from DocDummyDetail where docid=t1.id and catelogid in("+dumids+"))";
+				}
+				if(!cenids.isEmpty()){
+
+					RecordSet rs = new RecordSet();
+					rs.executeQuery("select publishtype,departmentopt,dateopt,newsclause from DocFrontpage where id in(" + cenids + ")");
+					
+					
+					String newsWhere = "";
+					
+					int publishtype = 0;
+					int departmentopt = 0;
+					int dateopt = 0;
+					String newsclause = "";
+					while(rs.next()){
+						publishtype = rs.getInt("publishtype");
+						departmentopt = rs.getInt("departmentopt");
+						dateopt = rs.getInt("dateopt");
+						newsclause = rs.getString("newsclause");
+					
+						newsWhere += " or (";
+						if(publishtype > 0){
+							newsWhere += " t1.docpublishtype='" + publishtype + "'";
+						}else{
+							newsWhere += " t1.docpublishtype in('2','3')";
+						}
+						
+						if(departmentopt > 0){
+							newsWhere += " and t1.docdepartmentid=" + departmentopt ;
+						}
+						
+						if(dateopt > 0){
+							
+							Calendar calendar = Calendar.getInstance();
+							calendar.add(Calendar.DATE, -30);
+							String date = TimeUtil.getDateString(calendar);
+							
+							newsWhere += " and t1.doclastmoddate>='" + date + "'" ;
+						}
+						
+						if(!newsclause.isEmpty()){
+							newsWhere += " and " + newsclause;
+						}
+						newsWhere += ")";
+					}
+					
+				}
+				
+				String ids = toids + "," + poids;
+				
+				ids = ids.startsWith(",") ? ids.substring(1) : ids;
+				ids = ids.endsWith(",") ? ids.substring(0,ids.length() - 1) : ids;
+				
+				if(!ids.isEmpty()){
+					moreWhere += " or t1.id in(" + ids + ")";
+				}
+				
+				
+				if(!moreWhere.isEmpty()){
+					detailWhere += " and (" + moreWhere.substring(4) + ")";
+				}
+				
+				int seccategory = Util.getIntValue(request.getParameter(DocCondition.SEC_CATEGORY.getName()),0);
+				String _secid = secIds;
+				if(seccategory > 0){
+					_secid = _secid.isEmpty() ? (seccategory+"") : (_secid + "," + seccategory);
+				}
+				
+				Map<String,String> createDateMap = DocListUtil.getCreateDate(request);
+				createDateMap.put(DocCondition.SEC_CATEGORY.getName(),_secid);
+
+				DocShareUtil docShareUtil = new DocShareUtil(user,detailWhere,createDateMap);
+				String shareTable = docShareUtil.getSqlShare();
+				
+				
+				Map<String,String> params = new HashMap<String,String>();
+				params.put("getMost", request.getParameter("getMost"));
+				
+				String getLog = new BaseBean().getPropValue("doc_full_search","sqlLog");
+				if("1".equals(getLog))
+					params.put("showTableString","1");
+
+				if(seccategory > 0){
+					boolean useCustomSearch = docSearchService.isUseCustomSearch(seccategory);
+					params.put("useCustomSearch",useCustomSearch ? "1" : "0");
+				}
+
+				apidatas = docSearchService.getDocList(detailWhere,shareTable,seccategory,docTableType,user,params);
+				apidatas.put("useType", "sql");
+				apidatas.put("seccategoryid",seccategory);
+				apidatas.put("fromPortal",fromProtal?"1":"0");
+				apidatas.put("protalViewcondition",protalViewcondition);
+				apidatas.put("canCreate",true);
+			}
+			
+		} catch (Exception e) {
+			e.printStackTrace();
+			apidatas.put("api_status", false);
+			apidatas.put("api_errormsg", "catch exception : " + e.getMessage());
+		}
+		return JSONObject.toJSONString(apidatas);	
+	}
+	
+	/**
+	 * 保存自定义查询模板
+	 * @author wangqs
+	 * */
+	@GET
+	@Path("/saveConditionMould")
+	@Produces(MediaType.TEXT_PLAIN)
+	public String saveConditionMould(@Context HttpServletRequest request, @Context HttpServletResponse response) throws Exception {
+		Map<String,Object> apidatas = new HashMap<String,Object>();
+		try{
+			User user = HrmUserVarify.getUser (request , response) ;
+			
+			String conditionMouldId = Util.null2String(request.getParameter("conditionMouldId"));
+			String conditionMouldName = Util.null2String(request.getParameter("conditionMouldName"));
+			
+			Map<String,Object> conditionMap = getRequestMap(request);
+			
+			ConditionUtil conditionUtil = new ConditionUtil();
+			apidatas = conditionUtil.saveConditionMould(conditionMouldId, conditionMouldName, user, conditionMap);
+			
+		}catch (Exception e) {
+			e.printStackTrace();
+			apidatas.put("api_status", false);
+			apidatas.put("api_errormsg", "catch exception : " + e.getMessage());
+		}
+		return JSONObject.toJSONString(apidatas);	
+	}
+	
+	/**
+	 * 删除自定义查询模板
+	 * @author wangqs
+	 * */
+	@GET
+	@Path("/deleteConditionMould")
+	@Produces(MediaType.TEXT_PLAIN)
+	public String deleteConditionMould(@Context HttpServletRequest request, @Context HttpServletResponse response) throws Exception {
+		Map<String,Object> apidatas = new HashMap<String,Object>();
+		try{
+			User user = HrmUserVarify.getUser (request , response) ;
+			
+			String conditionMouldId = Util.null2String(request.getParameter("groupid"));
+			
+			ConditionUtil conditionUtil = new ConditionUtil();
+			apidatas = conditionUtil.deleteConditionMould(conditionMouldId, user);
+			
+		}catch (Exception e) {
+			e.printStackTrace();
+			apidatas.put("api_status", false);
+			apidatas.put("api_errormsg", "catch exception : " + e.getMessage());
+		}
+		return JSONObject.toJSONString(apidatas);	
+	}
+	
+	/**
+	 * 高级搜索
+	 * @author wangqs
+	 * */
+	@GET
+	@Path("/condition")
+	@Produces(MediaType.TEXT_PLAIN)
+	public String getConDition(@Context HttpServletRequest request, @Context HttpServletResponse response) throws Exception {
+		Map<String,Object> apidatas = new HashMap<String,Object>();
+		try{
+			User user = HrmUserVarify.getUser (request , response) ;
+			
+			//当前选中tab
+			int tabInfo = Util.getIntValue(request.getParameter(ConditionUtil.TAB_REQ_NAME),ConditionUtil.TAB_LIST_DEFAULT);
+			
+			//目录id
+			int secid = Util.getIntValue(request.getParameter(DocCondition.SEC_CATEGORY.getName()));
+			
+			List<Map<String,Object>> grouplist = new ArrayList<Map<String,Object>>();
+			
+			Map<String,Object> groupitem1 = new HashMap<String,Object>();
+			List<SearchConditionItem> itemlist1 = new ArrayList<SearchConditionItem>();
+			groupitem1.put("title", SystemEnv.getHtmlLabelNames(ConditionUtil.COMMON_CONDITION, user.getLanguage()));
+			groupitem1.put("defaultshow", true);
+			groupitem1.put("items", itemlist1);
+			grouplist.add(groupitem1);
+			
+			Map<String,String> defaultValues = new HashMap<String,String>();
+			if(tabInfo > ConditionUtil.TAB_LIST_ALL){
+				String groupid = request.getParameter("groupid");   //自定义查询
+				if(groupid != null && !groupid.isEmpty()){
+					ConditionUtil condition = new ConditionUtil();
+					defaultValues = condition.getConditionMouldDetail(groupid, user);
+				}
+			}
+			
+			
+			itemlist1.add(ConditionUtil.getCondition(DocCondition.DOC_SUBJECT,user,
+					defaultValues.get(DocCondition.DOC_SUBJECT.getName())));
+			
+			boolean secretFlag = CheckPermission.isOpenSecret();
+			if(secretFlag){
+				//String tableType = request.getParameter("tableType");
+				//if("propSet".equals(tableType)){
+				//	itemlist1.add(ConditionUtil.getSecretLevel(user));
+				//}else{
+					itemlist1.add(ConditionUtil.getCondition(DocCondition.SECRET_LEVEL,user,
+							defaultValues.get(DocCondition.SECRET_LEVEL.getName())));
+				//}
+			}
+			
+			if(ConditionUtil.TAB_LIST_MY == tabInfo){  //我的文档
+				itemlist1.add(ConditionUtil.getDocStatus2(user.getLanguage()));
+			}else if(ConditionUtil.TAB_LIST_NO_READ == tabInfo || ConditionUtil.TAB_LIST_ALL <= tabInfo){ // 未读文档、全部文档
+				itemlist1.add(ConditionUtil.getCondition(DocCondition.DOC_CREATER_ID,user,
+						defaultValues.get(DocCondition.DOC_CREATER_ID.getName())));
+			}
+			//增加属性，目录浏览框过滤隐藏目录
+			SearchConditionItem searchConditionItem=ConditionUtil.getCondition(DocCondition.SEC_CATEGORY,user,
+					defaultValues.get(DocCondition.SEC_CATEGORY.getName()));
+			BrowserBean browserBean= searchConditionItem.getBrowserConditionParam();
+			Map<String,Object> browserparams= browserBean.getDataParams();
+			browserparams.put("ishidesec","1");
+			browserBean.getCompleteParams().put("ishidesec","1");
+			itemlist1.add(searchConditionItem);
+			itemlist1.add(ConditionUtil.getCondition(DocCondition.DOC_CREATEDATE_SELECT,user,
+					defaultValues.get(DocCondition.DOC_CREATEDATE_SELECT.getName())));
+			itemlist1.add(ConditionUtil.getCondition(DocCondition.DOC_NO,user,
+					defaultValues.get(DocCondition.DOC_NO.getName())));
+			//itemlist1.add(ConditionUtil.getCondition(DocCondition.DATE2DURING,user));
+			itemlist1.add(ConditionUtil.getCondition(DocCondition.DOC_LAST_MODDATE,user,
+					defaultValues.get(DocCondition.DOC_LAST_MODDATE.getName())));
+			
+			Map<String,Object> groupitem2 = new HashMap<String,Object>();
+			List<SearchConditionItem> itemlist2 = new ArrayList<SearchConditionItem>();
+			groupitem2.put("title", SystemEnv.getHtmlLabelNames(ConditionUtil.OTHER_CONDITION,user.getLanguage()));
+			groupitem2.put("defaultshow", true);
+			groupitem2.put("items", itemlist2);
+			grouplist.add(groupitem2);
+			
+			if(ConditionUtil.TAB_LIST_NO_READ == tabInfo || ConditionUtil.TAB_LIST_ALL <= tabInfo){ // 未读文档、全部文档
+				itemlist2.add(ConditionUtil.getCondition(DocCondition.DEPARTMENT_ID,user,
+						defaultValues.get(DocCondition.DEPARTMENT_ID.getName())));
+				itemlist2.add(ConditionUtil.getCondition(DocCondition.OWNER_ID,user,
+						defaultValues.get(DocCondition.OWNER_ID.getName())));
+				itemlist2.add(ConditionUtil.getCondition(DocCondition.OWNER_DEPARTMENT_ID,user,
+						defaultValues.get(DocCondition.OWNER_DEPARTMENT_ID.getName())));
+				itemlist2.add(ConditionUtil.getCondition(DocCondition.OWNER_SUBCOMPANY_ID,user,
+						defaultValues.get(DocCondition.OWNER_SUBCOMPANY_ID.getName())));
+				itemlist2.add(ConditionUtil.getCondition(DocCondition.CREATER_SUBCOMPANY_ID,user,
+						defaultValues.get(DocCondition.CREATER_SUBCOMPANY_ID.getName())));
+			}
+			itemlist2.add(ConditionUtil.getCondition(DocCondition.DOC_PUBLISH_TYPE,user,
+					defaultValues.get(DocCondition.DOC_PUBLISH_TYPE.getName())));
+			//if(ConditionUtil.TAB_LIST_NO_READ == tabInfo){
+				itemlist2.add(ConditionUtil.getCondition(DocCondition.TREE_DOC_FIELD_ID,user));
+			//}
+			itemlist2.add(ConditionUtil.getCondition(DocCondition.KEYWORD,user,
+					defaultValues.get(DocCondition.KEYWORD.getName())));
+			itemlist2.add(ConditionUtil.getCondition(DocCondition.REPLAY_DOC_COUNT,user,
+					defaultValues.get(DocCondition.REPLAY_DOC_COUNT.getName())));
+			if(ConditionUtil.TAB_LIST_NO_READ == tabInfo || ConditionUtil.TAB_LIST_ALL <= tabInfo){ // 未读文档、全部文档
+				itemlist2.add(ConditionUtil.getDocStatus1(user.getLanguage()));
+				//itemlist2.add(ConditionUtil.getCondition(DocCondition.DOC_LANGURAGE,user,
+				//		defaultValues.get(DocCondition.DOC_LANGURAGE.getName())));
+				itemlist2.add(ConditionUtil.getCondition(DocCondition.DOC_LAST_MODUSER_ID,user,
+						defaultValues.get(DocCondition.DOC_LAST_MODUSER_ID.getName())));
+				itemlist2.add(ConditionUtil.getCondition(DocCondition.DOC_ARCHIVE_DATE,user,
+						defaultValues.get(DocCondition.DOC_ARCHIVE_DATE.getName())));
+				itemlist2.add(ConditionUtil.getCondition(DocCondition.DOC_ARCHIVE_USER_ID,user,
+						defaultValues.get(DocCondition.DOC_ARCHIVE_USER_ID.getName())));
+				itemlist2.add(ConditionUtil.getCondition(DocCondition.DOC_APPROVE_DATE,user,
+						defaultValues.get(DocCondition.DOC_APPROVE_DATE.getName())));
+				itemlist2.add(ConditionUtil.getCondition(DocCondition.DOC_APPROVE_USER_ID,user,
+						defaultValues.get(DocCondition.DOC_APPROVE_USER_ID.getName())));
+				
+				itemlist2.add(ConditionUtil.getCondition(DocCondition.CRMID,user,
+						defaultValues.get(DocCondition.CRMID.getName())));
+				itemlist2.add(ConditionUtil.getCondition(DocCondition.ASSETID,user,
+						defaultValues.get(DocCondition.ASSETID.getName())));
+				itemlist2.add(ConditionUtil.getCondition(DocCondition.HRMRESID,user,
+						defaultValues.get(DocCondition.HRMRESID.getName())));
+				itemlist2.add(ConditionUtil.getCondition(DocCondition.PROJECTID,user,
+						defaultValues.get(DocCondition.PROJECTID.getName())));
+			}
+			
+			
+			//自定义字段
+			if(secid > 0){
+				List<SearchConditionItem> itemlist3 = ConditionUtil.getCustomFieldExtProxyNew(secid, user);
+				
+				if(itemlist3 != null && itemlist3.size() > 0){
+				
+					Map<String,Object> groupitem3 = new HashMap<String,Object>();
+					groupitem3.put("title", SystemEnv.getHtmlLabelNames(ConditionUtil.CUSTOM_CONDITION,user.getLanguage()));
+					groupitem3.put("defaultshow", false);
+					groupitem3.put("items", itemlist3);
+					grouplist.add(groupitem3);
+				}
+				
+			}
+		
+			apidatas.put("condition", grouplist);
+		} catch (Exception e) {
+			e.printStackTrace();
+			apidatas.put("api_status", false);
+			apidatas.put("api_errormsg", "catch exception : " + e.getMessage());
+		}
+
+		// 禁止序列化时，同一个对象产生引用
+		return JSONObject.toJSONString(apidatas, SerializerFeature.DisableCircularReferenceDetect);
+	}
+	
+	/**
+	 * 树结构
+	 * @author wangqs
+	 * */
+	@GET
+	@Path("/treeNode")
+	@Produces(MediaType.TEXT_PLAIN)
+	public String getTreeData(@Context HttpServletRequest request, @Context HttpServletResponse response) throws Exception {
+		Map<String,Object> apidatas = new HashMap<String,Object>();
+		try{
+			
+			//当前选中tab
+			int tabInfo = Util.getIntValue(request.getParameter(ConditionUtil.TAB_REQ_NAME),ConditionUtil.TAB_LIST_DEFAULT);
+			BaseBean bb = new BaseBean();
+			User user = HrmUserVarify.getUser (request , response) ;
+			CategoryTree tree = new CategoryTree();
+			
+			String isCommon = Util.null2String(request.getParameter("isCommon"));
+			String isFav = Util.null2String(request.getParameter("isFav"));
+			
+			int type = CategoryTree.ALL;
+			if("1".equals(isCommon)){
+				type = CategoryTree.COMMON;
+			}else if("1".equals(isFav)){
+				type = CategoryTree.FAV;
+			}
+			
+			Map<String,String> dataMap = new HashMap<String,String>();
+			String secid = Util.null2String(request.getParameter("secid"));
+            String menuid = Util.null2String(request.getParameter("menuidforportal"));
+			String firstSecid = Util.null2s(request.getParameter("firstSecid"),"0");
+			dataMap.put("firstSecid",firstSecid);
+//			bb.writeLog("111111111111111 secid:"+secid+"---menuid:"+menuid+"--firstSecid:"+firstSecid);
+            if (!menuid.isEmpty()){
+				String paramsStr = new MenuInfoCommonBiz().getLeftMenuParams(menuid);
+				paramsStr =  (paramsStr.indexOf("?")>0 ? "" : "?") +paramsStr;
+				secid = getUrlParams(paramsStr,"secid");
+            }
+
+			if(!secid.isEmpty()){
+				dataMap.put("secid",secid);
+			}
+//			bb.writeLog("222222222222222 secid:"+secid+"---menuid:"+menuid+"--dataMap:"+dataMap+"---type:"+type+"--tabInfo:"+tabInfo);
+			String getLog = new BaseBean().getPropValue("doc_full_search","sqlLog");
+			if("1".equals(getLog))
+				tree.setGetSql(true);
+			
+			String treeJson = "";
+			if(tabInfo == ConditionUtil.TAB_LIST_MY){
+				treeJson = tree.getTree(user,DocTableType.MY_DOC_TABLE,"",type,dataMap);
+			}else if(tabInfo == ConditionUtil.TAB_LIST_NO_READ){
+				treeJson = tree.getTree(user,DocTableType.NEWEST_DOC,"",type,dataMap);
+			}else if(tabInfo >= ConditionUtil.TAB_LIST_ALL){
+				treeJson = tree.getTree(user,DocTableType.SEARCH_DOC_TABLE,"",type,dataMap);
+			}
+//			bb.writeLog("3333333333333333 secid:"+secid+"---menuid:"+menuid+"--treeJson:"+treeJson);
+			return treeJson;
+		} catch (Exception e) {
+			e.printStackTrace();
+			apidatas.put("api_status", false);
+			apidatas.put("api_errormsg", "catch exception : " + e.getMessage());
+		}
+		return JSONObject.toJSONString(apidatas);
+	}
+	
+	/**
+	 * 树结构数
+	 * @author wangqs
+	 * */
+	@POST
+	@Path("/treeNodeNum")
+	@Produces(MediaType.TEXT_PLAIN)
+	public String getTreeDataNum(@Context HttpServletRequest request, @Context HttpServletResponse response) throws Exception {
+		Map<String,Object> apidatas = new HashMap<String,Object>();
+		try{
+			
+			//当前选中tab
+			int tabInfo = Util.getIntValue(request.getParameter(ConditionUtil.TAB_REQ_NAME),ConditionUtil.TAB_LIST_DEFAULT);
+			
+			
+			User user = HrmUserVarify.getUser (request , response) ;
+			CategoryTree tree = new CategoryTree();
+			
+			String isCommon = Util.null2String(request.getParameter("isCommon"));
+			String isFav = Util.null2String(request.getParameter("isFav"));
+			
+			int type = CategoryTree.ALL;
+			if("1".equals(isCommon)){
+				type = CategoryTree.COMMON;
+			}else if("1".equals(isFav)){
+				type = CategoryTree.FAV;
+			}
+			//处理异步加载目录num的逻辑start====
+			Map<String,String> dataMap = new HashMap<String,String>();
+			String secid = Util.null2String(request.getParameter("secid"));
+			String selectChild = Util.null2s(request.getParameter("selectChild"),"0");
+			dataMap.put("selectChild",selectChild);
+			if(!secid.isEmpty()){
+				dataMap.put("secid",secid);
+				if("1".equals(selectChild)&&!secid.contains(",")){
+					String childSql = "select id from DocSecCategory where parentid = ?";
+					RecordSet rs = new RecordSet();
+					rs.executeQuery(childSql,secid);
+					String ids="";
+					while (rs.next()){
+						String id = rs.getString("id");
+						ids = ids+","+id;
+					}
+					if(!ids.isEmpty()) ids = ids.substring(1);
+					dataMap.put("secid",ids);
+				}
+				dataMap.put("asynnum","1");
+			}
+			
+			String getLog = new BaseBean().getPropValue("doc_full_search","sqlLog");
+			if("1".equals(getLog))
+				tree.setGetSql(true);
+			
+			//处理异步加载目录num的逻辑end====
+			Map<String,Map<String,String>> treeNum = new HashMap<String,Map<String,String>>();
+			if(tabInfo == ConditionUtil.TAB_LIST_MY){
+				treeNum = tree.getTreeNum(user,DocTableType.MY_DOC_TABLE,"",type,dataMap);
+			}else if(tabInfo == ConditionUtil.TAB_LIST_NO_READ){
+				treeNum = tree.getTreeNum(user,DocTableType.NEWEST_DOC,"",type,dataMap);
+			}else if(tabInfo >= ConditionUtil.TAB_LIST_ALL){
+				treeNum = tree.getTreeNum(user,DocTableType.SEARCH_DOC_TABLE,"",type,dataMap);
+			}
+			
+			apidatas.put("treecount", treeNum);
+			apidatas.put("countcfg", tree.getTreeNumColor(user,true));
+			
+		} catch (Exception e) {
+			e.printStackTrace();
+			apidatas.put("api_status", false);
+			apidatas.put("api_errormsg", "catch exception : " + e.getMessage());
+		}
+		return JSONObject.toJSONString(apidatas);
+	}
+	
+	/**
+	 * 右键菜单
+	 * @author wangqs
+	 * */
+	@GET
+	@Path("/rightMenu")
+	@Produces(MediaType.TEXT_PLAIN)
+	public String getRightMenu(@Context HttpServletRequest request, @Context HttpServletResponse response) throws Exception {
+		Map<String,Object> apidatas = new HashMap<String,Object>();
+		try{
+			User user = HrmUserVarify.getUser (request , response) ;
+			List<RightMenu> rightMenus = new ArrayList<RightMenu>(); 
+			
+			String view = Util.null2String(request.getParameter(RightMenu.TABLE_VIEW_PARAM));
+			
+			int language = user.getLanguage();
+			
+			//当前选中tab
+			int tabInfo = Util.getIntValue(request.getParameter(ConditionUtil.TAB_REQ_NAME),ConditionUtil.TAB_LIST_DEFAULT);
+			
+			
+			rightMenus.add(new RightMenu(language,RightMenuType.BTN_SEARCH,"",false));
+			if(tabInfo == ConditionUtil.TAB_LIST_MY){  //我的文档
+				rightMenus.add(new RightMenu(language,RightMenuType.BTN_DELETE,"doMuliDelete()", true,true));
+			}else if(tabInfo == ConditionUtil.TAB_LIST_NO_READ){ //未读文档
+				rightMenus.add(new RightMenu(language,RightMenuType.BTN_SUBSCRIBE,"doSubscribe()", false));
+				rightMenus.add(new RightMenu(language,RightMenuType.BTN_SIGN_READED,"signReaded()", true,true));
+			}else if(tabInfo >= ConditionUtil.TAB_LIST_ALL){ //全部文档
+				rightMenus.add(new RightMenu(language,RightMenuType.BTN_SUBSCRIBE,"doSubscribe()", false));
+				rightMenus.add(new RightMenu(language,RightMenuType.BTN_IMPORT_SELECT_TO_DUMMY,"importSelectedToDummy()", true,false));
+				rightMenus.add(new RightMenu(language,RightMenuType.BTN_IMPORT_ALL_TO_DUMMY,"importAllToDummy()", false));
+				//rightMenus.add(new RightMenu(language,RightMenuType.BTN_BACTH_DOWNLOAD_FILE,"bacthDownloadImageFile()", true,false));
+				
+			}
+			//--------------------------------
+			RightMenu createDocRightMenu = new RightMenu(language, RightMenuType.BTN_CREATE_DOC, "", true, true);
+			//判断是否开启了知识分权，开启了分权增加高级搜索按钮
+			boolean useDocManageDetach = new ManageDetachComInfo().isUseDocManageDetach();
+			if (useDocManageDetach){
+				HashMap map = new HashMap();
+				map.put("isHasAdvanceSerach",true);
+				createDocRightMenu.setCustomData(map);
+			}
+			rightMenus.add(createDocRightMenu);
+			//--------------------------------
+			
+			if(DocSearchService.thumbnail){
+				if(RightMenu.TABLE_VIEW_VIEW.equals(view)){
+					rightMenus.add(new RightMenu(language,RightMenuType.BTN_LIST_DISPLAY,"",false));
+				}else{
+					RightMenu rMenu = new RightMenu(language,RightMenuType.BTN_MINIATURE_DISPLAY,"",false);
+					rMenu.setParams(RightMenu.TABLE_VIEW_PARAM + "=" + RightMenu.TABLE_VIEW_VIEW);
+					rightMenus.add(rMenu);
+				}
+			}
+			rightMenus.add(new RightMenu(language,RightMenuType.BTN_COLUMN,"",false));
+		//	rightMenus.add(new RightMenu(language,RightMenuType.BTN_STORE,"",false));
+		//	rightMenus.add(new RightMenu(language,RightMenuType.BTN_HELP,"",false));
+			
+			apidatas.put("rightMenus", rightMenus);
+		} catch (Exception e) {
+			e.printStackTrace();
+			apidatas.put("api_status", false);
+			apidatas.put("api_errormsg", "catch exception : " + e.getMessage());
+		}
+		return JSONObject.toJSONString(apidatas);
+	}
+	
+	/**
+	 * TAB页
+	 * @author wangqs
+	 * */
+	@GET
+	@Path("/tabInfo")
+	@Produces(MediaType.TEXT_PLAIN)
+	public String getTabInfo(@Context HttpServletRequest request, @Context HttpServletResponse response) throws Exception {
+		Map<String,Object> apidatas = new HashMap<String,Object>();
+		try{
+			User user = HrmUserVarify.getUser (request , response) ;
+			
+			int _default = ConditionUtil.TAB_LIST_DEFAULT;
+			
+			List<Map<String,Object>> groupinfo = new ArrayList<Map<String,Object>>();
+			String protalViewcondition = "";
+			boolean fromProtal = false;
+			String menuid = Util.null2String(request.getParameter("menuidforportal"));
+			if (!menuid.isEmpty()){
+				String paramsStr = new MenuInfoCommonBiz().getLeftMenuParams(menuid);
+				int viewcondition = Util.getIntValue(getUrlParams(paramsStr,"viewcondition"));
+				if(viewcondition == ConditionUtil.TAB_LIST_MY){
+					protalViewcondition = ConditionUtil.TAB_LIST_MY+"";
+					fromProtal = true;
+				}else if(viewcondition == ConditionUtil.TAB_LIST_NO_READ){
+					protalViewcondition = ConditionUtil.TAB_LIST_NO_READ+"";
+					fromProtal = true;
+				}else if(viewcondition >= ConditionUtil.TAB_LIST_ALL){
+					protalViewcondition = ConditionUtil.TAB_LIST_ALL+"";
+					fromProtal = true;
+				}
+			}
+
+			if((fromProtal && "0".equals(protalViewcondition))||!fromProtal){
+				Map<String,Object> myDoc = new HashMap<String,Object>();
+				myDoc.put("color","");
+				myDoc.put("selected",ConditionUtil.TAB_ALL_VALUE == _default);
+				myDoc.put("groupid","myDoc");
+				myDoc.put("editable",false);
+				myDoc.put("showcount",false);
+				myDoc.put("title",SystemEnv.getHtmlLabelName(1212,user.getLanguage()));
+				myDoc.put(ConditionUtil.TAB_REQ_NAME, ConditionUtil.TAB_LIST_MY);
+				groupinfo.add(myDoc);
+			}
+
+			if((fromProtal && "1".equals(protalViewcondition))||!fromProtal){
+				Map<String,Object> noReadDoc = new HashMap<String,Object>();
+				noReadDoc.put("color","");
+				noReadDoc.put("selected",ConditionUtil.TAB_TODAY_VALUE == _default);
+				noReadDoc.put("groupid","noReadDoc");
+				noReadDoc.put("editable",false);
+				noReadDoc.put("showcount",false);
+				noReadDoc.put("title",SystemEnv.getHtmlLabelName(18441,user.getLanguage()));
+				noReadDoc.put(ConditionUtil.TAB_REQ_NAME, ConditionUtil.TAB_LIST_NO_READ);
+				groupinfo.add(noReadDoc);
+			}
+			if((fromProtal && "2".equals(protalViewcondition))||!fromProtal){
+				Map<String,Object> allDoc = new HashMap<String,Object>();
+				allDoc.put("color","");
+				allDoc.put("selected",ConditionUtil.TAB_WEEK_VALUE == _default);
+				allDoc.put("groupid","allDoc");
+				allDoc.put("editable",false);
+				allDoc.put("showcount",false);
+				allDoc.put("title",SystemEnv.getHtmlLabelName(30898,user.getLanguage()));
+				allDoc.put(ConditionUtil.TAB_REQ_NAME, ConditionUtil.TAB_LIST_ALL);
+				groupinfo.add(allDoc);
+			}
+			if(!fromProtal){
+				ConditionUtil conditionUtil = new ConditionUtil();
+				List<Map<String,String>> conditionTabs = conditionUtil.getConditionMould("", user);
+				int count = 1;
+				for(Map<String,String> conditionTab : conditionTabs){
+					Map<String,Object> tab = new HashMap<String,Object>();
+					tab.put("color","");
+					tab.put("selected",false);
+					tab.put("groupid",conditionTab.get("id"));
+					tab.put("editable",true);
+					tab.put("showcount",false);
+					tab.put("title",conditionTab.get("name"));
+					tab.put(ConditionUtil.TAB_REQ_NAME, ConditionUtil.TAB_LIST_ALL + count);
+					groupinfo.add(tab);
+					count++;
+				}
+			}
+			String sql = "insert into doc_user_introstep(userid,stepstatus) values(?,?)";
+			RecordSet rs = new RecordSet();
+			rs.executeUpdate(sql,user.getUID(),1);
+			apidatas.put("groupinfo",groupinfo);
+			apidatas.put("fromPortal",fromProtal?"1":"0");
+			apidatas.put("protalViewcondition",protalViewcondition);
+		} catch (Exception e) {
+			e.printStackTrace();
+			apidatas.put("api_status", false);
+			apidatas.put("api_errormsg", "catch exception : " + e.getMessage());
+		}
+		return JSONObject.toJSONString(apidatas);	
+	}
+
+	/**
+	 * 获取默认目录配置
+	 *
+	 * @param request
+	 * @param response
+	 * @return
+	 */
+	@GET
+	@Path("/defaultTreeNode")
+	@Produces(MediaType.TEXT_PLAIN)
+	public String defaultTreeNode(@Context HttpServletRequest request, @Context HttpServletResponse response) {
+		Map<String, Object> apidatas = new HashMap<String, Object>();
+		User user = HrmUserVarify.getUser (request , response) ;
+		try {
+			BaseBean bb = new BaseBean();
+			//默认目录树配置 0 ：全部目录 1：收藏目录
+			String default_treenode = Util.null2String(bb.getPropValue("doc_full_search","default_treenode")) ;
+			default_treenode = "0".equals(default_treenode) ? default_treenode : "1";
+			apidatas.put("default_treenode",default_treenode);
+			
+			boolean showLeftTree = DocApplySettingUtil.getDocTreeOpen();
+			apidatas.put("showLeftTree",showLeftTree);
+			String protalViewcondition = "";
+			boolean fromProtal = false;
+			String menuid = Util.null2String(request.getParameter("menuidforportal"));
+			if (!menuid.isEmpty()){
+				String paramsStr = new MenuInfoCommonBiz().getLeftMenuParams(menuid);
+				int viewcondition = Util.getIntValue(getUrlParams(paramsStr,"viewcondition"));
+				if(viewcondition == ConditionUtil.TAB_LIST_MY){
+					protalViewcondition = ConditionUtil.TAB_LIST_MY+"";
+					fromProtal = true;
+				}else if(viewcondition == ConditionUtil.TAB_LIST_NO_READ){
+					protalViewcondition = ConditionUtil.TAB_LIST_NO_READ+"";
+					fromProtal = true;
+				}else if(viewcondition >= ConditionUtil.TAB_LIST_ALL){
+					protalViewcondition = ConditionUtil.TAB_LIST_ALL+"";
+					fromProtal = true;
+				}
+			}
+			apidatas.put("linkUrl",CategoryService.LINK_URL);
+			apidatas.put("linkRout",CategoryService.LINK_ROUT);
+			apidatas.put("domKey",CategoryService.DOM_KEY);
+			apidatas.put("params",CategoryService.PARAMS + DocSptm.DOC_ROOT_FLAG_VALUE);
+			apidatas.put(CategoryService.OPEN_NEW_WINDOW,"1");
+			apidatas.put("openNewWind","1");
+			apidatas.put("api_status",true);
+			apidatas.put("fromPortal",fromProtal?"1":"0");
+			apidatas.put("protalViewcondition",protalViewcondition);
+		} catch (Exception e) {
+			e.printStackTrace();
+			apidatas.put("api_status", false);
+			apidatas.put("msg", SystemEnv.getHtmlLabelName(500551,user.getLanguage()));// "获取目录树默认配置失败"
+			//记录异常日志
+			BaseBean baseBean = new BaseBean();
+			baseBean.writeLog("SearchListAction--->defaultTreeNode:" + e.getMessage());
+		}
+		return JSONObject.toJSONString(apidatas);
+	}/**
+	 * 获取新建文档的链接
+	 *
+	 * @param request
+	 * @param response
+	 * @return
+	 */
+	@GET
+	@Path("/createUrl")
+	@Produces(MediaType.TEXT_PLAIN)
+	public String createUrl(@Context HttpServletRequest request, @Context HttpServletResponse response) {
+		Map<String, Object> apidatas = new HashMap<String, Object>();
+		User user = HrmUserVarify.getUser (request , response) ;
+		try {
+			CategoryService categoryService = new CategoryService();
+			apidatas.put("linkUrl",categoryService.LINK_URL);
+			apidatas.put("linkRout",categoryService.LINK_ROUT);
+			apidatas.put("domKey",categoryService.DOM_KEY);
+			apidatas.put("params",categoryService.PARAMS + DocSptm.DOC_ROOT_FLAG_VALUE);
+			apidatas.put(categoryService.OPEN_NEW_WINDOW,"1");
+			apidatas.put("openNewWind","1");
+			apidatas.put("api_status",true);
+		} catch (Exception e) {
+			e.printStackTrace();
+			apidatas.put("api_status", false);
+			apidatas.put("msg",SystemEnv.getHtmlLabelName(500554,user.getLanguage()));//  "获取链接失败"
+			//记录异常日志
+			BaseBean baseBean = new BaseBean();
+			baseBean.writeLog("SearchListAction--->createUrl:" + e.getMessage());
+		}
+		return JSONObject.toJSONString(apidatas);
+	}
+	/**
+	 * 文档查询页面新建权限的目录浏览按钮
+	 *
+	 * @param request
+	 * @param response
+	 * @return
+	 */
+	@GET
+	@Path("/createDocCategoryBrowser")
+	@Produces(MediaType.TEXT_PLAIN)
+	public String createDocCategoryBrowser(@Context HttpServletRequest request, @Context HttpServletResponse response) {
+		Map<String, Object> apidatas = new HashMap<String, Object>();
+		try {
+			User user = HrmUserVarify.getUser(request, response);
+			Map<String, Object> params = ParamUtil.request2Map(request);
+			apidatas.put("createDocCategoryBrowser", CategoryUtil.getCategoryBrowser(params,user, DocCategoryService.IS_CREATE));//新建文档全部目录
+			apidatas.put("api_status",true);
+
+		} catch (Exception e) {
+			e.printStackTrace();
+			apidatas.put("api_status", false);
+			//记录异常日志
+			BaseBean baseBean = new BaseBean();
+			baseBean.writeLog("SearchListAction--->createDocCategoryBrowser:" + e.getMessage());
+		}
+		return JSONObject.toJSONString(apidatas);
+	}
+
+	@GET
+	@Path("/getIntrostep")
+	@Produces(MediaType.TEXT_PLAIN)
+	public String getIntrostep(@Context HttpServletRequest request, @Context HttpServletResponse response) {
+		Map<String, Object> apidatas = new HashMap<String, Object>();
+		try {
+			User user = HrmUserVarify.getUser(request, response);
+			Map<String, Object> params = ParamUtil.request2Map(request);
+			String sql = "select stepstatus from doc_user_introstep where userid = ?";
+			RecordSet rs = new RecordSet();
+			rs.executeQuery(sql,user.getUID());
+			Boolean needIntro = true;
+			if (rs.next()){
+				String status = rs.getString("stepstatus");
+				if("1".equals(status)){
+					needIntro = false;
+				}
+			}
+			apidatas.put("api_status",true);
+			apidatas.put("needIntro",needIntro);
+		} catch (Exception e) {
+			e.printStackTrace();
+			apidatas.put("api_status", false);
+			//记录异常日志
+			BaseBean baseBean = new BaseBean();
+			baseBean.writeLog("SearchListAction--->getIntrostep:" + e.getMessage());
+		}
+		return JSONObject.toJSONString(apidatas);
+	}
+	public Map<String,Object> getRequestMap(HttpServletRequest request){
+		
+		Map<String,Object> dataMap = new HashMap<String,Object>();
+		
+		Enumeration paramNames = request.getParameterNames(); 
+		while (paramNames.hasMoreElements()) { 
+			String paramName = (String) paramNames.nextElement(); 
+			String paramValue = Util.null2String(request.getParameter(paramName));
+			dataMap.put(paramName,paramValue);
+		}
+		return dataMap;
+	}
+	public String getUrlParams(String url,String paramname){
+		String result = "";
+		Map<String, String> mapRequest = new HashMap<String, String>();
+		String[] arrSplit=null;
+		String strUrlParam=url;
+		if(strUrlParam==null){
+			return "";
+		}
+		arrSplit=strUrlParam.split("[&]");
+		for(String strSplit:arrSplit){
+			String[] arrSplitEqual=null;
+			arrSplitEqual= strSplit.split("[=]");
+			//解析出键值
+			if(arrSplitEqual.length>1){
+				//正确解析
+				mapRequest.put(arrSplitEqual[0], arrSplitEqual[1]);
+			}else{
+				if(arrSplitEqual[0]!=""){
+					//只有参数没有值，不加入
+					mapRequest.put(arrSplitEqual[0], "");
+				}
+			}
+		}
+		if(mapRequest.containsKey(paramname)){
+			result = mapRequest.get(paramname);
+		}
+		return result;
+	}
+}
diff --git a/src/main/youhong_ai_old_src/com/api/interfaces/ai_you_hong/kao_he/statistics/entity/StatisticsVo.java b/src/main/youhong_ai_old_src/com/api/interfaces/ai_you_hong/kao_he/statistics/entity/StatisticsVo.java
new file mode 100644
index 0000000..0e01161
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/interfaces/ai_you_hong/kao_he/statistics/entity/StatisticsVo.java
@@ -0,0 +1,21 @@
+package com.api.interfaces.ai_you_hong.kao_he.statistics.entity;
+
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+/**
+ * <p>统计前端展示数据</p>
+ * <p>create 2022/4/28 11:42 PM</p>
+ *
+ * @author ayh
+ */
+
+@Getter
+@Setter
+@ToString
+public class StatisticsVo {
+    private String userName;
+    private float totalAmount;
+    private int sortNum;
+}
diff --git a/src/main/youhong_ai_old_src/com/api/interfaces/ai_you_hong/kao_he/statistics/mapper/StatisticsMapper.java b/src/main/youhong_ai_old_src/com/api/interfaces/ai_you_hong/kao_he/statistics/mapper/StatisticsMapper.java
new file mode 100644
index 0000000..c0f2591
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/interfaces/ai_you_hong/kao_he/statistics/mapper/StatisticsMapper.java
@@ -0,0 +1,28 @@
+package com.api.interfaces.ai_you_hong.kao_he.statistics.mapper;
+
+import aiyh.utils.annotation.recordset.Select;
+import aiyh.utils.annotation.recordset.SqlMapper;
+import com.api.interfaces.ai_you_hong.kao_he.statistics.entity.StatisticsVo;
+
+import java.util.List;
+
+/**
+ * <p>查询统计年度报销</p>
+ * <p>create 2022/4/28 11:50 PM</p>
+ *
+ * @author ayh
+ */
+
+@SqlMapper
+public interface StatisticsMapper {
+    /**
+     * 查询统计报表
+     * @return List<StatisticsVo>统计数据
+     */
+    @Select("select hr.lastname user_name,sum(sbje) total_amount,(@rowNum:=@rowNum+1) sort_num from uf_fybxtj uf " +
+            "inner join hrmresource hr on hr.id = uf.bxr, " +
+            "(select (@rowNum:=0)) d " +
+            "where date_format(uf.fyrq, '%Y')  = YEAR(CURDATE()) and hr.lastname is not null  " +
+            "GROUP BY uf.bxr ORDER BY total_amount desc limit 5 ")
+    List<StatisticsVo> selectStatistics();
+}
diff --git a/src/main/youhong_ai_old_src/com/api/interfaces/ai_you_hong/kao_he/statistics/service/StatisticsService.java b/src/main/youhong_ai_old_src/com/api/interfaces/ai_you_hong/kao_he/statistics/service/StatisticsService.java
new file mode 100644
index 0000000..6802635
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/interfaces/ai_you_hong/kao_he/statistics/service/StatisticsService.java
@@ -0,0 +1,27 @@
+package com.api.interfaces.ai_you_hong.kao_he.statistics.service;
+
+import aiyh.utils.Util;
+import com.api.interfaces.ai_you_hong.kao_he.statistics.entity.StatisticsVo;
+import com.api.interfaces.ai_you_hong.kao_he.statistics.mapper.StatisticsMapper;
+
+import java.util.List;
+
+/**
+ * <p>统计年度报销</p>
+ * <p>create 2022/4/28 11:45 PM</p>
+ *
+ * @author ayh
+ */
+
+public class StatisticsService {
+
+    private final StatisticsMapper mapper = Util.getMapper(StatisticsMapper.class);
+
+    /**
+     * 查询统计年度报销
+     * @return 年度报销数据
+     */
+    public List<StatisticsVo> getYearStatistics() {
+        return mapper.selectStatistics();
+    }
+}
diff --git a/src/main/youhong_ai_old_src/com/api/interfaces/ai_you_hong/kao_he/statistics/web/StatisticsController.java b/src/main/youhong_ai_old_src/com/api/interfaces/ai_you_hong/kao_he/statistics/web/StatisticsController.java
new file mode 100644
index 0000000..7549e3b
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/interfaces/ai_you_hong/kao_he/statistics/web/StatisticsController.java
@@ -0,0 +1,40 @@
+package com.api.interfaces.ai_you_hong.kao_he.statistics.web;
+
+import aiyh.utils.ApiResult;
+import com.api.interfaces.ai_you_hong.kao_he.statistics.entity.StatisticsVo;
+import com.api.interfaces.ai_you_hong.kao_he.statistics.service.StatisticsService;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import java.util.List;
+
+/**
+ * <p>统计年度报销</p>
+ * <p>create 2022/4/28 11:45 PM</p>
+ *
+ * @author ayh
+ */
+
+@Path("/statistics")
+public class StatisticsController {
+
+    private final StatisticsService statisticsService = new StatisticsService();
+
+    /**
+     * 获取年度报销统计数据
+     * @return 年度报销统计数据
+     */
+    @Path("/year")
+    @GET
+    @Produces(MediaType.APPLICATION_JSON)
+    public String getYearStatistics(){
+        try {
+            List<StatisticsVo> statisticsVoList = statisticsService.getYearStatistics();
+            return ApiResult.success(statisticsVoList);
+        }catch (Exception e){
+           return ApiResult.error("获取年度报销统计数据失败！"+ e.getMessage());
+        }
+    }
+}
diff --git a/src/main/youhong_ai_old_src/com/api/system/createDB/service/CreateDBService.java b/src/main/youhong_ai_old_src/com/api/system/createDB/service/CreateDBService.java
new file mode 100644
index 0000000..b335c76
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/system/createDB/service/CreateDBService.java
@@ -0,0 +1,1422 @@
+//
+// Source code recreated from a .class file by IntelliJ IDEA
+// (powered by FernFlower decompiler)
+//
+
+package com.api.system.createDB.service;
+
+import com.api.system.createDB.bean.ConditionItem;
+import com.api.system.createDB.bean.ConditionOption;
+import com.api.system.createDB.bean.CreateDBStateBean;
+import com.api.system.createDB.bean.DBDefalutViewBean;
+import com.api.system.createDB.util.ConditionType;
+import weaver.conn.ConnectionPool;
+import weaver.conn.RecordSet;
+import weaver.conn.RecordSetExecutionInterface;
+import weaver.conn.mybatis.MysqlScriptRunner;
+import weaver.conn.util.ConnParamStore;
+import weaver.conn.util.ProcChecker;
+import weaver.conn.util.ProcParamStore;
+import weaver.conn.util.ProcSqlParser;
+import weaver.file.Prop;
+import weaver.general.BaseBean;
+import weaver.general.GCONST;
+import weaver.general.TimeUtil;
+import weaver.general.Util;
+import weaver.system.EditProperties;
+import weaver.templetecheck.SystemAutoConfig;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.*;
+import java.sql.*;
+import java.text.NumberFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import java.util.stream.Stream;
+
+public class CreateDBService {
+    private BaseBean loggerBean = new BaseBean();
+    private static CreateDBStateBean createDBStateBean = new CreateDBStateBean();
+    private static CreateDBService createDBService = new CreateDBService();
+    private Pattern sqlPattern;
+    private Pattern sequencePattern = Pattern.compile("^\\s*create\\s+sequence\\s", 2);
+
+    private CreateDBService() {
+    }
+
+    public static CreateDBService getCreateDBService() {
+        return createDBService;
+    }
+
+    public Map<String, Object> getCondition(String var1, int var2) {
+        if (null == var1 || "".equals(var1)) {
+            var1 = "sqlserver";
+        }
+
+        if (var2 <= 7) {
+            var2 = 7;
+        } else if (var2 > 9) {
+            var2 = 8;
+        }
+
+        HashMap var3 = new HashMap();
+        ArrayList var4 = new ArrayList();
+        HashMap var5 = new HashMap();
+        ArrayList var6 = new ArrayList();
+        new ConditionItem();
+        ArrayList var8 = new ArrayList();
+        List var9 = ConditionOptionClassBuilder.building(var1);
+        DBDefalutViewBean var10 = ConditionOptionClassBuilder.getDBDefaultViewBean(var1);
+        String var11 = "";
+        String var12 = "";
+        String var13 = "";
+        String var14 = "";
+        String var15 = "";
+        ConditionItem var7;
+        if (var2 == 7) {
+            var5.put("title", "数据库");
+            var5.put("defaultshow", true);
+            var8.add(new ConditionOption("7", "简体中文", true));
+            var8.add(new ConditionOption("8", "English", false));
+            var8.add(new ConditionOption("9", "繁体中文", false));
+            var7 = new ConditionItem(2, ConditionType.SELECT, new String[]{"languageId"}, 10, false, "选择语言", 8, 0, 3, var8);
+            var6.add(new ConditionItem(2, ConditionType.PASSWORD, new String[]{"validCode"}, 10, false, "验证码", 8, 0, 3, "required|string"));
+            var6.add(new ConditionItem(2, ConditionType.SELECT, new String[]{"dbType"}, 10, false, "数据库类型", 8, 0, 2, var9));
+            var6.add(new ConditionItem(2, ConditionType.INPUT, new String[]{"dbIp"}, 10, false, "数据库服务器IP", 8, 0, 3, "required|string"));
+            var6.add(new ConditionItem(2, ConditionType.INPUT, new String[]{"dbPort"}, 10, false, "数据库端口号", 8, 0, 3, "required|string"));
+            if (!var1.equals("dm") && !var1.equalsIgnoreCase("gs")) {
+                var6.add(new ConditionItem(2, ConditionType.INPUT, new String[]{"dbName"}, 10, false, "数据库名称", 8, 0, 3, "required|string"));
+            }
+
+            if (var1.equals("sqlserver")) {
+                var6.add(new ConditionItem(2, ConditionType.INPUT, new String[]{"dbInstance"}, 10, false, "数据库实例", 8, 0, 3, "required|string"));
+            }
+
+            var6.add(new ConditionItem(2, ConditionType.INPUT, new String[]{"username"}, 10, false, "用户名", 8, 0, 3, "required|string"));
+            var6.add(new ConditionItem(2, ConditionType.PASSWORD, new String[]{"password"}, 10, false, "密码", 8, 0, 3, "required|string"));
+            var6.add(new ConditionItem(2, ConditionType.CHECKBOX, new String[]{"useCurrentDB"}, 10, false, "使用现有数据库", 8, 0, 3, "", "新安装系统请勿勾选此选项"));
+            var11 = "更改验证码";
+            var12 = "无论是否使用现有数据库，数据库均需手动到数据库中创建，程序无法自动生成";
+            var13 = "初始化数据库";
+            var14 = "重置";
+            var15 = "如果为12C容器模式数据库，需要在$ORACLE_HOME/network/admin/sqlnet.ora文件末尾处增加SQLNET.ALLOWED_LOGON_VERSION=8";
+        } else if (var2 == 9) {
+            var5.put("title", "數據庫");
+            var5.put("defaultshow", true);
+            var8.add(new ConditionOption("7", "简体中文", false));
+            var8.add(new ConditionOption("8", "English", false));
+            var8.add(new ConditionOption("9", "繁体中文", true));
+            var7 = new ConditionItem(2, ConditionType.SELECT, new String[]{"languageId"}, 10, false, "選擇語言", 8, 0, 3, var8);
+            var6.add(new ConditionItem(2, ConditionType.PASSWORD, new String[]{"validCode"}, 10, false, "驗證碼", 8, 0, 3, "required|string"));
+            var6.add(new ConditionItem(2, ConditionType.SELECT, new String[]{"dbType"}, 10, false, "數據庫類型", 8, 0, 2, var9));
+            var6.add(new ConditionItem(2, ConditionType.INPUT, new String[]{"dbIp"}, 10, false, "數據庫服務器IP", 8, 0, 3, "required|string"));
+            var6.add(new ConditionItem(2, ConditionType.INPUT, new String[]{"dbPort"}, 10, false, "數據庫端口號", 8, 0, 3, "required|string"));
+            if (!var1.equals("dm") && !var1.equalsIgnoreCase("gs")) {
+                var6.add(new ConditionItem(2, ConditionType.INPUT, new String[]{"dbName"}, 10, false, "數據庫名稱", 8, 0, 3, "required|string"));
+            }
+
+            if (var1.equals("sqlserver")) {
+                var6.add(new ConditionItem(2, ConditionType.INPUT, new String[]{"dbInstance"}, 10, false, "數據庫實例 ", 8, 0, 3, "required|string"));
+            }
+
+            var6.add(new ConditionItem(2, ConditionType.INPUT, new String[]{"username"}, 10, false, "用户名", 8, 0, 3, "required|string"));
+            var6.add(new ConditionItem(2, ConditionType.PASSWORD, new String[]{"password"}, 10, false, "密碼", 8, 0, 3, "required|string"));
+            var6.add(new ConditionItem(2, ConditionType.CHECKBOX, new String[]{"useCurrentDB"}, 10, false, "使用現有數據庫", 8, 0, 3, "", "新安裝系統請勿勾選此選項"));
+            var11 = "更改驗證碼";
+            var12 = "無論是否使用現有數據庫，數據庫均需手動到數據庫中創建，程式無法自動生成";
+            var13 = "初始化數據庫";
+            var14 = "重置";
+            var15 = "如果為12C容器模式數據庫，需要在$ORACLE_HOME/network/admin/sqlnet.ora檔案末尾處新增SQLNET.ALLOWED_LOGON_VERSION=8";
+        } else {
+            var5.put("title", "Database Type");
+            var5.put("defaultshow", true);
+            var8.add(new ConditionOption("7", "简体中文", false));
+            var8.add(new ConditionOption("8", "English", true));
+            var8.add(new ConditionOption("9", "繁体中文", false));
+            var7 = new ConditionItem(2, ConditionType.SELECT, new String[]{"languageId"}, 10, false, "選擇語言", 8, 0, 3, var8);
+            var6.add(new ConditionItem(2, ConditionType.PASSWORD, new String[]{"validCode"}, 10, false, "Verification Code", 8, 0, 3, "required|string"));
+            var6.add(new ConditionItem(2, ConditionType.SELECT, new String[]{"dbType"}, 10, false, "Database Type", 8, 0, 2, var9));
+            var6.add(new ConditionItem(2, ConditionType.INPUT, new String[]{"dbIp"}, 10, false, "Database ServerIp", 8, 0, 3, "required|string"));
+            var6.add(new ConditionItem(2, ConditionType.INPUT, new String[]{"dbPort"}, 10, false, "Database ServerPort", 8, 0, 3, "required|string"));
+            if (!var1.equals("dm") && !var1.equalsIgnoreCase("gs")) {
+                var6.add(new ConditionItem(2, ConditionType.INPUT, new String[]{"dbName"}, 10, false, "Database Name", 8, 0, 3, "required|string"));
+            }
+
+            if (var1.equals("sqlserver")) {
+                var6.add(new ConditionItem(2, ConditionType.INPUT, new String[]{"dbInstance"}, 10, false, "Database Instance", 8, 0, 3, "required|string"));
+            }
+
+            var6.add(new ConditionItem(2, ConditionType.INPUT, new String[]{"username"}, 10, false, "User Name", 8, 0, 3, "required|string"));
+            var6.add(new ConditionItem(2, ConditionType.PASSWORD, new String[]{"password"}, 10, false, "Password", 8, 0, 3, "required|string"));
+            var6.add(new ConditionItem(2, ConditionType.CHECKBOX, new String[]{"useCurrentDB"}, 10, false, " Use Current Database", 8, 0, 3, "", "Do not enable this option for new installation system"));
+            var11 = "Change verifying code";
+            var12 = "Whether or not the existing database is used, the database needs to be manually created in the database,  the program can not generate the database automatically.";
+            var13 = "Init database";
+            var14 = "Reset";
+            var15 = "If the database is 12C container mode, you need to add SQLNET.ALLOWED_LOGON_VERSION=8 at the end of the $ORACLE_HOME/network/admin/sqlnet.ora file.";
+        }
+
+        var5.put("items", var6);
+        var4.add(var5);
+        var3.put("conditioninfo", var4);
+        var3.put("selectLanguage", var7);
+        var3.put("datas", var10);
+        var3.put("codeTip", var11);
+        var3.put("warningTip", var12);
+        var3.put("initButton", var13);
+        var3.put("resetButton", var14);
+        var3.put("oracleWarningTip", var15);
+        return var3;
+    }
+
+    public Map<String, Object> confirmInitDB(int var1) {
+        HashMap var2 = new HashMap();
+        String var3 = "";
+        String var4 = "";
+        String var5 = "";
+        String var6 = "";
+        if (var1 == 7) {
+            var3 = "请确认";
+            var4 = "已执行";
+            var5 = "未执行";
+            var6 = "数据库是否已执行alter system set \"_allow_level_without_connect_by\"=true,如果未执行，会导致初始化数据库脚本执行失败。";
+        } else if (var1 == 9) {
+            var3 = "請確認";
+            var4 = "已執行";
+            var5 = "未執行";
+            var6 = "數據庫是否已執行alter system set \"_allow_level_without_connect_by\"=true,如果未執行，會導致初始化數據庫腳本執行失敗。";
+        } else {
+            var3 = "Please confirm";
+            var4 = "Executed";
+            var5 = "Unexecuted";
+            var6 = "Confirm the database has executed alter system set \"_allow_level_without_connect_by\"=true,if not that will lead to failure of initialization the database script";
+        }
+
+        var2.put("title", var3);
+        var2.put("confirmButton", var4);
+        var2.put("cancelButton", var5);
+        var2.put("tips", var6);
+        return var2;
+    }
+
+    public String initDB(HttpServletRequest var1, HttpServletResponse var2) {
+        if (createDBStateBean.getStatus() == 1) {
+            return "Executing...";
+        } else {
+            EditProperties var3 = new EditProperties();
+            int var4 = Util.getIntValue(var1.getParameter("languageId"));
+            String var5 = Util.null2String(var1.getParameter("validCode"));
+            String var6 = Util.null2String(var1.getParameter("dbType"));
+            String var7 = Util.null2String(var1.getParameter("dbIp"));
+            String var8 = Util.null2String(var1.getParameter("dbPort"));
+            String var9 = Util.null2String(var1.getParameter("dbName"));
+            String var10 = Util.null2String(var1.getParameter("dbInstance"));
+            String var11 = Util.null2String(var1.getParameter("username"));
+            String var12 = Util.null2String(var1.getParameter("password"));
+            boolean var13 = Util.getIntValue(var1.getParameter("useCurrentDB")) == 1;
+            char[] var14 = new char[16];
+
+            try {
+                (new FileReader(GCONST.getRootPath() + File.separator + "WEB-INF" + File.separator + "code.key")).read(var14);
+            } catch (FileNotFoundException var173) {
+                this.loggerBean.writeLog(var173);
+            } catch (IOException var174) {
+                this.loggerBean.writeLog(var174);
+            }
+
+            String var15 = (new String(var14)).trim();
+            if (!var15.equals(var5)) {
+                createDBStateBean.setStatus(3);
+                createDBStateBean.setCompletePercent("0.0%");
+                createDBStateBean.setMsg("");
+                if (var4 == 7) {
+                    createDBStateBean.setErrormsg("无效的验证码");
+                    return "无效的验证码";
+                } else if (var4 == 9) {
+                    createDBStateBean.setErrormsg("Invalid authentication code!");
+                    return "Invalid authentication code!";
+                } else {
+                    createDBStateBean.setErrormsg("無效的驗證碼！");
+                    return "無效的驗證碼！";
+                }
+            } else {
+                if (var6.equals("")) {
+                    var6 = "sqlserver";
+                }
+
+                String var16 = "";
+                String var17 = "";
+                Connection var18 = null;
+                String var19 = "";
+                String var20 = "";
+                String var21 = "";
+                String var22 = "";
+                String var23 = "";
+                boolean var24 = false;
+                String var25 = "";
+                String var26 = "";
+                String var27 = "";
+                NumberFormat var28 = NumberFormat.getInstance();
+                var28.setMaximumFractionDigits(2);
+                boolean var29 = false;
+                int var30 = 0;
+                int var31 = 0;
+                String var32 = "";
+                boolean var33 = false;
+                String var34 = "";
+                int var35 = 0;
+                int var36 = 0;
+                boolean var37 = false;
+                boolean var101 = false;
+
+                String var49;
+                File var198;
+                label3015:
+                {
+                    label3016:
+                    {
+                        label3017:
+                        {
+                            label3018:
+                            {
+                                String var48;
+                                label3019:
+                                {
+                                    String var40;
+                                    label3020:
+                                    {
+                                        String var63;
+                                        label3021:
+                                        {
+                                            String var39;
+                                            label3022:
+                                            {
+                                                label3023:
+                                                {
+                                                    label3024:
+                                                    {
+                                                        String var44;
+                                                        label3025:
+                                                        {
+                                                            String var43;
+                                                            label3026:
+                                                            {
+                                                                try {
+                                                                    label3082:
+                                                                    {
+                                                                        var101 = true;
+                                                                        if (var6.equalsIgnoreCase("sqlserver") && var10.equals("MSSQLSERVER")) {
+                                                                            var16 = "jdbc:sqlserver://" + var7 + ":" + var8 + ";DatabaseName=master;SelectMethod=cursor";
+                                                                            var17 = "com.microsoft.sqlserver.jdbc.SQLServerDriver";
+                                                                            var20 = var1.getRealPath("/data/init/SQLServer");
+                                                                            var21 = var1.getRealPath("/data/SQLServer");
+                                                                            var25 = var1.getRealPath("/data/init/SQLServer/config");
+                                                                            var22 = "go";
+                                                                            var26 = "sqlserver";
+                                                                            var27 = "1";
+                                                                        } else if (var6.equalsIgnoreCase("sqlserver") && !var10.equals("MSSQLSERVER")) {
+                                                                            var16 = "jdbc:sqlserver://" + var7 + ":" + var8 + ";instanceName=" + var10 + ";DatabaseName=master;SelectMethod=cursor";
+                                                                            var17 = "com.microsoft.sqlserver.jdbc.SQLServerDriver";
+                                                                            var20 = var1.getRealPath("/data/init/SQLServer");
+                                                                            var21 = var1.getRealPath("/data/SQLServer");
+                                                                            var25 = var1.getRealPath("/data/init/SQLServer/config");
+                                                                            var22 = "go";
+                                                                            var26 = "sqlserver";
+                                                                            var27 = "1";
+                                                                        } else if (var6.equalsIgnoreCase("oracle")) {
+                                                                            var16 = "jdbc:oracle:thin:@" + var7 + ":" + var8 + ":" + var9;
+                                                                            var17 = "oracle.jdbc.OracleDriver";
+                                                                            var20 = var1.getRealPath("/data/init/Oracle");
+                                                                            var21 = var1.getRealPath("/data/Oracle");
+                                                                            var25 = var1.getRealPath("/data/init/Oracle/config");
+                                                                            var22 = "/";
+                                                                            var26 = "oracle";
+                                                                            var27 = "2";
+                                                                        } else if (var6.equalsIgnoreCase("db2")) {
+                                                                            var16 = "jdbc:db2:" + var7 + ":" + var9;
+                                                                            var17 = "COM.ibm.db2.jdbc.net.DB2Driver";
+                                                                            var20 = var1.getRealPath("/data/init/DB2");
+                                                                            var21 = var1.getRealPath("/data/DB2");
+                                                                            var25 = var1.getRealPath("/data/init/DB2/config");
+                                                                            var22 = ";";
+                                                                            var26 = "db2";
+                                                                            var27 = "3";
+                                                                        } else if (var6.equalsIgnoreCase("mysql")) {
+                                                                            var16 = "jdbc:mysql://" + var7 + ":" + var8 + "/" + var9 + "?characterEncoding=utf8&useSSL=false&autoReconnect=true&failOverReadOnly=false&serverTimezone=Asia/Shanghai";
+                                                                            var17 = "com.mysql.cj.jdbc.Driver";
+                                                                            var20 = var1.getRealPath("/data/init/Mysql");
+                                                                            var21 = var1.getRealPath("/data/Mysql");
+                                                                            var25 = var1.getRealPath("/data/init/Mysql/config");
+                                                                            var26 = "mysql";
+                                                                            var27 = "4";
+                                                                        } else if (var6.equalsIgnoreCase("nt")) {
+                                                                            var16 = "jdbc:gbase://" + var7 + ":" + var8 + "/" + var9 + "?characterEncoding=utf8&useSSL=false&autoReconnect=true&failOverReadOnly=false&serverTimezone=Asia/Shanghai";
+                                                                            var17 = "com.gbase.jdbc.Driver";
+                                                                            var20 = var1.getRealPath("/data/init/Mysql");
+                                                                            var21 = var1.getRealPath("/data/Mysql");
+                                                                            var25 = var1.getRealPath("/data/init/Mysql/config");
+                                                                            var26 = "nt";
+                                                                            var27 = "7";
+                                                                        } else if (var6.equalsIgnoreCase("dm")) {
+                                                                            var9 = "";
+                                                                            var16 = "jdbc:dm://" + var7 + ":" + var8;
+                                                                            var17 = "dm.jdbc.driver.DmDriver";
+                                                                            var20 = var1.getRealPath("/data/init/DM");
+                                                                            var21 = var1.getRealPath("/data/DM");
+                                                                            var25 = var1.getRealPath("/data/init/DM/config");
+                                                                            var22 = "/";
+                                                                            var26 = "dm";
+                                                                            var27 = "5";
+                                                                        } else if (var6.equalsIgnoreCase("st")) {
+                                                                            var16 = "jdbc:oscar://" + var7 + ":" + var8 + "/" + var9;
+                                                                            var17 = "com.oscar.Driver";
+                                                                            var20 = var1.getRealPath("/data/init/ST");
+                                                                            var21 = var1.getRealPath("/data/ST");
+                                                                            var25 = var1.getRealPath("/data/init/ST/config");
+                                                                            var22 = "/";
+                                                                            var26 = "st";
+                                                                            var27 = "6";
+                                                                        } else if (var6.equalsIgnoreCase("jc")) {
+                                                                            var16 = "jdbc:kingbase8://" + var7 + ":" + var8 + "/" + var9 + "?prepareThreshold=0&clientEncoding=UTF-8";
+                                                                            var17 = "com.kingbase8.Driver";
+                                                                            var20 = var1.getRealPath("/data/init/JC");
+                                                                            var21 = var1.getRealPath("/data/JC");
+                                                                            var25 = var1.getRealPath("/data/init/JC/config");
+                                                                            var22 = "/";
+                                                                            var26 = "jc";
+                                                                            var27 = "8";
+                                                                        } else if (var6.equalsIgnoreCase("gs")) {
+                                                                            var16 = "jdbc:zenith:@" + var7 + ":" + var8;
+                                                                            var17 = "com.huawei.gauss.jdbc.ZenithDriver";
+                                                                            var20 = var1.getRealPath("/data/init/GS");
+                                                                            var21 = var1.getRealPath("/data/GS");
+                                                                            var25 = var1.getRealPath("/data/init/GS/config");
+                                                                            var22 = "/";
+                                                                            var26 = "gs";
+                                                                            var27 = "9";
+                                                                            this.sqlPattern = Pattern.compile("([\\s;]+)$", 2);
+                                                                        } else if (var6.equalsIgnoreCase("ob")) {
+                                                                            var16 = "jdbc:oceanbase://" + var7 + ":" + var8 + "/" + var9;
+                                                                            var17 = "com.alipay.oceanbase.jdbc.Driver";
+                                                                            var20 = var1.getRealPath("/data/init/OB");
+                                                                            var21 = var1.getRealPath("/data/OB");
+                                                                            var25 = var1.getRealPath("/data/init/OB/config");
+                                                                            var26 = "dm";
+                                                                            var27 = "10";
+                                                                        } else if (var6.equalsIgnoreCase("pg")) {
+                                                                            var16 = "jdbc:postgresql://" + var7 + ":" + var8 + "/" + var9 + "?connectTimeout=0";
+                                                                            var17 = "org.postgresql.Driver";
+                                                                            var20 = var1.getRealPath("/data/init/PG");
+                                                                            var21 = var1.getRealPath("/data/PG");
+                                                                            var25 = var1.getRealPath("/data/init/PG/config");
+                                                                            var22 = "/";
+                                                                            var26 = "pg";
+                                                                            var27 = "11";
+                                                                        } else if (var6.equalsIgnoreCase("hg")) {
+                                                                            var16 = "jdbc:highgo://" + var7 + ":" + var8 + "/" + var9;
+                                                                            var17 = "com.highgo.jdbc.Driver";
+                                                                            var20 = var1.getRealPath("/data/init/PG");
+                                                                            var21 = var1.getRealPath("/data/PG");
+                                                                            var25 = var1.getRealPath("/data/init/PG/config");
+                                                                            var22 = "/";
+                                                                            var26 = "hg";
+                                                                            var27 = "12";
+                                                                        } else if (var6.equalsIgnoreCase("og")) {
+                                                                            var16 = "jdbc:gaussdb://" + var7 + ":" + var8 + "/" + var9 + "?connectTimeout=0&socketTimeout=0";
+                                                                            var17 = "com.huawei.gauss200.jdbc.Driver";
+                                                                            var20 = var1.getRealPath("/data/init/PG");
+                                                                            var21 = var1.getRealPath("/data/PG");
+                                                                            var25 = var1.getRealPath("/data/init/PG/config");
+                                                                            var22 = "/";
+                                                                            var26 = "og";
+                                                                            var27 = "13";
+                                                                        }
+
+                                                                        String finalVar = var6;
+                                                                        var37 = Stream.of("mysql", "nt").anyMatch((var1x) -> {
+                                                                            return var1x.equalsIgnoreCase(finalVar);
+                                                                        });
+                                                                        Class.forName(var17);
+                                                                        Properties var188 = new Properties();
+                                                                        var188.put("user", var11);
+                                                                        var188.put("password", var12);
+                                                                        if (!var37) {
+                                                                            var188.put("CHARSET", "ISO");
+                                                                        }
+
+                                                                        var40 = null;
+
+                                                                        try {
+                                                                            var18 = DriverManager.getConnection(var16, var188);
+                                                                            var40 = var18.getMetaData().getDatabaseProductName();
+                                                                        } catch (Exception var181) {
+                                                                            String var42 = "";
+                                                                            if (!var6.equals("oracle")) {
+                                                                                createDBStateBean.setStatus(3);
+                                                                                createDBStateBean.setCompletePercent("0.0%");
+                                                                                createDBStateBean.setMsg("");
+                                                                                createDBStateBean.setErrormsg("DB Connection Error! Reason :" + var181.getMessage());
+                                                                                var181.printStackTrace();
+                                                                                System.out.println("DB Connection Error! Reason is :" + var181.getMessage());
+                                                                                var43 = "DB Connection Error!";
+                                                                                var101 = false;
+                                                                                break label3026;
+                                                                            }
+
+                                                                            try {
+                                                                                var42 = "jdbc:oracle:thin:@" + var7 + ":" + var8 + "/" + var9;
+                                                                                var18 = DriverManager.getConnection(var42, var188);
+                                                                                var24 = true;
+                                                                            } catch (Exception var180) {
+                                                                                createDBStateBean.setStatus(3);
+                                                                                createDBStateBean.setCompletePercent("0.0%");
+                                                                                createDBStateBean.setMsg("");
+                                                                                createDBStateBean.setErrormsg("DB Connection Error! Reason :" + var181.getMessage());
+                                                                                var181.printStackTrace();
+                                                                                System.out.println("oracle DB Connection Error! Reason is :" + var181.getMessage());
+                                                                                var44 = "DB Connection Error!";
+                                                                                var101 = false;
+                                                                                break label3025;
+                                                                            }
+                                                                        }
+
+                                                                        ConnectionPool var41 = ConnectionPool.getInstance();
+                                                                        var41.setInitiating(true);
+                                                                        var3.editProp(var7, var8, var9, var11, var12, var27, "utf8", var24, GCONST.propFileBakName + ".properties");
+                                                                        var41.init();
+                                                                        Statement var191 = var18.createStatement();
+                                                                        var43 = "";
+                                                                        var44 = "";
+                                                                        String var45 = "";
+                                                                        String var46 = "";
+                                                                        ResultSet var47;
+                                                                        if (var6.equals("sqlserver")) {
+                                                                            var46 = "SELECT name, collation_name FROM sys.databases  where name in('" + var9 + "')";
+                                                                            var47 = null;
+
+                                                                            try {
+                                                                                var47 = var191.executeQuery(var46);
+                                                                            } catch (Exception var176) {
+                                                                                createDBStateBean.setStatus(3);
+                                                                                createDBStateBean.setCompletePercent("0.0%");
+                                                                                createDBStateBean.setMsg("");
+                                                                                if (var4 == 7) {
+                                                                                    createDBStateBean.setErrormsg("没有权限查询数据库排序规则");
+                                                                                    var19 = "没有权限查询数据库排序规则";
+                                                                                } else if (var4 == 9) {
+                                                                                    createDBStateBean.setErrormsg("沒有許可權査詢數據庫排序規則");
+                                                                                    var19 = "沒有許可權査詢數據庫排序規則";
+                                                                                } else {
+                                                                                    createDBStateBean.setErrormsg("No permissions to query database collation rules");
+                                                                                    var19 = "No permissions to query database collation rules";
+                                                                                }
+
+                                                                                var49 = var19;
+                                                                                var101 = false;
+                                                                                break label3018;
+                                                                            }
+
+                                                                            while (var47.next()) {
+                                                                                var48 = var47.getString("name");
+                                                                                if (!var47.getString("collation_name").equals("Chinese_PRC_CI_AS")) {
+                                                                                    createDBStateBean.setStatus(3);
+                                                                                    createDBStateBean.setCompletePercent("0.0%");
+                                                                                    createDBStateBean.setMsg("");
+                                                                                    if (var4 == 7) {
+                                                                                        createDBStateBean.setErrormsg("数据库:master 或者 " + var48 + " 排序规则错误,不是Chinese_PRC_CI_AS");
+                                                                                        var19 = "数据库:master 或者 " + var48 + " 排序规则错误,不是Chinese_PRC_CI_AS";
+                                                                                    } else if (var4 == 9) {
+                                                                                        createDBStateBean.setErrormsg("數據庫:master 或者 " + var48 + "排序規則錯誤,不是Chinese_PRC_CI_AS");
+                                                                                        var19 = "數據庫:master 或者 " + var48 + "排序規則錯誤,不是Chinese_PRC_CI_AS";
+                                                                                    } else {
+                                                                                        createDBStateBean.setErrormsg("DataBase:master or " + var48 + "Collation rules error,not Chinese_PRC_CI_AS");
+                                                                                        var19 = "DataBase:master or " + var48 + "Collation rules error,not Chinese_PRC_CI_AS";
+                                                                                    }
+
+                                                                                    var49 = var19;
+                                                                                    var101 = false;
+                                                                                    break label3015;
+                                                                                }
+                                                                            }
+                                                                        } else if (var6.equals("oracle")) {
+                                                                            var46 = "SELECT VALUE FROM Nls_Database_Parameters WHERE PARAMETER='NLS_CHARACTERSET'";
+                                                                            var47 = null;
+
+                                                                            try {
+                                                                                var47 = var191.executeQuery(var46);
+                                                                            } catch (Exception var182) {
+                                                                                createDBStateBean.setStatus(3);
+                                                                                createDBStateBean.setCompletePercent("0.0%");
+                                                                                createDBStateBean.setMsg("");
+                                                                                if (var4 == 7) {
+                                                                                    createDBStateBean.setErrormsg("没有权限查询数据库排序规则");
+                                                                                    var19 = "没有权限查询数据库排序规则";
+                                                                                } else if (var4 == 9) {
+                                                                                    createDBStateBean.setErrormsg("沒有許可權査詢數據庫排序規則");
+                                                                                    var19 = "沒有許可權査詢數據庫排序規則";
+                                                                                } else {
+                                                                                    createDBStateBean.setErrormsg("No permissions to query database collation rules");
+                                                                                    var19 = "No permissions to query database collation rules";
+                                                                                }
+
+                                                                                var49 = var19;
+                                                                                var101 = false;
+                                                                                break label3024;
+                                                                            }
+
+                                                                            if (var47.next()) {
+                                                                                int var194 = Util.getIntValue(Prop.getPropValue("weaver_encode4Upgrade", "encoding"), 1);
+                                                                                if (var194 == 2) {
+                                                                                    if (!var47.getString("value").equals("ZHS16GBK")) {
+                                                                                        createDBStateBean.setStatus(3);
+                                                                                        createDBStateBean.setCompletePercent("0.0%");
+                                                                                        createDBStateBean.setMsg("");
+                                                                                        if (var4 == 7) {
+                                                                                            createDBStateBean.setErrormsg("数据库编码不是ZHS16GBK");
+                                                                                            var19 = "数据库编码不是ZHS16GBK";
+                                                                                        } else if (var4 == 9) {
+                                                                                            createDBStateBean.setErrormsg("數據庫編碼不是ZHS16GBK");
+                                                                                            var19 = "數據庫編碼不是ZHS16GBK";
+                                                                                        } else {
+                                                                                            createDBStateBean.setErrormsg("Database coding is not ZHS16GBK");
+                                                                                            var19 = "Database coding is not ZHS16GBK";
+                                                                                        }
+
+                                                                                        var49 = var19;
+                                                                                        var101 = false;
+                                                                                        break label3016;
+                                                                                    }
+                                                                                } else if (!var47.getString("value").equals("AL32UTF8")) {
+                                                                                    createDBStateBean.setStatus(3);
+                                                                                    createDBStateBean.setCompletePercent("0.0%");
+                                                                                    createDBStateBean.setMsg("");
+                                                                                    if (var4 == 7) {
+                                                                                        createDBStateBean.setErrormsg("数据库编码不是AL32UTF8");
+                                                                                        var19 = "数据库编码不是AL32UTF8, 如需指定使用ZHS16GBK编码进行初始化,修改ecology/WEB-INF/prop/weaver_encode4upgrade.properties文件中encoding=2 (请注意:选择ZHS16GBK编码不能很好的兼容小语种字符和部分中文生僻字的存储,推荐数据库编码选择AL32UTF8)";
+                                                                                    } else if (var4 == 9) {
+                                                                                        createDBStateBean.setErrormsg("數據庫編碼不是AL32UTF8");
+                                                                                        var19 = "數據庫編碼不是AL32UTF8";
+                                                                                    } else {
+                                                                                        createDBStateBean.setErrormsg("Database coding is not AL32UTF8");
+                                                                                        var19 = "Database coding is not AL32UTF8";
+                                                                                    }
+
+                                                                                    var49 = var19;
+                                                                                    var101 = false;
+                                                                                    break label3017;
+                                                                                }
+                                                                            }
+                                                                        } else if (var6.equals("mysql")) {
+                                                                            var46 = "select DEFAULT_CHARACTER_SET_NAME from information_schema.SCHEMATA where SCHEMA_NAME = '" + var9 + "'";
+                                                                            var47 = null;
+
+                                                                            try {
+                                                                                var47 = var191.executeQuery(var46);
+                                                                            } catch (Exception var183) {
+                                                                                createDBStateBean.setStatus(3);
+                                                                                createDBStateBean.setCompletePercent("0.0%");
+                                                                                createDBStateBean.setMsg("");
+                                                                                if (var4 == 7) {
+                                                                                    createDBStateBean.setErrormsg("没有权限查询数据库排序规则");
+                                                                                    var19 = "没有权限查询数据库排序规则";
+                                                                                } else if (var4 == 9) {
+                                                                                    createDBStateBean.setErrormsg("沒有許可權査詢數據庫排序規則");
+                                                                                    var19 = "沒有許可權査詢數據庫排序規則";
+                                                                                } else {
+                                                                                    createDBStateBean.setErrormsg("No permissions to query database collation rules");
+                                                                                    var19 = "No permissions to query database collation rules";
+                                                                                }
+
+                                                                                var49 = var19;
+                                                                                var101 = false;
+                                                                                break label3082;
+                                                                            }
+
+                                                                            if (var47.next() && !var47.getString("DEFAULT_CHARACTER_SET_NAME").toLowerCase().startsWith("utf8")) {
+                                                                                createDBStateBean.setStatus(3);
+                                                                                createDBStateBean.setCompletePercent("0.0%");
+                                                                                createDBStateBean.setMsg("");
+                                                                                if (var4 == 7) {
+                                                                                    createDBStateBean.setErrormsg("数据库编码不是utf8");
+                                                                                    var19 = "数据库编码不是utf8";
+                                                                                } else if (var4 == 9) {
+                                                                                    createDBStateBean.setErrormsg("數據庫編碼不是utf8");
+                                                                                    var19 = "數據庫編碼不是utf8";
+                                                                                } else {
+                                                                                    createDBStateBean.setErrormsg("Database coding is not utf8");
+                                                                                    var19 = "Database coding is not utf8";
+                                                                                }
+
+                                                                                var48 = var19;
+                                                                                var101 = false;
+                                                                                break label3019;
+                                                                            }
+                                                                        }
+
+                                                                        if (var13) {
+                                                                            if (var6.equals("sqlserver")) {
+                                                                                var43 = " use master ";
+                                                                                var191.executeUpdate(var43);
+                                                                                var43 = " use " + var9;
+                                                                                var191.executeUpdate(var43);
+                                                                            }
+
+                                                                            String var197 = "select 1 from license";
+
+                                                                            try {
+                                                                                var191.executeQuery(var197);
+                                                                            } catch (Exception var177) {
+                                                                                createDBStateBean.setStatus(3);
+                                                                                createDBStateBean.setCompletePercent("0.0%");
+                                                                                createDBStateBean.setMsg("");
+                                                                                if (var4 == 7) {
+                                                                                    var19 = "数据库还未初始化,请勿勾选使用已有数据库!";
+                                                                                } else if (var4 == 9) {
+                                                                                    var19 = "數據庫還未初始化，請勿勾選使用已有數據庫!";
+                                                                                } else {
+                                                                                    var19 = "The database has not been initialized yet. Do not check to use the existing database";
+                                                                                }
+
+                                                                                createDBStateBean.setErrormsg(var19);
+                                                                                var49 = var19;
+                                                                                var101 = false;
+                                                                                break label3023;
+                                                                            }
+
+                                                                            var19 = "";
+                                                                            var101 = false;
+                                                                            break label3020;
+                                                                        }
+
+                                                                        if (var6.equals("sqlserver")) {
+                                                                            var43 = " use master ";
+                                                                            var191.executeUpdate(var43);
+                                                                            var43 = " use " + var9;
+                                                                            var191.executeUpdate(var43);
+                                                                        }
+
+                                                                        File var195 = new File(var20);
+                                                                        String[] var196 = var195.list(new FilenameFilter() {
+                                                                            public boolean accept(File var1, String var2) {
+                                                                                return var2.trim().endsWith(".sql");
+                                                                            }
+                                                                        });
+                                                                        int var186 = 0;
+                                                                        if (var196 != null) {
+                                                                            for (int var199 = 0; var199 < var196.length; ++var199) {
+                                                                                for (int var50 = var199 + 1; var50 < var196.length; ++var50) {
+                                                                                    if (var196[var199].compareTo(var196[var50]) > 0) {
+                                                                                        String var51 = var196[var199];
+                                                                                        var196[var199] = var196[var50];
+                                                                                        var196[var50] = var51;
+                                                                                    }
+                                                                                }
+                                                                            }
+
+                                                                            var186 = var196.length;
+                                                                        }
+
+                                                                        if (!var25.endsWith("" + File.separatorChar)) {
+                                                                            var25 = var25 + File.separatorChar;
+                                                                        }
+
+                                                                        List var201 = readInitSqlFiles(var25 + "initSqlList.properties");
+                                                                        var198 = new File(var21);
+                                                                        String[] var200 = var198.list();
+
+                                                                        int var52;
+                                                                        int var53;
+                                                                        for (var52 = 0; var52 < var200.length; ++var52) {
+                                                                            for (var53 = var52 + 1; var53 < var200.length; ++var53) {
+                                                                                if (var200[var52].compareTo(var200[var53]) > 0) {
+                                                                                    String var54 = var200[var52];
+                                                                                    var200[var52] = var200[var53];
+                                                                                    var200[var53] = var54;
+                                                                                }
+                                                                            }
+                                                                        }
+
+                                                                        var52 = var200.length;
+                                                                        var53 = 0;
+
+                                                                        for (int var203 = 0; var203 < var52; ++var203) {
+                                                                            if (var201.contains(var200[var203].trim().toLowerCase()) && var186 > 0) {
+                                                                                ++var53;
+                                                                            }
+                                                                        }
+
+                                                                        var30 = var186 + var52 - var53;
+                                                                        String[] var204 = new String[var30];
+
+                                                                        int var55;
+                                                                        for (var55 = 0; var55 < var186; ++var55) {
+                                                                            var204[var55] = var196[var55];
+                                                                        }
+
+                                                                        var55 = 0;
+
+                                                                        for (int var56 = 0; var56 < var52; ++var56) {
+                                                                            if (!var201.contains(var200[var56].trim().toLowerCase()) || var186 <= 0) {
+                                                                                var204[var55 + var186] = var200[var56];
+                                                                                ++var55;
+                                                                            }
+                                                                        }
+
+                                                                        SimpleDateFormat var205 = new SimpleDateFormat("yyyy-MM-dd");
+                                                                        SimpleDateFormat var57 = new SimpleDateFormat("HH:mm:ss");
+                                                                        createDBStateBean.setStatus(1);
+                                                                        createDBStateBean.setErrormsg("");
+                                                                        createDBStateBean.setCompletePercent("0.0%");
+
+                                                                        for (int var58 = 0; var58 < var30; ++var58) {
+                                                                            if (var58 < var186) {
+                                                                                var44 = var20 + "/" + var204[var58];
+                                                                            } else {
+                                                                                var44 = var21 + "/" + var204[var58];
+                                                                            }
+
+                                                                            var36 += this.readFileScriptsCount(var44, var22);
+                                                                        }
+
+                                                                        boolean var206 = false;
+
+                                                                        String var62;
+                                                                        for (int var59 = 0; var59 < var30; ++var59) {
+                                                                            createDBStateBean.setStatus(1);
+                                                                            createDBStateBean.setErrormsg("");
+                                                                            if (var59 < var186) {
+                                                                                var44 = var20 + "/" + var204[var59];
+                                                                            } else {
+                                                                                var44 = var21 + "/" + var204[var59];
+                                                                            }
+
+                                                                            ++var31;
+                                                                            var32 = var204[var59];
+                                                                            if (var4 == 7) {
+                                                                                createDBStateBean.setMsg("共" + var30 + "个脚本,当前执行第" + var31 + "个脚本：" + var204[var59]);
+                                                                            } else if (var4 == 9) {
+                                                                                createDBStateBean.setMsg("共" + var30 + "個腳本,當前執行第" + var31 + "個腳本：" + var204[var59]);
+                                                                            } else {
+                                                                                createDBStateBean.setMsg("Total of " + var30 + " scripts,the current execution script No" + var31 + "：" + var204[var59]);
+                                                                            }
+
+                                                                            System.out.println(TimeUtil.getCurrentTimeString() + ":共" + var30 + "个脚本,当前执行第" + var31 + "个脚本：" + var204[var59]);
+                                                                            var45 = "";
+                                                                            var43 = "";
+                                                                            File var60 = new File(var44);
+                                                                            BufferedReader var61 = null;
+
+                                                                            try {
+                                                                                var61 = new BufferedReader(new InputStreamReader(new FileInputStream(var60), "gbk"));
+                                                                                var62 = "insert into sqlinitloginfo(id,sqlfilename,rundate,runtime,packageno,exectime) values(?,?,?,?,?,?)";
+                                                                                long var210 = System.currentTimeMillis();
+                                                                                if (var37) {
+                                                                                    MysqlScriptRunner var211 = new MysqlScriptRunner(var18, false, true);
+                                                                                    var211.runScript(var61);
+                                                                                    createDBStateBean.setCompletePercent(var28.format((double) ((float) var31 / (float) var30 * 100.0F)) + "%");
+                                                                                } else {
+                                                                                    int var65 = 0;
+
+                                                                                    label2885:
+                                                                                    while (true) {
+                                                                                        while (true) {
+                                                                                            if ((var45 = var61.readLine()) == null) {
+                                                                                                break label2885;
+                                                                                            }
+
+                                                                                            ++var65;
+                                                                                            var45 = var45.trim();
+                                                                                            if (!var45.equalsIgnoreCase(var22)) {
+                                                                                                var43 = var43 + " " + var45;
+                                                                                            } else if (!var43.trim().equals("")) {
+                                                                                                var19 = var19 + var43 + "<br>";
+                                                                                                String finalVar2 = var26;
+                                                                                                if (Stream.of(RecordSetExecutionInterface.LEGACY_DB_TYPES).noneMatch((var1x) -> {
+                                                                                                    return var1x.equalsIgnoreCase(finalVar2);
+                                                                                                })) {
+                                                                                                    ProcSqlParser var67 = new ProcSqlParser(var43, new ConnParamStore(var26, var6));
+                                                                                                    if (var67.hasValidProcSql()) {
+                                                                                                        ProcChecker var68 = new ProcChecker(new ProcParamStore(var67.getProcName(), (String) null, new RecordSet(), var67.getParams(), true));
+                                                                                                        if (var68.hasClass()) {
+                                                                                                            var68.executeProc();
+                                                                                                            var43 = "";
+                                                                                                            var19 = "";
+                                                                                                            continue;
+                                                                                                        }
+                                                                                                    }
+                                                                                                }
+
+                                                                                                if (var40 != null && (var40.contains("Kingbase") || var40.contains("PostgreSQL"))) {
+                                                                                                    var191.execute(var43);
+                                                                                                } else {
+                                                                                                    if (var40 != null && var40.contains("Zenith")) {
+                                                                                                        Matcher var213 = this.sequencePattern.matcher(var43);
+                                                                                                        if (var213.find()) {
+                                                                                                            var43 = var43.toUpperCase();
+                                                                                                        }
+
+                                                                                                        var213 = this.sqlPattern.matcher(var43);
+                                                                                                        if (var213.find()) {
+                                                                                                            var43 = var43.substring(0, var213.start(1));
+                                                                                                        }
+                                                                                                    }
+
+                                                                                                    var191.executeUpdate(var43);
+                                                                                                }
+
+                                                                                                var43 = "";
+                                                                                                var19 = "";
+                                                                                                ++var35;
+                                                                                                createDBStateBean.setCompletePercent(var28.format((double) ((float) var35 / (float) var36 * 100.0F)) + "%");
+                                                                                            }
+                                                                                        }
+                                                                                    }
+                                                                                }
+
+                                                                                long var212 = System.currentTimeMillis();
+                                                                                if (var186 > 0) {
+                                                                                    PreparedStatement var214 = null;
+
+                                                                                    try {
+                                                                                        var214 = var18.prepareStatement(var62);
+                                                                                        var214.setString(1, var204[var59]);
+                                                                                        var214.setString(2, var204[var59]);
+                                                                                        var214.setString(3, var205.format(new Date()));
+                                                                                        var214.setString(4, var57.format(new Date()));
+                                                                                        var214.setString(5, "null");
+                                                                                        var214.setString(6, var212 - var210 + "ms");
+                                                                                        var214.executeUpdate();
+                                                                                    } catch (Exception var172) {
+                                                                                        var172.printStackTrace();
+                                                                                    } finally {
+                                                                                        if (var214 != null) {
+                                                                                            var214.close();
+                                                                                        }
+
+                                                                                    }
+                                                                                }
+
+                                                                                var23 = var204[var59];
+                                                                                System.out.println(TimeUtil.getCurrentTimeString() + ":" + var23 + " execute success !");
+                                                                                continue;
+                                                                            } catch (Exception var178) {
+                                                                                var19 = var19 + var178.toString();
+                                                                                createDBStateBean.setStatus(3);
+                                                                                if (var37) {
+                                                                                    createDBStateBean.setCompletePercent(var28.format((double) ((float) var31 / (float) var30 * 100.0F)) + "%");
+                                                                                } else {
+                                                                                    createDBStateBean.setCompletePercent(var28.format((double) ((float) var35 / (float) var36 * 100.0F)) + "%");
+                                                                                }
+
+                                                                                createDBStateBean.setMsg("");
+                                                                                var19 = " error ! message is below : <br>File:" + var32 + "<br> Reason:" + var19;
+                                                                                createDBStateBean.setErrormsg(var19);
+                                                                                var178.printStackTrace();
+                                                                                var63 = var19;
+                                                                            } finally {
+                                                                                if (var61 != null) {
+                                                                                    var61.close();
+                                                                                }
+
+                                                                            }
+
+                                                                            var101 = false;
+                                                                            break label3021;
+                                                                        }
+
+                                                                        if (var186 > 0) {
+                                                                            String var207 = "insert into SqlFileLogInfo(SQLFILENAME,RUNDATE,RUNTIME) values(?,?,?)";
+                                                                            PreparedStatement var208 = var18.prepareStatement(var207);
+                                                                            Iterator var209 = var201.iterator();
+
+                                                                            while (var209.hasNext()) {
+                                                                                var62 = (String) var209.next();
+                                                                                var208.setString(1, var62);
+                                                                                var208.setString(2, var205.format(new Date()));
+                                                                                var208.setString(3, var57.format(new Date()));
+                                                                                var208.addBatch();
+                                                                            }
+
+                                                                            var208.executeBatch();
+                                                                            var208.close();
+                                                                        }
+
+                                                                        var19 = "";
+                                                                        var101 = false;
+                                                                        break label3020;
+                                                                    }
+                                                                } catch (Exception var184) {
+                                                                    var19 = var19 + var184.toString();
+                                                                    createDBStateBean.setStatus(3);
+                                                                    if (var37) {
+                                                                        createDBStateBean.setCompletePercent(var28.format((double) ((float) var31 / (float) var30 * 100.0F)) + "%");
+                                                                    } else {
+                                                                        createDBStateBean.setCompletePercent(var28.format((double) ((float) var35 / (float) var36 * 100.0F)) + "%");
+                                                                    }
+
+                                                                    createDBStateBean.setMsg("");
+                                                                    var19 = " error ! message is below : <br>File:" + var32 + "<br> Reason:" + var19;
+                                                                    createDBStateBean.setErrormsg(var19);
+                                                                    var184.printStackTrace();
+                                                                    var39 = var19;
+                                                                    var101 = false;
+                                                                    break label3022;
+                                                                } finally {
+                                                                    if (var101) {
+                                                                        try {
+                                                                            var18.close();
+                                                                        } catch (Exception var161) {
+                                                                        }
+
+                                                                        File var72 = new File(GCONST.getPropertyPath() + GCONST.propFileBakName + ".properties");
+                                                                        if (!var72.delete()) {
+                                                                            var72.deleteOnExit();
+                                                                        }
+
+                                                                    }
+                                                                }
+
+                                                                try {
+                                                                    var18.close();
+                                                                } catch (Exception var166) {
+                                                                }
+
+                                                                var198 = new File(GCONST.getPropertyPath() + GCONST.propFileBakName + ".properties");
+                                                                if (!var198.delete()) {
+                                                                    var198.deleteOnExit();
+                                                                }
+
+                                                                return var49;
+                                                            }
+
+                                                            try {
+                                                                var18.close();
+                                                            } catch (Exception var165) {
+                                                            }
+
+                                                            File var193 = new File(GCONST.getPropertyPath() + GCONST.propFileBakName + ".properties");
+                                                            if (!var193.delete()) {
+                                                                var193.deleteOnExit();
+                                                            }
+
+                                                            return var43;
+                                                        }
+
+                                                        try {
+                                                            var18.close();
+                                                        } catch (Exception var164) {
+                                                        }
+
+                                                        File var192 = new File(GCONST.getPropertyPath() + GCONST.propFileBakName + ".properties");
+                                                        if (!var192.delete()) {
+                                                            var192.deleteOnExit();
+                                                        }
+
+                                                        return var44;
+                                                    }
+
+                                                    try {
+                                                        var18.close();
+                                                    } catch (Exception var163) {
+                                                    }
+
+                                                    var198 = new File(GCONST.getPropertyPath() + GCONST.propFileBakName + ".properties");
+                                                    if (!var198.delete()) {
+                                                        var198.deleteOnExit();
+                                                    }
+
+                                                    return var49;
+                                                }
+
+                                                try {
+                                                    var18.close();
+                                                } catch (Exception var162) {
+                                                }
+
+                                                var198 = new File(GCONST.getPropertyPath() + GCONST.propFileBakName + ".properties");
+                                                if (!var198.delete()) {
+                                                    var198.deleteOnExit();
+                                                }
+
+                                                return var49;
+                                            }
+
+                                            try {
+                                                var18.close();
+                                            } catch (Exception var160) {
+                                            }
+
+                                            File var190 = new File(GCONST.getPropertyPath() + GCONST.propFileBakName + ".properties");
+                                            if (!var190.delete()) {
+                                                var190.deleteOnExit();
+                                            }
+
+                                            return var39;
+                                        }
+
+                                        try {
+                                            var18.close();
+                                        } catch (Exception var159) {
+                                        }
+
+                                        File var64 = new File(GCONST.getPropertyPath() + GCONST.propFileBakName + ".properties");
+                                        if (!var64.delete()) {
+                                            var64.deleteOnExit();
+                                        }
+
+                                        return var63;
+                                    }
+
+                                    try {
+                                        var18.close();
+                                    } catch (Exception var171) {
+                                    }
+
+                                    File var38 = new File(GCONST.getPropertyPath() + GCONST.propFileBakName + ".properties");
+                                    if (!var38.delete()) {
+                                        var38.deleteOnExit();
+                                    }
+
+                                    if (var19.equals("")) {
+                                        if (var6.equals("sqlserver") && !var10.equals("MSSQLSERVER")) {
+                                            if (var6.equals("sqlserver")) {
+                                                var6 = "1";
+                                            }
+
+                                            var3.editsidProp(var7, var8, var9, var11, var12, var6, var10);
+                                            if (!var23.equals("")) {
+                                                var3.editDblog(var7, var9, var6, var23);
+                                            }
+
+                                            createDBStateBean.setStatus(2);
+                                            createDBStateBean.setCompletePercent("100%");
+                                            createDBStateBean.setErrormsg("");
+                                            var19 = " Success ! ";
+                                            if (var4 == 7) {
+                                                var19 = var19 + "<br>请重启服务，启动成功后再点击下方的登入系统！";
+                                                var19 = var19 + "<br><a href=/wui/index.html#/?logintype=1 target=_top>登入系统</a>";
+                                                createDBStateBean.setMsg(var19);
+                                            } else if (var4 == 9) {
+                                                var19 = var19 + "<br>請重啓服務，啟動成功後再點擊下方的登入系統！";
+                                                var19 = var19 + "<br><a href=/wui/index.html#/?logintype=1 target=_top>登入系统</a>";
+                                                createDBStateBean.setMsg(var19);
+                                            } else {
+                                                var19 = var19 + "<br>Please restart Service,After launched, click on the login system below.";
+                                                var19 = var19 + "<br><a href=/wui/index.html#/?logintype=1 target=_top>Login</a>";
+                                                createDBStateBean.setMsg(var19);
+                                            }
+                                        } else {
+                                            var3.editProp(var7, var8, var9, var11, var12, var27, "utf8", var24);
+                                            if (!var23.equals("")) {
+                                                var3.editDblog(var7, var9, var27, var23);
+                                            }
+
+                                            createDBStateBean.setStatus(2);
+                                            createDBStateBean.setCompletePercent("100%");
+                                            createDBStateBean.setErrormsg("");
+                                            var19 = " Success ! ";
+                                            if (var4 == 7) {
+                                                var19 = var19 + "<br>请重启服务，启动成功后再点击下方的登入系统！";
+                                                var19 = var19 + "<br><a href=/wui/index.html#/?logintype=1 target=_top>登入系统</a>";
+                                                createDBStateBean.setMsg(var19);
+                                            } else if (var4 == 9) {
+                                                var19 = var19 + "<br>請重啓服務，啟動成功後再點擊下方的登入系統！";
+                                                var19 = var19 + "<br><a href=/wui/index.html#/?logintype=1 target=_top>登入系统</a>";
+                                                createDBStateBean.setMsg(var19);
+                                            } else {
+                                                var19 = var19 + "<br>Please restart Service,After launched, click on the login system below.";
+                                                var19 = var19 + "<br><a href=/wui/index.html#/?logintype=1 target=_top>Login</a>";
+                                                createDBStateBean.setMsg(var19);
+                                            }
+                                        }
+
+                                        String var187 = Prop.getPropValue("autoconfigsetting", "autoconfig");
+                                        if ("1".equals(var187)) {
+                                            this.loggerBean.writeLog("&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&自动配置开始 : " + TimeUtil.getCurrentTimeString() + "&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&");
+                                            SystemAutoConfig var189 = new SystemAutoConfig();
+                                            var40 = var189.systemAutoConfig("1", (String) null);
+                                            this.loggerBean.writeLog("&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&自动配置结束 : " + TimeUtil.getCurrentTimeString() + "&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&");
+                                        }
+                                    } else {
+                                        createDBStateBean.setStatus(3);
+                                        createDBStateBean.setCompletePercent("100%");
+                                        createDBStateBean.setMsg("");
+                                        var19 = " error ! message is below : " + var19;
+                                        createDBStateBean.setErrormsg(var19);
+                                    }
+
+                                    return var19;
+                                }
+
+                                try {
+                                    var18.close();
+                                } catch (Exception var170) {
+                                }
+
+                                File var202 = new File(GCONST.getPropertyPath() + GCONST.propFileBakName + ".properties");
+                                if (!var202.delete()) {
+                                    var202.deleteOnExit();
+                                }
+
+                                return var48;
+                            }
+
+                            try {
+                                var18.close();
+                            } catch (Exception var158) {
+                            }
+
+                            var198 = new File(GCONST.getPropertyPath() + GCONST.propFileBakName + ".properties");
+                            if (!var198.delete()) {
+                                var198.deleteOnExit();
+                            }
+
+                            return var49;
+                        }
+
+                        try {
+                            var18.close();
+                        } catch (Exception var169) {
+                        }
+
+                        var198 = new File(GCONST.getPropertyPath() + GCONST.propFileBakName + ".properties");
+                        if (!var198.delete()) {
+                            var198.deleteOnExit();
+                        }
+
+                        return var49;
+                    }
+
+                    try {
+                        var18.close();
+                    } catch (Exception var168) {
+                    }
+
+                    var198 = new File(GCONST.getPropertyPath() + GCONST.propFileBakName + ".properties");
+                    if (!var198.delete()) {
+                        var198.deleteOnExit();
+                    }
+
+                    return var49;
+                }
+
+                try {
+                    var18.close();
+                } catch (Exception var167) {
+                }
+
+                var198 = new File(GCONST.getPropertyPath() + GCONST.propFileBakName + ".properties");
+                if (!var198.delete()) {
+                    var198.deleteOnExit();
+                }
+
+                return var49;
+            }
+        }
+    }
+
+    public Map<String, Object> getDBValidcodeCondition(int var1) {
+        if (var1 <= 7) {
+            var1 = 7;
+        } else if (var1 > 9) {
+            var1 = 8;
+        }
+
+        HashMap var2 = new HashMap();
+        ArrayList var3 = new ArrayList();
+        HashMap var4 = new HashMap();
+        ArrayList var5 = new ArrayList();
+        String var6 = "";
+        String var7 = "";
+        if (var1 == 7) {
+            var4.put("title", "更改验证码");
+            var4.put("defaultshow", true);
+            var5.add(new ConditionItem(2, ConditionType.PASSWORD, new String[]{"code"}, 10, false, "旧验证码", 8, 0, 3, "required|string"));
+            var5.add(new ConditionItem(2, ConditionType.PASSWORD, new String[]{"newcode"}, 10, false, "新验证码", 8, 0, 3, "required|string"));
+            var5.add(new ConditionItem(2, ConditionType.PASSWORD, new String[]{"confirmCode"}, 10, false, "确认新验证码", 8, 0, 3, "required|string"));
+            var6 = "提交";
+            var7 = "取消";
+        } else if (var1 == 9) {
+            var4.put("title", "更改驗證碼");
+            var4.put("defaultshow", true);
+            var5.add(new ConditionItem(2, ConditionType.PASSWORD, new String[]{"code"}, 10, false, "舊驗證碼", 8, 0, 3, "required|string"));
+            var5.add(new ConditionItem(2, ConditionType.PASSWORD, new String[]{"newcode"}, 10, false, "新驗證碼", 8, 0, 3, "required|string"));
+            var5.add(new ConditionItem(2, ConditionType.PASSWORD, new String[]{"confirmCode"}, 10, false, "確認新驗證碼", 8, 0, 3, "required|string"));
+            var6 = "提交";
+            var7 = "返回";
+        } else {
+            var4.put("title", "Change Verification Code");
+            var4.put("defaultshow", true);
+            var5.add(new ConditionItem(2, ConditionType.PASSWORD, new String[]{"code"}, 10, false, "Old verifying code", 8, 0, 3, "required|string"));
+            var5.add(new ConditionItem(2, ConditionType.PASSWORD, new String[]{"newcode"}, 10, false, "New verifying code", 8, 0, 3, "required|string"));
+            var5.add(new ConditionItem(2, ConditionType.PASSWORD, new String[]{"confirmCode"}, 10, false, "Confirm New verifying code", 8, 0, 3, "required|string"));
+            var6 = "Submit";
+            var7 = "Cancel";
+        }
+
+        var4.put("items", var5);
+        var3.add(var4);
+        var2.put("conditioninfo", var3);
+        var2.put("submmit", var6);
+        var2.put("back", var7);
+        return var2;
+    }
+
+    public String resetValidcode(String var1, String var2, String var3, int var4) {
+        if (var4 <= 7) {
+            var4 = 7;
+        } else if (var4 > 9) {
+            var4 = 8;
+        }
+
+        if (var1 != "" && var2 != "" && var3 != "") {
+            if (!var2.equals(var3)) {
+                if (var4 == 7) {
+                    return "新验证码不一致!";
+                } else {
+                    return var4 == 9 ? "新驗證碼不一致!" : "New verification code inconsistencies!";
+                }
+            } else {
+                char[] var5 = new char[16];
+
+                try {
+                    (new FileReader(GCONST.getRootPath() + File.separator + "WEB-INF" + File.separator + "code.key")).read(var5);
+                } catch (Exception var9) {
+                    this.loggerBean.writeLog(var9);
+                    if (var4 == 7) {
+                        return "验证码读取失败!";
+                    }
+
+                    if (var4 == 9) {
+                        return "驗證碼讀取失敗!";
+                    }
+
+                    return "Verification code read failure!";
+                }
+
+                String var6 = (new String(var5)).trim();
+                if (!var6.equals(var1)) {
+                    if (var4 == 7) {
+                        return "验证码错误!";
+                    } else {
+                        return var4 == 9 ? "驗證碼讀取失敗!" : "Verification code error!";
+                    }
+                } else {
+                    try {
+                        FileWriter var7 = new FileWriter(GCONST.getRootPath() + File.separator + "WEB-INF" + File.separator + "code.key");
+                        var7.write(var2);
+                        var7.close();
+                    } catch (Exception var8) {
+                        this.loggerBean.writeLog(var8);
+                        if (var4 == 7) {
+                            return "验证码修改失败!";
+                        }
+
+                        if (var4 == 9) {
+                            return "驗證碼修改失敗!";
+                        }
+
+                        return "Verification code modification failure!";
+                    }
+
+                    if (var4 == 7) {
+                        return "验证码修改成功!";
+                    } else {
+                        return var4 == 9 ? "驗證碼修改成功!" : "Verification code modification success!";
+                    }
+                }
+            }
+        } else if (var4 == 7) {
+            return "验证码信息不完整!";
+        } else {
+            return var4 == 9 ? "驗證碼資訊不完整!" : "The Verification code information is incomplete!";
+        }
+    }
+
+    public CreateDBStateBean getStat() {
+        return createDBStateBean;
+    }
+
+    public synchronized String resetStat() {
+        createDBStateBean.setCompletePercent("0.0%");
+        createDBStateBean.setErrormsg("");
+        createDBStateBean.setMsg("");
+        createDBStateBean.setStatus(0);
+        return "Success";
+    }
+
+    private static List<String> readInitSqlFiles(String var0) {
+        ArrayList var1 = new ArrayList();
+        if (var0 != null && !var0.equals("")) {
+            File var2 = new File(var0);
+            BufferedReader var3 = null;
+            new StringBuffer();
+
+            try {
+                var3 = new BufferedReader(new InputStreamReader(new FileInputStream(var2), "gbk"));
+                String var5 = "";
+                String var6 = "";
+
+                while ((var5 = var3.readLine()) != null) {
+                    var6 = var5.trim().toLowerCase();
+                    if (!"".equals(var6)) {
+                        var1.add(var6);
+                    }
+                }
+            } catch (IOException var15) {
+                var15.printStackTrace();
+            } finally {
+                if (var3 != null) {
+                    try {
+                        var3.close();
+                    } catch (IOException var14) {
+                    }
+                }
+
+            }
+
+            return var1;
+        } else {
+            return var1;
+        }
+    }
+
+    private int readFileScriptsCount(String var1, String var2) {
+        if (var1 != null && !var1.equals("")) {
+            int var3 = 0;
+            File var4 = new File(var1);
+            BufferedReader var5 = null;
+
+            try {
+                var5 = new BufferedReader(new InputStreamReader(new FileInputStream(var4), "GBK"));
+                String var6 = "";
+
+                while ((var6 = var5.readLine()) != null) {
+                    if (var6.trim().equalsIgnoreCase(var2)) {
+                        ++var3;
+                    }
+                }
+
+                var5.close();
+            } catch (IOException var15) {
+                var15.printStackTrace();
+            } finally {
+                if (var5 != null) {
+                    try {
+                        var5.close();
+                    } catch (IOException var14) {
+                    }
+                }
+
+            }
+
+            return var3;
+        } else {
+            return 0;
+        }
+    }
+}
diff --git a/src/main/youhong_ai_old_src/com/api/testapi/TestApiUtil.java b/src/main/youhong_ai_old_src/com/api/testapi/TestApiUtil.java
new file mode 100644
index 0000000..360fa63
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/testapi/TestApiUtil.java
@@ -0,0 +1,24 @@
+package com.api.testapi;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.core.Response;
+import java.net.URI;
+import java.net.URISyntaxException;
+
+/**
+ * create 2022/1/4 0004 14:46
+ *
+ * @author EBU7-dev1-ayh
+ */
+
+
+@Path("/testapi")
+public class TestApiUtil {
+
+    @GET
+    @Path("test-forword")
+    public Response forword() throws URISyntaxException {
+        return Response.temporaryRedirect(new URI("https://www.baidu.com")).build();
+    }
+}
diff --git a/src/main/youhong_ai_old_src/com/api/xiao/commons/config/dao/ConfigMappingCMD.java b/src/main/youhong_ai_old_src/com/api/xiao/commons/config/dao/ConfigMappingCMD.java
new file mode 100644
index 0000000..0b0da06
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/xiao/commons/config/dao/ConfigMappingCMD.java
@@ -0,0 +1,182 @@
+package com.api.xiao.commons.config.dao;
+
+import aiyh.utils.zwl.common.ToolUtil;
+import com.api.xiao.commons.config.entity.FieldMessage;
+import com.api.xiao.commons.config.entity.MappingDetail;
+import com.api.xiao.commons.config.entity.RequestMappingConfig;
+import weaver.conn.RecordSet;
+import weaver.general.Util;
+import weaver.workflow.workflow.WorkflowVersion;
+
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.List;
+
+
+/**
+ * @author XiaoBokang
+ * @create 2021/12/29 9:46
+ */
+
+public class ConfigMappingCMD {
+
+    private final ToolUtil toolUtil = new ToolUtil();
+    private final String configTableName = "uf_request_config";
+
+    public RequestMappingConfig selectMsg(String workflowId){
+
+        toolUtil.writeDebuggerLog("=======================查询配置列表=======================");
+        RequestMappingConfig requestMappingConfig = new RequestMappingConfig();
+        RecordSet recordSet = new RecordSet();
+        //根据当前流程id获取全版本的流程id
+        WorkflowVersion workflowVersion = new WorkflowVersion();
+        List<String> voList = workflowVersion.getVersionListByWfid(workflowId);
+        String allVersionWorkflow = String.join(",", voList);
+        String queryConfigSql = "select id,workflow,requestUrl from "+configTableName+" where workflow in ("+allVersionWorkflow+")";
+        toolUtil.writeDebuggerLog("执行查询主表配置数据的sql query mainRequestMappingConfig list sql >>>>"+queryConfigSql);
+        recordSet.executeQuery(queryConfigSql);
+        if(recordSet.next()){
+            int mainId = Util.getIntValue(recordSet.getString("id"));
+            String workflow = Util.null2String(recordSet.getString("workflow"));
+            String requestUrl = Util.null2String(recordSet.getString("requestUrl"));
+            requestMappingConfig.setRequestUrl(requestUrl);
+            requestMappingConfig.setWorkflow(workflow);
+            this.setDetailMapping(mainId,requestMappingConfig);
+        }
+        return requestMappingConfig;
+    }
+
+    public RequestMappingConfig selectByUniqueCode(String uniqueCode) {
+        toolUtil.writeDebuggerLog("=======================查询配置列表=======================");
+        RequestMappingConfig requestMappingConfig = new RequestMappingConfig();
+        RecordSet recordSet = new RecordSet();
+        String querySql = "select id,workflow,requestUrl from "+configTableName+" where uniqueCode = ?";
+        toolUtil.writeDebuggerLog("执行查询的sql query mainRequestMappingConfig list sql >>>>"+querySql+" uniqueCode >>"+uniqueCode);
+        recordSet.executeQuery(querySql,uniqueCode);
+        if(recordSet.next()){
+            int mainId = Util.getIntValue(recordSet.getString("id"));
+            String workflow = Util.null2String(recordSet.getString("workflow"));
+            String requestUrl = Util.null2String(recordSet.getString("requestUrl"));
+            requestMappingConfig.setRequestUrl(requestUrl);
+            requestMappingConfig.setWorkflow(workflow);
+            this.setDetailMapping(mainId,requestMappingConfig);
+        }
+        return requestMappingConfig;
+    }
+
+    public RequestMappingConfig selectByUniqueCodeNew(String uniqueCode,String wfid) {
+        toolUtil.writeDebuggerLog("=======================查询配置列表=======================");
+        String allwfid = WorkflowVersion.getVersionStringByWfid(wfid+"");
+        RequestMappingConfig requestMappingConfig = new RequestMappingConfig();
+        requestMappingConfig.setWorkflow(wfid);
+        RecordSet recordSet = new RecordSet();
+        String querySql = "select id,workflow,requestUrl from "+configTableName+" where uniqueCode = ? and workflow in("+allwfid+")";
+        toolUtil.writeDebuggerLog("执行查询的sql query mainRequestMappingConfig list sql new>>>>"+querySql+" uniqueCode >>"+uniqueCode);
+        recordSet.executeQuery(querySql,uniqueCode);
+        if(recordSet.next()){
+            int mainId = Util.getIntValue(recordSet.getString("id"));
+            //String workflow = Util.null2String(recordSet.getString("workflow"));
+            String requestUrl = Util.null2String(recordSet.getString("requestUrl"));
+            requestMappingConfig.setRequestUrl(requestUrl);
+            this.setDetailMapping(mainId,requestMappingConfig);
+        }
+        return requestMappingConfig;
+    }
+
+    /**
+     * 查询明细表的信息
+     * @param mainId 主表数据id
+     * @param requestMappingConfig 请求参数配置类
+     */
+    private void setDetailMapping(int mainId, RequestMappingConfig requestMappingConfig) {
+        //查询明细1的信息
+        RecordSet detail1RecordSet = new RecordSet();
+        String queryDetail1Sql = "select paramName,paramType,getValueType,dataSource,belongTo,workflowField,valueContext," +
+                " fv.id fieldId,fv.fieldname,fv.tablename,fv.indexdesc " +
+                " from "+configTableName+"_dt1 config " +
+                " left join workflow_field_table_view fv on config.workflowField = fv.id " +
+                " where mainid = ? ";
+        toolUtil.writeDebuggerLog("执行查询的明细1sql query detail1Sql  >>>>"+queryDetail1Sql+" mainId:"+mainId);
+        detail1RecordSet.executeQuery(queryDetail1Sql,mainId);
+        List<MappingDetail> mappingDetails = new ArrayList<>();
+        while (detail1RecordSet.next()){
+            MappingDetail mappingDetail = this.recordSetToEntityByEntity(detail1RecordSet, MappingDetail.class);
+            String getValueType = mappingDetail.getGetValueType();
+            //设置流程字段相关信息
+//            if("0".equals(getValueType) || "4".equals(getValueType)){
+                FieldMessage fieldMessage = this.recordSetToEntityByEntity(detail1RecordSet, FieldMessage.class);
+                mappingDetail.setFieldMassage(fieldMessage);
+//            }
+            mappingDetails.add(mappingDetail);
+        }
+        //查询明细2的信息
+        RecordSet detail2RecordSet = new RecordSet();
+        String queryDetail2Sql = "select paramName,belongTo,childType,dataSource,detailId from uf_request_config_dt2 where mainid = ?";
+        toolUtil.writeDebuggerLog("执行查询的明细sql query detail2Sql >>>>"+queryDetail2Sql+" mainId:"+mainId);
+        detail2RecordSet.executeQuery(queryDetail2Sql,mainId);
+        while (detail2RecordSet.next()){
+            MappingDetail mappingDetail = this.recordSetToEntityByColumn(detail2RecordSet, MappingDetail.class);
+            mappingDetail.setParamType("6");//设置参数类型为List
+            mappingDetails.add(mappingDetail);
+        }
+        //查询明细3的信息
+        RecordSet detail3RecordSet = new RecordSet();
+        String queryDetail3Sql = "select paramName,belongTo from uf_request_config_dt3 where mainid = ?";
+        toolUtil.writeDebuggerLog("执行查询的明细sql query detail3Sql >>>>"+queryDetail3Sql+" mainId:"+mainId);
+        detail3RecordSet.executeQuery(queryDetail3Sql,mainId);
+        while (detail3RecordSet.next()){
+            MappingDetail mappingDetail = this.recordSetToEntityByColumn(detail3RecordSet, MappingDetail.class);
+            mappingDetail.setParamType("5");//设置参数类型为Object
+            mappingDetails.add(mappingDetail);
+        }
+        requestMappingConfig.setConfigDetail(mappingDetails);
+        //查询明细4的信息
+//        RecordSet detail4RecordSet = new RecordSet();
+//        List<ResponseMapping> responseMappingList = new ArrayList<>();
+//        String queryDetail4Sql = "select responseFieldName,workflowField,mainOrDetail,detailTableId,workflowFieldName from uf_request_config_dt4 where mainid = ?";
+//        toolUtil.writeDebuggerLog("执行查询的明细sql query detail4Sql >>>>"+queryDetail4Sql+" mainId:"+mainId);
+//        detail4RecordSet.executeQuery(queryDetail4Sql,mainId);
+//        while (detail4RecordSet.next()){
+//            ResponseMapping responseMapping = this.recordSetToEntityByColumn(detail4RecordSet, ResponseMapping.class);
+//            responseMappingList.add(responseMapping);
+//        }
+//        requestMappingConfig.setResponseMappingList(responseMappingList);
+        requestMappingConfig.setConfigDetail(mappingDetails);
+    }
+
+    public  <T> T recordSetToEntityByColumn(RecordSet recordSet,Class<T> tClass){
+        T res = null;
+        try{
+            res = tClass.newInstance();
+            String[] columnNames = recordSet.getColumnName();
+            for (String columnName : columnNames) {
+                Field declaredField = tClass.getDeclaredField(columnName);
+                declaredField.setAccessible(true);
+                String value = recordSet.getString(columnName);
+                declaredField.set(res,value);
+            }
+        }catch (Exception e){
+            toolUtil.writeDebuggerLog("转换成实体类异常："+e);
+        }
+        return res;
+    }
+
+    public  <T> T   recordSetToEntityByEntity(RecordSet recordSet,Class<T> tClass){
+        T res = null;
+        try{
+            res = tClass.newInstance();
+            Field[] declaredFields = tClass.getDeclaredFields();
+            for (Field declaredField : declaredFields) {
+                declaredField.setAccessible(true);
+                String name = declaredField.getName();
+                String value = Util.null2String(recordSet.getString(name));
+                declaredField.set(res,value);
+            }
+        }catch (Exception e){
+            toolUtil.writeDebuggerLog("转换成实体类异常："+e);
+        }
+        return res;
+    }
+
+
+}
diff --git a/src/main/youhong_ai_old_src/com/api/xiao/commons/config/entity/FieldMessage.java b/src/main/youhong_ai_old_src/com/api/xiao/commons/config/entity/FieldMessage.java
new file mode 100644
index 0000000..e68d0c0
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/xiao/commons/config/entity/FieldMessage.java
@@ -0,0 +1,16 @@
+package com.api.xiao.commons.config.entity;
+
+import lombok.Data;
+
+/**
+ * @author XiaoBokang
+ * @create 2021/12/31 10:15
+ */
+
+@Data
+public class FieldMessage {
+    private String fieldId;
+    private String fieldName;
+    private String indexDesc;
+    private String tableName;
+}
diff --git a/src/main/youhong_ai_old_src/com/api/xiao/commons/config/entity/MappingDetail.java b/src/main/youhong_ai_old_src/com/api/xiao/commons/config/entity/MappingDetail.java
new file mode 100644
index 0000000..f1ff9f1
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/xiao/commons/config/entity/MappingDetail.java
@@ -0,0 +1,25 @@
+package com.api.xiao.commons.config.entity;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author XiaoBokang
+ * @create 2021/12/28 17:45
+ */
+
+@Data
+public class MappingDetail {
+    private String paramName;
+    private String paramType;
+    private String getValueType;
+    private String childType;
+    private String dataSource;
+    private String detailId;
+    private String belongTo;
+    private String workflowField;
+    private String valueContext;
+    private List<MappingDetail> childList;
+    private FieldMessage fieldMassage;
+}
diff --git a/src/main/youhong_ai_old_src/com/api/xiao/commons/config/entity/RequestMappingConfig.java b/src/main/youhong_ai_old_src/com/api/xiao/commons/config/entity/RequestMappingConfig.java
new file mode 100644
index 0000000..b19b546
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/xiao/commons/config/entity/RequestMappingConfig.java
@@ -0,0 +1,19 @@
+package com.api.xiao.commons.config.entity;
+
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author XiaoBokang
+ * @create 2021/12/28 17:43
+ */
+
+@Data
+public class RequestMappingConfig {
+    private String workflow;
+    private String requestUrl;
+    private List<MappingDetail> configDetail;
+    private List<ResponseMapping> responseMappingList;
+}
diff --git a/src/main/youhong_ai_old_src/com/api/xiao/commons/config/entity/RequestParam.java b/src/main/youhong_ai_old_src/com/api/xiao/commons/config/entity/RequestParam.java
new file mode 100644
index 0000000..f84efbf
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/xiao/commons/config/entity/RequestParam.java
@@ -0,0 +1,19 @@
+package com.api.xiao.commons.config.entity;
+
+import lombok.Data;
+
+import java.util.Map;
+
+/**
+ * <p>请求参数数据</p>
+ * <p>create 2022/6/21 18:32</p>
+ *
+ * @author ayh
+ */
+
+@Data
+public class RequestParam {
+    private String detailId;
+    private String mainId;
+    private Map<String,Object> param;
+}
diff --git a/src/main/youhong_ai_old_src/com/api/xiao/commons/config/entity/ResponseMapping.java b/src/main/youhong_ai_old_src/com/api/xiao/commons/config/entity/ResponseMapping.java
new file mode 100644
index 0000000..918258f
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/xiao/commons/config/entity/ResponseMapping.java
@@ -0,0 +1,17 @@
+package com.api.xiao.commons.config.entity;
+
+import lombok.Data;
+
+/**
+ * @author XiaoBokang
+ * @create 2022/4/12 22:28
+ */
+
+@Data
+public class ResponseMapping {
+    private String responseFieldName;
+    private String workflowField;
+    private String mainOrDetail;
+    private String detailTableId;
+    private String workflowFieldName;
+}
diff --git a/src/main/youhong_ai_old_src/com/api/xiao/commons/config/service/DealWithMapping.java b/src/main/youhong_ai_old_src/com/api/xiao/commons/config/service/DealWithMapping.java
new file mode 100644
index 0000000..63257c3
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/xiao/commons/config/service/DealWithMapping.java
@@ -0,0 +1,639 @@
+package com.api.xiao.commons.config.service;
+
+import aiyh.utils.excention.CustomerException;
+import aiyh.utils.zwl.common.ToolUtil;
+import com.alibaba.fastjson.JSON;
+import com.api.xiao.commons.config.dao.ConfigMappingCMD;
+import com.api.xiao.commons.config.entity.FieldMessage;
+import com.api.xiao.commons.config.entity.MappingDetail;
+import com.api.xiao.commons.config.entity.RequestMappingConfig;
+import com.api.xiao.commons.config.entity.RequestParam;
+import com.api.xiao.commons.exception.ValueDealException;
+import com.api.xiao.commons.utils.CustomerValueHandler;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import weaver.conn.RecordSet;
+import weaver.file.ImageFileManager;
+import weaver.general.Util;
+
+import javax.script.ScriptEngine;
+import javax.script.ScriptEngineManager;
+import javax.script.ScriptException;
+import java.io.InputStream;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+import java.security.SecureRandom;
+import java.text.DecimalFormat;
+import java.text.SimpleDateFormat;
+import java.util.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * @author XiaoBokang
+ * @create 2021/12/29 10:10
+ */
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class DealWithMapping extends ToolUtil {
+
+    private final ConfigMappingCMD mappingCMD = new ConfigMappingCMD();
+    private String mainTable;
+    private String forMatString;
+    private ScriptEngineManager engineManager = new ScriptEngineManager();
+    private ScriptEngine nashorn = engineManager.getEngineByName("nashorn");
+
+    private List<String> fileNames = new ArrayList<>();
+    private List<InputStream> fileInputStreams = new ArrayList<>();
+
+
+//    /**
+//     * 获取参数配置树形列表
+//     * @param workflowId 流程id
+//     * @return
+//     */
+//    public RequestMappingConfig treeDealWith(String workflowId){
+//
+//        this.writeDebuggerLog("============== 根据workflowId查询请求配置树形列表 treeDealWith begin =================");
+//        RequestMappingConfig tempConfig = mappingCMD.selectMsg(workflowId);
+//        this.writeDebuggerLog("查询到的请求配置列表 query RequestMappingConfig list >>>"+ JSON.toJSONString(tempConfig));
+//        List<MappingDetail> mappingDetails = tempConfig.getConfigDetail();
+//        List<MappingDetail> subMappingDetailList = new ArrayList<>();
+//        //过滤出指定节点的子节点，并返回除去子节点之外的节点列表
+//        List<MappingDetail> collect = this.filterList(mappingDetails, subMappingDetailList,"rootNode");
+//        //将数据库查询出来的信息赋值给要返回的配置信息树
+//        RequestMappingConfig requestMappingConfig = new RequestMappingConfig();
+//        requestMappingConfig.setRequestUrl(tempConfig.getRequestUrl());
+//        requestMappingConfig.setWorkflow(tempConfig.getWorkflow());
+//        List<MappingDetail> mappingDetailList = new ArrayList<>();
+//        //循环判断根节点
+//        for (MappingDetail mappingDetail : collect) {
+//            String paramType = mappingDetail.getParamType();
+//            if("5".equals(paramType) || "6".equals(paramType)){
+//                List<MappingDetail> childList = new ArrayList<>();
+//                mappingDetail.setChildList(childList);
+//                this.getChildList(mappingDetail,mappingDetails,childList);
+//            }
+//            mappingDetailList.add(mappingDetail);
+//        }
+//        requestMappingConfig.setConfigDetail(mappingDetailList);
+//        this.writeDebuggerLog("通过处理后得到的树形参数列表 deal with tree >>>"+JSON.toJSONString(requestMappingConfig));
+//        return requestMappingConfig;
+//    }
+
+    /**
+     * 获取参数配置树形列表
+     * @param workflowId 流程id
+     * @return
+     */
+    public RequestMappingConfig treeDealWith(String workflowId){
+        this.writeDebuggerLog("============== 根据workflowId查询请求配置树形列表 treeDealWith begin =================");
+        RequestMappingConfig tempConfig = mappingCMD.selectMsg(workflowId);
+        return this.dealWith(tempConfig);
+    }
+
+    /**
+     * 将配置参数通过唯一标识查询处理成树形结构
+     * @param uniqueCode 唯一标识
+     * @return
+     */
+    public RequestMappingConfig treeDealWithUniqueCode(String uniqueCode){
+        this.writeDebuggerLog("============== 根据uniqueCode查询请求配置树形列表 treeDealWith begin =================");
+        RequestMappingConfig tempConfig = mappingCMD.selectByUniqueCode(uniqueCode);
+        return this.dealWith(tempConfig);
+    }
+
+    /**
+     * 将配置参数通过唯一标识查询处理成树形结构
+     * @param uniqueCode 唯一标识
+     * @return
+     */
+    public RequestMappingConfig treeDealWithUniqueCodeNew(String uniqueCode,String wfid){
+        this.writeDebuggerLog("============== 根据uniqueCode查询请求配置树形列表 treeDealWith begin =================");
+        RequestMappingConfig tempConfig = mappingCMD.selectByUniqueCodeNew(uniqueCode,wfid);
+        return this.dealWith(tempConfig);
+    }
+
+    /**
+     * 处理成树形结构
+     * @param tempConfig 配置列表
+     * @return
+     */
+    public RequestMappingConfig dealWith(RequestMappingConfig tempConfig){
+        this.writeDebuggerLog("查询到的请求配置列表 query RequestMappingConfig list >>>"+ JSON.toJSONString(tempConfig));
+        List<MappingDetail> mappingDetails = tempConfig.getConfigDetail();
+        List<MappingDetail> subMappingDetailList = new ArrayList<>();
+        //过滤出指定节点的子节点，并返回除去子节点之外的节点列表
+        List<MappingDetail> collect = this.filterList(mappingDetails, subMappingDetailList,"rootNode");
+        //将数据库查询出来的信息赋值给要返回的配置信息树
+        RequestMappingConfig requestMappingConfig = new RequestMappingConfig();
+        requestMappingConfig.setRequestUrl(tempConfig.getRequestUrl());
+        requestMappingConfig.setWorkflow(tempConfig.getWorkflow());
+        requestMappingConfig.setResponseMappingList(tempConfig.getResponseMappingList());
+        List<MappingDetail> mappingDetailList = new ArrayList<>();
+        //循环判断根节点
+        for (MappingDetail mappingDetail : collect) {
+            String paramType = mappingDetail.getParamType();
+            if("5".equals(paramType) || "6".equals(paramType)){
+                List<MappingDetail> childList = new ArrayList<>();
+                mappingDetail.setChildList(childList);
+                this.getChildList(mappingDetail,mappingDetails,childList);
+            }
+            mappingDetailList.add(mappingDetail);
+        }
+        requestMappingConfig.setConfigDetail(mappingDetailList);
+        this.writeDebuggerLog("通过处理后得到的树形参数列表 deal with tree >>>"+JSON.toJSONString(requestMappingConfig));
+        return requestMappingConfig;
+    }
+
+    /**
+     * 通过递归的方式设置子节点信息
+     * @param mappingDetail 当前节点
+     * @param mappingDetailList 所有节点
+     * @param childList 子节点
+     */
+    private void getChildList(MappingDetail mappingDetail, List<MappingDetail> mappingDetailList, List<MappingDetail> childList) {
+        String paramName = mappingDetail.getParamName();
+        String paramType = mappingDetail.getParamType();
+        if("5".equals(paramType) || "6".equals(paramType)){
+            List<MappingDetail> list = new ArrayList<>();
+            mappingDetail.setChildList(list);
+            List<MappingDetail> subMappingDetailList = new ArrayList<>();
+            List<MappingDetail> collect = this.filterList(mappingDetailList,subMappingDetailList, paramName);
+            for (MappingDetail detail : collect) {
+                this.getChildList(detail,subMappingDetailList,list);
+            }
+        }
+        childList.add(mappingDetail);
+    }
+
+    /**
+     * 过滤list集合信息
+     * @param mappingDetailList 原始集合
+     * @param subMappingDetailList 过滤后集合
+     * @param paramName 过滤信息
+     * @return
+     */
+    private List<MappingDetail> filterList(List<MappingDetail> mappingDetailList, List<MappingDetail> subMappingDetailList, String paramName){
+        List<MappingDetail> tempList = new ArrayList<>();
+        for (MappingDetail mappingDetail : mappingDetailList) {
+            String belongTo = mappingDetail.getBelongTo();
+            if(paramName.equals(belongTo)){
+                tempList.add(mappingDetail);
+            }else {
+                subMappingDetailList.add(mappingDetail);
+            }
+        }
+        return tempList;
+    }
+
+    /**
+     * 解析请求参数配置树，转换成请求参数
+     * @param recordSet 主表数据结果集
+     * @param requestMappingConfig 配置树
+     * @return
+     */
+    public Map<String,Object> getRequestParam(RecordSet recordSet, RequestMappingConfig requestMappingConfig){
+        this.fileInputStreams.clear();
+        this.fileNames.clear();
+        Map<String,Object> requestParam = new HashMap<>();
+        List<MappingDetail> configDetail = requestMappingConfig.getConfigDetail();
+        this.objValueDeal(recordSet,null,configDetail,requestParam,0);
+        return requestParam;
+    }
+
+    /**
+     * @author aiyh edit by aiyh in 2022-06-21
+     * 解析请求参数配置书，转换成请求参数
+     * @param recordSet 获取主表数据的函数
+     * @param recordSetDetail 明细数据
+     * @param requestMappingConfig 配置数据
+     * @return 请求参数
+     */
+    public List<RequestParam> getRequestParams(RecordSet recordSet, RecordSet recordSetDetail, RequestMappingConfig requestMappingConfig){
+        this.fileInputStreams.clear();
+        this.fileNames.clear();
+        List<RequestParam> results = new ArrayList<>();
+        int n = 1;
+        while (recordSetDetail.next()){
+            Map<String,Object> requestParamMap = new HashMap<>();
+            List<MappingDetail> configDetail = requestMappingConfig.getConfigDetail();
+            this.objValueDeal(recordSet,recordSetDetail,configDetail,requestParamMap,n);
+            RequestParam requestParam = new RequestParam();
+            requestParam.setMainId(recordSet.getString("id"));
+            requestParam.setDetailId(recordSetDetail.getString("id"));
+            requestParam.setParam(requestParamMap);
+            results.add(requestParam);
+            n ++;
+        }
+        return results;
+    }
+
+
+    /**
+     * 对象类型处理
+     * @param recordSet 主表数据结果集
+     * @param detailRecordSet 明细数据结果集
+     * @param configDetail 配置列表集合
+     * @param requestParam 节点参数
+     */
+    private void objValueDeal(RecordSet recordSet, RecordSet detailRecordSet, List<MappingDetail> configDetail, Map<String, Object> requestParam,int n){
+        for (MappingDetail mappingDetail : configDetail) {
+            String paramType = mappingDetail.getParamType();
+            String paramName = mappingDetail.getParamName();
+            //5为对象类型
+            if("5".equals(paramType)){
+                List<MappingDetail> childList = mappingDetail.getChildList();
+                Map<String,Object> map = new HashMap<>();
+                requestParam.put(paramName,map);
+                this.objValueDeal(recordSet,detailRecordSet,childList,map,n);
+            }
+            //6为List类型
+            else if("6".equals(paramType)){
+                String childType = mappingDetail.getChildType();
+                List<MappingDetail> childList = mappingDetail.getChildList();
+                List<Object> list = new ArrayList<>();
+                requestParam.put(paramName,list);
+                this.listValueDeal(recordSet,childList,list,mappingDetail);
+            }else{
+                Object value = this.normalValueDeal(recordSet,detailRecordSet,mappingDetail,n);
+                requestParam.put(paramName,value);
+            }
+        }
+    }
+
+    /**
+     * 普通类型处理
+     * @param main 主表数据结果集
+     * @param detail 明细数据结果集
+     * @param mappingDetail 配置节点信息
+     * @return
+     */
+    private Object normalValueDeal(RecordSet main, RecordSet detail, MappingDetail mappingDetail, int n){
+
+        String paramType = mappingDetail.getParamType();
+        String getValueType = mappingDetail.getGetValueType();
+        String valueContext = mappingDetail.getValueContext();
+        String childSource = mappingDetail.getDataSource();
+        String paramName = mappingDetail.getParamName();
+        Object value = "";
+        switch (getValueType){
+            //流程字段
+            case "0" : {
+                FieldMessage fieldMassage = mappingDetail.getFieldMassage();
+                String fieldName = fieldMassage.getFieldName();
+                if("1".equals(childSource)){
+                    value = Util.null2String(detail.getString(fieldName));
+                }else{
+                    value = Util.null2String(main.getString(fieldName));
+                }
+            }break;
+            //默认值
+            case "1" : {
+                value = valueContext;
+            }break;
+            //当前时间
+            case "3" : {
+                value = new Date();
+            }break;
+            //自定义sql查询
+            case "4" : {
+                FieldMessage fieldMassage = mappingDetail.getFieldMassage();
+                String tempValue = "";
+                if(fieldMassage != null) {
+                    String fieldName = fieldMassage.getFieldName();
+                    if("1".equals(childSource)){
+                        tempValue = Util.null2String(detail.getString(fieldName));
+                    }else{
+                        tempValue = Util.null2String(main.getString(fieldName));
+                    }
+                }
+                String requestId = Util.null2String(main.getString("requestid"));
+                tempValue = "'" + tempValue + "'";
+                value = this.getValueByChangeRule(valueContext,tempValue,requestId);
+            }break;
+            //requestId
+            case "5" : {
+                value = Util.null2String(main.getString("requestid"));
+            }break;
+            //数据id
+            case "6" : {
+                if("1".equals(childSource)){
+                    value = Util.null2String(detail.getString("id"));
+                }else{
+                    value = Util.null2String(main.getString("id"));
+                }
+//                value = Util.null2String(main.getString("id"));
+            }break;
+            //随机数
+            case "7" : {
+                int bit = Util.getIntValue(valueContext,10);
+                value = this.getGUID(bit);
+            }break;
+            //附件
+            case "8" : {
+                int imageFileId = Util.getIntValue(String.valueOf(value));
+                InputStream inputStream = ImageFileManager.getInputStreamById(imageFileId);
+                String fileName = this.getFileNameById(imageFileId);
+                fileInputStreams.add(inputStream);
+                fileNames.add(fileName);
+            }break;
+            case "9":
+                value = String.valueOf(UUID.randomUUID());
+                break;
+            case "10":
+//                TODO 序号
+
+                String expression = valueContext.replace("{?}", String.valueOf(n));
+                Object eval = null;
+                try {
+                    ScriptEngineManager engineManager = new ScriptEngineManager();
+                    ScriptEngine js = engineManager.getEngineByExtension("js");
+                     eval = js.eval(expression);
+                } catch (ScriptException e) {
+                    aiyh.utils.Util.getLogger().error("执行表达式" + expression + "失败！\n"
+                            + aiyh.utils.Util.getErrString(e));
+                    throw  new CustomerException("执行表达式" + expression + "失败！");
+                }
+                value = String.valueOf(eval);
+                break;
+            case "11":
+//                表达式
+                FieldMessage fieldMassage = mappingDetail.getFieldMassage();
+                String fieldName = fieldMassage.getFieldName();
+                if("1".equals(childSource)){
+                    value = Util.null2String(detail.getString(fieldName));
+                }else{
+                    value = Util.null2String(main.getString(fieldName));
+                }
+                if(valueContext == null || "".equals(valueContext)){
+                    return value;
+                }
+                String expression1 = valueContext.replace("{?}", String.valueOf(value));
+                expression1= aiyh.utils.Util.sbc2dbcCase(expression1);
+                String pattern =  "main\\.(?<key>\\w+)+";
+                Pattern compile = Pattern.compile(pattern);
+                Matcher test = compile.matcher(expression1);
+                while(test.find()){
+                    String key = test.group("key");
+                    String keyValue =  Util.null2String(main.getString(key));
+                    expression1 = expression1.replaceFirst(pattern,keyValue);
+                }
+
+                pattern =  "detail\\.(?<key>\\w+)+";
+                compile = Pattern.compile(pattern);
+                test = compile.matcher(expression1);
+                while(test.find()){
+                    String key = test.group("key");
+                    String keyValue = Util.null2String(detail.getString(key));
+                    expression1 = expression1.replaceFirst(pattern,keyValue);
+                }
+
+                pattern =  "sql\\{(?<key>([\\s\\S])+?)}";
+                compile = Pattern.compile(pattern);
+                test = compile.matcher(expression1);
+                while(test.find()){
+                    String key = test.group("key");
+                    String requestId = Util.null2String(main.getString("requestid"));
+                    String keyValue = this.getValueByChangeRule(key,"",requestId);
+                    expression1 = expression1.replaceFirst(pattern,keyValue);
+                }
+
+                Object eval1 = null;
+                try {
+                    eval1 = nashorn.eval(expression1);
+                } catch (ScriptException e) {
+                    aiyh.utils.Util.getLogger().error("执行表达式" + expression1 + "失败！\n"
+                            + aiyh.utils.Util.getErrString(e));
+                    throw  new CustomerException("执行表达式" + expression1 + "失败！");
+                }
+                value = String.valueOf(eval1);
+                break;
+            case "12":{
+//                自定义处理
+                fieldMassage = mappingDetail.getFieldMassage();
+                fieldName = fieldMassage.getFieldName();
+                if("1".equals(childSource)){
+                    value = Util.null2String(detail.getString(fieldName));
+                }else{
+                    value = Util.null2String(main.getString(fieldName));
+                }
+
+                if(valueContext != null && !"".equals(valueContext)){
+                    Class<?> aClass = null;
+                    try {
+                        aClass = Class.forName(valueContext);
+                    } catch (ClassNotFoundException e) {
+                        e.printStackTrace();
+                    }
+                    Constructor<?> constructor = null;
+                    try {
+                        constructor = aClass.getConstructor();
+                    } catch (NoSuchMethodException e) {
+                        e.printStackTrace();
+                    }
+                    Object o = null;
+                    try {
+                        o = constructor.newInstance();
+                    } catch (InstantiationException | IllegalAccessException | InvocationTargetException e) {
+                        e.printStackTrace();
+                    }
+                    if(o instanceof CustomerValueHandler){
+                        return ((CustomerValueHandler)o).getValue(main,detail);
+                    }
+                }
+            }break;
+            default:break;
+        }
+        switch (paramType){
+            //String类型
+            case "0" : {
+                value = Util.null2String(String.valueOf(value));
+            }break;
+            //int类型
+            case "1" : {
+                value = Util.getIntValue(String.valueOf(value));
+            }break;
+            //double类型
+            case "2" : {
+                try {
+                    if(valueContext != null && !"".equals(valueContext)){
+                        value = (new DecimalFormat(valueContext)).format(Double.parseDouble(String.valueOf(value)));
+                    }else {
+                        value = Util.getDoubleValue(String.valueOf(value));
+                    }
+                }catch (Exception e){
+                    aiyh.utils.Util.getLogger().error("格式化小数出错，无法将 " + value + "转换为 " + valueContext + "格式！\n" + aiyh.utils.Util.getErrString(e));
+                    throw  new CustomerException("格式化小数出错，无法将 " + value + "转换为 " + valueContext + "格式！",e);
+                }
+            }break;
+            //日期类型
+            case "3" : {
+                if(! (value instanceof Date)){
+                    value = aiyh.utils.Util.parseDate(String.valueOf(value));
+                }
+                try {
+                    String format = "yyyy-MM-dd";
+                    if(valueContext != null && !"".equals(valueContext)){
+                        format = valueContext;
+                    }
+                    value = this.diyDateFortMat((Date) value,format);
+                }catch (Exception e){
+                    this.writeDebuggerLog("时间处理异常："+e);
+                    throw new ValueDealException("时间处理异常：参数>>"+paramName);
+                }
+
+            }break;
+            //时间日期类型
+            case "4" : {
+                try {
+                    String format = "yyyy-MM-dd HH:mm:ss";
+                    if(valueContext != null && !"".equals(valueContext)){
+                        format = valueContext;
+                    }
+                    value = this.diyDateFortMat((Date) value,format);
+                }catch (Exception e){
+                    this.writeDebuggerLog("时间处理异常："+e);
+                    throw new ValueDealException("时间处理异常：参数>>"+paramName+" 异常信息："+e);
+                }
+            }break;
+            //自定义时间格式化类型
+            case "7" : {
+                try {
+                    value = this.diyDateFortMat((Date) value,forMatString);
+                }catch (Exception e){
+                    this.writeDebuggerLog("时间处理异常："+e);
+                    throw new ValueDealException("时间处理异常：参数>>"+paramName+" 异常信息："+e.getMessage());
+                }
+            }break;
+            //时间戳类型
+            case "8" : {
+                try{
+                    Date tempDate = (Date) value;
+                    value = tempDate.getTime();
+                }catch (Exception e){
+                    this.writeDebuggerLog("时间处理异常："+e);
+                    throw new ValueDealException("时间处理异常：参数>>"+paramName+" 异常信息："+e.getMessage());
+                }
+            }break;
+            default:break;
+        }
+
+        return value;
+    }
+
+    /**
+     * list类型处理
+     * @param recordSet 主表数据集
+     * @param childList 子节点配置列表
+     * @param list 子节点参数
+     * @param detail 当前节点
+     */
+    private void listValueDeal(RecordSet recordSet, List<MappingDetail> childList, List<Object> list, MappingDetail detail) throws ValueDealException {
+        String childSource = detail.getDataSource();
+        String childType = detail.getChildType();
+        if("1".equals(childSource)){
+            String id = recordSet.getString("id");
+            int mainId = Util.getIntValue(recordSet.getString("id"));
+            int detailId = Util.getIntValue(detail.getDetailId());
+            String detailTableName = mainTable+"_dt"+detailId;
+            String querySql = "select * from "+detailTableName+" where mainid = ?";
+            RecordSet recordSetDetail = new RecordSet();
+            recordSetDetail.executeQuery(querySql,mainId);
+            int n = 1;
+            while(recordSetDetail.next()){
+                if("0".equals(childType)) {
+                    Map<String, Object> item = new HashMap<>();
+                    list.add(item);
+                    this.objValueDeal(recordSet, recordSetDetail, childList, item,n);
+                }else {
+                    for (MappingDetail mappingDetail : childList) {
+                        Object o = this.normalValueDeal(recordSet, recordSetDetail, mappingDetail,n);
+                        list.add(o);
+                    }
+                }
+                n ++;
+            }
+        }else{
+            if("0".equals(childType)) {
+                Map<String, Object> item = new HashMap<>();
+                list.add(item);
+                this.objValueDeal(recordSet, null, childList, item,0);
+            }else {
+                int n = 0;
+                for (MappingDetail mappingDetail : childList) {
+                    Object o = this.normalValueDeal(recordSet, null, mappingDetail,n ++);
+                    list.add(o);
+                }
+            }
+//            for (MappingDetail mappingDetail : childList) {
+//                Object o = this.normalValueDeal(recordSet, null, mappingDetail);
+//                list.add(o);
+//            }
+        }
+    }
+
+    /**
+     * 自定义时间格式化
+     * @param date 日期
+     * @param tempStr 格式化字符串
+     * @return
+     */
+    private String diyDateFortMat(Date date,String tempStr){
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat(tempStr);
+        return simpleDateFormat.format(date);
+    }
+
+    private String getGUID(int bit) {
+
+        StringBuilder uid = new StringBuilder();
+
+        //产生16位的强随机数
+
+        Random rd = new SecureRandom();
+
+        for (int i = 0; i < bit; i++) {
+
+            //产生0-2的3位随机数
+            int type = rd.nextInt(3);
+
+            switch (type){
+                case 0:
+                    //0-9的随机数
+                    uid.append(rd.nextInt(10));
+                    break;
+                case 1:
+                    //ASCII在65-90之间为大写,获取大写随机
+                    uid.append((char)(rd.nextInt(25)+65));
+                    break;
+                case 2:
+                    //ASCII在97-122之间为小写，获取小写随机
+                    uid.append((char)(rd.nextInt(25)+97));
+                    break;
+                default:
+                    break;
+            }
+        }
+        return uid.toString();
+    }
+
+    /**
+     * 通过文件id获取文件名
+     * @param fileId 文件id
+     * @return
+     */
+    public String getFileNameById(int fileId){
+        String fileName = "";
+        String querySql = "select filename from docimagefile where imgagefileid = ?";
+        RecordSet recordSet = new RecordSet();
+        recordSet.executeQuery(querySql,fileId);
+        if(recordSet.next()){
+            fileName = recordSet.getString("filename");
+        }
+        return fileName;
+    }
+
+}
diff --git a/src/main/youhong_ai_old_src/com/api/xiao/commons/exception/RequestException.java b/src/main/youhong_ai_old_src/com/api/xiao/commons/exception/RequestException.java
new file mode 100644
index 0000000..0f3b778
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/xiao/commons/exception/RequestException.java
@@ -0,0 +1,21 @@
+package com.api.xiao.commons.exception;
+
+/**
+ * @author XiaoBokang
+ * @create 2022/1/12 11:06
+ */
+
+public class RequestException extends RuntimeException{
+    public RequestException(String message){
+        super(message);
+    }
+
+    public RequestException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    @Override
+    public synchronized Throwable fillInStackTrace() {
+        return super.fillInStackTrace();
+    }
+}
diff --git a/src/main/youhong_ai_old_src/com/api/xiao/commons/exception/ValueDealException.java b/src/main/youhong_ai_old_src/com/api/xiao/commons/exception/ValueDealException.java
new file mode 100644
index 0000000..af18e22
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/xiao/commons/exception/ValueDealException.java
@@ -0,0 +1,22 @@
+package com.api.xiao.commons.exception;
+
+/**
+ * @author XiaoBokang
+ * @create 2022/1/4 9:50
+ */
+
+public class ValueDealException extends RuntimeException{
+
+    public ValueDealException(String message){
+        super(message);
+    }
+
+    public ValueDealException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    @Override
+    public synchronized Throwable fillInStackTrace() {
+        return super.fillInStackTrace();
+    }
+}
diff --git a/src/main/youhong_ai_old_src/com/api/xiao/commons/utils/CustomerValueHandler.java b/src/main/youhong_ai_old_src/com/api/xiao/commons/utils/CustomerValueHandler.java
new file mode 100644
index 0000000..6a174cf
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/xiao/commons/utils/CustomerValueHandler.java
@@ -0,0 +1,19 @@
+package com.api.xiao.commons.utils;
+
+import aiyh.utils.Util;
+import weaver.conn.RecordSet;
+
+/**
+ * <p>自定义值处理方式接口</p>
+ * <p>create 2022/7/4 11:51</p>
+ *
+ * @author ayh
+ */
+
+public interface CustomerValueHandler {
+    public Object getValue(RecordSet main, RecordSet detail);
+
+    default String getRsValue(RecordSet rs,String fieldName){
+        return Util.null2String(rs.getString(fieldName));
+    }
+}
diff --git a/src/main/youhong_ai_old_src/com/api/xiao/commons/utils/JsonResult.java b/src/main/youhong_ai_old_src/com/api/xiao/commons/utils/JsonResult.java
new file mode 100644
index 0000000..4ed341a
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/xiao/commons/utils/JsonResult.java
@@ -0,0 +1,70 @@
+package com.api.xiao.commons.utils;
+
+import com.alibaba.fastjson.JSONObject;
+
+
+/**
+ * @author XiaoBokang
+ * @create 2021/9/9 19:33
+ */
+
+public class JsonResult {
+
+    private Integer code;
+    private String message;
+    private Object Data;
+
+    public JsonResult(Integer code, String message, Object data) {
+        this.code = code;
+        this.message = message;
+        Data = data;
+    }
+
+    public static String success(String message){
+        return JSONObject.toJSONString(new JsonResult(200,message,null));
+    }
+    public static String success(){
+        return JSONObject.toJSONString(new JsonResult(200,"success",null));
+    }
+    public static String successData(String message,Object data){
+        return JSONObject.toJSONString(new JsonResult(200,message,data));
+    }
+    public static String successData(Object data){
+        return JSONObject.toJSONString(new JsonResult(200,"success",data));
+    }
+
+    public static String error(int code,String message){
+        return JSONObject.toJSONString(new JsonResult(code,message,null));
+    }
+    public static String error(String message){
+        return JSONObject.toJSONString(new JsonResult(500,message,null));
+    }
+    public static String error(){
+        return JSONObject.toJSONString(new JsonResult(500,"fail",null));
+    }
+
+
+    public Integer getCode() {
+        return code;
+    }
+
+    public void setCode(Integer code) {
+        this.code = code;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+
+    public Object getData() {
+        return Data;
+    }
+
+    public void setData(Object data) {
+        Data = data;
+    }
+}
diff --git a/src/main/youhong_ai_old_src/com/api/xiao/commons/utils/LogUtil.java b/src/main/youhong_ai_old_src/com/api/xiao/commons/utils/LogUtil.java
new file mode 100644
index 0000000..111ebd6
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/xiao/commons/utils/LogUtil.java
@@ -0,0 +1,44 @@
+package com.api.xiao.commons.utils;
+
+import org.apache.log4j.*;
+
+import java.io.File;
+
+/**
+ * @author XiaoBokang
+ * @create 2022/3/3 14:16
+ */
+
+public class LogUtil {
+
+    private static volatile Logger log = null;
+    /**
+     * 获取日志对象
+     *
+     * @return 日志对象
+     */
+    public static Logger getLogger() {
+        if (log == null) {
+            synchronized (LogUtil.class) {
+                if (log == null) {
+                    DailyRollingFileAppender appender = new DailyRollingFileAppender();
+                    log = Logger.getLogger("xbk_cus");
+                    appender.setName("xbk_cus");
+                    appender.setEncoding("UTF-8");
+                    appender.setDatePattern("'_'yyyyMMdd'.log'");
+                    appender.setFile(weaver.general.GCONST.getLogPath() + "cus" + File.separator + "util_cus" + File.separator + "cus.log");
+                    appender.setThreshold(Priority.DEBUG);
+                    appender.setLayout(new PatternLayout("[%-5p] [%d{yyyy-MM-dd HH:mm:ss,SSS}] [%r] [Thread:%t][%F.%M:%L] ==> : %m %x %n"));
+                    appender.setAppend(true);
+                    appender.activateOptions();
+                    log.addAppender(appender);
+                    boolean enableDebug = true;
+                    if (!enableDebug) {
+                        log.setLevel(Level.INFO);
+                    }
+                }
+            }
+        }
+        return log;
+    }
+}
diff --git a/src/main/youhong_ai_old_src/com/api/xiao/commons/utils/PreMap.java b/src/main/youhong_ai_old_src/com/api/xiao/commons/utils/PreMap.java
new file mode 100644
index 0000000..6eee303
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/xiao/commons/utils/PreMap.java
@@ -0,0 +1,26 @@
+package com.api.xiao.commons.utils;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @author XiaoBokang
+ * @create 2021/8/20 14:01
+ */
+
+public class PreMap extends HashMap<String,Object> implements Map<String,Object> {
+
+    public PreMap(){
+        super();
+    }
+
+    public static PreMap create(){
+        return new PreMap();
+    }
+
+    @Override
+    public PreMap put(String key, Object value){
+        super.put(key,value);
+        return this;
+    }
+}
diff --git a/src/main/youhong_ai_old_src/com/api/xiao/commons/utils/PropUtil.java b/src/main/youhong_ai_old_src/com/api/xiao/commons/utils/PropUtil.java
new file mode 100644
index 0000000..c0a20ea
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/xiao/commons/utils/PropUtil.java
@@ -0,0 +1,57 @@
+package com.api.xiao.commons.utils;
+
+import weaver.common.util.string.StringUtil;
+import weaver.general.GCONST;
+
+import java.io.*;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+
+/**
+ * @author XiaoBokang
+ * @create 2022/3/10 11:13
+ */
+
+public class PropUtil {
+    /**
+     * 通过文件名获取到对应的配置文件map对象
+     * @param fileName prop/文件夹下的文件名（不包含.properties）
+     * @return 配置文件对应的map对象
+     */
+    public static Map<String, Object> getProperties2Map(String fileName) {
+        String propertyPath = GCONST.getPropertyPath();
+        if (StringUtil.isNullOrEmpty(fileName)) {
+            return null;
+        }
+        if (fileName.contains(".properties")) {
+            fileName = fileName.replace(".properties", "");
+        }
+        String path = propertyPath + File.separator + fileName + ".properties";
+        Properties prop = new Properties();
+        Map<String, Object> map = new HashMap<>();
+        InputStream inputStream = null;
+        try {
+            inputStream = new BufferedInputStream(new FileInputStream(path));
+            prop.load(inputStream);
+            Enumeration<?> enumeration = prop.propertyNames();
+            while (enumeration.hasMoreElements()) {
+                String key = String.valueOf(enumeration.nextElement());
+                map.put(key, prop.getProperty(key));
+            }
+        } catch (IOException e) {
+            throw new RuntimeException("找不到文件：" + path);
+        } finally {
+            try {
+                if (inputStream != null) {
+                    inputStream.close();
+                }
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+        return map;
+    }
+
+}
diff --git a/src/main/youhong_ai_old_src/com/api/xiao/commons/utils/RequestBaseInfo.java b/src/main/youhong_ai_old_src/com/api/xiao/commons/utils/RequestBaseInfo.java
new file mode 100644
index 0000000..707c077
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/xiao/commons/utils/RequestBaseInfo.java
@@ -0,0 +1,58 @@
+package com.api.xiao.commons.utils;
+
+
+import lombok.Data;
+
+import java.io.InputStream;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @author XiaoBokang
+ * @create 2021/8/23 16:34
+ */
+
+@Data
+public class RequestBaseInfo{
+
+    private String type;
+    private String url;
+    private Object params;
+    private InputStream[] inputStreams;
+    private String[] fileNames;
+    private String fileField;
+    private Map<String,String > headers;
+
+    private static final Map<String,String > HEADER_NORMAL = new HashMap<>();
+    private static final Map<String,Object > PARAMS_NORMAL = new HashMap<>();
+
+
+    public static RequestBaseInfo create(String type, String url){
+        return create(type,url,HEADER_NORMAL,PARAMS_NORMAL);
+    }
+
+    public static RequestBaseInfo create(String type, String url, Map<String, String> headers){
+        return create(type,url,headers,PARAMS_NORMAL);
+    }
+
+    public static RequestBaseInfo create(String type, String url, Map<String, String> headers, Object params){
+        RequestBaseInfo requestInfo =  new RequestBaseInfo();
+        requestInfo.setType(type.toUpperCase());
+        requestInfo.setUrl(url);
+        requestInfo.setParams(params);
+        requestInfo.setHeaders(headers);
+        return requestInfo;
+    }
+
+    public static RequestBaseInfo createByFile(String type, String url, Map<String, String> headers, Object params, InputStream[] inputStreams, String fileField, String[] fileNames){
+        RequestBaseInfo requestInfo =  new RequestBaseInfo();
+        requestInfo.setType(type.toUpperCase());
+        requestInfo.setUrl(url);
+        requestInfo.setParams(params);
+        requestInfo.setHeaders(headers);
+        requestInfo.setInputStreams(inputStreams);
+        requestInfo.setFileNames(fileNames);
+        requestInfo.setFileField(fileField);
+        return requestInfo;
+    }
+}
diff --git a/src/main/youhong_ai_old_src/com/api/xiao/commons/utils/RequestUtil.java b/src/main/youhong_ai_old_src/com/api/xiao/commons/utils/RequestUtil.java
new file mode 100644
index 0000000..b755c7f
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/xiao/commons/utils/RequestUtil.java
@@ -0,0 +1,142 @@
+package com.api.xiao.commons.utils;
+
+import aiyh.utils.zwl.common.ToolUtil;
+import com.alibaba.fastjson.JSON;
+import com.api.xiao.commons.exception.RequestException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.http.HttpEntity;
+import org.apache.http.client.methods.*;
+import org.apache.http.entity.ContentType;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.entity.mime.HttpMultipartMode;
+import org.apache.http.entity.mime.MultipartEntityBuilder;
+import org.apache.http.impl.client.DefaultHttpClient;
+import org.apache.http.util.EntityUtils;
+import weaver.wechat.request.HttpManager;
+
+import javax.ws.rs.core.MediaType;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
+import java.util.Map;
+
+
+/**
+ * @author XiaoBokang
+ * @create 2021/8/9 10:09
+ */
+
+public class RequestUtil {
+
+    public static <T> T apiRequest(RequestBaseInfo requestInfo, Class<T> tClass){
+
+        Map<String,String> headers = requestInfo.getHeaders();
+        T result = null;
+
+        switch(requestInfo.getType()){
+            case "GET" :{
+                String sendUrl = serializableUrl(requestInfo.getUrl(), (Map<String, Object>) requestInfo.getParams());
+                HttpGet httpGet = new HttpGet(sendUrl);
+                headers.forEach(httpGet::setHeader);
+                result = apiSend(httpGet,tClass);
+                }break;
+            case "POST" :{
+                HttpPost httpPost = new HttpPost(requestInfo.getUrl());
+                headers.forEach(httpPost::setHeader);
+                httpPost.setEntity(new StringEntity(JSON.toJSONString(requestInfo.getParams()),"UTF-8"));
+                new ToolUtil().writeErrorLog("请求信息：url:"+requestInfo.getUrl()+" params:"+JSON.toJSONString(requestInfo.getParams()));
+                result = apiSend(httpPost,tClass);}break;
+            case "PUT" :{
+                HttpPut httpPut = new HttpPut(requestInfo.getUrl());
+                headers.forEach(httpPut::setHeader);
+                httpPut.setEntity(new StringEntity(JSON.toJSONString(requestInfo.getParams()),"UTF-8"));
+                result = apiSend(httpPut,tClass);}break;
+        }
+
+        return result;
+    }
+
+    public static <T> T POSTBySerializableUrl(RequestBaseInfo requestInfo, Class<T> tClass){
+        T result = null;
+        Map<String,String> headers = requestInfo.getHeaders();
+        String url = serializableUrl(requestInfo.getUrl(), (Map<String, Object>) requestInfo.getParams());
+        HttpPost httpPost = new HttpPost(url);
+        headers.forEach(httpPost::setHeader);
+        new ToolUtil().writeErrorLog("请求信息：url:"+requestInfo.getUrl()+" params:"+JSON.toJSONString(requestInfo.getParams()));
+        result = apiSend(httpPost,tClass);
+        return result;
+    }
+
+    public static <T> T apiUploadFileByInputStream(RequestBaseInfo requestInfo, Class<T> tClass){
+        Map<String,Object> params = (Map<String, Object>) requestInfo.getParams();
+        HttpPost httpPost = new HttpPost(requestInfo.getUrl());
+        requestInfo.getHeaders().forEach(httpPost::setHeader);
+        MultipartEntityBuilder builder = MultipartEntityBuilder.create();
+        builder.setCharset(StandardCharsets.UTF_8);
+        builder.setMode(HttpMultipartMode.BROWSER_COMPATIBLE);
+        InputStream[] inputStreams = requestInfo.getInputStreams();
+        String[] fileNames = requestInfo.getFileNames();
+        for (int i = 0; i < inputStreams.length; i++) {
+            builder.addBinaryBody(requestInfo.getFileField(),inputStreams[i],ContentType.MULTIPART_FORM_DATA,fileNames[i]);
+        }
+        params.forEach((k,v)->{
+            builder.addTextBody(k,JSON.toJSONString(v),ContentType.create(MediaType.TEXT_PLAIN,"UTF-8"));
+        });
+        HttpEntity entity = builder.build();
+        httpPost.setEntity(entity);
+        return apiSend(httpPost,tClass);
+    }
+
+    public static <T> T apiSend(
+            HttpUriRequest httpRequest,
+            Class<T> resClass
+    ){
+        DefaultHttpClient httpClient = HttpManager.getHttpClient();
+        CloseableHttpResponse execute = null;
+        T res = null;
+        try {
+            new ToolUtil().writeDebuggerLog("开始发送请求：request start -----------------");
+            execute = httpClient.execute(httpRequest);
+            if(execute.getStatusLine().getStatusCode() == 200){
+                new ToolUtil().writeDebuggerLog("请求发送成功：request send success -----------------");
+                HttpEntity entity = execute.getEntity();
+                String response= EntityUtils.toString(entity,"utf-8");
+//                ObjectMapper mapper = new ObjectMapper();
+//                CollectionType listType = mapper.getTypeFactory().constructCollectionType(ArrayList.class, Map.class);
+//                List<Map<String,Object>> list = mapper.readValue(response, listType);
+//                result.put("res",list);
+                ObjectMapper objectMapper = new ObjectMapper();
+                res = objectMapper.readValue(response,resClass);
+            }else {
+                HttpEntity entity = execute.getEntity();
+                String response = EntityUtils.toString(entity,"utf-8");
+                new ToolUtil().writeDebuggerLog("请求状态不为200，返回信息为："+response);
+                throw new RequestException("请求状态异常："+response);
+            }
+        } catch (IOException e) {
+            new ToolUtil().writeDebuggerLog("请求发生异常 request error>>>"+e);
+            try {
+                if(execute != null) {
+                    execute.close();
+                }
+            } catch (IOException ioException) {
+                ioException.printStackTrace();
+            }
+            e.printStackTrace();
+            throw new RequestException("请求调用异常："+e);
+        }
+        return res;
+    }
+
+    public static String serializableUrl(String url,Map<String,Object> params){
+        if(params == null || params.isEmpty()){
+            return url;
+        }
+        url += "?";
+        for (Map.Entry entry: params.entrySet()){
+            url += entry.getKey() + "=" + entry.getValue() + "&";
+        }
+        return url.substring(0,url.length()-1);
+    }
+
+}
diff --git a/src/main/youhong_ai_old_src/com/api/xiao/commons/utils/SqlUtil.java b/src/main/youhong_ai_old_src/com/api/xiao/commons/utils/SqlUtil.java
new file mode 100644
index 0000000..456b89f
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/api/xiao/commons/utils/SqlUtil.java
@@ -0,0 +1,72 @@
+package com.api.xiao.commons.utils;
+
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author XiaoBokang
+ * @create 2021/12/7 14:19
+ */
+
+public class SqlUtil {
+    /**
+     * 拼接更新的sql
+     */
+    public String buildUpdateSql(String tableName, Map<String,Object> setParam, Map<String,Object> whereParam){
+        StringBuilder updateBuilder = new StringBuilder();
+        StringBuilder whereBuilder = new StringBuilder();
+        updateBuilder.append("update ")
+                .append(tableName)
+                .append(" set ");
+        setParam.forEach((k,v) -> {
+            updateBuilder.append(k);
+            updateBuilder.append(" = '");
+            updateBuilder.append(v);
+            updateBuilder.append("',");
+        });
+        whereBuilder.append(" where ");
+        whereParam.forEach((k,v) -> {
+            whereBuilder.append(k);
+            whereBuilder.append(" = '");
+            whereBuilder.append(v);
+            whereBuilder.append("' and ");
+        });
+        String preStr = updateBuilder.substring(0,updateBuilder.length()-1)+" ";
+        String fixStr = whereBuilder.substring(0,whereBuilder.length()-5)+" ";
+        return preStr + fixStr;
+    }
+
+    public String buildWhereSql(String tempSql,Map<String,Object> whereParam){
+        StringBuilder whereBuilder = new StringBuilder(tempSql);
+        whereBuilder.append(" where ");
+        whereParam.forEach((k,v) -> {
+            whereBuilder.append(k);
+            whereBuilder.append(" = '");
+            whereBuilder.append(v);
+            whereBuilder.append("' and ");
+        });
+        return whereBuilder.substring(0,whereBuilder.length()-5)+" ";
+    }
+
+    public String buildWhereSql2(String tempSql,Map<String,Object> whereParam,List<Object> whereParamList){
+        StringBuilder whereBuilder = new StringBuilder(tempSql);
+        whereBuilder.append(" where 1 = 1 ");
+        whereParam.forEach((k,v) -> {
+            whereBuilder.append(" and ").append(k).append(" = ? ");
+            whereParamList.add(v);
+        });
+        return whereBuilder.toString();
+    }
+
+    public String buildQuerySql(String tableName, Map<String,Object> whereParam, List<Object> queryParamList){
+        StringBuilder querySqlBuild = new StringBuilder("select * from "+tableName+" where 1 = 1 ");
+        whereParam.forEach((k,v) -> {
+            querySqlBuild.append(" and ").append(k).append(" = ? ");
+            queryParamList.add(v);
+        });
+        return querySqlBuild.toString();
+    }
+
+
+}
diff --git a/src/main/youhong_ai_old_src/com/customization/quanshimeting/NewMeetingServiceProxy.java b/src/main/youhong_ai_old_src/com/customization/quanshimeting/NewMeetingServiceProxy.java
new file mode 100644
index 0000000..0c5bd3f
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/customization/quanshimeting/NewMeetingServiceProxy.java
@@ -0,0 +1,507 @@
+package com.customization.quanshimeting;
+
+
+import aiyh.utils.Util;
+import aiyh.utils.zwl.common.ToolUtil;
+import com.engine.core.cfg.annotation.ServiceDynamicProxy;
+import com.engine.core.cfg.annotation.ServiceMethodDynamicProxy;
+import com.engine.core.impl.aop.AbstractServiceProxy;
+import com.engine.meeting.service.MeetingBaseService;
+import com.engine.meeting.service.impl.MeetingBaseServiceImpl;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import weaver.aiyh_quanshi.RequestApi;
+import weaver.aiyh_quanshi.entity.QsConfParty;
+import weaver.aiyh_quanshi.entity.QsResponse;
+import weaver.conn.RecordSet;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+/**
+ * @author EBU7-dev1-ayh
+ * @create 2021/9/17 0017 16:18
+ * 代理类
+ */
+
+@ServiceDynamicProxy(target = MeetingBaseServiceImpl.class, desc = "对全时会议进行同步")
+public class NewMeetingServiceProxy extends AbstractServiceProxy implements MeetingBaseService {
+	private final ToolUtil toolUtil = new ToolUtil();
+	private final RequestApi requestApi = new RequestApi();
+	private final SimpleDateFormat simpleFormat = new SimpleDateFormat("yyyy-MM-dd hh:mm");
+
+
+	@ServiceMethodDynamicProxy(desc = "创建会议，向全时会议中添加预约会议")
+	public Map<String, Object> newMeeting(Map<String, Object> map) {
+
+		toolUtil.writeErrorLog(map.toString());
+		try {
+			int quanShiType = Integer.parseInt(Util.null2String("".equals(toolUtil.getSystemParamValue("QUAN_SHI_TYPE")) ? null : toolUtil.getSystemParamValue("QUAN_SHI_TYPE"), "-1"));
+			int meetingType = Integer.parseInt(Util.null2String("".equals(String.valueOf(map.get("meetingtype"))) ? null : String.valueOf(map.get("meetingtype")), "0"));
+			if (quanShiType != meetingType) {
+				return (Map<String, Object>) executeMethod(map);
+			}
+		} catch (Exception e) {
+			toolUtil.writeErrorLog("转换失败，失败原因：" + e);
+			return (Map<String, Object>) executeMethod(map);
+		}
+		Map<String, Object> result = (Map<String, Object>) executeMethod(map);
+		//		获取会议标题
+		String title = String.valueOf(map.get("name"));
+//		会议内容
+		String desc_n = String.valueOf(map.get("desc_n"));
+//		获取会议创建人
+		String creator = String.valueOf(map.get("contacter"));
+		RecordSet rs = new RecordSet();
+//		获取会议创建人邮件
+		String query = "select * from hrmresource where id = ?";
+		rs.executeQuery(query, creator);
+		rs.next();
+		String creatorEmail = rs.getString("email");
+		//		获取会议开始日期
+		String startDate = String.valueOf(map.get("begindate"));
+//		获取会议开始时间
+		String startTime = String.valueOf(map.get("begintime"));
+		Date start;
+		try {
+			start = simpleFormat.parse(startDate + " " + startTime);
+		} catch (ParseException e) {
+/*			e.printStackTrace();
+			Map<String, Object> resultErr = new HashMap<>();
+//				请求失败
+			resultErr.put("status", false);
+			resultErr.put("retstatus", true);
+			resultErr.put("error", "日期转换失败！");
+			resultErr.put("msg", "日期转换失败！");
+			resultErr.put("api_errormsg", "日期转换失败！");
+			return resultErr;*/
+			return result;
+		}
+
+//		获取会议结束日期
+		String endDate = String.valueOf(map.get("enddate"));
+//		获取会议结束时间
+		String endTime = String.valueOf(map.get("endtime"));
+		Date end;
+		try {
+			end = simpleFormat.parse(endDate + " " + endTime);
+		} catch (ParseException e) {
+/*			e.printStackTrace();
+			Map<String, Object> resultErr = new HashMap<>();
+//				请求失败
+			resultErr.put("status", false);
+			resultErr.put("retstatus", true);
+			resultErr.put("error", "日期转换失败!");
+			resultErr.put("msg", "日期转换失败！");
+			resultErr.put("api_errormsg", "日期转换失败！");
+			return resultErr;*/
+			return result;
+		}
+//		计算会议时长
+		int length = new Long((end.getTime() - start.getTime()) / (1000 * 60)).intValue();
+//		获取会议参与人
+		String hrmStr = String.valueOf(map.get("hrmmembers"));
+//	    处理会议参与人
+		List<QsConfParty> list = new ArrayList<>();
+		List<String> emailList = new ArrayList<>();
+		query = "select * from hrmresource where id in ( " + hrmStr + ")";
+		rs.executeQuery(query);
+		while (rs.next()) {
+			QsConfParty qsConfParty = new QsConfParty();
+			qsConfParty.setEmail(rs.getString("email"));
+			emailList.add(rs.getString("email"));
+			list.add(qsConfParty);
+			if (emailList.size() == 199) {
+				QsResponse userIdsByEmails = requestApi.getInfoByEmail(emailList);
+				Map<String, Object> resultMap = new HashMap<>();
+
+				ObjectMapper mapper = new ObjectMapper();
+				try {
+					resultMap = mapper.readValue(userIdsByEmails.getResult(), Map.class);
+				} catch (JsonProcessingException e) {
+					toolUtil.writeErrorLog(userIdsByEmails.toString());
+					toolUtil.writeErrorLog("请求结果转换失败，失败信息：" + e);
+				}
+				for (QsConfParty confParty : list) {
+					confParty.setUserId(Long.valueOf(String.valueOf(((Map<String, Object>) resultMap.get(confParty.getEmail())).get("userId"))));
+				}
+				emailList.clear();
+			}
+		}
+		QsResponse userIdsByEmails = requestApi.getInfoByEmail(emailList);
+		Map<String, Object> resultsMap = new HashMap<>();
+
+		ObjectMapper mapper = new ObjectMapper();
+		try {
+			resultsMap = mapper.readValue(userIdsByEmails.getResult(), Map.class);
+		} catch (JsonProcessingException e) {
+			toolUtil.writeErrorLog(userIdsByEmails.toString());
+			toolUtil.writeErrorLog("请求结果转换失败，失败信息：" + e);
+		}
+		for (QsConfParty confParty : list) {
+			confParty.setUserId(Long.valueOf(String.valueOf(((Map<String, Object>) resultsMap.get(confParty.getEmail())).get("userId"))));
+		}
+/*		toolUtil.writeErrorLog(list.toString());
+		toolUtil.writeErrorLog(creatorEmail);
+		toolUtil.writeErrorLog(title);
+		toolUtil.writeErrorLog(String.valueOf(length));
+		toolUtil.writeErrorLog(startDate + " " + startTime + ":00 ");*/
+		QsResponse meeting = requestApi.createMeting(creatorEmail, title, length, startDate + " " + startTime + ":00", list);
+		if (meeting != null) {
+			if (!"0".equals(meeting.getStatus())) {
+				String update = "update meeting set quanshimeeting = ? where id = ?";
+				rs.executeUpdate(update, "全时会议添加失败！", String.valueOf(map.get("meetingid")));
+				toolUtil.writeErrorLog(meeting.toString());
+/*				Map<String, Object> result = new HashMap<>();
+//				请求失败
+				result.put("status", false);
+				result.put("retstatus", false);
+				result.put("error", "全时会议添加失败");
+				result.put("msg", "全时会议添加失败！");
+				result.put("api_errormsg", "全时会议添加失败！");
+				return result;*/
+				return result;
+			} else {
+//				请求成功
+				Map<String, Object> resultMap = new HashMap<>();
+
+				try {
+					resultMap = mapper.readValue(meeting.getResult(), Map.class);
+				} catch (JsonProcessingException e) {
+					toolUtil.writeErrorLog("请求结果转换失败，失败信息：" + e);
+				}
+				if (Boolean.parseBoolean(String.valueOf(result.get("status")))) {
+//                  添加成功
+					String update = "update meeting set quan_shi_id = ?, quanshimeeting = ? where id = ?";
+					String quanShjInfo = "会议密码：" + String.valueOf(resultMap.get("pcode2")) + "<br /><br />会议连接：" + String.valueOf(resultMap.get("attendeeJoinUrl"));
+					rs.executeUpdate(update, String.valueOf(resultMap.get("conferenceId")), quanShjInfo, String.valueOf(map.get("meetingid")));
+					return result;
+				} else {
+					QsResponse qsResponse = requestApi.cancelConference(String.valueOf(resultMap.get("conferenceId")), creatorEmail);
+					toolUtil.writeErrorLog(qsResponse.toString());
+/*					Map<String, Object> resultErr = new HashMap<>();
+//				请求失败
+					resultErr.put("status", false);
+					resultErr.put("retstatus", false);
+					resultErr.put("error", "OA会议添加失败！");
+					resultErr.put("msg", "OA会议添加失败！");
+					resultErr.put("api_errormsg", "OA会议添加失败！");
+					return resultErr;*/
+					return result;
+				}
+			}
+		} else {
+/*			Map<String, Object> resultErr = new HashMap<>();
+//				请求失败
+			resultErr.put("status", false);
+			resultErr.put("retstatus", false);
+			resultErr.put("error", "全时会议添加失败");
+			resultErr.put("msg", "全时会议添加失败！");
+			resultErr.put("api_errormsg", "全时会议添加失败！");
+			return resultErr;*/
+			return result;
+		}
+	}
+/*
+	Map<String, Object> result = (Map<String, Object>) executeMethod(map);
+		if (Boolean.parseBoolean(String.valueOf(result.get("status")))) {
+//			会议添加成功，需要王全时会议中添加会议
+		String meetingId = String.valueOf(result.get("meetingid"));
+//			通过会议id获取到会议相关的信息
+		String query = "select * from meeting where id = ?";
+		RecordSet rs = new RecordSet();
+		rs.executeQuery(query, meetingId);
+		MeetingInfoDTO meetingInfoDTO = Util.recordeSet2Entity(rs, MeetingInfoDTO.class, true);
+//			判断是否需要对会议进行全时会议添加
+		int quanShiType = Integer.parseInt(Util.null2String(toolUtil.getSystemParamValue("QUAN_SHI_TYPE"), "-1"));
+		if (meetingInfoDTO.getMeetingtype() != quanShiType) {
+			return result;
+		}
+//			通过信息查询全时会议所需要的数据
+//			获取创建人邮箱
+		query = "select email from hrmresource where id = ?";
+		rs.executeQuery(query, meetingInfoDTO.getCreater());
+		rs.next();
+		String creatorEmail = rs.getString("email");
+//			获取参与人邮箱
+		List<QsConfParty> list = new ArrayList<>();
+		query = "select email from hrmresource where id in ( " + meetingInfoDTO.getHrmmembers() + ")";
+		rs.executeQuery(query);
+		while (rs.next()) {
+			QsConfParty qsConfParty = new QsConfParty();
+			qsConfParty.setEmail(rs.getString("email"));
+			list.add(qsConfParty);
+		}
+//			获取开始i时间和结束时间以及计算会议时长
+		int length = 0;
+		String startDate = "";
+		String startTime = "";
+		try {
+//		        获取会议开始日期
+			startDate = String.valueOf(meetingInfoDTO.getBegindate());
+//		        获取会议开始时间
+			startTime = String.valueOf(meetingInfoDTO.getBegintime());
+			Date start = simpleFormat.parse(startDate + " " + startTime);
+//		        获取会议结束日期
+			String endDate = String.valueOf(meetingInfoDTO.getEnddate());
+//		        获取会议结束时间
+			String endTime = String.valueOf(meetingInfoDTO.getEndtime());
+			Date end = simpleFormat.parse(endDate + " " + endTime);
+//		        计算会议时长
+			length = new Long((end.getTime() - start.getTime()) / (1000 * 60)).intValue();
+		} catch (Exception e) {
+			toolUtil.writeErrorLog("日期传换失败，失败信息：" + e);
+		}
+//		    调取接口
+		QsResponse meting = requestApi.createMeting(creatorEmail, meetingInfoDTO.getName(), length, startDate + " " + startTime + ":00 ", list);
+		if (!"0".equals(meting.getStatus())) {
+			toolUtil.writeErrorLog("全时会议添加失败！失败结果" + meting);
+//				需要删除OA会议
+//				添加全时会议失败
+			result.put("status", false);
+			result.put("retstatus", false);
+			result.put("error", "全时会议添加失败");
+			result.put("msg", "全时会议添加失败！");
+			result.put("api_errormsg", "abab全时会议添加失败！");
+			result.remove("apiCost");
+			result.remove("meetingid");
+		} else {
+//				添加全时会议成功
+			String update = "update meeting set quan_shi_id = ? where id = ?";
+			Map<String, Object> resultMap = new HashMap<>();
+			ObjectMapper mapper = new ObjectMapper();
+			try {
+				resultMap = mapper.readValue(meting.getResult(), Map.class);
+			} catch (JsonProcessingException e) {
+				toolUtil.writeErrorLog("请求结果转换失败，失败信息：" + e);
+			}
+			rs.executeUpdate(update, String.valueOf(resultMap.get("conferenceId")), String.valueOf(map.get("meetingid")));
+		}
+	}
+//		throw new RuntimeException("全时会议添加失败!");
+		return result;*/
+
+	@ServiceMethodDynamicProxy(desc = "删除会议时， 需要判断是否需要对全时会议的会议进行取消预约")
+	public Map<String, Object> deleteMeeting(Map<String, Object> map) {
+		Map<String, Object> result = (Map<String, Object>) executeMethod(map);
+//		获取请求参数中的会议id
+		String meetingIds = String.valueOf(map.get("meetingids"));
+//		查询要删除的会议中是否存再全时会议预约的，如果有需要对全时会议进行取消
+		String query = "select * from meeting where id in (" + meetingIds + ") and cancel != 1 and quan_shi_id is not null and quan_shi_cancel is null";
+		RecordSet rs = new RecordSet();
+		rs.executeQuery(query);
+		RecordSet rs_1 = new RecordSet();
+		while (rs.next()) {
+//			取消会议
+			String quanShiId = rs.getString("quan_shi_id");
+			String hrmId = rs.getString("contacter");
+			query = "select * from hrmresource where id = ?";
+			rs_1.executeQuery(query, hrmId);
+			rs_1.next();
+			String creatorEmail = rs_1.getString("email");
+			QsResponse qsResponse = requestApi.cancelConference(quanShiId, creatorEmail);
+			if (!"0".equals(qsResponse.getStatus())) {
+//				取消失败
+				toolUtil.writeErrorLog("全时会议取消失败！失败结果" + qsResponse);
+				/*Map<String, Object> resultErr = new HashMap<>();
+				resultErr.put("status", false);
+				resultErr.put("retstatus", false);
+				resultErr.put("ret", false);
+				resultErr.put("error", "全时会议取消失败！");
+				resultErr.put("msg", "全时会议取消失败！");
+				resultErr.put("api_errormsg", "全时会议取消失败！");
+				return resultErr;*/
+				return result;
+			} else {
+				String update = "update meeting set quan_shi_cancel = ? where id = ?";
+				rs_1.executeUpdate(update, "1", rs.getString("id"));
+			}
+		}
+//		取消成功，需要删除OA中会议
+//		Map<String, Object> result = (Map<String, Object>) executeMethod(map);
+		return result;
+	}
+
+	public Map<String, Object> editMeeting(Map<String, Object> map) {
+		return null;
+	}
+
+	public Map<String, Object> overMeeting(Map<String, Object> map) {
+		return null;
+	}
+
+	@ServiceMethodDynamicProxy(desc = "取消会议时，需要对全时会议的会议也进行同步取消")
+	public Map<String, Object> cancelMeeting(Map<String, Object> map) {
+		String meetingId = String.valueOf(map.get("meetingid"));
+		//			通过会议id获取到会议相关的信息
+		String query = "select * from meeting where id = ?";
+		RecordSet rs = new RecordSet();
+		rs.executeQuery(query, meetingId);
+		rs.next();
+		String quanShiId = rs.getString("quan_shi_id");
+		Map<String, Object> result = (Map<String, Object>) executeMethod(map);
+		int quanShiType = Integer.parseInt(Util.null2String(toolUtil.getSystemParamValue("QUAN_SHI_TYPE"), "-1"));
+		if (rs.getInt("meetingtype") != quanShiType) {
+			return result;
+		}
+		RecordSet rs_1 = new RecordSet();
+//			取消会议
+		String hrmId = rs.getString("contacter");
+		query = "select * from hrmresource where id = ?";
+		rs_1.executeQuery(query, hrmId);
+		rs_1.next();
+		String creatorEmail = rs_1.getString("email");
+		QsResponse qsResponse = requestApi.cancelConference(quanShiId, creatorEmail);
+		if (!"0".equals(qsResponse.getStatus())) {
+//				取消失败
+			toolUtil.writeErrorLog("全时会议取消失败！失败结果" + qsResponse);
+			/*Map<String, Object> resultErr = new HashMap<>();
+			resultErr.put("status", false);
+			resultErr.put("retstatus", false);
+			resultErr.put("ret", false);
+			resultErr.put("error", "全时会议取消失败！");
+			resultErr.put("msg", "全时会议取消失败！");
+			resultErr.put("api_errormsg", "全时会议取消失败！");
+			return resultErr;*/
+			return result;
+		} else {
+			String update = "update meeting set quan_shi_cancel = ? where id = ?";
+			rs_1.executeUpdate(update, "1", rs.getString("id"));
+		}
+		return result;
+	}
+
+	public Map<String, Object> chkMember(Map<String, Object> map) {
+		return null;
+	}
+
+	public Map<String, Object> chkRoom(Map<String, Object> map) {
+		return null;
+	}
+
+	public Map<String, Object> chkservice(Map<String, Object> map) {
+		return null;
+	}
+
+	public Map<String, Object> chkRoomAttribute(Map<String, Object> map) {
+		return null;
+	}
+
+	public Map<String, Object> chkWPMember(Map<String, Object> map) {
+		return null;
+	}
+
+	public Map<String, Object> updateCkIsck(Map<String, Object> map) {
+		return null;
+	}
+
+	public Map<String, Object> chkMeeting(Map<String, Object> map) {
+		return null;
+	}
+
+	public Map<String, Object> customMeetingChk(Map<String, Object> map) {
+		return null;
+	}
+
+	public Map<String, Object> changeMeeting(Map<String, Object> map) {
+		return null;
+	}
+
+	public Map<String, Object> submitMeeting(Map<String, Object> map) {
+		return null;
+	}
+
+	public Map<String, Object> afterMeetingNormal(Map<String, Object> map) {
+		return null;
+	}
+
+	public Map<String, Object> afterMeetingChange(Map<String, Object> map) {
+		return null;
+	}
+
+	public Map<String, Object> getUnReadCount(Map<String, Object> map) {
+		return null;
+	}
+
+	public Map<String, Object> doSubmit(Map<String, Object> map) {
+		return null;
+	}
+
+	public Map<String, Object> selRejectNode(Map<String, Object> map) {
+		return null;
+	}
+
+	public Map<String, Object> doReject(Map<String, Object> map) {
+		return null;
+	}
+
+	public Map<String, Object> getUserDefInfo(Map<String, Object> map) {
+		return null;
+	}
+
+	public Map<String, Object> getNowMeeting(Map<String, Object> map) {
+		return null;
+	}
+
+	public Map<String, Object> getMoreMeeting(Map<String, Object> map) {
+		return null;
+	}
+
+	public Map<String, Object> getMeetingCornerMark(Map<String, Object> map) {
+		return null;
+	}
+
+	public Map<String, Object> getRequestParams(Map<String, Object> map) {
+		return null;
+	}
+
+	public Map<String, Object> exportExcel(Map<String, Object> map) {
+		return null;
+	}
+
+	public Map<String, Object> chkRight(Map<String, Object> map) {
+		return null;
+	}
+
+	public Map<String, Object> customChangeHrm(Map<String, Object> map) {
+		return null;
+	}
+
+	public Map<String, Object> getMeetingTabElement(Map<String, Object> map) {
+		return null;
+	}
+
+	public Map<String, Object> chkRepeatMeeting(Map<String, Object> map) {
+		return null;
+	}
+
+	public Map<String, Object> afterMeetingDelete(Map<String, Object> map) {
+		return null;
+	}
+
+	public Map<String, Object> meetingToGovern(Map<String, Object> map) {
+		return null;
+	}
+
+	public Map<String, Object> meetingDecisionToGovern(Map<String, Object> map) {
+		return null;
+	}
+
+	@Override
+	public Map<String, Object> getMeetingInfluenceInfo(String s) {
+		return null;
+	}
+
+	public Map<String, Object> getMeetingSysWorkRecordList(Map<String, Object> map) {
+		return null;
+	}
+
+	public Map<String, Object> getDefalutByLevel(Map<String, Object> map) {
+		return null;
+	}
+
+	public Map<String, Object> getMeetingBaseInfo(Map<String, Object> map) {
+		return null;
+	}
+}
diff --git a/src/main/youhong_ai_old_src/com/customization/quanshimeting/entity/MeetingInfoDTO.java b/src/main/youhong_ai_old_src/com/customization/quanshimeting/entity/MeetingInfoDTO.java
new file mode 100644
index 0000000..193cab5
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/customization/quanshimeting/entity/MeetingInfoDTO.java
@@ -0,0 +1,113 @@
+
+package com.customization.quanshimeting.entity; 
+
+
+public class MeetingInfoDTO {
+
+	private int id;
+	private String name;
+	private int meetingtype;
+	private String begindate;
+	private String begintime;
+	private String endtime;
+	private String enddate;
+	private String descN;
+	private int creater;
+	private String hrmmembers;
+
+	public void setId(int id){
+		this.id = id;
+	}
+
+	public void setName(String name){
+		this.name = name;
+	}
+
+	public void setMeetingtype(int meetingtype){
+		this.meetingtype = meetingtype;
+	}
+
+	public void setBegindate(String begindate){
+		this.begindate = begindate;
+	}
+
+	public void setBegintime(String begintime){
+		this.begintime = begintime;
+	}
+
+	public void setEndtime(String endtime){
+		this.endtime = endtime;
+	}
+
+	public void setEnddate(String enddate){
+		this.enddate = enddate;
+	}
+
+	public void setDescN(String descN){
+		this.descN = descN;
+	}
+
+	public void setCreater(int creater){
+		this.creater = creater;
+	}
+
+	public void setHrmmembers(String hrmmembers){
+		this.hrmmembers = hrmmembers;
+	}
+
+	public int getId(){
+		return this.id;
+	}
+
+	public String getName(){
+		return this.name;
+	}
+
+	public int getMeetingtype(){
+		return this.meetingtype;
+	}
+
+	public String getBegindate(){
+		return this.begindate;
+	}
+
+	public String getBegintime(){
+		return this.begintime;
+	}
+
+	public String getEndtime(){
+		return this.endtime;
+	}
+
+	public String getEnddate(){
+		return this.enddate;
+	}
+
+	public String getDescN(){
+		return this.descN;
+	}
+
+	public int getCreater(){
+		return this.creater;
+	}
+
+	public String getHrmmembers(){
+		return this.hrmmembers;
+	}
+
+	@Override
+	public String toString() {
+		return "MeetingInfoDTO{" +
+				"id='" + id + '\'' +
+				", name='" + name + '\'' +
+				", meetingtype='" + meetingtype + '\'' +
+				", begindate='" + begindate + '\'' +
+				", begintime='" + begintime + '\'' +
+				", endtime='" + endtime + '\'' +
+				", enddate='" + enddate + '\'' +
+				", descN='" + descN + '\'' +
+				", creater='" + creater + '\'' +
+				", hrmmembers='" + hrmmembers + '\'' +
+				'}';
+	}
+}
\ No newline at end of file
diff --git a/src/main/youhong_ai_old_src/com/engine/interfaces/ai_you_hong/kao_he/action/workflow2model/WorkflowDataToModel.java b/src/main/youhong_ai_old_src/com/engine/interfaces/ai_you_hong/kao_he/action/workflow2model/WorkflowDataToModel.java
new file mode 100644
index 0000000..23af7f1
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/engine/interfaces/ai_you_hong/kao_he/action/workflow2model/WorkflowDataToModel.java
@@ -0,0 +1,53 @@
+package com.engine.interfaces.ai_you_hong.kao_he.action.workflow2model;
+
+import com.engine.interfaces.ai_you_hong.kao_he.action.workflow2model.service.WorkflowDataToModelService;
+import weaver.interfaces.workflow.action.Action;
+import weaver.soa.workflow.request.RequestInfo;
+import weaver.workflow.request.RequestManager;
+import weaver.workflow.workflow.WorkflowBillComInfo;
+import weaver.workflow.workflow.WorkflowComInfo;
+
+/**
+ * <p>流程数据转建模数据</p>
+ * <p>create 2022/4/28 10:09 PM</p>
+ *
+ * @author ayh
+ */
+
+public class WorkflowDataToModel implements Action {
+
+    private final WorkflowDataToModelService service = new WorkflowDataToModelService();
+    private String BXJ_ID;
+    private String modelId;
+    @Override
+    public String execute(RequestInfo requestInfo) {
+        String requestId = requestInfo.getRequestid();
+        String workflowId = requestInfo.getWorkflowid();
+        RequestManager requestManager = requestInfo.getRequestManager();
+        String billTableName = requestManager.getBillTableName();
+        if("".equals(billTableName)){
+            WorkflowComInfo workflowComInfo = new WorkflowComInfo();
+            String formId = workflowComInfo.getFormId(workflowId);
+            WorkflowBillComInfo workflowBillComInfo = new WorkflowBillComInfo();
+            billTableName=workflowBillComInfo.getTablename(formId);
+        }
+        service.insertData(requestId,billTableName,BXJ_ID,modelId);
+        return Action.SUCCESS;
+    }
+
+    public String getBXJ_ID() {
+        return BXJ_ID;
+    }
+
+    public void setBXJ_ID(String BXJ_ID) {
+        this.BXJ_ID = BXJ_ID;
+    }
+
+    public String getModelId() {
+        return modelId;
+    }
+
+    public void setModelId(String modelId) {
+        this.modelId = modelId;
+    }
+}
diff --git a/src/main/youhong_ai_old_src/com/engine/interfaces/ai_you_hong/kao_he/action/workflow2model/mapper/WorkflowDataToModelMapper.java b/src/main/youhong_ai_old_src/com/engine/interfaces/ai_you_hong/kao_he/action/workflow2model/mapper/WorkflowDataToModelMapper.java
new file mode 100644
index 0000000..7e0f7ed
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/engine/interfaces/ai_you_hong/kao_he/action/workflow2model/mapper/WorkflowDataToModelMapper.java
@@ -0,0 +1,54 @@
+package com.engine.interfaces.ai_you_hong.kao_he.action.workflow2model.mapper;
+
+import aiyh.utils.annotation.recordset.*;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p></p>
+ * <p>create 2022/4/28 10:17 PM</p>
+ *
+ * @author ayh
+ */
+
+@SqlMapper
+public interface WorkflowDataToModelMapper {
+
+    /**
+     * 根据流程ID查询主表数据
+     * @param tableName 表名
+     * @param requestId 流程ID
+     * @return 主表数据
+     */
+    @Select("select id,bxr,bxsm from $t{tableName} where requestid = #{requestId}")
+    Map<String,Object> selectMainDataByRequestId(@ParamMapper("tableName") String tableName,
+                                                 @ParamMapper("requestId") String requestId);
+
+    /**
+     * 根据主表数据查询明细数据
+     * @param tableName 表名
+     * @param mainId 主表ID
+     * @return 明细数据
+     */
+    @Select("select fyrq,fysx,sbje from $t{tableName} where mainid = #{mainId}")
+    List<Map<String,Object>> selectDetailDataByMainId(@ParamMapper("tableName")String tableName,
+                                                      @ParamMapper("mainId")String mainId);
+
+    /**
+     * 更新建模表数据
+     * @param updateSql 更新语句
+     * @param insertMap 插入数据
+     * @return 更新结果
+     */
+    @Update(custom = true)
+    boolean updateModelDate(@SqlString String updateSql, Map<String, Object> insertMap);
+
+    /**
+     * 删除表数据
+     * @param tableName 表名
+     * @param id 主键
+     */
+    @Delete("delete from $t{tableName} where id = #{id}")
+    void deleteDate(@ParamMapper("tableName") String tableName,@ParamMapper("id") Integer id);
+}
diff --git a/src/main/youhong_ai_old_src/com/engine/interfaces/ai_you_hong/kao_he/action/workflow2model/service/WorkflowDataToModelService.java b/src/main/youhong_ai_old_src/com/engine/interfaces/ai_you_hong/kao_he/action/workflow2model/service/WorkflowDataToModelService.java
new file mode 100644
index 0000000..2559674
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/engine/interfaces/ai_you_hong/kao_he/action/workflow2model/service/WorkflowDataToModelService.java
@@ -0,0 +1,84 @@
+package com.engine.interfaces.ai_you_hong.kao_he.action.workflow2model.service;
+
+import aiyh.utils.Util;
+import com.engine.interfaces.ai_you_hong.kao_he.action.workflow2model.mapper.WorkflowDataToModelMapper;
+import org.h2.util.StringUtils;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p></p>
+ * <p>create 2022/4/28 10:16 PM</p>
+ *
+ * @author ayh
+ */
+
+public class WorkflowDataToModelService {
+
+    private final WorkflowDataToModelMapper mapper = Util.getMapper(WorkflowDataToModelMapper.class);
+
+    /**
+     * 往建模表中插入数据
+     * @param requestId 流程requestID
+     * @param billTableName 流程表名
+     * @param BXJ_ID 包小捐id
+     * @param modelId 建模模块id
+     */
+    public void insertData(String requestId, String billTableName,String BXJ_ID,String modelId) {
+        Map<String, Object> mainData = mapper.selectMainDataByRequestId(billTableName, requestId);
+        String mainId = String.valueOf(mainData.get("id"));
+        List<Map<String, Object>> detailData = mapper.selectDetailDataByMainId(billTableName + "_dt1", mainId);
+        List<Map<String,Object>> insertList = new ArrayList<>(16);
+        for (Map<String, Object> map : detailData) {
+            Map<String,Object> insertMap = new HashMap<>(16);
+            insertMap.putAll(map);
+            insertMap.putAll(mainData);
+            insertMap.remove("id");
+            insertMap.put("ckqx",BXJ_ID);
+            insertList.add(insertMap);
+        }
+        if(StringUtils.isNullOrEmpty(modelId)){
+            modelId = Util.getModeIdByTableName(billTableName);
+        }
+        for (Map<String, Object> insertMap : insertList) {
+            insertDataHandler(insertMap,modelId);
+        }
+    }
+
+    /**
+     * 插入数据
+     * @param insertMap 插入数据
+     * @param modelId 模型id
+     */
+    private void insertDataHandler(Map<String, Object> insertMap, String modelId) {
+        int dataId = Util.getModeDataId("uf_fybxtj", Integer.parseInt(modelId), 1);
+        String updateSql = builderUpdateSql(insertMap);
+        insertMap.put("id",dataId);
+        updateSql = updateSql + " where id = #{id}";
+        boolean flag = mapper.updateModelDate(updateSql,insertMap);
+        if(!flag){
+//            更新失败，删除数据
+            mapper.deleteDate("uf_fybxtj",dataId);
+        }else {
+//            更新成功，权限重构
+            Util.rebuildModeDataShare(1, Integer.valueOf(modelId), dataId);
+        }
+    }
+
+    /**
+     * 构建更新sql
+     * @param insertMap 更新数据
+     * @return 更新sql
+     */
+    private String builderUpdateSql(Map<String, Object> insertMap){
+        StringBuilder sb = new StringBuilder("update ");
+        sb.append("uf_fybxtj").append(" set ");
+        for (Map.Entry<String, Object> entry : insertMap.entrySet()) {
+            sb.append(entry.getKey()).append("= #{").append(entry.getKey()).append("},");
+        }
+        return Util.removeSeparator(sb, ",");
+    }
+}
diff --git a/src/main/youhong_ai_old_src/com/engine/interfaces/ai_you_hong/kao_he/async_org/annoration/SqlFieldName.java b/src/main/youhong_ai_old_src/com/engine/interfaces/ai_you_hong/kao_he/async_org/annoration/SqlFieldName.java
new file mode 100644
index 0000000..dabcc62
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/engine/interfaces/ai_you_hong/kao_he/async_org/annoration/SqlFieldName.java
@@ -0,0 +1,23 @@
+package com.engine.interfaces.ai_you_hong.kao_he.async_org.annoration;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * <p>数据库字段</p>
+ * <p>create 2022/4/28 1:33 PM</p>
+ *
+ * @author ayh
+ */
+
+@Target(ElementType.FIELD)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface SqlFieldName {
+    String value() default "";
+    String subCompanyField() default "";
+    String departmentField() default "";
+    boolean update() default true;
+    boolean insert() default false;
+}
diff --git a/src/main/youhong_ai_old_src/com/engine/interfaces/ai_you_hong/kao_he/async_org/cmd/AsyncOrgCmd.java b/src/main/youhong_ai_old_src/com/engine/interfaces/ai_you_hong/kao_he/async_org/cmd/AsyncOrgCmd.java
new file mode 100644
index 0000000..891b73f
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/engine/interfaces/ai_you_hong/kao_he/async_org/cmd/AsyncOrgCmd.java
@@ -0,0 +1,429 @@
+package com.engine.interfaces.ai_you_hong.kao_he.async_org.cmd;
+
+import aiyh.utils.Util;
+import aiyh.utils.excention.CustomerException;
+import com.engine.interfaces.ai_you_hong.kao_he.async_org.entity.DepartmentResult;
+import com.engine.interfaces.ai_you_hong.kao_he.async_org.entity.HrmAsyncApiResult;
+import com.engine.interfaces.ai_you_hong.kao_he.async_org.entity.HrmResourceResult;
+import com.engine.interfaces.ai_you_hong.kao_he.async_org.mapper.AsyncOrgMapper;
+import com.engine.interfaces.ai_you_hong.kao_he.async_org.util.AsyncOrgUtil;
+import com.weaver.formmodel.util.EncryptHelper;
+import org.h2.util.StringUtils;
+import weaver.conn.RecordSet;
+import weaver.hrm.company.DepartmentComInfo;
+import weaver.hrm.company.SubCompanyComInfo;
+import weaver.hrm.finance.SalaryManager;
+import weaver.hrm.resource.HrmSynDAO;
+import weaver.hrm.resource.ResourceComInfo;
+import weaver.interfaces.hrm.HrmServiceManager;
+import weaver.matrix.MatrixUtil;
+
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * <p>同步组织架构</p>
+ * <p>create 2022/4/28 2:10 PM</p>
+ *
+ * @author ayh
+ */
+
+public class AsyncOrgCmd {
+
+    public static final String HRM_DEPARTMENT_INSERT = "HrmDepartment_Insert";
+    public static final String HRM_SUB_COMPANY_INSERT = "HrmSubCompany_Insert";
+    private final RecordSet rs = new RecordSet();
+    private final AsyncOrgMapper mapper = Util.getMapper(AsyncOrgMapper.class);
+
+    private final DepartmentComInfo dci = new DepartmentComInfo();
+    private final SubCompanyComInfo sci = new SubCompanyComInfo();
+
+    /**
+     * 同步分部数据
+     *
+     * @return 同步结果
+     */
+    public List<Map<String, Object>> asyncSubCompany() {
+        HrmAsyncApiResult<DepartmentResult> departmentData = AsyncOrgUtil.getDepartmentData();
+        if ("-1".equals(departmentData.getCode())) {
+            throw new CustomerException("获取部门数据失败");
+        }
+        List<DepartmentResult> resultData = departmentData.getResultData();
+        List<DepartmentResult> subCompanyList = resultData.stream().filter(departmentResult -> "0".equals(departmentResult.getSign())).collect(Collectors.toList());
+        List<DepartmentResult> subCompanyTreeList = Util.listToTree(subCompanyList, DepartmentResult::getDepartmentCode, DepartmentResult::getHigherLevelCode,
+                DepartmentResult::getChildList, DepartmentResult::setChildList, StringUtils::isNullOrEmpty);
+        return asyncSubChild(subCompanyTreeList, 0, HRM_SUB_COMPANY_INSERT, "HrmSubCompany");
+    }
+
+    /**
+     * 同步部门数据
+     *
+     * @return 同步结果
+     */
+    public List<Map<String, Object>> asyncDepartment() {
+        HrmAsyncApiResult<DepartmentResult> departmentData = AsyncOrgUtil.getDepartmentData();
+        if ("-1".equals(departmentData.getCode())) {
+            throw new CustomerException("获取部门数据失败");
+        }
+        List<DepartmentResult> resultData = departmentData.getResultData();
+        List<DepartmentResult> subCompanyList = resultData.stream().filter(departmentResult -> "1".equals(departmentResult.getSign())).collect(Collectors.toList());
+        List<DepartmentResult> subCompanyTreeList = Util.listToTree(subCompanyList, DepartmentResult::getDepartmentCode, DepartmentResult::getHigherLevelCode,
+                DepartmentResult::getChildList, DepartmentResult::setChildList,
+                parentCode -> StringUtils.isNullOrEmpty(parentCode) || parentCode.startsWith("sub"));
+        return asyncDepChild(subCompanyTreeList, 0, 0, HRM_DEPARTMENT_INSERT, "HrmDepartment");
+    }
+
+
+    /**
+     * 同步分部数据
+     *
+     * @param subCompanyList 分部信息
+     * @param parentId       父级分部ID
+     * @param proc           执行的存储过程
+     * @param tableName      表名
+     * @return 同步结果
+     */
+    private List<Map<String, Object>> asyncSubChild(List<DepartmentResult> subCompanyList, int parentId, String proc, String tableName) {
+        List<Map<String, Object>> synResultList = new ArrayList<>();
+        int type = 1;
+        for (DepartmentResult departmentResult : subCompanyList) {
+            Integer subId = mapper.selectSubCompanyIdBySubCode(departmentResult.getDepartmentCode());
+            String status = departmentResult.getStatus();
+            status = "1".equals(status) ? "0" : "1";
+            departmentResult.setStatus(status);
+            if (subId > 0) {
+//                存在分部，，需要更新
+                departmentResult.setModified(Util.getTime("yyyy-MM-dd HH:mm:ss"));
+                departmentResult.setId(subId);
+                departmentResult.setParentId(parentId);
+                Map<String, Object> map = updateSubCompany(departmentResult, tableName, type);
+                synResultList.add(map);
+                if (departmentResult.getChildList() != null && departmentResult.getChildList().size() > 0) {
+                    List<Map<String, Object>> maps = asyncSubChild(departmentResult.getChildList(), subId, proc, tableName);
+                    synResultList.addAll(maps);
+                }
+            } else {
+//                不存在分部需要插入
+                departmentResult.setCreated(Util.getTime("yyyy-MM-dd HH:mm:ss"));
+                departmentResult.setCreater(1);
+                departmentResult.setModified(Util.getTime("yyyy-MM-dd HH:mm:ss"));
+                Map<String, Object> map = insertSubCompany(departmentResult, parentId, proc, tableName, type);
+                subId = Integer.parseInt(Util.null2DefaultStr(map.get("subId"), "0"));
+                map.remove("subId");
+                synResultList.add(map);
+                if (departmentResult.getChildList() != null && departmentResult.getChildList().size() > 0) {
+                    List<Map<String, Object>> maps = asyncSubChild(departmentResult.getChildList(), subId, proc, tableName);
+                    synResultList.addAll(maps);
+                }
+            }
+        }
+        return synResultList;
+    }
+
+    /**
+     * 同步部门信息
+     *
+     * @param subCompanyList 部门信息
+     * @param parentId       父级部门id
+     * @param subId          父级部门的分部ID
+     * @param proc           执行的存储过程
+     * @param tableName      表名
+     * @return 同步结果
+     */
+    private List<Map<String, Object>> asyncDepChild(List<DepartmentResult> subCompanyList, int parentId, int subId, String proc, String tableName) {
+        List<Map<String, Object>> synResultList = new ArrayList<>();
+        int type = 2;
+        for (DepartmentResult departmentResult : subCompanyList) {
+            departmentResult.setCreater(1);
+            String status = departmentResult.getStatus();
+            status = "1".equals(status) ? "0" : "1";
+            departmentResult.setStatus(status);
+            if (subId == 0) {
+//                不存在父级部门，查询所属分部id
+                subId = mapper.selectSubCompanyIdBySubCode(departmentResult.getHigherLevelCode());
+            }
+            Integer depId = mapper.selectDepartmentIdByDeptCode(departmentResult.getDepartmentCode());
+            if (depId > 0) {
+//                存在部门，需要更新
+                departmentResult.setId(depId);
+                departmentResult.setSubCompanyId(subId);
+                departmentResult.setModified(Util.getTime("yyyy-MM-dd HH:mm:ss"));
+                if (parentId > 0) {
+                    departmentResult.setParentId(parentId);
+                }
+                Map<String, Object> map = updateSubCompany(departmentResult, tableName, type);
+                synResultList.add(map);
+                if (departmentResult.getChildList() != null && departmentResult.getChildList().size() > 0) {
+                    List<Map<String, Object>> maps = asyncDepChild(departmentResult.getChildList(), depId, subId, proc, tableName);
+                    synResultList.addAll(maps);
+                }
+            } else {
+//                不存在部门，不需要更新
+                departmentResult.setModified(Util.getTime("yyyy-MM-dd HH:mm:ss"));
+                departmentResult.setCreater(1);
+                departmentResult.setCreated(Util.getTime("yyyy-MM-dd HH:mm:ss"));
+                departmentResult.setSubCompanyId(subId);
+                Map<String, Object> map = insertSubCompany(departmentResult, parentId, proc, tableName, type);
+                subId = Integer.parseInt(Util.null2DefaultStr(map.get("subId"), "0"));
+                map.remove("subId");
+                synResultList.add(map);
+                if (departmentResult.getChildList() != null && departmentResult.getChildList().size() > 0) {
+                    List<Map<String, Object>> maps = asyncDepChild(departmentResult.getChildList(), depId, subId, proc, tableName);
+                    synResultList.addAll(maps);
+                }
+            }
+        }
+        return synResultList;
+    }
+
+    /**
+     * 更新部门分部数据信息
+     *
+     * @param departmentResult 部门信息
+     * @param tableName        表名
+     * @param type             类型
+     * @return 同步结果
+     */
+    private Map<String, Object> updateSubCompany(DepartmentResult departmentResult, String tableName, int type) {
+        String updateSql = AsyncOrgUtil.builderUpdateSql(tableName, departmentResult, type);
+        updateSql = updateSql + " where id = #{id}";
+        boolean flag = mapper.updateSubCompany(updateSql, departmentResult);
+        if (flag) {
+            return buildItemMap(departmentResult.getDepartmentCode(), departmentResult.getOrder(),
+                    departmentResult.getDepartmentName(), "2", "更新成功！");
+        }
+        return buildItemMap(departmentResult.getDepartmentCode(), departmentResult.getOrder(),
+                departmentResult.getDepartmentName(), "0", "更新失败！");
+    }
+
+    /**
+     * 插入部门分部数据信息
+     *
+     * @param departmentResult 部门信息
+     * @param parentId         父级部门或分部id
+     * @param proc             执行的存储过程
+     * @param tableName        表名
+     * @param type             类型
+     * @return 同步结果
+     */
+    private Map<String, Object> insertSubCompany(DepartmentResult departmentResult, int parentId, String proc, String tableName, int type) {
+        int subId = 0;
+        Map<String, Object> asyncResult;
+        String departmentName = departmentResult.getDepartmentName();
+        String departmentMark = departmentResult.getDepartmentMark();
+        String order = departmentResult.getOrder();
+        Integer subCompanyId = departmentResult.getSubCompanyId();
+        char separator = weaver.general.Util.getSeparator();
+        String para = "";
+        if (HRM_SUB_COMPANY_INSERT.equals(proc)) {
+            para = departmentName + separator + departmentMark + separator + "1" + separator + parentId + separator + "" + separator + order;
+        } else if (HRM_DEPARTMENT_INSERT.equals(proc)) {
+            para = departmentMark + separator + departmentName + separator + "" + separator + "" + separator + subCompanyId + separator + order + separator + "";
+        }
+        rs.executeProc(proc, para);
+        if (rs.next()) {
+            subId = rs.getInt(1);
+            asyncResult = buildItemMap(departmentResult.getDepartmentCode(), departmentResult.getOrder(),
+                    departmentResult.getDepartmentName(), "1", "插入成功！");
+        } else {
+            asyncResult = buildItemMap(departmentResult.getDepartmentCode(), departmentResult.getOrder(),
+                    departmentResult.getDepartmentName(), "0", "插入失败！");
+        }
+        departmentResult.setId(subId);
+        departmentResult.setParentId(parentId);
+        updateSubCompany(departmentResult, tableName, type);
+        asyncResult.put("subId", subId);
+        if (type == 1) {
+            //清除全部分部缓存
+            sci.removeCompanyCache();
+            //新增单个分部缓存
+            sci.addCache(String.valueOf(subId));
+            //同步分部数据到矩阵
+            MatrixUtil.updateSubcompayData("" + subId);
+            new weaver.hrm.appdetach.AppDetachComInfo().initSubDepAppData();
+        }
+        if (type == 2) {
+            //清除全部部门缓存
+            dci.removeCompanyCache();
+            //新增单个部门缓存
+            dci.addCache(String.valueOf(subId));
+            HrmServiceManager hrmServiceManager = new HrmServiceManager();
+            hrmServiceManager.SynInstantDepartment(subId + "", "2");
+            //同步分部数据到矩阵
+            MatrixUtil.updateDepartmentData("" + subId);
+        }
+        return asyncResult;
+    }
+
+    /**
+     * 同步人员数据
+     * @return 同步结果
+     */
+    public List<Map<String, Object>> asyncHrmResource() {
+        HrmAsyncApiResult<HrmResourceResult> hrmResourceData = AsyncOrgUtil.getHrmResourceData();
+        if ("-1".equals(hrmResourceData.getCode())) {
+            throw new CustomerException("获取人员数据失败");
+        }
+        List<HrmResourceResult> resultData = hrmResourceData.getResultData();
+        List<HrmResourceResult> hrmResourceResults = Util.listToTree(resultData, HrmResourceResult::getEmployeeNumber, HrmResourceResult::getHigherLevelCode,
+                HrmResourceResult::getChildList, HrmResourceResult::setChildList, StringUtils::isNullOrEmpty);
+        return asyncHrmResourceChild(hrmResourceResults, 0, "", "HrmResourceMaxId_Get", "HrmResource");
+    }
+
+    /**
+     * 同步人员数据
+     * @param hrmResourceResults 人员数据
+     * @param parentId 父级id
+     * @param managerStr 父级所有id
+     * @param proc 执行存储过程
+     * @param tableName ·
+     * @return 同步结果
+     */
+    private List<Map<String, Object>> asyncHrmResourceChild(List<HrmResourceResult> hrmResourceResults, int parentId, String managerStr, String proc, String tableName) {
+        List<Map<String, Object>> synResultList = new ArrayList<>();
+        for (HrmResourceResult hrmResourceResult : hrmResourceResults) {
+            hrmResourceResult.setPassword(EncryptHelper.encodeMd5(hrmResourceResult.getLoginAccount()).toUpperCase());
+            Integer userId = mapper.selectHrmIdByEmployeeNumber(hrmResourceResult.getEmployeeNumber());
+            String employeeStatus = hrmResourceResult.getEmployeeStatus();
+            employeeStatus = "1".equals(employeeStatus) ? "1" : "5";
+            hrmResourceResult.setEmployeeStatus(employeeStatus);
+//            获取部门ID
+            Integer depId = mapper.selectDepartmentIdByDeptCode(hrmResourceResult.getInstitutionCode());
+            hrmResourceResult.setInstitutionCode(String.valueOf(depId));
+//            获取分部ID
+            Integer subId = mapper.selectSubIdId4DeptTableByDeptCode(hrmResourceResult.getInstitutionCode());
+            hrmResourceResult.setSubCompanyId(String.valueOf(subId));
+            if (userId > 0) {
+//               存在人员，需要更新
+                if (parentId != 0) {
+                    hrmResourceResult.setManagerId(parentId);
+                    hrmResourceResult.setManagerStr(managerStr);
+                }
+                hrmResourceResult.setId(userId);
+                Map<String, Object> map = updateHrmResource(hrmResourceResult, tableName);
+                childHandler(synResultList, map, hrmResourceResult, managerStr, userId, proc, tableName);
+            } else {
+//                不存在人员，需要插入
+                if (parentId != 0) {
+                    hrmResourceResult.setManagerId(parentId);
+                    hrmResourceResult.setManagerStr(managerStr);
+                }
+                Map<String, Object> map = insertHrmResource(hrmResourceResult, parentId, proc, tableName);
+                childHandler(synResultList, map, hrmResourceResult, managerStr, userId, proc, tableName);
+            }
+        }
+        return synResultList;
+    }
+
+    /**
+     * 同步人员数据下级处理
+     * @param synResultList 同步结果
+     * @param map 同步结果
+     * @param hrmResourceResult 人员数据
+     * @param managerStr 父级所有id
+     * @param userId 人员id
+     * @param proc 执行存储过程
+     * @param tableName 数据库表名
+     */
+    private void childHandler(List<Map<String, Object>> synResultList, Map<String, Object> map, HrmResourceResult hrmResourceResult, String managerStr, Integer userId, String proc, String tableName) {
+        synResultList.add(map);
+        if (hrmResourceResult.getChildList() != null && hrmResourceResult.getChildList().size() > 0) {
+            if ("".equals(managerStr)) {
+                managerStr = "," + userId + ",";
+            } else if(userId > 0){
+                managerStr = managerStr + userId + ",";
+            }
+            List<Map<String, Object>> maps = asyncHrmResourceChild(hrmResourceResult.getChildList(), userId,
+                    managerStr, proc, tableName);
+            synResultList.addAll(maps);
+        }
+    }
+
+    /**
+     * 插入人员数据
+     * @param hrmResourceResult 人员数据
+     * @param parentId 父级id
+     * @param proc 执行存储过程
+     * @param tableName 数据库表名
+     * @return 同步结果
+     */
+    private Map<String, Object> insertHrmResource(HrmResourceResult hrmResourceResult, int parentId, String proc,String tableName) {
+        rs.executeProc(proc,"");
+        rs.next();
+        int hrmId = rs.getInt(1);
+        hrmResourceResult.setId(hrmId);
+        hrmResourceResult.setManagerId(parentId);
+
+        String insertSql = AsyncOrgUtil.builderInsertSql(tableName, hrmResourceResult, 0);
+        boolean flag = mapper.insertHrmResource(insertSql,hrmResourceResult);
+        if (flag) {
+            char separator = weaver.general.Util.getSeparator();
+            Calendar calendar = Calendar.getInstance();
+            String today = weaver.general.Util.add0(calendar.get(Calendar.YEAR), 4) + "-" +
+                    weaver.general.Util.add0(calendar.get(Calendar.MONTH) + 1, 2) + "-" +
+                    weaver.general.Util.add0(calendar.get(Calendar.DAY_OF_MONTH), 2);
+            String userParam = "" + 1 + separator + today;
+            rs.executeProc("HrmResource_CreateInfo", "" + hrmId + separator + userParam + 	separator + userParam);
+
+            ResourceComInfo resourceComInfo = null;
+            try {
+                resourceComInfo = new ResourceComInfo();
+                resourceComInfo.addResourceInfoCache(String.valueOf(hrmId));
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+            SalaryManager salaryManager = new SalaryManager();
+            salaryManager.initResourceSalary(String.valueOf(hrmId));
+            String para1 = "" + hrmId + separator + "" + separator + hrmResourceResult.getInstitutionCode() + separator
+                    + hrmResourceResult.getSubCompanyId()+ separator + "0" + separator + "0";
+            rs.executeProc("HrmResource_Trigger_Insert", para1);
+            mapper.insertHrmInfoStatus(1, hrmId);
+            mapper.insertHrmInfoStatus(2, hrmId);
+            mapper.insertHrmInfoStatus(3, hrmId);
+            mapper.insertHrmInfoStatus(10, hrmId);
+            resourceComInfo.updateResourceInfoCache(String.valueOf(hrmId));
+            return buildItemMap(hrmResourceResult.getEmployeeNumber(), hrmResourceResult.getLoginAccount(),
+                    hrmResourceResult.getEmployeeName(), "1", "插入成功！");
+        }
+        return buildItemMap(hrmResourceResult.getEmployeeNumber(), hrmResourceResult.getLoginAccount(),
+                hrmResourceResult.getEmployeeName(), "0", "插入失败！");
+    }
+
+    /**
+     * 更新人员数据
+     * @param hrmResourceResult 人员数据
+     * @param tableName 数据库表名
+     * @return 同步结果
+     */
+    private Map<String, Object> updateHrmResource(HrmResourceResult hrmResourceResult, String tableName) {
+        String updateSql = AsyncOrgUtil.builderUpdateSql(tableName, hrmResourceResult, 0);
+        updateSql = updateSql + " where id = #{id}";
+        boolean flag = mapper.updateHrmResource(updateSql, hrmResourceResult);
+        if (flag) {
+            return buildItemMap(hrmResourceResult.getEmployeeNumber(), hrmResourceResult.getLoginAccount(),
+                    hrmResourceResult.getEmployeeName(), "2", "更新成功！");
+        }
+        return buildItemMap(hrmResourceResult.getEmployeeNumber(), hrmResourceResult.getLoginAccount(),
+                hrmResourceResult.getEmployeeName(), "0", "更新失败！");
+    }
+
+
+    /**
+     * 新建同步结果
+     * @param pkcode pkcode
+     * @param pk pk
+     * @param memo memo
+     * @param succ succ
+     * @param error error
+     * @return 结果
+     */
+    private Map<String, Object> buildItemMap(String pkcode, String pk, String memo, String succ, String error) {
+        HashMap<String, Object> itemMap = new HashMap<>();
+        itemMap.put(weaver.hrm.resource.HrmSynDAO.OUTPK, pkcode);
+        itemMap.put(weaver.hrm.resource.HrmSynDAO.PK, pk);
+        itemMap.put(weaver.hrm.resource.HrmSynDAO.Memo, memo);
+        itemMap.put(weaver.hrm.resource.HrmSynDAO.Success, succ);
+        itemMap.put(HrmSynDAO.ErrorMessage, error);
+        return itemMap;
+    }
+}
diff --git a/src/main/youhong_ai_old_src/com/engine/interfaces/ai_you_hong/kao_he/async_org/entity/DepartmentResult.java b/src/main/youhong_ai_old_src/com/engine/interfaces/ai_you_hong/kao_he/async_org/entity/DepartmentResult.java
new file mode 100644
index 0000000..c8bd5dc
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/engine/interfaces/ai_you_hong/kao_he/async_org/entity/DepartmentResult.java
@@ -0,0 +1,76 @@
+package com.engine.interfaces.ai_you_hong.kao_he.async_org.entity;
+
+import com.engine.interfaces.ai_you_hong.kao_he.async_org.annoration.SqlFieldName;
+import com.huawei.shade.com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+import java.util.List;
+
+/**
+ * <p>部门信息</p>
+ * <p>create 2022/4/28 1:27 PM</p>
+ *
+ * @author ayh
+ */
+@Getter
+@Setter
+@ToString
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class DepartmentResult {
+    private Integer id;
+    /**
+     * 机构编码
+     */
+    @SqlFieldName(subCompanyField = "subcompanycode",departmentField = "departmentcode")
+    private String departmentCode;
+    /**
+     * 机构全称
+     */
+    @SqlFieldName(subCompanyField = "subcompanydesc",departmentField = "departmentmark")
+    private String departmentMark;
+    /**
+     * 机构简称
+     */
+    @SqlFieldName(subCompanyField = "subcompanyname",departmentField = "departmentname")
+    private String departmentName;
+    /**
+     * 上级机构编码
+     */
+    private String higherLevelCode;
+    /**
+     * 层级
+     */
+    @SqlFieldName(subCompanyField = "tlevel",departmentField = "tlevel")
+    private String level;
+    /**
+     * 显示顺序
+     */
+    private String order;
+    /**
+     * 机构标识（0：分部，1：部门）
+     */
+    private String sign;
+    /**
+     * 状态
+     */
+    @SqlFieldName(subCompanyField = "canceled",departmentField = "canceled")
+    private String status;
+
+    @SqlFieldName(subCompanyField = "supsubcomid",departmentField = "supdepid")
+    private Integer parentId;
+
+    @SqlFieldName(departmentField = "subcompanyid1")
+    private Integer subCompanyId;
+
+    @SqlFieldName(subCompanyField = "created", departmentField = "created",insert = true)
+    private String created;
+
+    @SqlFieldName(subCompanyField = "modified",departmentField = "modified",insert = true)
+    private String modified;
+
+    @SqlFieldName(subCompanyField = "creater", departmentField = "creater",insert = true)
+    private Integer creater;
+    private List<DepartmentResult> childList;
+}
diff --git a/src/main/youhong_ai_old_src/com/engine/interfaces/ai_you_hong/kao_he/async_org/entity/HrmAsyncApiResult.java b/src/main/youhong_ai_old_src/com/engine/interfaces/ai_you_hong/kao_he/async_org/entity/HrmAsyncApiResult.java
new file mode 100644
index 0000000..49c04b2
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/engine/interfaces/ai_you_hong/kao_he/async_org/entity/HrmAsyncApiResult.java
@@ -0,0 +1,28 @@
+package com.engine.interfaces.ai_you_hong.kao_he.async_org.entity;
+
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+import java.util.List;
+
+/**
+ * <p>请求结果</p>
+ * <p>create 2022/4/28 1:24 PM</p>
+ *
+ * @author ayh
+ */
+
+@Getter
+@Setter
+@ToString
+public class HrmAsyncApiResult<T> {
+    /**
+     * 请求状态
+     */
+    private String code;
+    /**
+     * 结果数据
+     */
+    private List<T> resultData;
+}
diff --git a/src/main/youhong_ai_old_src/com/engine/interfaces/ai_you_hong/kao_he/async_org/entity/HrmResourceResult.java b/src/main/youhong_ai_old_src/com/engine/interfaces/ai_you_hong/kao_he/async_org/entity/HrmResourceResult.java
new file mode 100644
index 0000000..e31520f
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/engine/interfaces/ai_you_hong/kao_he/async_org/entity/HrmResourceResult.java
@@ -0,0 +1,102 @@
+package com.engine.interfaces.ai_you_hong.kao_he.async_org.entity;
+
+import com.engine.interfaces.ai_you_hong.kao_he.async_org.annoration.SqlFieldName;
+import com.huawei.shade.com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+import java.util.List;
+
+/**
+ * <p>人员数据结果</p>
+ * <p>create 2022/4/28 1:28 PM</p>
+ *
+ * @author ayh
+ */
+@Setter
+@Getter
+@ToString
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class HrmResourceResult {
+    @SqlFieldName(value = "id",insert = true,update = false)
+    private int id;
+    /**
+     * 人员编码
+     */
+    @SqlFieldName(value = "workcode",insert = true)
+    private String employeeNumber;
+    /**
+     * 人员名称
+     */
+    @SqlFieldName(value = "lastname",insert = true)
+    private String employeeName;
+    /**
+     * 登录账号
+     */
+    @SqlFieldName(value = "loginid",insert = true)
+    private String loginAccount;
+    /**
+     * 所属机构编码
+     */
+    @SqlFieldName(value = "departmentid",insert = true)
+    private String institutionCode;
+    /**
+     * subCompanyId
+     */
+    @SqlFieldName(value = "subcompanyid1",insert = true)
+    private String subCompanyId;
+    /**
+     * 直接上级编码
+     */
+    private String higherLevelCode;
+    /**
+     * 人员状态（1：在职，0：离职）
+     */
+    @SqlFieldName(value = "status",insert = true)
+    private String employeeStatus;
+    /**
+     * 性别
+     */
+    @SqlFieldName(value = "sex",insert = true)
+    private String sex;
+    /**
+     * 安全等级
+     */
+    @SqlFieldName(value = "seclevel",insert = true)
+    private String securityLevel;
+    /**
+     * 显示顺序
+     */
+    @SqlFieldName(value = "dsporder",insert = true)
+    private String showOrder;
+    /**
+     * 岗位编码
+     */
+//    @SqlFieldName(value = "jobtitle",insert = true)
+    private String jobtitlecode;
+
+    @SqlFieldName(value = "managerid",insert = true)
+    private Integer managerId;
+
+    @SqlFieldName(value = "managerstr",insert = true)
+    private String managerStr;
+
+    @SqlFieldName(value = "password",insert = true,update = true)
+    private String password;
+
+
+    @SqlFieldName(value = "created",insert = true,update = false)
+    private String created;
+
+    @SqlFieldName(value = "modified", insert = true)
+    private String modified;
+
+    @SqlFieldName(value = "creater",insert = true,update = false)
+    private String creater;
+
+    @SqlFieldName(value = "createdate",insert = true,update = false)
+    private String createdate;
+
+    private List<HrmResourceResult> childList;
+}
diff --git a/src/main/youhong_ai_old_src/com/engine/interfaces/ai_you_hong/kao_he/async_org/mapper/AsyncOrgMapper.java b/src/main/youhong_ai_old_src/com/engine/interfaces/ai_you_hong/kao_he/async_org/mapper/AsyncOrgMapper.java
new file mode 100644
index 0000000..a1df9c1
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/engine/interfaces/ai_you_hong/kao_he/async_org/mapper/AsyncOrgMapper.java
@@ -0,0 +1,83 @@
+package com.engine.interfaces.ai_you_hong.kao_he.async_org.mapper;
+
+import aiyh.utils.annotation.recordset.*;
+import com.engine.interfaces.ai_you_hong.kao_he.async_org.entity.DepartmentResult;
+import com.engine.interfaces.ai_you_hong.kao_he.async_org.entity.HrmResourceResult;
+
+/**
+ * <p></p>
+ * <p>create 2022/4/28 2:28 PM</p>
+ *
+ * @author ayh
+ */
+
+@SqlMapper
+public interface AsyncOrgMapper {
+
+    /**
+     * 查询分部ID，通过分部编码
+     * @param subCompanyCode 分部编码
+     * @return 分部ID
+     */
+    @Select("select id from HrmSubCompany where subcompanycode = #{subCompanyCode}")
+    Integer selectSubCompanyIdBySubCode(@ParamMapper("subCompanyCode") String subCompanyCode);
+
+    /**
+     * 根据部门实体更新部门数据库
+     * @param updateSql 跟新sql
+     * @param departmentResult 部门实体
+     * @return 更新结果
+     */
+    @Update(custom = true)
+    boolean updateSubCompany(@SqlString String updateSql, DepartmentResult departmentResult);
+
+    /**
+     * 查询部门ID
+     * @param departmentCode 部门编码
+     * @return 部门ID
+     */
+    @Select("select id from HrmDepartment where departmentcode = #{departmentCode}")
+    Integer selectDepartmentIdByDeptCode(@ParamMapper("departmentCode") String departmentCode);
+
+    /**
+     * 查询父级部门的分部id
+     * @param departmentCode 部门编码
+     * @return  分部ID
+     */
+    @Select("select subcompanyid1 from HrmDepartment where departmentcode = #{departmentCode}")
+    Integer selectSubIdId4DeptTableByDeptCode(@ParamMapper("departmentCode") String departmentCode);
+
+    /**
+     * 通过人员编号查询人员ID
+     * @param employeeNumber 人员编号
+     * @return 人员ID
+     */
+    @Select("select id from hrmresource  where workcode = #{employeeNumber}")
+    Integer selectHrmIdByEmployeeNumber(@ParamMapper("employeeNumber") String employeeNumber);
+
+    /**
+     * 更新人员数据库
+     * @param updateSql 更新sql
+     * @param hrmResourceResult 人员实体
+     * @return 更新结果
+     */
+    @Update(custom = true)
+    boolean updateHrmResource(@SqlString String updateSql, HrmResourceResult hrmResourceResult);
+
+    /**
+     * 插入人员数据
+     * @param insertSql 插入sql
+     * @return 插入结果
+     */
+    @Insert(custom = true)
+    boolean insertHrmResource(@SqlString String insertSql,HrmResourceResult hrmResourceResult);
+
+    /**
+     * 新增人员信息状态
+     * @param i id
+     * @param hrmId 人员id
+     */
+    @Insert("insert into HrmInfoStatus (itemid,hrmid) values(#{id},#{hrmId})")
+    void insertHrmInfoStatus(@ParamMapper("id") int i,
+                             @ParamMapper("hrmId") int hrmId);
+}
diff --git a/src/main/youhong_ai_old_src/com/engine/interfaces/ai_you_hong/kao_he/async_org/service/AsyncOrgServiceImpl.java b/src/main/youhong_ai_old_src/com/engine/interfaces/ai_you_hong/kao_he/async_org/service/AsyncOrgServiceImpl.java
new file mode 100644
index 0000000..5905cfa
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/engine/interfaces/ai_you_hong/kao_he/async_org/service/AsyncOrgServiceImpl.java
@@ -0,0 +1,126 @@
+package com.engine.interfaces.ai_you_hong.kao_he.async_org.service;
+
+import aiyh.utils.Util;
+import com.engine.interfaces.ai_you_hong.kao_he.async_org.cmd.AsyncOrgCmd;
+import weaver.interfaces.hrm.*;
+import weaver.matrix.MatrixUtil;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>同步组织架构</p>
+ * <p>create 2022/4/28 2:09 PM</p>
+ *
+ * @author ayh
+ */
+
+public class AsyncOrgServiceImpl implements HrmSynService {
+
+    private final AsyncOrgCmd cmd = new AsyncOrgCmd();
+    /** 同步结果 */
+    private HashMap<String, Object> synResult = new HashMap<>();
+
+    /**
+     * 同步分部数据
+     * @return 同步结果
+     */
+    @Override
+    public String SynTimingToOASubCompany() {
+        Util.getLogger().info("同步分部数据======================start===============");
+        try {
+            List<Map<String, Object>> maps = cmd.asyncSubCompany();
+            synResult.put("1",maps);
+        }catch (Exception e){
+            e.printStackTrace();
+            Util.getLogger().error("同步分部出错！====================");
+        }
+        //同步部门数据到矩阵
+        MatrixUtil.sysSubcompayData();
+        Util.getLogger().info("同步分部数据======================end===============");
+        return null;
+    }
+
+    @Override
+    public String SynTimingToOADepartment() {
+        Util.getLogger().info("同步部门数据======================start===============");
+        List<Map<String, Object>> maps = cmd.asyncDepartment();
+        synResult.put("2",maps);
+        //同步部门数据到矩阵
+        MatrixUtil.sysDepartmentData();
+        Util.getLogger().info("同步部门数据======================end===============");
+        return null;
+    }
+
+    @Override
+    public String SynTimingToOAJobtitle() {
+        return null;
+    }
+
+    @Override
+    public String SynTimingToOAHrmResource() {
+        Util.getLogger().info("同步人员数据======================start===============");
+        List<Map<String, Object>> maps = cmd.asyncHrmResource();
+        synResult.put("4",maps);
+        //同步部门数据到矩阵
+        Util.getLogger().info("同步人员数据======================end===============");
+        return null;
+    }
+
+    @Override
+    public void SynTimingFromOASubCompany(SubCompanyBean[] subCompanyBeans) {
+
+    }
+
+    @Override
+    public void SynTimingFromOADepartment(DepartmentBean[] departmentBeans) {
+
+    }
+
+    @Override
+    public void SynTimingFromOAJobtitle(JobTitleBean[] jobTitleBeans) {
+
+    }
+
+    @Override
+    public void SynTimingFromOAHrmResource(UserBean[] userBeans) {
+
+    }
+
+    @Override
+    public void SynInstantSubCompany(SubCompanyBean subCompanyBean) {
+
+    }
+
+    @Override
+    public void SynInstantDepartment(DepartmentBean departmentBean) {
+
+    }
+
+    @Override
+    public void SynInstantJobtitle(JobTitleBean jobTitleBean) {
+
+    }
+
+    @Override
+    public void SynInstantHrmResource(UserBean userBean) {
+
+    }
+
+    @Override
+    public boolean SynSendMessage(String s, String s1, String s2, String s3, String s4) {
+        return false;
+    }
+
+
+    @Override
+    public HashMap getSynResult() {
+        return this.synResult;
+    }
+
+    @Override
+    public void removeSynResult() {
+        this.synResult = new HashMap<>(16);
+    }
+}
diff --git a/src/main/youhong_ai_old_src/com/engine/interfaces/ai_you_hong/kao_he/async_org/util/AsyncOrgUtil.java b/src/main/youhong_ai_old_src/com/engine/interfaces/ai_you_hong/kao_he/async_org/util/AsyncOrgUtil.java
new file mode 100644
index 0000000..87ff0a9
--- /dev/null
+++ b/src/main/youhong_ai_old_src/com/engine/interfaces/ai_you_hong/kao_he/async_org/util/AsyncOrgUtil.java
@@ -0,0 +1,152 @@
+package com.engine.interfaces.ai_you_hong.kao_he.async_org.util;
+
+import aiyh.utils.Util;
+import aiyh.utils.excention.CustomerException;
+import aiyh.utils.httpUtil.ResponeVo;
+import aiyh.utils.httpUtil.util.HttpUtils;
+import com.engine.interfaces.ai_you_hong.kao_he.async_org.annoration.SqlFieldName;
+import com.engine.interfaces.ai_you_hong.kao_he.async_org.entity.DepartmentResult;
+import com.engine.interfaces.ai_you_hong.kao_he.async_org.entity.HrmAsyncApiResult;
+import com.engine.interfaces.ai_you_hong.kao_he.async_org.entity.HrmResourceResult;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.core.type.TypeReference;
+import org.h2.util.StringUtils;
+import org.jetbrains.annotations.Nullable;
+
+import java.io.IOException;
+import java.lang.reflect.Field;
+
+/**
+ * <p>工具</p>
+ * <p>create 2022/4/28 1:31 PM</p>
+ *
+ * @author ayh
+ */
+
+public class AsyncOrgUtil {
+
+    private static final HttpUtils HTTP_UTILS;
+    private static final String API_URL = "http://124.71.177.157:8080/api/kh/";
+
+    static {
+        HTTP_UTILS = new HttpUtils();
+        HTTP_UTILS.getGlobalCache().paramMap.put("systemid", "examine");
+    }
+
+    public static <T> String builderUpdateSql(String tableName, T t, int type) {
+        Field[] declaredFields = t.getClass().getDeclaredFields();
+        StringBuilder sb = new StringBuilder("update ");
+        sb.append(tableName).append(" set ");
+        for (Field declaredField : declaredFields) {
+            declaredField.setAccessible(true);
+            SqlFieldName annotation = declaredField.getAnnotation(SqlFieldName.class);
+            if(annotation == null){
+                continue;
+            }
+            String sqlField = getString(annotation, type);
+            boolean updateFlag = annotation.update();
+            if (!updateFlag || StringUtils.isNullOrEmpty(sqlField)) {
+                continue;
+            }
+            try {
+                Object o = declaredField.get(t);
+                if (o == null || "-1".equals(String.valueOf(o))) {
+                    continue;
+                }
+            } catch (IllegalAccessException e) {
+                throw new CustomerException("更新sql构建失败", e);
+            }
+            sb.append(sqlField)
+                    .append(" = #{")
+                    .append(declaredField.getName())
+                    .append("},");
+        }
+        return Util.removeSeparator(sb, ",");
+    }
+
+    public static <T> String builderInsertSql(String tableName, T t, int type) {
+        Field[] declaredFields = t.getClass().getDeclaredFields();
+        StringBuilder sb = new StringBuilder("insert into ");
+        sb.append(tableName).append(" ( ");
+        StringBuilder fieldSb = new StringBuilder();
+        StringBuilder fieldValue = new StringBuilder();
+        for (Field declaredField : declaredFields) {
+            declaredField.setAccessible(true);
+            SqlFieldName annotation = declaredField.getAnnotation(SqlFieldName.class);
+            if(annotation == null){
+                continue;
+            }
+            String sqlField = getString(annotation, type);
+            boolean insert = annotation.insert();
+            if (!insert || StringUtils.isNullOrEmpty(sqlField)) {
+                continue;
+            }
+            try {
+                Object o = declaredField.get(t);
+                if (o == null || "-1".equals(String.valueOf(o))) {
+                    continue;
+                }
+            } catch (IllegalAccessException e) {
+                throw new CustomerException("更新sql构建失败", e);
+            }
+            fieldSb.append(sqlField).append(",");
+            fieldValue.append("#{").append(declaredField.getName()).append("},");
+        }
+        sb.append(Util.removeSeparator(fieldSb, ",")).append(") values (");
+        sb.append(Util.removeSeparator(fieldValue, ",")).append(")");
+        return Util.removeSeparator(sb, ",");
+    }
+
+    @Nullable
+    private static String getString(SqlFieldName annotation, int type) {
+        if (annotation == null) {
+            return null;
+        }
+        String sqlField;
+        if (type == 1) {
+            sqlField = annotation.subCompanyField();
+        }else if (type == 2) {
+            sqlField = annotation.departmentField();
+        } else {
+            sqlField = annotation.value();
+        }
+        return sqlField;
+    }
+
+
+    public static HrmAsyncApiResult<DepartmentResult> getDepartmentData() {
+        ResponeVo responeVo = null;
+        try {
+            responeVo = HTTP_UTILS.apiGet(API_URL + "org");
+        } catch (IOException e) {
+            throw new CustomerException("请求失败！", e);
+        }
+        HrmAsyncApiResult<DepartmentResult> entity = null;
+        try {
+            assert responeVo != null;
+            entity = responeVo.getEntity(new TypeReference<HrmAsyncApiResult<DepartmentResult>>() {
+            });
+        } catch (JsonProcessingException e) {
+            throw new CustomerException("参数转换失败！", e);
+        }
+        return entity;
+    }
+
+    public static HrmAsyncApiResult<HrmResourceResult> getHrmResourceData() {
+        ResponeVo responeVo = null;
+        try {
+            responeVo = HTTP_UTILS.apiGet(API_URL + "user");
+        } catch (IOException e) {
+            throw new CustomerException("请求失败！", e);
+        }
+        HrmAsyncApiResult<HrmResourceResult> entity = null;
+        try {
+            assert responeVo != null;
+            entity = responeVo.getEntity(new TypeReference<HrmAsyncApiResult<HrmResourceResult>>() {
+            });
+        } catch (JsonProcessingException e) {
+            throw new CustomerException("参数转换失败！", e);
+        }
+        return entity;
+    }
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_igh/schedule/decentralization/DecentralizationOfPowersCronJob.java b/src/main/youhong_ai_old_src/weaver/aiyh_igh/schedule/decentralization/DecentralizationOfPowersCronJob.java
new file mode 100644
index 0000000..931f97d
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_igh/schedule/decentralization/DecentralizationOfPowersCronJob.java
@@ -0,0 +1,219 @@
+package weaver.aiyh_igh.schedule.decentralization;
+
+import aiyh.utils.Util;
+import aiyh.utils.annotation.ActionDesc;
+import aiyh.utils.annotation.PrintParamMark;
+import aiyh.utils.annotation.RequiredMark;
+import aiyh.utils.excention.CustomerException;
+import com.alibaba.fastjson.JSON;
+import lombok.AccessLevel;
+import lombok.Setter;
+import org.apache.log4j.Logger;
+import weaver.aiyh_igh.schedule.decentralization.entity.OrgInfoHotelEntity;
+import weaver.aiyh_igh.schedule.decentralization.mapper.DecentralizationMapper;
+import weaver.conn.RecordSet;
+import weaver.hrm.appdetach.AppDetachComInfo;
+import weaver.interfaces.schedule.BaseCronJob;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * <h1>分级分权定时任务控制</h1>
+ * <p>create 2022/7/15 11:58</p>
+ *
+ * @author ayh
+ */
+
+@Setter
+@ActionDesc(value = "部门属于酒店的部门分级分权控制定时任务，只能查看到同层的酒店部门信息", author = "aiyh")
+public class DecentralizationOfPowersCronJob extends BaseCronJob {
+
+    @RequiredMark("支持中心部门ID")
+    @PrintParamMark
+    private String supportCenterDeptId;
+
+    @Setter(AccessLevel.NONE)
+    private final Logger log = Util.getLogger();
+
+    private final RecordSet recordSet = new RecordSet();
+
+    private final DecentralizationMapper mapper = Util.getMapper(DecentralizationMapper.class);
+
+
+    @Override
+    public void execute() {
+        try {
+            Util.verifyRequiredField(this);
+            doExecute();
+        } catch (Exception e) {
+            log.error(Util.logStr("execute cronJob fail! error msg is [{}]，stack trace is [\n{}\n]",
+                    e.getMessage(), Util.getErrString(e)));
+            throw new CustomerException("execute cronJob fail," + e.getMessage());
+        }
+    }
+
+
+    public void doExecute() {
+        List<OrgInfoHotelEntity> hotelInfoList = mapper.selectCnTileFromOrginfo();
+
+        for (OrgInfoHotelEntity orgInfoHotelEntity : hotelInfoList) {
+            insertSysdetachinfo(orgInfoHotelEntity);
+        }
+        log.info("查询酒店后信息数据： " + hotelInfoList.size());
+//        将没有infoID的数据过滤
+        List<OrgInfoHotelEntity> hasInfoIdHotelInfo = hotelInfoList.stream()
+                .filter(item -> item.getInfoId() != null && item.getInfoId() > 0)
+                .collect(Collectors.toList());
+        log.info("过滤后数据信息：" + hasInfoIdHotelInfo.size());
+        Map<String, List<OrgInfoHotelEntity>> groupByUpdate = hasInfoIdHotelInfo
+                .stream().collect(Collectors.groupingBy(OrgInfoHotelEntity::getUpdate));
+
+        log.info("分组后数据信息：" + groupByUpdate.size());
+        List<OrgInfoHotelEntity> updateInfo = groupByUpdate.get("true");
+        List<OrgInfoHotelEntity> insertInfo = groupByUpdate.get("false");
+        if (updateInfo == null) {
+            updateInfo = new ArrayList<>();
+        }
+        if (insertInfo == null) {
+            insertInfo = new ArrayList<>();
+        }
+        List<List> insertSqlArgs = new ArrayList<>();
+        insertInfo.forEach(item -> {
+            List<List> lists = OrgInfoHotelEntity.orgInfoHotelEntityToSqlList(item, "");
+            insertSqlArgs.addAll(lists);
+        });
+        log.info("将待插入数据插入数据表中： " + insertSqlArgs.size());
+        if (!insertSqlArgs.isEmpty()) {
+            boolean insertSuccess = recordSet.executeBatchSql(OrgInfoHotelEntity.getInsertSql(), insertSqlArgs);
+            if (!insertSuccess) {
+                log.error("批量插入权限数据失败！" + OrgInfoHotelEntity.getInsertSql() + "； " +
+                        JSON.toJSONString(insertSqlArgs.get(0)));
+            }
+        }
+        List<OrgInfoHotelEntity> updateDetachDetailList = new ArrayList<>();
+        List<OrgInfoHotelEntity> insertDetachDetailList = new ArrayList<>();
+        for (OrgInfoHotelEntity orgInfoHotelEntity : updateInfo) {
+            log.info("循环查询权限ID： " + orgInfoHotelEntity);
+            Integer detachdetailId1 = mapper.selectSysdetachdetailByInfoIdAndYh(orgInfoHotelEntity.getInfoId(), 1);
+            if (null != detachdetailId1 && detachdetailId1 > 0) {
+//                需要更新
+                OrgInfoHotelEntity copy = OrgInfoHotelEntity.copy(orgInfoHotelEntity);
+                copy.setId(String.valueOf(detachdetailId1));
+                copy.setSourceType(1);
+                updateDetachDetailList.add(copy);
+            }
+            Integer detachdetailId2 = mapper.selectSysdetachdetailByInfoIdAndYh(orgInfoHotelEntity.getInfoId(), 2);
+            if (null != detachdetailId2 && detachdetailId2 > 0) {
+//                需要更新
+                OrgInfoHotelEntity copy = OrgInfoHotelEntity.copy(orgInfoHotelEntity);
+                copy.setId(String.valueOf(detachdetailId2));
+                copy.setSourceType(2);
+                updateDetachDetailList.add(copy);
+            }
+            boolean hasSourceType1 = null == detachdetailId1 || detachdetailId1 < 0;
+            boolean hasSourceType2 = null == detachdetailId2 || detachdetailId2 < 0;
+            if (hasSourceType1 && hasSourceType2) {
+//                需要插入
+                insertDetachDetailList.add(orgInfoHotelEntity);
+            }
+        }
+        log.info("需要插入的数据： " + insertDetachDetailList.size());
+        log.info("需要更新的数据： " + updateDetachDetailList.size());
+        insertSqlArgs.clear();
+        insertDetachDetailList.forEach(item -> {
+            List<List> lists = OrgInfoHotelEntity.orgInfoHotelEntityToSqlList(item, "");
+            insertSqlArgs.addAll(lists);
+        });
+        if (!insertSqlArgs.isEmpty()) {
+            boolean insertSuccess = recordSet.executeBatchSql(OrgInfoHotelEntity.getInsertSql(), insertSqlArgs);
+            if (!insertSuccess) {
+                log.error("批量插入权限数据失败！" + OrgInfoHotelEntity.getInsertSql() + "； " +
+                        JSON.toJSONString(insertSqlArgs.get(0)));
+            }
+        }
+
+        List<List> updateSqlArgs = new ArrayList<>();
+        updateDetachDetailList.forEach(item -> {
+            List lists = OrgInfoHotelEntity.orgInfoHotelEntityToSqlUpdateList(item);
+            updateSqlArgs.add(lists);
+        });
+        if (!updateSqlArgs.isEmpty()) {
+            boolean updateSuccess = recordSet.executeBatchSql(OrgInfoHotelEntity.getUpdateSql(), updateSqlArgs);
+            if (!updateSuccess) {
+                log.error("批量跟新权限数据失败！" + OrgInfoHotelEntity.getUpdateSql() + "； " +
+                        JSON.toJSONString(insertSqlArgs.get(0)));
+            }
+        }
+
+
+//        特殊权限设置
+        List<String> idList = mapper.selectBrotherDeptIds(supportCenterDeptId);
+        Integer infoId = mapper.selectInfoIdByCnTitle("支持中心分权查看");
+
+        if (null == infoId || infoId < 0) {
+//            插入
+            OrgInfoHotelEntity orgInfoHotelEntity = new OrgInfoHotelEntity();
+            orgInfoHotelEntity.setDeptId(Util.join(idList, ","));
+            boolean insertSuccess = mapper.insertSysdetachinfo("支持中心分权查看");
+            if (insertSuccess) {
+//          查询最大ID
+                infoId = mapper.selectIdByCntitle("支持中心分权查看");
+                orgInfoHotelEntity.setInfoId(infoId);
+                List<List> lists = OrgInfoHotelEntity.orgInfoHotelEntityToSqlList(orgInfoHotelEntity, supportCenterDeptId);
+                if (!lists.isEmpty()) {
+                    boolean b = recordSet.executeBatchSql(OrgInfoHotelEntity.getInsertSql(), lists);
+                    if (!b) {
+                        log.error("插入特殊权限失败！" + OrgInfoHotelEntity.getInsertSql() + " : " + JSON.toJSONString(lists));
+                    }
+                }
+            }
+        } else {
+//            更新
+            Integer sysdetachId1 = mapper.selectSysdetachdetailByInfoIdAndYh(infoId, 1);
+            Integer sysdetachId2 = mapper.selectSysdetachdetailByInfoIdAndYh(infoId, 2);
+            OrgInfoHotelEntity orgInfoHotelEntity = new OrgInfoHotelEntity();
+            orgInfoHotelEntity.setDeptId(Util.join(idList, ","));
+            orgInfoHotelEntity.setInfoId(infoId);
+            orgInfoHotelEntity.setId(String.valueOf(sysdetachId1));
+            orgInfoHotelEntity.setSourceType(1);
+            List list = OrgInfoHotelEntity.orgInfoHotelEntityToSqlUpdateList(orgInfoHotelEntity);
+            if (!list.isEmpty()) {
+                recordSet.executeUpdate(OrgInfoHotelEntity.getUpdateSql(), list);
+            }
+            orgInfoHotelEntity.setId(String.valueOf(sysdetachId2));
+            orgInfoHotelEntity.setSourceType(2);
+            if (!list.isEmpty()) {
+                recordSet.executeUpdate(OrgInfoHotelEntity.getUpdateSql(), list);
+            }
+        }
+
+        AppDetachComInfo appDetachComInfo = new AppDetachComInfo();
+        appDetachComInfo.resetAppDetachInfo();
+    }
+
+    /**
+     * 插入信息表数据
+     *
+     * @param orgInfoHotelEntity 信息数据实体
+     */
+    private void insertSysdetachinfo(OrgInfoHotelEntity orgInfoHotelEntity) {
+        Integer integer = mapper.selectIdByCntitle(orgInfoHotelEntity.getCnTitle());
+        if (null != integer && integer > 0) {
+            orgInfoHotelEntity.setInfoId(integer);
+            orgInfoHotelEntity.setUpdate("true");
+            return;
+        }
+        boolean insertSuccess = mapper.insertSysdetachinfo(orgInfoHotelEntity.getCnTitle());
+        if (insertSuccess) {
+//          查询最大ID
+            Integer infoId = mapper.selectIdByCntitle(orgInfoHotelEntity.getCnTitle());
+            orgInfoHotelEntity.setInfoId(infoId);
+            orgInfoHotelEntity.setUpdate("false");
+        }
+    }
+
+
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_igh/schedule/decentralization/entity/OrgInfoHotelEntity.java b/src/main/youhong_ai_old_src/weaver/aiyh_igh/schedule/decentralization/entity/OrgInfoHotelEntity.java
new file mode 100644
index 0000000..1ca00b3
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_igh/schedule/decentralization/entity/OrgInfoHotelEntity.java
@@ -0,0 +1,104 @@
+package weaver.aiyh_igh.schedule.decentralization.entity;
+
+import com.google.common.base.Strings;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * <h1>组织 信息</h1>
+ * <p>create 2022/7/15 13:31</p>
+ *
+ * @author ayh
+ */
+
+@Data
+public class OrgInfoHotelEntity {
+    /**
+     * orgInfo id
+     */
+    private String id;
+    private String cnTitle;
+    private String deptId;
+    private String hotelId;
+    private Integer infoId;
+    private String update;
+    private Integer sourceType;
+
+
+    public static OrgInfoHotelEntity copy(OrgInfoHotelEntity orgInfoHotelEntity){
+        OrgInfoHotelEntity orgInfo = new OrgInfoHotelEntity();
+        orgInfo.setInfoId(orgInfoHotelEntity.getInfoId());
+        orgInfo.setUpdate(orgInfoHotelEntity.getUpdate());
+        orgInfo.setHotelId(orgInfoHotelEntity.getHotelId());
+        orgInfo.setCnTitle(orgInfoHotelEntity.getCnTitle());
+        orgInfo.setDeptId(orgInfoHotelEntity.getDeptId());
+        orgInfo.setId(orgInfoHotelEntity.getId());
+        return orgInfo;
+    }
+
+
+    public static List<List> orgInfoHotelEntityToSqlList(OrgInfoHotelEntity orgInfoHotelEntity,String sourceId){
+        if (Strings.isNullOrEmpty(sourceId)){
+            sourceId = orgInfoHotelEntity.getDeptId();
+        }
+        List<List> result = new ArrayList<>();
+        List list = new ArrayList<>();
+//        infoId
+        list.add(orgInfoHotelEntity.getInfoId());
+//        sourcetype - 1查看范围 2 对象   对象A 查看范围B表示A可以查看B
+        list.add("1");
+//        content id
+        list.add(orgInfoHotelEntity.getDeptId());
+//        type1  类别 1- 人力资源 2- 分部 3- 部门 4- 角色
+        list.add("3");
+//        seclevel 安全等级
+        list.add("0");
+//        seclevelto 安全等级结束
+        list.add("100");
+//        ISCONTAINS 好像是是否包含下级
+        list.add("1");
+//        操作人，随便写的两个字符，表示自己操作的数据，然后用于后期更新数据的标识
+        list.add("yh");
+        result.add(list);
+
+        List list2 = new ArrayList<>();
+//        infoId
+        list2.add(orgInfoHotelEntity.getInfoId());
+//        sourcetype - 1查看范围 2 对象   对象A 查看范围B表示A可以查看B
+        list2.add("2");
+//        content id
+        list2.add(sourceId);
+//        type1  类别 1- 人力资源 2- 分部 3- 部门 4- 角色
+        list2.add("3");
+//        seclevel 安全等级
+        list2.add("0");
+//        seclevelto 安全等级结束
+        list2.add("100");
+//        ISCONTAINS 好像是是否包含下级
+        list2.add("1");
+//        操作人，随便写的两个字符，表示自己操作的数据，然后用于后期更新数据的标识
+        list2.add("yh");
+        result.add(list2);
+        return result;
+    }
+
+
+    public static List orgInfoHotelEntityToSqlUpdateList(OrgInfoHotelEntity orgInfoHotelEntity){
+        List list = new ArrayList<>();
+        list.add(orgInfoHotelEntity.getDeptId());
+        list.add(orgInfoHotelEntity.getId());
+        list.add(orgInfoHotelEntity.getSourceType());
+        return list;
+    }
+
+    public static String getInsertSql(){
+        return "insert into sysdetachdetail (infoid,sourcetype,content," +
+                "type1,seclevel,seclevelto,ISCONTAINS,OPERATOR) values (?,?,?,?,?,?,?,?);";
+    }
+
+    public static String getUpdateSql(){
+        return "update sysdetachdetail set content = ? where id = ? and sourcetype = ?";
+    }
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_igh/schedule/decentralization/mapper/DecentralizationMapper.java b/src/main/youhong_ai_old_src/weaver/aiyh_igh/schedule/decentralization/mapper/DecentralizationMapper.java
new file mode 100644
index 0000000..7e0742a
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_igh/schedule/decentralization/mapper/DecentralizationMapper.java
@@ -0,0 +1,57 @@
+package weaver.aiyh_igh.schedule.decentralization.mapper;
+
+import aiyh.utils.annotation.recordset.Insert;
+import aiyh.utils.annotation.recordset.ParamMapper;
+import aiyh.utils.annotation.recordset.Select;
+import aiyh.utils.annotation.recordset.SqlMapper;
+import weaver.aiyh_igh.schedule.decentralization.entity.OrgInfoHotelEntity;
+
+import java.util.List;
+
+/**
+ * <h1>数据库查询</h1>
+ * <p>create 2022/7/15 13:18</p>
+ *
+ * @author ayh
+ */
+
+@SqlMapper
+public interface DecentralizationMapper {
+    /**
+     * 查询酒店信息
+     * @return 酒店信息
+     */
+    @Select("select ufht.hotelid hotel_id,ufog.cn_title,ufog.id,hrdp.id dept_id " +
+            "            from uf_hotelinfo ufht  left join uf_orginfo ufog on ufht.hotelnamezh = ufog.cn_title " +
+            "            left join hrmdepartment hrdp on hrdp.outkey = ufog.deptid")
+    List<OrgInfoHotelEntity> selectCnTileFromOrginfo();
+
+
+    /**
+     * 插入权限数据信息
+     * @param cnTitle 酒店名称
+     * @return 是否插入成功
+     */
+    @Insert("insert into sysdetachinfo (name,DESCRIPTION ) values (#{cnTitle},#{cnTitle})")
+    boolean insertSysdetachinfo(@ParamMapper("cnTitle") String cnTitle);
+
+    /**
+     * 查询当前插入的数据的最大的id
+     * @param cnTitle 酒店名称
+     * @return 信息id
+     */
+    @Select("select max(id) from sysdetachinfo where name = #{cnTitle}")
+    Integer selectIdByCntitle(@ParamMapper("cnTitle") String cnTitle);
+
+    @Select("select max(id) from sysdetachdetail where infoid = #{infoId} and OPERATOR = 'yh' and sourcetype = #{sourceType}")
+    Integer selectSysdetachdetailByInfoIdAndYh(@ParamMapper("infoId") Integer infoId,
+                                               @ParamMapper("sourceType") Integer sourceType);
+
+    @Select("select id from hrmdepartment where SUPDEPID = ( " +
+            " select SUPDEPID from hrmdepartment where id = #{supportCenterDeptId} " +
+            ")")
+    List<String> selectBrotherDeptIds(String supportCenterDeptId);
+
+    @Select("select max(id) from sysdetachinfo where name = #{supportCenterCnTitle}")
+    Integer selectInfoIdByCnTitle(@ParamMapper("supportCenterCnTitle") String supportCenterCnTitle);
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_intercept/ChangeStatusIntercept.java b/src/main/youhong_ai_old_src/weaver/aiyh_intercept/ChangeStatusIntercept.java
new file mode 100644
index 0000000..55544f3
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_intercept/ChangeStatusIntercept.java
@@ -0,0 +1,11 @@
+package weaver.aiyh_intercept;
+
+/**
+ * @author EBU7-dev1-ayh
+ * @create 2021/11/27 0027 14:06
+ * customer intercept
+ */
+
+
+public class ChangeStatusIntercept {
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_ji_feng/action/AdvancePaymentAction.java b/src/main/youhong_ai_old_src/weaver/aiyh_ji_feng/action/AdvancePaymentAction.java
new file mode 100644
index 0000000..def0942
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_ji_feng/action/AdvancePaymentAction.java
@@ -0,0 +1,207 @@
+package weaver.aiyh_ji_feng.action;
+
+import aiyh.utils.Util;
+import aiyh.utils.annotation.RequiredMark;
+import aiyh.utils.excention.CustomerException;
+import aiyh.utils.httpUtil.ResponeVo;
+import aiyh.utils.httpUtil.util.HttpUtils;
+import com.alibaba.fastjson.JSON;
+import com.api.xiao.commons.config.entity.RequestMappingConfig;
+import com.api.xiao.commons.config.service.DealWithMapping;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import lombok.Data;
+import org.apache.http.auth.AuthScope;
+import org.apache.http.auth.UsernamePasswordCredentials;
+import org.apache.http.client.CredentialsProvider;
+import org.apache.http.impl.client.BasicCredentialsProvider;
+import org.apache.log4j.Logger;
+import weaver.aiyh_ji_feng.mapper.ActionMapper;
+import weaver.conn.RecordSet;
+import weaver.interfaces.workflow.action.Action;
+import weaver.soa.workflow.request.RequestInfo;
+import weaver.workflow.request.RequestManager;
+import weaver.workflow.workflow.WorkflowBillComInfo;
+import weaver.workflow.workflow.WorkflowComInfo;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+
+/**
+ * <p>预付款申请数据推送</p>
+ * <p>create 2022/6/21 12:47</p>
+ *
+ * @author ayh
+ */
+@Data
+public class AdvancePaymentAction implements Action {
+    public static final int SUSSESSCODE = 200;
+    private final DealWithMapping dealWithMapping = new DealWithMapping();
+    private final HttpUtils httpUtil = new HttpUtils();
+    private final Logger logger = Util.getLogger();
+    private final ActionMapper mapper = Util.getMapper(ActionMapper.class);
+
+
+    @RequiredMark
+    private String dealersConfigMark;
+
+    @RequiredMark
+    private String userName;
+
+    @RequiredMark
+    private String password;
+
+    @RequiredMark
+    private String continueRunField;
+
+    @RequiredMark
+    private String continueRunValue;
+
+
+    @Override
+    public String execute(RequestInfo requestInfo) {
+        RequestManager requestManager = requestInfo.getRequestManager();
+        String billTable = requestManager.getBillTableName();
+        String requestId = requestInfo.getRequestid();
+        int workflowId = requestManager.getWorkflowid();
+        if ("".equals(billTable)) {
+            WorkflowComInfo workflowComInfo = new WorkflowComInfo();
+            String formId = workflowComInfo.getFormId(String.valueOf(workflowId));
+            WorkflowBillComInfo workflowBillComInfo = new WorkflowBillComInfo();
+            billTable = workflowBillComInfo.getTablename(formId);
+        }
+        logger.info("执行预付款流程推送数据action！");
+        try {
+
+            try {
+                boolean flag = Util.verifyRequiredField(this);
+                if (!flag) {
+                    logger.info("必填参数未填写，请检查配置参数！");
+                }
+            } catch (CustomerException e) {
+                e.printStackTrace();
+//            TODO 退回流程
+                Util.actionFail(requestManager, "action必填字段未配置，请先配置action配置信息！");
+                return Action.FAILURE_AND_CONTINUE;
+            }
+            CredentialsProvider provider = new BasicCredentialsProvider();
+            UsernamePasswordCredentials credentials
+                    = new UsernamePasswordCredentials(this.userName, this.password);
+            logger.info("userName: " + userName + "  password: " + password);
+            provider.setCredentials(AuthScope.ANY, credentials);
+
+            httpUtil.setCredentialsProvider(provider);
+
+            httpUtil.getGlobalCache().header.put("Content-Type","application/json");
+            dealWithMapping.setMainTable(billTable);
+            RequestMappingConfig requestMappingConfig = dealWithMapping.treeDealWithUniqueCode(dealersConfigMark);
+            RecordSet recordSet = mapper.selectMainRs(billTable, requestId);
+            String mainId = "0";
+            boolean isRun = false;
+            if (recordSet.next()) {
+                mainId = recordSet.getString("id");
+                String value = recordSet.getString(continueRunField);
+                String[] continueRunValues = continueRunValue.split(",");
+//            如果不满足继续执行条件则直接返回成功
+                for (String runValue : continueRunValues) {
+                    if (runValue != null && runValue.equals(value)) {
+                        isRun = true;
+                    }
+                }
+
+            } else {
+//            TODO 退回流程
+                logger.error("未查询到流程主数据！无法推送数据！");
+                Util.actionFail(requestManager, "未查询到流程主数据，请联系开发人员排查问题！");
+                return Action.FAILURE_AND_CONTINUE;
+            }
+            if(!isRun){
+                return  Action.SUCCESS;
+            }
+            String requestUrl = requestMappingConfig.getRequestUrl();
+            logger.info("流程参数接受正常，并且符合流程数据推送条件！");
+            Map<String, Object> requestParam = dealWithMapping.getRequestParam(recordSet, requestMappingConfig);
+            logger.info("解析后请求参数：" + JSON.toJSONString(requestParam));
+            ResponeVo responeVo = new ResponeVo();
+            int n = 0;
+            do {
+                Map<String, String> heardMap = getHeardMap();
+                try {
+                    logger.info("请求参数：" + requestUrl + ":=> " + JSON.toJSONString(requestParam) + " :=> " + JSON.toJSONString(heardMap));
+                    responeVo = httpUtil.apiPost(requestUrl, requestParam, heardMap);
+                    logger.info("请求结果：" + responeVo.getEntityString());
+                } catch (IOException e) {
+                    responeVo.setCode(0);
+                    logger.error("无法链接请求对方接口，请检查请求参数和认证信息！" + Util.getErrString(e));
+                }
+                if (responeVo.getCode() == SUSSESSCODE) {
+                    Map<String, Object> entityMap = null;
+                    try {
+                        entityMap = responeVo.getEntityMap();
+                    } catch (JsonProcessingException e) {
+                        e.printStackTrace();
+                    }
+                    Map<String, Object> response_context = (Map<String, Object>) entityMap.get("RESPONSE_CONTEXT");
+//                    TBUS处理本次请求生成的唯一ID
+                    String process_id = String.valueOf(response_context.get("PROCESS_ID"));
+//                    TBUS调用目标RFC的状态码 200正常
+                    String rfc_code = String.valueOf(response_context.get("RFC_CODE"));
+//                    异常信息
+                    String rfc_reason = String.valueOf(response_context.get("RFC_REASON"));
+
+//                    响应消息
+                    Map<String,Object> response_body = (Map<String, Object>) entityMap.get("RESPONSE_BODY");
+                    Map<String,Object> output = (Map<String, Object>) response_body.get("OUTPUT");
+                    if (output == null || !"200".equals(rfc_code)){
+                        Util.actionFail(requestManager,"接口调用失败失败信息：" + rfc_reason);
+                        return Action.FAILURE_AND_CONTINUE;
+                    }
+//                    会计年度
+                    String gjahr = String.valueOf(output.get("GJAHR"));
+//                    会计凭证
+                    String belnr = String.valueOf(output.get("BELNR"));
+                    Map<String,Object> aReturn = (Map<String, Object>) output.get("RETURN");
+                    String msgty = String.valueOf(aReturn.get("MSGTY"));
+                    String msgtx = String.valueOf(aReturn.get("MSGTX"));
+                    if(!"s".equalsIgnoreCase(msgty)){
+//                        失败
+                        Util.actionFail(requestManager,"推送数据异常，" + msgtx);
+                        return Action.FAILURE_AND_CONTINUE;
+                    }
+
+                    Map<String, Object> updateMap = new HashMap<>();
+                    updateMap.put("process_id", process_id);
+                    updateMap.put("rfc_code", rfc_code);
+                    updateMap.put("rfc_reason", rfc_reason);
+                    updateMap.put("gjahr", gjahr);
+                    updateMap.put("belnr", belnr);
+                    updateMap.put("repetition_mark", heardMap.get("jf_applicationid"));
+//                    回写数据
+                    String updateSql = Util.builderUpdateSql(billTable, updateMap);
+                    updateSql = updateSql + " where requestid = " + requestId;
+                    boolean flag = mapper.updateBackData(updateSql, updateMap);
+                    if (!flag) {
+                        logger.error("推送预付款数据回写字段失败！" + updateSql + " ==> " + updateMap);
+                    }
+//                    结束重试循环
+                    break;
+                }
+            } while (responeVo.getCode() != 200 && n++ < 5);
+        }catch (Exception e){
+            logger.error("actin 出现异常！ 异常信息：" + Util.getErrString(e));
+            Util.actionFail(requestManager,"action异常，请联系开发者！");
+            return Action.FAILURE_AND_CONTINUE;
+        }
+        return Action.SUCCESS;
+    }
+
+    private Map<String,String> getHeardMap(){
+        Map<String,String> heard = new HashMap<>();
+        heard.put("jf_svc","IFA0001");
+        heard.put("jf_applicationid", UUID.randomUUID().toString());
+        heard.put("jf_sender","OA");
+        heard.put("jf_receiver","SAP");
+        return heard;
+    }
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_ji_feng/action/FixedPricingAction.java b/src/main/youhong_ai_old_src/weaver/aiyh_ji_feng/action/FixedPricingAction.java
new file mode 100644
index 0000000..3559301
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_ji_feng/action/FixedPricingAction.java
@@ -0,0 +1,171 @@
+package weaver.aiyh_ji_feng.action;
+
+import aiyh.utils.Util;
+import aiyh.utils.annotation.RequiredMark;
+import aiyh.utils.excention.CustomerException;
+import aiyh.utils.httpUtil.ResponeVo;
+import aiyh.utils.httpUtil.util.HttpUtils;
+import com.alibaba.fastjson.JSON;
+import com.api.xiao.commons.config.entity.RequestMappingConfig;
+import com.api.xiao.commons.config.service.DealWithMapping;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import lombok.Data;
+import org.apache.http.auth.AuthScope;
+import org.apache.http.auth.UsernamePasswordCredentials;
+import org.apache.http.client.CredentialsProvider;
+import org.apache.http.impl.client.BasicCredentialsProvider;
+import org.apache.log4j.Logger;
+import weaver.aiyh_ji_feng.mapper.ActionMapper;
+import weaver.conn.RecordSet;
+import weaver.interfaces.workflow.action.Action;
+import weaver.soa.workflow.request.RequestInfo;
+import weaver.workflow.request.RequestManager;
+import weaver.workflow.workflow.WorkflowBillComInfo;
+import weaver.workflow.workflow.WorkflowComInfo;
+
+import java.io.IOException;
+import java.util.*;
+
+/**
+ * <h1>定点定价流程数据推送</h1>
+ * <p>create 2022/7/5 18:11</p>
+ *
+ * @author ayh
+ */
+@Data
+public class FixedPricingAction implements Action {
+
+
+    private final DealWithMapping dealWithMapping = new DealWithMapping();
+    private final HttpUtils httpUtil = new HttpUtils();
+    private final Logger logger = Util.getLogger();
+    private final ActionMapper mapper = Util.getMapper(ActionMapper.class);
+
+    @RequiredMark
+    private String dealersConfigMark;
+
+    @RequiredMark
+    private String userName;
+
+    @RequiredMark
+    private String password;
+
+    @Override
+    public String execute(RequestInfo requestInfo) {
+        RequestManager requestManager = requestInfo.getRequestManager();
+        String billTable = requestManager.getBillTableName();
+        String requestId = requestInfo.getRequestid();
+        int workflowId = requestManager.getWorkflowid();
+        if ("".equals(billTable)) {
+            WorkflowComInfo workflowComInfo = new WorkflowComInfo();
+            String formId = workflowComInfo.getFormId(String.valueOf(workflowId));
+            WorkflowBillComInfo workflowBillComInfo = new WorkflowBillComInfo();
+            billTable = workflowBillComInfo.getTablename(formId);
+        }
+        try {
+            boolean flag = Util.verifyRequiredField(this);
+            if (!flag) {
+                logger.info("必填参数未填写，请检查配置参数！");
+            }
+        } catch (CustomerException e) {
+            e.printStackTrace();
+//            TODO 退回流程
+            Util.actionFail(requestManager, "action必填字段未配置，请先配置action配置信息！");
+            return Action.FAILURE_AND_CONTINUE;
+        }
+        try {
+
+            CredentialsProvider provider = new BasicCredentialsProvider();
+            UsernamePasswordCredentials credentials
+                    = new UsernamePasswordCredentials(this.userName, this.password);
+            provider.setCredentials(AuthScope.ANY, credentials);
+            httpUtil.setCredentialsProvider(provider);
+            httpUtil.getGlobalCache().header.put("Content-Type","application/json");
+            dealWithMapping.setMainTable(billTable);
+            RequestMappingConfig requestMappingConfig = dealWithMapping.treeDealWithUniqueCode(dealersConfigMark);
+            String requestUrl = requestMappingConfig.getRequestUrl();
+            RecordSet recordSet = mapper.selectMainRs(billTable, requestId);
+            if (!recordSet.next()) {
+                Util.actionFail(requestManager,"没能查询到流程数据，请联系系统管理员！");
+                return  Action.FAILURE_AND_CONTINUE;
+            }
+            Map<String, Object> requestParam = dealWithMapping.getRequestParam(recordSet, requestMappingConfig);
+            logger.info("解析后请求参数：" + JSON.toJSONString(requestParam));
+            ResponeVo responeVo = new ResponeVo();
+            int n = 0;
+            do {
+                Map<String, String> heardMap = getHeardMap();
+                try {
+                    responeVo = httpUtil.apiPost(requestUrl, requestParam, heardMap);
+                    logger.info("请求结果：" + responeVo.getEntityString());
+                } catch (IOException e) {
+                    responeVo.setCode(0);
+                    logger.error("无法链接请求对方接口，请检查请求参数和认证信息！");
+                }
+                if (responeVo.getCode() == 200) {
+                    Map<String, Object> entityMap = null;
+                    try {
+                        entityMap = responeVo.getEntityMap();
+                    } catch (JsonProcessingException e) {
+                        e.printStackTrace();
+                    }
+                    Map<String, Object> response_context = (Map<String, Object>) entityMap.get("RESPONSE_CONTEXT");
+//                    TBUS处理本次请求生成的唯一ID
+                    String process_id = String.valueOf(response_context.get("PROCESS_ID"));
+//                    TBUS调用目标RFC的状态码 200正常
+                    String rfc_code = String.valueOf(response_context.get("RFC_CODE"));
+//                    异常信息
+                    String rfc_reason = String.valueOf(response_context.get("RFC_REASON"));
+
+//                    响应消息
+                    Map<String, Object> response_body = (Map<String, Object>) entityMap.get("RESPONSE_BODY");
+                    Map<String, Object> output = (Map<String, Object>) response_body.get("OUTPUT");
+                    if (output == null || !"200".equals(rfc_code)){
+                        Util.actionFail(requestManager,"接口调用失败失败信息：" + rfc_reason);
+                        return Action.FAILURE_AND_CONTINUE;
+                    }
+//                    erp 编号 采购凭证号
+                    String erp_no = String.valueOf(output.get("ERP_NO"));
+                    Map<String,Object> aReturn = (Map<String, Object>) output.get("RETURN");
+                    String msgty = String.valueOf(aReturn.get("MSGTY"));
+                    String msgtx = String.valueOf(aReturn.get("MSGTX"));
+                    if(!"s".equalsIgnoreCase(msgty)){
+//                        失败
+                        Util.actionFail(requestManager,"推送数据异常，" + msgtx);
+                        return Action.FAILURE_AND_CONTINUE;
+                    }
+//                  TODO 流程表单添加辅助字段
+                    Map<String, Object> updateMap = new HashMap<>();
+                    updateMap.put("process_id", process_id);
+                    updateMap.put("rfc_code", rfc_code);
+                    updateMap.put("rfc_reason", rfc_reason);
+                    updateMap.put("erpno", erp_no);
+                    updateMap.put("repetition_mark", heardMap.get("jf_applicationid"));
+//                    回写数据
+                    String updateSql = Util.builderUpdateSql(billTable, updateMap);
+                    updateSql = updateSql + " where requestid = " + requestId;
+                    boolean flag = mapper.updateBackData(updateSql, updateMap);
+                    if (!flag) {
+                        logger.error("推送定点定价回写字段失败！" + updateSql + " ==> " + updateMap);
+                    }
+//                    结束重试循环
+                    break;
+                }
+            } while (responeVo.getCode() != 200 && n++ < 5);
+        } catch (Exception e) {
+            logger.error("actin 出现异常！ 异常信息：" + Util.getErrString(e));
+            Util.actionFail(requestManager,"action异常，请联系开发者！");
+            return Action.FAILURE_AND_CONTINUE;
+        }
+        return Action.SUCCESS;
+    }
+
+    private Map<String, String> getHeardMap() {
+        Map<String, String> heard = new HashMap<>();
+        heard.put("jf_svc", "IOA0006");
+        heard.put("jf_applicationid", UUID.randomUUID().toString());
+        heard.put("jf_sender", "OA");
+        heard.put("jf_receiver", "SAP");
+        return heard;
+    }
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_ji_feng/action/PurchaseRequestAction.java b/src/main/youhong_ai_old_src/weaver/aiyh_ji_feng/action/PurchaseRequestAction.java
new file mode 100644
index 0000000..1b80501
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_ji_feng/action/PurchaseRequestAction.java
@@ -0,0 +1,200 @@
+package weaver.aiyh_ji_feng.action;
+
+import aiyh.utils.Util;
+import aiyh.utils.annotation.ActionDefaultTestValue;
+import aiyh.utils.annotation.PrintParamMark;
+import aiyh.utils.annotation.RequiredMark;
+import aiyh.utils.excention.CustomerException;
+import aiyh.utils.httpUtil.ResponeVo;
+import aiyh.utils.httpUtil.util.HttpUtils;
+import com.alibaba.fastjson.JSON;
+import com.api.xiao.commons.config.entity.RequestMappingConfig;
+import com.api.xiao.commons.config.service.DealWithMapping;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import lombok.Data;
+import org.apache.http.auth.AuthScope;
+import org.apache.http.auth.UsernamePasswordCredentials;
+import org.apache.http.client.CredentialsProvider;
+import org.apache.http.impl.client.BasicCredentialsProvider;
+import org.apache.log4j.Logger;
+import weaver.aiyh_ji_feng.mapper.ActionMapper;
+import weaver.conn.RecordSet;
+import weaver.interfaces.workflow.action.Action;
+import weaver.soa.workflow.request.RequestInfo;
+import weaver.workflow.request.RequestManager;
+import weaver.workflow.workflow.WorkflowBillComInfo;
+import weaver.workflow.workflow.WorkflowComInfo;
+
+import java.io.IOException;
+import java.util.*;
+
+/**
+ * <p>采购申请</p>
+ * <p>create 2022/6/27 11:00</p>
+ *
+ * @author ayh
+ */
+
+@Data
+public class PurchaseRequestAction implements Action {
+
+    private final DealWithMapping dealWithMapping = new DealWithMapping();
+    private final HttpUtils httpUtil = new HttpUtils();
+    private final Logger logger = Util.getLogger();
+    private final ActionMapper mapper = Util.getMapper(ActionMapper.class);
+
+    @ActionDefaultTestValue("CGSQ")
+    @RequiredMark
+    @PrintParamMark
+    private String dealersConfigMark;
+
+    @ActionDefaultTestValue("sb-76db6002-ea25-4cb0-81e1-e2bfa8d9b977!b1147|it-rt-prd-orhrp18r!b39")
+    @RequiredMark
+    @PrintParamMark
+    private String userName;
+
+    @ActionDefaultTestValue("a9e48b3c-2181-47a3-b20a-161a0f531fce$eYIBsP2dtf4CpsO7bDiM8eFv6SXngTTg0P_vtI5aVTc=")
+    @RequiredMark
+    @PrintParamMark
+    private String password;
+
+
+    @Override
+    public String execute(RequestInfo requestInfo) {
+        RequestManager requestManager = requestInfo.getRequestManager();
+        String billTable = requestManager.getBillTableName();
+        String requestId = requestInfo.getRequestid();
+        int workflowId = requestManager.getWorkflowid();
+        if ("".equals(billTable)) {
+            WorkflowComInfo workflowComInfo = new WorkflowComInfo();
+            String formId = workflowComInfo.getFormId(String.valueOf(workflowId));
+            WorkflowBillComInfo workflowBillComInfo = new WorkflowBillComInfo();
+            billTable = workflowBillComInfo.getTablename(formId);
+        }
+        try {
+            boolean flag = Util.verifyRequiredField(this);
+            if (!flag) {
+                logger.info("必填参数未填写，请检查配置参数！");
+            }
+        } catch (CustomerException e) {
+            e.printStackTrace();
+//            TODO 退回流程
+            Util.actionFail(requestManager, e.getMessage());
+            return Action.FAILURE_AND_CONTINUE;
+        }
+        try {
+
+            CredentialsProvider provider = new BasicCredentialsProvider();
+            UsernamePasswordCredentials credentials
+                    = new UsernamePasswordCredentials(this.userName, this.password);
+            provider.setCredentials(AuthScope.ANY, credentials);
+            httpUtil.setCredentialsProvider(provider);
+            httpUtil.getGlobalCache().header.put("Content-Type","application/json");
+            dealWithMapping.setMainTable(billTable);
+            RequestMappingConfig requestMappingConfig = dealWithMapping.treeDealWithUniqueCode(dealersConfigMark);
+            String requestUrl = requestMappingConfig.getRequestUrl();
+            RecordSet recordSet = mapper.selectMainRs(billTable, requestId);
+            if (!recordSet.next()) {
+                Util.actionFail(requestManager,"没能查询到流程数据，请联系系统管理员！");
+                return  Action.FAILURE_AND_CONTINUE;
+            }
+            Map<String, Object> requestParam = dealWithMapping.getRequestParam(recordSet, requestMappingConfig);
+            logger.info("解析后请求参数：" + JSON.toJSONString(requestParam));
+            Map<String,Object> request_body = (Map<String, Object>) requestParam.get("REQUEST_BODY");
+            Map<String,Object> input = (Map<String, Object>) request_body.get("INPUT");
+            List<Map<String,Object>> items = (List<Map<String, Object>>) input.get("ITEMS");
+            for (Map<String, Object> item : items) {
+                String assetNo = String.valueOf(item.get("PRACCONUT"));
+                List<Map<String,Object>> list = new ArrayList<>();
+                Map<String,Object> map = new HashMap<>(4);
+                list.add(map);
+                map.put("ASSET_NO",assetNo);
+                item.put("PRACCONUT",list);
+            }
+            logger.info("最终解析后参数请求参数：" + JSON.toJSONString(requestParam));
+            ResponeVo responeVo = new ResponeVo();
+            int n = 0;
+            do {
+                Map<String, String> heardMap = getHeardMap();
+                try {
+                    responeVo = httpUtil.apiPost(requestUrl, requestParam, heardMap);
+                    logger.info("请求结果：" + responeVo.getEntityString());
+                } catch (IOException e) {
+                    responeVo.setCode(0);
+                    logger.error("无法链接请求对方接口，请检查请求参数和认证信息！");
+                }
+                if (responeVo.getCode() == 200) {
+                    Map<String, Object> entityMap = null;
+                    try {
+                        entityMap = responeVo.getEntityMap();
+                    } catch (JsonProcessingException e) {
+                        e.printStackTrace();
+                    }
+                    Map<String, Object> response_context = (Map<String, Object>) entityMap.get("RESPONSE_CONTEXT");
+//                    TBUS处理本次请求生成的唯一ID
+                    String process_id = String.valueOf(response_context.get("PROCESS_ID"));
+//                    TBUS调用目标RFC的状态码 200正常
+                    String rfc_code = String.valueOf(response_context.get("RFC_CODE"));
+//                    异常信息
+                    String rfc_reason = String.valueOf(response_context.get("RFC_REASON"));
+
+//                    响应消息
+                    Map<String, Object> response_body = (Map<String, Object>) entityMap.get("RESPONSE_BODY");
+                    Map<String, Object> output = (Map<String, Object>) response_body.get("OUTPUT");
+                    if (output == null || !"200".equals(rfc_code)){
+                        Util.actionFail(requestManager,"接口调用失败失败信息：" + rfc_reason);
+                        return Action.FAILURE_AND_CONTINUE;
+                    }
+//                    采购编号
+                    String banfn = String.valueOf(output.get("BANFN"));
+                    Map<String,Object> aReturn = (Map<String, Object>) output.get("RETURN");
+                    String msgty = String.valueOf(aReturn.get("MSGTY"));
+                    String msgtx = String.valueOf(aReturn.get("MSGTX"));
+                    if(!"s".equalsIgnoreCase(msgty)){
+//                        失败
+                        Util.actionFail(requestManager,"推送数据异常，" + msgtx);
+                        return Action.FAILURE_AND_CONTINUE;
+                    }
+//                  TODO 流程表单添加辅助字段
+                    Map<String, Object> updateMap = new HashMap<>();
+//                   sap处理ID
+                    updateMap.put("process_id", process_id);
+//                    请求结果编号
+                    updateMap.put("rfc_code", rfc_code);
+//                    异常信息
+                    updateMap.put("rfc_reason", rfc_reason);
+//                    采购申请编号
+                    updateMap.put("banfn", banfn);
+//                    重复标识
+                    updateMap.put("repetition_mark", heardMap.get("jf_applicationid"));
+
+//                    已经添加了字段，回写到主表sapcgsqdh 采购申请编号
+                    updateMap.put("sapcgsqdh",banfn);
+//                    回写数据
+                    String updateSql = Util.builderUpdateSql(billTable, updateMap);
+                    updateSql = updateSql + " where requestid = " + requestId;
+                    boolean flag = mapper.updateBackData(updateSql, updateMap);
+                    if (!flag) {
+                        logger.error("推送采购申请回写字段失败！" + updateSql + " ==> " + updateMap);
+                    }
+//                    结束重试循环
+                    break;
+                }
+            } while (responeVo.getCode() != 200 && n++ < 5);
+        } catch (Exception e) {
+            logger.error("actin 出现异常！ 异常信息：" + Util.getErrString(e));
+            Util.actionFail(requestManager,"action异常，请联系开发者！");
+            return Action.FAILURE_AND_CONTINUE;
+        }
+        return Action.SUCCESS;
+    }
+
+    private Map<String, String> getHeardMap() {
+        Map<String, String> heard = new HashMap<>();
+        heard.put("jf_svc", "IOA0005");
+        heard.put("jf_applicationid", UUID.randomUUID().toString());
+        heard.put("jf_sender", "OA");
+        heard.put("jf_receiver", "SAP");
+        return heard;
+    }
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_ji_feng/action/ReimbursementAction.java b/src/main/youhong_ai_old_src/weaver/aiyh_ji_feng/action/ReimbursementAction.java
new file mode 100644
index 0000000..9fe1723
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_ji_feng/action/ReimbursementAction.java
@@ -0,0 +1,207 @@
+package weaver.aiyh_ji_feng.action;
+
+import aiyh.utils.Util;
+import aiyh.utils.annotation.RequiredMark;
+import aiyh.utils.excention.CustomerException;
+import aiyh.utils.httpUtil.ResponeVo;
+import aiyh.utils.httpUtil.util.HttpUtils;
+import com.alibaba.fastjson.JSON;
+import com.api.xiao.commons.config.entity.RequestMappingConfig;
+import com.api.xiao.commons.config.service.DealWithMapping;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import lombok.Data;
+import org.apache.http.auth.AuthScope;
+import org.apache.http.auth.UsernamePasswordCredentials;
+import org.apache.http.client.CredentialsProvider;
+import org.apache.http.impl.client.BasicCredentialsProvider;
+import org.apache.log4j.Logger;
+import weaver.aiyh_ji_feng.mapper.ActionMapper;
+import weaver.conn.RecordSet;
+import weaver.interfaces.workflow.action.Action;
+import weaver.soa.workflow.request.RequestInfo;
+import weaver.workflow.request.RequestManager;
+import weaver.workflow.workflow.WorkflowBillComInfo;
+import weaver.workflow.workflow.WorkflowComInfo;
+
+import java.io.IOException;
+import java.util.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * <p>费用报销流程</p>
+ * <p>create 2022/6/22 15:25</p>
+ *
+ * @author ayh
+ */
+@Data
+public class ReimbursementAction implements Action {
+    private final DealWithMapping dealWithMapping = new DealWithMapping();
+    private final HttpUtils httpUtil = new HttpUtils();
+    private final Logger logger = Util.getLogger();
+    private final ActionMapper mapper = Util.getMapper(ActionMapper.class);
+
+    @RequiredMark
+    private String dealersConfigMark;
+
+    @RequiredMark
+    private String userName;
+
+    @RequiredMark
+    private String password;
+
+
+    @Override
+    public String execute(RequestInfo requestInfo) {
+
+        RequestManager requestManager = requestInfo.getRequestManager();
+        String billTable = requestManager.getBillTableName();
+        String requestId = requestInfo.getRequestid();
+        int workflowId = requestManager.getWorkflowid();
+        if ("".equals(billTable)) {
+            WorkflowComInfo workflowComInfo = new WorkflowComInfo();
+            String formId = workflowComInfo.getFormId(String.valueOf(workflowId));
+            WorkflowBillComInfo workflowBillComInfo = new WorkflowBillComInfo();
+            billTable = workflowBillComInfo.getTablename(formId);
+        }
+        try {
+            boolean flag = Util.verifyRequiredField(this);
+            if (!flag) {
+                logger.info("必填参数未填写，请检查配置参数！");
+            }
+        } catch (CustomerException e) {
+            e.printStackTrace();
+//            TODO 退回流程
+            Util.actionFail(requestManager, "action必填字段未配置，请先配置action配置信息！");
+            return Action.FAILURE_AND_CONTINUE;
+        }
+        try {
+
+            CredentialsProvider provider = new BasicCredentialsProvider();
+            UsernamePasswordCredentials credentials
+                    = new UsernamePasswordCredentials(this.userName, this.password);
+            provider.setCredentials(AuthScope.ANY, credentials);
+            httpUtil.setCredentialsProvider(provider);
+            httpUtil.getGlobalCache().header.put("Content-Type", "application/json");
+            dealWithMapping.setMainTable(billTable);
+            RequestMappingConfig requestMappingConfig = dealWithMapping.treeDealWithUniqueCode(dealersConfigMark);
+            String requestUrl = requestMappingConfig.getRequestUrl();
+            RecordSet recordSet = mapper.selectMainRs(billTable, requestId);
+            if (!recordSet.next()) {
+                Util.actionFail(requestManager, "没能查询到流程数据，请联系系统管理员！");
+                return Action.FAILURE_AND_CONTINUE;
+            }
+            Map<String, Object> requestParam = dealWithMapping.getRequestParam(recordSet, requestMappingConfig);
+            logger.info("解析后请求参数：" + JSON.toJSONString(requestParam));
+            Map<String, Object> request_body = (Map<String, Object>) requestParam.get("REQUEST_BODY");
+            Map<String, Object> input = (Map<String, Object>) request_body.get("INPUT");
+            List<Map<String, Object>> items = (List<Map<String, Object>>) input.get("ITEMS");
+            List<Map<String, Object>> newItems = new ArrayList<>();
+            if (items != null) {
+                for (Map<String, Object> item : items) {
+//                    将一条明细拆分为两条数据
+                    Map<String, Object> afterTaxAmount = new HashMap<>();
+                    Map<String, Object> taxAmount = new HashMap<>();
+                    for (Map.Entry<String, Object> entry : item.entrySet()) {
+                        String key = entry.getKey();
+                        String pattern = "(?<key>\\S+)+_after";
+                        Pattern compile = Pattern.compile(pattern);
+                        Matcher matcher = compile.matcher(key);
+                        if (matcher.find()) {
+                            afterTaxAmount.put(matcher.group("key"), entry.getValue());
+                        } else {
+                            taxAmount.put(key, entry.getValue());
+                        }
+                    }
+                    newItems.add(afterTaxAmount);
+                    newItems.add(taxAmount);
+                }
+            }
+            Map<String, Object> total = (Map<String, Object>) requestParam.get("total");
+            newItems.add(total);
+            requestParam.remove("total");
+            input.put("ITEMS", newItems);
+            logger.info("最终请求参数：" + JSON.toJSONString(requestParam));
+            ResponeVo responeVo = new ResponeVo();
+            int n = 0;
+            do {
+                Map<String, String> heardMap = getHeardMap();
+                try {
+                    responeVo = httpUtil.apiPost(requestUrl, requestParam, heardMap);
+                    logger.info("请求结果：" + responeVo.getEntityString());
+                } catch (IOException e) {
+                    responeVo.setCode(0);
+                    logger.error("无法链接请求对方接口，请检查请求参数和认证信息！");
+                }
+                if (responeVo.getCode() == 200) {
+                    Map<String, Object> entityMap = null;
+                    try {
+                        entityMap = responeVo.getEntityMap();
+                    } catch (JsonProcessingException e) {
+                        e.printStackTrace();
+                        throw e;
+                    }
+                    Map<String, Object> response_context = (Map<String, Object>) entityMap.get("RESPONSE_CONTEXT");
+//                    TBUS处理本次请求生成的唯一ID
+                    String process_id = String.valueOf(response_context.get("PROCESS_ID"));
+//                    TBUS调用目标RFC的状态码 200正常
+                    String rfc_code = String.valueOf(response_context.get("RFC_CODE"));
+//                    异常信息
+                    String rfc_reason = String.valueOf(response_context.get("RFC_REASON"));
+
+//                    响应消息
+                    Map<String, Object> response_body = (Map<String, Object>) entityMap.get("RESPONSE_BODY");
+                    Map<String, Object> output = (Map<String, Object>) response_body.get("OUTPUT");
+                    if (output == null || !"200".equals(rfc_code)) {
+                        Util.actionFail(requestManager, "接口调用失败失败信息：" + rfc_reason);
+                        return Action.FAILURE_AND_CONTINUE;
+                    }
+//                    会计年度
+                    String gjahr = String.valueOf(output.get("GJAHR"));
+//                    会计凭证
+                    String belnr = String.valueOf(output.get("BELNR"));
+                    Map<String, Object> aReturn = (Map<String, Object>) output.get("RETURN");
+                    String msgty = String.valueOf(aReturn.get("MSGTY"));
+                    String msgtx = String.valueOf(aReturn.get("MSGTX"));
+                    if (!"s".equalsIgnoreCase(msgty)) {
+//                        失败
+                        Util.actionFail(requestManager, "推送数据异常，" + msgtx);
+                        return Action.FAILURE_AND_CONTINUE;
+                    }
+
+                    Map<String, Object> updateMap = new HashMap<>();
+                    updateMap.put("process_id", process_id);
+                    updateMap.put("rfc_code", rfc_code);
+                    updateMap.put("rfc_reason", rfc_reason);
+                    updateMap.put("gjahr", gjahr);
+                    updateMap.put("belnr", belnr);
+                    updateMap.put("repetition_mark", heardMap.get("jf_applicationid"));
+//                    回写数据
+                    String updateSql = Util.builderUpdateSql(billTable, updateMap);
+                    updateSql = updateSql + " where requestid = " + requestId;
+                    boolean flag = mapper.updateBackData(updateSql, updateMap);
+                    if (!flag) {
+                        logger.error("推送预付款数据回写字段失败！" + updateSql + " ==> " + updateMap);
+                    }
+//                    结束重试循环
+                    break;
+                }
+            } while (responeVo.getCode() != 200 && n++ < 5);
+        } catch (Exception e) {
+            logger.error("actin 出现异常！ 异常信息：" + Util.getErrString(e));
+            Util.actionFail(requestManager, "action异常，请联系开发者！");
+            return Action.FAILURE_AND_CONTINUE;
+        }
+        return Action.SUCCESS;
+    }
+
+
+    private Map<String, String> getHeardMap() {
+        Map<String, String> heard = new HashMap<>();
+        heard.put("jf_svc", "IFA0002");
+        heard.put("jf_applicationid", UUID.randomUUID().toString());
+        heard.put("jf_sender", "OA");
+        heard.put("jf_receiver", "SAP");
+        return heard;
+    }
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_ji_feng/mapper/ActionMapper.java b/src/main/youhong_ai_old_src/weaver/aiyh_ji_feng/mapper/ActionMapper.java
new file mode 100644
index 0000000..31add5e
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_ji_feng/mapper/ActionMapper.java
@@ -0,0 +1,26 @@
+package weaver.aiyh_ji_feng.mapper;
+
+import aiyh.utils.annotation.recordset.*;
+import weaver.conn.RecordSet;
+
+import java.util.Map;
+
+/**
+ * <p>数据查询</p>
+ * <p>create 2022/6/21 12:49</p>
+ *
+ * @author ayh
+ */
+
+@SqlMapper
+public interface ActionMapper {
+
+    @Select("select * from $t{tableName} where requestid = #{requestId}")
+    RecordSet selectMainRs(@ParamMapper("tableName") String billTable, @ParamMapper("requestId") String requestId);
+
+    @Select("select * from $t{tableName} where mainid = #{mainId}")
+    RecordSet selectDetailRs(@ParamMapper("tableName") String detailTable, @ParamMapper("mainId") String mainId);
+
+    @Update(custom = true)
+    boolean updateBackData(@SqlString String sql, Map<String,Object> param);
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_ji_feng/util/AcctasscatValueHandler.java b/src/main/youhong_ai_old_src/weaver/aiyh_ji_feng/util/AcctasscatValueHandler.java
new file mode 100644
index 0000000..23eb2d0
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_ji_feng/util/AcctasscatValueHandler.java
@@ -0,0 +1,33 @@
+package weaver.aiyh_ji_feng.util;
+
+import com.api.xiao.commons.utils.CustomerValueHandler;
+import weaver.conn.RecordSet;
+
+/**
+ * <p>ACCTASSCAT自定义值处理</p>
+ * <p>create 2022/7/4 12:03</p>
+ *
+ * @author ayh
+ */
+
+public class AcctasscatValueHandler implements CustomerValueHandler {
+
+    @Override
+    public Object getValue(RecordSet main, RecordSet detail) {
+        String cgsqlx = getRsValue(main, "cgsqlx");
+        String xmh = getRsValue(main, "xmh");
+        if("0".equals(cgsqlx)){
+            return "";
+        }
+        if("2".equals(cgsqlx) && "".equals(xmh)){
+            return "K";
+        }
+        if("2".equals(cgsqlx)){
+            return "F";
+        }
+        if("1".equals(cgsqlx)){
+            return "A";
+        }
+        return "";
+    }
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_jitu/action/fadada/action/CreateContractAction.java b/src/main/youhong_ai_old_src/weaver/aiyh_jitu/action/fadada/action/CreateContractAction.java
new file mode 100644
index 0000000..a76eeb5
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_jitu/action/fadada/action/CreateContractAction.java
@@ -0,0 +1,120 @@
+package weaver.aiyh_jitu.action.fadada.action;
+
+import aiyh.utils.Util;
+import aiyh.utils.action.CusBaseAction;
+import aiyh.utils.annotation.*;
+import aiyh.utils.excention.CustomerException;
+import lombok.Setter;
+import weaver.aiyh_jitu.action.fadada.mapper.CreateContractActionMapper;
+import weaver.aiyh_jitu.schedule.registerfadada.constants.FaDaDaConstants;
+import weaver.aiyh_jitu.schedule.registerfadada.util.JiTuFaDaDaUtil;
+import weaver.conn.RecordSet;
+import weaver.hrm.User;
+import weaver.workflow.request.RequestManager;
+import weaver.xiao.commons.config.entity.RequestMappingConfig;
+import weaver.xiao.commons.config.service.DealWithMapping;
+
+import java.util.Map;
+
+/**
+ * <h1>创建法大大合同action</h1>
+ *
+ * <p>create: 2022-08-15 17:32</p>
+ *
+ * @author aiyh EBU7-dev-1
+ */
+
+@Setter
+@ActionDesc(value = "法大大创建合同action", author = "aiyh")
+public class CreateContractAction extends CusBaseAction {
+	
+	private final DealWithMapping dealWithMapping = new DealWithMapping();
+	
+	private final CreateContractActionMapper mapper = Util.getMapper(CreateContractActionMapper.class);
+	
+	
+	@RequiredMark("请求接口配置的唯一标识")
+	@PrintParamMark
+	@ActionDefaultTestValue("create_contract")
+	private String onlyMark;
+	
+	
+	@ActionOptionalParam(desc = "合同编号对应的接口中的参数名", value = "contractNo")
+	@PrintParamMark
+	@ActionDefaultTestValue("contractNo")
+	private String contractNoField = "contractNo";
+	
+	
+	@RequiredMark("合同编号回写至流程主表字段的字段名，即流程中需要保存合同编号")
+	@PrintParamMark
+	@ActionDefaultTestValue("contract_no")
+	private String contractNoOaField;
+	
+	
+	@ActionOptionalParam(desc = "是否自动提交流程：true -自动提交； false -不自动提交", value = "false")
+	@PrintParamMark
+	@ActionDefaultTestValue("false")
+	private String doSubmit = "false";
+	
+	
+	@Override
+	public void doSubmit(String requestId, String billTable, int workflowId, User user, RequestManager requestManager) {
+		try {
+			dealWithMapping.setMainTable(billTable);
+			RequestMappingConfig requestMappingConfig = dealWithMapping.treeDealWithUniqueCode(onlyMark);
+			String requestUrl = requestMappingConfig.getRequestUrl();
+			RecordSet recordSet = mapper.selectMainRs(billTable, requestId);
+			if (!recordSet.next()) {
+				throw new CustomerException("can not query request data by requestId: " + requestId);
+			}
+			Map<String, Object> requestParam = dealWithMapping.getRequestParam(recordSet, requestMappingConfig);
+			Map<String, Object> result = JiTuFaDaDaUtil.createContract(requestUrl, requestParam);
+			String contractNo = (String) requestParam.get(contractNoField);
+			backWritContractNo(billTable, requestId, contractNo);
+			writContractInfoLog(billTable, requestId, contractNo, contractNoOaField);
+			if (Boolean.parseBoolean(doSubmit)) {
+				Util.submitWorkflowThread(Integer.valueOf(requestId), 1, "流程自动提交：" + result.get("data"), 60);
+			}
+		} catch (Exception e) {
+			log.error("create contract failure！ " + Util.getErrString(e));
+			Util.actionFailException(requestManager, "create contract failure! ");
+		}
+	}
+	
+	/**
+	 * <h2>编写合同信息日志</h2>
+	 *
+	 * @param billTable         流程表表名称
+	 * @param requestId         请求ID
+	 * @param contractNo        合同编号
+	 * @param contractNoOaField 合同编号字段
+	 */
+	private void writContractInfoLog(String billTable, String requestId, String contractNo, String contractNoOaField) {
+		String logTable = FaDaDaConstants.UF_JT_CONTRACT_INFO_TABLE_NAME;
+		String modeId = Util.getModeIdByTableName(logTable);
+		int dataId = Util.getModeDataId(logTable, Integer.parseInt(modeId), 1);
+		boolean success = mapper.updateContractLog(billTable, requestId, contractNo, contractNoOaField, logTable);
+		if (success) {
+			Util.rebuildModeDataShare(1, Integer.valueOf(modeId), dataId);
+			return;
+		}
+		mapper.deleteModeId(logTable, dataId);
+	}
+	
+	/**
+	 * <h2>数据回写主表</h2>
+	 *
+	 * @param billTable  主表表名
+	 * @param requestId  请求ID
+	 * @param contractNo 合同编号
+	 */
+	private void backWritContractNo(String billTable, String requestId, String contractNo) {
+		int n = 0;
+		while (!mapper.updateData(billTable, requestId, contractNo, contractNoOaField)) {
+			n++;
+			if (n > 5) {
+				return;
+			}
+		}
+	}
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_jitu/action/fadada/action/ManualSignContractAction.java b/src/main/youhong_ai_old_src/weaver/aiyh_jitu/action/fadada/action/ManualSignContractAction.java
new file mode 100644
index 0000000..78df1cd
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_jitu/action/fadada/action/ManualSignContractAction.java
@@ -0,0 +1,138 @@
+package weaver.aiyh_jitu.action.fadada.action;
+
+import aiyh.utils.Util;
+import aiyh.utils.action.CusBaseAction;
+import aiyh.utils.annotation.*;
+import aiyh.utils.excention.CustomerException;
+import aiyh.utils.httpUtil.util.HttpUtils;
+import lombok.Setter;
+import weaver.aiyh_jitu.action.fadada.mapper.ManualSignContractActionMapper;
+import weaver.aiyh_jitu.schedule.registerfadada.util.JiTuFaDaDaUtil;
+import weaver.conn.RecordSet;
+import weaver.hrm.User;
+import weaver.workflow.request.RequestManager;
+import weaver.xiao.commons.config.entity.RequestMappingConfig;
+import weaver.xiao.commons.config.service.DealWithMapping;
+
+import java.util.Map;
+
+/**
+ * <h1>手动签署合同</h1>
+ *
+ * <p>create: 2022-08-18 12:26</p>
+ *
+ * @author aiyh EBU7-dev-1
+ */
+
+@Setter
+@ActionDesc(value = "法大大手动签署合同action", author = "aiyh")
+public class ManualSignContractAction extends CusBaseAction {
+
+    @ActionOptionalParam(desc = "transactionNo交易号存储于oa字段,不填写表示不会写如流程中", value = "")
+    @PrintParamMark
+    @ActionDefaultTestValue("")
+    private String transactionNoOaField = "";
+
+    @ActionOptionalParam(desc = "transactionNo交易号于请求参数中的字段名", value = "transactionNo")
+    @PrintParamMark
+    @ActionDefaultTestValue("transactionNo")
+    private String transactionNoField = "transactionNo";
+
+
+    @RequiredMark("合同手动签署的接口配置唯一标识")
+    @PrintParamMark
+    @ActionDefaultTestValue("manual_sign-contract")
+    private String onlyMark;
+
+
+    @ActionOptionalParam(desc = "保存合同签署链接字段，空表示不保存", value = "")
+    @PrintParamMark
+    @ActionDefaultTestValue("")
+    private String signUrlOaField = "";
+
+    @ActionOptionalParam(desc = "是否发送请求到法大大，通知员工签署", value = "false")
+    @PrintParamMark
+    @ActionDefaultTestValue("false")
+    private String sendSignToFaDaDa = "false";
+
+    @ActionOptionalParam(desc = "是否自动提交流程：true -自动提交； false -不自动提交", value = "false")
+    @PrintParamMark
+    @ActionDefaultTestValue("false")
+    private String doSubmit = "false";
+
+
+    private final DealWithMapping dealWithMapping = new DealWithMapping();
+
+    private final ManualSignContractActionMapper mapper = Util.getMapper(ManualSignContractActionMapper.class);
+
+
+    @Override
+    public void doSubmit(String requestId, String billTable, int workflowId, User user, RequestManager requestManager) {
+
+        dealWithMapping.setMainTable(billTable);
+        RequestMappingConfig requestMappingConfig = dealWithMapping.treeDealWithUniqueCode(onlyMark);
+        RecordSet recordSet = mapper.queryMainRs(billTable, requestId);
+        if (!recordSet.next()) {
+            throw new CustomerException(Util.logStr("can not query data for requestId is [{}]", requestId));
+        }
+        Map<String, Object> requestParam = dealWithMapping.getRequestParam(recordSet, requestMappingConfig);
+        String requestUrl = requestMappingConfig.getRequestUrl();
+        if (!Boolean.parseBoolean(sendSignToFaDaDa)) {
+            doSaveSignUrl(requestUrl, requestParam, billTable, requestId);
+            doSaveTransactionNo(requestParam, billTable, requestId);
+            if (Boolean.parseBoolean(doSubmit)) {
+                Util.submitWorkflowThread(Integer.valueOf(requestId), 1, "合同签署发起，流程自动提交！", 60);
+            }
+            return;
+        }
+        JiTuFaDaDaUtil.manualSignContract(requestUrl, requestParam);
+        doSaveSignUrl(requestUrl, requestParam, billTable, requestId);
+        doSaveTransactionNo(requestParam, billTable, requestId);
+        if (Boolean.parseBoolean(doSubmit)) {
+            Util.submitWorkflowThread(Integer.valueOf(requestId), 1, "合同签署发起，流程自动提交！", 60);
+        }
+    }
+
+    /**
+     * <h2>更新交易号到流程中</h2>
+     *
+     * @param requestParam 请求参数
+     * @param billTable    主表id
+     * @param requestId    请求ID
+     */
+    private void doSaveTransactionNo(Map<String, Object> requestParam, String billTable, String requestId) {
+        if (Util.isNullOrEmpty(transactionNoOaField)) {
+            return;
+        }
+        int n = 0;
+        String transactionNo = Util.null2String(requestParam.get(transactionNoField));
+        while (mapper.updateTransaction(billTable, requestId, transactionNoOaField, transactionNo)) {
+            n++;
+            if (n > 5) {
+                return;
+            }
+        }
+    }
+
+    /**
+     * <h2>保存签署连接到流程表单</h2>
+     *
+     * @param requestUrl   请求地址
+     * @param requestParam 请求参数
+     * @param billTable    流程主表
+     * @param requestId    请求id
+     */
+    private void doSaveSignUrl(String requestUrl, Map<String, Object> requestParam, String billTable, String requestId) {
+        if (Util.isNullOrEmpty(signUrlOaField)) {
+            return;
+        }
+        String signUrl = HttpUtils.urlHandle(requestUrl, requestParam);
+        int n = 0;
+        while (mapper.updateSignUrl(signUrl, billTable, requestId, signUrlOaField)) {
+            n++;
+            if (n > 5) {
+                return;
+            }
+        }
+    }
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_jitu/action/fadada/entity/WidgetDetailConfigMain.java b/src/main/youhong_ai_old_src/weaver/aiyh_jitu/action/fadada/entity/WidgetDetailConfigMain.java
new file mode 100644
index 0000000..1d80a49
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_jitu/action/fadada/entity/WidgetDetailConfigMain.java
@@ -0,0 +1,84 @@
+package weaver.aiyh_jitu.action.fadada.entity;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * <h1>控件映射规则配置表</h1>
+ *
+ * <p>create: 2022-08-17 17:53</p>
+ *
+ * @author aiyh EBU7-dev-1
+ */
+@Data
+public class WidgetDetailConfigMain {
+
+    /**
+     * ID
+     */
+    private Integer id;
+
+    /**
+     * 对应流程
+     */
+    private Integer workflowType;
+    /**
+     * 合同模板ID / 编号
+     */
+    private String templateId;
+    /**
+     * 配置唯一标识
+     */
+    private String onlyMark;
+    /**
+     * 描述信息
+     */
+    private String cusDesc;
+
+    private List<WidgetDetailConfigDetail> detailList;
+
+
+    @Data
+    public static class WidgetDetailConfigDetail {
+
+        /**
+         * id
+         */
+        private Integer id;
+        /**
+         * 控件名称
+         */
+        private String widgetName;
+
+        /**
+         * 控件类型
+         *
+         * @see weaver.aiyh_jitu.action.fadada.type.WidgetType
+         */
+        private Integer widgetType;
+
+        /**
+         * 取值方式
+         *
+         * @see weaver.aiyh_jitu.action.fadada.type.WidgetValueRule
+         */
+        private Integer valueRule;
+
+        /**
+         * 流程字段id
+         */
+        private Integer workflowField;
+
+        /**
+         * 自定义值
+         */
+        private String customerValue;
+
+        /**
+         * 流程字段名
+         */
+        private String workflowFieldName;
+
+    }
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_jitu/action/fadada/interfacies/OnlineWidgetDetailListCusInteface.java b/src/main/youhong_ai_old_src/weaver/aiyh_jitu/action/fadada/interfacies/OnlineWidgetDetailListCusInteface.java
new file mode 100644
index 0000000..784b6c2
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_jitu/action/fadada/interfacies/OnlineWidgetDetailListCusInteface.java
@@ -0,0 +1,188 @@
+package weaver.aiyh_jitu.action.fadada.interfacies;
+
+import aiyh.utils.Util;
+import aiyh.utils.excention.CustomerException;
+import cn.hutool.core.lang.Assert;
+import weaver.aiyh_jitu.action.fadada.entity.WidgetDetailConfigMain;
+import weaver.aiyh_jitu.action.fadada.mapper.CreateContractActionMapper;
+import weaver.aiyh_jitu.action.fadada.mapper.WidgetDetailConfigMapper;
+import weaver.aiyh_jitu.action.fadada.type.WidgetType;
+import weaver.aiyh_jitu.action.fadada.type.WidgetValueRule;
+import weaver.aiyh_jitu.schedule.registerfadada.util.JiTuFaDaDaUtil;
+import weaver.conn.RecordSet;
+import weaver.xiao.commons.config.entity.RequestMappingConfig;
+import weaver.xiao.commons.config.interfacies.CusInterfaceListValue;
+import weaver.xiao.commons.config.service.DealWithMapping;
+
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * <h1>自定义数组数据源，获取控件列表</h1>
+ *
+ * <p>create: 2022-08-15 18:01</p>
+ *
+ * @author aiyh EBU7-dev-1
+ */
+
+public class OnlineWidgetDetailListCusInteface implements CusInterfaceListValue {
+
+    private final DealWithMapping dealWithMapping = new DealWithMapping();
+    private final CreateContractActionMapper mapper = Util.getMapper(CreateContractActionMapper.class);
+
+    private final WidgetDetailConfigMapper widgetDetailConfigMapper = Util.getMapper(WidgetDetailConfigMapper.class);
+
+    /**
+     * <h2>查询控件列表</h2>
+     *
+     * @param pathParam 路径参数
+     *                  onlyMark -> 请求唯一标识；必填配置
+     *                  resultConfig -> 响应解析唯一标识：必填配置
+     * @param mainMap   主表数据
+     * @param mainTable 主表表明
+     * @return 控件列表解析后值
+     */
+    @Override
+    public List<Object> execute(Map<String, String> pathParam, Map<String, Object> mainMap, String mainTable) {
+        String onlyMark = pathParam.get("onlyMark");
+        String resultConfig = pathParam.get("resultConfig");
+        Assert.notEmpty(onlyMark, "The [onlyMark] configuration is not found," +
+                " please confirm whether the configuration parameters are fully configured!");
+        Assert.notEmpty(resultConfig, "The [resultConfig] configuration is not found," +
+                " please confirm whether the configuration parameters are fully configured!");
+        resultConfig = String.valueOf(mainMap.get("resultConfig"));
+        dealWithMapping.setMainTable(mainTable);
+        RequestMappingConfig requestMappingConfig = dealWithMapping.treeDealWithUniqueCode(onlyMark);
+        String requestUrl = requestMappingConfig.getRequestUrl();
+        String requestId = Util.null2String(mainMap.get("requestid"));
+        if (Util.isNullOrEmpty(requestId)) {
+            requestId = Util.null2String(mainMap.get("REQUESTID"));
+        }
+        RecordSet recordSet = mapper.selectMainRs(mainTable, requestId);
+        if (!recordSet.next()) {
+            throw new CustomerException("can not query request data by requestId: " + requestId);
+        }
+        // 获取请求参数
+        Map<String, Object> requestParam = dealWithMapping.getRequestParam(recordSet, requestMappingConfig);
+        // 请求控件列表
+        Map<String, Object> fetchResult = JiTuFaDaDaUtil.fetchOnlineWidgetDetailList(requestUrl, requestParam);
+        List<Object> list = (List<Object>) fetchResult.get("data");
+        // 整理控件列表； 控件名:控件类型
+        Map<String, Object> collect = list.stream().map(item -> (Map<String, Object>) item)
+                .collect(Collectors.toMap(item -> String.valueOf(item.get("name")), item -> item.get("type")));
+        List<Object> resultList = new ArrayList<>(list.size());
+        // 解析配置表控件信息
+        Map<String, Object> resultMapping = parseConfig(resultConfig, mainMap);
+        for (Map.Entry<String, Object> entry : resultMapping.entrySet()) {
+            Map<String, Object> item = new HashMap<>(8);
+            String type = Util.null2String(collect.get(entry.getKey())).toLowerCase();
+            switch (WidgetType.get(type)) {
+                case INPUT:
+                case TEXTAREA:
+                    item.put("name", entry.getKey());
+                    item.put("value", entry.getValue());
+                    break;
+                case CHECKBOX:
+                    // 只将只为true的数据上传
+                    boolean value = (boolean) entry.getValue();
+                    if (value) {
+                        item.put("name", entry.getKey());
+                        item.put("value", entry.getValue());
+                    }
+                    break;
+                default:
+                    throw new CustomerException("not supper widgetType!" + type);
+            }
+            resultList.add(item);
+        }
+        return resultList;
+    }
+
+
+    /**
+     * <h2>解析配置表数据</h2>
+     *
+     * @param resultConfig 控件规则配置表唯一标识
+     * @param mainMap      主表数据
+     * @return 解析后数据
+     */
+    private Map<String, Object> parseConfig(String resultConfig, Map<String, Object> mainMap) {
+        WidgetDetailConfigMain widgetDetailConfigMain = widgetDetailConfigMapper.queryConfigMainByOnlyMarkAndTempId(resultConfig);
+        Assert.notNull(widgetDetailConfigMain, "The relevant configuration data is not queried, " +
+                "please check whether the configuration table [uf_widget_config] is configured!");
+        // 查询配置规则明细表
+        List<WidgetDetailConfigMain.WidgetDetailConfigDetail> widgetDetailConfigDetailList = widgetDetailConfigMapper.queryWidgetDetailRuleListByMainId(String.valueOf(widgetDetailConfigMain.getTemplateId()));
+        widgetDetailConfigMain.setDetailList(widgetDetailConfigDetailList);
+        List<WidgetDetailConfigMain.WidgetDetailConfigDetail> detailList = widgetDetailConfigMain.getDetailList();
+        if (null == detailList || detailList.isEmpty()) {
+            return Collections.emptyMap();
+        }
+        Map<String, Object> result = new HashMap<>(8);
+        for (WidgetDetailConfigMain.WidgetDetailConfigDetail widgetDetailConfigDetail : detailList) {
+            Object value = getValue(widgetDetailConfigDetail, mainMap);
+            //    验证类型
+            WidgetType widgetType = WidgetType.get(widgetDetailConfigDetail.getWidgetType());
+            switch (widgetType) {
+                case INPUT:
+                case TEXTAREA:
+                    result.put(widgetDetailConfigDetail.getWidgetName(), String.valueOf(value));
+                    break;
+                case CHECKBOX:
+                    result.put(widgetDetailConfigDetail.getWidgetName(),
+                            widgetDetailConfigDetail.getCustomerValue().equals(String.valueOf(value)));
+                    break;
+                default:
+                    throw new CustomerException("not supper widgetType!" + widgetType.getValue());
+            }
+        }
+        return result;
+    }
+
+
+    /**
+     * <h2>根据取值规则获取对应的值</h2>
+     *
+     * @param widgetDetailConfigDetail 配置明细行数据
+     * @param mainMap                  主表火速句
+     * @return 值
+     */
+    private Object getValue(WidgetDetailConfigMain.WidgetDetailConfigDetail widgetDetailConfigDetail, Map<String, Object> mainMap) {
+        WidgetValueRule widgetValueRule = WidgetValueRule.get(widgetDetailConfigDetail.getValueRule());
+        Object value;
+        switch (widgetValueRule) {
+            case WORKFLOW_FIELD: {
+                String fieldName = widgetDetailConfigDetail.getWorkflowFieldName();
+                value = mainMap.get(fieldName);
+                break;
+            }
+            case CUSTOMER_SQL: {
+                // 目前只支持主表数据
+                String customerValue = widgetDetailConfigDetail.getCustomerValue();
+                String customerSql = Util.sbc2dbcCase(customerValue);
+                value = widgetDetailConfigMapper.queryCustomerSql(customerSql, mainMap);
+                break;
+            }
+            case DEFAULT_VALUE: {
+                value = widgetDetailConfigDetail.getCustomerValue();
+                break;
+            }
+            case CURRENT_TIME: {
+                String formatStr = Util.null2DefaultStr(widgetDetailConfigDetail.getCustomerValue(), "yyyy-MM-dd HH:mm:ss");
+                value = Util.getTime(formatStr);
+                break;
+            }
+            case UUID: {
+                String customerLength = widgetDetailConfigDetail.getCustomerValue();
+                if (Util.isNullOrEmpty(customerLength)) {
+                    value = UUID.randomUUID();
+                } else {
+                    value = Util.getRandomString(Integer.parseInt(customerLength));
+                }
+                break;
+            }
+            default:
+                throw new CustomerException("not supper value rule!" + widgetValueRule.getValue());
+        }
+        return value;
+    }
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_jitu/action/fadada/mapper/CreateContractActionMapper.java b/src/main/youhong_ai_old_src/weaver/aiyh_jitu/action/fadada/mapper/CreateContractActionMapper.java
new file mode 100644
index 0000000..802e451
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_jitu/action/fadada/mapper/CreateContractActionMapper.java
@@ -0,0 +1,74 @@
+package weaver.aiyh_jitu.action.fadada.mapper;
+
+import aiyh.utils.annotation.recordset.*;
+import weaver.conn.RecordSet;
+
+/**
+ * <h1></h1>
+ *
+ * <p>create: 2022-08-15 17:39</p>
+ *
+ * @author aiyh EBU7-dev-1
+ */
+
+@SqlMapper
+public interface CreateContractActionMapper {
+
+
+    /**
+     * 查询主表rs
+     *
+     * @param billTable 表名
+     * @param requestId requestid
+     * @return 结果rs
+     */
+    @Select("select * from $t{tableName} where requestid = #{requestId}")
+    RecordSet selectMainRs(@ParamMapper("tableName") String billTable, @ParamMapper("requestId") String requestId);
+
+    /**
+     * <h2>合同编号回写到主表</h2>
+     *
+     * @param billTable         表名
+     * @param requestId         请求ID
+     * @param contractNo        合同编号
+     * @param contractNoOaField 合同编号所在字段
+     * @return 是否更新成功
+     */
+    @Update("update $t{billTable} set $t{contractNoOaField} = #{contractNo} where requestid = #{requestId}")
+    boolean updateData(
+            @ParamMapper("billTable") String billTable,
+            @ParamMapper("requestId") String requestId,
+            @ParamMapper("contractNo") String contractNo,
+            @ParamMapper("contractNoOaField") String contractNoOaField);
+
+    /**
+     * <h2>更新合同日志信息</h2>
+     *
+     * @param billTable         流程表名
+     * @param requestId         请求ID
+     * @param contractNo        合同编号
+     * @param contractNoOaField 合同编号流程字段
+     * @param logTable          日志表名
+     * @return 是否更新成功
+     */
+    @Update("update $t{logTable} " +
+            "set request_id = #{request_id}," +
+            "    contract_no =#{contract_no} ," +
+            "    workflow_table =#{workflow_table} ," +
+            "    workflow_field =#{workflow_field}," +
+            "where id = #{id};")
+    boolean updateContractLog(@ParamMapper("workflow_table") String billTable,
+                              @ParamMapper("request_id") String requestId,
+                              @ParamMapper("contract_no") String contractNo,
+                              @ParamMapper("workflow_field") String contractNoOaField,
+                              @ParamMapper("logTable") String logTable);
+
+    /**
+     * <h2>删除建模表更新失败的数据ID</h2>
+     *
+     * @param logTable 建模表
+     * @param dataId   数据ID
+     */
+    @Delete("delete from $t{logTable} where id = #{id}")
+    void deleteModeId(@ParamMapper("logTable") String logTable, @ParamMapper("id") int dataId);
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_jitu/action/fadada/mapper/ManualSignContractActionMapper.java b/src/main/youhong_ai_old_src/weaver/aiyh_jitu/action/fadada/mapper/ManualSignContractActionMapper.java
new file mode 100644
index 0000000..d65347f
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_jitu/action/fadada/mapper/ManualSignContractActionMapper.java
@@ -0,0 +1,63 @@
+package weaver.aiyh_jitu.action.fadada.mapper;
+
+import aiyh.utils.annotation.recordset.ParamMapper;
+import aiyh.utils.annotation.recordset.Select;
+import aiyh.utils.annotation.recordset.SqlMapper;
+import aiyh.utils.annotation.recordset.Update;
+import weaver.conn.RecordSet;
+
+/**
+ * <h1></h1>
+ *
+ * <p>create: 2022-08-19 09:55</p>
+ *
+ * @author aiyh EBU7-dev-1
+ */
+
+@SqlMapper
+public interface ManualSignContractActionMapper {
+
+    /**
+     * <h2>查询主表数据</h2>
+     *
+     * @param tableName 表明
+     * @param requestId 请求ID
+     * @return 主表结果集
+     */
+    @Select("select * from $t{tableName} where requestid = #{requestId}")
+    RecordSet queryMainRs(
+            @ParamMapper("tableName") String tableName,
+            @ParamMapper("requestId") String requestId
+    );
+
+
+    /**
+     * 更新签署连接到主表中
+     *
+     * @param signUrl        签署链接
+     * @param billTable      表名
+     * @param requestId      请求ID
+     * @param signUrlOaField 签署链接字段
+     * @return 是否更新成功
+     */
+    @Update("update $t{billTable} set $t{signUrlOaField} = #{signUrl} where requestid = #{requestId}")
+    boolean updateSignUrl(@ParamMapper("signUrl") String signUrl,
+                          @ParamMapper("billTable") String billTable,
+                          @ParamMapper("requestId") String requestId,
+                          @ParamMapper("signUrlOaField") String signUrlOaField);
+
+    /**
+     * <h2>更新交易号到表单中</h2>
+     *
+     * @param billTable            主表表名
+     * @param requestId            请求ID
+     * @param transactionNoOaField 交易号字段
+     * @param transactionNo        交易号
+     * @return 是否更新成功
+     */
+    @Update("update $t{billTable} set $t{transactionNoOaField} = #{transactionNo} where requestid = #{requestId}")
+    boolean updateTransaction(@ParamMapper("billTable") String billTable,
+                              @ParamMapper("requestId") String requestId,
+                              @ParamMapper("transactionNoOaField") String transactionNoOaField,
+                              @ParamMapper("transactionNo") String transactionNo);
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_jitu/action/fadada/mapper/WidgetDetailConfigMapper.java b/src/main/youhong_ai_old_src/weaver/aiyh_jitu/action/fadada/mapper/WidgetDetailConfigMapper.java
new file mode 100644
index 0000000..eb3e891
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_jitu/action/fadada/mapper/WidgetDetailConfigMapper.java
@@ -0,0 +1,52 @@
+package weaver.aiyh_jitu.action.fadada.mapper;
+
+import aiyh.utils.annotation.recordset.ParamMapper;
+import aiyh.utils.annotation.recordset.Select;
+import aiyh.utils.annotation.recordset.SqlMapper;
+import aiyh.utils.annotation.recordset.SqlString;
+import weaver.aiyh_jitu.action.fadada.entity.WidgetDetailConfigMain;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <h1>配置信息查询</h1>
+ *
+ * <p>create: 2022-08-17 18:16</p>
+ *
+ * @author aiyh EBU7-dev-1
+ */
+
+@SqlMapper
+public interface WidgetDetailConfigMapper {
+
+    /**
+     * <h2>查询控件映射规则配置表主表数据</h2>
+     *
+     * @param onlyMark 唯一标识
+     * @return 控件映射规则主表数据
+     */
+    @Select("select * from uf_widget_config where only_mark = #{onlyMark}")
+    WidgetDetailConfigMain queryConfigMainByOnlyMarkAndTempId(@ParamMapper("onlyMark") String onlyMark);
+
+
+    /**
+     * <h2>查询控件映射规则配置表明细表数据</h2>
+     *
+     * @param mainId 主表ID
+     * @return 控件映射规则明细表数据
+     */
+    @Select("select * from uf_widget_config_dt1 where mainid = #{mainId}")
+    List<WidgetDetailConfigMain.WidgetDetailConfigDetail> queryWidgetDetailRuleListByMainId(@ParamMapper("mainId") String mainId);
+
+
+    /**
+     * <h2>查询自定义SQL值</h2>
+     *
+     * @param sql     自定义SQL
+     * @param mainMap 主表数据
+     * @return 查询数据
+     */
+    @Select(custom = true)
+    String queryCustomerSql(@SqlString String sql, Map<String, Object> mainMap);
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_jitu/action/fadada/type/WidgetType.java b/src/main/youhong_ai_old_src/weaver/aiyh_jitu/action/fadada/type/WidgetType.java
new file mode 100644
index 0000000..5b247fb
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_jitu/action/fadada/type/WidgetType.java
@@ -0,0 +1,58 @@
+package weaver.aiyh_jitu.action.fadada.type;
+
+import java.util.EnumSet;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * <h1>控件类型</h1>
+ *
+ * <p>create: 2022-08-17 17:58</p>
+ *
+ * @author aiyh EBU7-dev-1
+ */
+
+public enum WidgetType {
+
+    INPUT(0, "input", "input类型"),
+
+    CHECKBOX(1, "checkbox", "checkbox类型，值为true或false，接口只需要提供为true的checkbox控件"),
+
+    TEXTAREA(3, "textarea", "textarea类型");
+    private final Integer value;
+
+    private final String name;
+
+    WidgetType(Integer value, String name, String desc) {
+        this.value = value;
+        this.name = name;
+    }
+
+    private static final Map<Integer, WidgetType> LOOKUP;
+    private static final Map<String, WidgetType> LOOKUP_NAME;
+
+    static {
+        LOOKUP = new HashMap<>();
+        LOOKUP_NAME = new HashMap<>();
+        for (WidgetType enumType : EnumSet.allOf(WidgetType.class)) {
+            LOOKUP.put(enumType.getValue(), enumType);
+            LOOKUP_NAME.put(enumType.getName(), enumType);
+        }
+    }
+
+    public static WidgetType get(int value) {
+        return LOOKUP.get(value);
+    }
+
+    public static WidgetType get(String name) {
+        return LOOKUP_NAME.get(name);
+    }
+
+    public String getName() {
+        return this.name;
+    }
+
+    public Integer getValue() {
+        return this.value;
+    }
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_jitu/action/fadada/type/WidgetValueRule.java b/src/main/youhong_ai_old_src/weaver/aiyh_jitu/action/fadada/type/WidgetValueRule.java
new file mode 100644
index 0000000..f582c5a
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_jitu/action/fadada/type/WidgetValueRule.java
@@ -0,0 +1,49 @@
+package weaver.aiyh_jitu.action.fadada.type;
+
+import java.util.EnumSet;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * <h1>获取值方式枚举</h1>
+ *
+ * <p>create: 2022-08-17 18:06</p>
+ *
+ * @author aiyh EBU7-dev-1
+ */
+
+public enum WidgetValueRule {
+
+    WORKFLOW_FIELD(0, "流程字段"),
+
+    CUSTOMER_SQL(1, "流程字段"),
+
+    DEFAULT_VALUE(2, "默认值"),
+
+    CURRENT_TIME(3, "当前时间"),
+
+    UUID(4, "随机数");
+    private final Integer value;
+
+
+    WidgetValueRule(Integer value, String des) {
+        this.value = value;
+    }
+
+    private static final Map<Integer, WidgetValueRule> LOOKUP;
+
+    static {
+        LOOKUP = new HashMap<>();
+        for (WidgetValueRule enumType : EnumSet.allOf(WidgetValueRule.class)) {
+            LOOKUP.put(enumType.getValue(), enumType);
+        }
+    }
+
+    public static WidgetValueRule get(int value) {
+        return LOOKUP.get(value);
+    }
+
+    public Integer getValue() {
+        return this.value;
+    }
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_jitu/pushdata/action/PushDataToCentralPlatformAction.java b/src/main/youhong_ai_old_src/weaver/aiyh_jitu/pushdata/action/PushDataToCentralPlatformAction.java
new file mode 100644
index 0000000..ef0260c
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_jitu/pushdata/action/PushDataToCentralPlatformAction.java
@@ -0,0 +1,423 @@
+package weaver.aiyh_jitu.pushdata.action;
+
+import aiyh.utils.Util;
+import aiyh.utils.annotation.*;
+import aiyh.utils.excention.CustomerException;
+import aiyh.utils.httpUtil.ResponeVo;
+import aiyh.utils.httpUtil.util.HttpUtils;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.google.common.base.Strings;
+import lombok.Data;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.log4j.Logger;
+import weaver.aiyh_jitu.pushdata.before_processor.interfaces.CusActionBeforeProcessor;
+import weaver.aiyh_jitu.pushdata.entity.TokenEntity;
+import weaver.aiyh_jitu.pushdata.mapper.ReleaseFlowMapper;
+import weaver.aiyh_jitu.pushdata.service.CusActionPostProcessor;
+import weaver.aiyh_jitu.pushdata.service.toones.GetUUIDProcessorProcessorImpl;
+import weaver.aiyh_jitu.pushdata.util.JiTuTokenUtil;
+import weaver.conn.RecordSet;
+import weaver.interfaces.workflow.action.Action;
+import weaver.soa.workflow.request.RequestInfo;
+import weaver.workflow.request.RequestManager;
+import weaver.workflow.workflow.WorkflowBillComInfo;
+import weaver.workflow.workflow.WorkflowComInfo;
+import weaver.xiao.commons.config.entity.RequestMappingConfig;
+import weaver.xiao.commons.config.service.DealWithMapping;
+
+import javax.ws.rs.core.MediaType;
+import java.io.IOException;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * <h1>国内、国际发版数据推送</h1>
+ * <p>create 2022/7/12 19:04</p>
+ *
+ * @author ayh
+ */
+
+@Data
+@ActionDesc(value = "oa发版申请，国内、国际发版数据推送、通用中台数据推送Action，" +
+		                    "不包含请求回写逻辑，仅做数据推送，通过成功标识判断是否数据推送成功！", author = "aiyh")
+public class PushDataToCentralPlatformAction implements Action {
+	
+	public static final int SUCCESS_CODE = 200;
+	public static final String IS_NOT_NULL = "{is not null}";
+	public static final String EQUALS = "{equals}";
+	public static final String EQUALS_IGNORE_CASE = "{equalsIgnoreCase}";
+	public static final String WRITE_SUCCESS = "0";
+	public static final String WRITE_ERROR = "1";
+	
+	@ActionOptionalParam(desc = "环境标识字段必填！uat表示测试环境、pro表示正式环境！", value = "uat")
+	@ActionDefaultTestValue("uat")
+	@PrintParamMark
+	private String environmentMark = "uat";
+	
+	@RequiredMark("数据推送唯一标识，接口数据配置表中的唯一标识字段!")
+	@ActionDefaultTestValue("oaToOnes_workItem")
+	@PrintParamMark
+	private String onlyMark;
+	
+	@ActionOptionalParam(value = "default", desc = "业务名称，该配置为配置文件中中环境标识后的业务名称！")
+	@ActionDefaultTestValue("default")
+	@PrintParamMark
+	private String businessMark = "default";
+	
+	@ActionOptionalParam(desc = "成功标识接口字段，接口响应判断成功与否的字段！配合successMark使用，如data：{is not null},当data不为null和" +
+			                            "不为\"\"时表示成功；data.succ: {equals} true," +
+			                            "当data.succ等于true时表示成功，或 data.succ: {equalsIgnoreCase} true，表示data.succ等于true（忽略大小写）时成功；",
+			value = "succ")
+	@ActionDefaultTestValue("succ")
+	@PrintParamMark
+	private String successField = "succ";
+	
+	@ActionOptionalParam(desc = "成功标识，接口成功的标识！必须配合successField使用。如data：{is not null}," +
+			                            "当data不为null和不为\"\"时表示成功；data.succ: {equals} true," +
+			                            "当data.succ等于true时表示成功，或 data.succ: {equalsIgnoreCase} true，表示data.succ等于true（忽略大小写）时成功；",
+			value = "{equals} true")
+	@ActionDefaultTestValue("{equals} true")
+	@PrintParamMark
+	private String successMark = "{equals} true";
+	
+	@PrintParamMark
+	@ActionOptionalParam(value = "1", desc = "请求参数的根节点参数类型 1- 对象 2- 数组")
+	private String rootParamType = "1";
+	
+	@ActionOptionalParam(desc = "自定义流程后置处理器增强方法全路径类名", value = "")
+	@PrintParamMark
+	private String cusActionPostProcessorClass;
+	
+	@ActionOptionalParam(desc = "自定义流程前置处理器增强方法全路径类名", value = "")
+	@PrintParamMark
+	private String cusActionBeforeProcessorClass;
+	
+	// 错误信息字段
+	@ActionOptionalParam(desc = "错误信息字段", value = "")
+	@PrintParamMark
+	private String errorMsgField;
+	
+	@ActionOptionalParam(desc = "是否推送成功", value = "")
+	@PrintParamMark
+	// pushNccSuccess
+	private String writeSuccessField;
+	
+	@ActionOptionalParam(desc = "ncc返回信息", value = "")
+	@PrintParamMark
+	// nccfhxx
+	private String errorDescField;
+	
+	@ActionOptionalParam(desc = "ncc返回code", value = "")
+	@PrintParamMark
+	// ncc_code
+	private String nccCodeField;
+	
+	// 用来更新接口返回信息到表单字段
+	private final RecordSet updateRs = new RecordSet();
+	
+	private final DealWithMapping dealWithMapping = new DealWithMapping();
+	
+	private final Logger log = Util.getLogger();
+	
+	private final ReleaseFlowMapper mapper = Util.getMapper(ReleaseFlowMapper.class);
+	
+	private final HttpUtils httpUtils = new HttpUtils();
+	
+	{
+		httpUtils.getGlobalCache().header.put("Content-Type", MediaType.APPLICATION_JSON);
+	}
+	
+	@Override
+	public String execute(RequestInfo requestInfo) {
+		log.info("push PushDataToCentralPlatformAction data start!");
+		RequestManager requestManager = requestInfo.getRequestManager();
+		String billTable = requestManager.getBillTableName();
+		String requestId = requestInfo.getRequestid();
+		int workflowId = requestManager.getWorkflowid();
+		if ("".equals(billTable)) {
+			WorkflowComInfo workflowComInfo = new WorkflowComInfo();
+			String formId = workflowComInfo.getFormId(String.valueOf(workflowId));
+			WorkflowBillComInfo workflowBillComInfo = new WorkflowBillComInfo();
+			billTable = workflowBillComInfo.getTablename(formId);
+		}
+		try {
+			Util.verifyRequiredField(this);
+		} catch (CustomerException e) {
+			Util.actionFail(requestManager, e.getMessage());
+			return Action.FAILURE_AND_CONTINUE;
+		}
+		try {
+			RequestMappingConfig requestMappingConfig = dealWithMapping.treeDealWithUniqueCode(onlyMark);
+			// 自定义 where sql :  and a = ? and b = ?
+			String cusWhere = Util.null2DefaultStr(requestMappingConfig.getCusWhereSql(), "");
+			if (StringUtils.isNotBlank(cusWhere)) {
+				cusWhere = DealWithMapping.sbc2dbcCase(cusWhere);
+			}
+//            RecordSet recordSet = mapper.selectMainData(requestId, billTable);
+			String selectMainSql = "select * from " + billTable + " where requestid = ? " + cusWhere;
+			log.info("查询主表数据sql { " + selectMainSql + " }, requestId { " + requestId + " }");
+			RecordSet recordSet = new RecordSet();
+			recordSet.executeQuery(selectMainSql, requestId);
+			if (recordSet.next()) {
+				dealWithMapping.setMainTable(billTable);
+				boolean containue = true;
+				// 前置处理
+				if (!Util.isNullOrEmpty(cusActionBeforeProcessorClass)) {
+					Map<String, String> pathParam = Util.parseCusInterfacePathParam(cusActionBeforeProcessorClass);
+					log.info("前置处理解析action参数 \n: " + JSONObject.toJSONString(pathParam));
+					String classPath = pathParam.remove("_ClassPath");
+					containue = executeBeforeProcessor(classPath, requestInfo, requestMappingConfig, pathParam);
+				}
+				GetUUIDProcessorProcessorImpl.TASKS_UUID.remove();
+				if (!containue) {
+					return Action.SUCCESS;
+				}
+				Object requestParam;
+				if ("1".equals(rootParamType)) {
+//                    对象类型的餐素
+					requestParam = dealWithMapping.getRequestParam(recordSet, requestMappingConfig);
+				} else {
+//                      数组类型的参数
+					requestParam = dealWithMapping.getRequestListParam(recordSet, requestMappingConfig);
+				}
+				Map<String, Object> response = pushReleaseFlowData(requestMappingConfig.getRequestUrl(), requestParam);
+				if (null == response) {
+//                    推送失败
+					log.error(Util.logStr("the response of this request is fail, " +
+							                      "because do not meet the conditions for success of [{}] meet [{}]", successField, successMark));
+					Util.actionFail(requestManager, Util.logStr("the response of this request is fail, " +
+							                                            "because do not meet the conditions for success of [{}] meet [{}]", successField, successMark));
+					return Action.FAILURE_AND_CONTINUE;
+				}
+				executeProcessor(requestInfo, response, requestParam, WRITE_SUCCESS, "");
+//                if (!Util.isNullOrEmpty(cusActionPostProcessorClass)) {
+//                    Map<String, String> pathParam = Util.parseCusInterfacePathParam(cusActionPostProcessorClass);
+//                    pathParam.put("nccCodeField",nccCodeField);
+//                    pathParam.put("errorDescField",errorDescField);
+//                    pathParam.put("writeSuccessField",writeSuccessField);
+//                    pathParam.put("errorMsgField",errorMsgField);
+//                    pathParam.put("writeSuccess", WRITE_SUCCESS);
+//
+//                    String classPath = pathParam.remove("_ClassPath");
+//                    Map<String, Object> params = new HashMap<>(4);
+//                    params.put("requestParam", requestParam);
+//                    params.put("response", response);
+//                    params.put("requestInfo", requestInfo);
+//                    params.put("pathParam", pathParam);
+//                    executePostProcessor(classPath, params);
+//                }
+				return Action.SUCCESS;
+			}
+		} catch (Exception e) {
+			log.error(Util.logStr("execute action fail! error msg is [{}]，detail error info is\n[{}]", e.getMessage(), Util.getErrString(e)));
+			Util.actionFail(requestManager, Util.logStr("execute action fail! error msg is [{}]", e.getMessage()));
+			e.printStackTrace();
+			executeProcessor(requestInfo, Collections.EMPTY_MAP, Collections.EMPTY_MAP, WRITE_ERROR, e.getMessage());
+			log.error(Util.getErrString(e));
+			return Action.FAILURE_AND_CONTINUE;
+		} finally {
+			GetUUIDProcessorProcessorImpl.TASKS_UUID.remove();
+		}
+		Util.actionFail(requestManager, Util.logStr("can not query workflow data from [{}] by requestId = [{}]", billTable, requestId));
+		log.error(Util.logStr("can not query workflow data from [{}] by requestId = [{}]", billTable, requestId));
+		return Action.FAILURE_AND_CONTINUE;
+	}
+	
+	/**
+	 * <h1>执行后置接口处理</h1>
+	 *
+	 * @param requestInfo    请求对象
+	 * @param response       接口响应
+	 * @param requestParam   请求参数
+	 * @param successOrError 成功or失败
+	 * @param exception      异常信息
+	 * @author xuanran.wang
+	 * @dateTime 2022/11/16 15:14
+	 **/
+	private Object executeProcessor(RequestInfo requestInfo,
+	                                Map<String, Object> response,
+	                                Object requestParam,
+	                                String successOrError,
+	                                String exception) {
+		if (!Util.isNullOrEmpty(cusActionPostProcessorClass)) {
+			Map<String, String> pathParam = Util.parseCusInterfacePathParam(cusActionPostProcessorClass);
+			pathParam.put("nccCodeField", nccCodeField);
+			pathParam.put("errorDescField", errorDescField);
+			pathParam.put("writeSuccessField", writeSuccessField);
+			pathParam.put("errorMsgField", errorMsgField);
+			pathParam.put("writeSuccess", successOrError);
+			pathParam.put("exception", exception);
+			
+			String classPath = pathParam.remove("_ClassPath");
+			Map<String, Object> params = new HashMap<>(4);
+			params.put("requestParam", requestParam);
+			params.put("response", response);
+			params.put("requestInfo", requestInfo);
+			params.put("pathParam", pathParam);
+			return executePostProcessor(classPath, params);
+		}
+		return null;
+	}
+	
+	/**
+	 * <h2>推送数据</h2>
+	 *
+	 * @param url    url
+	 * @param params 推送数据参数
+	 * @return 是否成功
+	 */
+	private Map<String, Object> pushReleaseFlowData(String url, Object params) {
+		log.info("start request push data!");
+		// 海外token
+		Map<String, Object> tokenConfig = Util.readProperties2Map("jt_tokenConfigInfo", this.environmentMark.trim() + "." + businessMark);
+		if (tokenConfig == null) {
+			throw new CustomerException("Unable to read configuration file correctly [jt_tokenConfigInfo]，Please check whether the configuration file exists");
+		}
+		log.info("获取token配置map { " + tokenConfig + " }");
+		TokenEntity tokenEntity = TokenEntity.mapToTokenEntity(tokenConfig);
+		if (!url.trim().startsWith(tokenEntity.getBaseUrl().trim())) {
+			throw new CustomerException("this domain name of config table is different from the profile domain name！Please check environment param configuration!");
+		}
+		String token = JiTuTokenUtil.getToken(tokenEntity);
+		Map<String, String> heards = new HashMap<>(4);
+		if (Strings.isNullOrEmpty(token)) {
+			throw new CustomerException("con not fetch token，Please check environment param configuration!");
+		}
+		heards.put("token", token);
+		log.info(tokenEntity.getUserName() + " -> get token is " + token);
+		ResponeVo responeVo;
+		try {
+			responeVo = httpUtils.apiPostObject(url, params, heards);
+		} catch (IOException e) {
+			throw new CustomerException(Util.logStr("can not connection [{}]!", url), e);
+		}
+		if (responeVo.getCode() != SUCCESS_CODE) {
+			log.error(Util.logStr("can not fetch [{}]，this request params is [{}]，" +
+					                      "this request heard is [{}]，but response status code is [{}]，" +
+					                      "this response is [{}]", url, JSON.toJSON(params), JSON.toJSONString(heards), responeVo.getCode(),
+					responeVo.getEntityString()));
+			throw new CustomerException(Util.logStr("can not fetch [{}]", url));
+		}
+		Map<String, Object> response;
+		log.info(Util.logStr("this response is [{}]", responeVo.getEntityString()));
+		try {
+			response = responeVo.getEntityMap();
+		} catch (JsonProcessingException e) {
+			log.error(Util.logStr("push data error, can not parse response to map，" +
+					                      "this response is [{}], url is [{}]，request params is [{}]， request heard is [{}];",
+					responeVo.getEntityString(), url, JSON.toJSONString(params), JSON.toJSONString(heards)));
+			throw new CustomerException(Util.logStr("push data error, can not parse response to map"));
+		}
+		Object successValue = Util.getValueByKeyStr(successField, response);
+		Object errorMsg = "";
+		log.info("errorMsgField { " + errorMsgField + " }");
+		if (StringUtils.isNotBlank(errorMsgField)) {
+			errorMsg = Util.getValueByKeyStr(errorMsgField, response);
+		}
+		if (IS_NOT_NULL.equalsIgnoreCase(successMark.trim())) {
+			if (successValue != null) {
+				return response;
+			}
+			if (StringUtils.isNotBlank(errorMsgField)) {
+				throw new CustomerException(String.valueOf(errorMsg));
+			}
+			return null;
+		}
+		if (successMark.trim().startsWith(EQUALS)) {
+			String successMarkValue = successMark.trim().replace(EQUALS, "").trim();
+			if (successMarkValue.equals(String.valueOf(successValue))) {
+				return response;
+			}
+			if (StringUtils.isNotBlank(errorMsgField)) {
+				throw new CustomerException(String.valueOf(errorMsg));
+			}
+			return null;
+		}
+		if (successMark.trim().startsWith(EQUALS_IGNORE_CASE)) {
+			String successMarkValue = successMark.trim().replace(EQUALS_IGNORE_CASE, "").trim();
+			if (successMarkValue.equalsIgnoreCase(String.valueOf(successValue))) {
+				return response;
+			}
+			if (StringUtils.isNotBlank(errorMsgField)) {
+				throw new CustomerException(String.valueOf(errorMsg));
+			}
+			return null;
+		}
+		return null;
+	}
+	
+	
+	/**
+	 * <h2>执行自定义后置处理方法</h2>
+	 *
+	 * @param className 全路径类名
+	 * @param params    参数
+	 * @return 返回值
+	 */
+	private Object executePostProcessor(String className, Map<String, Object> params) {
+		Class<?> aClass;
+		try {
+			aClass = Class.forName(className);
+		} catch (ClassNotFoundException e) {
+			throw new IllegalArgumentException("未能找到自定义action后置处理方法理接口：" + className);
+		}
+		Constructor<?> constructor;
+		try {
+			constructor = aClass.getConstructor();
+		} catch (NoSuchMethodException e) {
+			throw new IllegalArgumentException(className + "没有空参构造方法，无法获取构造方法对象！");
+		}
+		if (!CusActionPostProcessor.class.isAssignableFrom(aClass)) {
+			throw new IllegalArgumentException("自定义后置处理接口：" + className + " 不是"
+					                                   + CusActionPostProcessor.class.getName() + "的子类或实现类！");
+		}
+		CusActionPostProcessor o;
+		try {
+			o = (CusActionPostProcessor) constructor.newInstance();
+		} catch (InstantiationException | IllegalAccessException | InvocationTargetException e) {
+			throw new IllegalArgumentException("无法构造" + className + "对象！");
+		}
+		return o.postProcessor(params);
+	}
+	
+	/**
+	 * <h2>执行自定义后置处理方法</h2>
+	 *
+	 * @param className 全路径类名
+	 * @return 返回值
+	 */
+	private boolean executeBeforeProcessor(String className, RequestInfo requestInfo,
+	                                       RequestMappingConfig requestMappingConfig,
+	                                       Map<String, String> pathParam) {
+		Class<?> aClass;
+		try {
+			aClass = Class.forName(className);
+		} catch (ClassNotFoundException e) {
+			throw new IllegalArgumentException("未能找到自定义action前置置处理方法理接口：" + className);
+		}
+		Constructor<?> constructor;
+		try {
+			constructor = aClass.getConstructor();
+		} catch (NoSuchMethodException e) {
+			throw new IllegalArgumentException(className + "没有空参构造方法，无法获取构造方法对象！");
+		}
+		if (!CusActionBeforeProcessor.class.isAssignableFrom(aClass)) {
+			throw new IllegalArgumentException("自定义前置置处理接口：" + className + " 不是"
+					                                   + CusActionBeforeProcessor.class.getName() + "的子类或实现类！");
+		}
+		CusActionBeforeProcessor o;
+		try {
+			o = (CusActionBeforeProcessor) constructor.newInstance();
+		} catch (InstantiationException | IllegalAccessException | InvocationTargetException e) {
+			throw new IllegalArgumentException("无法构造" + className + "对象！");
+		}
+		return o.beforeProcessor(requestInfo, requestMappingConfig, pathParam);
+	}
+	
+	
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_jitu/pushdata/before_processor/interfaces/CusActionBeforeProcessor.java b/src/main/youhong_ai_old_src/weaver/aiyh_jitu/pushdata/before_processor/interfaces/CusActionBeforeProcessor.java
new file mode 100644
index 0000000..fa0f739
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_jitu/pushdata/before_processor/interfaces/CusActionBeforeProcessor.java
@@ -0,0 +1,23 @@
+package weaver.aiyh_jitu.pushdata.before_processor.interfaces;
+
+import weaver.soa.workflow.request.RequestInfo;
+import weaver.xiao.commons.config.entity.RequestMappingConfig;
+
+import java.util.Map;
+
+/**
+ * @Author xuanran.wang
+ * @Date 2022/11/1 12:44
+ * 前置处理
+ */
+public interface CusActionBeforeProcessor {
+
+    /**
+     * 前置处理接口
+     * @param requestInfo 流程参数
+     * @param requestMappingConfig 根据onlyMark生成的配置对象
+     * @param pathParam 自定义前置处理类路径参数
+     * @return 是否继续执行
+     */
+    boolean beforeProcessor(RequestInfo requestInfo, RequestMappingConfig requestMappingConfig, Map<String, String> pathParam);
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_jitu/pushdata/before_processor/ncc/PayApplyToPayAble.java b/src/main/youhong_ai_old_src/weaver/aiyh_jitu/pushdata/before_processor/ncc/PayApplyToPayAble.java
new file mode 100644
index 0000000..859be35
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_jitu/pushdata/before_processor/ncc/PayApplyToPayAble.java
@@ -0,0 +1,69 @@
+package weaver.aiyh_jitu.pushdata.before_processor.ncc;
+
+import aiyh.utils.Util;
+import aiyh.utils.excention.CustomerException;
+import com.alibaba.fastjson.JSONObject;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.log4j.Logger;
+import weaver.aiyh_jitu.pushdata.before_processor.interfaces.CusActionBeforeProcessor;
+import weaver.aiyh_jitu.pushdata.before_processor.ncc.mapper.NccMapper;
+import weaver.aiyh_jitu.pushdata.before_processor.ncc.util.BeforeProcessorUtil;
+import weaver.aiyh_jitu.pushdata.mapper.ReleaseFlowMapper;
+import weaver.conn.RecordSet;
+import weaver.soa.workflow.request.RequestInfo;
+import weaver.xiao.commons.config.entity.RequestMappingConfig;
+import weaver.xiao.commons.config.service.DealWithMapping;
+
+import java.util.Map;
+
+/**
+ * @Author xuanran.wang
+ * @Date 2022/11/8 13:16
+ * 付款申请存在抵扣先生成应付单
+ * weaver.aiyh_jitu.pushdata.before_processor.ncc.PayApplyToPayAble?
+ * onlyMark=fkyf&successField=succ&environmentMark=pro
+ * &businessMark=NCC&errorMsgField=msg&successMark={equals} true
+ */
+public class PayApplyToPayAble implements CusActionBeforeProcessor {
+
+    private final ReleaseFlowMapper mapper = Util.getMapper(ReleaseFlowMapper.class);
+    private final NccMapper nccMapper = Util.getMapper(NccMapper.class);
+    private final DealWithMapping dealWithMapping = new DealWithMapping();
+    private final Logger log = Util.getLogger();
+
+    public PayApplyToPayAble() {
+    }
+
+    @Override
+    public boolean beforeProcessor(RequestInfo requestInfo, RequestMappingConfig requestMappingConfig, Map<String, String> pathParam) {
+        log.info("----------- PayApplyToPayAble Begin -----------");
+        String onlyMark = Util.null2DefaultStr(pathParam.get("onlyMark"),"");
+        if(StringUtils.isBlank(onlyMark)){
+            throw new CustomerException("路径参数未获取到onlyMark标识的字段!");
+        }
+        RequestMappingConfig requestConfig = dealWithMapping.treeDealWithUniqueCode(onlyMark);
+        String tableName = requestInfo.getRequestManager().getBillTableName();
+        String requestId = requestInfo.getRequestid();
+        // 自定义数据条件
+        String cusWhere = Util.null2DefaultStr(requestConfig.getCusWhereSql(),"");
+        if(StringUtils.isNotBlank(cusWhere)){
+            // 全角转半角
+            cusWhere = DealWithMapping.sbc2dbcCase(cusWhere);
+        }
+        String selectMainSql = "select * from " + tableName + " where requestid = ? " + cusWhere;
+        log.info("查询主表数据sql { " + selectMainSql + " }, requestId { " + requestId + " }");
+        RecordSet recordSet = new RecordSet();
+        recordSet.executeQuery(selectMainSql, requestId);
+        if(recordSet.next()){
+            dealWithMapping.setMainTable(tableName);
+            Map<String, Object> params = dealWithMapping.getRequestParam(recordSet, requestConfig);
+            log.info("付款申请生成应付单接口调用json { \n" + JSONObject.toJSONString(params) + " \n}");
+            String successField = Util.null2DefaultStr(pathParam.get("successField"),"");
+            String successMark = Util.null2DefaultStr(pathParam.get("successMark"),"");
+            BeforeProcessorUtil.getResponse(requestConfig.getRequestUrl(), params, pathParam, successField, successMark);
+        }
+        log.info("----------- PayApplyToPayAble End -----------");
+        return true;
+    }
+}
+
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_jitu/pushdata/before_processor/ncc/mapper/NccMapper.java b/src/main/youhong_ai_old_src/weaver/aiyh_jitu/pushdata/before_processor/ncc/mapper/NccMapper.java
new file mode 100644
index 0000000..0f79a78
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_jitu/pushdata/before_processor/ncc/mapper/NccMapper.java
@@ -0,0 +1,21 @@
+package weaver.aiyh_jitu.pushdata.before_processor.ncc.mapper;
+
+import aiyh.utils.annotation.recordset.ParamMapper;
+import aiyh.utils.annotation.recordset.Select;
+import aiyh.utils.annotation.recordset.SqlMapper;
+
+/**
+ * @Author xuanran.wang
+ * @Date 2022/11/1 17:19
+ */
+@SqlMapper
+public interface NccMapper {
+
+    @Select("select b.tablename " +
+            "from workflow_base a " +
+            "left join workflow_bill b " +
+            "on a.formid = b.id " +
+            "where a.id = #{workFlowId}")
+    String getTableName(@ParamMapper("workFlowId") String workFlowId);
+
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_jitu/pushdata/before_processor/ncc/supplier_write_off/NccSupplierWriteOffBeforeProcessor.java b/src/main/youhong_ai_old_src/weaver/aiyh_jitu/pushdata/before_processor/ncc/supplier_write_off/NccSupplierWriteOffBeforeProcessor.java
new file mode 100644
index 0000000..59935aa
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_jitu/pushdata/before_processor/ncc/supplier_write_off/NccSupplierWriteOffBeforeProcessor.java
@@ -0,0 +1,82 @@
+package weaver.aiyh_jitu.pushdata.before_processor.ncc.supplier_write_off;
+
+import aiyh.utils.Util;
+import com.alibaba.fastjson.JSONObject;
+import org.apache.log4j.Logger;
+import weaver.aiyh_jitu.pushdata.before_processor.ncc.mapper.NccMapper;
+import weaver.aiyh_jitu.pushdata.before_processor.ncc.util.BeforeProcessorUtil;
+import weaver.aiyh_jitu.pushdata.mapper.ReleaseFlowMapper;
+import weaver.aiyh_jitu.pushdata.before_processor.interfaces.CusActionBeforeProcessor;
+import weaver.conn.RecordSet;
+import weaver.soa.workflow.request.RequestInfo;
+import weaver.xiao.commons.config.entity.RequestMappingConfig;
+import weaver.xiao.commons.config.service.DealWithMapping;
+import java.util.Map;
+
+/**
+ * @Author xuanran.wang
+ * @Date 2022/11/1 16:28
+ * 供应商预付核销流程数据推送前置处理
+ */
+public class NccSupplierWriteOffBeforeProcessor implements CusActionBeforeProcessor {
+
+    private final ReleaseFlowMapper mapper = Util.getMapper(ReleaseFlowMapper.class);
+    private final NccMapper nccMapper = Util.getMapper(NccMapper.class);
+    private final DealWithMapping dealWithMapping = new DealWithMapping();
+    private final Logger log = Util.getLogger();
+
+    public NccSupplierWriteOffBeforeProcessor() {
+    }
+
+    @Override
+    public boolean beforeProcessor(RequestInfo requestInfo,
+                                   RequestMappingConfig requestMappingConfig,
+                                   Map<String, String> pathParam) {
+        log.info("----------- NccSupplierWriteOffBeforeProcessor Begin -----------");
+        String tableName = requestInfo.getRequestManager().getBillTableName();
+        String requestId = requestInfo.getRequestid();
+        String relationWorkFlow = requestMappingConfig.getRelationWorkFlow();
+        String relationTableName = nccMapper.getTableName(relationWorkFlow);
+        dealWithMapping.setMainTable(tableName);
+        RecordSet recordSet = mapper.selectMainData(requestId, tableName);
+        /**
+         * 查关联的预付流程信息
+         * select *
+         * from formtable_main_2648 a
+         * left join formtable_main_2648_dt2 b
+         * on a.id = b.mainid
+         * right join
+         * (
+         *  select b.xgyflc,c.wfdetailid
+         *  from formtable_main_2652  a
+         *  left join formtable_main_2652_dt1 b
+         *  on a.id = b.mainid
+         *  left join uf_advance_ncc_dt1 c
+         *  on b.yfkqptzmxid = c.id
+         *  where requestid = 2116114
+         *  )c
+         *  on a.requestid = c.xgyflc
+         *  and b.id = c.wfdetailid
+         */
+        if(recordSet.next()) {
+            String cusSql = BeforeProcessorUtil.getCusSql("cusSql", pathParam, requestId, relationTableName, tableName);
+            RecordSet selectRs = new RecordSet();
+            selectRs.executeQuery(cusSql);
+            Map<String, Object> params = dealWithMapping.getRequestParamsByRelationWorkFlow(recordSet, requestMappingConfig, selectRs, cusSql);
+            log.info("供应商前置接口调用json { \n" + JSONObject.toJSONString(params) + " \n}");
+            String successField = Util.null2DefaultStr(pathParam.get("successField"),"");
+            String successMark = Util.null2DefaultStr(pathParam.get("successMark"),"");
+            Map<String, Object> response = BeforeProcessorUtil.getResponse(requestMappingConfig.getRequestUrl(), params, pathParam, successField, successMark);
+            String needCallBackWrite = Util.null2DefaultStr(pathParam.get("needCallBackWrite"),"");
+            // 状态回写
+            BeforeProcessorUtil.callBackWriteNccCode(needCallBackWrite, response, requestInfo, pathParam);
+        }
+        return false;
+    }
+
+
+
+
+
+
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_jitu/pushdata/before_processor/ncc/supplier_write_off/PaymentRequisitionVerificationBeforeProcessor.java b/src/main/youhong_ai_old_src/weaver/aiyh_jitu/pushdata/before_processor/ncc/supplier_write_off/PaymentRequisitionVerificationBeforeProcessor.java
new file mode 100644
index 0000000..604c73d
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_jitu/pushdata/before_processor/ncc/supplier_write_off/PaymentRequisitionVerificationBeforeProcessor.java
@@ -0,0 +1,101 @@
+package weaver.aiyh_jitu.pushdata.before_processor.ncc.supplier_write_off;
+
+import aiyh.utils.Util;
+import aiyh.utils.excention.CustomerException;
+import com.alibaba.fastjson.JSONObject;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.log4j.Logger;
+import weaver.aiyh_jitu.pushdata.before_processor.interfaces.CusActionBeforeProcessor;
+import weaver.aiyh_jitu.pushdata.before_processor.ncc.mapper.NccMapper;
+import weaver.aiyh_jitu.pushdata.before_processor.ncc.util.BeforeProcessorUtil;
+import weaver.aiyh_jitu.pushdata.mapper.ReleaseFlowMapper;
+import weaver.conn.RecordSet;
+import weaver.soa.workflow.request.RequestInfo;
+import weaver.xiao.commons.config.entity.RequestMappingConfig;
+import weaver.xiao.commons.config.service.DealWithMapping;
+
+import java.math.BigDecimal;
+import java.util.Map;
+
+/**
+ * @Author xuanran.wang
+ * @Date 2022/11/2 17:32
+ */
+public class PaymentRequisitionVerificationBeforeProcessor implements CusActionBeforeProcessor {
+    private final ReleaseFlowMapper mapper = Util.getMapper(ReleaseFlowMapper.class);
+    private final NccMapper nccMapper = Util.getMapper(NccMapper.class);
+    private final DealWithMapping dealWithMapping = new DealWithMapping();
+    private final Logger log = Util.getLogger();
+    @Override
+    public boolean beforeProcessor(RequestInfo requestInfo, RequestMappingConfig requestMappingConfig, Map<String, String> pathParam) {
+        log.info("----------- PaymentRequisitionVerificationBeforeProcessor Begin -----------");
+        String onlyMark = Util.null2DefaultStr(pathParam.get("onlyMark"),"");
+        String payOnlyMark = Util.null2DefaultStr(pathParam.get("payOnlyMark"),"");
+        if(StringUtils.isBlank(onlyMark) || StringUtils.isBlank(payOnlyMark)){
+            throw new CustomerException("路径参数未获取到onlyMark或者payOnlyMark标识的字段");
+        }
+        String tableName = requestInfo.getRequestManager().getBillTableName();
+        String requestId = requestInfo.getRequestid();
+        String relationWorkFlow = requestMappingConfig.getRelationWorkFlow();
+        String relationTableName = nccMapper.getTableName(relationWorkFlow);
+        // 预付明细行行数 如果明细行不存在则不推送
+        String payInAdvanceCountSql = BeforeProcessorUtil.getCusSql("payInAdvanceCountSql", pathParam, requestId, relationTableName, tableName);
+        RecordSet payInAdvanceRs = new RecordSet();
+        // 判断是否存在数据 如果不存在则不推送
+        payInAdvanceRs.executeQuery(payInAdvanceCountSql);
+        String successField = Util.null2DefaultStr(pathParam.get("successField"),"");
+        String successMark = Util.null2DefaultStr(pathParam.get("successMark"),"");
+        if(payInAdvanceRs.next()){
+            // 发票金额和sql
+            String invoiceSumSql = BeforeProcessorUtil.getCusSql("invoiceSumSql", pathParam, requestId, relationTableName, tableName);
+            RecordSet invoiceSumRs = new RecordSet();
+            invoiceSumRs.executeQuery(invoiceSumSql);
+            // 预付金额和
+            String payInAdvanceSumSql = BeforeProcessorUtil.getCusSql("payInAdvanceSumSql", pathParam, requestId, relationTableName, tableName);
+            payInAdvanceRs.executeQuery(payInAdvanceSumSql);
+            if (invoiceSumRs.next() && payInAdvanceRs.next()) {
+                String invoiceSum = invoiceSumRs.getString(1);
+                String payInAdvanceSum = invoiceSumRs.getString(1);
+                log.info("发票金额 { " + invoiceSum + " }， 预付金额 { " + payInAdvanceSum + " }");
+                // 发票金额大于预付金额时候推送
+                if(new BigDecimal(invoiceSum).compareTo(new BigDecimal(payInAdvanceSum)) < 1){
+                    return true;
+                }
+            }
+            dealWithMapping.setMainTable(tableName);
+            requestMappingConfig = dealWithMapping.treeDealWithUniqueCode(onlyMark);
+            RecordSet recordSet = mapper.selectMainData(requestId, tableName);
+            /**
+             * select d.*,c.*
+             * from formtable_main_2648 a
+             * left join formtable_main_2648_dt1 b
+             * on a.id = b.mainid
+             * left join formtable_main_2648_dt2 d
+             * on b.yfklcmxid = d.id
+             * inner join formtable_main_2648 c
+             * on a.requestid = c.requestid
+             * where a.requestid = 2110111
+             */
+            if(recordSet.next()) {
+                String cusSql = BeforeProcessorUtil.getCusSql("cusSql",pathParam, requestId, relationTableName, tableName);
+                RecordSet selectRs = new RecordSet();
+                selectRs.executeQuery(cusSql);
+                Map<String, Object> yfParams = dealWithMapping.getRequestParamsByRelationWorkFlow(recordSet, requestMappingConfig, selectRs, cusSql);
+                log.info("付款申请前置接口生成应付单调用json { \n" + JSONObject.toJSONString(yfParams) + " \n}");
+                BeforeProcessorUtil.getResponse(requestMappingConfig.getRequestUrl(), yfParams, pathParam, successField, successMark);
+
+                selectRs.executeQuery(cusSql);
+                requestMappingConfig = dealWithMapping.treeDealWithUniqueCode(payOnlyMark);
+                Map<String, Object> fkParams = dealWithMapping.getRequestParamsByRelationWorkFlow(recordSet, requestMappingConfig, selectRs, cusSql);
+                log.info("付款申请前置生成付款单接口调用json { \n" + JSONObject.toJSONString(fkParams) + " \n}");
+                Map<String, Object> response  = BeforeProcessorUtil.getResponse(requestMappingConfig.getRequestUrl(), fkParams, pathParam, successField, successMark);
+                String needCallBackWrite = Util.null2DefaultStr(pathParam.get("needCallBackWrite"),"");
+                // 状态回写
+                BeforeProcessorUtil.callBackWriteNccCode(needCallBackWrite, response, requestInfo, pathParam);
+            }
+        }
+        return false;
+    }
+
+
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_jitu/pushdata/before_processor/ncc/util/BeforeProcessorUtil.java b/src/main/youhong_ai_old_src/weaver/aiyh_jitu/pushdata/before_processor/ncc/util/BeforeProcessorUtil.java
new file mode 100644
index 0000000..87aecc1
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_jitu/pushdata/before_processor/ncc/util/BeforeProcessorUtil.java
@@ -0,0 +1,179 @@
+package weaver.aiyh_jitu.pushdata.before_processor.ncc.util;
+
+import aiyh.utils.Util;
+import aiyh.utils.excention.CustomerException;
+import aiyh.utils.httpUtil.ResponeVo;
+import aiyh.utils.httpUtil.util.HttpUtils;
+import com.alibaba.fastjson.JSON;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.google.common.base.Strings;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.log4j.Logger;
+import weaver.aiyh_jitu.pushdata.action.PushDataToCentralPlatformAction;
+import weaver.aiyh_jitu.pushdata.entity.TokenEntity;
+import weaver.aiyh_jitu.pushdata.post_processor.NccCodePostProcessor;
+import weaver.aiyh_jitu.pushdata.util.JiTuTokenUtil;
+import weaver.soa.workflow.request.RequestInfo;
+import weaver.xiao.commons.config.service.DealWithMapping;
+
+import javax.ws.rs.core.MediaType;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @Author xuanran.wang
+ * @Date 2022/11/2 17:34
+ */
+public class BeforeProcessorUtil {
+    private static final Logger log = Util.getLogger();
+
+    private static final HttpUtils httpUtils = new HttpUtils();
+
+    static {
+        httpUtils.getGlobalCache().header.put("Content-Type", MediaType.APPLICATION_JSON);
+    }
+
+    public static void callBackWriteNccCode(String needCallBackWrite,
+                                            Map<String, Object> response,
+                                            RequestInfo requestInfo,
+                                            Map<String, String> pathParam){
+        if(StringUtils.isNotBlank(needCallBackWrite) && "true".equals(needCallBackWrite)){
+            HashMap<String, Object> processorParams = new HashMap<>();
+            // 状态回写
+            processorParams.put("requestParam", new HashMap<>());
+            processorParams.put("response", response);
+            processorParams.put("requestInfo", requestInfo);
+            processorParams.put("pathParam", pathParam);
+            NccCodePostProcessor nccCodePostProcessor = new NccCodePostProcessor();
+            nccCodePostProcessor.postProcessor(processorParams);
+        }
+
+    }
+
+    public static Map<String, Object> getResponse(String url,
+                                           Map<String, Object> params,
+                                           Map<String, String> pathParam,
+                                           String successField,
+                                           String successMark){
+        Map<String, Object> response = BeforeProcessorUtil.pushReleaseFlowDataBeforeProcessor(url, params, pathParam);
+        if (null == response) {
+            log.error(Util.logStr("the response of this request is fail, " +
+                            "because do not meet the conditions for success of [{}] meet [{}]",successField,
+                    successMark));
+            throw new CustomerException(Util.logStr("the response of this request is fail, " +
+                            "because do not meet the conditions for success of [{}] meet [{}]", successField,
+                    successMark));
+        }
+        return response;
+    }
+
+    public static String getCusSql(String targetField, Map<String, String> pathParam, String requestId, String relationTableName, String tableName){
+        String cusSqlField = Util.null2DefaultStr(pathParam.get(targetField), "");
+        if (StringUtils.isBlank(cusSqlField)) {
+            throw new CustomerException("前置处理未获取到指定sql标识, 请检查配置!");
+        }
+        String cusSql = Util.getCusConfigValue(cusSqlField);
+        if (StringUtils.isBlank(cusSql)) {
+            throw new CustomerException("该标识 { " + cusSqlField + " }, 在系统参数中未配置!");
+        }
+        cusSql = cusSql.replaceAll("#\\{requestId}", requestId);
+        cusSql = cusSql.replaceAll("#\\{relationTable}", relationTableName);
+        cusSql = cusSql.replaceAll("#\\{nowTable}", tableName);
+        cusSql = DealWithMapping.sbc2dbcCase(cusSql);
+        log.info("自定义sql " + targetField + " {\n " + cusSql + " \n}");
+        return cusSql;
+    }
+
+    /**
+     * <h2>推送数据</h2>
+     *
+     * @param url    url
+     * @param params 推送数据参数
+     * @return 是否成功
+     */
+    public static Map<String, Object> pushReleaseFlowDataBeforeProcessor(String url, Object params, Map<String, String> pathMap) {
+        String environmentMark = Util.null2DefaultStr(pathMap.get("environmentMark"),"");
+        String businessMark = Util.null2DefaultStr(pathMap.get("businessMark"),"");
+        String successField = Util.null2DefaultStr(pathMap.get("successField"),"");
+        String errorMsgField = Util.null2DefaultStr(pathMap.get("errorMsgField"),"");
+        String successMark = Util.null2DefaultStr(pathMap.get("successMark"),"");
+        log.info("start request push data!");
+        // 海外token
+        Map<String, Object> tokenConfig = Util.readProperties2Map("jt_tokenConfigInfo", environmentMark.trim() + "." + businessMark);
+        if (tokenConfig == null) {
+            throw new CustomerException("Unable to read configuration file correctly [jt_tokenConfigInfo]，Please check whether the configuration file exists");
+        }
+        log.info("获取token配置map { " + tokenConfig + " }");
+        TokenEntity tokenEntity = TokenEntity.mapToTokenEntity(tokenConfig);
+        if (!url.trim().startsWith(tokenEntity.getBaseUrl().trim())) {
+            throw new CustomerException("this domain name of config table is different from the profile domain name！Please check environment param configuration!");
+        }
+        String token = JiTuTokenUtil.getToken(tokenEntity);
+        Map<String, String> heards = new HashMap<>(4);
+        if (Strings.isNullOrEmpty(token)) {
+            throw new CustomerException("con not fetch token，Please check environment param configuration!");
+        }
+        heards.put("token", token);
+        log.info(tokenEntity.getUserName() + " -> get token is " + token);
+        ResponeVo responeVo;
+        try {
+            responeVo = httpUtils.apiPostObject(url, params, heards);
+        } catch (IOException e) {
+            throw new CustomerException(Util.logStr("can not connection [{}]!", url), e);
+        }
+        if (responeVo.getCode() != PushDataToCentralPlatformAction.SUCCESS_CODE) {
+            log.error(Util.logStr("can not fetch [{}]，this request params is [{}]，" +
+                            "this request heard is [{}]，but response status code is [{}]，" +
+                            "this response is [{}]", url, JSON.toJSON(params), JSON.toJSONString(heards), responeVo.getCode(),
+                    responeVo.getEntityString()));
+            throw new CustomerException(Util.logStr("can not fetch [{}]", url));
+        }
+        Map<String, Object> response;
+        log.info(Util.logStr("this response is [{}]", responeVo.getEntityString()));
+        try {
+            response = responeVo.getEntityMap();
+        } catch (JsonProcessingException e) {
+            log.error(Util.logStr("push data error, can not parse response to map，" +
+                            "this response is [{}], url is [{}]，request params is [{}]， request heard is [{}];",
+                    responeVo.getEntityString(), url, JSON.toJSONString(params), JSON.toJSONString(heards)));
+            throw new CustomerException(Util.logStr("push data error, can not parse response to map"));
+        }
+        Object successValue = Util.getValueByKeyStr(successField, response);
+        Object errorMsg = "";
+        log.info("errorMsgField { " + errorMsgField + " }");
+        if(StringUtils.isNotBlank(errorMsgField)){
+            errorMsg = Util.getValueByKeyStr(errorMsgField, response);
+        }
+        if (PushDataToCentralPlatformAction.IS_NOT_NULL.equalsIgnoreCase(successMark.trim())) {
+            if (successValue != null) {
+                return response;
+            }
+            if(StringUtils.isNotBlank(errorMsgField)){
+                throw new CustomerException(String.valueOf(errorMsg));
+            }
+            return null;
+        }
+        if (successMark.trim().startsWith(PushDataToCentralPlatformAction.EQUALS)) {
+            String successMarkValue = successMark.trim().replace(PushDataToCentralPlatformAction.EQUALS, "").trim();
+            if (successMarkValue.equals(String.valueOf(successValue))) {
+                return response;
+            }
+            if(StringUtils.isNotBlank(errorMsgField)){
+                throw new CustomerException(String.valueOf(errorMsg));
+            }
+            return null;
+        }
+        if (successMark.trim().startsWith(PushDataToCentralPlatformAction.EQUALS_IGNORE_CASE)) {
+            String successMarkValue = successMark.trim().replace(PushDataToCentralPlatformAction.EQUALS_IGNORE_CASE, "").trim();
+            if (successMarkValue.equalsIgnoreCase(String.valueOf(successValue))) {
+                return response;
+            }
+            if(StringUtils.isNotBlank(errorMsgField)){
+                throw new CustomerException(String.valueOf(errorMsg));
+            }
+            return null;
+        }
+        return null;
+    }
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_jitu/pushdata/entity/CusProcessorResult.java b/src/main/youhong_ai_old_src/weaver/aiyh_jitu/pushdata/entity/CusProcessorResult.java
new file mode 100644
index 0000000..9004c25
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_jitu/pushdata/entity/CusProcessorResult.java
@@ -0,0 +1,23 @@
+package weaver.aiyh_jitu.pushdata.entity;
+
+import lombok.Data;
+
+/**
+ * <h1>增强处理器返回值</h1>
+ *
+ * <p>create: 2022-07-26 17:13</p>
+ *
+ * @author EBU7-dev-1 aiyh
+ */
+
+@Data
+public class CusProcessorResult {
+    /**
+     * 处理后的值
+     */
+    private Object value;
+    /**
+     * 是否继续往下执行
+     */
+    private boolean isContinue;
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_jitu/pushdata/entity/TokenEntity.java b/src/main/youhong_ai_old_src/weaver/aiyh_jitu/pushdata/entity/TokenEntity.java
new file mode 100644
index 0000000..e8f6be6
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_jitu/pushdata/entity/TokenEntity.java
@@ -0,0 +1,98 @@
+package weaver.aiyh_jitu.pushdata.entity;
+
+import aiyh.utils.Util;
+import cn.hutool.core.lang.Assert;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+import java.util.Map;
+
+/**
+ * <h1>极兔获取token所需要的参数</h1>
+ * <p>create 2022/7/12 17:34</p>
+ *
+ * @author ayh
+ */
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class TokenEntity {
+
+    /**
+     * 用户名
+     */
+    private String userName;
+    /**
+     * 密码
+     */
+    private String password;
+    /**
+     * 系统码
+     */
+    private String systemCode;
+    /**
+     * 秘钥
+     */
+    private String secretKey;
+    /**
+     * 域名
+     */
+    private String baseUrl;
+
+    /**
+     * 有效期时长——小时
+     */
+    private Integer expiration;
+
+
+    /**
+     * <h2>将map转换为TokenEntity对象</h2>
+     *
+     * @param map map
+     * @return tokenEntity对象
+     */
+    public static TokenEntity mapToTokenEntity(Map<String, Object> map) {
+        TokenEntity tokenEntity = new TokenEntity();
+        String userName = Util.null2String(map.get("userName"));
+        String password = Util.null2String(map.get("password"));
+        String systemCode = Util.null2String(map.get("systemCode"));
+        String secretKey = Util.null2String(map.get("secretKey"));
+        String baseUrl = Util.null2String(map.get("baseUrl"));
+        String expiration = Util.null2String(map.get("expiration"));
+        Assert.notEmpty(userName, "get token param error! userName cant not be null");
+        tokenEntity.setUserName(userName);
+        Assert.notEmpty(password, "get token param error! password cant not be null");
+        tokenEntity.setPassword(password);
+        Assert.notEmpty(systemCode, "get token param error! systemCode cant not be null");
+        tokenEntity.setSystemCode(systemCode);
+        Assert.notEmpty(secretKey, "get token param error! secretKey cant not be null");
+        tokenEntity.setSecretKey(secretKey);
+        Assert.notEmpty(baseUrl, "get token param error! baseUrl cant not be null");
+        tokenEntity.setBaseUrl(baseUrl);
+        Assert.notEmpty(expiration, "get token param error! baseUrl cant not be null");
+        tokenEntity.setExpiration(Util.getIntValue(expiration));
+        return tokenEntity;
+    }
+
+
+    /**
+     * <h2>极兔Token信息对象</h2>
+     */
+    @Data
+    @AllArgsConstructor
+    @NoArgsConstructor
+    public static class TokenInfo {
+        /**
+         * token字符串
+         */
+        private String tokenStr;
+        /**
+         * token过期时间
+         */
+        private Date expirationTime;
+    }
+
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_jitu/pushdata/mapper/ReleaseFlowMapper.java b/src/main/youhong_ai_old_src/weaver/aiyh_jitu/pushdata/mapper/ReleaseFlowMapper.java
new file mode 100644
index 0000000..728ec60
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_jitu/pushdata/mapper/ReleaseFlowMapper.java
@@ -0,0 +1,89 @@
+package weaver.aiyh_jitu.pushdata.mapper;
+
+import aiyh.utils.annotation.recordset.*;
+import aiyh.utils.entity.DocImageInfo;
+import org.apache.ibatis.annotations.Delete;
+import weaver.conn.RecordSet;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <h1>查询数据mapper</h1>
+ * <p>create 2022/7/12 19:38</p>
+ *
+ * @author ayh
+ */
+
+@SqlMapper
+public interface ReleaseFlowMapper {
+
+    /**
+     * <h2>查询主表数据</h2>
+     *
+     * @param requestId 请求id
+     * @param mainTable 主表表名
+     * @return recordset对象
+     */
+    @Select("select * from $t{mainTable} where requestid = #{requestId}")
+    RecordSet selectMainData(
+            @ParamMapper("requestId") String requestId,
+            @ParamMapper("mainTable") String mainTable
+    );
+
+
+    /**
+     * <h2>查询ones需求负责人工号缓存</h2>
+     *
+     * @param hrmId 人力资源ID
+     * @return 对应assign
+     */
+    @Select("select assign from uf_ones_code_cache where hrm_id = #{hrmId}")
+    String selectOnesCache(@ParamMapper("hrmId") String hrmId);
+
+
+    /**
+     * <h2>更新插入需求负责人工号缓存信息</h2>
+     *
+     * @param hrmId  人员ID
+     * @param assign 需求负责人工号
+     * @param id     数据id
+     * @return 查询结果
+     */
+    @Update("update uf_ones_code_cache set hrm_id = #{hrmId}, assign = #{assign} where id = #{id}")
+    boolean updateOnesCache(@ParamMapper("hrmId") String hrmId, @ParamMapper("assign") String assign, @ParamMapper("id") String id);
+
+
+    /**
+     * <h2>删除缓存数据</h2>
+     *
+     * @param id id
+     */
+    @Delete("delete from uf_ones_code_cache where id = #{id}")
+    void deleteOnesCache(@ParamMapper("id") String id);
+
+    /**
+     * <h2>查询自定义SQL值</h2>
+     *
+     * @param cusSql    自定义SQL字符串
+     * @param mainMap   主表数据
+     * @param detailMap 明细表数据
+     * @return 查询结果
+     */
+    @Select(custom = true)
+    String selectCusSql(@SqlString String cusSql,
+                        @ParamMapper("main") Map<String, Object> mainMap,
+                        @ParamMapper("detail") Map<String, Object> detailMap);
+
+    /**
+     * <h2>查询附件对应的文件信息</h2>
+     *
+     * @param docIds 附件id
+     * @return 对应的信息
+     */
+    @Select("select id,doc.docid doc_id,img.imagefileid image_file_id,img.imagefilename image_file_name,img.filesize file_size " +
+            "from docimagefile doc " +
+            "inner join imagefile img on img.imagefileid = doc.imagefileid " +
+            "where doc.docid in (${docIds})")
+    List<DocImageInfo> selectDocImageInfoList(@ParamMapper("docIds") String[] docIds);
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_jitu/pushdata/post_processor/CusInfoToOaProcessor.java b/src/main/youhong_ai_old_src/weaver/aiyh_jitu/pushdata/post_processor/CusInfoToOaProcessor.java
new file mode 100644
index 0000000..74d0f21
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_jitu/pushdata/post_processor/CusInfoToOaProcessor.java
@@ -0,0 +1,103 @@
+package weaver.aiyh_jitu.pushdata.post_processor;
+
+import aiyh.utils.Util;
+import aiyh.utils.excention.CustomerException;
+import aiyh.utils.sqlUtil.sqlResult.impl.PrepSqlResultImpl;
+import aiyh.utils.sqlUtil.whereUtil.Where;
+import com.alibaba.fastjson.JSONObject;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.log4j.Logger;
+import weaver.aiyh_jitu.pushdata.post_processor.mapper.RequestInfoToModelMapper;
+import weaver.aiyh_jitu.pushdata.service.CusActionPostProcessor;
+import weaver.conn.RecordSet;
+import weaver.formmode.data.ModeDataIdUpdate;
+import weaver.formmode.setup.ModeRightInfo;
+import weaver.general.TimeUtil;
+import weaver.soa.workflow.request.RequestInfo;
+import weaver.zwl.common.ToolUtil;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @Author xuanran.wang
+ * @Date 2022/11/11 18:05
+ */
+public class CusInfoToOaProcessor implements CusActionPostProcessor {
+	
+	private final RequestInfoToModelMapper requestInfoToModelMapper = Util.getMapper(RequestInfoToModelMapper.class);
+	private final ModeDataIdUpdate modeDataIdUpdate = ModeDataIdUpdate.getInstance();
+	private final ModeRightInfo moderightinfo = new ModeRightInfo();
+	private final ToolUtil toolUtil = new ToolUtil();
+	private final Logger log = Util.getLogger();
+	
+	/**
+	 * <h1>错误信息写入建模后置处理</h1>
+	 *
+	 * @param params 参数
+	 * @return 是否成功
+	 * @author xuanran.wang
+	 * @dateTime 2022/11/16 11:21
+	 **/
+	@Override
+	public Object postProcessor(Map<String, Object> params) {
+		Map<String, Object> pathParam = (Map<String, Object>) params.get("pathParam");
+		Map<String, Object> response = (Map<String, Object>) params.get("response");
+		Map<String, Object> data = (Map<String, Object>) response.get("data");
+		RequestInfo requestInfo = (RequestInfo) params.get("requestInfo");
+		Integer modelId = Util.getIntValue(Util.null2String(pathParam.get("modelId")), -1);
+		if (modelId < 0) {
+			throw new RuntimeException("设置日志模块id");
+		}
+		String tableName = requestInfoToModelMapper.getModelNameByModelId(String.valueOf(modelId));
+		if (StringUtils.isBlank(tableName)) {
+			throw new CustomerException("模块id为 " + modelId + ", 在系统中暂没查询到对应表单!");
+		}
+		RecordSet rs = new RecordSet();
+		int mainId = -1;
+		boolean needModeRight = false;
+		if (rs.executeQuery("select 1 from " + tableName + " where reqId = ?", requestInfo.getRequestid()) && rs.next()) {
+			mainId = Util.getIntValue(rs.getString(1), -1);
+		}
+		if (mainId < 0) {
+			mainId = getNewIdByModelInfo(tableName, modelId);
+			needModeRight = true;
+		}
+		Map<String, Object> paramMap = new HashMap<>();
+		Map<String, Object> cusLogInfo = (Map<String, Object>) params.get("cusLogInfo");
+		paramMap.put("reqId", requestInfo.getRequestid());
+		paramMap.put("requestUrl", Util.null2String(cusLogInfo.get("requestUrl")));
+		paramMap.put("requestParam", Util.null2String(cusLogInfo.get("requestParam")));
+		paramMap.put("response", Util.null2String(cusLogInfo.get("response")));
+		paramMap.put("ncc_code", Util.null2String(data.get(Util.null2DefaultStr(toolUtil.getSystemParamValue("ncc_code"), ""))));
+		paramMap.put("exception", Util.null2String(cusLogInfo.get("exception")));
+		paramMap.put("success", Util.null2String(cusLogInfo.get("success")));
+		Where where = Util.createPrepWhereImpl()
+				              .whereAnd("id").whereEqual(mainId);
+		PrepSqlResultImpl sqlResult = Util.createSqlBuilder().updateSql(
+				tableName,
+				paramMap,
+				where
+		);
+		if (!rs.executeUpdate(sqlResult.getSqlStr(), sqlResult.getArgs())) {
+			String error = Util.logStr("错误信息写入建模后置处理执行更新sql失败!" +
+					                           " 当前sql [{}], 当前参数 [{}], where条件[{}]", sqlResult.getSqlStr(),
+					JSONObject.toJSONString(sqlResult.getArgs()), mainId);
+			log.error(error);
+			throw new CustomerException(error);
+		}
+//        if (needModeRight) {
+//            moderightinfo.
+//        }
+		return params;
+	}
+	
+	public Integer getNewIdByModelInfo(String modelTableName, int modelId) {
+		String currentDateTime = TimeUtil.getCurrentTimeString();
+		// 日期
+		String currentDate = currentDateTime.substring(0, 10);
+		// 时间
+		String currentTime = currentDateTime.substring(11);
+		return modeDataIdUpdate.getModeDataNewId(modelTableName, modelId, 1, 0, currentDate, currentTime);
+	}
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_jitu/pushdata/post_processor/NccCodePostProcessor.java b/src/main/youhong_ai_old_src/weaver/aiyh_jitu/pushdata/post_processor/NccCodePostProcessor.java
new file mode 100644
index 0000000..1c7e1d2
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_jitu/pushdata/post_processor/NccCodePostProcessor.java
@@ -0,0 +1,108 @@
+package weaver.aiyh_jitu.pushdata.post_processor;
+import aiyh.utils.Util;
+import aiyh.utils.excention.CustomerException;
+import aiyh.utils.sqlUtil.sqlResult.impl.PrepSqlResultImpl;
+import aiyh.utils.sqlUtil.whereUtil.Where;
+import com.alibaba.fastjson.JSONObject;
+import org.apache.commons.collections.MapUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.log4j.Logger;
+import weaver.conn.RecordSet;
+import weaver.soa.workflow.request.RequestInfo;
+import weaver.aiyh_jitu.pushdata.service.CusActionPostProcessor;
+import weaver.zwl.common.ToolUtil;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @Author xuanran.wang
+ * @Date 2022/10/20 13:54
+ * ncc单据号状态回传处理逻辑 表单字段 ncc_code
+ */
+public class NccCodePostProcessor implements CusActionPostProcessor {
+    private final ToolUtil toolUtil = new ToolUtil();
+    private final RecordSet updateRs = new RecordSet();
+    private static final Logger logger = Util.getLogger();
+    public NccCodePostProcessor() {
+    }
+    @Override
+    public Object postProcessor(Map<String, Object> params) {
+        Map<String, Object> pathParam = (Map<String, Object>) params.get("pathParam");
+        Map<String, Object> response = (Map<String, Object>) params.get("response");
+        Map<String, Object> data = (Map<String, Object>) response.get("data");
+        Map<String, Object> updateParams = new HashMap<>();
+        /**
+         * 响应ncc_code字段要配置 配置哪个就将请求中的字段更新至表单
+         * {
+         * 	"pk_bill":"1011A3100000006KPAZD",
+         * 	"def31":"2097102",
+         * 	"billmaker":"00459905",
+         * 	"billno":"APJTSDMYS0001042210210001",
+         * 	"pk_org":"JTSDMYS000104"
+         * }
+         */
+        String ncc_code_filed = Util.null2DefaultStr(toolUtil.getSystemParamValue("ncc_code"),"");
+        if(StringUtils.isBlank(ncc_code_filed)){
+            throw new CustomerException("请联系管理员配置指定ncc接口返回code标识字段!");
+        }
+        String exception = Util.null2String(pathParam.get("exception"));
+        // 异常返回
+        String errorDescField = Util.null2String(pathParam.get("errorDescField"));
+        if(StringUtils.isNotBlank(exception)){
+            updateParams.put(errorDescField, exception);
+        }else {
+            // 从响应中获取指定字段的值 nccCode
+            String nccCodeField = Util.null2String(pathParam.get("nccCodeField"));
+            if(StringUtils.isNotBlank(nccCodeField)){
+                String nccCode = Util.null2String(data.get(ncc_code_filed));
+                updateParams.put(nccCodeField, nccCode);
+            }
+            // 错误信息字段
+            String errorMsgField = Util.null2String(pathParam.get("errorMsgField"));
+            // 接口响应的不为空并且更新表单的错误字段也不为空
+            if(StringUtils.isNotBlank(errorMsgField) && StringUtils.isNotBlank(errorDescField)){
+                String errorMsg = Util.null2String(data.get(errorMsgField));
+                updateParams.put(errorDescField, errorMsg);
+            }
+        }
+        // 推送ncc成功表单字段
+        String writeSuccessField = Util.null2String(pathParam.get("writeSuccessField"));
+        // 成功or失败
+        String writeSuccess = Util.null2String(pathParam.get("writeSuccess"));
+        if(StringUtils.isNotBlank(writeSuccessField)){
+            updateParams.put(writeSuccessField, writeSuccess);
+        }
+        logger.info(Util.logStr("更新表单参数集合: [{}]", JSONObject.toJSONString(updateParams)));
+        RequestInfo requestInfo = (RequestInfo) params.get("requestInfo");
+        if(MapUtils.isNotEmpty(updateParams)){
+            updateNccInfoToWorkFlow(requestInfo, updateParams);
+        }
+        return params;
+    }
+
+    /**
+     * <h1>更新表单数据</h1>
+     * @author xuanran.wang
+     * @dateTime 2022/11/16 14:06
+     * @param requestInfo 请求对象
+     * @param paramMap 参数map
+     **/
+    public static void updateNccInfoToWorkFlow(RequestInfo requestInfo, Map<String, Object> paramMap){
+        RecordSet rs = new RecordSet();
+        Where where = Util.createPrepWhereImpl()
+                .whereAnd("requestid").whereEqual(requestInfo.getRequestid());
+        PrepSqlResultImpl sqlResult = Util.createSqlBuilder().updateSql(
+                requestInfo.getRequestManager().getBillTableName(),
+                paramMap,
+                where
+        );
+        if (!rs.executeUpdate(sqlResult.getSqlStr(), sqlResult.getArgs())) {
+            String error = Util.logStr("信息写入流程执行更新sql失败!" +
+                            " 当前sql [{}], 当前参数 [{}], where条件[{}]", sqlResult.getSqlStr(),
+                    JSONObject.toJSONString(sqlResult.getArgs()),requestInfo.getRequestid());
+            logger.error(error);
+            throw new CustomerException(error);
+        }
+    }
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_jitu/pushdata/post_processor/mapper/RequestInfoToModelMapper.java b/src/main/youhong_ai_old_src/weaver/aiyh_jitu/pushdata/post_processor/mapper/RequestInfoToModelMapper.java
new file mode 100644
index 0000000..289a533
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_jitu/pushdata/post_processor/mapper/RequestInfoToModelMapper.java
@@ -0,0 +1,17 @@
+package weaver.aiyh_jitu.pushdata.post_processor.mapper;
+
+import aiyh.utils.annotation.recordset.*;
+
+/**
+ * @Author xuanran.wang
+ * @Date 2022/11/11 18:12
+ */
+@SqlMapper
+public interface RequestInfoToModelMapper {
+    @Select(" select tablename \n" +
+            " from modeinfo t1 \n" +
+            " left join workflow_bill t2 \n" +
+            " on t1.formid = t2.id \n" +
+            " where t1.id = #{modelId}")
+    String getModelNameByModelId(@ParamMapper("modelId") String modelId);
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_jitu/pushdata/service/CusActionPostProcessor.java b/src/main/youhong_ai_old_src/weaver/aiyh_jitu/pushdata/service/CusActionPostProcessor.java
new file mode 100644
index 0000000..2e54ab8
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_jitu/pushdata/service/CusActionPostProcessor.java
@@ -0,0 +1,22 @@
+package weaver.aiyh_jitu.pushdata.service;
+
+import java.util.Map;
+
+/**
+ * <h1>自定义action后置处理器增强方法</h1>
+ *
+ * <p>create: 2022-07-30 00:40</p>
+ *
+ * @author aiyh EBU7-dev-1
+ */
+
+public interface CusActionPostProcessor {
+
+    /**
+     * 后置处理方法。
+     *
+     * @param params 后置处理器参数
+     * @return 处理后返回值
+     */
+    Object postProcessor(Map<String, Object> params);
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_jitu/pushdata/service/CusInterFaceGetValueProcessor.java b/src/main/youhong_ai_old_src/weaver/aiyh_jitu/pushdata/service/CusInterFaceGetValueProcessor.java
new file mode 100644
index 0000000..4c08f3f
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_jitu/pushdata/service/CusInterFaceGetValueProcessor.java
@@ -0,0 +1,34 @@
+package weaver.aiyh_jitu.pushdata.service;
+
+import weaver.aiyh_jitu.pushdata.entity.CusProcessorResult;
+
+import java.util.Map;
+
+/**
+ * <h1>获取自定义接口数据后置处理方法</h1>
+ *
+ * <p>create: 2022-07-26 15:41</p>
+ *
+ * @author EBU7-dev-1 aiyh
+ */
+
+public interface CusInterFaceGetValueProcessor {
+
+    /**
+     * 后置处理方法
+     *
+     * @param value     当前值
+     * @param pathParam 路径值
+     * @return 处理后的值
+     */
+    CusProcessorResult beforeProcessor(Object value, Map<String, String> pathParam, Map<String, Object> getValueParam);
+
+    /**
+     * 后置处理方法
+     *
+     * @param value     当前值
+     * @param pathParam 路径值
+     * @return 处理后的值
+     */
+    Object afterProcessor(Object value, Map<String, String> pathParam);
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_jitu/pushdata/service/toones/ConversionPriorityCusGetValueImpl.java b/src/main/youhong_ai_old_src/weaver/aiyh_jitu/pushdata/service/toones/ConversionPriorityCusGetValueImpl.java
new file mode 100644
index 0000000..b803267
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_jitu/pushdata/service/toones/ConversionPriorityCusGetValueImpl.java
@@ -0,0 +1,39 @@
+package weaver.aiyh_jitu.pushdata.service.toones;
+
+import aiyh.utils.Util;
+import aiyh.utils.excention.CustomerException;
+import weaver.xiao.commons.config.interfacies.CusInterfaceGetValue;
+
+import java.util.Map;
+
+/**
+ * <h1>转换优先级自定义接口处理方法</h1>
+ *
+ * <p>create: 2022-07-26 15:23</p>
+ *
+ * @author EBU7-dev-1 aiyh
+ */
+
+public class ConversionPriorityCusGetValueImpl implements CusInterfaceGetValue {
+    @Override
+    public Object execute(Map<String, Object> mainMap, Map<String, Object> detailMap, String currentValue,
+                          Map<String, String> pathParam) {
+        String convertField = pathParam.get("convertField");
+        if (Util.isNullOrEmpty(convertField)) {
+            throw new CustomerException("自定义接口执行异常： can not find [convertField] ,please check path param configuration!");
+        }
+        String value = null;
+        if (convertField.startsWith(START_LEFT + MAIN) && convertField.endsWith(END_STR)) {
+//            主表
+            value = Util.null2String(mainMap.get(convertField.substring((START_LEFT + MAIN).length(), convertField.length() - 1)));
+        }
+        if (convertField.startsWith(START_LEFT + DETAIL) && convertField.endsWith(END_STR)) {
+//            明细表
+            value = Util.null2String(detailMap.get(convertField.substring((START_LEFT + DETAIL).length(), convertField.length() - 1)));
+        }
+        if (Util.isNullOrEmpty(value)) {
+            throw new CustomerException(Util.logStr("自定义接口执行异常： can not get [{}] value! please make sure [{}] has value!", convertField, convertField));
+        }
+        return pathParam.get(value);
+    }
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_jitu/pushdata/service/toones/GetAssignProcessorProcessorImpl.java b/src/main/youhong_ai_old_src/weaver/aiyh_jitu/pushdata/service/toones/GetAssignProcessorProcessorImpl.java
new file mode 100644
index 0000000..ecbc6d7
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_jitu/pushdata/service/toones/GetAssignProcessorProcessorImpl.java
@@ -0,0 +1,61 @@
+package weaver.aiyh_jitu.pushdata.service.toones;
+
+import aiyh.utils.Util;
+import weaver.aiyh_jitu.pushdata.entity.CusProcessorResult;
+import weaver.aiyh_jitu.pushdata.mapper.ReleaseFlowMapper;
+import weaver.aiyh_jitu.pushdata.service.CusInterFaceGetValueProcessor;
+
+import java.util.Map;
+
+/**
+ * <h1>获取assign的后置增强方法处理</h1>
+ *
+ * <p>create: 2022-07-26 16:41</p>
+ *
+ * @author EBU7-dev-1 aiyh
+ */
+
+public class GetAssignProcessorProcessorImpl implements CusInterFaceGetValueProcessor {
+
+    private final ReleaseFlowMapper mapper = Util.getMapper(ReleaseFlowMapper.class);
+    private final String tableName = "uf_ones_code_cache";
+
+
+    @Override
+    public CusProcessorResult beforeProcessor(Object value, Map<String, String> pathParam, Map<String, Object> getValueParam) {
+        //        从pathParam中获取人员id
+        String hrmId = pathParam.get("hrmId");
+        String assign = mapper.selectOnesCache(hrmId);
+        CusProcessorResult cusProcessorResult = new CusProcessorResult();
+        cusProcessorResult.setContinue(true);
+        if (!Util.isNullOrEmpty(assign)) {
+//         存在
+            cusProcessorResult.setValue(assign);
+            cusProcessorResult.setContinue(false);
+        }
+        return cusProcessorResult;
+    }
+
+    @Override
+    public Object afterProcessor(Object value, Map<String, String> pathParam) {
+//        从pathParam中获取人员id
+        String hrmId = pathParam.get("hrmId");
+        String assignCode = Util.null2String(value);
+        String assign = mapper.selectOnesCache(hrmId);
+        if (!Util.isNullOrEmpty(assign)) {
+//            存在
+            return value;
+        }
+//        获取表单对应的modelId
+        String modelId = Util.getModeIdByTableName(tableName);
+        int modeDataId = Util.getModeDataId(tableName, Integer.parseInt(modelId), 1);
+        boolean flag = mapper.updateOnesCache(hrmId, assignCode, String.valueOf(modeDataId));
+        if (!flag) {
+            mapper.deleteOnesCache(String.valueOf(modeDataId));
+            Util.getLogger().error("can not update uf_noes_code_cache!");
+        }
+//        权限重构
+        Util.rebuildModeDataShare(1, Integer.parseInt(modelId), modeDataId);
+        return value;
+    }
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_jitu/pushdata/service/toones/GetRequestValueCusGetValueImpl.java b/src/main/youhong_ai_old_src/weaver/aiyh_jitu/pushdata/service/toones/GetRequestValueCusGetValueImpl.java
new file mode 100644
index 0000000..e5d865a
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_jitu/pushdata/service/toones/GetRequestValueCusGetValueImpl.java
@@ -0,0 +1,285 @@
+package weaver.aiyh_jitu.pushdata.service.toones;
+
+import aiyh.utils.Util;
+import aiyh.utils.excention.CustomerException;
+import aiyh.utils.httpUtil.ResponeVo;
+import aiyh.utils.httpUtil.util.HttpUtils;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import org.jetbrains.annotations.Nullable;
+import weaver.aiyh_jitu.pushdata.entity.CusProcessorResult;
+import weaver.aiyh_jitu.pushdata.entity.TokenEntity;
+import weaver.aiyh_jitu.pushdata.mapper.ReleaseFlowMapper;
+import weaver.aiyh_jitu.pushdata.service.CusInterFaceGetValueProcessor;
+import weaver.aiyh_jitu.pushdata.util.JiTuTokenUtil;
+import weaver.xiao.commons.config.entity.RequestMappingConfig;
+import weaver.xiao.commons.config.interfacies.CusInterfaceGetValue;
+import weaver.xiao.commons.config.service.DealWithMapping;
+
+import javax.ws.rs.core.MediaType;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * <h1>获取assign值</h1>
+ *
+ * <p>create: 2022-07-25 15:05</p>
+ *
+ * @author EBU7-dev-1 aiyh
+ */
+
+public class GetRequestValueCusGetValueImpl implements CusInterfaceGetValue {
+
+    public static final String GET = "GET";
+    public static final String POST = "POST";
+    public static final int SUCCESS_CODE = 200;
+
+    private Map<String, String> afterProcessorMap = new HashMap<>();
+    private Map<String, String> beforeProcessorMap = new HashMap<>();
+
+    private Map<String, Object> getValuePathParam = new HashMap<>();
+
+    private final ReleaseFlowMapper mapper = Util.getMapper(ReleaseFlowMapper.class);
+
+    /**
+     * <h2>读取配置的接口信息，执行接口并获取数据</h2>
+     * <p>
+     * requireParam requestType  请求类型 get post
+     * requireParam apiOnlyMark  请求接口唯一标识
+     * requireParam valueKey     获取接口的值的字段如data.value 获取请求结果中的data中的value
+     * </p>
+     * <p>
+     * #processorClass 获取增强类全路径类名，反射调用来增强当前的自定义接口，提高可扩展性和当前接口的复用性
+     * </p>
+     *
+     * @param mainMap      主表数据
+     * @param detailMap    明细表数据
+     * @param currentValue 当前字段值
+     * @param pathParam    路径参数
+     * @return 最终返回数据
+     */
+    @Override
+    public Object execute(Map<String, Object> mainMap, Map<String, Object> detailMap,
+                          String currentValue, Map<String, String> pathParam) {
+        try {
+
+            String requestTypeKey = "requestType";
+            String requestType = pathParam.remove(requestTypeKey);
+            if (Util.isNullOrEmpty(requestType)) {
+                Util.getLogger().info(Util.logStr("未正确配置转换字段的流程字段名！请检查配置表信息！"));
+                throw new CustomerException("换字段的流程字段名！请检查配置表信息！");
+            }
+//        请求唯一标识键名
+            String apiOnlyMarkKey = "apiOnlyMark";
+            String apiOnlyMark = pathParam.remove(apiOnlyMarkKey);
+            if (Util.isNullOrEmpty(apiOnlyMark)) {
+                Util.getLogger().info(Util.logStr("未正确配置请未正确配置请求参数的唯一标识！请检查配置表信息！"));
+                throw new CustomerException("未正确配置请未正确配置请求参数的唯一标识！请检查配置表信息！ ");
+            }
+//            获取后置处理的全路径类名
+            String processorClass = pathParam.remove("#processorClass");
+            DealWithMapping dealWithMapping = new DealWithMapping();
+            RequestMappingConfig requestMappingConfig = dealWithMapping.treeDealWithUniqueCode(apiOnlyMark);
+            String requestUrl = requestMappingConfig.getRequestUrl();
+            String environmentMark = Util.null2DefaultStr(pathParam.remove("environmentMark"), "uat");
+            String businessMark = Util.null2DefaultStr(pathParam.remove("businessMark"), "default");
+            if (Util.isNullOrEmpty(environmentMark)) {
+                throw new CustomerException("environmentMark is not configuration!");
+            }
+            if (Util.isNullOrEmpty(businessMark)) {
+                throw new CustomerException("businessMark is not configuration!");
+            }
+            String valueKey = pathParam.remove("valueKey");
+            if (Util.isNullOrEmpty(valueKey)) {
+                throw new CustomerException("接口参数验证异常： can not find [valueKey], please check path params configuration!");
+            }
+            Map<String, Object> requestParam = this.parseParam(mainMap, detailMap, pathParam);
+//            前置处理
+            if (!Util.isNullOrEmpty(processorClass)) {
+                CusProcessorResult cusProcessorResult = this.beforeProcessor(null, processorClass);
+                if (null != cusProcessorResult && !cusProcessorResult.isContinue()) {
+                    return cusProcessorResult.getValue();
+                }
+            }
+            Map<String, Object> tokenConfig = Util.readProperties2Map("jt_tokenConfigInfo", environmentMark.trim() + "." + businessMark);
+            if (tokenConfig == null) {
+                throw new CustomerException("Unable to read configuration file correctly [jt_tokenConfigInfo]，Please check whether the configuration file exists");
+            }
+            TokenEntity tokenEntity = TokenEntity.mapToTokenEntity(tokenConfig);
+            String token = JiTuTokenUtil.getToken(tokenEntity);
+//            对token添加到请求参数中
+            requestParam.replace("token", token);
+            HttpUtils httpUtils = new HttpUtils();
+            httpUtils.getGlobalCache().header.put("Content-Type", MediaType.APPLICATION_JSON);
+            httpUtils.getGlobalCache().header.put("token", token);
+            Object requestValue = getRequestValue(requestType, requestUrl, valueKey, requestParam, httpUtils);
+            Object value = requestValue;
+            if (!Util.isNullOrEmpty(processorClass)) {
+                value = afterProcessor(requestValue, processorClass);
+            }
+            return value;
+        } catch (Exception e) {
+            log.error("execute customer interface error! error info is " + Util.getErrString(e));
+            throw new CustomerException("execute customer interface error! " + e.getMessage(), e);
+        }
+    }
+
+    @Nullable
+    private Object getRequestValue(String requestType, String requestUrl, String valueKey,
+                                   Map<String, Object> requestParam, HttpUtils httpUtils) {
+        ResponeVo responeVo = null;
+        try {
+            if (GET.equalsIgnoreCase(requestType)) {
+//            GET请求
+                responeVo = httpUtils.apiGet(requestUrl, requestParam, null);
+            }
+            if (POST.equalsIgnoreCase(requestType)) {
+                //            POST请求
+                responeVo = httpUtils.apiPost(requestUrl, requestParam);
+            }
+        } catch (Exception e) {
+            throw new CustomerException("自定义接口执行异常：can not fetch url :[" + requestUrl + "]", e);
+        }
+        if (null == responeVo) {
+            return null;
+        }
+        if (responeVo.getCode() != SUCCESS_CODE) {
+            log.error(Util.logStr("自定义接口执行异常： can not success fetch url [{}], response string is [{}].",
+                    requestUrl, responeVo.getEntityString()));
+            throw new CustomerException("自定义接口执行异常：can not success fetch value!");
+        }
+        Map<String, Object> resultMap;
+        try {
+            resultMap = responeVo.getEntityMap();
+        } catch (JsonProcessingException e) {
+            log.error(Util.logStr("接口执行异常： can not parse map from response staring, response string is [{}]",
+                    responeVo.getEntityString()));
+            throw new CustomerException("自定义接口执行异常：can not parse map from response string!");
+        }
+        int code = Integer.parseInt(Util.null2DefaultStr(resultMap.get("code"), "-1"));
+        if (code != 1) {
+            log.error(Util.logStr("自定义接口执行异常： can not success fetch value, because [{}], all response is [{}]",
+                    resultMap.get("msg"), responeVo.getEntityString()));
+            throw new CustomerException("自定义接口执行异常：can not success fetch value!" + " " + resultMap.get("msg"));
+        }
+        return Util.getValueByKeyStr(valueKey, resultMap);
+    }
+
+
+    /**
+     * <h2>后置处理扩展</h2>
+     *
+     * @param value               当前值
+     * @param afterProcessorClass 后置处理类
+     * @return 后置处理后的值
+     */
+    private Object afterProcessor(Object value, String afterProcessorClass) {
+        Class<?> aClass;
+        try {
+            aClass = Class.forName(afterProcessorClass);
+        } catch (ClassNotFoundException e) {
+            throw new IllegalArgumentException("未能找到自定义后置处理接口：" + afterProcessorClass);
+        }
+        Constructor<?> constructor;
+        try {
+            constructor = aClass.getConstructor();
+        } catch (NoSuchMethodException e) {
+            throw new IllegalArgumentException(afterProcessorClass + "没有空参构造方法，无法获取构造方法对象！");
+        }
+        if (!CusInterFaceGetValueProcessor.class.isAssignableFrom(aClass)) {
+            throw new IllegalArgumentException("自定义后置处理接口：" + afterProcessorClass + " 不是"
+                    + CusInterFaceGetValueProcessor.class.getName() + "的子类或实现类！");
+        }
+        CusInterFaceGetValueProcessor o;
+        try {
+            o = (CusInterFaceGetValueProcessor) constructor.newInstance();
+        } catch (InstantiationException | IllegalAccessException | InvocationTargetException e) {
+            throw new IllegalArgumentException("无法构造" + afterProcessorClass + "对象！");
+        }
+        return o.afterProcessor(value, afterProcessorMap);
+    }
+
+    /**
+     * <h2>前置处理扩展</h2>
+     *
+     * @param value                当前值
+     * @param beforeProcessorClass 后置处理类
+     * @return 后置处理后的值
+     */
+    private CusProcessorResult beforeProcessor(Object value, String beforeProcessorClass) {
+        Class<?> aClass;
+        try {
+            aClass = Class.forName(beforeProcessorClass);
+        } catch (ClassNotFoundException e) {
+            throw new IllegalArgumentException("未能找到自定义前置处理接口：" + beforeProcessorClass);
+        }
+        Constructor<?> constructor;
+        try {
+            constructor = aClass.getConstructor();
+        } catch (NoSuchMethodException e) {
+            throw new IllegalArgumentException(beforeProcessorClass + "没有空参构造方法，无法获取构造方法对象！");
+        }
+        if (!CusInterFaceGetValueProcessor.class.isAssignableFrom(aClass)) {
+            throw new IllegalArgumentException("自定义前置处理接口：" + beforeProcessorClass + " 不是"
+                    + CusInterFaceGetValueProcessor.class.getName() + "的子类或实现类！");
+        }
+        CusInterFaceGetValueProcessor o;
+        try {
+            o = (CusInterFaceGetValueProcessor) constructor.newInstance();
+        } catch (InstantiationException | IllegalAccessException | InvocationTargetException e) {
+            throw new IllegalArgumentException("无法构造" + beforeProcessorClass + "对象！");
+        }
+        return o.beforeProcessor(value, beforeProcessorMap, getValuePathParam);
+    }
+
+    /**
+     * <h2>解析自定义接口配置的路径参数</h2>
+     * <p>
+     * #{main.zd} 解析为主表zd的值
+     * #{detail.zd} 解析为明细表zd的值
+     * #sql{select X from XXX where XX = XXX} 解析为sql的值
+     * afterProcessor.key 将键值对收集到后置增强类中当作参数
+     * beforeProcessor.key 将键值对收集到前置增强类中当作参数
+     * </p>
+     *
+     * @param mainMap   主表数据
+     * @param detailMap 明细表数据
+     * @param pathParam 路径参数
+     * @return 解析后路径参数
+     */
+    public Map<String, Object> parseParam(Map<String, Object> mainMap, Map<String, Object> detailMap, Map<String, String> pathParam) {
+        Map<String, Object> result = new HashMap<>(pathParam.size());
+
+        for (Map.Entry<String, String> entry : pathParam.entrySet()) {
+            // 解析参数
+            String key = entry.getKey();
+            String value = entry.getValue();
+            if (value.startsWith(VAR_START_STR + MAIN) && value.endsWith(END_STR)) {
+//                主表字段
+                value = value.substring((VAR_START_STR + MAIN).length(), value.length() - 1);
+                value = Util.null2String(mainMap.get(value));
+            } else if (value.startsWith(VAR_START_STR + DETAIL) && value.endsWith(END_STR)) {
+//                 明细表
+                value = value.substring((VAR_START_STR + DETAIL).length(), value.length() - 1);
+                value = Util.null2String(detailMap.get(value));
+            } else if (value.startsWith(SQL_START) && value.endsWith(END_STR)) {
+//                自定义sql
+                String cusSql = value.substring(SQL_START.length(), value.length() - 1);
+//                全角字符串转半角字符串
+                cusSql = Util.sbc2dbcCase(cusSql);
+                value = mapper.selectCusSql(cusSql, mainMap, detailMap);
+            }
+
+            if (key.startsWith("afterProcessor.")) {
+                afterProcessorMap.put(key.substring("afterProcessor.".length()), value);
+            } else if (key.startsWith("beforeProcessor.")) {
+                beforeProcessorMap.put(key.substring("beforeProcessor.".length()), value);
+            } else {
+                result.put(key, value);
+            }
+        }
+        getValuePathParam.putAll(result);
+        return result;
+    }
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_jitu/pushdata/service/toones/GetUUIDFromProjectIdFieldImpl.java b/src/main/youhong_ai_old_src/weaver/aiyh_jitu/pushdata/service/toones/GetUUIDFromProjectIdFieldImpl.java
new file mode 100644
index 0000000..b5886f6
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_jitu/pushdata/service/toones/GetUUIDFromProjectIdFieldImpl.java
@@ -0,0 +1,22 @@
+package weaver.aiyh_jitu.pushdata.service.toones;
+
+import weaver.xiao.commons.config.interfacies.CusInterfaceGetValue;
+
+import java.util.Map;
+
+/**
+ * <h1>获取uuid从projectId</h1>
+ *
+ * <p>create: 2023/3/27 18:18</p>
+ *
+ * @author youHong.ai
+ */
+public class GetUUIDFromProjectIdFieldImpl implements CusInterfaceGetValue {
+	@Override
+	public Object execute(Map<String, Object> mainMap,
+	                      Map<String, Object> detailMap,
+	                      String currentValue,
+	                      Map<String, String> pathParam) {
+		return GetUUIDProcessorProcessorImpl.TASKS_UUID.get();
+	}
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_jitu/pushdata/service/toones/GetUUIDProcessorProcessorImpl.java b/src/main/youhong_ai_old_src/weaver/aiyh_jitu/pushdata/service/toones/GetUUIDProcessorProcessorImpl.java
new file mode 100644
index 0000000..a198cc2
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_jitu/pushdata/service/toones/GetUUIDProcessorProcessorImpl.java
@@ -0,0 +1,33 @@
+package weaver.aiyh_jitu.pushdata.service.toones;
+
+import aiyh.utils.Util;
+import weaver.aiyh_jitu.pushdata.entity.CusProcessorResult;
+import weaver.aiyh_jitu.pushdata.service.CusInterFaceGetValueProcessor;
+
+import java.util.Map;
+
+/**
+ * <h1>获取uuid后置处理增强方法处理,增加后8位随机数</h1>
+ *
+ * <p>create: 2022-07-26 16:21</p>
+ *
+ * @author EBU7-dev-1 aiyh
+ */
+
+public class GetUUIDProcessorProcessorImpl implements CusInterFaceGetValueProcessor {
+	
+	public static final ThreadLocal<String> TASKS_UUID = new ThreadLocal<>();
+	
+	@Override
+	public CusProcessorResult beforeProcessor(Object value, Map<String, String> pathParam, Map<String, Object> getValueParam) {
+		return null;
+	}
+	
+	@Override
+	public Object afterProcessor(Object value, Map<String, String> pathParam) {
+		String valueStr = Util.null2DefaultStr(value, "");
+		valueStr += Util.randomString(8);
+		GetUUIDProcessorProcessorImpl.TASKS_UUID.set(valueStr);
+		return valueStr;
+	}
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_jitu/pushdata/service/toones/UploadFilePostProcessor.java b/src/main/youhong_ai_old_src/weaver/aiyh_jitu/pushdata/service/toones/UploadFilePostProcessor.java
new file mode 100644
index 0000000..cde4acd
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_jitu/pushdata/service/toones/UploadFilePostProcessor.java
@@ -0,0 +1,273 @@
+package weaver.aiyh_jitu.pushdata.service.toones;
+
+import aiyh.utils.Util;
+import aiyh.utils.entity.DocImageInfo;
+import aiyh.utils.excention.CustomerException;
+import aiyh.utils.httpUtil.ResponeVo;
+import aiyh.utils.httpUtil.util.HttpUtils;
+import cn.hutool.core.lang.Assert;
+import com.alibaba.fastjson.JSON;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import org.apache.log4j.Logger;
+import org.jetbrains.annotations.NotNull;
+import weaver.aiyh_jitu.pushdata.mapper.ReleaseFlowMapper;
+import weaver.aiyh_jitu.pushdata.service.CusActionPostProcessor;
+import weaver.aiyh_jitu.pushdata.util.JiTuTokenUtil;
+import weaver.conn.RecordSet;
+import weaver.soa.workflow.request.RequestInfo;
+import weaver.workflow.request.RequestManager;
+import weaver.xiao.commons.config.entity.RequestMappingConfig;
+import weaver.xiao.commons.config.service.DealWithMapping;
+
+import javax.ws.rs.core.MediaType;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <h1>上传附件增强处理器</h1>
+ *
+ * <p>create: 2022-07-30 00:44</p>
+ *
+ * @author aiyh EBU7-dev-1
+ */
+
+public class UploadFilePostProcessor implements CusActionPostProcessor {
+	
+	private static final int SUCCESS_CODE = 200;
+	private final HttpUtils httpUtils = new HttpUtils();
+	private final Logger log = Util.getLogger();
+	private String billTable;
+	private String requestId;
+	private final ReleaseFlowMapper mapper = Util.getMapper(ReleaseFlowMapper.class);
+	
+	/**
+	 * @param params 后置处理器参数
+	 *               params.get("requestParam", requestParam);  Map<String,Object>请求参数
+	 *               params.get("response", response);          Map<String,Object>请求响应
+	 *               params.get("requestInfo", requestInfo);    requestInfo对象
+	 *               params.get("pathParam", pathParam);        Map<String,String>路径配置参数
+	 *               <p>
+	 *               必配置参数：
+	 *               fileTokenApiConfigMark   获取上传文件token的接口配置
+	 *               uploadFileApiConfigMark   上传文件的接口配置
+	 *               task_uuidField    获取上传文件token的接口的uuid接口字段名
+	 *               fileOaFieldName    表单附件字段（只支持主表）
+	 *               fileNameApiField   获取token的接口的文件名
+	 *               可选配置参数：
+	 *               environmentMark  环境标识 测试 uat  正式 pro
+	 *               businessMark    业务标识， 可以使用默认
+	 * @return 处理结果值
+	 */
+	@Override
+	public Object postProcessor(Map<String, Object> params) {
+//        获取路径参数
+		Map<String, String> pathParam = (Map<String, String>) params.get("pathParam");
+//        获取流程信息
+		RequestInfo requestInfo = (RequestInfo) params.get("requestInfo");
+		RequestManager requestManager = requestInfo.getRequestManager();
+		billTable = requestManager.getBillTableName();
+		requestId = requestInfo.getRequestid();
+//        获取token配置信息
+		String environmentMark = Util.null2DefaultStr(pathParam.get("environmentMark"), "uat");
+		String businessMark = Util.null2DefaultStr(pathParam.get("businessMark"), "default");
+		String token = JiTuTokenUtil.getToken(environmentMark, businessMark);
+		httpUtils.getGlobalCache().header.put("Content-Type", MediaType.APPLICATION_JSON);
+		httpUtils.getGlobalCache().header.put("token", token);
+//        获取文件上传token的参数配置信息
+		String fileTokenApiConfigMark = pathParam.get("fileTokenApiConfigMark");
+//        获取文件上传接口参数
+		String uploadFileApiConfigMark = pathParam.get("uploadFileApiConfigMark");
+		String task_uuidField = pathParam.get("task_uuidField");
+		String task_uuid = GetUUIDProcessorProcessorImpl.TASKS_UUID.get();
+		GetUUIDProcessorProcessorImpl.TASKS_UUID.remove();
+		String fileNameApiField = pathParam.get("fileNameApiField");
+		Assert.notBlank(fileNameApiField, "api file name field is null, please make suer has value!");
+		String fileOaFieldName = pathParam.get("fileOaFieldName");
+		Assert.notBlank(fileOaFieldName, "file field name of oa is null, please make suer has value!");
+		RecordSet recordSet = mapper.selectMainData(requestId, billTable);
+		String fileFieldValue;
+		if (recordSet.next()) {
+			fileFieldValue = Util.null2String(recordSet.getString(fileOaFieldName));
+		} else {
+			return null;
+		}
+		if (Util.isNullOrEmpty(fileFieldValue)) {
+			return null;
+		}
+		String[] docIds = fileFieldValue.split(",");
+		List<DocImageInfo> docImageInfoList = mapper.selectDocImageInfoList(docIds);
+		if (null == docImageInfoList || docImageInfoList.isEmpty()) {
+			throw new CustomerException("can not select docImageInfo, please check you sql of selectDocImageInfoList method!");
+		}
+		for (DocImageInfo docImageInfo : docImageInfoList) {
+			if (docImageInfo.getFileSize() / 1024 >= 10 * 1024) {
+				throw new CustomerException("Single file size is more than 10m！");
+			}
+		}
+		int totalSize = docImageInfoList.stream().mapToInt(DocImageInfo::getFileSize).sum();
+		if (totalSize / 1024 >= 20 * 1024) {
+			throw new CustomerException("The total file size is greater than 20m！");
+		}
+		for (String docId : docIds) {
+			DocImageInfo docImageInfo = Util.selectImageInfoByDocId(docId);
+			uploadTaskFiles(fileTokenApiConfigMark, uploadFileApiConfigMark, task_uuid, task_uuidField, docImageInfo, fileNameApiField);
+		}
+		return null;
+	}
+	
+	/**
+	 * <h2>上传task附件</h2>
+	 *
+	 * @param fileTokenApiConfigMark  获取文件token的接口唯一标识
+	 * @param uploadFileApiConfigMark 上传文件的接口配置唯一标识
+	 * @param task_uuid               任务的uuid
+	 * @param task_uuidField          任务的uuid对应的请求接口的字段
+	 * @param docImageInfo            文件信息
+	 */
+	private void uploadTaskFiles(String fileTokenApiConfigMark, String uploadFileApiConfigMark,
+	                             String task_uuid, String task_uuidField, DocImageInfo docImageInfo, String fileNameApiField) {
+		String fileToken = getFileToken(fileTokenApiConfigMark, task_uuidField,
+				task_uuid, docImageInfo.getImageFileName(), fileNameApiField);
+		uploadFile(uploadFileApiConfigMark, docImageInfo.getImageFileId(),
+				docImageInfo.getImageFileName(), fileToken);
+	}
+	
+	/**
+	 * <h2>上传附件</h2>
+	 *
+	 * @param uploadFileApiConfigMark 上传文件的接口配置的唯一标识
+	 * @param imageFileId             附件ID
+	 * @param fileName                附件名称
+	 * @param fileToken               文件token
+	 */
+	private void uploadFile(String uploadFileApiConfigMark, Integer imageFileId,
+	                        String fileName, String fileToken) {
+		DealWithMapping dealWithMapping = new DealWithMapping();
+		RequestMappingConfig requestMappingConfig = dealWithMapping.treeDealWithUniqueCode(uploadFileApiConfigMark);
+		String requestUrl = requestMappingConfig.getRequestUrl();
+		Map<String, Object> params = new HashMap<>(4);
+		params.put("token", fileToken);
+		Map<String, String> heards = new HashMap<>(4);
+		heards.put("Content-Type", "multipart/form-data");
+		int retry = 0;
+		Map<String, Object> resultMap = null;
+		do {
+			retry++;
+			try {
+				resultMap = doUploadFile(imageFileId, fileName, requestUrl, params, heards);
+			} catch (Exception e) {
+				log.error(Util.logStr("fetch upload file token error, this url [{}], params is [{}]",
+						requestUrl, JSON.toJSONString(params)));
+				log.error(Util.getErrString(e));
+			}
+			
+		} while (retry <= 3 && (resultMap == null || resultMap.isEmpty()));
+		if (null == resultMap) {
+			throw new CustomerException("request upload file error, response is null!");
+		}
+	}
+	
+	/**
+	 * <h2>上传附件</h2>
+	 *
+	 * @param imageFileId 附件ID
+	 * @param fileName    附件名称
+	 * @param requestUrl  请求地址
+	 * @param params      其他请求参数
+	 * @param heards      请求头
+	 * @return 请求返回值
+	 */
+	private Map<String, Object> doUploadFile(Integer imageFileId, String fileName, String requestUrl, Map<String, Object> params, Map<String, String> heards) {
+		ResponeVo responeVo;
+		try {
+			responeVo = httpUtils.apiUploadFileById(requestUrl, imageFileId, "file", fileName, params, heards);
+		} catch (Exception e) {
+			throw new CustomerException("自定义actionProcessor接口执行异常：can not upload file, url :[" + requestUrl + "]", e);
+		}
+		return verifyResponseVoAndGetResultMap(requestUrl, responeVo);
+	}
+	
+	
+	/**
+	 * <h2>获取文件token</h2>
+	 *
+	 * @param fileTokenApiConfigMark 获取文件token接口的配置唯一标识
+	 * @param task_uuidField         对应任务uuid字段）
+	 * @param task_uuid              任务的uuid
+	 * @return 文件token
+	 */
+	private String getFileToken(String fileTokenApiConfigMark, String task_uuidField, String task_uuid,
+	                            String fileName, String fileNameApiField) {
+		DealWithMapping dealWithMapping = new DealWithMapping();
+		RequestMappingConfig requestMappingConfig = dealWithMapping.treeDealWithUniqueCode(fileTokenApiConfigMark);
+		RecordSet recordSet = mapper.selectMainData(requestId, billTable);
+		recordSet.next();
+		dealWithMapping.setMainTable(billTable);
+		Map<String, Object> requestParam = dealWithMapping.getRequestParam(recordSet, requestMappingConfig);
+		requestParam.put(task_uuidField, task_uuid);
+		requestParam.put(fileNameApiField, fileName);
+		String requestUrl = requestMappingConfig.getRequestUrl();
+		Map<String, Object> resultMap = null;
+		int retry = 0;
+		do {
+			try {
+				retry++;
+				resultMap = fetchUploadFileToken(requestParam, requestUrl);
+			} catch (Exception e) {
+				log.error(Util.logStr("fetch upload file token error, this url [{}], params is [{}]",
+						requestUrl, JSON.toJSONString(requestParam)));
+				log.error(Util.getErrString(e));
+			}
+		} while ((null == resultMap || resultMap.isEmpty()) && retry <= 3);
+		if (null == resultMap) {
+			throw new CustomerException("request upload file token error, response is null!");
+		}
+		return Util.null2String(resultMap.get("data"));
+	}
+	
+	/**
+	 * <h2>获取上传文件的token</h2>
+	 *
+	 * @param requestParam 请求参数
+	 * @param requestUrl   请求路径
+	 * @return 返回值
+	 */
+	@SuppressWarnings({"all"})
+	private Map<String, Object> fetchUploadFileToken(Map<String, Object> requestParam, String requestUrl) {
+		ResponeVo responeVo;
+		try {
+			responeVo = httpUtils.apiPost(requestUrl, requestParam);
+		} catch (Exception e) {
+			throw new CustomerException("自定义actionProcessor接口执行异常：can not fetch url :[" + requestUrl + "]", e);
+		}
+		return verifyResponseVoAndGetResultMap(requestUrl, responeVo);
+	}
+	
+	
+	@NotNull
+	@SuppressWarnings({"all"})
+	private Map<String, Object> verifyResponseVoAndGetResultMap(String requestUrl, ResponeVo responeVo) {
+		if (responeVo.getCode() != SUCCESS_CODE) {
+			log.error(Util.logStr("自定义 actionProcessor 接口执行异常： can not success fetch url [{}], response string is [{}].",
+					requestUrl, responeVo.getEntityString()));
+			throw new CustomerException("自定义actionProcessor接口执行异常：can not success fetch value!");
+		}
+		Map<String, Object> resultMap;
+		try {
+			resultMap = responeVo.getEntityMap();
+		} catch (
+				  JsonProcessingException e) {
+			log.error(Util.logStr("actionProcessor接口执行异常： can not parse map from response staring, response string is [{}]",
+					responeVo.getEntityString()));
+			throw new CustomerException("actionProcessor自定义接口执行异常：can not parse map from response string!");
+		}
+		int code = Integer.parseInt(Util.null2DefaultStr(resultMap.get("code"), "-1"));
+		if (code != 1) {
+			log.error(Util.logStr("actionProcessor自定义接口执行异常： can not success fetch value, because [{}], all response is [{}]",
+					resultMap.get("msg"), responeVo.getEntityString()));
+			throw new CustomerException("actionProcessor自定义接口执行异常：can not success fetch value!" + " " + resultMap.get("msg"));
+		}
+		return resultMap;
+	}
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_jitu/pushdata/util/JiTuTokenUtil.java b/src/main/youhong_ai_old_src/weaver/aiyh_jitu/pushdata/util/JiTuTokenUtil.java
new file mode 100644
index 0000000..1a68680
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_jitu/pushdata/util/JiTuTokenUtil.java
@@ -0,0 +1,210 @@
+package weaver.aiyh_jitu.pushdata.util;
+
+import aiyh.utils.Util;
+import aiyh.utils.excention.CustomerException;
+import aiyh.utils.httpUtil.ResponeVo;
+import aiyh.utils.httpUtil.util.HttpUtils;
+import com.alibaba.fastjson.JSON;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import weaver.aiyh_jitu.pushdata.entity.TokenEntity;
+
+import javax.ws.rs.core.MediaType;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * <h1>极兔获取token工具类</h1>
+ * <p>create 2022/7/12 17:03</p>
+ *
+ * @author ayh
+ */
+
+public class JiTuTokenUtil {
+
+    /**
+     * 请求工具类
+     */
+    private static final HttpUtils HTTP_UTILS = new HttpUtils();
+
+    private static final String TOKEN_URL = "/dcoauthedi/oauth/getToken";
+
+
+    /**
+     * token缓存池
+     */
+    private static final Map<String, TokenEntity.TokenInfo> TOKEN_INFO_MAP = new HashMap<>(4);
+    public static final int SUCCESS_CODE = 200;
+
+    static {
+//        设置全局请求头信息
+        HTTP_UTILS.getGlobalCache().header.put("Content-Type", MediaType.APPLICATION_JSON);
+    }
+
+    /**
+     * <h2>获取token字符串</h2>
+     *
+     * @param tokenEntity 获取token字符串所必要的数据信息
+     * @return token字符串
+     */
+    public static String getToken(TokenEntity tokenEntity) {
+        TokenEntity.TokenInfo tokenInfo = TOKEN_INFO_MAP.get(tokenEntity.getUserName());
+        if (tokenInfo == null) {
+            synchronized (JiTuTokenUtil.class) {
+                if (tokenInfo == null) {
+                    return fetchToken(tokenEntity);
+                }
+            }
+        }
+        // 过期时间在当前时间之前
+        boolean expiration = tokenInfo.getExpirationTime().before(new Date());
+        if (expiration) {
+//            token过期
+            synchronized (JiTuTokenUtil.class) {
+                // 再次确认token过期
+                tokenInfo = TOKEN_INFO_MAP.get(tokenEntity.getUserName());
+                if (tokenInfo.getExpirationTime().before(new Date())) {
+                    return fetchToken(tokenEntity);
+                }
+            }
+        }
+        return tokenInfo.getTokenStr();
+    }
+
+    /**
+     * <h2>验证token是否合法</h2>
+     *
+     * @param userName 用户名
+     * @return token是否合法
+     */
+    private static boolean verifyTokenExpiration(String userName) {
+        TokenEntity.TokenInfo tokenInfo = TOKEN_INFO_MAP.get(userName);
+        if (tokenInfo == null) {
+            return false;
+        }
+        // 过期时间在当前时间之前,true标识过期，反之没过期
+        boolean expiration = tokenInfo.getExpirationTime().before(new Date());
+        return !expiration;
+    }
+
+    /**
+     * 发送请求获取token信息
+     *
+     * @param tokenEntity 获取token所必须的参数
+     * @return token字符串
+     */
+    private static String fetchToken(TokenEntity tokenEntity) {
+        if (verifyTokenExpiration(tokenEntity.getUserName())) {
+            return TOKEN_INFO_MAP.get(tokenEntity.getUserName()).getTokenStr();
+        }
+        String password = tokenEntity.getPassword();
+        String userName = tokenEntity.getUserName();
+        String secretKey = tokenEntity.getSecretKey();
+        String currentTime = Util.getTime("yyyyMMdd");
+        String encryptionKey = encryptMD5(userName + ":" + password + ":" + currentTime + ":" + secretKey);
+        Map<String, Object> params = new HashMap<>(8);
+        params.put("password", password);
+        params.put("userName", userName);
+        params.put("systemCode", tokenEntity.getSystemCode());
+        params.put("encryptionKey", encryptionKey);
+        String url = tokenEntity.getBaseUrl() + TOKEN_URL;
+        ResponeVo responeVo;
+        try {
+            responeVo = HTTP_UTILS.apiPost(url, params);
+        } catch (IOException e) {
+            throw new CustomerException(Util.logStr("this request is error, error message is [{}]," +
+                            "this request params is [{}], url is [{}]",
+                    e.getMessage(), JSON.toJSONString(params), url), e);
+        }
+        if (responeVo.getCode() == SUCCESS_CODE) {
+            Map<String, Object> entityMap;
+            try {
+                entityMap = responeVo.getEntityMap();
+            } catch (JsonProcessingException e) {
+                throw new CustomerException(Util.logStr("this response parse map error, this response string is [{}]," +
+                                "this request params is [{}], url is [{}]",
+                        responeVo.getEntityString(), JSON.toJSONString(params), url), e);
+            }
+            int code = Integer.parseInt(String.valueOf(entityMap.get("code")));
+            boolean succ = Boolean.parseBoolean(String.valueOf(entityMap.get("succ")));
+            if (code == 1 && succ) {
+                String token = String.valueOf(entityMap.get("data"));
+                if (Util.isNullOrEmpty(token)) {
+                    throw new CustomerException(Util.logStr("get token success but this token is empty! this request params is [{}], url is [{}]",
+                            JSON.toJSONString(params), url));
+                }
+                TokenEntity.TokenInfo tokenInfo = new TokenEntity.TokenInfo();
+                tokenInfo.setTokenStr(token);
+                Calendar calendar = Calendar.getInstance();
+                calendar.add(Calendar.HOUR, tokenEntity.getExpiration());
+                tokenInfo.setExpirationTime(calendar.getTime());
+                TOKEN_INFO_MAP.put(userName, tokenInfo);
+                return token;
+            } else {
+                throw new CustomerException(Util.logStr("cont not fetch token , fail msg is [{}]，this request params is [{}], url is [{}]", responeVo.getEntityString(),
+                        JSON.toJSONString(params), url));
+            }
+        }
+        throw new CustomerException(Util.logStr("cont not fetch token, because the status code of this request was not successful, " +
+                        "the status code of this request is [{}] and response string is [{}]",
+                responeVo.getCode(), responeVo.getEntityString()));
+    }
+
+
+    /**
+     * <h2>获取token</h2>
+     *
+     * @param environmentMark 环境标识
+     * @param businessMark    业务标识
+     * @return token
+     */
+    public static String getToken(String environmentMark, String businessMark) {
+        Map<String, Object> tokenConfig = Util.readProperties2Map("jt_tokenConfigInfo", environmentMark.trim() + "." + businessMark);
+        if (tokenConfig == null) {
+            throw new CustomerException("Unable to read configuration file correctly [jt_tokenConfigInfo]，Please check whether the configuration file exists");
+        }
+        TokenEntity tokenEntity = TokenEntity.mapToTokenEntity(tokenConfig);
+        return JiTuTokenUtil.getToken(tokenEntity);
+    }
+
+    /**
+     * <h2>获取token</h2>
+     *
+     * @return token
+     */
+    public static String getTokenByDefault() {
+        return getToken("uat", "default");
+    }
+
+    /**
+     * <h2>加密字符串</h2>
+     *
+     * @param str 待加密字符串
+     * @return 加密字符串
+     */
+    public static String encryptMD5(String str) {
+        try {
+            MessageDigest md5 = MessageDigest.getInstance("MD5");
+            md5.update(str.getBytes(StandardCharsets.UTF_8));
+            byte[] digest = md5.digest();
+            StringBuilder build = new StringBuilder();
+            for (byte b : digest) {
+                // 以16进制形式输出,高位不足补0
+                build.append(String.format("%02X", b));
+            }
+            return build.toString();
+        } catch (NoSuchAlgorithmException e) {
+            throw new CustomerException("encrypt string error!", e);
+        }
+    }
+
+
+    public static void clearToken() {
+        TOKEN_INFO_MAP.clear();
+    }
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_jitu/schedule/deletewxhrm/LeaveOfficeHrmWxDeleteCronJob.java b/src/main/youhong_ai_old_src/weaver/aiyh_jitu/schedule/deletewxhrm/LeaveOfficeHrmWxDeleteCronJob.java
new file mode 100644
index 0000000..e72bb5e
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_jitu/schedule/deletewxhrm/LeaveOfficeHrmWxDeleteCronJob.java
@@ -0,0 +1,188 @@
+package weaver.aiyh_jitu.schedule.deletewxhrm;
+
+import aiyh.utils.Util;
+import aiyh.utils.annotation.*;
+import aiyh.utils.excention.CustomerException;
+import com.alibaba.fastjson.JSON;
+import lombok.Setter;
+import org.apache.log4j.Logger;
+import weaver.aiyh_jitu.schedule.deletewxhrm.enetiy.EmAndWxDeleteHrmInfo;
+import weaver.aiyh_jitu.schedule.deletewxhrm.mapper.LeaveOfficeHrmMapper;
+import weaver.aiyh_jitu.schedule.deletewxhrm.wxutil.Em7AccessTokenUtil;
+import weaver.aiyh_jitu.schedule.deletewxhrm.wxutil.WxAccessTokenUtil;
+import weaver.interfaces.schedule.BaseCronJob;
+
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.List;
+
+/**
+ * <h1>企业微信删除某个离职周期外的离职人员</h1>
+ *
+ * <p>create: 2022-07-27 14:02</p>
+ *
+ * @author EBU7-dev-1 aiyh
+ */
+
+@Setter
+@ActionDesc(value = "定时任务根据配置离职周期删除企业微信的离职人员", author = "aiyh")
+public class LeaveOfficeHrmWxDeleteCronJob extends BaseCronJob {
+
+    @ActionOptionalParam(desc = "微信用户id与oa人力资源表中相互对应的字段", value = "mobile")
+    @PrintParamMark
+    @ActionDefaultTestValue("mobile")
+    private String wxAccountMappingOaField = "mobile";
+
+    @ActionOptionalParam(desc = "em用户于oa人力资源表中相互映射的字段", value = "loginid")
+    @PrintParamMark
+    @ActionDefaultTestValue("loginid")
+    private String emAccountMappingOaField = "loginid";
+
+    @RequiredMark("删除周期类型： 1 - 指定日期之前，0 - 今天 减 离职周期之前，即如果今天是2022年7月31日，" +
+            "leaveOfficeDateCycle设置的周期是30天，那么将会删除2022年7月1日之前离职的人员")
+    @PrintParamMark
+    @ActionDefaultTestValue("0")
+    private String cycleType;
+
+    @RequiredMark("删除企业微信离职人员的离职周期，如果周期类型`cycleType`为 0 ，时间以小时为天为单位，如30表示，离职30天之后的人员，" +
+            "如周期类型`cycleType`为 1 ， 时间未固定时间之前离职的人格式为 yyyy-MM-dd，如2022-07-32")
+    @PrintParamMark
+    @ActionDefaultTestValue("30")
+    private String leaveOfficeDateCycle;
+
+
+    @ActionOptionalParam(desc = "删除人员的人员id范围限制，如1,2,3,4,5,6标识只会查询和删除人员id在1,2,3,4,5,6中的人员",
+            value = "")
+    @PrintParamMark
+    @ActionDefaultTestValue("80")
+    private String includeHrm;
+
+    @ActionOptionalParam(desc = "自定义查询条件以and开头，比如： and field1 = 2，慎用，存在高风险", value = "")
+    @PrintParamMark
+    @ActionDefaultTestValue("")
+    private String cusSqlWhere = "";
+
+    @ActionOptionalParam(desc = "人员状态，默认值为离职状态0：试用<br>1：正式<br>2：临时<br>3：试用延期<br>4：解聘<br>5：离职<br>6：退休<br>7：无效", value = "5")
+    @PrintParamMark
+    @ActionDefaultTestValue("5")
+    private String status = "5";
+
+
+    /**
+     * 企业微信人员离职周期外人员删除标记， 0 - 未删除 1 - 以删除 2 - 用户不存在企业微信中
+     */
+    private final String deleteFlagFieldOfHrmResource = "tinyintfield5";
+
+    private final LeaveOfficeHrmMapper mapper = Util.getMapper(LeaveOfficeHrmMapper.class);
+
+    private final Logger log = Util.getLogger();
+
+    @Override
+    public void execute() {
+        try {
+            Util.verifyRequiredField(this);
+            if (!Util.isNullOrEmpty(cusSqlWhere)) {
+                if (cusSqlWhere.toLowerCase().contains(" or ")) {
+                    throw new IllegalArgumentException("自定义查询条件未通过验证，该条件存在高风险操作！");
+                }
+                String replace = cusSqlWhere.toLowerCase().replaceFirst("and ", "");
+                String[] keyValues = replace.split(" and ");
+                for (String keyValue : keyValues) {
+                    String[] split = keyValue.split("=");
+                    for (int i = 0; i < split.length - 1; i++) {
+                        String key = split[i];
+                        String value = split[i + 1];
+                        if (key.trim().equals(value.trim())) {
+                            throw new IllegalArgumentException("自定义查询条件未通过验证，该条件存在高风险操作！");
+                        }
+                    }
+                }
+            }
+            if (status.contains("0") || status.contains("1") || status.contains("2") || status.contains("3")) {
+                throw new IllegalArgumentException("自定义状态通过验证，该条件存在高风险操作！");
+            }
+        } catch (CustomerException e) {
+            log.error("必填参数验证未通过：" + e.getMessage());
+        } catch (Exception e) {
+            log.error(Util.getErrString(e));
+        }
+        try {
+            doExecute();
+        } catch (CustomerException e) {
+            e.printStackTrace();
+        } catch (Exception e) {
+            log.error("定时任务执行异常：" + Util.getErrString(e));
+            throw new CustomerException("定时任务执行异常！", e);
+        }
+    }
+
+
+    /**
+     * <h2>具体逻辑处理</h2>
+     */
+    private void doExecute() {
+        String lastDate = "";
+        if ("1".equals(cycleType)) {
+//            指定日期之前
+            lastDate = leaveOfficeDateCycle;
+        } else if ("0".equals(cycleType)) {
+//            指定天数之前
+            Calendar calendar = Calendar.getInstance();
+            calendar.add(Calendar.DAY_OF_YEAR, -Integer.parseInt(leaveOfficeDateCycle));
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+            lastDate = sdf.format(calendar.getTime());
+        }
+
+        List<EmAndWxDeleteHrmInfo> wxAccountOfDeleteHrmList;
+        if (Util.isNullOrEmpty(includeHrm)) {
+            wxAccountOfDeleteHrmList = mapper.selectShouldDeleteHrm(lastDate, deleteFlagFieldOfHrmResource,
+                    wxAccountMappingOaField, emAccountMappingOaField, status, cusSqlWhere);
+        } else {
+            wxAccountOfDeleteHrmList = mapper.selectShouldDeleteHrmIn(lastDate, deleteFlagFieldOfHrmResource,
+                    wxAccountMappingOaField, emAccountMappingOaField, includeHrm, status, cusSqlWhere);
+        }
+        if (null == wxAccountOfDeleteHrmList || wxAccountOfDeleteHrmList.isEmpty()) {
+            return;
+        }
+        log.info("select wxAccountOfDeleteHrmList is : " + JSON.toJSONString(wxAccountOfDeleteHrmList));
+        for (EmAndWxDeleteHrmInfo emAndWxDeleteHrmInfo : wxAccountOfDeleteHrmList) {
+            try {
+                Em7AccessTokenUtil.deleteEmHrmByAccount(emAndWxDeleteHrmInfo.getEmAccount());
+                boolean isDelete = WxAccessTokenUtil.deleteWxHrmByAccount(emAndWxDeleteHrmInfo.getWxAccount());
+                if (isDelete) {
+//                删除成功
+                    doDeleteSuccess(emAndWxDeleteHrmInfo.getWxAccount());
+                } else {
+//                企业微信不存在这个人
+                    doNotFindHrm(emAndWxDeleteHrmInfo.getWxAccount());
+                }
+            } catch (CustomerException e) {
+//                  自定义异常，删除失败
+                log.error("can not delete wxHrm, fail msg is: " + e.getMessage());
+                throw e;
+            } catch (Exception e) {
+//                其他异常信息
+                log.error("can not delete wxHrm,  because application is error");
+                throw e;
+            }
+        }
+    }
+
+    /**
+     * <h2>删除成功具体操作</h2>
+     *
+     * @param wxAccount 企业微信账号
+     */
+    private void doDeleteSuccess(String wxAccount) {
+        mapper.updateWxHrmDeleteStatus(wxAccount, wxAccountMappingOaField, 1, deleteFlagFieldOfHrmResource);
+    }
+
+    /**
+     * <h2>不存在人员具体操作</h2>
+     *
+     * @param wxAccount 企业微信账号
+     */
+    private void doNotFindHrm(String wxAccount) {
+        mapper.updateWxHrmDeleteStatus(wxAccount, wxAccountMappingOaField, 2, deleteFlagFieldOfHrmResource);
+    }
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_jitu/schedule/deletewxhrm/enetiy/EmAndWxDeleteHrmInfo.java b/src/main/youhong_ai_old_src/weaver/aiyh_jitu/schedule/deletewxhrm/enetiy/EmAndWxDeleteHrmInfo.java
new file mode 100644
index 0000000..d9e44b4
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_jitu/schedule/deletewxhrm/enetiy/EmAndWxDeleteHrmInfo.java
@@ -0,0 +1,18 @@
+package weaver.aiyh_jitu.schedule.deletewxhrm.enetiy;
+
+import lombok.Data;
+
+/**
+ * <h1>微信和em7删除离职人员信息</h1>
+ *
+ * <p>create: 2022-08-05 12:52</p>
+ *
+ * @author aiyh EBU7-dev-1
+ */
+
+@Data
+public class EmAndWxDeleteHrmInfo {
+
+    private String wxAccount;
+    private String emAccount;
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_jitu/schedule/deletewxhrm/mapper/LeaveOfficeHrmMapper.java b/src/main/youhong_ai_old_src/weaver/aiyh_jitu/schedule/deletewxhrm/mapper/LeaveOfficeHrmMapper.java
new file mode 100644
index 0000000..e2ba584
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_jitu/schedule/deletewxhrm/mapper/LeaveOfficeHrmMapper.java
@@ -0,0 +1,69 @@
+package weaver.aiyh_jitu.schedule.deletewxhrm.mapper;
+
+import aiyh.utils.annotation.recordset.ParamMapper;
+import aiyh.utils.annotation.recordset.Select;
+import aiyh.utils.annotation.recordset.SqlMapper;
+import aiyh.utils.annotation.recordset.Update;
+import weaver.aiyh_jitu.schedule.deletewxhrm.enetiy.EmAndWxDeleteHrmInfo;
+
+import java.util.List;
+
+/**
+ * <h1>离职人员查询</h1>
+ *
+ * <p>create: 2022-07-28 11:47</p>
+ *
+ * @author aiyh
+ */
+
+@SqlMapper
+public interface LeaveOfficeHrmMapper {
+
+
+    /**
+     * <h2>查询需要删除企业微信的人员的企业微信账号</h2>
+     *
+     * @param lastDate                     离职日期
+     * @param deleteFlagFieldOfHrmResource 删除标记字段
+     * @param wxAccountMappingOaField      微信账号字段即企业微信的用户ID
+     * @return 待删除的企业微信的人员微信账号信息
+     */
+    @Select("select $t{wxAccountMappingOaField} wx_account, $t{emAccountMappingOaField} em_account from hrmresource where $t{wxAccountMappingOaField} is not null and " +
+            "enddate < #{lastDate} and ($t{deleteFlagFieldOfHrmResource} not in (1,2) or " +
+            "$t{deleteFlagFieldOfHrmResource} is null) and status in ($t{status}) " +
+            "$t{cusSqlWhere}")
+    List<EmAndWxDeleteHrmInfo> selectShouldDeleteHrm(@ParamMapper("lastDate") String lastDate,
+                                                     @ParamMapper("deleteFlagFieldOfHrmResource") String deleteFlagFieldOfHrmResource,
+                                                     @ParamMapper("wxAccountMappingOaField") String wxAccountMappingOaField,
+                                                     @ParamMapper("emAccountMappingOaField") String emAccountMappingOaField,
+                                                     @ParamMapper("status") String status,
+                                                     @ParamMapper("cusSqlWhere") String cusSqlWhere);
+
+
+    /**
+     * <h2>更新离职人员在企业微信中的删除状态</h2>
+     *
+     * @param wxAccount                    微信账号
+     * @param wxAccountMappingOaField      微信账号字段
+     * @param status                       删除状态
+     * @param deleteFlagFieldOfHrmResource 删除状态字段
+     */
+    @Update("update hrmresource set $t{deleteFlagFieldOfHrmResource} = #{status} " +
+            "where $t{wxAccountMappingOaField} = #{wxAccount}")
+    void updateWxHrmDeleteStatus(@ParamMapper("wxAccount") String wxAccount,
+                                 @ParamMapper("wxAccountMappingOaField") String wxAccountMappingOaField,
+                                 @ParamMapper("status") int status,
+                                 @ParamMapper("deleteFlagFieldOfHrmResource") String deleteFlagFieldOfHrmResource);
+
+    @Select("select $t{wxAccountMappingOaField} wx_account, $t{emAccountMappingOaField} em_account from hrmresource where $t{wxAccountMappingOaField} is not null and " +
+            "enddate < #{lastDate} and ($t{deleteFlagFieldOfHrmResource} not in (1,2) or " +
+            "$t{deleteFlagFieldOfHrmResource} is null) and id in ($t{includeHrm}) and status in ($t{status}) " +
+            "$t{cusSqlWhere}")
+    List<EmAndWxDeleteHrmInfo> selectShouldDeleteHrmIn(@ParamMapper("lastDate") String lastDate,
+                                                       @ParamMapper("deleteFlagFieldOfHrmResource") String deleteFlagFieldOfHrmResource,
+                                                       @ParamMapper("wxAccountMappingOaField") String wxAccountMappingOaField,
+                                                       @ParamMapper("emAccountMappingOaField") String emAccountMappingOaField,
+                                                       @ParamMapper("includeHrm") String includeHrm,
+                                                       @ParamMapper("status") String status,
+                                                       @ParamMapper("cusSqlWhere") String cusSqlWhere);
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_jitu/schedule/deletewxhrm/wxutil/Em7AccessTokenUtil.java b/src/main/youhong_ai_old_src/weaver/aiyh_jitu/schedule/deletewxhrm/wxutil/Em7AccessTokenUtil.java
new file mode 100644
index 0000000..616425f
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_jitu/schedule/deletewxhrm/wxutil/Em7AccessTokenUtil.java
@@ -0,0 +1,182 @@
+package weaver.aiyh_jitu.schedule.deletewxhrm.wxutil;
+
+import aiyh.utils.Util;
+import aiyh.utils.excention.CustomerException;
+import aiyh.utils.httpUtil.ResponeVo;
+import aiyh.utils.httpUtil.util.HttpUtils;
+import cn.hutool.core.lang.Assert;
+import com.fasterxml.jackson.core.JsonProcessingException;
+
+import java.io.IOException;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * <h1>em7获取accessToken及接口调用工具</h1>
+ *
+ * <p>create: 2022-08-04 15:05</p>
+ *
+ * @author aiyh EBU7-dev-1
+ */
+
+public class Em7AccessTokenUtil {
+    /**
+     * 请求工具
+     */
+    private final static HttpUtils httpUtils = new HttpUtils();
+    /**
+     * em accessToken
+     */
+    private static volatile String accessToken;
+    /**
+     * em accessToken过期时间
+     */
+    private static Date accessTokenExpirationTime;
+
+    /**
+     * em 服务端域名
+     */
+    private static String baseHost;
+
+    /**
+     * <h2>获取em接口调用凭证</h2>
+     *
+     * @return em接口调用凭证
+     */
+    public static String getAccessToken() {
+        if (!verifyAccessToken(accessToken)) {
+            synchronized (Em7AccessTokenUtil.class) {
+                if (!verifyAccessToken(accessToken)) {
+                    try {
+                        accessToken = fetchEm7AccessToken();
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                        throw new CustomerException(e.getMessage());
+                    }
+                }
+            }
+        }
+        return accessToken;
+    }
+
+    /**
+     * <h2>请求调用获取em接口调用凭证</h2>
+     *
+     * @return em7接口调用凭证
+     */
+    private static String fetchEm7AccessToken() {
+        Map<String, Object> emAccessTokenConfig = Util.readProperties2Map("wxAccessTokenConfig", "em");
+        if (null == emAccessTokenConfig || emAccessTokenConfig.isEmpty()) {
+            throw new CustomerException("can not read /WEB-INF/prop/prop2map/wxAccessTokenConfig.properties file, " +
+                    "please check this configuration file!");
+        }
+        baseHost = Util.null2String(emAccessTokenConfig.remove("baseHost"));
+        Assert.notBlank(baseHost, "baseUrl is null or blank! please make sure baseUrl has value!");
+        String corpId = Util.null2String(emAccessTokenConfig.get("corpid"));
+        Assert.notBlank(corpId, "corpid is null or blank! please make sure corpid has value!");
+        String corpSecret = Util.null2String(emAccessTokenConfig.get("corpsecret"));
+        Assert.notBlank(corpSecret, "corpsecret is null or blank! please make sure corpsecret has value!");
+        String baseUrl;
+        if (baseHost.endsWith("/")) {
+            baseUrl = baseHost + "emp/api/gettoken";
+        } else {
+            baseUrl = baseHost + "/emp/api/gettoken";
+        }
+        Map<String, Object> result = fetchEmService(baseUrl, emAccessTokenConfig);
+        int errCode = Integer.parseInt(Util.null2DefaultStr(result.get("errcode"), "-1"));
+        if (0 != errCode) {
+            throw new CustomerException(Util.logStr("get accessToken error, error msg is [{}]", result.get("errmsg")));
+        }
+        accessToken = Util.null2String(result.get("access_token"));
+        int expiresIn = Integer.parseInt(Util.null2DefaultStr(result.get("expire"), "100"));
+        Calendar calendar = Calendar.getInstance();
+        calendar.add(Calendar.SECOND, expiresIn - 60 * 5);
+        accessTokenExpirationTime = calendar.getTime();
+        return accessToken;
+    }
+
+
+    /**
+     * <h2>查验accessToken是否存在或过期，是否正常</h2>
+     *
+     * @param accessToken 需要查询的accessToken
+     * @return false不能使用 true正常
+     */
+    private static boolean verifyAccessToken(String accessToken) {
+        if (null == accessToken || Util.isNullOrEmpty(accessToken)) {
+            return false;
+        }
+        return !accessTokenExpirationTime.before(new Date());
+    }
+
+    /**
+     * <h2>删除em成员</h2>
+     *
+     * @param account em账号
+     * @return 是否删除成功， true 删除成功 false 不存在账号
+     * @throws CustomerException 其他异常信息，删除失败
+     */
+    public static boolean deleteEmHrmByAccount(String account) throws CustomerException {
+        Assert.notBlank(account, "em account is null or blank, please make suer em account has value!");
+        String accessToken = getAccessToken();
+        String baseUrl;
+        if (baseHost.endsWith("/")) {
+            baseUrl = baseHost + "emp/api/user/delete";
+        } else {
+            baseUrl = baseHost + "/emp/api/user/delete";
+        }
+        Map<String, Object> params = new HashMap<>(4);
+        params.put("access_token", accessToken);
+        params.put("userid", account);
+        Map<String, Object> result = fetchEmService(baseUrl, params);
+        int errCode = Integer.parseInt(Util.null2DefaultStr(result.get("errcode"), "-1"));
+        if (60111 == errCode) {
+            return false;
+        }
+        if (0 != errCode) {
+            throw new CustomerException(Util.logStr("delete wxHrm error, error msg is [{}]", result.get("errmsg")));
+        }
+        return true;
+    }
+
+
+    /**
+     * <h2>验证并获取返回值</h2>
+     *
+     * @param baseUrl   请求地址
+     * @param responeVo 响应对象
+     * @return 响应结果
+     */
+    private static Map<String, Object> verifyResponseAndGerResultMap(String baseUrl, ResponeVo responeVo) {
+        if (200 != responeVo.getCode()) {
+            throw new CustomerException(Util.logStr("fetch [{}] error, error msg is [{}]", baseUrl, responeVo.getEntityString()));
+        }
+        Map<String, Object> result;
+        try {
+            result = responeVo.getEntityMap();
+        } catch (JsonProcessingException e) {
+            throw new CustomerException(Util.logStr("can not parse map from response string, the response string is [{}]", responeVo.getEntityString()));
+        }
+        return result;
+    }
+
+    /**
+     * <h2>调用em服务</h2>
+     *
+     * @param baseUrl 请求路径
+     * @param params  请求参数
+     * @return 请求结果
+     */
+    private static Map<String, Object> fetchEmService(String baseUrl, Map<String, Object> params) {
+        ResponeVo responeVo;
+        try {
+            responeVo = httpUtils.apiGet(baseUrl, params, null);
+        } catch (IOException e) {
+            throw new CustomerException(Util.logStr("can not fetch [{}], please check network!", baseUrl), e);
+        }
+        return verifyResponseAndGerResultMap(baseUrl, responeVo);
+
+    }
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_jitu/schedule/deletewxhrm/wxutil/WxAccessTokenUtil.java b/src/main/youhong_ai_old_src/weaver/aiyh_jitu/schedule/deletewxhrm/wxutil/WxAccessTokenUtil.java
new file mode 100644
index 0000000..e483fff
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_jitu/schedule/deletewxhrm/wxutil/WxAccessTokenUtil.java
@@ -0,0 +1,234 @@
+package weaver.aiyh_jitu.schedule.deletewxhrm.wxutil;
+
+import aiyh.utils.Util;
+import aiyh.utils.excention.CustomerException;
+import aiyh.utils.httpUtil.ResponeVo;
+import aiyh.utils.httpUtil.util.HttpUtils;
+import cn.hutool.core.lang.Assert;
+import com.fasterxml.jackson.core.JsonProcessingException;
+
+import javax.ws.rs.core.MediaType;
+import java.io.IOException;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * <h1>微信访问令牌工具类</h1>
+ *
+ * <p>create: 2022-07-28 17:59</p>
+ *
+ * @author aiyh EBU7-dev-1
+ */
+
+public class WxAccessTokenUtil {
+
+    /**
+     * 请求工具
+     */
+    private final static HttpUtils httpUtils = new HttpUtils();
+    /**
+     * 微信accessToken
+     */
+    private static volatile String accessToken;
+    /**
+     * 微信accessToken过期时间
+     */
+    private static Date accessTokenExpirationTime;
+
+    /**
+     * 企业微信服务端域名
+     */
+    private static String baseHost;
+
+    /**
+     * <h2>获取企业微信接口调用凭证</h2>
+     *
+     * @return 企业微信接口调用凭证
+     */
+    public static String getAccessToken() {
+        if (!verifyAccessToken(accessToken)) {
+            synchronized (WxAccessTokenUtil.class) {
+                if (!verifyAccessToken(accessToken)) {
+                    try {
+                        accessToken = fetchWxAccessToken();
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                        throw new CustomerException(e.getMessage());
+                    }
+                }
+            }
+        }
+        return accessToken;
+    }
+
+    /**
+     * <h2>请求调用获取企业卫星接口调用凭证</h2>
+     *
+     * @return 企业微信接口调用凭证
+     */
+    private static String fetchWxAccessToken() {
+        Map<String, Object> wxAccessTokenConfig = Util.readProperties2Map("wxAccessTokenConfig", "wx");
+        if (null == wxAccessTokenConfig || wxAccessTokenConfig.isEmpty()) {
+            throw new CustomerException("can not read /WEB-INF/prop/prop2map/wxAccessTokenConfig.properties file, " +
+                    "please check this configuration file!");
+        }
+        baseHost = Util.null2String(wxAccessTokenConfig.remove("baseHost"));
+        Assert.notBlank(baseHost, "baseUrl is null or blank! please make sure baseUrl has value!");
+        String corpId = Util.null2String(wxAccessTokenConfig.get("corpid"));
+        Assert.notBlank(corpId, "corpid is null or blank! please make sure corpid has value!");
+        String corpSecret = Util.null2String(wxAccessTokenConfig.get("corpsecret"));
+        Assert.notBlank(corpSecret, "corpsecret is null or blank! please make sure corpsecret has value!");
+        String baseUrl;
+        if (baseHost.endsWith("/")) {
+            baseUrl = baseHost + "cgi-bin/gettoken";
+        } else {
+            baseUrl = baseHost + "/cgi-bin/gettoken";
+        }
+        Map<String, Object> result = fetchWxService(baseUrl, wxAccessTokenConfig);
+        int errCode = Integer.parseInt(Util.null2DefaultStr(result.get("errcode"), "-1"));
+        if (0 != errCode) {
+            throw new CustomerException(Util.logStr("get accessToken error, error msg is [{}]", result.get("errmsg")));
+        }
+        accessToken = Util.null2String(result.get("access_token"));
+        int expiresIn = Integer.parseInt(Util.null2DefaultStr(result.get("expires_in"), "100"));
+        Calendar calendar = Calendar.getInstance();
+        calendar.add(Calendar.SECOND, expiresIn - 60 * 5);
+        accessTokenExpirationTime = calendar.getTime();
+        return accessToken;
+    }
+
+
+    /**
+     * <h2>查验accessToken是否存在或过期，是否正常</h2>
+     *
+     * @param accessToken 需要查询的accessToken
+     * @return false不能使用 true正常
+     */
+    private static boolean verifyAccessToken(String accessToken) {
+        if (null == accessToken || Util.isNullOrEmpty(accessToken)) {
+            return false;
+        }
+        return !accessTokenExpirationTime.before(new Date());
+    }
+
+    /**
+     * <h2>删除微信成员</h2>
+     *
+     * @param account 微信账号
+     * @return 是否删除成功， true 删除成功 false 不存在账号
+     * @throws CustomerException 其他异常信息，删除失败
+     */
+    public static boolean deleteWxHrmByAccount(String account) throws CustomerException {
+        Assert.notBlank(account, "wx account is null or blank, please make suer wx account has value!");
+        String accessToken = getAccessToken();
+//        通过收集账号查询用户ID
+        String wxUserId;
+        try {
+            wxUserId = fetchWxAccountIdByMobil(accessToken, account);
+        } catch (CustomerException e) {
+            if (e.getCode() == 46004) {
+//                不存在
+                return false;
+            }
+            throw new CustomerException(e.getMessage());
+        }
+        String baseUrl;
+        if (baseHost.endsWith("/")) {
+            baseUrl = baseHost + "cgi-bin/user/delete";
+        } else {
+            baseUrl = baseHost + "/cgi-bin/user/delete";
+        }
+        Map<String, Object> params = new HashMap<>(4);
+        params.put("access_token", accessToken);
+        params.put("userid", wxUserId);
+        Map<String, Object> result = fetchWxService(baseUrl, params);
+        int errCode = Integer.parseInt(Util.null2DefaultStr(result.get("errcode"), "-1"));
+        if (60111 == errCode) {
+            return false;
+        }
+        if (0 != errCode) {
+            throw new CustomerException(Util.logStr("delete wxHrm error, error msg is [{}]", result.get("errmsg")));
+        }
+        return true;
+    }
+
+    /**
+     * <h2>通过手机号查询企业微信的用户id</h2>
+     *
+     * @param accessToken 接口调用凭证
+     * @param account     ecology手机号
+     * @return 手机号对应的企业微信的用户的id
+     */
+    private static String fetchWxAccountIdByMobil(String accessToken, String account) {
+        String baseUrl;
+        if (baseHost.endsWith("/")) {
+            baseUrl = baseHost + "cgi-bin/user/getuserid";
+        } else {
+            baseUrl = baseHost + "/cgi-bin/user/getuserid";
+        }
+        baseUrl = baseUrl + "?access_token=" + accessToken;
+        Map<String, Object> params = new HashMap<>(4);
+        params.put("mobile", account);
+        Map<String, String> heard = new HashMap<>(4);
+        heard.put("Content-Type", MediaType.APPLICATION_JSON);
+        ResponeVo responeVo;
+        try {
+            responeVo = httpUtils.apiPost(baseUrl, params, heard);
+        } catch (IOException e) {
+            throw new CustomerException(Util.logStr("can not fetch [{}], please check network!", baseUrl), e);
+        }
+        Map<String, Object> result = verifyResponseAndGetResultMap(baseUrl, responeVo);
+        int errCode = Integer.parseInt(Util.null2DefaultStr(result.get("errcode"), "-1"));
+
+        if (errCode == 46004) {
+            throw new CustomerException("user no exist！", 46004);
+        }
+        if (errCode != 0) {
+            throw new CustomerException("wx api error, error info: " + result.get("errmsg"));
+        }
+        return Util.null2String(result.get("userid"));
+    }
+
+    /**
+     * <h2>验证并获取返回值</h2>
+     *
+     * @param baseUrl   请求地址
+     * @param responeVo 响应对象
+     * @return 响应结果
+     */
+    private static Map<String, Object> verifyResponseAndGetResultMap(String baseUrl, ResponeVo responeVo) {
+        if (200 != responeVo.getCode()) {
+            throw new CustomerException(Util.logStr("fetch [{}] error, error msg is [{}]", baseUrl, responeVo.getEntityString()));
+        }
+        Map<String, Object> result;
+        try {
+            result = responeVo.getEntityMap();
+        } catch (JsonProcessingException e) {
+            throw new CustomerException(Util.logStr("can not parse map from response string, the response string is [{}]", responeVo.getEntityString()));
+        }
+        return result;
+    }
+
+    /**
+     * <h2>调用微信服务</h2>
+     *
+     * @param baseUrl 请求路径
+     * @param params  请求参数
+     * @return 请求结果
+     */
+    private static Map<String, Object> fetchWxService(String baseUrl, Map<String, Object> params) {
+        ResponeVo responeVo;
+        try {
+            responeVo = httpUtils.apiGet(baseUrl, params, null);
+        } catch (IOException e) {
+            throw new CustomerException(Util.logStr("can not fetch [{}], please check network!", baseUrl), e);
+        }
+        return verifyResponseAndGetResultMap(baseUrl, responeVo);
+    }
+}
+//40014  invalid access_token
+//42001  access_token expired
+//41001  access_token missing
+//60111  userid not found
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_jitu/schedule/registerfadada/RealNameAuthenticationCronJob.java b/src/main/youhong_ai_old_src/weaver/aiyh_jitu/schedule/registerfadada/RealNameAuthenticationCronJob.java
new file mode 100644
index 0000000..5a592e5
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_jitu/schedule/registerfadada/RealNameAuthenticationCronJob.java
@@ -0,0 +1,231 @@
+package weaver.aiyh_jitu.schedule.registerfadada;
+
+import aiyh.utils.Util;
+import aiyh.utils.annotation.ActionDefaultTestValue;
+import aiyh.utils.annotation.ActionDesc;
+import aiyh.utils.annotation.PrintParamMark;
+import aiyh.utils.annotation.RequiredMark;
+import aiyh.utils.excention.CustomerException;
+import cn.hutool.core.lang.Assert;
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+import org.apache.log4j.Logger;
+import weaver.aiyh_jitu.schedule.registerfadada.constants.FaDaDaConstants;
+import weaver.aiyh_jitu.schedule.registerfadada.core.command.ConversionValue;
+import weaver.aiyh_jitu.schedule.registerfadada.mapper.RealNameAuthenticationCronJobMapper;
+import weaver.aiyh_jitu.schedule.registerfadada.util.JiTuFaDaDaUtil;
+import weaver.interfaces.schedule.BaseCronJob;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.Future;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+/**
+ * <h1>法大大实名认证定时任务</h1>
+ *
+ * <p>create: 2022-08-10 17:11</p>
+ *
+ * @author aiyh EBU7-dev-1
+ */
+
+@Setter
+@Getter
+@ToString
+@ActionDesc(value = "法大大实名认证定时任务！", author = "aiyh")
+public class RealNameAuthenticationCronJob extends BaseCronJob {
+
+    @Setter(AccessLevel.NONE)
+    @Getter(AccessLevel.NONE)
+    private final Logger log = Util.getLogger();
+
+    @RequiredMark("注册状态标识字段，oa中自定义人力资源卡片中的注册状态标识字段，需要新建一个自定义字段类型可为下拉框，" +
+            "0 为注册；1 已注册；2 已完成实名认证")
+    @PrintParamMark
+    @ActionDefaultTestValue("field0")
+    private String registerStatusOaField;
+
+    @RequiredMark("交易号（需要保存，用于证书申请和实名认证查询）,人力资源自定义卡片中的法大大实名认证交易号字段")
+    @PrintParamMark
+    @ActionDefaultTestValue("field1")
+    private String transactionNoOaField;
+
+    @RequiredMark("长链转短链地址（建议接入方保存）（miniProgram =1 的时候，返回的也是长链地址），人力资源自定义卡片中的法大大实名认证" +
+            "长链接转端链接地址（多文本字段）")
+    @PrintParamMark
+    @ActionDefaultTestValue("field2")
+    private String realNameAuthenticationUrlOaField;
+
+    @RequiredMark("长链地址（建议接入方保存），人力资源卡片中法大大实名认证地址长链接字段（多文本字段）")
+    @PrintParamMark
+    @ActionDefaultTestValue("field2")
+    private String realNameAuthenticationSourceUrlOaField;
+
+    private final RealNameAuthenticationCronJobMapper mapper = Util.getMapper(RealNameAuthenticationCronJobMapper.class);
+
+    private final List<Future<?>> futureList = new ArrayList<>();
+
+    @Override
+    public void execute() {
+        // 判断上一次只执行的子线程是否执行完成
+        if (!futureList.isEmpty()) {
+            for (Future<?> future : futureList) {
+                if (!future.isDone()) {
+                    return;
+                }
+            }
+        }
+        futureList.clear();
+        try {
+            Util.verifyRequiredField(this);
+            Util.insertOrUpdateConfigValue(FaDaDaConstants.TRANSACTION_NO_OA_FIELD, transactionNoOaField, "法大大实名认证交易号保存字段");
+            Util.insertOrUpdateConfigValue(FaDaDaConstants.REGISTER_STATUS_OA_FIELD, registerStatusOaField, "法大大注册状态保存字段");
+            doExecute();
+        } catch (Exception e) {
+            log.error("execute cronjob error, detail error msg is :" + Util.getErrString(e));
+            throw new CustomerException(e.getMessage());
+        }
+    }
+
+    private void doExecute() {
+        Map<String, Object> realNameAuthenticationConfiguration = Util.readProperties2Map("jt_fadadaAuthenticConfiguration", "fadada.realNameAuthentication");
+        Assert.notEmpty(realNameAuthenticationConfiguration, "fadada real name authentication configuration is not data,please check configuration file!");
+        // 查询需要实名认证的人员数据
+        List<Map<String, Object>> unRealNameAuthenticationHrmList = mapper.selectUnRealNameAuthenticationHrm(registerStatusOaField);
+        if (null == unRealNameAuthenticationHrmList || unRealNameAuthenticationHrmList.isEmpty()) {
+            return;
+        }
+        int batchSize = 10_000;
+        if (unRealNameAuthenticationHrmList.size() > batchSize) {
+            int batchNum = (int) Math.ceil(unRealNameAuthenticationHrmList.size() / batchSize);
+            Stream.iterate(0, n -> n + 1).limit(batchNum).forEach(n -> {
+                List<Map<String, Object>> collect = unRealNameAuthenticationHrmList.stream().skip(n * batchSize)
+                        .limit(batchSize).collect(Collectors.toList());
+                Future<?> submit = Util.threadPool.submit(() -> fetchRealNameAuthenticationUrlByList(collect, realNameAuthenticationConfiguration));
+                futureList.add(submit);
+            });
+        }
+    }
+
+    /**
+     * <h2>多线程执行注册操作</h2>
+     *
+     * @param list 注册数据
+     */
+    private void fetchRealNameAuthenticationUrlByList(List<Map<String, Object>> list, Map<String, Object> realNameAuthenticationConfiguration) {
+        for (Map<String, Object> hrmInfo : list) {
+            Map<String, Object> requestParams = parseConfigMap(realNameAuthenticationConfiguration, hrmInfo);
+            fetchRealNameAuthenticationUrl(requestParams, hrmInfo);
+        }
+    }
+
+    /**
+     * <h2>发送请求获取实名认证地址</h2>
+     *
+     * @param requestParams 请求参数
+     */
+    private void fetchRealNameAuthenticationUrl(Map<String, Object> requestParams, Map<String, Object> hrmInfo) {
+        JiTuFaDaDaUtil.realNameAuthenticationAsync(requestParams,
+                result -> updateRealNameAuthenticationUrl(result, hrmInfo));
+
+    }
+
+    /**
+     * <h2>对实名认证结果保存到对应的自定义的人力资源字段中</h2>
+     *
+     * @param result 请求响应结果
+     */
+    private void updateRealNameAuthenticationUrl(Map<String, Object> result, Map<String, Object> hrmInfo) {
+        String transactionNo = Util.null2String(result.get("transactionNo"));
+        // 获取cus_fielddata的ID
+        String seqorder = Util.null2DefaultStr(hrmInfo.get("seqorder"), Util.null2String(hrmInfo.get("SEQORDER")));
+        String url = Util.null2String(result.get("url"));
+        String sourceUrl = Util.null2String(result.get("sourceUrl"));
+        // 更新实名认证地址
+        mapper.updateRealNameAuthenticationUrl(transactionNoOaField, transactionNo,
+                realNameAuthenticationUrlOaField, url,
+                realNameAuthenticationSourceUrlOaField, sourceUrl,
+                registerStatusOaField, 2, seqorder);
+    }
+
+    /**
+     * <h2>解析配置文件数据</h2>
+     *
+     * @param configMap 配置文件对象
+     * @param hrmInfo   人员数据信息
+     * @return 解析后的请求参数
+     */
+    private Map<String, Object> parseConfigMap(Map<String, Object> configMap, Map<String, Object> hrmInfo) {
+        Map<String, Object> result = new HashMap<>(configMap.size());
+        for (Map.Entry<String, Object> entry : configMap.entrySet()) {
+            String key = entry.getKey();
+            Object value = entry.getValue();
+            if (value instanceof Map) {
+                Map<String, Object> parseValueResult = parseConfigMap((Map<String, Object>) value, hrmInfo);
+                result.put(key, parseValueResult);
+                continue;
+            }
+            result.put(key, parseValue(value, hrmInfo));
+        }
+        return result;
+    }
+
+    /**
+     * <h2>解析配置文件值</h2>
+     *
+     * @param value   参数值
+     * @param hrmInfo 人员数据信息
+     * @return 解析后的值
+     */
+    private Object parseValue(Object value, Map<String, Object> hrmInfo) {
+        if (value == null) {
+            return null;
+        }
+        if ("".equals(value)) {
+            return "";
+        }
+        String parseSource = String.valueOf(value);
+        String pattern = "(?<key>(\\w+:)?)(?<source>(\\s|\\S)+)";
+        Pattern compile = Pattern.compile(pattern);
+        Matcher matcher = compile.matcher(parseSource);
+        String commandKey = "string:";
+        if (matcher.find()) {
+            parseSource = matcher.group("source");
+            commandKey = matcher.group("key");
+        }
+        //				 值解析
+        //				解析 ${}类型的参数，直接替换
+        pattern = "\\$\\{(?<field>(\\s|\\S)+?)}";
+        compile = Pattern.compile(pattern);
+        matcher = compile.matcher(parseSource);
+        while (matcher.find()) {
+            parseSource = parseSource.replaceFirst(pattern,
+                    Util.null2String(hrmInfo.get(matcher.group("field"))));
+        }
+        // 解析sql值
+        pattern = "#sql\\{(?<sqlStr>([\\s\\S])+?)}";
+        compile = Pattern.compile(pattern);
+        matcher = compile.matcher(parseSource);
+        while (matcher.find()) {
+            String sqlStr = matcher.group("sqlStr");
+            String sqlValue = mapper.selectCustomerSqlValue(sqlStr, hrmInfo);
+            parseSource = parseSource.replaceFirst(pattern, Util.null2String(sqlValue));
+        }
+        // 解析#{} 类型的值
+        pattern = "#\\{(?<field>(\\s|\\S)+?)}";
+        compile = Pattern.compile(pattern);
+        matcher = compile.matcher(parseSource);
+        while (matcher.find()) {
+            parseSource = parseSource.replaceFirst(pattern,
+                    Util.null2String(hrmInfo.get(matcher.group("field"))));
+        }
+        return ConversionValue.getCommand(commandKey).execute(parseSource);
+    }
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_jitu/schedule/registerfadada/RegisterFaDaDaAccountCronJob.java b/src/main/youhong_ai_old_src/weaver/aiyh_jitu/schedule/registerfadada/RegisterFaDaDaAccountCronJob.java
new file mode 100644
index 0000000..7282ae7
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_jitu/schedule/registerfadada/RegisterFaDaDaAccountCronJob.java
@@ -0,0 +1,235 @@
+package weaver.aiyh_jitu.schedule.registerfadada;
+
+import aiyh.utils.Util;
+import aiyh.utils.annotation.*;
+import cn.hutool.core.lang.Assert;
+import lombok.AccessLevel;
+import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
+import org.apache.log4j.Logger;
+import weaver.aiyh_jitu.schedule.registerfadada.constants.FaDaDaConstants;
+import weaver.aiyh_jitu.schedule.registerfadada.entity.FaDaDaRegisterEntity;
+import weaver.aiyh_jitu.schedule.registerfadada.mapper.RegisterFaDaDaAccountCronJobMapper;
+import weaver.aiyh_jitu.schedule.registerfadada.util.JiTuFaDaDaUtil;
+import weaver.interfaces.schedule.BaseCronJob;
+
+import java.util.*;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Future;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+/**
+ * <h1>注册法大大账号定时任务</h1>
+ *
+ * <p>create: 2022-08-09 10:22</p>
+ *
+ * @author aiyh EBU7-dev-1
+ */
+
+@Data
+@ActionDesc(value = "注册法大大账号定时任务！", author = "aiyh")
+public class RegisterFaDaDaAccountCronJob extends BaseCronJob {
+
+    @RequiredMark("注册法大大时，法大大账号对应的oa人力资源表中的字段")
+    @PrintParamMark
+    @ActionDefaultTestValue("workcode")
+    private String accountOaField;
+
+    @RequiredMark("注册状态标识字段，oa中自定义人力资源卡片中的注册状态标识字段，需要新建一个自定义字段类型可为下拉框，" +
+            "0 未注册；1 已注册；2 实名认证中, 3：未激活；4：未认证；5：审核通过；6：已提交待审核；7：审核不通过")
+    @PrintParamMark
+    @ActionDefaultTestValue("field0")
+    private String registerStatusOaField;
+
+    @RequiredMark("注册法大大账号后返回的customerId所存储的oa的自定义人员卡片中的字段")
+    @PrintParamMark
+    @ActionDefaultTestValue("field1")
+    private String customerIdOaField;
+
+    @ActionOptionalParam(desc = "自定义查询条件以and开头，比如： and hrm.field1 = 2表示hrmresource表中的字段，" +
+            "cus.field1表示自定义人力资源卡片字段，慎用，存在高风险", value = "")
+    @PrintParamMark
+    @ActionDefaultTestValue("")
+    private String cusSqlWhere = "";
+
+    @Getter(AccessLevel.NONE)
+    @Setter(AccessLevel.NONE)
+    private final Logger log = Util.getLogger();
+
+    private List<Map<String, Object>> registerCustomerIdList = new ArrayList<>();
+
+    private final RegisterFaDaDaAccountCronJobMapper mapper = Util.getMapper(RegisterFaDaDaAccountCronJobMapper.class);
+
+    @Override
+    public void execute() {
+        try {
+            if (!registerCustomerIdList.isEmpty()) {
+                return;
+            }
+            if (!Util.isNullOrEmpty(cusSqlWhere)) {
+                if (cusSqlWhere.toLowerCase().contains(" or ")) {
+                    throw new IllegalArgumentException("自定义查询条件未通过验证，该条件存在高风险操作！");
+                }
+                String replace = cusSqlWhere.toLowerCase().replaceFirst("and ", "");
+                String[] keyValues = replace.split(" and ");
+                for (String keyValue : keyValues) {
+                    String[] split = keyValue.split("=");
+                    for (int i = 0; i < split.length - 1; i++) {
+                        String key = split[i];
+                        String value = split[i + 1];
+                        if (key.trim().equals(value.trim())) {
+                            throw new IllegalArgumentException("自定义查询条件未通过验证，该条件存在高风险操作！");
+                        }
+                    }
+                }
+            }
+            Util.verifyRequiredField(this);
+            Util.insertOrUpdateConfigValue(FaDaDaConstants.CUSTOMER_ID_OA_FIELD, customerIdOaField, "法大大customerId保存字段");
+            Util.insertOrUpdateConfigValue(FaDaDaConstants.REGISTER_STATUS_OA_FIELD, registerStatusOaField, "法大大注册状态保存字段");
+            doExecute();
+            registerCustomerIdList.clear();
+        } catch (Exception e) {
+            registerCustomerIdList.clear();
+            log.error("execute cronJob fail, error msg is \n" + Util.getErrString(e));
+            throw new RuntimeException(e.getMessage());
+        }
+    }
+
+    /**
+     * <h2>具体执行逻辑</h2>
+     */
+    private void doExecute() {
+        List<Future<?>> futureList = new ArrayList<>();
+        List<FaDaDaRegisterEntity> faDaDaRegisterEntityList = mapper.selectNotRegisterFaDaDaAccountHrmInfoEntityList(
+                accountOaField, registerStatusOaField, cusSqlWhere);
+        Assert.notEmpty(faDaDaRegisterEntityList, "can not query fadada register info!");
+        int batchSize = 10_000;
+        if (faDaDaRegisterEntityList.size() > batchSize) {
+            int batchNum = (int) Math.ceil(faDaDaRegisterEntityList.size() / batchSize);
+            Stream.iterate(0, n -> n + 1).limit(batchNum).forEach(n -> {
+                List<FaDaDaRegisterEntity> collect = faDaDaRegisterEntityList.stream().skip(n * batchSize)
+                        .limit(batchSize).collect(Collectors.toList());
+                Future<?> submit = Util.threadPool.submit(() -> doRegisterAsyncByList(collect));
+                futureList.add(submit);
+            });
+        }
+        // 等待所有子线程执行完成
+        for (Future<?> future : futureList) {
+            if (!future.isDone()) {
+                try {
+                    future.get();
+                } catch (InterruptedException | ExecutionException e) {
+                    throw new RuntimeException(e);
+                }
+            }
+        }
+        // 等待所有注册信息全部返回
+        while (true) {
+            if (registerCustomerIdList.size() == faDaDaRegisterEntityList.size()) {
+                doInsertCustomerId();
+                return;
+            }
+            try {
+                wait(60_000);
+            } catch (InterruptedException e) {
+                throw new RuntimeException(e);
+            }
+        }
+    }
+
+
+    /**
+     * <h2>多线程执行注册操作</h2>
+     *
+     * @param list 注册数据
+     */
+    private void doRegisterAsyncByList(List<FaDaDaRegisterEntity> list) {
+        for (FaDaDaRegisterEntity faDaDaRegisterEntity : list) {
+            doRegister(faDaDaRegisterEntity);
+        }
+    }
+
+
+    /**
+     * <h2>注册法大大账号信息</h2>
+     *
+     * @param faDaDaRegisterEntity 人员账号信息
+     */
+    private void doRegister(FaDaDaRegisterEntity faDaDaRegisterEntity) {
+        Map<String, Object> params = new HashMap<>(8);
+        params.put("type", 1);
+        params.put("account", faDaDaRegisterEntity.getAccount());
+        JiTuFaDaDaUtil.registerAccountAsync(params, result -> {
+            String customerId = Util.null2String(result.get("data"));
+            Map<String, Object> insertMap = new HashMap<>(8);
+            insertMap.put("userId", faDaDaRegisterEntity.getId());
+            insertMap.put("customerId", customerId);
+            insertMap.put("registerStatusOaField", registerStatusOaField);
+            insertMap.put("customerIdOaField", customerIdOaField);
+            registerCustomerIdList.add(insertMap);
+        });
+    }
+
+
+    /**
+     * <h2>更新和插入customerId</h2>
+     */
+    private void doInsertCustomerId() {
+        List<Map<String, Object>> registerCustomerIdUpdateList;
+        List<Map<String, Object>> registerCustomerIdInsertList;
+        List<Map<String, Object>> existCustomerFieldUserInfoList = mapper.selectExistCustomerFieldUserInfo();
+        List<String> userIdList = existCustomerFieldUserInfoList.stream()
+                .map(item -> String.valueOf(item.get("userId")))
+                .collect(Collectors.toList());
+        //    求差集 求出数据库中存在的 本次注册中人员主结果但不存在与数据中的list
+        registerCustomerIdUpdateList = registerCustomerIdList.stream()
+                .filter(item -> {
+                    String userId = String.valueOf(item.get("userId"));
+                    if (userIdList.contains(userId)) {
+                        int i = userIdList.indexOf(userId);
+                        item.put("id", String.valueOf(existCustomerFieldUserInfoList.get(i).get("id")));
+                        return true;
+                    }
+                    return false;
+                }).collect(Collectors.toList());
+        registerCustomerIdList.removeAll(registerCustomerIdUpdateList);
+        // 插入数组
+        registerCustomerIdInsertList = registerCustomerIdList;
+        //    更新customerId 和注册状态
+        int batchSize = 10_000;
+        // 分批次更新数据或插入数据，每次操作批次数据量为10_000
+        if (!registerCustomerIdUpdateList.isEmpty()) {
+            if (registerCustomerIdUpdateList.size() > batchSize) {
+                int batchNum = (int) Math.ceil(registerCustomerIdUpdateList.size() / batchSize);
+                // 使用流式迭代器，从0开始每次加一，取前batchNum个遍历，n为0，1，2... batchNum
+                Stream.iterate(0, n -> n + 1).limit(batchNum).forEach(n -> {
+                    List<Map<String, Object>> collect = registerCustomerIdUpdateList.stream()
+                            .skip(n * batchSize)
+                            .limit(batchSize)
+                            .collect(Collectors.toList());
+                    mapper.batchUpdateCustomerId(customerIdOaField, registerStatusOaField, collect);
+                });
+            } else {
+                mapper.batchUpdateCustomerId(customerIdOaField, registerStatusOaField, registerCustomerIdUpdateList);
+            }
+        }
+        //    插入数据
+        if (!registerCustomerIdInsertList.isEmpty()) {
+            if (registerCustomerIdInsertList.size() > batchSize) {
+                int batchNum = (int) Math.ceil(registerCustomerIdInsertList.size() / batchSize);
+                List<Map<String, Object>> finalRegisterCustomerIdInsertList = registerCustomerIdInsertList;
+                Stream.iterate(0, n -> n + 1).limit(batchNum).forEach(n -> {
+                    List<Map<String, Object>> collect = finalRegisterCustomerIdInsertList.stream()
+                            .skip(n * batchSize)
+                            .limit(batchSize)
+                            .collect(Collectors.toList());
+                    mapper.batchInsertCustomerId(customerIdOaField, registerStatusOaField, collect);
+                });
+            } else {
+                mapper.batchInsertCustomerId(customerIdOaField, registerStatusOaField, registerCustomerIdInsertList);
+            }
+        }
+    }
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_jitu/schedule/registerfadada/constants/FaDaDaConstants.java b/src/main/youhong_ai_old_src/weaver/aiyh_jitu/schedule/registerfadada/constants/FaDaDaConstants.java
new file mode 100644
index 0000000..22fef47
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_jitu/schedule/registerfadada/constants/FaDaDaConstants.java
@@ -0,0 +1,70 @@
+package weaver.aiyh_jitu.schedule.registerfadada.constants;
+
+/**
+ * <h1>法大大常量类</h1>
+ *
+ * <p>create: 2022-08-09 16:19</p>
+ *
+ * @author aiyh EBU7-dev-1
+ */
+
+public class FaDaDaConstants {
+    /**
+     * 法大大验签字符串加密算法
+     */
+    public static final String DIGEST_STR = "SHA-256";
+    /**
+     * 法大大配置文件文件名 prop/prop2map/jt_fadadaRequestConfigInfo.properties
+     */
+    public static final String FDD_CONFIG_FILE_NAME = "jt_fadadaRequestConfigInfo";
+    /**
+     * 法大大配置文件取值前缀
+     */
+    public static final String FDD_CONFIG_FIEL_PREFIX = "fadada";
+
+    /**
+     * 法大大配置文件基本请求地址路径
+     */
+    public static final String FDD_BASE_URL_KEY = "baseUrl";
+    /**
+     * 法大大配置文件appId对应键
+     */
+    public static final String FDD_APP_ID_KEY = "appId";
+    /**
+     * 法大大配置文件appKey对应键
+     */
+    public static final String FDD_APP_KEY_KEY = "appKey";
+    /**
+     * string 转换
+     */
+    public static final String CONVERSION_STRING = "string:";
+    /**
+     * integer转换
+     */
+    public static final String CONVERSION_INTEGER = "integer:";
+    /**
+     * boolean转换
+     */
+    public static final String CONVERSION_BOOLEAN = "boolean:";
+    /**
+     * double转换
+     */
+    public static final String CONVERSION_DOUBLE = "double:";
+    /**
+     * customerId字段对应的配置表唯一标识
+     */
+    public static final String CUSTOMER_ID_OA_FIELD = "CUSTOMER_ID_OA_FIELD";
+    /**
+     * 注册状态字段对应配置表唯一标识
+     */
+    public static final String REGISTER_STATUS_OA_FIELD = "REGISTER_STATUS_OA_FIELD";
+    /**
+     * 实名认证交易号字段配置表唯一标识
+     */
+    public static final String TRANSACTION_NO_OA_FIELD = "TRANSACTION_NO_OA_FIELD";
+
+    /**
+     * 法大大合同创建信息日志表表名称
+     */
+    public static final String UF_JT_CONTRACT_INFO_TABLE_NAME = "uf_jt_contract_info";
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_jitu/schedule/registerfadada/core/command/ConversionCommand.java b/src/main/youhong_ai_old_src/weaver/aiyh_jitu/schedule/registerfadada/core/command/ConversionCommand.java
new file mode 100644
index 0000000..a427ec9
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_jitu/schedule/registerfadada/core/command/ConversionCommand.java
@@ -0,0 +1,19 @@
+package weaver.aiyh_jitu.schedule.registerfadada.core.command;
+
+/**
+ * <h1>转换命令接口</h1>
+ *
+ * <p>create: 2022-08-13 22:32</p>
+ *
+ * @author aiyh EBU7-dev-1
+ */
+
+public interface ConversionCommand<T> {
+    /**
+     * <h2>将source对象类型转换为T类型</h2>
+     *
+     * @param source 待转换对象
+     * @return 转换后对象
+     */
+    T execute(Object source);
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_jitu/schedule/registerfadada/core/command/ConversionValue.java b/src/main/youhong_ai_old_src/weaver/aiyh_jitu/schedule/registerfadada/core/command/ConversionValue.java
new file mode 100644
index 0000000..d6ae605
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_jitu/schedule/registerfadada/core/command/ConversionValue.java
@@ -0,0 +1,40 @@
+package weaver.aiyh_jitu.schedule.registerfadada.core.command;
+
+import aiyh.utils.excention.CustomerException;
+import weaver.aiyh_jitu.schedule.registerfadada.constants.FaDaDaConstants;
+import weaver.aiyh_jitu.schedule.registerfadada.core.command.impl.BooleanCommand;
+import weaver.aiyh_jitu.schedule.registerfadada.core.command.impl.DoubleCommand;
+import weaver.aiyh_jitu.schedule.registerfadada.core.command.impl.IntegerCommand;
+import weaver.aiyh_jitu.schedule.registerfadada.core.command.impl.StringCommand;
+
+/**
+ * <h1>转换器</h1>
+ *
+ * <p>create: 2022-08-13 22:44</p>
+ *
+ * @author aiyh EBU7-dev-1
+ */
+
+public class ConversionValue {
+
+    /**
+     * <h2>获取命令转换器</h2>
+     *
+     * @param commandKey 命令转换器key
+     * @return 命令转换器
+     */
+    public static ConversionCommand getCommand(String commandKey) {
+        switch (commandKey.toLowerCase()) {
+            case FaDaDaConstants.CONVERSION_STRING:
+                return new StringCommand();
+            case FaDaDaConstants.CONVERSION_INTEGER:
+                return new IntegerCommand();
+            case FaDaDaConstants.CONVERSION_BOOLEAN:
+                return new BooleanCommand();
+            case FaDaDaConstants.CONVERSION_DOUBLE:
+                return new DoubleCommand();
+            default:
+                throw new CustomerException("There is no command converter with commandKey " + commandKey + "!");
+        }
+    }
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_jitu/schedule/registerfadada/core/command/impl/BooleanCommand.java b/src/main/youhong_ai_old_src/weaver/aiyh_jitu/schedule/registerfadada/core/command/impl/BooleanCommand.java
new file mode 100644
index 0000000..9f55dd2
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_jitu/schedule/registerfadada/core/command/impl/BooleanCommand.java
@@ -0,0 +1,23 @@
+package weaver.aiyh_jitu.schedule.registerfadada.core.command.impl;
+
+import aiyh.utils.Util;
+import weaver.aiyh_jitu.schedule.registerfadada.core.command.ConversionCommand;
+
+/**
+ * <h1>Boolean转换器</h1>
+ *
+ * <p>create: 2022-08-13 22:38</p>
+ *
+ * @author aiyh EBU7-dev-1
+ */
+
+public class BooleanCommand implements ConversionCommand<Boolean> {
+    @Override
+    public Boolean execute(Object source) {
+        try {
+            return Boolean.parseBoolean(Util.null2String(source));
+        } catch (Exception e) {
+            return false;
+        }
+    }
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_jitu/schedule/registerfadada/core/command/impl/DoubleCommand.java b/src/main/youhong_ai_old_src/weaver/aiyh_jitu/schedule/registerfadada/core/command/impl/DoubleCommand.java
new file mode 100644
index 0000000..57ecebb
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_jitu/schedule/registerfadada/core/command/impl/DoubleCommand.java
@@ -0,0 +1,23 @@
+package weaver.aiyh_jitu.schedule.registerfadada.core.command.impl;
+
+import aiyh.utils.Util;
+import weaver.aiyh_jitu.schedule.registerfadada.core.command.ConversionCommand;
+
+/**
+ * <h1>Double转换器</h1>
+ *
+ * <p>create: 2022-08-13 22:37</p>
+ *
+ * @author aiyh EBU7-dev-1
+ */
+
+public class DoubleCommand implements ConversionCommand<Double> {
+    @Override
+    public Double execute(Object source) {
+        try {
+            return Double.parseDouble(Util.null2String(source));
+        } catch (Exception e) {
+            return 0.0;
+        }
+    }
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_jitu/schedule/registerfadada/core/command/impl/IntegerCommand.java b/src/main/youhong_ai_old_src/weaver/aiyh_jitu/schedule/registerfadada/core/command/impl/IntegerCommand.java
new file mode 100644
index 0000000..80cf099
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_jitu/schedule/registerfadada/core/command/impl/IntegerCommand.java
@@ -0,0 +1,23 @@
+package weaver.aiyh_jitu.schedule.registerfadada.core.command.impl;
+
+import aiyh.utils.Util;
+import weaver.aiyh_jitu.schedule.registerfadada.core.command.ConversionCommand;
+
+/**
+ * <h1>Integer转换器</h1>
+ *
+ * <p>create: 2022-08-13 22:36</p>
+ *
+ * @author aiyh EBU7-dev-1
+ */
+
+public class IntegerCommand implements ConversionCommand<Integer> {
+    @Override
+    public Integer execute(Object source) {
+        try {
+            return Integer.parseInt(Util.null2String(source));
+        } catch (Exception e) {
+            return -1;
+        }
+    }
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_jitu/schedule/registerfadada/core/command/impl/StringCommand.java b/src/main/youhong_ai_old_src/weaver/aiyh_jitu/schedule/registerfadada/core/command/impl/StringCommand.java
new file mode 100644
index 0000000..2ff3aa3
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_jitu/schedule/registerfadada/core/command/impl/StringCommand.java
@@ -0,0 +1,19 @@
+package weaver.aiyh_jitu.schedule.registerfadada.core.command.impl;
+
+import aiyh.utils.Util;
+import weaver.aiyh_jitu.schedule.registerfadada.core.command.ConversionCommand;
+
+/**
+ * <h1>string类型转换器</h1>
+ *
+ * <p>create: 2022-08-13 22:35</p>
+ *
+ * @author aiyh EBU7-dev-1
+ */
+
+public class StringCommand implements ConversionCommand<String> {
+    @Override
+    public String execute(Object source) {
+        return Util.null2String(source);
+    }
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_jitu/schedule/registerfadada/entity/FaDaDaRegisterEntity.java b/src/main/youhong_ai_old_src/weaver/aiyh_jitu/schedule/registerfadada/entity/FaDaDaRegisterEntity.java
new file mode 100644
index 0000000..5a2db1b
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_jitu/schedule/registerfadada/entity/FaDaDaRegisterEntity.java
@@ -0,0 +1,29 @@
+package weaver.aiyh_jitu.schedule.registerfadada.entity;
+
+import lombok.Data;
+
+/**
+ * <h1>hrm info of register fadada account</h1>
+ *
+ * <p>create: 2022-08-09 14:00</p>
+ *
+ * @author aiyh EBU7-dev-1
+ */
+
+@Data
+public class FaDaDaRegisterEntity {
+    /**
+     * hrmresource id of oa
+     */
+    private Integer id;
+    /**
+     * account of fadada
+     */
+    private String account;
+    /**
+     * 0 or null is: not register;
+     * 1 is: Registration has been complete ;
+     * 2 is: Real-name authentication has been completed
+     */
+    private Integer registerStatus;
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_jitu/schedule/registerfadada/mapper/JiTuFaDaDaMapper.java b/src/main/youhong_ai_old_src/weaver/aiyh_jitu/schedule/registerfadada/mapper/JiTuFaDaDaMapper.java
new file mode 100644
index 0000000..fbe94fc
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_jitu/schedule/registerfadada/mapper/JiTuFaDaDaMapper.java
@@ -0,0 +1,46 @@
+package weaver.aiyh_jitu.schedule.registerfadada.mapper;
+
+import aiyh.utils.annotation.recordset.Delete;
+import aiyh.utils.annotation.recordset.ParamMapper;
+import aiyh.utils.annotation.recordset.SqlMapper;
+import aiyh.utils.annotation.recordset.Update;
+
+import java.util.Map;
+
+/**
+ * <h1>极兔法大大数据库操作</h1>
+ *
+ * <p>create: 2022-08-18 10:12</p>
+ *
+ * @author aiyh EBU7-dev-1
+ */
+
+@SqlMapper
+public interface JiTuFaDaDaMapper {
+
+    /**
+     * <h2>更新日志信息</h2>
+     *
+     * @param updateParam 更新参数
+     * @return 是否更新成功
+     */
+    @Update("update uf_fdd_request_log set " +
+            "      request_time = #{request_time}, " +
+            "      request_params = #{request_params}," +
+            "      digest_params = #{digest_params} ," +
+            "      request_path = #{request_path}," +
+            "      request_type = #{request_type}," +
+            "      response_msg = #{response_msg}" +
+            "where id = #{dataId}")
+    boolean updateRequestLog(Map<String, Object> updateParam);
+
+    /**
+     * <h2>删除没有更新成功的dataID</h2>
+     *
+     * @param dataId 数据id
+     */
+    @Delete("delete " +
+            "from uf_fdd_request_log " +
+            "where id = #{dataId}")
+    void deleteDataId(@ParamMapper("dataId") int dataId);
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_jitu/schedule/registerfadada/mapper/RealNameAuthenticationCronJobMapper.java b/src/main/youhong_ai_old_src/weaver/aiyh_jitu/schedule/registerfadada/mapper/RealNameAuthenticationCronJobMapper.java
new file mode 100644
index 0000000..cc9eeaf
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_jitu/schedule/registerfadada/mapper/RealNameAuthenticationCronJobMapper.java
@@ -0,0 +1,85 @@
+package weaver.aiyh_jitu.schedule.registerfadada.mapper;
+
+import aiyh.utils.annotation.recordset.*;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <h1>实名认证定时任务数据库操作</h1>
+ *
+ * <p>create: 2022-08-10 17:16</p>
+ *
+ * @author aiyh EBU7-dev-1
+ */
+
+@SqlMapper
+public interface RealNameAuthenticationCronJobMapper {
+
+    @Select("select cus.*, \n " +
+            "       hrm.ID resource_id,LOGINID,PASSWORD,LASTNAME, \n " +
+            "       SEX,BIRTHDAY,NATIONALITY,SYSTEMLANGUAGE,MARITALSTATUS, \n " +
+            "       TELEPHONE,MOBILE,MOBILECALL,EMAIL,LOCATIONID, \n " +
+            "       WORKROOM,HOMEADDRESS,RESOURCETYPE,STARTDATE,ENDDATE,JOBTITLE, \n " +
+            "       JOBACTIVITYDESC,JOBLEVEL,SECLEVEL,DEPARTMENTID,SUBCOMPANYID1, \n " +
+            "       COSTCENTERID,MANAGERID,ASSISTANTID,BANKID1,ACCOUNTID1,RESOURCEIMAGEID, \n " +
+            "       CREATERID,CREATEDATE,LASTMODID,LASTMODDATE,LASTLOGINDATE,DATEFIELD1, \n " +
+            "       DATEFIELD2,DATEFIELD3,DATEFIELD4,DATEFIELD5,NUMBERFIELD1, \n " +
+            "       NUMBERFIELD2,NUMBERFIELD3,NUMBERFIELD4,NUMBERFIELD5,TEXTFIELD1, \n " +
+            "       TEXTFIELD2,TEXTFIELD3,TEXTFIELD4,TEXTFIELD5,TINYINTFIELD1, \n " +
+            "       TINYINTFIELD2,TINYINTFIELD3,TINYINTFIELD4,TINYINTFIELD5,CERTIFICATENUM, \n " +
+            "       NATIVEPLACE,EDUCATIONLEVEL,BEMEMBERDATE,BEPARTYDATE,WORKCODE, \n " +
+            "       REGRESIDENTPLACE,HEALTHINFO,RESIDENTPLACE,POLICY,DEGREE, \n " +
+            "       HEIGHT,USEKIND,JOBCALL,ACCUMFUNDACCOUNT,BIRTHPLACE, \n " +
+            "       FOLK,RESIDENTPHONE,RESIDENTPOSTCODE,EXTPHONE,MANAGERSTR, \n " +
+            "       STATUS,FAX,ISLABOUUNION,WEIGHT,TEMPRESIDENTNUMBER, \n " +
+            "       PROBATIONENDDATE,COUNTRYID,PASSWDCHGDATE,NEEDUSB,SERIAL, \n " +
+            "       ACCOUNT,LLOGINID,NEEDDYNAPASS,DSPORDER,PASSWORDSTATE, \n " +
+            "       ACCOUNTTYPE,BELONGTO,DACTYLOGRAM,ASSISTANTDACTYLOGRAM,PASSWORDLOCK, \n " +
+            "       SUMPASSWORDWRONG,OLDPASSWORD1,OLDPASSWORD2,MSGSTYLE,MESSAGERURL, \n " +
+            "       pinyinlastname,TOKENKEY,USERUSBTYPE,OUTKEY,ADSJGS, \n " +
+            "       ADGS,ADBM,MOBILESHOWTYPE,USBSTATE,TOTALSPACE, \n " +
+            "       OCCUPYSPACE,ECOLOGY_PINYIN_SEARCH,ISADACCOUNT,ACCOUNTNAME,haschangepwd, \n " +
+            "       created,creater,modified,modifier,passwordlocktime, \n " +
+            "       mobilecaflag,salt,companystartdate,workstartdate,secondaryPwd, \n " +
+            "       useSecondaryPwd,classification,uuid,passwordLockReason,companyworkyear, \n " +
+            "       workyear,DISMISSDATE,encKey,crc,usbscope, \n " +
+            "       tenant_key,clauthtype,hashData,signData \n " +
+            "from hrmresource hrm \n " +
+            "inner join cus_fielddata cus \n " +
+            "    on hrm.id = cus.id \n " +
+            "           and cus.SCOPE = 'HrmCustomFieldByInfoType' \n " +
+            "           and cus.scopeid = -1 \n " +
+            "where cus.$t{registerStatusOaField} = 1")
+    @CaseConversion(false)
+    List<Map<String, Object>> selectUnRealNameAuthenticationHrm(
+            @ParamMapper("registerStatusOaField") String registerStatusOaField
+    );
+
+    @Select(custom = true)
+    @CaseConversion(false)
+    String selectCustomerSqlValue(@SqlString String sqlStr, Map<String, Object> hrmInfo);
+
+    /**
+     * <h2>更新实名认证地址</h2>
+     *
+     * @param transactionNoOaField                   交易号对应的自定义人力资源卡片中的字段
+     * @param transactionNo                          交易号
+     * @param realNameAuthenticationUrlOaField       实名认证长链接转端链接对应人力资源自定义字段
+     * @param url                                    实名认证长链接转端链接
+     * @param realNameAuthenticationSourceUrlOaField 实名认证长链接对应人力资源自定义字段
+     * @param sourceUrl                              实名认证长链接
+     * @param registerStatusOaField                  注册状态对应人力资源自定义字段
+     * @param registerStatus                         注册状态值
+     * @param SEQORDER                               cus_fielddataID
+     */
+    @Update("update cus_fielddata set $t{transactionNoOaField} = #{transactionNo}," +
+            "$t{realNameAuthenticationUrlOaField} = #{url}," +
+            "$t{realNameAuthenticationSourceUrlOaField} = sourceUrl," +
+            "$t{registerStatusOaField} = #{registerStatus} where SEQORDER = #{SEQORDER}")
+    void updateRealNameAuthenticationUrl(@ParamMapper("transactionNoOaField") String transactionNoOaField, @ParamMapper("transactionNo") String transactionNo,
+                                         @ParamMapper("realNameAuthenticationUrlOaField") String realNameAuthenticationUrlOaField, @ParamMapper("url") String url,
+                                         @ParamMapper("realNameAuthenticationSourceUrlOaField") String realNameAuthenticationSourceUrlOaField, @ParamMapper("sourceUrl") String sourceUrl,
+                                         @ParamMapper("registerStatusOaField") String registerStatusOaField, @ParamMapper("registerStatus") int registerStatus,
+                                         @ParamMapper("SEQORDER") String SEQORDER);
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_jitu/schedule/registerfadada/mapper/RegisterFaDaDaAccountCronJobMapper.java b/src/main/youhong_ai_old_src/weaver/aiyh_jitu/schedule/registerfadada/mapper/RegisterFaDaDaAccountCronJobMapper.java
new file mode 100644
index 0000000..07c1e87
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_jitu/schedule/registerfadada/mapper/RegisterFaDaDaAccountCronJobMapper.java
@@ -0,0 +1,71 @@
+package weaver.aiyh_jitu.schedule.registerfadada.mapper;
+
+import aiyh.utils.annotation.recordset.*;
+import weaver.aiyh_jitu.schedule.registerfadada.entity.FaDaDaRegisterEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <h1>注册法大大账号定时任务数据库操作</h1>
+ *
+ * <p>create: 2022-08-09 10:45</p>
+ *
+ * @author aiyh EBU7-dev-1
+ */
+
+@SqlMapper
+public interface RegisterFaDaDaAccountCronJobMapper {
+
+    /**
+     * <h2>query hrm info of register fadada account</h2>
+     *
+     * @param accountOaField        oa database field of mapping fadada account
+     * @param registerStatusOaField oa database field of register fadada status
+     * @return register info
+     */
+    @Select("select hrm.id,hrm.$t{accountOaField} account,cus.$t{registerStatusOaField} register_status from  hrmresource hrm " +
+            "left join cus_fielddata cus on hrm.id = cus.id and cus.SCOPE = 'HrmCustomFieldByInfoType' and cus.scopeid = -1 " +
+            "where (cus.$t{registerStatusOaField} is null or cus.$t{registerStatusOaField} = 0) and hrm.$t{accountOaField} is not null " +
+            "and hrm.status not in (4,5,6,7) $t{cusWhere}")
+    List<FaDaDaRegisterEntity> selectNotRegisterFaDaDaAccountHrmInfoEntityList(
+            @ParamMapper("accountOaField") String accountOaField,
+            @ParamMapper("registerStatusOaField") String registerStatusOaField,
+            @ParamMapper("cusWhere") String cusWhere
+    );
+
+
+    /**
+     * <h2>select exist customer field user and table id</h2>
+     *
+     * @return customer field and user id info
+     */
+    @Select("select id user_id, seqorder id from cus_fielddata where SCOPE = 'HrmCustomFieldByInfoType' and scopeid = -1")
+    List<Map<String, Object>> selectExistCustomerFieldUserInfo();
+
+    /**
+     * <h2>batch update customerId</h2>
+     *
+     * @param customerIdOaField     customerId field
+     * @param registerStatusOaField register status field
+     * @param list                  batch update data list
+     */
+    @BatchUpdate("update cus_fielddata set  $t{customerIdOaField} = #{item.customerId}, " +
+            "$t{registerStatusOaField} = '1' where SEQORDER = #{item.id}")
+    void batchUpdateCustomerId(@ParamMapper("customerIdOaField") String customerIdOaField,
+                               @ParamMapper("registerStatusOaField") String registerStatusOaField,
+                               @BatchSqlArgs List<Map<String, Object>> list);
+
+    /**
+     * <h2>batch insert customerId </h2>
+     *
+     * @param customerIdOaField     customerId field
+     * @param registerStatusOaField register status field
+     * @param collect               batch insert data list
+     */
+    @BatchInsert("insert into cus_fielddata (scope,scopeid,id,$t{customerIdOaField},$t{registerStatusOaField}) values " +
+            "('HrmCustomFieldByInfoType',-1,#{item.userId},#{item.customerId},'1')")
+    void batchInsertCustomerId(@ParamMapper("customerIdOaField") String customerIdOaField,
+                               @ParamMapper("registerStatusOaField") String registerStatusOaField,
+                               @BatchSqlArgs List<Map<String, Object>> collect);
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_jitu/schedule/registerfadada/util/JiTuFaDaDaUtil.java b/src/main/youhong_ai_old_src/weaver/aiyh_jitu/schedule/registerfadada/util/JiTuFaDaDaUtil.java
new file mode 100644
index 0000000..bcce6a0
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_jitu/schedule/registerfadada/util/JiTuFaDaDaUtil.java
@@ -0,0 +1,359 @@
+package weaver.aiyh_jitu.schedule.registerfadada.util;
+
+import aiyh.utils.Util;
+import aiyh.utils.excention.CustomerException;
+import aiyh.utils.httpUtil.ResponeVo;
+import aiyh.utils.httpUtil.util.HttpUtils;
+import cn.hutool.core.codec.Base64;
+import cn.hutool.core.lang.Assert;
+import cn.hutool.core.map.MapUtil;
+import cn.hutool.core.net.URLEncoder;
+import com.alibaba.fastjson.JSON;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import org.apache.commons.codec.binary.Hex;
+import org.apache.log4j.Logger;
+import weaver.aiyh_jitu.schedule.registerfadada.constants.FaDaDaConstants;
+import weaver.aiyh_jitu.schedule.registerfadada.mapper.JiTuFaDaDaMapper;
+import weaver.aiyh_jitu.schedule.registerfadada.util.type.FaDaDaRequestType;
+
+import javax.ws.rs.core.MediaType;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.text.SimpleDateFormat;
+import java.util.*;
+import java.util.function.Consumer;
+
+/**
+ * <h1>极兔法大大工具类</h1>
+ *
+ * <p>create: 2022-08-09 10:49</p>
+ *
+ * @author aiyh EBU7-dev-1
+ */
+
+public class JiTuFaDaDaUtil {
+
+    private static final Map<String, Object> config = new HashMap<>(8);
+
+    private static final HttpUtils httpUtils = new HttpUtils();
+
+    private static final JiTuFaDaDaMapper MAPPER = Util.getMapper(JiTuFaDaDaMapper.class);
+
+    private static final Logger log = Util.getLogger();
+
+    public static final int SUCCESS_CODE = 200;
+
+    static {
+        httpUtils.getGlobalCache().header.put("Content-Type", MediaType.APPLICATION_JSON);
+    }
+
+    /**
+     * <h2>构建加密的sign验签字符串</h2>
+     *
+     * @param commonParams 公共参数
+     * @return 验签字符串
+     */
+    private static String builderSignStr(Map<String, Object> commonParams) {
+        String appKey = Util.null2String(config.get(FaDaDaConstants.FDD_APP_KEY_KEY));
+        Assert.notEmpty(appKey, "can not read fadada appId for [{}] from [{}]",
+                FaDaDaConstants.FDD_APP_KEY_KEY, JSON.toJSONString(config));
+
+        List<String> list = new ArrayList<>(commonParams.keySet());
+        Collections.sort(list);
+        StringBuilder builder = new StringBuilder();
+        for (String key : list) {
+            Object value = commonParams.get(key);
+            if (null != value && !"".equals(value)) {
+                builder.append(key).append("=").append(value).append("&");
+            }
+        }
+        String unsigned = builder.substring(0, builder.length() - 1);
+
+        String sign = digest(unsigned.getBytes(StandardCharsets.UTF_8), FaDaDaConstants.DIGEST_STR);
+        sign = sign.toUpperCase();
+        sign += appKey;
+        sign = digest(sign.getBytes(StandardCharsets.UTF_8), FaDaDaConstants.DIGEST_STR);
+        sign = Base64.encode(sign.toUpperCase().getBytes(StandardCharsets.UTF_8));
+        return sign;
+    }
+
+    /**
+     * <h2>获取公共请求头数据</h2>
+     *
+     * @param params 请求参数
+     * @return 公共请求头数据
+     */
+    private static Map<String, Object> encryptParams(Map<String, Object> params) {
+        if (MapUtil.isEmpty(config)) {
+            Map<String, Object> configMap = Util.readProperties2Map(FaDaDaConstants.FDD_CONFIG_FILE_NAME, FaDaDaConstants.FDD_CONFIG_FIEL_PREFIX);
+            Assert.notEmpty(configMap, "can not read config file [{}], check you config file!", FaDaDaConstants.FDD_CONFIG_FILE_NAME);
+            config.putAll(configMap);
+        }
+        String appId = Util.null2String(config.get(FaDaDaConstants.FDD_APP_ID_KEY));
+        Assert.notEmpty(appId, "can not read fadada appId for [{}] from [{}]",
+                FaDaDaConstants.FDD_APP_ID_KEY, JSON.toJSONString(config));
+        HashMap<String, Object> commonParams = new HashMap<>(8);
+        commonParams.put("appId", appId);
+        commonParams.put("signType", "SHA256");
+        commonParams.put("timestamp", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
+        commonParams.put("bizContent", getBizContent(params));
+        commonParams.put("sign", builderSignStr(commonParams));
+        return commonParams;
+    }
+
+    /**
+     * <h2>获取bizContent</h2>
+     *
+     * @param params 请求参数
+     * @return bizContent
+     */
+    private static String getBizContent(Map<String, Object> params) {
+        String paramsJson = JSON.toJSONString(params);
+        String paramsJsonUrlEncode = URLEncoder.createDefault().encode(paramsJson, StandardCharsets.UTF_8);
+        return Base64.encode(paramsJsonUrlEncode.getBytes(StandardCharsets.UTF_8));
+    }
+
+    /**
+     * <h2>加密操作</h2>
+     *
+     * @param inputBytes 待加密字节数组
+     * @param algorithm  加密方法
+     * @return 加密后的字符串
+     */
+    private static String digest(byte[] inputBytes, String algorithm) {
+        MessageDigest instance;
+        try {
+            instance = MessageDigest.getInstance(algorithm);
+        } catch (NoSuchAlgorithmException e) {
+            throw new CustomerException("digest string error!");
+        }
+        byte[] digest = instance.digest(inputBytes);
+        return new String(Hex.encodeHex(digest));
+    }
+
+
+    /**
+     * <h2>验证返回结果并获取返回值</h2>
+     *
+     * @param responeVo 响应结果对象
+     * @return 请求结果
+     */
+    private static Map<String, Object> verifyResponseAndGetResult(ResponeVo responeVo) {
+        if (responeVo.getCode() != SUCCESS_CODE) {
+            log.error(Util.logStr("can not fetch fadada, this response status is [{}]," +
+                            " response detail is [{}]",
+                    responeVo.getCode(), responeVo.getEntityString()));
+            throw new CustomerException("can not fetch fadada, this status is " + responeVo.getCode());
+        }
+        Map<String, Object> entityMap;
+        try {
+            entityMap = responeVo.getEntityMap();
+        } catch (JsonProcessingException e) {
+            log.error(Util.logStr("fetch fadada error, can not parse map for response, " +
+                    " response detail is [{}]", responeVo.getEntityString()));
+            throw new CustomerException("fetch fadada error, can not parse map for response");
+        }
+        String code = Util.null2String(entityMap.get("code"));
+        if (!"1".equals(code)) {
+            throw new CustomerException(Util.logStr("can not fetch fadada, error msg is [{}]",
+                    entityMap.get("msg")));
+        }
+        return entityMap;
+    }
+
+
+    /**
+     * <h2>记录请求日志到数据表中</h2>
+     *
+     * @param requestUrl        请求地址
+     * @param params            请求参数
+     * @param digestParams      加密后的请求参数
+     * @param responseString    响应字符串
+     * @param faDaDaRequestType 请求类型
+     */
+    private static void writRequestLog(String requestUrl,
+                                       Map<String, Object> params,
+                                       Map<String, Object> digestParams,
+                                       String responseString,
+                                       FaDaDaRequestType faDaDaRequestType) {
+        String modeId = Util.getModeIdByTableName("uf_fdd_request_log");
+        int dataId = Util.getModeDataId("uf_fdd_request_log", Integer.parseInt(modeId), 1);
+        Map<String, Object> updateParam = new HashMap<>(16);
+        updateParam.put("request_time", Util.getTime("yyyy-MM-dd HH:mm:ss"));
+        updateParam.put("request_params", JSON.toJSONString(params));
+        updateParam.put("digest_params", JSON.toJSONString(digestParams));
+        updateParam.put("request_type", faDaDaRequestType.getValue());
+        updateParam.put("request_path", requestUrl);
+        updateParam.put("response_msg", responseString);
+        updateParam.put("dataId", dataId);
+        if (!MAPPER.updateRequestLog(updateParam)) {
+            MAPPER.deleteDataId(dataId);
+        }
+        Util.rebuildModeDataShare(1, Integer.valueOf(modeId), dataId);
+    }
+
+
+    /**
+     * <h2>注册法大大账号</h2>
+     *
+     * @param params 注册参数
+     * @return 返回结果
+     */
+
+    public static Map<String, Object> registerAccount(Map<String, Object> params) {
+        String url = Util.null2String(config.get(FaDaDaConstants.FDD_BASE_URL_KEY)) + "/account/register";
+        ResponeVo responeVo;
+        Map<String, Object> digestParams = encryptParams(params);
+        try {
+            responeVo = httpUtils.apiPost(url, digestParams);
+            writRequestLog(url, params, digestParams, responeVo.getEntityString(), FaDaDaRequestType.REGISTER_ACCOUNT);
+        } catch (IOException e) {
+            log.error(Util.logStr("can not fetch fadada registerAccount [{}], request param is [{}], request heard is [{}]",
+                    url, JSON.toJSONString(params), JSON.toJSONString(digestParams)));
+            throw new CustomerException("can not fetch fadada registerAccount");
+        }
+        return verifyResponseAndGetResult(responeVo);
+    }
+
+    /**
+     * <h2>异步注册法大大账号</h2>
+     *
+     * @param params 注册参数
+     */
+
+    public static void registerAccountAsync(Map<String, Object> params, Consumer<Map<String, Object>> callback) {
+        String url = Util.null2String(config.get(FaDaDaConstants.FDD_BASE_URL_KEY)) + "/account/register";
+        Map<String, Object> digestParams = encryptParams(params);
+        try {
+            httpUtils.asyncApiPost(url, digestParams, null, responeVo -> {
+                if (null == responeVo) {
+                    throw new CustomerException(Util.logStr("can not fetch fadada [{}], request param is [{}], request heard is [{}]",
+                            url, JSON.toJSONString(params), JSON.toJSONString(digestParams)));
+                }
+                writRequestLog(url, params, digestParams, responeVo.getEntityString(), FaDaDaRequestType.REGISTER_ACCOUNT);
+                Map<String, Object> result = verifyResponseAndGetResult(responeVo);
+                callback.accept(result);
+            });
+        } catch (IOException e) {
+            log.error(Util.logStr("can not fetch fadada registerAccountAsync  [{}], request param is [{}], request heard is [{}]",
+                    url, JSON.toJSONString(params), JSON.toJSONString(digestParams)));
+            throw new CustomerException("can not fetch fadada registerAccountAsync");
+        }
+    }
+
+
+    /**
+     * <h2>获取法大大实名认证链接地址</h2>
+     *
+     * @param requestParams 请求参数
+     * @return 响应结果
+     */
+    public static Map<String, Object> realNameAuthentication(Map<String, Object> requestParams) {
+        String url = Util.null2String(config.get(FaDaDaConstants.FDD_BASE_URL_KEY)) + "/certification/person/url";
+        ResponeVo responeVo;
+        Map<String, Object> digestParams = encryptParams(requestParams);
+        try {
+            responeVo = httpUtils.apiPost(url, digestParams);
+            writRequestLog(url, requestParams, digestParams, responeVo.getEntityString(), FaDaDaRequestType.REAL_NAME_AUTHENTICATION);
+        } catch (IOException e) {
+            log.error(Util.logStr("can not fetch fadada realNameAuthentication [{}], request param is [{}], request heard is [{}]",
+                    url, JSON.toJSONString(requestParams), JSON.toJSONString(digestParams)));
+            throw new CustomerException("can not fetch fadada realNameAuthentication");
+        }
+        return verifyResponseAndGetResult(responeVo);
+    }
+
+    /**
+     * <h2>异步获取法大大实名认证链接地址</h2>
+     *
+     * @param requestParams 请求参数
+     */
+    public static void realNameAuthenticationAsync(Map<String, Object> requestParams, Consumer<Map<String, Object>> callback) {
+        String url = Util.null2String(config.get(FaDaDaConstants.FDD_BASE_URL_KEY)) + "/certification/person/url";
+        Map<String, Object> digestParams = encryptParams(requestParams);
+        try {
+            httpUtils.asyncApiPost(url, digestParams, null, responeVo -> {
+                if (null == responeVo) {
+                    throw new CustomerException(Util.logStr("can not fetch fadada realNameAuthentication [{}], request param is [{}], request heard is [{}]",
+                            url, JSON.toJSONString(requestParams), JSON.toJSONString(digestParams)));
+                }
+                writRequestLog(url, requestParams, digestParams, responeVo.getEntityString(), FaDaDaRequestType.REAL_NAME_AUTHENTICATION);
+                Map<String, Object> result = verifyResponseAndGetResult(responeVo);
+                callback.accept(result);
+            });
+        } catch (IOException e) {
+            log.error(Util.logStr("can not fetch fadada realNameAuthenticationAsync [{}], request param is [{}], request heard is [{}]",
+                    url, JSON.toJSONString(requestParams), JSON.toJSONString(digestParams)));
+            throw new CustomerException("can not fetch fadada realNameAuthenticationAsync");
+        }
+    }
+
+    /**
+     * <h2>创建法大大合同,合同模板填充</h2>
+     *
+     * @param requestUrl   请求地址
+     * @param requestParam 请求参数
+     * @return 最终返回结果
+     */
+    public static Map<String, Object> createContract(String requestUrl, Map<String, Object> requestParam) {
+        ResponeVo responeVo;
+        Map<String, Object> digestParams = encryptParams(requestParam);
+        try {
+            responeVo = httpUtils.apiPost(requestUrl, digestParams);
+            writRequestLog(requestUrl, requestParam, digestParams, responeVo.getEntityString(), FaDaDaRequestType.ONLINE_TEMPLATE_FILL);
+        } catch (IOException e) {
+            log.error(Util.logStr("can not fetch fadada createContract [{}], request param is [{}], request heard is [{}]",
+                    requestUrl, JSON.toJSONString(requestParam), JSON.toJSONString(digestParams)));
+            throw new CustomerException("can not fetch fadada createContract");
+        }
+        return verifyResponseAndGetResult(responeVo);
+    }
+
+    /**
+     * <h2>查询法大大控件列表</h2>
+     *
+     * @param requestUrl   查询地址
+     * @param requestParam 查询参数
+     * @return 控件列表
+     */
+    public static Map<String, Object> fetchOnlineWidgetDetailList(String requestUrl, Map<String, Object> requestParam) {
+        ResponeVo responeVo;
+        Map<String, Object> digestParams = encryptParams(requestParam);
+        try {
+            responeVo = httpUtils.apiPost(requestUrl, digestParams);
+            writRequestLog(requestUrl, requestParam, digestParams, responeVo.getEntityString(), FaDaDaRequestType.ONLINE_TEMPLATE_GET);
+        } catch (IOException e) {
+            log.error(Util.logStr("can not fetch fadada selectOnlineWidgetDetailList [{}], request param is [{}], request heard is [{}]",
+                    requestUrl, JSON.toJSONString(requestParam), JSON.toJSONString(digestParams)));
+            throw new CustomerException("can not fetch fadada selectOnlineWidgetDetailList");
+        }
+        return verifyResponseAndGetResult(responeVo);
+    }
+
+
+    /**
+     * <h2>法大大合同手动签署</h2>
+     *
+     * @param requestUrl   请求地址
+     * @param requestParam 请求参数
+     * @return 响应结果
+     */
+    public static void manualSignContract(String requestUrl, Map<String, Object> requestParam) {
+        ResponeVo responeVo;
+        Map<String, Object> digestParams = encryptParams(requestParam);
+        try {
+            responeVo = httpUtils.apiGet(requestUrl, digestParams, null);
+            writRequestLog(requestUrl, requestParam, digestParams, responeVo.getEntityString(), FaDaDaRequestType.ONLINE_TEMPLATE_GET);
+        } catch (IOException e) {
+            log.error(Util.logStr("can not fetch fadada manualSignContract [{}], request param is [{}], request heard is [{}]",
+                    requestUrl, JSON.toJSONString(requestParam), JSON.toJSONString(digestParams)));
+            throw new CustomerException("can not fetch fadada manualSignContract");
+        }
+        if (responeVo.getCode() == SUCCESS_CODE) {
+            return;
+        }
+        throw new CustomerException("fetch fadada manualSignContract error");
+    }
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_jitu/schedule/registerfadada/util/type/FaDaDaRequestType.java b/src/main/youhong_ai_old_src/weaver/aiyh_jitu/schedule/registerfadada/util/type/FaDaDaRequestType.java
new file mode 100644
index 0000000..8d14382
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_jitu/schedule/registerfadada/util/type/FaDaDaRequestType.java
@@ -0,0 +1,50 @@
+package weaver.aiyh_jitu.schedule.registerfadada.util.type;
+
+/**
+ * <h1>法大大请求枚举类</h1>
+ *
+ * <p>create: 2022-08-18 10:22</p>
+ *
+ * @author aiyh EBU7-dev-1
+ */
+
+public enum FaDaDaRequestType {
+
+    REGISTER_ACCOUNT(0, "注册账号"),
+
+    REAL_NAME_AUTHENTICATION(1, "实名认证"),
+
+    ONLINE_TEMPLATE_GET(2, "控件列表查询"),
+
+    ONLINE_TEMPLATE_FILL(3, "合同模板填充"),
+
+    SEMI_AUTOMATIC_BATCH_SIGN(4, "合同批量半自动签署"),
+
+    SIGN_PAGE_MANUAL(5, "手动签署"),
+
+    CONTRACT_ARCHIVE(6, "合同归档"),
+
+    CONTRACT_VIEW(7, "合同查看，输出查看页面"),
+
+    CONTRACT_DOWNLOAD(8, "合同下载"),
+
+    CONTRACT_REVOKE(9, "合同撤销"),
+
+    CONTRACT_STATUS(10, "合同状态查询"),
+
+    CONTRACT_SEARCH(11, "根据客户查询所有合同"),
+
+    ACCOUNT_PERSON_GET(12, "查询个人信息"),
+
+    COMPANY_USER_INFO_LIST(13, "企业用户信息查询");
+
+    private final Integer value;
+
+    FaDaDaRequestType(int value, String desc) {
+        this.value = value;
+    }
+
+    public int getValue() {
+        return this.value;
+    }
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_pcn/async_organization/SyncOrganizationForOtherAPI.java b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/async_organization/SyncOrganizationForOtherAPI.java
new file mode 100644
index 0000000..4a1c5e0
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/async_organization/SyncOrganizationForOtherAPI.java
@@ -0,0 +1,213 @@
+package weaver.aiyh_pcn.async_organization;
+
+import aiyh.utils.Util;
+import aiyh.utils.zwl.common.ToolUtil;
+import com.weaver.esb.server.cache.ResourceComInfo;
+import weaver.aiyh_pcn.async_organization.model.Department;
+import weaver.aiyh_pcn.async_organization.model.Employee;
+import weaver.aiyh_pcn.async_organization.model.Position;
+import weaver.aiyh_pcn.async_organization.result.GetOrganizationResult;
+import weaver.aiyh_pcn.async_organization.util.SyncOrganizationUtils;
+import weaver.hrm.company.DepartmentComInfo;
+import weaver.hrm.company.SubCompanyComInfo;
+import weaver.hrm.job.JobTitlesComInfo;
+import weaver.hrm.resource.HrmSynDAO;
+import weaver.integration.logging.Logger;
+import weaver.integration.logging.LoggerFactory;
+import weaver.interfaces.hrm.*;
+import weaver.matrix.MatrixUtil;
+
+import java.util.*;
+
+
+/**
+ * @author EBU7-dev1-ayh
+ * @create 2021/7/20 0020 15:16
+ * 同步第三方系统人员组织结构
+ */
+
+
+public class SyncOrganizationForOtherAPI extends ToolUtil implements HrmSynService {
+    private final Logger log = LoggerFactory.getLogger(SyncOrganizationForOtherAPI.class);
+    private final GetOrganizationResult getOrganizationResult = new GetOrganizationResult();
+    private final SyncOrganizationUtils organizationUtils = new SyncOrganizationUtils();
+    String className = "SyncOrganizationForOtherAPI";
+    private HashMap<String, Object> synResult;
+
+    public SyncOrganizationForOtherAPI() {
+        this.writeDebuggerLog(className, "===========> create Object! <============");
+        this.synResult = new HashMap<>();
+    }
+
+    /**
+     * 同步到分公司(分部)
+     */
+    @Override
+    public String SynTimingToOASubCompany() {
+        this.writeDebuggerLog(className, "===========> synchronous company to OA system start <============");
+        this.synResult.put("1", null);
+        this.writeDebuggerLog(className, "===========> synchronous company to OA system end <============");
+        return null;
+    }
+
+    /**
+     * 同步到部门
+     */
+    @Override
+    public String SynTimingToOADepartment() {
+        this.writeDebuggerLog(className, "===========> synchronous department to OA system starts <============");
+        try {
+            List<Department> departmentList = getOrganizationResult.getDepartmentList();
+            Collections.sort(departmentList);
+            List<Map<String, Object>> synResultlist = new ArrayList<>();
+            departmentList.forEach(department -> {
+                Map<String, String> stringStringMap = organizationUtils.asyncDepartment(department);
+                synResultlist.add(buildItemMap("", "", department.getDEPARTMENTNAME(), stringStringMap.get("code"), stringStringMap.get("msg")));
+            });
+            this.writeDebuggerLog(className, departmentList.size() + " data pieces are updated this time");
+            //清除OA中分部的缓存记录
+            SubCompanyComInfo subCompanyComInfo = new SubCompanyComInfo();
+            subCompanyComInfo.removeCompanyCache();
+            subCompanyComInfo.removeCache();
+            //清除部门缓存
+            DepartmentComInfo departmentComInfo = new DepartmentComInfo();
+            departmentComInfo.removeCompanyCache();
+            departmentComInfo.removeCache();
+
+            //同步部门数据到矩阵
+            MatrixUtil.sysDepartmentData();
+
+            this.writeDebuggerLog(className, "This time together step or update data " + departmentList.size());
+            this.synResult.put("2", synResultlist);
+            this.writeDebuggerLog(className, "===========> synchronous department to OA system end <============");
+        } catch (Exception e) {
+            this.writeErrorLog("同步部门出现错误：错误信息:" + Util.getErrString(e));
+        }
+        return null;
+    }
+
+    /**
+     * 同步到职位
+     */
+    @Override
+    public String SynTimingToOAJobtitle() {
+        this.writeDebuggerLog(className, "===========> synchronous job to OA system starts <============");
+        try {
+            List<Position> positionList = getOrganizationResult.getPositionList();
+            Collections.sort(positionList);
+            List<Map<String, Object>> synResultlist = new ArrayList<>();
+            positionList.forEach(position -> {
+                Map<String, String> stringStringMap = organizationUtils.asyncPosition(position);
+                synResultlist.add(buildItemMap(position.getJOBCODE(), position.getJOBCODE(), position.getJOBFUNCTION(), stringStringMap.get("code"), stringStringMap.get("msg")));
+            });
+            this.writeDebuggerLog(className, positionList.size() + " data pieces are updated this time");
+//		 清除职位缓存
+            JobTitlesComInfo jobTitlesComInfo = new JobTitlesComInfo();
+            jobTitlesComInfo.removeJobTitlesCache();
+            jobTitlesComInfo.removeCache();
+            this.synResult.put("3", synResultlist);
+            this.writeDebuggerLog(className, "===========> synchronous job to OA system end <============");
+        } catch (Exception e) {
+            this.writeErrorLog("同步职位失败，失败信息:" + Util.getErrString(e));
+        }
+        return null;
+    }
+
+    /**
+     * 同步到人员
+     */
+    @Override
+    public String SynTimingToOAHrmResource() {
+        this.writeDebuggerLog(className, "===========> synchronous hrm to OA system starts <============");
+        try {
+            List<Employee> employeeList = getOrganizationResult.getEmployeeList();
+            List<Map<String, Object>> synResultlist = new ArrayList<>();
+            Collections.sort(employeeList);
+            employeeList.forEach(employee -> {
+                Map<String, String> stringStringMap = organizationUtils.asyncEmployee(employee);
+                synResultlist.add(buildItemMap(employee.getUSERCODE(), employee.getUSERCODE(), employee.getPreferred_Name() + "/" + employee.getUSERNAMECN(), stringStringMap.get("code"), stringStringMap.get("msg")));
+            });
+            this.writeDebuggerLog(className, employeeList.size() + " data pieces are updated this time");
+            // 清除人员缓存
+            try {
+                ResourceComInfo rsc = new ResourceComInfo();
+                rsc.removeCache();
+            } catch (Exception e) {
+                this.writeErrorLog(className, "removeCache error!");
+                e.printStackTrace();
+            }
+//		organizationUtils.asyncEmployee(employeeList.get(0));
+            this.synResult.put("4", synResultlist);
+            this.writeDebuggerLog(className, "===========> synchronous hrm to OA system end <============");
+        } catch (Exception e) {
+            this.writeErrorLog("同步人员信息失败，失败信息:" + Util.getErrString(e));
+        }
+        return null;
+    }
+
+    @Override
+    public void SynTimingFromOASubCompany(SubCompanyBean[] subCompanyBeans) {
+
+    }
+
+    @Override
+    public void SynTimingFromOADepartment(DepartmentBean[] departmentBeans) {
+
+    }
+
+    @Override
+    public void SynTimingFromOAJobtitle(JobTitleBean[] jobTitleBeans) {
+
+    }
+
+    @Override
+    public void SynTimingFromOAHrmResource(UserBean[] userBeans) {
+
+    }
+
+    @Override
+    public void SynInstantSubCompany(SubCompanyBean subCompanyBean) {
+
+    }
+
+    @Override
+    public void SynInstantDepartment(DepartmentBean departmentBean) {
+
+    }
+
+    @Override
+    public void SynInstantJobtitle(JobTitleBean jobTitleBean) {
+
+    }
+
+    @Override
+    public void SynInstantHrmResource(UserBean userBean) {
+
+    }
+
+    @Override
+    public boolean SynSendMessage(String s, String s1, String s2, String s3, String s4) {
+        return false;
+    }
+
+    @Override
+    public HashMap<String, Object> getSynResult() {
+        return this.synResult;
+    }
+
+    @Override
+    public void removeSynResult() {
+        this.synResult = new HashMap();
+    }
+
+    private Map<String, Object> buildItemMap(String pkcode, String pk, String memo, String succ, String error) {
+        //保存结果
+        HashMap<String, Object> itemMap = new HashMap<>();
+        itemMap.put(weaver.hrm.resource.HrmSynDAO.OUTPK, pkcode);
+        itemMap.put(weaver.hrm.resource.HrmSynDAO.PK, pk);
+        itemMap.put(weaver.hrm.resource.HrmSynDAO.Memo, memo);
+        itemMap.put(weaver.hrm.resource.HrmSynDAO.Success, succ);
+        itemMap.put(HrmSynDAO.ErrorMessage, error);
+        return itemMap;
+    }
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_pcn/async_organization/config/SyncOrganizationConfig.java b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/async_organization/config/SyncOrganizationConfig.java
new file mode 100644
index 0000000..1b18459
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/async_organization/config/SyncOrganizationConfig.java
@@ -0,0 +1,161 @@
+package weaver.aiyh_pcn.async_organization.config;
+
+import aiyh.utils.httpUtil.ResponeVo;
+import aiyh.utils.httpUtil.util.HttpUtils;
+import aiyh.utils.zwl.common.ToolUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.TypeReference;
+import com.ibm.icu.text.SimpleDateFormat;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import weaver.aiyh_pcn.async_organization.result.ResultBean;
+
+import java.io.IOException;
+import java.util.*;
+
+/**
+ * @author EBU7-dev1-ayh
+ * @create 2021/7/20 0020 16:40
+ * 同步第三方系统人员组织结构配置类
+ */
+
+
+public class SyncOrganizationConfig<E> extends ToolUtil {
+
+	/**
+	 * api验证参数
+	 */
+	private final String API_KEY = this.getSystemParamValue("CMS_API_KEY");
+	/**
+	 * 测试地址URL
+	 */
+	private String CMS_TEST_URL = this.getSystemParamValue("CMS_TEST_URL");
+	/**
+	 * 生产环境地址URL
+	 */
+	private String CMS_PROUD_URL = this.getSystemParamValue("CMS_PROUD_URL");
+	/**
+	 * 员工
+	 */
+	private String EmployeeApi = this.getSystemParamValue("EmployeeApi");
+	/**
+	 * 部门
+	 */
+	private String DepartmentApi = this.getSystemParamValue("DepartmentApi");
+	/**
+	 * 职位
+	 */
+	private String PositionApi = this.getSystemParamValue("PositionApi");
+	private String CMS_API_URL_MARK = this.getSystemParamValue("CMS_API_URL_MARK");
+	private String REQUEST_API_RUL = "";
+	/**
+	 * 每页数据大小
+	 */
+	private final String PAGE_SIZE = this.getSystemParamValue("CMS_API_GET_DATA_SIZE");
+	private String CMS_API_QUERY_DATA = "";
+	private HttpUtils httpUtils = new HttpUtils();
+
+	public SyncOrganizationConfig() {
+		if (0 == Integer.parseInt(CMS_API_URL_MARK)) {
+			this.REQUEST_API_RUL = this.CMS_TEST_URL;
+			this.CMS_API_QUERY_DATA = "?date=" + this.getSystemParamValue("CMS_API_QUERY_DATA");
+		} else {
+			this.REQUEST_API_RUL = this.CMS_PROUD_URL;
+			this.CMS_API_QUERY_DATA = this.getDate();
+		}
+	}
+
+	private String getDate() {
+		Date date = new Date();
+		SimpleDateFormat formatter = new SimpleDateFormat("yyyyMMdd");
+		return "?date=" + formatter.format(date);
+	}
+
+	//	封装整理接口数据
+	public List<E> getDataList(String url) {
+		int pageIndex = 1;
+		ArrayList<E> employees = new ArrayList<>();
+		while (true) {
+			ResultBean<E> employeeResultBean = getDataResult(pageIndex, url);
+//			this.writeErrorLog("人员组织架构的响应互数据：" + employeeResultBean);
+			assert employeeResultBean != null;
+			employees.addAll(employeeResultBean.getItems());
+			pageIndex++;
+//			|| employeeResultBean.getItems().size() < employeeResultBean.getPageSize()
+			if (employeeResultBean.getPage() >= employeeResultBean.getTotalPage() ) {
+				break;
+			}
+		}
+		return employees;
+	}
+
+
+	//	请求api接口数据
+	private ResultBean<E> getDataResult(int pageIndex, String url) {
+		this.writeErrorLog("人员组织架构请求地址: " + url + " 请求数据：PAGE_SIZE：" + PAGE_SIZE + " pageIndex：" + pageIndex + " apikey：" + API_KEY);
+//		DefaultHttpClient httpClient = HttpManager.getHttpClient();
+
+//		HttpPost httpPost = new HttpPost(url);
+		Map<String, Object> params = new HashMap(2);
+		Map<String, String> heards = new HashMap(2);
+		heards.put("apikey", API_KEY);
+		heards.put("Content-Type", "application/json");
+		params.put("pageSize", PAGE_SIZE);
+		params.put("pageIndex", Integer.toString(pageIndex));
+
+
+//		List<NameValuePair> nvps = new ArrayList<>();
+//		nvps.add(new BasicNameValuePair("pageSize","10"));
+//		nvps.add(new BasicNameValuePair("pageIndex","1"));
+//      httpPost.setEntity(new UrlEncodedFormEntity(nvps, HTTP.UTF_8));
+/*		httpPost.setHeader("apikey", API_KEY);
+		httpPost.setHeader("Content-Type", "application/json");
+		httpPost.setEntity(new StringEntity(JSON.toJSONString(params), HTTP.UTF_8));*/
+		CloseableHttpResponse execute = null;
+		try {
+//			execute = httpClient.execute(httpPost);
+			ResponeVo responeVo = httpUtils.apiPost(url, params, heards);
+			if (responeVo.getCode() == 200) {
+				return JSON.parseObject(responeVo.getEntityString(), new TypeReference<ResultBean<E>>() {
+				});
+			}
+/*			if (execute.getStatusLine().getStatusCode() == 200) {
+				HttpEntity entity = execute.getEntity();
+				String response = EntityUtils.toString(entity, "utf-8");
+
+				return JSON.parseObject(response, new TypeReference<ResultBean<E>>() {
+				});
+			}*/
+//			HttpEntity entity = execute.getEntity();
+//			String response = EntityUtils.toString(entity, "utf-8");
+			this.writeErrorLog("人员组织架构的相应数据:" + responeVo.getEntityString());
+//			System.out.println(url);
+//			System.out.println(response);
+//			System.out.println(JSON.parseObject(response, new TypeReference<ResultBean<E>>() {}));
+			return null;
+		} catch (IOException e) {
+			try {
+				if (execute != null) {
+					execute.close();
+				}
+			} catch (IOException ioException) {
+				ioException.printStackTrace();
+				return null;
+			}
+			e.printStackTrace();
+			this.writeErrorLog("转换错误！错误原因：" + e);
+			return null;
+		}
+	}
+
+	public String getEMPLOYEE_API_RUL() {
+		return this.REQUEST_API_RUL + this.EmployeeApi + this.CMS_API_QUERY_DATA;
+	}
+
+	public String getDEPARTMENT_API_URL() {
+		return this.REQUEST_API_RUL + this.DepartmentApi + this.CMS_API_QUERY_DATA;
+	}
+
+	public String getPOSITION_API_URL() {
+		return this.REQUEST_API_RUL + this.PositionApi + this.CMS_API_QUERY_DATA;
+	}
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_pcn/async_organization/model/Department.java b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/async_organization/model/Department.java
new file mode 100644
index 0000000..9071fad
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/async_organization/model/Department.java
@@ -0,0 +1,82 @@
+package weaver.aiyh_pcn.async_organization.model;
+
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * @author EBU7-dev1-ayh
+ * @create 2021/7/20 0020 17:18
+ * 部门实体类
+ */
+
+
+public class Department implements Comparable<Department>{
+	/**部门ID*/
+	private Long DEPARTMENTID;
+	/**部门名称*/
+	private String DEPARTMENTNAME;
+	/**上级部门ID 此处为0时，表示该部门为根部门。对应所属公司，从【一级部门对应实体mapping表】上取值*/
+	private Long PARENTDEPARTMENDID;
+
+
+	public String getValue(String fieldName){
+		if("DEPARTMENTID".equals(fieldName)) {
+			return String.valueOf(this.getDEPARTMENTID());
+		}
+		if("DEPARTMENTNAME".equals(fieldName)) {
+			return this.getDEPARTMENTNAME();
+		}
+		if("PARENTDEPARTMENDID".equals(fieldName)) {
+			return String.valueOf(this.getPARENTDEPARTMENDID());
+		}
+		return null;
+	}
+
+	public Department() {
+	}
+
+	public Department(Long DEPARTMENTID, String DEPARTMENTNAME, Long PARENTDEPARTMENDID) {
+		this.DEPARTMENTID = DEPARTMENTID;
+		this.DEPARTMENTNAME = DEPARTMENTNAME;
+		this.PARENTDEPARTMENDID = PARENTDEPARTMENDID;
+	}
+
+	public Long getDEPARTMENTID() {
+		return DEPARTMENTID;
+	}
+
+	public void setDEPARTMENTID(Long DEPARTMENTID) {
+		this.DEPARTMENTID = DEPARTMENTID;
+	}
+
+	public String getDEPARTMENTNAME() {
+		return DEPARTMENTNAME;
+	}
+
+	public void setDEPARTMENTNAME(String DEPARTMENTNAME) {
+		this.DEPARTMENTNAME = DEPARTMENTNAME;
+	}
+
+	public Long getPARENTDEPARTMENDID() {
+		return PARENTDEPARTMENDID;
+	}
+
+	public void setPARENTDEPARTMENDID(Long PARENTDEPARTMENDID) {
+		this.PARENTDEPARTMENDID = PARENTDEPARTMENDID;
+	}
+
+
+
+	@Override
+	public String toString() {
+		return "Department{" +
+				"DEPARTMENTID='" + DEPARTMENTID + '\'' +
+				", DEPARTMENTNAME='" + DEPARTMENTNAME + '\'' +
+				", PARENTDEPARTMENDID='" + PARENTDEPARTMENDID + '\'' +
+				'}';
+	}
+
+	@Override
+	public int compareTo(@NotNull Department o) {
+		return new Long(this.PARENTDEPARTMENDID - o.getPARENTDEPARTMENDID()).intValue();
+	}
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_pcn/async_organization/model/Employee.java b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/async_organization/model/Employee.java
new file mode 100644
index 0000000..8799625
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/async_organization/model/Employee.java
@@ -0,0 +1,252 @@
+package weaver.aiyh_pcn.async_organization.model;
+
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * @author EBU7-dev1-ayh
+ * @create 2021/7/20 0020 17:09
+ * 员工实体类
+ */
+
+public class Employee  implements Comparable<Employee>{
+	/**员工id*/
+	private Long UserID;
+	/**名 （英文）*/
+	private String FIRSTNAMEEN;
+	/**姓 （英文）*/
+	private String LASTNAMEEN;
+	/**中文姓名 */
+	private String USERNAMECN;
+	/**员工编号*/
+	private String USERCODE;
+	/**岗位id*/
+	private Long JOBCODEID;
+	/**部门id*/
+	private Long DEPARTMENTID;
+	/**部门名称*/
+	private String DEPARTMENTNAME;
+	/*成本中心编码*/
+	private String COSTCENTERCODE;
+	/**邮箱*/
+	private String EMAIL;
+	/**公司实体*/
+	private String ORGANIZATION;
+	/**电话号*/
+	private String MOBILENO;
+	/**座机号*/
+	private String TEL;
+	/**英文名*/
+	private String Preferred_Name;
+
+	public String getValue(String fieldName){
+		if("UserID".equals(fieldName)){
+			return String.valueOf(this.getUserID());
+		}
+		if("FIRSTNAMEEN".equals(fieldName)){
+			return this.getFIRSTNAMEEN();
+		}
+		if("LASTNAMEEN".equals(fieldName)){
+			return this.getLASTNAMEEN();
+		}
+		if("USERNAMECN".equals(fieldName)){
+			return this.getUSERNAMECN();
+		}
+		if("USERCODE".equals(fieldName)){
+			return this.getUSERCODE();
+		}
+		if("JOBCODEID".equals(fieldName)){
+			return String.valueOf(this.getJOBCODEID());
+		}
+		if("DEPARTMENTID".equals(fieldName)){
+			return String.valueOf(this.getDEPARTMENTID());
+		}
+		if("DEPARTMENTNAME".equals(fieldName)){
+			return this.getDEPARTMENTNAME();
+		}
+		if("COSTCENTERCODE".equals(fieldName)){
+			return this.getCOSTCENTERCODE();
+		}
+		if("EMAIL".equals(fieldName)){
+			return this.getEMAIL();
+		}
+		if("ORGANIZATION".equals(fieldName)){
+			return this.getORGANIZATION();
+		}
+		if("MOBILENO".equals(fieldName)){
+			return this.getMOBILENO();
+		}
+		if("TEL".equals(fieldName)){
+			return this.getTEL();
+		}
+		if("Preferred_Name".equals(fieldName)){
+			return this.getPreferred_Name();
+		}
+		return null;
+	}
+
+	public Employee() {
+	}
+
+	@Override
+	public String toString() {
+		return "Employee{" +
+				"UserID='" + UserID + '\'' +
+				", FIRSTNAMEEN='" + FIRSTNAMEEN + '\'' +
+				", LASTNAMEEN='" + LASTNAMEEN + '\'' +
+				", USERNAMECN='" + USERNAMECN + '\'' +
+				", USERCODE='" + USERCODE + '\'' +
+				", JOBCODEID='" + JOBCODEID + '\'' +
+				", DEPARTMENTID='" + DEPARTMENTID + '\'' +
+				", DEPARTMENTNAME='" + DEPARTMENTNAME + '\'' +
+				", COSTCENTERCODE='" + COSTCENTERCODE + '\'' +
+				", EMAIL='" + EMAIL + '\'' +
+				", ORGANIZATION='" + ORGANIZATION + '\'' +
+				", MOBILENO='" + MOBILENO + '\'' +
+				", TEL='" + TEL + '\'' +
+				", Preferred_Name='" + Preferred_Name + '\'' +
+				'}';
+	}
+
+	public Employee(Long userID, String FIRSTNAMEEN, String LASTNAMEEN, String USERNAMECN, String USERCODE, Long JOBCODEID, Long DEPARTMENTID, String DEPARTMENTNAME, String COSTCENTERCODE, String EMAIL, String ORGANIZATION, String MOBILENO, String TEL, String preferred_Name) {
+		UserID = userID;
+		this.FIRSTNAMEEN = FIRSTNAMEEN;
+		this.LASTNAMEEN = LASTNAMEEN;
+		this.USERNAMECN = USERNAMECN;
+		this.USERCODE = USERCODE;
+		this.JOBCODEID = JOBCODEID;
+		this.DEPARTMENTID = DEPARTMENTID;
+		this.DEPARTMENTNAME = DEPARTMENTNAME;
+		this.COSTCENTERCODE = COSTCENTERCODE;
+		this.EMAIL = EMAIL;
+		this.ORGANIZATION = ORGANIZATION;
+		this.MOBILENO = MOBILENO;
+		this.TEL = TEL;
+		Preferred_Name = preferred_Name;
+	}
+
+	public Long getUserID() {
+		return UserID;
+	}
+
+	public void setUserID(Long userID) {
+		UserID = userID;
+	}
+
+	public String getFIRSTNAMEEN() {
+		return FIRSTNAMEEN;
+	}
+
+	public void setFIRSTNAMEEN(String FIRSTNAMEEN) {
+		this.FIRSTNAMEEN = FIRSTNAMEEN;
+	}
+
+	public String getLASTNAMEEN() {
+		return LASTNAMEEN;
+	}
+
+	public void setLASTNAMEEN(String LASTNAMEEN) {
+		this.LASTNAMEEN = LASTNAMEEN;
+	}
+
+	public String getUSERNAMECN() {
+		return USERNAMECN;
+	}
+
+	public void setUSERNAMECN(String USERNAMECN) {
+		this.USERNAMECN = USERNAMECN;
+	}
+
+	public String getUSERCODE() {
+		return USERCODE;
+	}
+
+	public void setUSERCODE(String USERCODE) {
+		this.USERCODE = USERCODE;
+	}
+
+	public Long getJOBCODEID() {
+		return JOBCODEID;
+	}
+
+	public void setJOBCODEID(Long JOBCODEID) {
+		this.JOBCODEID = JOBCODEID;
+	}
+
+	public Long getDEPARTMENTID() {
+		return DEPARTMENTID;
+	}
+
+	public void setDEPARTMENTID(Long DEPARTMENTID) {
+		this.DEPARTMENTID = DEPARTMENTID;
+	}
+
+	public String getDEPARTMENTNAME() {
+		return DEPARTMENTNAME;
+	}
+
+	public void setDEPARTMENTNAME(String DEPARTMENTNAME) {
+		this.DEPARTMENTNAME = DEPARTMENTNAME;
+	}
+
+	public String getCOSTCENTERCODE() {
+		return COSTCENTERCODE;
+	}
+
+	public void setCOSTCENTERCODE(String COSTCENTERCODE) {
+		this.COSTCENTERCODE = COSTCENTERCODE;
+	}
+
+	public String getEMAIL() {
+		return EMAIL;
+	}
+
+	public void setEMAIL(String EMAIL) {
+		this.EMAIL = EMAIL;
+	}
+
+	public String getORGANIZATION() {
+		return ORGANIZATION;
+	}
+
+	public void setORGANIZATION(String ORGANIZATION) {
+		this.ORGANIZATION = ORGANIZATION;
+	}
+
+	public String getMOBILENO() {
+		return MOBILENO;
+	}
+
+	public void setMOBILENO(String MOBILENO) {
+		this.MOBILENO = MOBILENO;
+	}
+
+	public String getTEL() {
+		return TEL;
+	}
+
+	public void setTEL(String TEL) {
+		this.TEL = TEL;
+	}
+
+	public String getPreferred_Name() {
+		return Preferred_Name;
+	}
+
+	public void setPreferred_Name(String preferred_Name) {
+		Preferred_Name = preferred_Name;
+	}
+
+
+
+
+	@Override
+	public int compareTo(@NotNull Employee o) {
+	    if(this.getJOBCODEID() == null){
+	        return -1;
+        }
+	    if(o.getJOBCODEID() == null){
+	        return 1;
+        }
+		return new Long(this.JOBCODEID - o.getJOBCODEID()).intValue();
+	}
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_pcn/async_organization/model/Position.java b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/async_organization/model/Position.java
new file mode 100644
index 0000000..c9c4c59
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/async_organization/model/Position.java
@@ -0,0 +1,125 @@
+package weaver.aiyh_pcn.async_organization.model;
+
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * @author EBU7-dev1-ayh
+ * @create 2021/7/20 0020 17:20
+ * 岗位实体类
+ */
+
+
+public class Position implements Comparable<Position>{
+	/**岗位id*/
+	private long JOBCODEID;
+	/**岗位编号*/
+	private String JOBCODE;
+	/**岗位描述*/
+	private String JOBFUNCTION;
+	/**上级岗位id 为空则表示该岗位无上级*/
+	private long SUPERIORJOBCODEID;
+	private long POSITIONOCCUPIED;
+	private String Company_Code;
+
+
+	public String getValue(String fieldName){
+		if("JOBCODEID".equals(fieldName)){
+			return String.valueOf(this.getJOBCODEID());
+		}
+		if("JOBCODE".equals(fieldName)){
+			return this.getJOBCODE();
+		}
+		if("JOBFUNCTION".equals(fieldName)){
+			return this.getJOBFUNCTION();
+		}
+		if("SUPERIORJOBCODEID".equals(fieldName)){
+			return String.valueOf(this.getSUPERIORJOBCODEID());
+		}
+		if("POSITIONOCCUPIED".equals(fieldName)){
+			return String.valueOf(this.getPOSITIONOCCUPIED());
+		}
+		if("Company_Code".equals(fieldName)){
+			return this.getCompany_Code();
+		}
+		return null;
+	}
+
+	public Position() {
+	}
+
+	public Position(long JOBCODEID, String JOBCODE, String JOBFUNCTION, long SUPERIORJOBCODEID, long POSITIONOCCUPIED, String company_Code) {
+		this.JOBCODEID = JOBCODEID;
+		this.JOBCODE = JOBCODE;
+		this.JOBFUNCTION = JOBFUNCTION;
+		this.SUPERIORJOBCODEID = SUPERIORJOBCODEID;
+		this.POSITIONOCCUPIED = POSITIONOCCUPIED;
+		this.Company_Code = company_Code;
+	}
+
+
+
+	public int getJOBCODEID() {
+		return (int)JOBCODEID;
+	}
+
+	public void setJOBCODEID(long JOBCODEID) {
+		this.JOBCODEID = JOBCODEID;
+	}
+
+	public String getJOBCODE() {
+		return JOBCODE;
+	}
+
+	public void setJOBCODE(String JOBCODE) {
+		this.JOBCODE = JOBCODE;
+	}
+
+	public String getJOBFUNCTION() {
+		return JOBFUNCTION;
+	}
+
+	public void setJOBFUNCTION(String JOBFUNCTION) {
+		this.JOBFUNCTION = JOBFUNCTION;
+	}
+
+	public long getSUPERIORJOBCODEID() {
+		return SUPERIORJOBCODEID;
+	}
+
+	public void setSUPERIORJOBCODEID(long SUPERIORJOBCODEID) {
+		this.SUPERIORJOBCODEID = SUPERIORJOBCODEID;
+	}
+
+	public long getPOSITIONOCCUPIED() {
+		return POSITIONOCCUPIED;
+	}
+
+	public void setPOSITIONOCCUPIED(long POSITIONOCCUPIED) {
+		this.POSITIONOCCUPIED = POSITIONOCCUPIED;
+	}
+
+	public String getCompany_Code() {
+		return Company_Code;
+	}
+
+	public void setCompany_Code(String company_Code) {
+		Company_Code = company_Code;
+	}
+
+	@Override
+	public int compareTo(@NotNull Position o) {
+		return new Long(this.SUPERIORJOBCODEID - o.getSUPERIORJOBCODEID()).intValue();
+	}
+
+	@Override
+	public String toString() {
+		return "Position{" +
+				"JOBCODEID=" + JOBCODEID +
+				", JOBCODE='" + JOBCODE + '\'' +
+				", JOBFUNCTION='" + JOBFUNCTION + '\'' +
+				", SUPERIORJOBCODEID=" + SUPERIORJOBCODEID +
+				", POSITIONOCCUPIED=" + POSITIONOCCUPIED +
+				", Company_Code='" + Company_Code + '\'' +
+				'}';
+	}
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_pcn/async_organization/result/ApiAsyncConfigResult.java b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/async_organization/result/ApiAsyncConfigResult.java
new file mode 100644
index 0000000..4ad425c
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/async_organization/result/ApiAsyncConfigResult.java
@@ -0,0 +1,121 @@
+package weaver.aiyh_pcn.async_organization.result;
+
+/**
+ * @author EBU7-dev1-ayh
+ * @create 2021/7/23 0023 15:28
+ * api配置结果查询结果
+ */
+
+
+public class ApiAsyncConfigResult {
+	/**
+	 * id
+	 */
+	private long id;
+	/**
+	 * 同步类型，0表示部门信息，1表示人员信息，2表示职位信息
+	 */
+	private int asyncType;
+	/**
+	 * 第三方api返回的数据对应字段
+	 */
+	private String apiField;
+	/**
+	 * api对应字段的值需要插入到的OA系统的字段
+	 */
+	private String oAField;
+	/**
+	 * OA字段类型，0表示系统自带的字段，1表示用户自定义的字段
+	 */
+	private int fieldType;
+	/**
+	 * 同步数据时的转换规则，0表示不转换，1表示固定值，3表示自定义SQL转换
+	 */
+	private int changeRules;
+	/**
+	 * 自定义的转换规则
+	 */
+	private String customRules;
+
+	public ApiAsyncConfigResult() {
+	}
+
+	public ApiAsyncConfigResult(long id, int asyncType, String apiField, String oAField, int fieldType, int changeRules, String customRules) {
+		this.id = id;
+		this.asyncType = asyncType;
+		this.apiField = apiField;
+		this.oAField = oAField;
+		this.fieldType = fieldType;
+		this.changeRules = changeRules;
+		this.customRules = customRules;
+	}
+
+	public long getId() {
+		return id;
+	}
+
+	public void setId(long id) {
+		this.id = id;
+	}
+
+	public int getAsyncType() {
+		return asyncType;
+	}
+
+	public void setAsyncType(int asyncType) {
+		this.asyncType = asyncType;
+	}
+
+	public String getApiField() {
+		return apiField;
+	}
+
+	public void setApiField(String apiField) {
+		this.apiField = apiField;
+	}
+
+	public String getoAField() {
+		return oAField;
+	}
+
+	public void setoAField(String oAField) {
+		this.oAField = oAField;
+	}
+
+	public int getFieldType() {
+		return fieldType;
+	}
+
+	public void setFieldType(int fieldType) {
+		this.fieldType = fieldType;
+	}
+
+	public int getChangeRules() {
+		return changeRules;
+	}
+
+	public void setChangeRules(int changeRules) {
+		this.changeRules = changeRules;
+	}
+
+	public String getCustomRules() {
+		return customRules;
+	}
+
+	public void setCustomRules(String customRules) {
+		this.customRules = customRules;
+	}
+
+	@Override
+	public String toString() {
+		return "ApiAsyncConfigResult{" +
+				"id=" + id +
+				", asyncType=" + asyncType +
+				", apiField='" + apiField + '\'' +
+				", oAField='" + oAField + '\'' +
+				", fieldType=" + fieldType +
+				", changeRules=" + changeRules +
+				", customRules='" + customRules + '\'' +
+				'}';
+	}
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_pcn/async_organization/result/GetOrganizationResult.java b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/async_organization/result/GetOrganizationResult.java
new file mode 100644
index 0000000..68d84c9
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/async_organization/result/GetOrganizationResult.java
@@ -0,0 +1,43 @@
+package weaver.aiyh_pcn.async_organization.result;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import weaver.aiyh_pcn.async_organization.config.SyncOrganizationConfig;
+import weaver.aiyh_pcn.async_organization.model.Department;
+import weaver.aiyh_pcn.async_organization.model.Employee;
+import weaver.aiyh_pcn.async_organization.model.Position;
+
+import java.util.List;
+
+/**
+ * @author EBU7-dev1-ayh
+ * @create 2021/7/21 0021 15:13
+ * 获取第三方api请求结果
+ */
+
+
+public class GetOrganizationResult {
+	/**获取员工数据*/
+	public List<Employee> getEmployeeList(){
+		SyncOrganizationConfig<Employee> employeeSyncOrganizationConfig = new SyncOrganizationConfig<>();
+		List<Employee> dataList = employeeSyncOrganizationConfig.getDataList(employeeSyncOrganizationConfig.getEMPLOYEE_API_RUL());
+		String jsonString = JSON.toJSON(dataList).toString();
+		return (List<Employee>) JSONObject.parseArray(jsonString, Employee.class);
+	}
+
+	/**获取部门数据*/
+	public List<Department> getDepartmentList(){
+		SyncOrganizationConfig<Department> employeeSyncOrganizationConfig = new SyncOrganizationConfig<>();
+		List<Department> dataList = employeeSyncOrganizationConfig.getDataList(employeeSyncOrganizationConfig.getDEPARTMENT_API_URL());
+		String jsonString = JSON.toJSON(dataList).toString();
+		return (List<Department>) JSONObject.parseArray(jsonString, Department.class);
+	}
+
+	/**获取职位数据*/
+	public List<Position> getPositionList(){
+		SyncOrganizationConfig<Position> employeeSyncOrganizationConfig = new SyncOrganizationConfig<>();
+		List<Position> dataList = employeeSyncOrganizationConfig.getDataList(employeeSyncOrganizationConfig.getPOSITION_API_URL());
+		String jsonString = JSON.toJSON(dataList).toString();
+		return (List<Position>) JSONObject.parseArray(jsonString, Position.class);
+	}
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_pcn/async_organization/result/ResultBean.java b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/async_organization/result/ResultBean.java
new file mode 100644
index 0000000..27852b5
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/async_organization/result/ResultBean.java
@@ -0,0 +1,138 @@
+package weaver.aiyh_pcn.async_organization.result;
+
+
+import java.util.ArrayList;
+
+/**
+ * @author EBU7-dev1-ayh
+ * @create 2021/7/21 0021 13:57
+ *
+ */
+
+
+public class ResultBean<E>{
+	/**响应状态码*/
+	private boolean code;
+	private String errorMessage;
+	private String traceId;
+	/**响应消息*/
+	private String msg;
+	/**总页数*/
+	private int totalPage;
+	/**当前页数*/
+	private int page;
+	/**每页数据量*/
+	private int pageSize;
+	/**数据总量*/
+	private int totalCount;
+	/**响应数据*/
+	private ArrayList<E> items;
+
+	@Override
+	public String toString() {
+		return "ResultBean{" +
+				"code=" + code +
+				", errorMessage='" + errorMessage + '\'' +
+				", traceId='" + traceId + '\'' +
+				", msg='" + msg + '\'' +
+				", totalPage=" + totalPage +
+				", page=" + page +
+				", pageSize=" + pageSize +
+				", totalCount=" + totalCount +
+				", items=" + items +
+				'}';
+	}
+
+	public ResultBean() {
+	}
+
+	public ResultBean(boolean code, String msg, int totalPage, int page, int pageSize, int totalCount, ArrayList<E> items) {
+		this.code = code;
+		this.msg = msg;
+		this.totalPage = totalPage;
+		this.page = page;
+		this.pageSize = pageSize;
+		this.totalCount = totalCount;
+		this.items = items;
+	}
+
+	public boolean getCode() {
+		return code;
+	}
+
+	public void setCode(boolean code) {
+		this.code = code;
+	}
+
+	public String getMsg() {
+		return msg;
+	}
+
+	public void setMsg(String msg) {
+		this.msg = msg;
+	}
+
+	public int getTotalPage() {
+		return totalPage;
+	}
+
+	public void setTotalPage(int totalPage) {
+		this.totalPage = totalPage;
+	}
+
+	public int getPage() {
+		return page;
+	}
+
+	public void setPage(int page) {
+		this.page = page;
+	}
+
+	public int getPageSize() {
+		return pageSize;
+	}
+
+	public void setPageSize(int pageSize) {
+		this.pageSize = pageSize;
+	}
+
+	public int getTotalCount() {
+		return totalCount;
+	}
+
+	public void setTotalCount(int totalCount) {
+		this.totalCount = totalCount;
+	}
+
+	public ArrayList<E> getItems() {
+		return items;
+	}
+
+	public boolean isCode() {
+		return code;
+	}
+
+	public String getErrorMessage() {
+		return errorMessage;
+	}
+
+	public String getTraceId() {
+		return traceId;
+	}
+
+	public ResultBean(boolean code, String errorMessage, String traceId, String msg, int totalPage, int page, int pageSize, int totalCount, ArrayList<E> items) {
+		this.code = code;
+		this.errorMessage = errorMessage;
+		this.traceId = traceId;
+		this.msg = msg;
+		this.totalPage = totalPage;
+		this.page = page;
+		this.pageSize = pageSize;
+		this.totalCount = totalCount;
+		this.items = items;
+	}
+
+	public void setItems(ArrayList<E> items) {
+		this.items = items;
+	}
+}
\ No newline at end of file
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_pcn/async_organization/util/GetModelValue.java b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/async_organization/util/GetModelValue.java
new file mode 100644
index 0000000..4e5deaf
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/async_organization/util/GetModelValue.java
@@ -0,0 +1,20 @@
+package weaver.aiyh_pcn.async_organization.util;
+
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
+/**
+ * @author EBU7-dev1-ayh
+ * @create 2021/7/26 0026 8:55
+ * 获取model类的属性值
+ */
+
+
+public class GetModelValue<T> {
+	public Object getValueForString(T obj, String mothodName) throws NoSuchMethodException, InvocationTargetException, IllegalAccessException {
+		Class<?> clazz = obj.getClass();
+		Method getValue = clazz.getDeclaredMethod("get" + mothodName);
+		return getValue.invoke(obj);
+	}
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_pcn/async_organization/util/SyncOrganizationUtils.java b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/async_organization/util/SyncOrganizationUtils.java
new file mode 100644
index 0000000..c611dc0
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/async_organization/util/SyncOrganizationUtils.java
@@ -0,0 +1,913 @@
+package weaver.aiyh_pcn.async_organization.util;
+
+import aiyh.utils.zwl.common.ToolUtil;
+import com.ibm.icu.text.MessageFormat;
+import com.ibm.icu.text.SimpleDateFormat;
+import com.weaver.formmodel.util.EncryptHelper;
+import com.weaver.general.TimeUtil;
+import com.weaver.general.Util;
+import org.h2.util.StringUtils;
+import weaver.aiyh_pcn.async_organization.model.Department;
+import weaver.aiyh_pcn.async_organization.model.Employee;
+import weaver.aiyh_pcn.async_organization.model.Position;
+import weaver.conn.RecordSet;
+
+import java.lang.reflect.InvocationTargetException;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @author EBU7-dev1-ayh
+ * @create 2021/7/22 0022 10:06
+ * 同步人员组织结构工具类
+ */
+
+
+public class SyncOrganizationUtils extends ToolUtil {
+	private static final String className = "SyncOrganization_Cronjob";
+
+	public Map<String, String> asyncDepartment(Department department) {
+//		writeErrorLog( "---------------"+className+" asyncDepartment  Begin --------------------");
+		GetModelValue<Department> getModelValue = new GetModelValue<>();
+		Map<String, String> successMark = new HashMap<>();
+		RecordSet rs = new RecordSet();
+//		所属分部id
+		int subcompanyid1 = 0;
+//		上级部门的id
+		int supDepId = 0;
+//		如果该部门是属于根部门，则需要进行分部的同步
+		//		 查询手动维护的分部信息表，将分部信息保存到分部表hrmsubcompany中，并且将部门的分部id赋值
+		if (department.getPARENTDEPARTMENDID() == 0) {
+//			查询mapping表，查看分部与部门的映射关系,通过部门id查询分部信息
+			String querySql = "select * from uf_sub_mapping where frist_company = "
+					+ Util.null2String(String.valueOf(department.getDEPARTMENTID()));
+//			查询数据库
+			try {
+				rs.executeQuery(querySql);
+			} catch (Exception e) {
+				writeErrorLog(className, "select subcomany error:" + querySql);
+				writeErrorLog("error info:" + e.getMessage() + "\n");
+				successMark.put("code", "0");
+				successMark.put("msg", "查询分部信息出错，错误SQL：" + querySql);
+                return successMark;
+			}
+			if (rs.next()) {
+				subcompanyid1 = Util.getIntValue(rs.getString("subcompany"), 0);
+			}
+
+//			Map<String, Integer> stringIntegerMap = this.subCompanyHandler(department);
+//			subcompanyid1 = stringIntegerMap.get("subcompanyid1");
+//			supDepId = stringIntegerMap.get("supDepId");
+		} else {
+//			如果不是根部门，需要查询到他的父级部门，然后查出他的分部id
+//			查询部门的父级部门
+			try {
+				rs.executeQuery("select * from hrmdepartment where outkey = ?", Util.null2String(String.valueOf(department.getPARENTDEPARTMENDID())));
+			} catch (Exception e) {
+				writeErrorLog("select hrmdepartment error in 51 line,sql: select * from hrmdepartment where outkey = " + Util.null2String(String.valueOf(department.getPARENTDEPARTMENDID())));
+				writeErrorLog("error info:" + e.getMessage() + "\n");
+				successMark.put("code", "0");
+				successMark.put("msg", "查询分部信息出错，错误SQL：" + "select hrmdepartment error in 51 line,sql: select * from hrmdepartment where outkey = " + Util.null2String(String.valueOf(department.getPARENTDEPARTMENDID())));
+                return successMark;
+			}
+			rs.next();
+//			将上级部门的分部id保存起来
+			subcompanyid1 = Util.getIntValue(Util.null2String(rs.getString("subcompanyid1")));
+//			将上级部门的id保存起来
+			supDepId = Util.getIntValue(Util.null2String(rs.getString("id")));
+		}
+//      处理部门信息
+// 		查询HR同步配置表用于更新或者插入字段  查询配置表
+		Map<String, Map<String, String>> configTableInfo = this.queryConfigTableInfo(department, getModelValue, "m.api_field_type = 0");
+		Map<String, String> sysDep = configTableInfo.get("sys");
+		Map<String, String> defDep = configTableInfo.get("def");
+
+//          查询部门表，是否存在该部门
+		String depSql = "select * from hrmdepartment where outkey = " + department.getDEPARTMENTID();
+		try {
+			rs.executeQuery(depSql);
+		} catch (Exception e) {
+			writeErrorLog("select hrmdepartment error in 70 line, sql: " + depSql);
+			writeErrorLog("error info:" + e.getMessage() + "\n");
+			successMark.put("code", "0");
+			successMark.put("msg", "查询分部信息出错，错误SQL：" + depSql);
+            return successMark;
+		}
+		int finalSubcompanyid = subcompanyid1;
+		if (rs.next()) {
+//				存在该部门
+//				拼接更新SQL
+//			查询父级部门的id并更新
+			String querySupId = "select * from hrmdepartment where outkey = ?";
+			RecordSet r_rs = new RecordSet();
+			r_rs.executeQuery(querySupId, department.getPARENTDEPARTMENDID());
+			String supDepId1;
+			if (r_rs.next()) {
+				supDepId1 = r_rs.getString("id");
+				sysDep.put("supdepid", supDepId1);
+			}
+			sysDep.put("subcompanyid1", String.valueOf(finalSubcompanyid));
+			StringBuilder sysSetSql = this.builderSql(sysDep, 1).get("update");
+			StringBuilder defSetSql = this.builderSql(defDep, 1).get("update");
+//				添加更新默认值
+			Map<String, Object> sysMap = new HashMap<>();
+			sysMap.put("modified", this.getTime());
+			this.addDefaultUpdateSql(sysSetSql, sysMap);
+//				更新数据库
+			this.executeUpdateData(sysSetSql, "hrmdepartment", "id = " + Util.null2String(rs.getString("id")));
+			this.executeUpdateData(defSetSql, "hrmdepartmentdefined", "deptid = " + Util.null2String(rs.getString("id")));
+			successMark.put("code", "2");
+			successMark.put("msg", "更新部门" + department.getPARENTDEPARTMENDID() + "成功！");
+		} else {
+//				拼接插入SQL
+//				不存在部门信息
+			Map<String, StringBuilder> insertSysBuilderMap = this.builderSql(sysDep, 2);
+			StringBuilder sysInsertSqlField = insertSysBuilderMap.get("insertField");
+			StringBuilder sysInsertSqlValue = insertSysBuilderMap.get("insertValue");
+			Map<String, StringBuilder> insertDefBuilderMap = this.builderSql(defDep, 2);
+			StringBuilder defInsertSqlField = insertDefBuilderMap.get("insertField");
+			StringBuilder defInsertSqlValue = insertDefBuilderMap.get("insertValue");
+//				加入默认值
+			int finalSupDepId = supDepId;
+
+			Map<String, Object> map = new HashMap<String, Object>() {{
+				//			外部系统主键
+				put("outkey", Util.getIntValue(String.valueOf(department.getDEPARTMENTID()), 0));
+				//			所属分部id
+				put("subcompanyid1", finalSubcompanyid);
+				//			上级部门id
+				put("supdepid", finalSupDepId);
+				put("departmentmark", Util.null2String(department.getDEPARTMENTNAME()));
+				put("departmentname", Util.null2String(department.getDEPARTMENTNAME()));
+			}};
+			//			创建时间
+			map.put("created", this.getTime());
+			this.addDefaultInsertSql(sysInsertSqlField, sysInsertSqlValue, map);
+			int departmentId = 0;
+			this.executeInsertData(sysInsertSqlField, sysInsertSqlValue, "hrmdepartment");
+//			查询刚添加的部门id
+			try {
+				rs.executeQuery("select * from hrmdepartment where outkey = ?", Util.null2String(String.valueOf(department.getDEPARTMENTID())));
+			} catch (Exception e) {
+				writeErrorLog("select hrmdepartment error in 112 line, sql: select * from hrmdepartment where outkey = " + Util.null2String(String.valueOf(department.getDEPARTMENTID())));
+				writeErrorLog("error info:" + e.getMessage() + "\n");
+				successMark.put("code", "0");
+				successMark.put("msg", "查询分部信息出错，错误SQL：" + "select * from hrmdepartment where outkey = " + Util.null2String(String.valueOf(department.getDEPARTMENTID())));
+                return successMark;
+			}
+			rs.next();
+			departmentId = Util.getIntValue(Util.null2String(rs.getString("id")));
+//			设置默认值
+			if (defInsertSqlField.lastIndexOf(",") != -1 && defInsertSqlValue.lastIndexOf(",") != -1) {
+				this.addDefaultInsertSql(defInsertSqlField, defInsertSqlValue, "deptid", departmentId);
+			}
+			this.executeInsertData(defInsertSqlField, defInsertSqlValue, "hrmdepartmentdefined");
+			successMark.put("code", "1");
+			successMark.put("msg", "插入部门" + department.getPARENTDEPARTMENDID() + "成功！");
+		}
+		return successMark;
+//		writeErrorLog( "---------------"+className+" asyncDepartment  end --------------------");
+	}
+
+
+	public Map<String, String> asyncPosition(Position position) {
+//		writeErrorLog( "---------------"+className+" asyncPosition  Begin --------------------");
+//		 职位同步的SQL
+		RecordSet rs = new RecordSet();
+		Map<String, String> successMark = new HashMap<>();
+		try {
+			rs.executeQuery("select id from hrmjobtitles where outkey = ?", Util.getIntValues(String.valueOf(position.getJOBCODEID())));
+		} catch (Exception e) {
+			writeErrorLog("select htmjobtitles error in 131 line, sql: select id from hrmjobtitles where outkey = " + Util.getIntValues(String.valueOf(position.getJOBCODEID())));
+			writeErrorLog("error info:" + e.getMessage() + "\n");
+			successMark.put("code", "0");
+			successMark.put("msg", "查询职位错误，错误SQL：" + "select id from hrmjobtitles where outkey = " + Util.getIntValues(String.valueOf(position.getJOBCODEID())));
+            return successMark;
+		}
+//		判断该职位是否存在于系统中
+		if (rs.next()) {
+//			存在该条职位，需要进行职位的更新
+			String updateSqlStr = MessageFormat.format("update hrmjobtitles set " +
+							"modified = ''{0}'', jobtitlemark = ''{1}'', jobtitlename = ''{2}'', cmsSupJobId = ''{3}'', " +
+							"jobtitlecode = ''{4}'' where outkey = ''{5}''",
+					this.getTime(), Util.null2String(position.getJOBFUNCTION()), Util.null2String(position.getJOBFUNCTION()),
+					Util.null2String(String.valueOf(position.getSUPERIORJOBCODEID())), Util.null2String(position.getJOBCODE()), Util.null2String(String.valueOf(position.getJOBCODEID())));
+			//			id
+			try {
+				rs.executeUpdate(updateSqlStr);
+				successMark.put("code", "2");
+				successMark.put("msg", "更新职位" + position.getJOBCODEID() + "成功！");
+			} catch (Exception e) {
+				writeErrorLog(className, "update jobtitle error: " + updateSqlStr);
+				writeErrorLog("error info:" + e.getMessage() + "\n");
+				successMark.put("code", "0");
+				successMark.put("msg", "更新职位失败，错误SQL：" + updateSqlStr);
+                return successMark;
+			}
+		} else {
+
+//			不存在该条职位
+//			判断该职位是否属于根职位（是否存在上级职位id），如果属于根职位，则需要进行创建工作类型（插入数据到工作类型表中）
+//              并且创建职责数据，然后将数据插入到职位表中
+//			如果不是根职位，则需要判断其上级职位是否属于根职位，如果上级职位属于根职位，则需要插入职责表，同时工作类型为父级岗位的
+//			    工作类型，然后将数据插入到职位表中，职责类型为刚插入的职责数据id。如果上级职位不属于根职位，则插入数据到职位表中，
+//			    职责id为父级职位的职责id
+
+//			判断是否是根职位
+			if (position.getSUPERIORJOBCODEID() == 0) {
+//              是根职位,插入数据到工作类型表中hrmjobgroups
+				int groupId = this.insertJobGroup(position);
+//				插入数据到工作职责表中，并且绑定工作类型id为刚插入的数据的id
+				int activityId = this.insertJobActive(position, groupId);
+//				将职位插入到职位表中，职责id为刚插入数据的id
+				this.insertJobTitle(position, rs, activityId, 0);
+			} else {
+//				不是根职位，判断父职位是否属于根职位
+				try {
+					rs.executeQuery("select * from hrmjobtitles where outkey = ?", Util.getIntValues(String.valueOf(position.getSUPERIORJOBCODEID())));
+				} catch (Exception e) {
+					writeErrorLog("select htmjobtitles error in 166 line, sql: select * from hrmjobtitles where outkey = " + Util.getIntValues(String.valueOf(position.getJOBCODEID())));
+					writeErrorLog("error info:" + e.getMessage() + "\n");
+					successMark.put("code", "0");
+					successMark.put("msg", "查询父级职位失败，错误SQL：" + "select * from hrmjobtitles where outkey = " + Util.getIntValues(String.valueOf(position.getSUPERIORJOBCODEID())));
+				}
+				if (rs.next()) {
+					if (Util.getIntValue(Util.null2String(rs.getString("cmssupjobid"))) == 0) {
+//					    父职位属于根职位，获取父级职位的工作类型id
+						try {
+							rs.executeQuery("select * from hrmjobactivities where id = ?", Util.getIntValue(Util.null2String(rs.getString("jobactivityid"))));
+						} catch (Exception e) {
+							writeErrorLog("select hrmjobactivities error in 175 line, sql: select * from hrmjobactivities where id = " + Util.getIntValue(Util.null2String(rs.getString("jobactivityid"))));
+							writeErrorLog("error info:" + e.getMessage() + "\n");
+							successMark.put("code", "0");
+							successMark.put("msg", "查询父职位工作类型错误，错误SQL：" + "select * from hrmjobactivities where id = " + Util.getIntValue(Util.null2String(rs.getString("jobactivityid"))));
+						}
+						rs.next();
+						int groupId = Util.getIntValue(Util.null2String(rs.getString("jobgroupid")));
+//					    将数据插入到工作职责表中
+						int activityId = this.insertJobActive(position, groupId);
+//						将数据插入到职位表中
+						this.insertJobTitle(position, rs, activityId, Util.getIntValue(String.valueOf(position.getSUPERIORJOBCODEID())));
+					} else {
+//						父级职位不属于根职位，获取父级职责id并将数据插入到职位表中
+						int activityId = Util.getIntValue(Util.null2String(rs.getString("jobactivityid")));
+//						将数据插入到职位表中
+						this.insertJobTitle(position, rs, activityId, Util.getIntValue(String.valueOf(position.getSUPERIORJOBCODEID())));
+					}
+				}
+			}
+			successMark.put("code", "1");
+			successMark.put("msg", "插入" + position.getJOBCODEID() + "成功！");
+		}
+		return successMark;
+//		writeErrorLog( "---------------"+className+" asyncPosition  end --------------------");
+	}
+
+
+	public Map<String, String> asyncEmployee(Employee employee) {
+//		writeErrorLog( "---------------"+className+" asyncEmployee  Begin --------------------");
+//      直接上级
+		int managerId = 0;
+		String managerStr = "";
+		Map<String, String> successMark = new HashMap<>();
+//      安全级别
+		String seclevel = getSystemParamValue("HR_SECLEVEL");
+		if (seclevel == null || "".equals(seclevel)) {
+			seclevel = "0";
+		}
+		String password = getSystemParamValue("PASSWORD");
+		if (StringUtils.isNullOrEmpty(password)) {
+			password = employee.getUSERCODE();
+		}
+//		人员id
+		int hrmid = 0;
+//		 不知道是否需要判断组织编码是否存在
+		GetModelValue<Employee> getModelValue = new GetModelValue<>();
+		RecordSet rs = new RecordSet();
+//		查询配置表信息
+		Map<String, Map<String, String>> configTableInfo = this.queryConfigTableInfo(employee, getModelValue, "m.api_field_type = 1");
+		Map<String, String> sysDep = configTableInfo.get("sys");
+		Map<String, String> defDep = configTableInfo.get("def");
+//		获取自定义字段的scopeid
+		rs.executeQuery("select * from cus_formfield");
+
+//		查询人员的职责表，获取分部id，和直接上级id
+		Map<String, Object> subIdAndManagerIdMap = this.getSubIdAndManagerId(employee);
+		managerId = Util.getIntValue(String.valueOf(subIdAndManagerIdMap.get("managerId")), 0);
+		String departmentid = subIdAndManagerIdMap.get("departmentId").toString();
+		String subcompanyid1 = subIdAndManagerIdMap.get("subCompanyId").toString();
+		String today = TimeUtil.getCurrentDateString();
+		//	    根据outkey,询是否存在该人员
+		String query = "select id from hrmresource where outkey = ?";
+        try {
+			rs.executeQuery(query, Util.null2String(String.valueOf(employee.getUserID())));
+		} catch (Exception e) {
+			writeErrorLog("select hrmresource error: " + query + Util.null2String(String.valueOf(employee.getUserID())));
+			writeErrorLog("error info:" + e.getMessage() + "\n");
+			successMark.put("code", "0");
+			successMark.put("msg", "查询出错，错误SQL：" + "select hrmresource error: " + query + Util.null2String(String.valueOf(employee.getUserID())));
+            return successMark;
+		}
+		if (rs.next()) {
+//			存在人员信息，获取到人员id
+			hrmid = Util.getIntValue(rs.getString("id"));
+//			更新人员信息,拼接更新SQL
+			StringBuilder sysSetSql = this.builderSql(sysDep, 1).get("update");
+//			StringBuilder defSetSql = this.builderSql(defDep, employee, getModelValue,1).get("update");
+			Map<String, Object> sysMap = new HashMap<String, Object>() {{
+				put("departmentid", subIdAndManagerIdMap.get("departmentId"));
+				put("subcompanyid1", subIdAndManagerIdMap.get("subCompanyId"));
+			}};
+			//			查询该人员的职位信息
+//				查询到当前职位的id
+			String jobId = String.valueOf(subIdAndManagerIdMap.get("jobtitleId"));
+			sysMap.put("jobtitle", jobId);
+			if (null != subIdAndManagerIdMap.get("managerstr")) {
+				managerStr = subIdAndManagerIdMap.get("managerstr").toString();
+				if (!managerStr.startsWith(",")) {
+					managerStr = "," + managerStr;
+				}
+				if (!managerStr.endsWith(",")) {
+					managerStr = managerStr + ",";
+				}
+				managerStr = managerStr + managerId + ",";
+				sysMap.put("managerstr", managerStr);
+				sysMap.put("managerid", managerId);
+			}
+
+			sysMap.put("managerid", managerId);
+			sysMap.put("modified", this.getTime());
+
+			this.addDefaultUpdateSql(sysSetSql, sysMap);
+
+			this.executeUpdateData(sysSetSql, "hrmresource", "id = '" + hrmid + "'");
+//			 待完善更新自定义人员信息表
+//			判断该字段的scopeid
+			for (Map.Entry<String, String> entry : defDep.entrySet()) {
+//				判断该字段属于的scopeid
+				String fieldId = entry.getKey().replace("field", "");
+				try {
+					rs.executeQuery("select * from cus_formfield where fieldid = '" + Util.null2String(fieldId) + "' and scope = 'HrmCustomFieldByInfoType'");
+				} catch (Exception e) {
+					writeErrorLog("select cus_fromfield error: select * from cus_formfield where fieldid = '" + Util.null2String(fieldId) + "' and scope = 'HrmCustomFieldByInfoType'");
+					writeErrorLog("error info:" + e.getMessage() + "\n");
+				}
+				rs.next();
+				String scopeid = Util.null2String(rs.getString("scopeid"));
+//				 判断是否存在该信息，如果存在着更新，不存在着插入
+				rs.executeQuery("select id from cus_fielddata where id = '" + hrmid + "' and scope = 'HrmCustomFieldByInfoType' and scopeid = '" + scopeid + "'");
+				if (rs.next()) {
+//					存在该信息,更新指定信息
+					try {
+						rs.executeUpdate("update cus_fielddata set " + entry.getKey() + " = '" + entry.getValue() + "' where scopeid = " + scopeid + " and id = " + hrmid);
+					} catch (Exception e) {
+						writeErrorLog(className, "update error, sql:  update cus_fielddata set " + entry.getKey() + " = " + entry.getValue() + " where scopeid = \" + scopeid +\" and id = \" + hrmid");
+						writeErrorLog("error info:" + e.getMessage() + "\n");
+					}
+
+				} else {
+//					不存在该信息，插入
+					try {
+						rs.executeUpdate("insert into cus_fielddata (id,scopeid,scope," + entry.getKey() + ") values ('" + hrmid + "','" + scopeid + "','HrmCustomFieldByInfoType','" + entry.getValue() + "')");
+					} catch (Exception e) {
+						writeErrorLog(className, "insert into error, sql : \"insert into cus_fielddata (id,scopeid,scope,\" + entry.getKey() + \") values ('\" + hrmid + \"','\" + scopeid + \"','HrmCustomFieldByInfoType','\" + entry.getValue() + \"')\"");
+						writeErrorLog("error info:" + e.getMessage() + "\n");
+					}
+				}
+//
+			}
+//			this.executeUpdateData(defSetSql,"cus_fielddata","");
+			successMark.put("code", "2");
+			successMark.put("msg", "更新成功！");
+		} else {
+//			不存在人员信息需要将人员信息插入到数据库中
+//			获取当前人员表中的最大id
+			rs.executeProc("HrmResourceMaxId_Get", "");
+			rs.next();
+			hrmid = rs.getInt(1);
+			if (managerId == 0) {
+				managerId = hrmid;
+			}
+
+//				加入默认值
+			String finalSeclevel = seclevel;
+			Map<String, Object> map = new HashMap<String, Object>() {{
+				//	外部系统主键
+				put("outkey", Util.null2String(String.valueOf(employee.getUserID())));
+				//	所属分部id
+				put("subcompanyid1", subIdAndManagerIdMap.get("subCompanyId"));
+				//	部门id
+				put("departmentid", subIdAndManagerIdMap.get("departmentId"));
+//				安全级别
+				put("seclevel", finalSeclevel);
+//				员工编号
+				put("workcode", Util.null2String(employee.getUSERCODE()));
+//				姓名
+				put("lastname", Util.null2String(employee.getPreferred_Name()) + "/" + Util.null2String(employee.getUSERNAMECN()));
+
+//				岗位id
+				put("jobtitle", subIdAndManagerIdMap.get("jobtitleId"));
+//				状态
+				put("status", 1);
+//				电话
+				put("telephone", Util.null2String(employee.getTEL()));
+//				移动电话
+				put("mobile", Util.null2String(employee.getMOBILENO()));
+//				电子邮件
+				put("email", Util.null2String(employee.getEMAIL()));
+
+			}};
+			if (null != subIdAndManagerIdMap.get("managerstr")) {
+				managerStr = subIdAndManagerIdMap.get("managerstr").toString();
+				if (!managerStr.startsWith(",")) {
+					managerStr = "," + managerStr;
+				}
+				if (!managerStr.endsWith(",")) {
+					managerStr = managerStr + ",";
+				}
+				managerStr = managerStr + managerId + ",";
+				map.put("managerstr", managerStr);
+			}
+//			userCode不为null的人员
+			if (!StringUtils.isNullOrEmpty(employee.getUSERCODE())) {
+//				登录名
+                if(!map.containsKey("loginid")){
+                    map.put("loginid", employee.getUSERCODE());
+                }
+//			密码
+				map.put("password", EncryptHelper.encodeMd5(password).toUpperCase());
+			} else {
+				writeErrorLog("the employee hove not usercode: " + employee);
+			}
+
+//			id
+			map.put("id", hrmid);
+//			直接上级
+			map.put("managerid", managerId);
+			//			创建时间
+			map.put("created", this.getTime());
+            for (Map.Entry<String, Object> entry : map.entrySet()) {
+                sysDep.remove(entry.getKey());
+            }
+//			拼接插入SQL
+            Map<String, StringBuilder> insertSysBuilderMap = this.builderSql(sysDep, 2);
+            StringBuilder sysInsertSqlField = insertSysBuilderMap.get("insertField");
+            StringBuilder sysInsertSqlValue = insertSysBuilderMap.get("insertValue");
+//			拼接默认值SQL
+			this.addDefaultInsertSql(sysInsertSqlField, sysInsertSqlValue, map);
+			//			插入数据
+            writeErrorLog("人员数据：" + employee.toString());
+			this.executeInsertData(sysInsertSqlField, sysInsertSqlValue, "hrmresource");
+			try {
+				if (departmentid == null || "".equals(departmentid)) {
+					departmentid = "0";
+				}
+				if (subcompanyid1 == null || "".equals(subcompanyid1)) {
+					subcompanyid1 = "0";
+				}
+				//共享信息
+				char separator = Util.getSeparator();
+				String p_para = "" + hrmid + separator + departmentid + separator + subcompanyid1 + separator + managerId + separator + seclevel + separator + managerStr +
+						separator + "0" + separator + "0" + separator + "0" + separator + "0" + separator + "0" + separator + "0";
+//				this.writeDebuggerLog(p_para);
+				rs.executeProc("HrmResourceShare", p_para);
+				rs.executeProc("HrmResource_CreateInfo", "" + hrmid + separator + "1" + separator + today + separator + "1" + separator + today);
+				//触发器
+				String para = "" + hrmid + separator + managerId + separator + departmentid + separator + subcompanyid1 + separator + "0" + separator + managerStr;
+				rs.executeProc("HrmResource_Trigger_Insert", para);
+				//入职维护状态
+				rs.executeUpdate("insert into HrmInfoStatus (itemid,hrmid,status) values(1," + hrmid + ",1)");
+
+				rs.executeUpdate("insert into HrmInfoStatus (itemid,hrmid) values(2," + hrmid + ")");
+
+				rs.executeUpdate("insert into HrmInfoStatus (itemid,hrmid) values(3," + hrmid + ")");
+
+				rs.executeUpdate("insert into HrmInfoStatus (itemid,hrmid) values(10," + hrmid + ")");
+			} catch (Exception e) {
+				writeErrorLog("error info:" + e.getMessage() + "\n");
+			}
+//			插入自定义信息表
+			for (Map.Entry<String, String> entry : defDep.entrySet()) {
+//				判断该字段属于的scopeid
+				String fieldId = entry.getKey().replace("field", "");
+				try {
+					rs.executeQuery("select * from cus_formfield where fieldid = '" + Util.null2String(fieldId) + "' and scope = 'HrmCustomFieldByInfoType'");
+				} catch (Exception e) {
+					writeErrorLog("select cus_fromfield error: select * from cus_formfield where fieldid = '" + Util.null2String(fieldId) + "' and scope = 'HrmCustomFieldByInfoType'");
+					writeErrorLog("error info:" + e.getMessage() + "\n");
+				}
+				rs.next();
+				String scopeid = rs.getString("scopeid");
+//				插入数据表中指定字段信息
+				rs.executeUpdate("insert into cus_fielddata (id,scopeid,scope," + entry.getKey() + ") values ('" + hrmid + "','" + scopeid + "','HrmCustomFieldByInfoType','" + entry.getValue() + "')");
+			}
+			successMark.put("code", "1");
+			successMark.put("msg", "插入成功！");
+		}
+		return successMark;
+//		writeErrorLog( "---------------"+className+" asyncEmployee  end --------------------");
+	}
+
+	private void addDefaultUpdateSql(StringBuilder sqlBuilder, Map<String, Object> map) {
+		for (Map.Entry<String, Object> entry : map.entrySet()) {
+			sqlBuilder.append(entry.getKey());
+			sqlBuilder.append(" = ");
+			sqlBuilder.append("'");
+			sqlBuilder.append(entry.getValue());
+			sqlBuilder.append("',");
+		}
+	}
+
+	/**
+	 * 获取直接上级
+	 * @param employee 人员对象
+	 * @return 获取人员直接上级，分部id和部门id
+	 */
+	private Map<String, Object> getSubIdAndManagerId(Employee employee) {
+		Map<String, Object> map = new HashMap<>();
+		RecordSet rs = new RecordSet();
+//		通过部门id查询该员工的分部id
+		String querySubIdAndId = "select id, subcompanyid1 from hrmdepartment where outkey = ?";
+		try {
+			rs.executeQuery(querySubIdAndId, Util.null2String(String.valueOf(employee.getDEPARTMENTID())));
+		} catch (Exception e) {
+			writeErrorLog("select hrmdepartment error: " + querySubIdAndId + Util.null2String(String.valueOf(employee.getDEPARTMENTID())));
+			writeErrorLog("error info:" + e.getMessage() + "\n");
+		}
+		rs.next();
+//		该员工所属部门id
+		String departmentId = Util.null2String(rs.getString("id"));
+//		该员工所属分部id
+		String subCompanyId = Util.null2String(rs.getString("subcompanyid1"));
+		map.put("subCompanyId", subCompanyId);
+		map.put("departmentId", departmentId);
+//		查询该员工的直接上级id => 查询该员工的职位的cmssupjobid对应的职位
+//		由于需要判断该员工的职位是否存在上级职位，所以不能一条SQL搞定，首先需要查询该员工的职位的上级职位id，也就是判断是否存在上级职位
+		String queryJobTitleId = "select id,cmssupjobid from hrmjobtitles where outkey = ?";
+//		 不知道需不需要在维护一下职位表中的所属部门id，如果需要的haunt将部门id更新进去就可以
+//		查询当前人员对应的职位id以及cms中的上级职位id
+		try {
+			rs.executeQuery(queryJobTitleId, Util.null2String(String.valueOf(employee.getJOBCODEID())));
+		} catch (Exception e) {
+			writeErrorLog("select htmjobtitles error: " + queryJobTitleId + Util.null2String(String.valueOf(employee.getJOBCODEID())));
+			writeErrorLog("error info:" + e.getMessage() + "\n");
+		}
+		rs.next();
+//	    获取职位id
+		map.put("jobtitleId", Util.null2String(rs.getString("id")));
+//		获取cms中的上级职位id，如果存在则查询上级职位的id，如果不存在则表示该人员表示没有直接上级
+		int cmsSupId = Util.getIntValue(Util.null2String(rs.getString("cmssupjobid")), 0);
+/*		if (cmsSupId != 0) {
+//			表示该职位拥有上级职位，需要查询上级职位对应的人员
+			String queryManagerId = "select h.id,h.managerstr from hrmresource as h join hrmjobtitles as j on h.jobtitle = j.id where j.outkey = ?";
+			try {
+				rs.executeQuery(queryManagerId, Util.null2String(String.valueOf(cmsSupId)));
+			} catch (Exception e) {
+				writeErrorLog("select hrmresource error: " + queryManagerId + Util.null2String(String.valueOf(cmsSupId)));
+				writeErrorLog("error info:" + e.getMessage() + "\n");
+			}
+			if (rs.next()) {
+				map.put("managerId", Util.getIntValue(Util.null2String(rs.getString("id"))));
+				map.put("managerstr", Util.null2String(rs.getString("managerstr")));
+			} else {
+				map.put("managerId", 0);
+			}
+		} else {
+//			如果该职位没有上级职位，则将该员工的直接上级id设置为0
+			map.put("managerId", 0);
+		}*/
+		while (cmsSupId >= 0) {
+//			表示该职位拥有上级职位，需要查询上级职位对应的人员
+//            新增 2022 04 22 根据日期排序
+			String queryManagerId = "select h.id,h.managerstr from hrmresource as h join hrmjobtitles as j on h.jobtitle = j.id where j.outkey = ? and h.status in (0,1,2) ORDER BY h.id DESC";
+			try {
+				rs.executeQuery(queryManagerId, Util.null2String(String.valueOf(cmsSupId)));
+			} catch (Exception e) {
+				writeErrorLog("select hrmresource error: " + queryManagerId + Util.null2String(String.valueOf(cmsSupId)));
+				writeErrorLog("error info:" + e.getMessage() + "\n");
+			}
+			if (rs.next()) {
+				map.put("managerId", Util.getIntValue(Util.null2String(rs.getString("id"))));
+				map.put("managerstr", Util.null2String(rs.getString("managerstr")));
+				break;
+			} else {
+				if (cmsSupId == 0) {
+					break;
+				}
+				queryJobTitleId = "select id,cmssupjobid from hrmjobtitles where outkey = ?";
+//		查询当前人员对应的职位id以及cms中的上级职位id
+				try {
+					rs.executeQuery(queryJobTitleId, Util.null2String(String.valueOf(cmsSupId)));
+				} catch (Exception e) {
+					writeErrorLog("select htmjobtitles error: " + queryJobTitleId + Util.null2String(String.valueOf(employee.getJOBCODEID())));
+					writeErrorLog("error info:" + e.getMessage() + "\n");
+				}
+				rs.next();
+				cmsSupId = Util.getIntValue(Util.null2String(rs.getString("cmssupjobid")));
+				map.put("managerId", 0);
+			}
+		}
+		/*else {
+//			如果该职位没有上级职位，则将该员工的直接上级id设置为0
+			map.put("managerId", 0);
+		}*/
+		return map;
+	}
+
+	/**
+	 * 执行插入SQL
+	 * @param insertFieldBuilder 需要插入的的字段
+	 * @param insertValueBuilder 需要插入的字段对应的值
+	 * @param table 表名
+	 */
+	private void executeInsertData(StringBuilder insertFieldBuilder, StringBuilder insertValueBuilder, String table) {
+		RecordSet rs = new RecordSet();
+		if (insertFieldBuilder.lastIndexOf(",") != -1 && insertValueBuilder.lastIndexOf(",") != -1) {
+//				    去除最后一个逗号
+			String insertFiledStr = this.removeLastComma(insertFieldBuilder);
+			String insertValueStr = this.removeLastComma(insertValueBuilder);
+			String insertSysSql = "insert into " + table + " (" + insertFiledStr + ") values (" + insertValueStr + ")";
+			try {
+                rs.executeUpdate(insertSysSql);
+			} catch (Exception e) {
+				writeErrorLog("insert " + table + " error: " + insertSysSql);
+				writeErrorLog("error info:" + e.getMessage() + "\n");
+			}
+		}
+        writeWarningLog("不满足条件: " + insertFieldBuilder + ", " + insertValueBuilder);
+	}
+
+	/**
+	 * 执行更新语句
+	 * @param updateSqlBuilder 更新SQL的字符串
+	 * @param table 表名
+	 * @param conditions 条件
+	 */
+	private void executeUpdateData(StringBuilder updateSqlBuilder, String table, String conditions) {
+		RecordSet rs = new RecordSet();
+		if (updateSqlBuilder.lastIndexOf(",") != -1) {
+			String updateSqlBuilderStr = updateSqlBuilder.substring(0, updateSqlBuilder.lastIndexOf(","));
+			String updateSql = "update " + table + " set " + updateSqlBuilderStr + " where " + conditions;
+			try {
+				rs.executeUpdate(updateSql);
+			} catch (Exception e) {
+				writeErrorLog("update " + table + " error: " + updateSql);
+				writeErrorLog("error info:" + e.getMessage() + "\n");
+			}
+		}
+	}
+
+	private String removeLastComma(StringBuilder sqlBuilder) {
+		return sqlBuilder.substring(0, sqlBuilder.lastIndexOf(","));
+	}
+
+	private void addDefaultInsertSql(StringBuilder filedBuilder, StringBuilder valueBuilder, String filedName, Object value) {
+		filedBuilder.append(filedName);
+		filedBuilder.append(",");
+		valueBuilder.append("'");
+		valueBuilder.append(value);
+		valueBuilder.append("',");
+	}
+
+	private void addDefaultInsertSql(StringBuilder filedBuilder, StringBuilder valueBuilder, Map<String, Object> map) {
+		for (Map.Entry<String, Object> entry : map.entrySet()) {
+			filedBuilder.append(entry.getKey());
+			filedBuilder.append(",");
+			valueBuilder.append("'");
+			valueBuilder.append(entry.getValue());
+			valueBuilder.append("',");
+		}
+	}
+
+	/**
+	 * 分部信息处理
+	 * @param department 部门
+	 * @return
+	 */
+	private Map<String, Integer> subCompanyHandler(Department department) {
+//			企业（总部）id
+		int companyid = 1;
+//			上级分部id
+		int supsubcomid = 0;
+		int subCompanyId;
+		int subcompanyid1 = 0;
+		int supDepId = 0;
+		RecordSet rs = new RecordSet();
+
+
+		Map<String, Integer> map = new HashMap<>();
+//			查询部门与手动维护的分部信息，并进行同步
+		String subCompanySql = MessageFormat.format("select * from uf_subcompany where yjbmid = ''{0}''", String.valueOf(department.getDEPARTMENTID()));
+		if (rs.executeQuery(subCompanySql) && rs.next()) {
+			String subCompanyName = Util.null2String(rs.getString("fbmmc"));
+			String subCompanyDisc = Util.null2String(rs.getString("fbmms"));
+			subCompanyId = Util.getIntValue(Util.null2String(rs.getString("fbmid")));
+//				查询分部表，是否存在该分部
+//				rs.executeQuery("select * from hrmsubcompany where id = ?", subCompanyId);
+			try {
+				rs.executeQuery("select * from hrmsubcompany where outkey = ?", Util.getIntValue(String.valueOf(subCompanyId)));
+			} catch (Exception e) {
+				writeErrorLog("select hrmsubcompany error: select * from hrmsubcompany where outkey = " + Util.getIntValue(String.valueOf(subCompanyId)));
+				writeErrorLog("error info:" + e.getMessage() + "\n");
+			}
+			if (rs.next()) {
+//					已经存在分部信息,保存部门对应分部id
+				subcompanyid1 = Util.getIntValue(Util.null2String(rs.getString("id")));
+//					设置上级部门id为0
+				supDepId = 0;
+//					更新分部信息
+				String updateSql = "update hrmsubcompany set " +
+						"subcompanyname = '" + subCompanyName +
+						"', subcompanydesc = '" + subCompanyDisc +
+						"', modified = '" + this.getTime() +
+						"' where id = " + subcompanyid1;
+				rs.executeUpdate(updateSql);
+
+			} else {
+//					不存在分部信息
+				String insertSql = "insert into hrmsubcompany " +
+						"(outkey,companyid,subcompanyname,subcompanydesc,created,supsubcomid) values ('"
+						+ subCompanyId + "', '" + companyid + "', '" + subCompanyName + "','" + subCompanyDisc + "','"
+						+ this.getTime() + "','" + supsubcomid + "')";
+				rs.executeUpdate(insertSql);
+//					查询刚插入的分部id
+				try {
+					rs.executeQuery("select * from hrmsubcompany where outkey = ?", subCompanyId);
+				} catch (Exception e) {
+					writeErrorLog("select hrmsubcompany error: select * from hrmsubcompany where outkey = " + subCompanyId);
+					writeErrorLog("error info:" + e.getMessage() + "\n");
+				}
+				rs.next();
+				subcompanyid1 = Util.getIntValue(Util.null2String(rs.getString("id")));
+			}
+		}
+		map.put("subcompanyid1", subcompanyid1);
+		map.put("supDepId", supDepId);
+		return map;
+	}
+
+	private Map<String, StringBuilder> builderSql(Map<String, String> filedAndValue, int type) {
+		StringBuilder sql = new StringBuilder();
+		Map<String, StringBuilder> map = new HashMap<>();
+		if (type == 1) {
+//			拼接更新SQL
+			for (Map.Entry<String, String> entry : filedAndValue.entrySet()) {
+				sql.append(entry.getKey()).append(" = '");
+				sql.append(entry.getValue()).append("',");
+			}
+			map.put("update", sql);
+			return map;
+		}
+		if (type == 2) {
+//			拼接插入SQL
+			StringBuilder sysInsertSqlField = new StringBuilder();
+			StringBuilder sysInsertSqlValue = new StringBuilder();
+			for (Map.Entry<String, String> entry : filedAndValue.entrySet()) {
+				sysInsertSqlField.append(entry.getKey());
+				sysInsertSqlField.append(",");
+				sysInsertSqlValue.append("'");
+				sysInsertSqlValue.append(entry.getValue());
+				sysInsertSqlValue.append("',");
+			}
+			map.put("insertField", sysInsertSqlField);
+			map.put("insertValue", sysInsertSqlValue);
+			return map;
+		}
+		return map;
+	}
+
+	private int insertJobGroup(Position position) {
+		RecordSet rs = new RecordSet();
+		String insertJobGroups = MessageFormat.format("insert into hrmjobgroups (" +
+						"jobgroupname,jobgroupremark,created,outkey) values (" +
+						"''{0}'',''{1}'',''{2}'',''{3}'')",
+				position.getJOBFUNCTION(), position.getJOBFUNCTION(), this.getTime(), String.valueOf(position.getJOBCODEID()));
+
+		try {
+			rs.executeUpdate(insertJobGroups);
+		} catch (Exception e) {
+			writeErrorLog("insert hrmjobgroups error: " + insertJobGroups);
+			writeErrorLog("error info:" + e.getMessage() + "\n");
+		}
+		try {
+			rs.executeQuery("select * from hrmjobgroups where outkey = ?", Util.getIntValue(String.valueOf(position.getJOBCODEID())));
+		} catch (Exception e) {
+			writeErrorLog("select hrmjobgroups error: select * from hrmjobgroups where outkey = " + Util.getIntValue(String.valueOf(position.getJOBCODEID())));
+			writeErrorLog("error info:" + e.getMessage() + "\n");
+		}
+		rs.next();
+		return Util.getIntValue(Util.null2String(rs.getString("id")));
+	}
+
+	private int insertJobActive(Position position, int groupId) {
+		RecordSet rs = new RecordSet();
+		String insertJobActive = MessageFormat.format("insert into hrmjobactivities (" +
+						"jobactivitymark,jobactivityname,jobgroupid,created,outkey) values (" +
+						"''{0}'',''{1}'',''{2}'',''{3}'',''{4}'')",
+				position.getJOBFUNCTION(), position.getJOBFUNCTION(), String.valueOf(groupId), this.getTime(), String.valueOf(position.getJOBCODEID()));
+
+		try {
+			rs.executeUpdate(insertJobActive);
+		} catch (Exception e) {
+			writeErrorLog("insert hrmjobactivities error: " + insertJobActive);
+			writeErrorLog("error info:" + e.getMessage() + "\n");
+		}
+
+		try {
+			rs.executeQuery("select * from hrmjobactivities where outkey = ?", Util.getIntValue(String.valueOf(position.getJOBCODEID())));
+		} catch (Exception e) {
+			writeErrorLog("select hrmjobactivities error: select * from hrmjobactivities where outkey = " + Util.getIntValue(String.valueOf(position.getJOBCODEID())));
+			writeErrorLog("error info:" + e.getMessage() + "\n");
+		}
+		rs.next();
+		return Util.getIntValue(Util.null2String(rs.getString("id")));
+	}
+
+	private void insertJobTitle(Position position, RecordSet rs, int activityId, int cmsSupJobId) {
+		String insertJobTitle = MessageFormat.format("insert into hrmjobtitles (" +
+						"jobtitlemark,jobtitlename,jobactivityid,jobtitlecode,created,outkey,cmssupjobid) values (" +
+						"''{0}'',''{1}'',''{2}'',''{3}'',''{4}'',''{5}'',''{6}'')",
+				position.getJOBFUNCTION(), position.getJOBFUNCTION(), String.valueOf(activityId), position.getJOBCODE(),
+				this.getTime(), String.valueOf(position.getJOBCODEID()), String.valueOf(cmsSupJobId));
+		try {
+			rs.executeUpdate(insertJobTitle);
+		} catch (Exception e) {
+			writeErrorLog("insert hrmjobtitles error: " + insertJobTitle);
+			writeErrorLog("error info:" + e.getMessage() + "\n");
+		}
+
+	}
+
+	/**
+	 * 查询配置表字段信息
+	 *
+	 * @return
+	 */
+	public Map<String, Map<String, String>> queryConfigTableInfo(Object obj, GetModelValue getModelValue, String conditions) {
+		RecordSet rs = new RecordSet();
+		Map<String, Map<String, String>> configResults = new HashMap<>();
+		try {
+			rs.executeQuery("select d.id,m.api_field_type,d.api_field,d.change_rules,d.custom_rules_value,d.ao_field,oa_field_type from uf_cms_async as m " +
+					"inner join uf_cms_async_dt1 as d on d.mainid = m.id where " + conditions);
+		} catch (Exception e) {
+			writeErrorLog("select configTable error: " + "select d.id,m.api_field_type,d.api_field,d.change_rules,d.custom_rules_value,d.ao_field,oa_field_type from uf_cms_async as m " +
+					"inner join uf_cms_async_dt1 as d on d.mainid = m.id where " + conditions);
+			writeErrorLog("error info:" + e.getMessage() + "\n");
+		}
+		Map<String, String> sysDep = new HashMap<>();
+		Map<String, String> defDep = new HashMap<>();
+//		 判断转换规则，如果是自定义SQL，则需要先执行SQL，如果是固定值，则需要进行直接赋值，如果是不转换，则按照默认走
+		while (rs.next()) {
+			String apiFieldType = Util.null2String(rs.getString("api_field_type"));
+			String oaFieldType = Util.null2String(rs.getString("oa_field_type"));
+			String apiField = Util.null2String(rs.getString("api_field"));
+			int changeRules = Util.getIntValue(Util.null2String(rs.getString("change_rules")));
+			if (changeRules == 0) {
+//				转换规则为不转换,获取api字段对应的值
+				try {
+					apiField = (String) getModelValue.getValueForString(obj, apiField);
+				} catch (NoSuchMethodException | InvocationTargetException | IllegalAccessException e) {
+					this.writeErrorLog(className, "changeRules error,args is: apiField[" + apiField + "],obj[" + obj + "]");
+					e.printStackTrace();
+				}
+			} else if (changeRules == 2) {
+//				转换规则为自定义SQL
+				String customRulesValue = Util.null2String(rs.getString("custom_rules_value"));
+				if (customRulesValue.contains("delete") || customRulesValue.contains("update") ||
+						customRulesValue.contains("exec") || customRulesValue.contains("drop") ||
+						customRulesValue.contains("truncate")) {
+//					sql 不包含delete，update，exec，drop，truncate等危险关键字
+				} else if (customRulesValue.contains("select")) {
+//					包含查询关键词
+					try {
+						rs.executeQuery(customRulesValue);
+					} catch (Exception e) {
+						writeErrorLog("execute custom sql error: " + customRulesValue);
+						writeErrorLog("error info:" + e.getMessage() + "\n");
+					}
+					rs.next();
+					apiField = Util.null2String(rs.getString(1));
+				}
+			} else {
+				apiField = Util.null2String(rs.getString("custom_rules_value"));
+			}
+//			如果属于系统字段
+			if ("0".equals(oaFieldType)) {
+				sysDep.put(Util.null2String(rs.getString("ao_field").replace(apiFieldType + oaFieldType, "")).toLowerCase(), apiField);
+			} else {
+//				属于自定义字段
+				defDep.put(Util.null2String(rs.getString("ao_field").replace(apiFieldType + oaFieldType, "")).toLowerCase(), apiField);
+			}
+		}
+		configResults.put("sys", sysDep);
+		configResults.put("def", defDep);
+		return configResults;
+	}
+
+	public String getTime() {
+		Date date = new Date();
+		SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS");
+		return formatter.format(date);
+	}
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_pcn/attachment_sort/AnnexSortAction.java b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/attachment_sort/AnnexSortAction.java
new file mode 100644
index 0000000..604fc60
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/attachment_sort/AnnexSortAction.java
@@ -0,0 +1,122 @@
+package weaver.aiyh_pcn.attachment_sort;
+
+import aiyh.utils.LabelHtmlUtils;
+import aiyh.utils.Util;
+import aiyh.utils.entity.LabelHtmlIndex;
+import lombok.Setter;
+import org.apache.commons.lang3.StringUtils;
+import weaver.interfaces.workflow.action.Action;
+import weaver.soa.workflow.request.RequestInfo;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * <p>附件按照规则排序</p>
+ * <p>create 2022/2/23 0023 10:31</p>
+ *
+ * @author EBU7-dev1-ayh
+ */
+
+@Setter
+public class AnnexSortAction implements Action {
+    /**
+     * 需要进行文件排序的字段
+     */
+    private String sortFields = "";
+    /**
+     * 获取排序数字的正则表达式
+     */
+    private String sortRegx = "[\\S\\s]*(annex|附件)[\\s\\-_(（]*(?<number>[0-9])+[\\s\\S]*";
+    /**
+     * 正则表达式中的数字分组
+     */
+    private String regxGroup = "number";
+    private SortFileMapper mapper = Util.getMapper(SortFileMapper.class);
+    /**
+     * 安全附件放置在最后一个，安全附件的名字
+     */
+    private String lastFileName = "";
+
+    @Override
+    public String execute(RequestInfo requestInfo) {
+        try {
+
+            String billTableName = requestInfo.getRequestManager().getBillTableName();
+            String requestId = requestInfo.getRequestid();
+            Map<String, String> fieldValue = mapper.selectDocIds(billTableName, sortFields.split(";"), requestId);
+            if (fieldValue == null) {
+                return Action.SUCCESS;
+            }
+            StringBuilder sb = new StringBuilder();
+            for (Map.Entry<String, String> entry : fieldValue.entrySet()) {
+                List<Integer> sortFileInfoList = this.getFileInfoByField(entry.getValue());
+                fieldValue.put(entry.getKey(), StringUtils.join(sortFileInfoList, ","));
+                sb.append(entry.getKey())
+                        .append("=")
+                        .append("#{")
+                        .append(entry.getKey())
+                        .append("}, ");
+            }
+            String updateField = sb.substring(0, sb.lastIndexOf(", "));
+            fieldValue.put("updateField", updateField);
+            fieldValue.put("tableName", billTableName);
+            fieldValue.put("requestId", requestId);
+            mapper.updateWorkflowData(fieldValue);
+        } catch (Exception e) {
+            Util.getLogger().error("排序失败，失败信息：" + Util.getErrString(e));
+            LabelHtmlUtils labelHtmlUtils = new LabelHtmlUtils("attachment_sort.AnnexSortAction");
+            LabelHtmlIndex sortErr = labelHtmlUtils.getLabelHtmlIndex("sortErr");
+            requestInfo.getRequestManager().setMessageid("1");
+            requestInfo.getRequestManager().setMessagecontent(Util.getHtmlLabelName(sortErr,requestInfo.getRequestManager().getUser()));
+            return Action.FAILURE_AND_CONTINUE;
+        }
+        return Action.SUCCESS;
+    }
+
+
+    /**
+     * 获取文件排序信息对象
+     *
+     * @param docIds 文件ids
+     * @return 文件排序后的数组
+     */
+    private List<Integer> getFileInfoByField(String docIds) {
+        List<SortFileInfo> sortFileInfos = mapper.selectFileInfo(docIds.split(","));
+        List<Integer> result = new ArrayList<>(sortFileInfos.size());
+        for (SortFileInfo sortFileInfo : sortFileInfos) {
+            Double sortNum = this.getSortNumByName(sortFileInfo.getFileName());
+            if (lastFileName.equals(sortFileInfo.getFileName())) {
+                sortFileInfo.setSortNum(9999.0);
+                continue;
+            }
+            sortFileInfo.setSortNum(sortNum);
+        }
+        Collections.sort(sortFileInfos);
+        for (SortFileInfo sortFileInfo : sortFileInfos) {
+            result.add(sortFileInfo.getDocId());
+        }
+        return result;
+    }
+
+    /**
+     * 通过文件名获取文件附件上的排序数字
+     *
+     * @param fileName 文件名
+     * @return 排序数字
+     */
+    private Double getSortNumByName(String fileName) {
+        Pattern compile = Pattern.compile(this.sortRegx);
+        Matcher matcher = compile.matcher(fileName.toLowerCase());
+        double sortNum = -1.0;
+        if (matcher.find()) {
+            sortNum = Double.parseDouble(matcher.group(this.regxGroup));
+        }
+        return sortNum;
+    }
+
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_pcn/attachment_sort/SortFileInfo.java b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/attachment_sort/SortFileInfo.java
new file mode 100644
index 0000000..c766efe
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/attachment_sort/SortFileInfo.java
@@ -0,0 +1,28 @@
+package weaver.aiyh_pcn.attachment_sort;
+
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * <p>附件排序工具类</p>
+ * <p>create 2022/2/23 0023 11:32</p>
+ *
+ * @author EBU7-dev1-ayh
+ */
+
+@Getter
+@Setter
+@ToString
+public class SortFileInfo implements Comparable<SortFileInfo>{
+    private Integer docId;
+    private String fileName;
+    private Double sortNum;
+
+    @Override
+    public int compareTo(@NotNull SortFileInfo o) {
+//        return this.getSortNum() - o.getSortNum();
+        return Double.compare(this.getSortNum(),o.getSortNum());
+    }
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_pcn/attachment_sort/SortFileMapper.java b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/attachment_sort/SortFileMapper.java
new file mode 100644
index 0000000..034518e
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/attachment_sort/SortFileMapper.java
@@ -0,0 +1,48 @@
+package weaver.aiyh_pcn.attachment_sort;
+
+import aiyh.utils.annotation.recordset.ParamMapper;
+import aiyh.utils.annotation.recordset.Select;
+import aiyh.utils.annotation.recordset.SqlMapper;
+import aiyh.utils.annotation.recordset.Update;
+
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>查询数据库信息</p>
+ * <p>create 2022/2/23 0023 11:54</p>
+ *
+ * @author EBU7-dev1-ayh
+ */
+
+@SqlMapper
+public interface SortFileMapper {
+
+
+    /**
+     * 查询字段新兴
+     * @param table 表名
+     * @param fields 字段名
+     * @param requestId 流程requestid
+     * @return 字段值
+     */
+    @Select("select $t{fields} from $t{table} where requestid = #{requestId}")
+    public Map<String,String> selectDocIds(@ParamMapper("table") String table,@ParamMapper("fields") String[] fields,
+                                           @ParamMapper("requestId") String requestId);
+
+    /**
+     * 查询文件名
+     * @param docIds 文件id
+     * @return 文件名
+     */
+    @Select("select docid doc_id,imagefilename file_name from docimagefile where docid in (${docIds})")
+    public List<SortFileInfo> selectFileInfo(@ParamMapper("docIds") String[] docIds);
+
+    /**
+     * 更新流程数据
+     * @param fieldValue 流程字段语句需要的值
+     */
+    @Update("update $t{tableName} set $t{updateField} where requestid = #{requestId}")
+    public void updateWorkflowData(Map<String, String> fieldValue);
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/action/CommonBatchSignAction.java b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/action/CommonBatchSignAction.java
new file mode 100644
index 0000000..9eff293
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/action/CommonBatchSignAction.java
@@ -0,0 +1,104 @@
+package weaver.aiyh_pcn.common_fadada.action;
+
+import aiyh.utils.Util;
+import aiyh.utils.action.SafeCusBaseAction;
+import aiyh.utils.annotation.ActionDesc;
+import aiyh.utils.annotation.ActionOptionalParam;
+import aiyh.utils.annotation.PrintParamMark;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.google.common.base.Strings;
+import lombok.Getter;
+import lombok.Setter;
+import org.jetbrains.annotations.Nullable;
+import weaver.aiyh_pcn.common_fadada.entity.FaResultEntity;
+import weaver.aiyh_pcn.common_fadada.service.BatchSignContractService;
+import weaver.hrm.User;
+import weaver.soa.workflow.request.RequestInfo;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <h1>批量本方签署</h1>
+ *
+ * <p>create: 2023-01-10 13:07</p>
+ *
+ * @author youHong.ai
+ */
+
+@Getter
+@Setter
+@ActionDesc(author = "youHong.ai", value = "法大大合同批量签署action")
+public class CommonBatchSignAction extends SafeCusBaseAction {
+
+    @PrintParamMark
+    @ActionOptionalParam(value = "", desc = "action后置处理方法！实现接口：aiyh.utils.action.SafeCusActionProcessInterface")
+    private String processAfter;
+
+    @PrintParamMark
+    @ActionOptionalParam(value = "", desc = "action前置处理方法！实现接口：aiyh.utils.action.SafeCusActionProcessInterface")
+    private String processBefore;
+
+
+    @PrintParamMark
+    @ActionOptionalParam(value = "false", desc = "是否自动提交流程")
+    private String submitAction = "false";
+
+    @PrintParamMark
+    @ActionOptionalParam(value = "true", desc = "是否失败后阻断流程")
+    private String block = "true";
+
+
+    @Override
+    public void doSubmit(String requestId, String billTable, int workflowId, User user, RequestInfo requestInfo) {
+        Object result = Util.executeActionProcess(processBefore, requestInfo);
+        BatchSignContractService service = new BatchSignContractService();
+        List<FaResultEntity> resultList = null;
+        try {
+            resultList = service.execute(String.valueOf(workflowId), requestId, user.getUID());
+        } catch (JsonProcessingException e) {
+            log.error("公共合同签署action异常,转换JSON异常");
+            if (!Strings.isNullOrEmpty(block) && Boolean.parseBoolean(block)) {
+                Util.actionFailException(requestInfo.getRequestManager(), "合同批量签署失败了，请练习系统管理员！");
+            }
+        } catch (Exception e) {
+            log.error("公共合同签署action异常", e);
+            if (!Strings.isNullOrEmpty(block) && Boolean.parseBoolean(block)) {
+                Util.actionFailException(requestInfo.getRequestManager(), "合同签署失败，请联系管理员！");
+            }
+        }
+        boolean failureAndContinue = verifyResult(resultList, String.valueOf(workflowId), requestId);
+        if (!Strings.isNullOrEmpty(block) && Boolean.parseBoolean(block)) {
+            if (!failureAndContinue) {
+                Util.actionFailException(requestInfo.getRequestManager(), "合同签署存在失败签署，请联系管理员！");
+            }
+
+        }
+        Util.executeActionProcess(processAfter, requestInfo);
+        if (Boolean.parseBoolean(submitAction)) {
+            this.submitWorkflow(requestId, user.getUID());
+        }
+    }
+
+    public void submitWorkflow(String requestId, Integer userId) {
+        Util.submitWorkflowThread(Integer.parseInt(requestId), userId, "批量签署自动提交流程！");
+    }
+
+
+    @Nullable
+    private boolean verifyResult(List<FaResultEntity> resultList, String workflowId, String requestId) {
+        for (FaResultEntity result : resultList) {
+            Map<String, Object> entityMap = null;
+            try {
+                entityMap = result.getResponeVo().getEntityMap();
+            } catch (JsonProcessingException e) {
+                e.printStackTrace();
+            }
+            String code = String.valueOf(entityMap.get("code"));
+            if (!"200".equals(code)) {
+                return false;
+            }
+        }
+        return true;
+    }
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/action/CommonContractRevocationAction.java b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/action/CommonContractRevocationAction.java
new file mode 100644
index 0000000..ecf325e
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/action/CommonContractRevocationAction.java
@@ -0,0 +1,109 @@
+package weaver.aiyh_pcn.common_fadada.action;
+
+import aiyh.utils.Util;
+import aiyh.utils.action.SafeCusBaseAction;
+import aiyh.utils.annotation.ActionDesc;
+import aiyh.utils.annotation.ActionOptionalParam;
+import aiyh.utils.annotation.PrintParamMark;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.google.common.base.Strings;
+import lombok.Getter;
+import lombok.Setter;
+import org.jetbrains.annotations.Nullable;
+import weaver.aiyh_pcn.common_fadada.entity.FaResultEntity;
+import weaver.aiyh_pcn.common_fadada.service.ContractRevocationService;
+import weaver.hrm.User;
+import weaver.soa.workflow.request.RequestInfo;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <h1>合同撤销接口</h1>
+ *
+ * <p>create: 2023-02-01 10:12</p>
+ *
+ * @author youHong.ai
+ */
+
+@Getter
+@Setter
+@ActionDesc(author = "youHong.ai", value = "法大大合同撤销action")
+public class CommonContractRevocationAction extends SafeCusBaseAction {
+
+    @PrintParamMark
+    @ActionOptionalParam(value = "", desc = "action后置处理方法！实现接口：aiyh.utils.action.SafeCusActionProcessInterface")
+    private String processAfter;
+
+    @PrintParamMark
+    @ActionOptionalParam(value = "", desc = "action前置处理方法！实现接口：aiyh.utils.action.SafeCusActionProcessInterface")
+    private String processBefore;
+
+
+    @PrintParamMark
+    @ActionOptionalParam(value = "false", desc = "是否自动提交流程")
+    private String submitAction = "false";
+
+    @PrintParamMark
+    @ActionOptionalParam(value = "true", desc = "是否失败后阻断流程")
+    private String block = "true";
+
+
+    @Override
+    public void doSubmit(String requestId, String billTable, int workflowId, User user, RequestInfo requestInfo) {
+        Object result = Util.executeActionProcess(processBefore, requestInfo);
+        ContractRevocationService service = new ContractRevocationService();
+        List<FaResultEntity> resultList = null;
+        try {
+            resultList = service.execute(String.valueOf(workflowId), requestId, user.getUID());
+        } catch (JsonProcessingException e) {
+            log.error("公共合同撤销action异常,转换JSON异常");
+            if (!Strings.isNullOrEmpty(block) && Boolean.parseBoolean(block)) {
+                Util.actionFailException(requestInfo.getRequestManager(), "合同撤销失败了，请练习系统管理员！");
+            }
+        } catch (Exception e) {
+            log.error("公共合同签署action异常", e);
+            if (!Strings.isNullOrEmpty(block) && Boolean.parseBoolean(block)) {
+                Util.actionFailException(requestInfo.getRequestManager(), "合同撤销失败，请联系管理员！");
+            }
+        }
+        boolean failureAndContinue = verifyResult(resultList, String.valueOf(workflowId), requestId);
+        if (!Strings.isNullOrEmpty(block) && Boolean.parseBoolean(block)) {
+            if (!failureAndContinue) {
+                Util.actionFailException(requestInfo.getRequestManager(), "合同撤销存在失败签署，请联系管理员！");
+            }
+
+        }
+        Util.executeActionProcess(processAfter, requestInfo);
+        if (Boolean.parseBoolean(submitAction)) {
+            this.submitWorkflow(requestId, user.getUID());
+        }
+    }
+
+    @Override
+    public void doReject(String requestId, String billTable, int workflowId, User user, RequestInfo requestInfo) {
+        this.doSubmit(requestId, billTable, workflowId, user, requestInfo);
+    }
+
+    public void submitWorkflow(String requestId, Integer userId) {
+        Util.submitWorkflowThread(Integer.parseInt(requestId), userId, "批量签署自动提交流程！");
+    }
+
+
+    @Nullable
+    private boolean verifyResult(List<FaResultEntity> resultList, String workflowId, String requestId) {
+        for (FaResultEntity result : resultList) {
+            Map<String, Object> entityMap = null;
+            try {
+                entityMap = result.getResponeVo().getEntityMap();
+            } catch (JsonProcessingException e) {
+                e.printStackTrace();
+            }
+            String code = String.valueOf(entityMap.get("code"));
+            if (!"200".equals(code)) {
+                return false;
+            }
+        }
+        return true;
+    }
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/action/CommonCreateContractAction.java b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/action/CommonCreateContractAction.java
new file mode 100644
index 0000000..b52acba
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/action/CommonCreateContractAction.java
@@ -0,0 +1,155 @@
+package weaver.aiyh_pcn.common_fadada.action;
+
+import aiyh.utils.Util;
+import aiyh.utils.excention.CustomerException;
+import com.alibaba.fastjson.JSON;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.google.common.base.Strings;
+import org.apache.log4j.Logger;
+import weaver.aiyh_pcn.common_fadada.entity.FaResultEntity;
+import weaver.aiyh_pcn.common_fadada.mapper.ActionMapper;
+import weaver.aiyh_pcn.common_fadada.service.CreateContractService;
+import weaver.hrm.User;
+import weaver.interfaces.workflow.action.Action;
+import weaver.soa.workflow.request.RequestInfo;
+import weaver.workflow.request.RequestManager;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>公共合同创建action</p>
+ * <p>create 2022/4/11 4:33 PM</p>
+ *
+ * @author ayh
+ */
+
+
+public class CommonCreateContractAction implements Action {
+
+    private final Logger logger = Util.getLogger();
+    private final ActionMapper mapper = Util.getMapper(ActionMapper.class);
+    /**
+     * 是否回写到表单合同编号
+     */
+    private String doSomething;
+    /**
+     * 合同编号回写字段
+     */
+    private String contractNoField;
+    /**
+     * 时候阻断流程
+     */
+    private String block;
+
+
+    @Override
+    public String execute(RequestInfo requestInfo) {
+        String requestId = requestInfo.getRequestid();
+        logger.info("进入创建合同action=====================");
+        String workflowId = requestInfo.getWorkflowid();
+        RequestManager requestManager = requestInfo.getRequestManager();
+        User user = requestManager.getUser();
+        String billTable = requestManager.getBillTableName();
+        CreateContractService service = new CreateContractService();
+        List<FaResultEntity> resultList = null;
+        try {
+            resultList = service.execute(workflowId, requestId, user.getUID());
+            logger.info("请求结果集：" + JSON.toJSONString(resultList));
+            verifyResult(resultList);
+        } catch (JsonProcessingException e) {
+            logger.error("公共合同创建action异常,转换JSON异常");
+            if (!Strings.isNullOrEmpty(block) && Boolean.parseBoolean(block)) {
+                requestManager.setMessageid(System.currentTimeMillis() + "");
+                requestManager.setMessagecontent("合同创建失败，请联系管理员");
+                return Action.FAILURE_AND_CONTINUE;
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("公共合同创建action异常: " + Util.getErrString(e));
+            if (!Strings.isNullOrEmpty(block) && Boolean.parseBoolean(block)) {
+                requestManager.setMessageid(System.currentTimeMillis() + "");
+                requestManager.setMessagecontent("合同创建失败，请联系管理员");
+                return Action.FAILURE_AND_CONTINUE;
+            }
+        }
+        if (!Strings.isNullOrEmpty(doSomething) && Boolean.parseBoolean(doSomething)) {
+            try {
+                doSomething(resultList, billTable, requestId);
+            } catch (Exception e) {
+                e.printStackTrace();
+                if (!Strings.isNullOrEmpty(block) && Boolean.parseBoolean(block)) {
+                    requestManager.setMessageid(System.currentTimeMillis() + "");
+                    requestManager.setMessagecontent("合同编号回写失败，请联系管理员");
+                    return Action.FAILURE_AND_CONTINUE;
+                }
+            }
+        }
+        return Action.SUCCESS;
+    }
+
+    public void doSomething(List<FaResultEntity> resultList, String billTable, String requestId) {
+        if (doSomething == null || doSomething.isEmpty() || !Boolean.parseBoolean(doSomething)) {
+            return;
+        }
+        for (FaResultEntity result : resultList) {
+            writeBackContractNo(result, billTable, requestId);
+        }
+    }
+
+    private void verifyResult(List<FaResultEntity> resultList) {
+        for (FaResultEntity result : resultList) {
+            Map<String, Object> entityMap;
+            try {
+                entityMap = result.getResponeVo().getEntityMap();
+            } catch (JsonProcessingException e) {
+                e.printStackTrace();
+                throw new CustomerException("can not parse map for response;");
+            }
+            String code = String.valueOf(entityMap.get("code"));
+            if (!"200".equals(code)) {
+                throw new CustomerException("合同创建失败！！失败信息：" + entityMap.get("message"));
+            }
+        }
+    }
+
+    private void writeBackContractNo(FaResultEntity result, String billTable, String requestId) {
+        Map<String, Object> entityMap = null;
+        try {
+            entityMap = result.getResponeVo().getEntityMap();
+        } catch (JsonProcessingException e) {
+            throw new CustomerException("获取合同号失败，JSON转换错误");
+        }
+        Map<String, Object> data = (Map<String, Object>) entityMap.get("data");
+        String contractNo = String.valueOf(data.get("contractNo"));
+        logger.info(Util.logStr("开始回写数据到流程中，获取到返回的数据[{}],获取到合同编号[{}]", JSON.toJSONString(result), contractNo));
+        if (result.getType() == 1) {
+//            回写主表
+            boolean flag = mapper.updateContractInMainTable(billTable, contractNoField, contractNo, requestId);
+            if (!flag) {
+                throw new CustomerException("回写主表失败,更新语句执行false");
+            }
+            return;
+        }
+//        回写明细表
+        boolean b = mapper.updateContractInDetailTable(result.getDetailTable(), contractNoField, contractNo, String.valueOf(result.getDetailId()));
+        if (!b) {
+            throw new CustomerException("回写明细表失败,更新语句执行false");
+        }
+
+    }
+
+    public void setDoSomething(String doSomething) {
+        this.doSomething = doSomething;
+    }
+
+    public void setContractNoField(String contractNoField) {
+        this.contractNoField = contractNoField;
+    }
+
+    public void setBlock(String block) {
+        this.block = block;
+    }
+
+
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/action/CommonCreateManyContractAction.java b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/action/CommonCreateManyContractAction.java
new file mode 100644
index 0000000..707549e
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/action/CommonCreateManyContractAction.java
@@ -0,0 +1,24 @@
+package weaver.aiyh_pcn.common_fadada.action;
+
+import aiyh.utils.action.CusBaseAction;
+import aiyh.utils.annotation.ActionDesc;
+import weaver.hrm.User;
+import weaver.workflow.request.RequestManager;
+
+/**
+ * <h1>多合同文件创建</h1>
+ *
+ * <p>create: 2022-11-09 14:28</p>
+ *
+ * @author youHong.ai
+ */
+
+@ActionDesc(value = "多合同文件字段创建action，一个字段多个文件，生成多份合同", author = "youHong.ai")
+public class CommonCreateManyContractAction extends CusBaseAction {
+
+
+    @Override
+    public void doSubmit(String requestId, String billTable, int workflowId, User user, RequestManager requestManager) {
+
+    }
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/action/CommonDownloadContractAction.java b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/action/CommonDownloadContractAction.java
new file mode 100644
index 0000000..bf0c1f8
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/action/CommonDownloadContractAction.java
@@ -0,0 +1,136 @@
+package weaver.aiyh_pcn.common_fadada.action;
+
+import aiyh.utils.Util;
+import aiyh.utils.excention.CustomerException;
+import aiyh.utils.httpUtil.ResponeVo;
+import com.google.common.base.Strings;
+import org.apache.log4j.Logger;
+import weaver.aiyh_pcn.common_fadada.entity.FaResultEntity;
+import weaver.aiyh_pcn.common_fadada.mapper.ActionMapper;
+import weaver.aiyh_pcn.common_fadada.service.DownloadContractService;
+import weaver.hrm.User;
+import weaver.interfaces.workflow.action.Action;
+import weaver.soa.workflow.request.RequestInfo;
+import weaver.workflow.request.RequestManager;
+
+import java.util.List;
+
+/**
+ * <p>下载合同</p>
+ * <p>create 2022/4/13 10:34 AM</p>
+ *
+ * @author ayh
+ */
+
+public class CommonDownloadContractAction implements Action {
+
+    private final Logger logger = Util.getLogger();
+    private final ActionMapper mapper = Util.getMapper(ActionMapper.class);
+    /**
+     * 是否回写到表单合同编号
+     */
+    private String doSomething;
+    /**
+     * 合同编号回写字段
+     */
+    private String contractField;
+
+    /**
+     * 时候阻断流程
+     */
+    private String block;
+
+
+    @Override
+    public String execute(RequestInfo requestInfo) {
+        String requestId = requestInfo.getRequestid();
+        String workflowId = requestInfo.getWorkflowid();
+        RequestManager requestManager = requestInfo.getRequestManager();
+        User user = requestManager.getUser();
+        String billTable = requestManager.getBillTableName();
+        DownloadContractService service = new DownloadContractService();
+        List<FaResultEntity> resultList = null;
+        try {
+            resultList = service.execute(workflowId, requestId, user.getUID());
+            Util.getLogger().error("合同下载的结果：" + resultList);
+        } catch (Exception e) {
+            e.printStackTrace();
+            Util.getLogger().error("合同下载失败：\n" + Util.getErrString(e));
+            if (!Strings.isNullOrEmpty(block) && Boolean.parseBoolean(block)) {
+                requestManager.setMessageid(System.currentTimeMillis() + "");
+                requestManager.setMessagecontent("合同编下载失败，请联系管理员");
+                return Action.FAILURE_AND_CONTINUE;
+            }
+        }
+        if (!Strings.isNullOrEmpty(doSomething) && Boolean.parseBoolean(doSomething)) {
+            try {
+                doSomething(resultList, workflowId, requestId, billTable);
+            } catch (Exception e) {
+                e.printStackTrace();
+                if (!Strings.isNullOrEmpty(block) && Boolean.parseBoolean(block)) {
+                    requestManager.setMessageid(System.currentTimeMillis() + "");
+                    requestManager.setMessagecontent("合同编回写失败，请联系管理员");
+                    return Action.FAILURE_AND_CONTINUE;
+                }
+            }
+        }
+        return Action.SUCCESS;
+    }
+
+    public void doSomething(List<FaResultEntity> resultList, String workflowId, String requestId, String billTable) {
+        if (doSomething == null || doSomething.isEmpty() || !Boolean.parseBoolean(doSomething)) {
+            return;
+        }
+//        循环获取resultList中的entityString
+        for (FaResultEntity entity : resultList) {
+            ResponeVo responeVo = entity.getResponeVo();
+            String imgFileId = responeVo.getEntityString();
+            boolean flag = writeBackContractFile(imgFileId, entity, workflowId, requestId, billTable);
+            if (!flag) {
+                Util.getLogger().info("合同文件下载成功，但是回写写失败，请联系管理员");
+            }
+        }
+    }
+
+
+    private boolean writeBackContractFile(String imgFileId, FaResultEntity result, String workflowId,
+                                          String requestId, String billTable) {
+        if (result.getType() == 1) {
+//            回写到主表
+            String docCategorys = Util.getDocCategorysByTable(workflowId, contractField, "");
+            String[] docCategoryArr = docCategorys.split(",");
+            int docId = 0;
+            try {
+                docId = Util.createDocByImageFileId(Integer.parseInt(docCategoryArr[docCategoryArr.length - 1]), Integer.parseInt(imgFileId), 1);
+                Util.getLogger().info("生成文档id：" + docId);
+            } catch (Exception e) {
+                throw new CustomerException("生成文档信息失败");
+            }
+            return mapper.updateContractInMainTable(billTable, contractField, String.valueOf(docId), requestId);
+        }
+        //        回写明细表
+        String docCategorys = Util.getDocCategorysByTable(workflowId, contractField, result.getDetailTable());
+        String[] docCategoryArr = docCategorys.split(",");
+        int docId = 0;
+        try {
+            docId = Util.createDocByImageFileId(Integer.parseInt(docCategoryArr[docCategoryArr.length - 1]), Integer.parseInt(imgFileId), 1);
+            Util.getLogger().info("回写明细表，生成文档id：" + docId);
+        } catch (Exception e) {
+            throw new CustomerException("生成文档信息失败");
+        }
+        Util.getLogger().info("明细表：" + result.getDetailTable() + "  明细表ID：" + result.getDetailId());
+        return mapper.updateContractInDetailTable(result.getDetailTable(), contractField, String.valueOf(docId), String.valueOf(result.getDetailId()));
+    }
+
+    public void setDoSomething(String doSomething) {
+        this.doSomething = doSomething;
+    }
+
+    public void setContractField(String contractField) {
+        this.contractField = contractField;
+    }
+
+    public void setBlock(String block) {
+        this.block = block;
+    }
+}
\ No newline at end of file
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/action/CommonOneselfSignAction.java b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/action/CommonOneselfSignAction.java
new file mode 100644
index 0000000..b66a8cc
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/action/CommonOneselfSignAction.java
@@ -0,0 +1,183 @@
+package weaver.aiyh_pcn.common_fadada.action;
+
+import aiyh.utils.Util;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.google.common.base.Strings;
+import org.apache.log4j.Logger;
+import org.jetbrains.annotations.Nullable;
+import weaver.aiyh_pcn.common_fadada.entity.ContractConfigEntity;
+import weaver.aiyh_pcn.common_fadada.entity.FaResultEntity;
+import weaver.aiyh_pcn.common_fadada.mapper.ActionMapper;
+import weaver.aiyh_pcn.common_fadada.mapper.ConfigMapper;
+import weaver.aiyh_pcn.common_fadada.service.OneselfSignContractService;
+import weaver.hrm.User;
+import weaver.interfaces.workflow.action.Action;
+import weaver.soa.workflow.request.RequestInfo;
+import weaver.workflow.request.RequestManager;
+import weaver.workflow.workflow.WorkflowVersion;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>公共本方签署action</p>
+ * <p>create 2022/4/13 10:09 AM</p>
+ *
+ * @author ayh
+ */
+
+public class CommonOneselfSignAction implements Action {
+
+
+    private final Logger logger = Util.getLogger();
+    private final ActionMapper mapper = Util.getMapper(ActionMapper.class);
+    private static final ConfigMapper CONFIG_MAPPER = Util.getMapper(ConfigMapper.class);
+    private String signStatusField;
+
+    /**
+     * 是否回写到表单合同编号
+     */
+    private String doSomething;
+    /**
+     * 时候阻断流程
+     */
+    private String block;
+    private String submitWorkflow;
+    private String signSuccessValue;
+    private String signFailValue;
+
+    @Override
+    public String execute(RequestInfo requestInfo) {
+        String requestId = requestInfo.getRequestid();
+        String workflowId = requestInfo.getWorkflowid();
+        RequestManager requestManager = requestInfo.getRequestManager();
+        User user = requestManager.getUser();
+        Integer userId = user.getUID();
+        OneselfSignContractService service = new OneselfSignContractService();
+        List<FaResultEntity> resultList = null;
+        try {
+            resultList = service.execute(workflowId, requestId, user.getUID());
+        } catch (JsonProcessingException e) {
+            logger.error("公共合同签署action异常,转换JSON异常");
+            if (!Strings.isNullOrEmpty(block) && Boolean.parseBoolean(block)) {
+                requestManager.setMessageid(System.currentTimeMillis() + "");
+                requestManager.setMessagecontent("合同签署失败，请联系管理员");
+                return Action.FAILURE_AND_CONTINUE;
+            }
+        } catch (Exception e) {
+            logger.error("公共合同签署action异常", e);
+            if (!Strings.isNullOrEmpty(block) && Boolean.parseBoolean(block)) {
+                requestManager.setMessageid(System.currentTimeMillis() + "");
+                requestManager.setMessagecontent("合同签署失败，请联系管理员");
+                return Action.FAILURE_AND_CONTINUE;
+            }
+        }
+        boolean failureAndContinue = verifyResult(resultList, workflowId, requestId);
+        if (!Strings.isNullOrEmpty(block) && Boolean.parseBoolean(block)) {
+            if (!failureAndContinue) {
+                requestManager.setMessageid(System.currentTimeMillis() + "");
+                requestManager.setMessagecontent("合同签署存在失败签署，请联系管理员");
+                return Action.FAILURE_AND_CONTINUE;
+            }
+
+        }
+        if (!Strings.isNullOrEmpty(doSomething) && Boolean.parseBoolean(doSomething)) {
+            try {
+                doSomething(resultList, workflowId, requestId);
+            } catch (Exception e) {
+                e.printStackTrace();
+                if (!Strings.isNullOrEmpty(block) && Boolean.parseBoolean(block)) {
+                    requestManager.setMessageid(System.currentTimeMillis() + "");
+                    requestManager.setMessagecontent("合同编号回写失败，请联系管理员");
+                    return Action.FAILURE_AND_CONTINUE;
+                }
+            }
+        }
+        if (!Strings.isNullOrEmpty(submitWorkflow) || Boolean.parseBoolean(submitWorkflow)) {
+            submitWorkflow(requestId, userId);
+        }
+        return Action.SUCCESS;
+    }
+
+    @Nullable
+    private boolean verifyResult(List<FaResultEntity> resultList, String workflowId, String requestId) {
+        for (FaResultEntity result : resultList) {
+            Map<String, Object> entityMap = null;
+            try {
+                entityMap = result.getResponeVo().getEntityMap();
+            } catch (JsonProcessingException e) {
+                e.printStackTrace();
+            }
+            String code = String.valueOf(entityMap.get("code"));
+            if (!"200".equals(code)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    public void doSomething(List<FaResultEntity> resultList, String workflowId, String requestId) {
+        String workflowIds = WorkflowVersion.getVersionStringByWfid(workflowId);
+        ContractConfigEntity contractConfigEntity = CONFIG_MAPPER.selectContractConfig(workflowIds.split(","), 2);
+        Integer contractTable = contractConfigEntity.getContractTable();
+        if (contractTable == 0) {
+            //            主表
+            for (FaResultEntity result : resultList) {
+                String code = null;
+                try {
+                    code = String.valueOf(result.getResponeVo().getEntityMap().get("code"));
+                } catch (JsonProcessingException e) {
+                    code = "0";
+                }
+                if ("200".equals(code)) {
+                    mapper.updateSignStatusMain(contractConfigEntity.getWorkflowTableName(), signStatusField, signSuccessValue, requestId);
+                } else {
+                    mapper.updateSignStatusMain(contractConfigEntity.getWorkflowTableName(), signStatusField, signFailValue, requestId);
+                }
+            }
+        } else if (contractTable == 1) {
+            //            明细表
+            for (FaResultEntity result : resultList) {
+                String code = null;
+                try {
+                    code = String.valueOf(result.getResponeVo().getEntityMap().get("code"));
+                } catch (JsonProcessingException e) {
+                    code = "0";
+                }
+                if ("200".equals(code)) {
+                    mapper.updateSignStatusDetail(contractConfigEntity.getWorkflowDetailTableName(), signStatusField, signSuccessValue, result.getDetailId());
+                } else {
+                    mapper.updateSignStatusDetail(contractConfigEntity.getWorkflowDetailTableName(), signStatusField, signFailValue, result.getDetailId());
+                }
+            }
+        }
+    }
+
+    public void submitWorkflow(String requestId, Integer userId) {
+        Util.submitWorkflowThread(Integer.parseInt(requestId), userId, "本方签署自动提交流程！");
+    }
+
+    public void setDoSomething(String doSomething) {
+        this.doSomething = doSomething;
+    }
+
+    public void setSubmitWorkflow(String submitWorkflow) {
+        this.submitWorkflow = submitWorkflow;
+    }
+
+    public void setBlock(String block) {
+        this.block = block;
+    }
+
+    public void setSignSuccessValue(String signSuccessValue) {
+        this.signSuccessValue = signSuccessValue;
+    }
+
+    public void setSignFailValue(String signFailValue) {
+        this.signFailValue = signFailValue;
+    }
+
+    public void setSignStatusField(String signStatusField) {
+        this.signStatusField = signStatusField;
+    }
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/action/CommonPigeonholeContractAction.java b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/action/CommonPigeonholeContractAction.java
new file mode 100644
index 0000000..3b57f93
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/action/CommonPigeonholeContractAction.java
@@ -0,0 +1,90 @@
+package weaver.aiyh_pcn.common_fadada.action;
+
+import aiyh.utils.Util;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.google.common.base.Strings;
+import org.apache.log4j.Logger;
+import weaver.aiyh_pcn.common_fadada.entity.FaResultEntity;
+import weaver.aiyh_pcn.common_fadada.mapper.ActionMapper;
+import weaver.aiyh_pcn.common_fadada.service.PigeonholeContractService;
+import weaver.hrm.User;
+import weaver.interfaces.workflow.action.Action;
+import weaver.soa.workflow.request.RequestInfo;
+import weaver.workflow.request.RequestManager;
+
+import java.util.List;
+
+/**
+ * <p>合同归档</p>
+ * <p>create 2022/4/13 4:14 PM</p>
+ *
+ * @author ayh
+ */
+
+public class CommonPigeonholeContractAction implements Action {
+    private final Logger logger = Util.getLogger();
+    private final ActionMapper mapper = Util.getMapper(ActionMapper.class);
+    /**
+     * 是否回写到表单合同编号
+     */
+    private String doSomething;
+    /**
+     * 合同编号回写字段
+     */
+    private Integer userId;
+    /**
+     * 时候阻断流程
+     */
+    private String block;
+
+    @Override
+    public String execute(RequestInfo requestInfo) {
+        String requestId = requestInfo.getRequestid();
+        String workflowId = requestInfo.getWorkflowid();
+        RequestManager requestManager = requestInfo.getRequestManager();
+        User user = requestManager.getUser();
+        userId = user.getUID();
+        String billTable = requestManager.getBillTableName();
+        PigeonholeContractService service = new PigeonholeContractService();
+        List<FaResultEntity> resultList;
+        try {
+            resultList = service.execute(workflowId, requestId, user.getUID());
+        } catch (JsonProcessingException e) {
+            logger.error("公共合同归档action异常,转换JSON异常");
+            if (!Strings.isNullOrEmpty(block) && Boolean.parseBoolean(block)) {
+                requestManager.setMessageid(System.currentTimeMillis() + "");
+                requestManager.setMessagecontent("合同归档失败，请联系管理员");
+                return Action.FAILURE_AND_CONTINUE;
+            }
+            return Action.SUCCESS;
+        }
+        if (!Strings.isNullOrEmpty(doSomething) && Boolean.parseBoolean(doSomething)) {
+            try {
+                doSomething(requestId);
+            } catch (Exception e) {
+                e.printStackTrace();
+                if (!Strings.isNullOrEmpty(block) && Boolean.parseBoolean(block)) {
+                    requestManager.setMessageid(System.currentTimeMillis() + "");
+                    requestManager.setMessagecontent("合同归档写失败，请联系管理员");
+                    return Action.FAILURE_AND_CONTINUE;
+                }
+            }
+        }
+        return Action.SUCCESS;
+    }
+
+    public void doSomething(String requestId) {
+        if (doSomething == null || doSomething.isEmpty() || !Boolean.parseBoolean(doSomething)) {
+            return;
+        }
+        Util.submitWorkflowThread(Integer.parseInt(requestId), userId, null);
+    }
+
+    public void setDoSomething(String doSomething) {
+        this.doSomething = doSomething;
+    }
+
+    public void setBlock(String block) {
+        this.block = block;
+    }
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/action/CommonSignContractAction.java b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/action/CommonSignContractAction.java
new file mode 100644
index 0000000..c1377fb
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/action/CommonSignContractAction.java
@@ -0,0 +1,113 @@
+package weaver.aiyh_pcn.common_fadada.action;
+
+import aiyh.utils.Util;
+import aiyh.utils.excention.CustomerException;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.google.common.base.Strings;
+import org.apache.log4j.Logger;
+import weaver.aiyh_pcn.common_fadada.entity.FaResultEntity;
+import weaver.aiyh_pcn.common_fadada.mapper.ActionMapper;
+import weaver.aiyh_pcn.common_fadada.service.SignContractService;
+import weaver.hrm.User;
+import weaver.interfaces.workflow.action.Action;
+import weaver.soa.workflow.request.RequestInfo;
+import weaver.workflow.request.RequestManager;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>签署合同流程</p>
+ * <p>create 2022/4/12 2:59 PM</p>
+ *
+ * @author ayh
+ */
+
+public class CommonSignContractAction implements Action {
+
+    private final Logger logger = Util.getLogger();
+    private final ActionMapper mapper = Util.getMapper(ActionMapper.class);
+
+    /**
+     * 是否回写到表单合同编号
+     */
+    private String doSomething;
+    /**
+     * 时候阻断流程
+     */
+    private String block;
+
+    @Override
+    public String execute(RequestInfo requestInfo) {
+        String requestId = requestInfo.getRequestid();
+        String workflowId = requestInfo.getWorkflowid();
+        RequestManager requestManager = requestInfo.getRequestManager();
+        User user = requestManager.getUser();
+        Integer userId = user.getUID();
+        SignContractService service = new SignContractService();
+        List<FaResultEntity> resultList;
+        try {
+            resultList = service.execute(workflowId, requestId, user.getUID());
+            logger.info("签署信息响应结果：" + resultList);
+            verifyResult(resultList);
+        } catch (JsonProcessingException e) {
+            logger.error("公共合同签署action异常,转换JSON异常");
+            if (!Strings.isNullOrEmpty(block) && Boolean.parseBoolean(block)) {
+                requestManager.setMessageid(System.currentTimeMillis() + "");
+                requestManager.setMessagecontent("合同签署失败,信息转换失败！，请联系管理员");
+                return Action.FAILURE_AND_CONTINUE;
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            if (!Strings.isNullOrEmpty(block) && Boolean.parseBoolean(block)) {
+                requestManager.setMessageid(System.currentTimeMillis() + "");
+                requestManager.setMessagecontent("合同签署失败，请联系管理员");
+                return Action.FAILURE_AND_CONTINUE;
+            }
+        }
+        if (!Strings.isNullOrEmpty(doSomething) && Boolean.parseBoolean(doSomething)) {
+            try {
+                doSomething(requestId, userId);
+            } catch (Exception e) {
+                e.printStackTrace();
+                if (!Strings.isNullOrEmpty(block) && Boolean.parseBoolean(block)) {
+                    requestManager.setMessageid(System.currentTimeMillis() + "");
+                    requestManager.setMessagecontent("合同编号回写失败，请联系管理员");
+                    return Action.FAILURE_AND_CONTINUE;
+                }
+            }
+        }
+        return Action.SUCCESS;
+    }
+
+    private void verifyResult(List<FaResultEntity> resultList) {
+        for (FaResultEntity result : resultList) {
+            Map<String, Object> entityMap = null;
+            try {
+                entityMap = result.getResponeVo().getEntityMap();
+            } catch (JsonProcessingException e) {
+                e.printStackTrace();
+            }
+            String code = String.valueOf(entityMap.get("code"));
+            if (!"200".equals(code)) {
+                throw new CustomerException("合同创建失败！！失败信息：" + entityMap.get("message"));
+            }
+        }
+    }
+
+
+    public void doSomething(String requestId, Integer userId) {
+        if (doSomething == null || doSomething.isEmpty() || !Boolean.parseBoolean(doSomething)) {
+            return;
+        }
+        Util.submitWorkflowThread(Integer.parseInt(requestId), userId, "签署流程自动提交");
+    }
+
+    public void setDoSomething(String doSomething) {
+        this.doSomething = doSomething;
+    }
+
+    public void setBlock(String block) {
+        this.block = block;
+    }
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/action/PushContractInfoAction.java b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/action/PushContractInfoAction.java
new file mode 100644
index 0000000..ff8ed6c
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/action/PushContractInfoAction.java
@@ -0,0 +1,134 @@
+package weaver.aiyh_pcn.common_fadada.action;
+
+import aiyh.utils.Util;
+import aiyh.utils.httpUtil.HttpArgsType;
+import aiyh.utils.httpUtil.ResponeVo;
+import aiyh.utils.httpUtil.util.HttpUtils;
+import com.alibaba.fastjson.JSON;
+import com.api.xiao.commons.config.entity.RequestMappingConfig;
+import com.api.xiao.commons.config.service.DealWithMapping;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import org.apache.log4j.Logger;
+import weaver.aiyh_pcn.common_fadada.mapper.ActionMapper;
+import weaver.conn.RecordSet;
+import weaver.interfaces.workflow.action.Action;
+import weaver.soa.workflow.request.RequestInfo;
+import weaver.workflow.request.RequestManager;
+import weaver.workflow.workflow.WorkflowBillComInfo;
+import weaver.workflow.workflow.WorkflowComInfo;
+
+import java.io.IOException;
+import java.util.*;
+
+/**
+ * <p>推送数据到D-flow</p>
+ * <p>create 2022/4/21 1:56 PM</p>
+ *
+ * @author ayh
+ */
+
+public class PushContractInfoAction implements Action {
+
+    private final DealWithMapping dealWithMapping = new DealWithMapping();
+    private final HttpUtils httpUtil = new HttpUtils();
+    private final Logger logger = Util.getLogger();
+    private final ActionMapper mapper = Util.getMapper(ActionMapper.class);
+    private String dealersConfigMark;
+    private String apikey;
+    /** 会写字段信息, 配置方式: apiField:workflowField,apiField:workflowField */
+    private String backWritFields;
+
+    @Override
+    public String execute(RequestInfo requestInfo) {
+        RequestManager requestManager = requestInfo.getRequestManager();
+        String billTable = requestManager.getBillTableName();
+        String requestId = requestInfo.getRequestid();
+        int workflowId = requestManager.getWorkflowid();
+        if ("".equals(billTable)) {
+            WorkflowComInfo workflowComInfo = new WorkflowComInfo();
+            String formId = workflowComInfo.getFormId(String.valueOf(workflowId));
+            WorkflowBillComInfo workflowBillComInfo = new WorkflowBillComInfo();
+            billTable = workflowBillComInfo.getTablename(formId);
+        }
+        dealWithMapping.setMainTable(billTable);
+        RequestMappingConfig requestMappingConfig = dealWithMapping.treeDealWithUniqueCode(dealersConfigMark);
+        RecordSet recordSet = mapper.selectMainRs(billTable, requestId);
+        recordSet.next();
+        Map<String, Object> requestParam = dealWithMapping.getRequestParam(recordSet, requestMappingConfig);
+        ResponeVo responeVo = null;
+        Util.getLogger().info("推送合同数据到d-flow数据：" + JSON.toJSONString(requestParam));
+        Util.getLogger().info("获取到的请求APIKey：" + apikey);
+        httpUtil.getGlobalCache().header.put("apikey", apikey);
+        httpUtil.getGlobalCache().header.put("Content-Type", HttpArgsType.APPLICATION_JSON);
+        Util.getLogger().info("请求头：" + JSON.toJSONString(httpUtil.getGlobalCache().header));
+        try {
+            responeVo = httpUtil.apiPost(requestMappingConfig.getRequestUrl(), requestParam);
+            Util.getLogger().info("请求结果响应：" + responeVo);
+        } catch (IOException e) {
+            logger.error("推送合同数据到D-flow失败", e);
+            requestManager.setMessageid(System.currentTimeMillis() + "");
+            requestManager.setMessagecontent("推送合同数据到d-flow失败，请联系管理员");
+            return Action.FAILURE_AND_CONTINUE;
+        }
+        if (responeVo.getCode() != 200) {
+            logger.error("推送合同数据到D-flow失败!，未能请求到d-flow！" + responeVo.getEntityString());
+            requestManager.setMessageid(System.currentTimeMillis() + "");
+            requestManager.setMessagecontent("推送合同数据到d-flow失败，请联系管理员");
+            return Action.FAILURE_AND_CONTINUE;
+        }
+        Map<String, Object> entityMap = null;
+        try {
+            entityMap = responeVo.getEntityMap();
+        } catch (JsonProcessingException e) {
+            logger.error("推送合同数据到D-flow失败!，未能正确解析返回数据！" + responeVo.getEntityString());
+            requestManager.setMessageid(System.currentTimeMillis() + "");
+            requestManager.setMessagecontent("推送合同数据到d-flow失败，请联系管理员");
+            return Action.FAILURE_AND_CONTINUE;
+        }
+        String errcode = Util.null2DefaultStr(entityMap.get("errcode"), "-1");
+        if (!"0".equals(errcode)) {
+            logger.error("推送合同数据到D-flow失败!" + responeVo.getEntityString());
+            requestManager.setMessageid(System.currentTimeMillis() + "");
+            requestManager.setMessagecontent("推送合同数据到d-flow失败，请联系管理员");
+            return Action.FAILURE_AND_CONTINUE;
+        }
+        backWritField(requestId, billTable, entityMap);
+        return Action.SUCCESS;
+    }
+
+
+    public void setBackWritFields(String backWritFields) {
+        this.backWritFields = backWritFields;
+    }
+
+    private void backWritField(String requestId, String billTable, Map<String, Object> entityMap) {
+        if (Objects.isNull(backWritFields) || "".equals(backWritFields)) {
+            return;
+        }
+        Map<String, Object> updateMap = new HashMap<>();
+        updateMap.put("_billTable", billTable);
+        updateMap.put("_requestId", requestId);
+        String[] split = backWritFields.split(",");
+        List<String> updateArr = new ArrayList<>();
+        for (String keyValue : split) {
+            String[] backFieldMapper = keyValue.split(":");
+            String apiField = backFieldMapper[0];
+            String workflowField = backFieldMapper[1];
+            updateArr.add(workflowField = " = " + "#{" + workflowField + "}");
+            updateMap.put(workflowField, Util.getValueByKeyStr(apiField, entityMap));
+        }
+        updateMap.put("_updateField", Util.join(updateArr, ","));
+        boolean b = mapper.updateFields(updateMap);
+        if (!b) {
+            logger.error("update workflow field error! back writ error!");
+        }
+    }
+
+    public void setApikey(String apikey) {
+        this.apikey = apikey;
+    }
+
+    public void setDealersConfigMark(String dealersConfigMark) {
+        this.dealersConfigMark = dealersConfigMark;
+    }
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/action/RegisterFaDaDaAccountAction.java b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/action/RegisterFaDaDaAccountAction.java
new file mode 100644
index 0000000..477b18b
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/action/RegisterFaDaDaAccountAction.java
@@ -0,0 +1,58 @@
+package weaver.aiyh_pcn.common_fadada.action;
+
+import aiyh.utils.Util;
+import aiyh.utils.action.CusBaseAction;
+import aiyh.utils.annotation.*;
+import aiyh.utils.httpUtil.util.HttpUtils;
+import lombok.Setter;
+import weaver.aiyh_pcn.common_fadada.mapper.RegisterFaDaDaMapper;
+import weaver.hrm.User;
+import weaver.workflow.request.RequestManager;
+import weaver.xiao.commons.config.entity.RequestMappingConfig;
+import weaver.xiao.commons.config.service.DealWithMapping;
+
+/**
+ * <h1>注册发大大账号action</h1>
+ *
+ * <p>create: 2022-11-09 11:06</p>
+ *
+ * @author youHong.ai EBU7-dev-1
+ */
+
+@ActionDesc(value = "保时捷发大大账号注册流程", author = "youHong.ai")
+@Setter
+public class RegisterFaDaDaAccountAction extends CusBaseAction {
+
+    private HttpUtils httpUtils = new HttpUtils();
+
+    private final DealWithMapping dealWithMapping = new DealWithMapping();
+
+    private final RegisterFaDaDaMapper mapper = Util.getMapper(RegisterFaDaDaMapper.class);
+
+    @PrintParamMark
+    @RequiredMark("发大大账号注册接口api配置唯一标识")
+    private String apiMark;
+
+    @ActionDefaultTestValue("false")
+    @ActionOptionalParam(value = "false", desc = "可选值，true：自动提交流程，false：不自动提交流程")
+    @PrintParamMark
+    private String doSubmit = "false";
+
+
+    @Override
+    public void doSubmit(String requestId, String billTable, int workflowId, User user, RequestManager requestManager) {
+        dealWithMapping.setMainTable(billTable);
+        RequestMappingConfig requestMappingConfig = dealWithMapping.treeDealWithUniqueCode(apiMark);
+        String requestUrl = requestMappingConfig.getRequestUrl();
+        // TODO
+        if (Boolean.parseBoolean(doSubmit)) {
+            doSubmit(requestId);
+        }
+    }
+
+
+    private void doSubmit(String requestId) {
+        Util.submitWorkflowThread(Integer.valueOf(requestId), 1, "流程代码自动提交（注册账号）");
+    }
+
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/core/ContractParamTypeFactory.java b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/core/ContractParamTypeFactory.java
new file mode 100644
index 0000000..f83fe3b
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/core/ContractParamTypeFactory.java
@@ -0,0 +1,33 @@
+package weaver.aiyh_pcn.common_fadada.core;
+
+import aiyh.utils.excention.CustomerException;
+import weaver.aiyh_pcn.common_fadada.core.param_type_rule.*;
+
+/**
+ * <p>参数类型值处理转换</p>
+ * <p>create 2022/3/31 2:02 PM</p>
+ *
+ * @author ayh
+ */
+
+public class ContractParamTypeFactory {
+
+    public static ContractParamTypeHandle createParamType(Integer type){
+        switch (type){
+            case 0:
+                return new StringTypeRule();
+            case 1:
+                return new IntegerTypeRule();
+            case 2:
+                return new BooleanTypeRule();
+            case 3:
+                return new ObjectTypeRule();
+            case 4:
+                return new ArrayListTypeRule();
+            case 5:
+                return new ContractCreateObjetTypeRule();
+            default:
+                throw new CustomerException("不存在的类型" + type+",ContractParamTypeFactory.class");
+        }
+    }
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/core/ContractParamTypeHandle.java b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/core/ContractParamTypeHandle.java
new file mode 100644
index 0000000..3c653ca
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/core/ContractParamTypeHandle.java
@@ -0,0 +1,21 @@
+package weaver.aiyh_pcn.common_fadada.core;
+
+import weaver.aiyh_pcn.common_fadada.entity.ApiConfigDetailEntity;
+
+import java.util.Map;
+
+/**
+ * <p>值转换类心处理器</p>
+ * <p>create 2022/3/31 2:07 PM</p>
+ *
+ * @author ayh
+ */
+
+public interface ContractParamTypeHandle {
+    /**
+     * 参数值类型转换
+     * @param o 值
+     * @return 值转换规则
+     */
+    public Object execute(Object o, ApiConfigDetailEntity mapping, Map<String, String> mainData);
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/core/ContractTableFactory.java b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/core/ContractTableFactory.java
new file mode 100644
index 0000000..24982c1
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/core/ContractTableFactory.java
@@ -0,0 +1,24 @@
+package weaver.aiyh_pcn.common_fadada.core;
+
+import aiyh.utils.excention.CustomerException;
+
+/**
+ * <p>工厂</p>
+ * <p>create 2022/3/30 5:12 PM</p>
+ *
+ * @author ayh
+ */
+
+public class ContractTableFactory {
+
+    public static ContractTableHandler createHandler(int type){
+        switch (type){
+            case 0:
+                return new MainTableHandler();
+            case 1:
+                return new DetailTableHandler();
+            default:
+                throw new CustomerException("未知的处理类型，请检查type的值或编写新的处理方法类");
+        }
+    }
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/core/ContractTableHandler.java b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/core/ContractTableHandler.java
new file mode 100644
index 0000000..9e33fa5
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/core/ContractTableHandler.java
@@ -0,0 +1,22 @@
+package weaver.aiyh_pcn.common_fadada.core;
+
+import weaver.aiyh_pcn.common_fadada.entity.ContractConfigEntity;
+import weaver.aiyh_pcn.common_fadada.entity.RequestParamEntity;
+
+/**
+ * <p>处理接口</p>
+ * <p>create 2022/3/30 5:13 PM</p>
+ *
+ * @author ayh
+ */
+
+public interface ContractTableHandler {
+
+    /**
+     * 处理合同配置信息
+     * @param configData 配置表数据
+     * @param requestId 流程id
+     * @return 请求信息
+     */
+    RequestParamEntity execute(ContractConfigEntity configData, String requestId);
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/core/ConversionRuleFactory.java b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/core/ConversionRuleFactory.java
new file mode 100644
index 0000000..1adc53c
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/core/ConversionRuleFactory.java
@@ -0,0 +1,36 @@
+package weaver.aiyh_pcn.common_fadada.core;
+
+import aiyh.utils.excention.CustomerException;
+import weaver.aiyh_pcn.common_fadada.core.conversion_rule.*;
+
+/**
+ * <p>值转换规则工厂</p>
+ * <p>create 2022/3/30 9:17 PM</p>
+ *
+ * @author ayh
+ */
+
+public class ConversionRuleFactory {
+    public static ConversionRuleHandler createRuleHandler(Integer changeRule) {
+        switch (changeRule){
+            case -1:
+                return  null;
+            case 0:
+                return new NormalChange();
+            case 1:
+                return new FixedValueChange();
+            case 2:
+                return new WorkflowFieldValueChange();
+            case 3:
+                return new CurrentDataChange();
+            case 4:
+                return new CurrentTimeChange();
+            case 6:
+                return new CustomerSqlChange();
+            case 11:
+                return new SingleFileChange();
+            default:
+                throw new CustomerException("不存在的类型" + changeRule+",ConversionRuleFactory.class");
+        }
+    }
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/core/ConversionRuleHandler.java b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/core/ConversionRuleHandler.java
new file mode 100644
index 0000000..6079986
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/core/ConversionRuleHandler.java
@@ -0,0 +1,23 @@
+package weaver.aiyh_pcn.common_fadada.core;
+
+import weaver.aiyh_pcn.common_fadada.entity.ApiConfigDetailEntity;
+
+import java.util.Map;
+
+/**
+ * <p>值转换接口</p>
+ * <p>create 2022/3/30 9:17 PM</p>
+ *
+ * @author ayh
+ */
+
+public interface ConversionRuleHandler {
+
+    /**
+     * 值转换规则转换值
+     * @param data 流程参数
+     * @param apiConfigDetailEntity 配置项
+     * @return 转换后的值
+     */
+    public Object execute(Map<String, String> data, ApiConfigDetailEntity apiConfigDetailEntity);
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/core/CustConsume.java b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/core/CustConsume.java
new file mode 100644
index 0000000..5d5cf27
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/core/CustConsume.java
@@ -0,0 +1,17 @@
+package weaver.aiyh_pcn.common_fadada.core;
+
+import aiyh.utils.httpUtil.ResponeVo;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import weaver.aiyh_pcn.common_fadada.entity.ContractConfigEntity;
+
+/**
+ * <p></p>
+ * <p>create 2022/4/1 4:54 PM</p>
+ *
+ * @author ayh
+ */
+
+@FunctionalInterface
+public interface CustConsume {
+    void run(String workflowId, String requestId, Integer userId, ContractConfigEntity configData, ResponeVo contract,int nextId) throws JsonProcessingException;
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/core/DetailTableHandler.java b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/core/DetailTableHandler.java
new file mode 100644
index 0000000..112c5cc
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/core/DetailTableHandler.java
@@ -0,0 +1,45 @@
+package weaver.aiyh_pcn.common_fadada.core;
+
+import aiyh.utils.Util;
+import com.alibaba.fastjson.JSON;
+import weaver.aiyh_pcn.common_fadada.entity.ApiConfigEntity;
+import weaver.aiyh_pcn.common_fadada.entity.ContractConfigEntity;
+import weaver.aiyh_pcn.common_fadada.entity.ParsingEntity;
+import weaver.aiyh_pcn.common_fadada.entity.RequestParamEntity;
+import weaver.aiyh_pcn.common_fadada.mapper.WorkflowDataMapper;
+import weaver.aiyh_pcn.common_fadada.util.FaContractUtil;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>明细表处理</p>
+ * <p>create 2022/3/31 3:31 PM</p>
+ *
+ * @author ayh
+ */
+
+public class DetailTableHandler implements ContractTableHandler{
+    private final WorkflowDataMapper mapper = Util.getMapper(WorkflowDataMapper.class);
+    private final FaContractUtil faContractUtil = new FaContractUtil();
+    @Override
+    public RequestParamEntity execute(ContractConfigEntity configData, String requestId) {
+        Map<String, String> mainData = mapper.selectMainDataByRequestId(configData.getWorkflowTableName(),requestId);
+        Util.getLogger().info("获取主表数据：" + JSON.toJSONString(mainData));
+        List<Map<String, String>> detailData = mapper.selectDetailDataByMainId(configData.getWorkflowDetailTableName(),
+                Integer.parseInt(String.valueOf(mainData.get("id"))));
+        Util.getLogger().info("明细表数据：" + JSON.toJSONString(detailData));
+        ApiConfigEntity apiConfigEntity = configData.getApiConfigEntity();
+        ParsingEntity parsingEntity = new ParsingEntity();
+        parsingEntity.setApiConfigEntity(apiConfigEntity);
+        parsingEntity.setMainData(mainData);
+        parsingEntity.setDetailData(detailData);
+        parsingEntity.setRequestId(requestId);
+        parsingEntity.setDetailTableName(configData.getWorkflowDetailTableName());
+        List<Map<String, Object>> mapList = faContractUtil.parsingDetailData(parsingEntity);
+        RequestParamEntity requestParamEntity = new RequestParamEntity();
+        requestParamEntity.setType(2);
+        requestParamEntity.setParamMapList(mapList);
+        return requestParamEntity;
+    }
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/core/MainTableHandler.java b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/core/MainTableHandler.java
new file mode 100644
index 0000000..207af5a
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/core/MainTableHandler.java
@@ -0,0 +1,40 @@
+package weaver.aiyh_pcn.common_fadada.core;
+
+import aiyh.utils.Util;
+import com.alibaba.fastjson.JSON;
+import weaver.aiyh_pcn.common_fadada.entity.ApiConfigEntity;
+import weaver.aiyh_pcn.common_fadada.entity.ContractConfigEntity;
+import weaver.aiyh_pcn.common_fadada.entity.ParsingEntity;
+import weaver.aiyh_pcn.common_fadada.entity.RequestParamEntity;
+import weaver.aiyh_pcn.common_fadada.mapper.WorkflowDataMapper;
+import weaver.aiyh_pcn.common_fadada.util.FaContractUtil;
+
+import java.util.Map;
+
+/**
+ * <p></p>
+ * <p>create 2022/3/30 5:14 PM</p>
+ *
+ * @author ayh
+ */
+
+public class MainTableHandler implements ContractTableHandler {
+    private final WorkflowDataMapper mapper = Util.getMapper(WorkflowDataMapper.class);
+    private final FaContractUtil faContractUtil = new FaContractUtil();
+    @Override
+    public RequestParamEntity execute(ContractConfigEntity configData, String requestId) {
+        Map<String, String> mainData = mapper.selectMainDataByRequestId(configData.getWorkflowTableName(), requestId);
+        Util.getLogger().info("查询主表数据：" + JSON.toJSONString(mainData));
+        ApiConfigEntity apiConfigEntity = configData.getApiConfigEntity();
+        ParsingEntity parsingEntity = new ParsingEntity();
+        parsingEntity.setApiConfigEntity(apiConfigEntity);
+        parsingEntity.setMainData(mainData);
+        parsingEntity.setRequestId(requestId);
+        parsingEntity.setDetailTableName(configData.getWorkflowDetailTableName());
+        Map<String, Object> map = faContractUtil.parsingMainData(parsingEntity);
+        RequestParamEntity requestParamEntity = new RequestParamEntity();
+        requestParamEntity.setType(1);
+        requestParamEntity.setParamMap(map);
+        return requestParamEntity;
+    }
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/core/SignTypeFactory.java b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/core/SignTypeFactory.java
new file mode 100644
index 0000000..558e16e
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/core/SignTypeFactory.java
@@ -0,0 +1,26 @@
+package weaver.aiyh_pcn.common_fadada.core;
+
+import aiyh.utils.excention.CustomerException;
+import weaver.aiyh_pcn.common_fadada.core.sign_type_rule.DoubleSignContractRule;
+import weaver.aiyh_pcn.common_fadada.core.sign_type_rule.SingleSignContractRule;
+
+/**
+ * <p>签署方式处理</p>
+ * <p>create 2022/4/1 2:31 PM</p>
+ *
+ * @author ayh
+ */
+
+public class SignTypeFactory {
+
+    public static SignTypeHandle createSignTypeHandler(Integer type){
+        switch (type){
+            case 0:
+                return new SingleSignContractRule();
+            case 1:
+                return new DoubleSignContractRule();
+            default:
+                throw new CustomerException("不存在的合同类型，" + type + " => createSignTypeHandler.class");
+        }
+    }
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/core/SignTypeHandle.java b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/core/SignTypeHandle.java
new file mode 100644
index 0000000..9eb3981
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/core/SignTypeHandle.java
@@ -0,0 +1,23 @@
+package weaver.aiyh_pcn.common_fadada.core;
+
+import aiyh.utils.httpUtil.ResponeVo;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import weaver.aiyh_pcn.common_fadada.entity.ContractConfigEntity;
+import weaver.aiyh_pcn.common_fadada.entity.FaResultEntity;
+
+import java.util.List;
+import java.util.Map;
+import java.util.function.BiFunction;
+
+/**
+ * <p>签署方式处理</p>
+ * <p>create 2022/4/1 2:31 PM</p>
+ *
+ * @author ayh
+ */
+
+public interface SignTypeHandle {
+    List<FaResultEntity>  execute(String workflowId,String requestId,Integer userId,ContractConfigEntity configData, List<Map<String, Object>> paramMapList,
+                                  String apiUrl, BiFunction<Map<String, Object>, String, ResponeVo> request,
+                                  CustConsume custConsume) throws JsonProcessingException;
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/core/conversion_rule/CurrentDataChange.java b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/core/conversion_rule/CurrentDataChange.java
new file mode 100644
index 0000000..cd3c1c8
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/core/conversion_rule/CurrentDataChange.java
@@ -0,0 +1,26 @@
+package weaver.aiyh_pcn.common_fadada.core.conversion_rule;
+
+import aiyh.utils.Util;
+import com.google.common.base.Strings;
+import weaver.aiyh_pcn.common_fadada.core.ConversionRuleHandler;
+import weaver.aiyh_pcn.common_fadada.entity.ApiConfigDetailEntity;
+
+import java.util.Map;
+
+/**
+ * <p>当前系统时间</p>
+ * <p>create 2022/3/31 1:04 AM</p>
+ *
+ * @author ayh
+ */
+
+public class CurrentDataChange implements ConversionRuleHandler {
+    @Override
+    public Object execute(Map<String, String> data, ApiConfigDetailEntity apiConfigDetailEntity) {
+        String paramValue = apiConfigDetailEntity.getParamValue();
+        if(Strings.isNullOrEmpty(paramValue)){
+            return Util.getTime("yyyy-MM-dd");
+        }
+        return Util.getTime(paramValue);
+    }
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/core/conversion_rule/CurrentTimeChange.java b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/core/conversion_rule/CurrentTimeChange.java
new file mode 100644
index 0000000..c336503
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/core/conversion_rule/CurrentTimeChange.java
@@ -0,0 +1,20 @@
+package weaver.aiyh_pcn.common_fadada.core.conversion_rule;
+
+import weaver.aiyh_pcn.common_fadada.core.ConversionRuleHandler;
+import weaver.aiyh_pcn.common_fadada.entity.ApiConfigDetailEntity;
+
+import java.util.Map;
+
+/**
+ * <p>当前时间戳</p>
+ * <p>create 2022/3/31 1:07 AM</p>
+ *
+ * @author ayh
+ */
+
+public class CurrentTimeChange implements ConversionRuleHandler {
+    @Override
+    public Object execute(Map<String, String> data, ApiConfigDetailEntity apiConfigDetailEntity) {
+        return System.currentTimeMillis();
+    }
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/core/conversion_rule/CustomerSqlChange.java b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/core/conversion_rule/CustomerSqlChange.java
new file mode 100644
index 0000000..91f679d
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/core/conversion_rule/CustomerSqlChange.java
@@ -0,0 +1,31 @@
+package weaver.aiyh_pcn.common_fadada.core.conversion_rule;
+
+import aiyh.utils.Util;
+import weaver.aiyh_pcn.common_fadada.core.ConversionRuleHandler;
+import weaver.aiyh_pcn.common_fadada.entity.ApiConfigDetailEntity;
+import weaver.aiyh_pcn.common_fadada.mapper.WorkflowDataMapper;
+
+import java.util.Map;
+
+/**
+ * <p>自定义sql</p>
+ * <p>create 2022/3/31 1:08 AM</p>
+ *
+ * @author ayh
+ */
+
+public class CustomerSqlChange implements ConversionRuleHandler {
+
+    public static final String SELECT = "select ";
+    private final WorkflowDataMapper mapper = Util.getMapper(WorkflowDataMapper.class);
+
+    @Override
+    public Object execute(Map<String, String> data, ApiConfigDetailEntity apiConfigDetailEntity) {
+        String paramValue = apiConfigDetailEntity.getParamValue();
+        paramValue = Util.sbc2dbcCase(paramValue);
+        if(paramValue.trim().toLowerCase().startsWith(SELECT)){
+            return mapper.selectValueByCustomerSql(paramValue,data);
+        }
+        return null;
+    }
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/core/conversion_rule/FixedValueChange.java b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/core/conversion_rule/FixedValueChange.java
new file mode 100644
index 0000000..8cf0b5d
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/core/conversion_rule/FixedValueChange.java
@@ -0,0 +1,20 @@
+package weaver.aiyh_pcn.common_fadada.core.conversion_rule;
+
+import weaver.aiyh_pcn.common_fadada.core.ConversionRuleHandler;
+import weaver.aiyh_pcn.common_fadada.entity.ApiConfigDetailEntity;
+
+import java.util.Map;
+
+/**
+ * <p>固定值</p>
+ * <p>create 2022/3/31 12:45 AM</p>
+ *
+ * @author ayh
+ */
+
+public class FixedValueChange implements ConversionRuleHandler {
+    @Override
+    public Object execute(Map<String, String> data, ApiConfigDetailEntity apiConfigDetailEntity) {
+        return apiConfigDetailEntity.getParamValue();
+    }
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/core/conversion_rule/NormalChange.java b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/core/conversion_rule/NormalChange.java
new file mode 100644
index 0000000..528fbcc
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/core/conversion_rule/NormalChange.java
@@ -0,0 +1,33 @@
+package weaver.aiyh_pcn.common_fadada.core.conversion_rule;
+
+import weaver.aiyh_pcn.common_fadada.core.ConversionRuleHandler;
+import weaver.aiyh_pcn.common_fadada.entity.ApiConfigDetailEntity;
+
+import java.util.Map;
+
+/**
+ * <p>不转换</p>
+ * <p>create 2022/3/30 11:12 PM</p>
+ *
+ * @author ayh
+ */
+
+public class NormalChange implements ConversionRuleHandler {
+
+    public static final String DT = "_dt";
+
+    @Override
+    public Object execute(Map<String, String> data, ApiConfigDetailEntity apiConfigDetailEntity) {
+        String workflowField = apiConfigDetailEntity.getWorkflowFieldName();
+        String workflowFieldTable = apiConfigDetailEntity.getWorkflowFieldTable();
+        if(workflowFieldTable.contains(DT)){
+            return data.get(getDetailPrefix(workflowFieldTable) + "_" + workflowField);
+        }
+        return data.get("main_" + workflowField);
+    }
+
+
+    private String getDetailPrefix(String detailTableName) {
+        return "detail_" + detailTableName.substring(detailTableName.indexOf(DT) + 3);
+    }
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/core/conversion_rule/SingleFileChange.java b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/core/conversion_rule/SingleFileChange.java
new file mode 100644
index 0000000..62105cd
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/core/conversion_rule/SingleFileChange.java
@@ -0,0 +1,55 @@
+package weaver.aiyh_pcn.common_fadada.core.conversion_rule;
+
+import aiyh.utils.Util;
+import aiyh.utils.excention.CustomerException;
+import com.google.common.base.Strings;
+import weaver.aiyh_pcn.common_fadada.core.ConversionRuleHandler;
+import weaver.aiyh_pcn.common_fadada.entity.ApiConfigDetailEntity;
+import weaver.aiyh_pcn.common_fadada.entity.CreateFileEntity;
+import weaver.aiyh_pcn.common_fadada.mapper.WorkflowDataMapper;
+import weaver.file.ImageFileManager;
+
+import java.io.InputStream;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>单文件处理</p>
+ * <p>create 2022/3/31 10:32 AM</p>
+ *
+ * @author ayh
+ */
+
+public class SingleFileChange implements ConversionRuleHandler {
+
+    public static final String DT = "_dt";
+    private final WorkflowDataMapper mapper = Util.getMapper(WorkflowDataMapper.class);
+    @Override
+    public Object execute(Map<String, String> data, ApiConfigDetailEntity apiConfigDetailEntity) {
+        String workflowFieldName = apiConfigDetailEntity.getWorkflowFieldName();
+        String docId;
+        String tableName = apiConfigDetailEntity.getWorkflowFieldTable();
+        if(tableName.contains(DT)){
+            docId = data.get(getDetailPrefix(tableName) + "_" + workflowFieldName);
+        }else {
+            docId = data.get("main_" + workflowFieldName);
+        }
+        if(Strings.isNullOrEmpty(docId)){
+            throw  new CustomerException("查询到的文件id为空，请检查配置和表单数据是否有值！");
+        }
+        List<CreateFileEntity> createFileEntities = mapper.selectImgFileIdByDocIds(docId.split(","));
+        for (CreateFileEntity createFileEntity : createFileEntities) {
+            InputStream inputStreamById = ImageFileManager.getInputStreamById(createFileEntity.getImageFileId());
+            createFileEntity.setFile(inputStreamById);
+            String imageFileName = createFileEntity.getImageFileName();
+            createFileEntity.setContractExtension(imageFileName.substring(imageFileName.lastIndexOf(".")));
+            createFileEntity.setContractTitle(imageFileName);
+            createFileEntity.setUploadType(1);
+        }
+        return createFileEntities.get(0);
+     }
+
+    private String getDetailPrefix(String detailTableName) {
+        return "detail_" + detailTableName.substring(detailTableName.indexOf(DT) + 3);
+    }
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/core/conversion_rule/WorkflowFieldValueChange.java b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/core/conversion_rule/WorkflowFieldValueChange.java
new file mode 100644
index 0000000..c9e454e
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/core/conversion_rule/WorkflowFieldValueChange.java
@@ -0,0 +1,33 @@
+package weaver.aiyh_pcn.common_fadada.core.conversion_rule;
+
+import weaver.aiyh_pcn.common_fadada.core.ConversionRuleHandler;
+import weaver.aiyh_pcn.common_fadada.entity.ApiConfigDetailEntity;
+
+import java.util.Map;
+
+/**
+ * <p>流程字段值</p>
+ * <p>create 2022/3/31 12:49 AM</p>
+ *
+ * @author ayh
+ */
+
+public class WorkflowFieldValueChange implements ConversionRuleHandler {
+
+    public static final String DT = "_dt";
+
+    @Override
+    public Object execute(Map<String, String> data, ApiConfigDetailEntity apiConfigDetailEntity) {
+        String workflowField = apiConfigDetailEntity.getWorkflowFieldName();
+        String workflowFieldTable = apiConfigDetailEntity.getWorkflowFieldTable();
+        if(workflowFieldTable.contains(DT)){
+            return data.get(getDetailPrefix(workflowFieldTable) + "_" + workflowField);
+        }
+        return data.get("main_" + workflowField);
+    }
+
+
+    private String getDetailPrefix(String detailTableName) {
+        return "detail_" + detailTableName.substring(detailTableName.indexOf(DT) + 3);
+    }
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/core/param_type_rule/ArrayListTypeRule.java b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/core/param_type_rule/ArrayListTypeRule.java
new file mode 100644
index 0000000..fe7c960
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/core/param_type_rule/ArrayListTypeRule.java
@@ -0,0 +1,20 @@
+package weaver.aiyh_pcn.common_fadada.core.param_type_rule;
+
+import weaver.aiyh_pcn.common_fadada.core.ContractParamTypeHandle;
+import weaver.aiyh_pcn.common_fadada.entity.ApiConfigDetailEntity;
+
+import java.util.Map;
+
+/**
+ * <p>数组</p>
+ * <p>create 2022/3/31 2:15 PM</p>
+ *
+ * @author ayh
+ */
+
+public class ArrayListTypeRule implements ContractParamTypeHandle {
+    @Override
+    public Object execute(Object o, ApiConfigDetailEntity mapping, Map<String, String> mainData) {
+        return o;
+    }
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/core/param_type_rule/BooleanTypeRule.java b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/core/param_type_rule/BooleanTypeRule.java
new file mode 100644
index 0000000..7ade50f
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/core/param_type_rule/BooleanTypeRule.java
@@ -0,0 +1,20 @@
+package weaver.aiyh_pcn.common_fadada.core.param_type_rule;
+
+import weaver.aiyh_pcn.common_fadada.core.ContractParamTypeHandle;
+import weaver.aiyh_pcn.common_fadada.entity.ApiConfigDetailEntity;
+
+import java.util.Map;
+
+/**
+ * <p>布尔类型</p>
+ * <p>create 2022/3/31 2:13 PM</p>
+ *
+ * @author ayh
+ */
+
+public class BooleanTypeRule implements ContractParamTypeHandle {
+    @Override
+    public Boolean execute(Object o, ApiConfigDetailEntity mapping, Map<String, String> mainData) {
+       return Boolean.parseBoolean(String.valueOf(o));
+    }
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/core/param_type_rule/ContractCreateObjetTypeRule.java b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/core/param_type_rule/ContractCreateObjetTypeRule.java
new file mode 100644
index 0000000..76850b5
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/core/param_type_rule/ContractCreateObjetTypeRule.java
@@ -0,0 +1,21 @@
+package weaver.aiyh_pcn.common_fadada.core.param_type_rule;
+
+import weaver.aiyh_pcn.common_fadada.core.ContractParamTypeHandle;
+import weaver.aiyh_pcn.common_fadada.entity.ApiConfigDetailEntity;
+import weaver.aiyh_pcn.common_fadada.entity.CreateFileEntity;
+
+import java.util.Map;
+
+/**
+ * <p>合同对象</p>
+ * <p>create 2022/3/31 2:18 PM</p>
+ *
+ * @author ayh
+ */
+
+public class ContractCreateObjetTypeRule implements ContractParamTypeHandle {
+    @Override
+    public CreateFileEntity execute(Object o, ApiConfigDetailEntity mapping, Map<String, String> mainData) {
+        return (CreateFileEntity) o;
+    }
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/core/param_type_rule/IntegerTypeRule.java b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/core/param_type_rule/IntegerTypeRule.java
new file mode 100644
index 0000000..7ba7d8b
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/core/param_type_rule/IntegerTypeRule.java
@@ -0,0 +1,20 @@
+package weaver.aiyh_pcn.common_fadada.core.param_type_rule;
+
+import weaver.aiyh_pcn.common_fadada.core.ContractParamTypeHandle;
+import weaver.aiyh_pcn.common_fadada.entity.ApiConfigDetailEntity;
+
+import java.util.Map;
+
+/**
+ * <p>整数类型</p>
+ * <p>create 2022/3/31 2:12 PM</p>
+ *
+ * @author ayh
+ */
+
+public class IntegerTypeRule implements ContractParamTypeHandle {
+    @Override
+    public Integer execute(Object o, ApiConfigDetailEntity mapping, Map<String, String> mainData) {
+       return Integer.parseInt(String.valueOf(o));
+    }
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/core/param_type_rule/ObjectTypeRule.java b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/core/param_type_rule/ObjectTypeRule.java
new file mode 100644
index 0000000..fa7f12f
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/core/param_type_rule/ObjectTypeRule.java
@@ -0,0 +1,33 @@
+package weaver.aiyh_pcn.common_fadada.core.param_type_rule;
+
+import aiyh.utils.Util;
+import com.alibaba.fastjson.JSON;
+import weaver.aiyh_pcn.common_fadada.core.ContractParamTypeHandle;
+import weaver.aiyh_pcn.common_fadada.entity.ApiConfigDetailEntity;
+import weaver.aiyh_pcn.common_fadada.util.FaContractUtil;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>对象类型</p>
+ * <p>create 2022/3/31 2:15 PM</p>
+ *
+ * @author ayh
+ */
+
+public class ObjectTypeRule implements ContractParamTypeHandle {
+    @Override
+    public Object execute(Object o, ApiConfigDetailEntity mapping, Map<String, String> mainData) {
+        Util.getLogger().info("对象类型，处理参数：" + JSON.toJSONString(mapping));
+        Map<String, Object> map = new HashMap<>();
+        List<ApiConfigDetailEntity> childList = mapping.getChildList();
+        FaContractUtil faContractUtil = new FaContractUtil();
+        Map<String, Object> result = faContractUtil.childHandler(childList, mainData);
+        Util.getLogger().info("对象类型，处理结果：" + JSON.toJSONString(result));
+        map.put(mapping.getParamName(), result);
+        Util.getLogger().info("最终结果：" + JSON.toJSONString(map));
+        return map;
+    }
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/core/param_type_rule/StringTypeRule.java b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/core/param_type_rule/StringTypeRule.java
new file mode 100644
index 0000000..e45cc98
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/core/param_type_rule/StringTypeRule.java
@@ -0,0 +1,21 @@
+package weaver.aiyh_pcn.common_fadada.core.param_type_rule;
+
+import aiyh.utils.Util;
+import weaver.aiyh_pcn.common_fadada.core.ContractParamTypeHandle;
+import weaver.aiyh_pcn.common_fadada.entity.ApiConfigDetailEntity;
+
+import java.util.Map;
+
+/**
+ * <p>string 类型参数值</p>
+ * <p>create 2022/3/31 2:06 PM</p>
+ *
+ * @author ayh
+ */
+
+public class StringTypeRule implements ContractParamTypeHandle {
+    @Override
+    public String execute(Object o, ApiConfigDetailEntity mapping, Map<String, String> mainData) {
+        return Util.null2String(o);
+    }
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/core/sign_type_rule/DoubleSignContractRule.java b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/core/sign_type_rule/DoubleSignContractRule.java
new file mode 100644
index 0000000..3b59c1a
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/core/sign_type_rule/DoubleSignContractRule.java
@@ -0,0 +1,61 @@
+package weaver.aiyh_pcn.common_fadada.core.sign_type_rule;
+
+import aiyh.utils.httpUtil.ResponeVo;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import weaver.aiyh_pcn.common_fadada.core.CustConsume;
+import weaver.aiyh_pcn.common_fadada.core.SignTypeHandle;
+import weaver.aiyh_pcn.common_fadada.entity.ContractConfigEntity;
+import weaver.aiyh_pcn.common_fadada.entity.FaResultEntity;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.function.BiFunction;
+
+/**
+ * <p>双方合同</p>
+ * <p>create 2022/4/1 2:50 PM</p>
+ *
+ * @author ayh
+ */
+
+public class DoubleSignContractRule implements SignTypeHandle {
+
+    @Override
+    public List<FaResultEntity> execute(String workflowId, String requestId, Integer userId,
+                                        ContractConfigEntity configData, List<Map<String, Object>> paramMapList,
+                                        String apiUrl,
+                                        BiFunction<Map<String, Object>, String, ResponeVo> request,
+                                        CustConsume custConsume) throws JsonProcessingException {
+        List<FaResultEntity> resultList = new ArrayList<>();
+        int i = 0;
+        for (Map<String, Object> map : paramMapList) {
+            i ++;
+            Object devDetailId = map.get("devDetailId");
+            map.remove("devDetailId");
+            ResponeVo apply = request.apply(map, apiUrl);
+            FaResultEntity faResultEntity = new FaResultEntity();
+            faResultEntity.setResponeVo(apply);
+            faResultEntity.setType(2);
+            faResultEntity.setDetailTable(configData.getWorkflowDetailTableName());
+            faResultEntity.setDetailId(Integer.parseInt(String.valueOf(devDetailId)));
+            resultList.add(faResultEntity);
+            Object next;
+            try {
+                if(i >= paramMapList.size()){
+                    next = "0";
+                }else {
+                    next = paramMapList.get(i).get("devDetailId");
+                }
+                if(Objects.isNull(next)) {
+                    next = "0";
+                }
+            }catch (Exception e){
+                next = "0";
+            }
+            custConsume.run(workflowId,requestId,userId,configData,apply,Integer.parseInt(String.valueOf(next)));
+        }
+        return resultList;
+    }
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/core/sign_type_rule/SingleSignContractRule.java b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/core/sign_type_rule/SingleSignContractRule.java
new file mode 100644
index 0000000..487690e
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/core/sign_type_rule/SingleSignContractRule.java
@@ -0,0 +1,42 @@
+package weaver.aiyh_pcn.common_fadada.core.sign_type_rule;
+
+import aiyh.utils.httpUtil.ResponeVo;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import weaver.aiyh_pcn.common_fadada.core.CustConsume;
+import weaver.aiyh_pcn.common_fadada.core.SignTypeHandle;
+import weaver.aiyh_pcn.common_fadada.entity.ContractConfigEntity;
+import weaver.aiyh_pcn.common_fadada.entity.FaResultEntity;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.function.BiFunction;
+
+/**
+ * <p>单方合同</p>
+ * <p>create 2022/4/1 2:39 PM</p>
+ *
+ * @author ayh
+ */
+
+public class SingleSignContractRule implements SignTypeHandle {
+
+
+    @Override
+    public List<FaResultEntity> execute(String workflowId, String requestId, Integer userId, ContractConfigEntity configData, List<Map<String, Object>> paramMapList, String apiUrl, BiFunction<Map<String, Object>, String, ResponeVo> request, CustConsume custConsume) throws JsonProcessingException {
+        List<FaResultEntity> resultList = new ArrayList<>();
+        for (Map<String, Object> map : paramMapList) {
+            Object devDetailId = map.get("devDetailId");
+            map.remove("devDetailId");
+            ResponeVo apply = request.apply(map, apiUrl);
+            FaResultEntity faResultEntity = new FaResultEntity();
+            faResultEntity.setResponeVo(apply);
+            faResultEntity.setType(2);
+            faResultEntity.setDetailTable(configData.getWorkflowDetailTableName());
+            faResultEntity.setDetailId(Integer.parseInt(String.valueOf(devDetailId)));
+            resultList.add(faResultEntity);
+            custConsume.run(workflowId, requestId, userId, configData, apply, 0);
+        }
+        return resultList;
+    }
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/entity/ApiConfigDetailEntity.java b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/entity/ApiConfigDetailEntity.java
new file mode 100644
index 0000000..691c801
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/entity/ApiConfigDetailEntity.java
@@ -0,0 +1,34 @@
+package weaver.aiyh_pcn.common_fadada.entity;
+
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+import java.util.List;
+
+/**
+ * <p>api明细</p>
+ * <p>create 2022/3/30 5:38 PM</p>
+ *
+ * @author ayh
+ */
+@Setter
+@Getter
+@ToString
+public class ApiConfigDetailEntity {
+    private Integer id;
+    private Integer lineNum;
+    private String paramName;
+    private Integer paramType;
+    private Integer objectChild;
+    private Integer parentLine;
+    private Integer changeRule;
+    private String paramValue;
+    private String workflowField;
+    private String arraySql;
+    private String paramDetail;
+    private Integer areUse;
+    private String workflowFieldName;
+    private String workflowFieldTable;
+    private List<ApiConfigDetailEntity> childList;
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/entity/ApiConfigEntity.java b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/entity/ApiConfigEntity.java
new file mode 100644
index 0000000..849376e
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/entity/ApiConfigEntity.java
@@ -0,0 +1,25 @@
+package weaver.aiyh_pcn.common_fadada.entity;
+
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+import java.util.List;
+
+/**
+ * <p>api配置信息</p>
+ * <p>create 2022/3/30 5:36 PM</p>
+ *
+ * @author ayh
+ */
+
+@Setter
+@Getter
+@ToString
+public class ApiConfigEntity {
+    Integer id;
+    Integer workflowType;
+    String apiName;
+    String apiUrl;
+    List<ApiConfigDetailEntity> mappings;
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/entity/CommonServiceResult.java b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/entity/CommonServiceResult.java
new file mode 100644
index 0000000..e1db682
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/entity/CommonServiceResult.java
@@ -0,0 +1,20 @@
+package weaver.aiyh_pcn.common_fadada.entity;
+
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+/**
+ * <p>公共业务逻辑处理结果</p>
+ * <p>create 2022/4/1 11:30 AM</p>
+ *
+ * @author ayh
+ */
+
+@Setter
+@Getter
+@ToString
+public class CommonServiceResult {
+    private RequestParamEntity requestParamEntity;
+    private ContractConfigEntity contractConfigEntity;
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/entity/ContractConfigEntity.java b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/entity/ContractConfigEntity.java
new file mode 100644
index 0000000..76fc4e9
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/entity/ContractConfigEntity.java
@@ -0,0 +1,31 @@
+package weaver.aiyh_pcn.common_fadada.entity;
+
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+/**
+ * <p>新建合同配置信息</p>
+ * <p>create 2022/3/30 5:18 PM</p>
+ *
+ * @author ayh
+ */
+
+@Getter
+@Setter
+@ToString
+public class ContractConfigEntity {
+    private Integer id;
+    private Integer apiConfigId;
+    private Integer workflowType;
+    private Integer signType;
+    private Integer contractTable;
+    private String contractDetailTable;
+    private Integer contractField;
+    private String workflowTableName;
+    private String workflowDetailTableName;
+    private String contractFieldName;
+    private ApiConfigEntity apiConfigEntity;
+    private Integer apiType;
+    private Integer sequenceSign;
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/entity/CreateFileEntity.java b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/entity/CreateFileEntity.java
new file mode 100644
index 0000000..ca79b98
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/entity/CreateFileEntity.java
@@ -0,0 +1,27 @@
+package weaver.aiyh_pcn.common_fadada.entity;
+
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+import java.io.InputStream;
+
+/**
+ * <p>创建合同文件信息</p>
+ * <p>create 2022/3/31 10:40 AM</p>
+ *
+ * @author ayh
+ */
+
+@Getter
+@Setter
+@ToString
+public class CreateFileEntity {
+    private Integer imageFileId;
+    private String imageFileName;
+    private String contractExtension;
+    private String contractTitle;
+    private String customerNo;
+    private int uploadType = 1;
+    private InputStream file;
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/entity/FaResultEntity.java b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/entity/FaResultEntity.java
new file mode 100644
index 0000000..5e7061e
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/entity/FaResultEntity.java
@@ -0,0 +1,27 @@
+package weaver.aiyh_pcn.common_fadada.entity;
+
+import aiyh.utils.httpUtil.ResponeVo;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+import java.io.InputStream;
+
+/**
+ * <p>发大大响应封装</p>
+ * <p>create 2022/4/1 10:55 AM</p>
+ *
+ * @author ayh
+ */
+
+@Getter
+@Setter
+@ToString
+public class FaResultEntity {
+    private Integer type;
+    private ResponeVo responeVo;
+    private Integer imageFileId;
+    private InputStream fileInputStream;
+    private Integer detailId;
+    private String detailTable;
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/entity/ParsingEntity.java b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/entity/ParsingEntity.java
new file mode 100644
index 0000000..6d492c2
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/entity/ParsingEntity.java
@@ -0,0 +1,26 @@
+package weaver.aiyh_pcn.common_fadada.entity;
+
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>解析参数</p>
+ * <p>create 2022/3/30 9:47 PM</p>
+ *
+ * @author ayh
+ */
+
+@Setter
+@Getter
+@ToString
+public class ParsingEntity {
+    private ApiConfigEntity apiConfigEntity;
+    private Map<String,String> mainData;
+    private List<Map<String,String>> detailData;
+    private String requestId;
+    private String detailTableName;
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/entity/RequestParamEntity.java b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/entity/RequestParamEntity.java
new file mode 100644
index 0000000..37ef22e
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/entity/RequestParamEntity.java
@@ -0,0 +1,24 @@
+package weaver.aiyh_pcn.common_fadada.entity;
+
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>请求参数实体类</p>
+ * <p>create 2022/3/31 4:02 PM</p>
+ *
+ * @author ayh
+ */
+
+@Getter
+@Setter
+@ToString
+public class RequestParamEntity {
+    private Integer type;
+    private Map<String,Object> paramMap;
+    private List<Map<String,Object>> paramMapList;
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/mapper/ActionMapper.java b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/mapper/ActionMapper.java
new file mode 100644
index 0000000..a2d6957
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/mapper/ActionMapper.java
@@ -0,0 +1,89 @@
+package weaver.aiyh_pcn.common_fadada.mapper;
+
+import aiyh.utils.annotation.recordset.*;
+import weaver.conn.RecordSet;
+
+import java.util.Map;
+
+/**
+ * <p>action 数据库操作</p>
+ * <p>create 2022/4/12 9:30 AM</p>
+ *
+ * @author ayh
+ */
+
+@SqlMapper
+public interface ActionMapper {
+
+
+    /**
+     * 更新合同号
+     *
+     * @param tableName     表名
+     * @param contractField 合同字段
+     * @param contractNo    合同号
+     * @param requestId     流程类型
+     * @return 是否更新成功
+     */
+    @Update("update $t{tableName} set $t{contractField} = #{contractNo} " +
+            " where requestid = #{requestId}")
+    boolean updateContractInMainTable(@ParamMapper("tableName") String tableName,
+                                      @ParamMapper("contractField") String contractField,
+                                      @ParamMapper("contractNo") String contractNo,
+                                      @ParamMapper("requestId") String requestId);
+
+
+    /**
+     * 更新合同号
+     *
+     * @param tableName     表名
+     * @param contractField 合同字段
+     * @param contractNo    合同号
+     * @param detailId      明细表ID
+     * @return 是否更新成功
+     */
+    @Update("update $t{tableName} set $t{contractField} = #{contractNo} " +
+            " where id = #{detailId}")
+    boolean updateContractInDetailTable(@ParamMapper("tableName") String tableName,
+                                        @ParamMapper("contractField") String contractField,
+                                        @ParamMapper("contractNo") String contractNo,
+                                        @ParamMapper("detailId") String detailId);
+
+    /**
+     * 查询主表rs
+     * @param billTable 表名
+     * @param requestId requestid
+     * @return 结果rs
+     */
+    @Select("select * from $t{tableName} where requestid = #{requestId}")
+    RecordSet selectMainRs(@ParamMapper("tableName") String billTable, @ParamMapper("requestId") String requestId);
+
+    /**
+     * 跟新合同状态到主表
+     * @param workflowTableName 流程表名
+     * @param signStatusField 签署状态字段
+     * @param requestId 请求id
+     * @param signSuccessValue 签署状态值
+     */
+    @Update("update $t{workflowTableName} set $t{signStatusField} = #{signSuccessValue} where requestid = #{requestId}")
+    void updateSignStatusMain(@ParamMapper("workflowTableName") String workflowTableName,
+                              @ParamMapper("signStatusField") String signStatusField,
+                              @ParamMapper("requestId") String requestId,
+                              @ParamMapper("signSuccessValue") String signSuccessValue);
+
+    /**
+     * 跟新合同状态到明细表
+     * @param workflowTableName 流程表名
+     * @param signStatusField 签署状态字段
+     * @param detailId 请求id
+     * @param signSuccessValue 签署状态值
+     */
+    @Update("update $t{workflowTableName} set $t{signStatusField} = #{signSuccessValue} where id = #{detailId}")
+    void updateSignStatusDetail(@ParamMapper("workflowTableName") String workflowTableName,
+                                @ParamMapper("signStatusField") String signStatusField,
+                                @ParamMapper("signSuccessValue") String signSuccessValue,
+                                @ParamMapper("detailId") Integer detailId);
+
+    @Update("update $t{_billTable} set $t{_updateField} where requestid = #{_requestId}")
+    boolean updateFields(Map<String,Object> param);
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/mapper/ConfigMapper.java b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/mapper/ConfigMapper.java
new file mode 100644
index 0000000..50789d8
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/mapper/ConfigMapper.java
@@ -0,0 +1,85 @@
+package weaver.aiyh_pcn.common_fadada.mapper;
+
+import aiyh.utils.annotation.recordset.*;
+import weaver.aiyh_pcn.common_fadada.entity.ApiConfigDetailEntity;
+import weaver.aiyh_pcn.common_fadada.entity.ApiConfigEntity;
+import weaver.aiyh_pcn.common_fadada.entity.ContractConfigEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>配置查询</p>
+ * <p>create 2022/3/30 5:17 PM</p>
+ *
+ * @author ayh
+ */
+
+@SqlMapper
+public interface ConfigMapper {
+
+
+    /**
+     * 查询配置表
+     *
+     * @param workflowIds 流程ID
+     * @param apiType     接口类型
+     * @return 数据
+     */
+    @Select("select * from uf_create_contract where workflow_type in (${workflowTypes}) and api_type = #{apiType}")
+    ContractConfigEntity selectContractConfig(@ParamMapper("workflowTypes") String[] workflowIds, @ParamMapper("apiType") Integer apiType);
+
+
+    /**
+     * 查询api配置信息
+     *
+     * @param apiConfigId api配置ID
+     * @return api配置数据
+     */
+    @Select("select * from uf_api_param_config where id = #{apiConfigId}")
+    ApiConfigEntity selectApiConfig(@ParamMapper("apiConfigId") Integer apiConfigId);
+
+    /**
+     * 查询api配置明细信息
+     *
+     * @param mainId 配置表主表id
+     * @return api配置明细数据
+     */
+    @Select("select * from uf_api_param_config_dt1 where mainid = #{mainId} and are_use = 1")
+    List<ApiConfigDetailEntity> selectApiConfigDetail(@ParamMapper("mainId") Integer mainId);
+
+
+    /**
+     * 更新数据库shave
+     *
+     * @param updateSql  自定义sql
+     * @param mapMapping 映射值
+     */
+    @Update(custom = true)
+    boolean updateDataInfo(@SqlString String updateSql, Map<String, Object> mapMapping);
+
+    @Delete("delete from $t{tableName} where id = #{modeDataId}")
+    void deleteDataById(@ParamMapper("tableName") String tableName,
+                        @ParamMapper("modeDataId") int modeDataId);
+
+
+    /**
+     * 更新见目标数据
+     *
+     * @param param 参数
+     * @return 是否更新成功
+     */
+    @Update("update uf_request_log set user_id = #{user_id}, workflow_id = #{workflow_id}," +
+            " request_id = #{request_id}, api_type = #{api_type}, api_result = #{api_result} where id = #{id}")
+    boolean updateModelData(Map<String, Object> param);
+
+
+    /**
+     * 根据请求ID查询文件名
+     *
+     * @param contractNo 请求ID
+     * @return 文件名
+     */
+    @Select("select contract_file_name from uf_contract_log where contract_id = #{contractNo}")
+    String selectContractFileName(@ParamMapper("contractNo") String contractNo);
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/mapper/RegisterFaDaDaMapper.java b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/mapper/RegisterFaDaDaMapper.java
new file mode 100644
index 0000000..f792273
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/mapper/RegisterFaDaDaMapper.java
@@ -0,0 +1,15 @@
+package weaver.aiyh_pcn.common_fadada.mapper;
+
+import aiyh.utils.annotation.recordset.SqlMapper;
+
+/**
+ * <h1>sql查询接口</h1>
+ *
+ * <p>create: 2022-11-09 11:31</p>
+ *
+ * @author aiyh EBU7-dev-1
+ */
+
+@SqlMapper
+public interface RegisterFaDaDaMapper {
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/mapper/WorkflowDataMapper.java b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/mapper/WorkflowDataMapper.java
new file mode 100644
index 0000000..4f385f8
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/mapper/WorkflowDataMapper.java
@@ -0,0 +1,60 @@
+package weaver.aiyh_pcn.common_fadada.mapper;
+
+import aiyh.utils.annotation.recordset.*;
+import weaver.aiyh_pcn.common_fadada.entity.CreateFileEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>流程数据查询</p>
+ * <p>create 2022/3/30 6:08 PM</p>
+ *
+ * @author ayh
+ */
+
+@SqlMapper
+public interface WorkflowDataMapper {
+
+    /**
+     * 查询主表数据
+     * @param requestId    请求ID
+     * @return 主表数据
+     */
+    @Select("select * from $t{tableName} where requestid = #{requestId}")
+    @CaseConversion(false)
+    Map<String,String> selectMainDataByRequestId(@ParamMapper("tableName") String tableName,
+                                                 @ParamMapper("requestId") String requestId);
+
+
+    /**
+     * 查询明细表数据
+     * @param tableName 明细表
+     * @param mainId 主表ID
+     * @return 明细表数据
+     */
+    @CaseConversion(false)
+    @Select("select * from $t{tableName} where mainid = #{mainId}")
+    List<Map<String,String>> selectDetailDataByMainId(@ParamMapper("tableName") String tableName,
+                                                      @ParamMapper("mainId") Integer mainId);
+
+
+    /**
+     * 自定义sql查询
+     * @param sql 自定义sql
+     * @param data 参数
+     * @return 查询结果
+     */
+    @Select(custom = true)
+    String selectValueByCustomerSql(@SqlString String sql, Map<String,String> data);
+
+
+    /**
+     * 根据docID查询物理文件ID
+     * @param fileIds docIds
+     * @return 文件信息
+     */
+    @Select("select imagefileid image_file_id,imagefilename image_file_name from docimagefile where docid in (${fileIds})")
+    List<CreateFileEntity> selectImgFileIdByDocIds(@ParamMapper("fileIds") String[] fileIds);
+
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/service/BatchSignContractService.java b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/service/BatchSignContractService.java
new file mode 100644
index 0000000..f75364b
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/service/BatchSignContractService.java
@@ -0,0 +1,120 @@
+package weaver.aiyh_pcn.common_fadada.service;
+
+import aiyh.utils.Util;
+import aiyh.utils.excention.CustomerException;
+import aiyh.utils.httpUtil.ResponeVo;
+import com.alibaba.fastjson.JSON;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import org.apache.log4j.Logger;
+import weaver.aiyh_pcn.common_fadada.entity.ContractConfigEntity;
+import weaver.aiyh_pcn.common_fadada.entity.FaResultEntity;
+import weaver.aiyh_pcn.common_fadada.entity.RequestParamEntity;
+import weaver.aiyh_pcn.common_fadada.mapper.ConfigMapper;
+import weaver.aiyh_pcn.common_fadada.util.FaRequestUtils;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>合同签署业务处理逻辑</p>
+ * <p>create 2022/4/1 10:53 AM</p>
+ *
+ * @author ayh
+ */
+
+public class BatchSignContractService implements IFaIntegration {
+    public static final String SUCCESS = "200";
+    private static final ConfigMapper CONFIG_MAPPER = Util.getMapper(ConfigMapper.class);
+    private final Logger logger = Util.getLogger();
+    private String workflowId;
+    private String requestId;
+    private Integer userId;
+    private Integer contractStatus = 1;
+    private Integer apiType = 6;
+
+    public static String builderUpdateSql(String modelTableName, Map<String, Object> mapping, Map<String, Object> whereMap) {
+        StringBuilder sb = new StringBuilder("update ");
+        sb.append(modelTableName)
+                .append(" set ");
+        int n = 0;
+        for (Map.Entry<String, Object> entry : mapping.entrySet()) {
+            n++;
+            sb.append(entry.getKey()).append("=#{").append(entry.getKey()).append("}");
+            if (n < mapping.size()) {
+                sb.append(",");
+            }
+        }
+        sb.append(" where ");
+        n = 0;
+        for (Map.Entry<String, Object> entry : whereMap.entrySet()) {
+            n++;
+            sb.append(entry.getKey()).append("=#{").append(entry.getKey()).append("}");
+            if (n < whereMap.size()) {
+                sb.append(" and ");
+            }
+        }
+        return sb.toString();
+    }
+
+    @Override
+    public List<FaResultEntity> execute(String workflowId, String requestId, Integer userId) throws JsonProcessingException {
+        this.requestId = requestId;
+        this.workflowId = workflowId;
+        this.userId = userId;
+        CommonService commonService = new CommonService();
+        return commonService.execute(workflowId, requestId, userId, apiType, this::detailHandle, this::request, this::doLog);
+    }
+
+    @Override
+    public List<FaResultEntity> detailHandle(ContractConfigEntity configData, RequestParamEntity execute) {
+        logger.info("批量签署，处理明细数据签署方式：" + JSON.toJSONString(execute));
+        List<Map<String, Object>> paramMapList = execute.getParamMapList();
+        logger.info("batch sign param: " + JSON.toJSONString(paramMapList));
+        String apiUrl = configData.getApiConfigEntity().getApiUrl();
+        //SignTypeHandle signTypeHandler = SignTypeFactory.createSignTypeHandler(configData.getSignType());
+        try {
+            //return signTypeHandler.execute(workflowId, requestId, userId, configData, paramMapList, apiUrl, this::request, this::doLog);
+            ResponeVo response = this.request(paramMapList, apiUrl);
+            FaResultEntity faResultEntity = new FaResultEntity();
+            faResultEntity.setResponeVo(response);
+            faResultEntity.setType(6);
+            faResultEntity.setDetailTable(configData.getWorkflowDetailTableName());
+            faResultEntity.setDetailId(-1);
+            this.doLog(workflowId, requestId, userId, configData, response, 0);
+            return Collections.singletonList(faResultEntity);
+        } catch (JsonProcessingException e) {
+            e.printStackTrace();
+            throw new CustomerException("json转换异常", e);
+        }
+    }
+
+    @Override
+    public ResponeVo request(Map<String, Object> paramMap, String apiUrl) {
+        Util.getLogger().info("开始签署->数据：" + JSON.toJSONString(paramMap));
+        return FaRequestUtils.batchSignedContract(paramMap, apiUrl);
+    }
+
+    public ResponeVo request(List<Map<String, Object>> paramMapList, String apiUrl) {
+        Util.getLogger().info("开始批量签署->数据：" + JSON.toJSONString(paramMapList));
+        for (Map<String, Object> param : paramMapList) {
+            param.remove("devDetailId");
+        }
+        return FaRequestUtils.batchSignedContract(new HashMap<String, Object>() {{
+            put("contractSignCommandList", paramMapList);
+        }}, apiUrl);
+    }
+
+    @Override
+    public void doLog(String workflowId, String requestId, Integer userId, ContractConfigEntity configData, ResponeVo contract, int nextId) throws JsonProcessingException {
+    }
+
+    public void setContractStatus(Integer contractStatus) {
+        this.contractStatus = contractStatus;
+    }
+
+    public void setApiType(Integer apiType) {
+        this.apiType = apiType;
+    }
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/service/CommonService.java b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/service/CommonService.java
new file mode 100644
index 0000000..7355c8f
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/service/CommonService.java
@@ -0,0 +1,108 @@
+package weaver.aiyh_pcn.common_fadada.service;
+
+import aiyh.utils.Util;
+import aiyh.utils.excention.CustomerException;
+import aiyh.utils.httpUtil.ResponeVo;
+import com.alibaba.fastjson.JSON;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import weaver.aiyh_pcn.common_fadada.core.ContractTableFactory;
+import weaver.aiyh_pcn.common_fadada.core.ContractTableHandler;
+import weaver.aiyh_pcn.common_fadada.core.CustConsume;
+import weaver.aiyh_pcn.common_fadada.entity.*;
+import weaver.aiyh_pcn.common_fadada.mapper.ConfigMapper;
+import weaver.workflow.workflow.WorkflowVersion;
+
+import java.io.ByteArrayInputStream;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.function.BiFunction;
+
+/**
+ * <p>公共逻辑类</p>
+ * <p>create 2022/4/1 11:26 AM</p>
+ *
+ * @author ayh
+ */
+
+public class CommonService {
+
+    private static final ConfigMapper CONFIG_MAPPER = Util.getMapper(ConfigMapper.class);
+    public static final String SUCCESS = "200";
+
+    public List<FaResultEntity> execute(String workflowId, String requestId, Integer userId,
+                                        Integer apiType,
+                                        BiFunction<ContractConfigEntity, RequestParamEntity, List<FaResultEntity>> detailFun,
+                                        BiFunction<Map<String, Object>, String, ResponeVo> request,
+                                        // 日志
+                                        CustConsume custConsume) throws JsonProcessingException {
+        ContractConfigEntity configData = getConfigData(workflowId, apiType);
+        Util.getLogger().info("获取总配置数据成功：" + JSON.toJSONString(configData));
+        List<FaResultEntity> resultList = new ArrayList<>();
+        ContractTableHandler handler = ContractTableFactory.createHandler(configData.getContractTable());
+        Util.getLogger().info("获取合同表处理器成功：");
+
+        RequestParamEntity execute = null;
+        try {
+            execute = handler.execute(configData, requestId);
+        } catch (Exception e) {
+            Util.getLogger().error("出错了：" + Util.getErrString(e));
+        }
+        Util.getLogger().info("获取表单配置和流程数据成功：" + JSON.toJSONString(execute));
+        Util.getLogger().info("获取请求数据成功：" + JSON.toJSONString(execute));
+        CommonServiceResult commonServiceResult = new CommonServiceResult();
+        commonServiceResult.setRequestParamEntity(execute);
+        commonServiceResult.setContractConfigEntity(configData);
+        String apiUrl = configData.getApiConfigEntity().getApiUrl();
+        Integer type = execute.getType();
+        if (type == 1) {
+//            信息在主表
+            Map<String, Object> paramMap = execute.getParamMap();
+            // 发送请求
+            ResponeVo contract = request.apply(paramMap, apiUrl);
+            // 写日志
+            custConsume.run(workflowId, requestId, userId, configData, contract, 0);
+            FaResultEntity faResultEntity = new FaResultEntity();
+            faResultEntity.setResponeVo(contract);
+            if (contract.getEntityString() != null) {
+                try {
+                    faResultEntity.setImageFileId(Integer.parseInt(contract.getEntityString()));
+                } catch (Exception e) {
+                    faResultEntity.setImageFileId(-1);
+                }
+            }
+            faResultEntity.setType(1);
+            if (contract.getContentByteArr() != null && contract.getContentByteArr().length != 0) {
+                faResultEntity.setFileInputStream(new ByteArrayInputStream(contract.getContentByteArr()));
+            }
+            resultList.add(faResultEntity);
+            return resultList;
+        }
+        if (type == 2) {
+//            信息在明细表
+            return detailFun.apply(configData, execute);
+        }
+        throw new CustomerException("创建合同处理方式错误，不存在的处理方式！");
+    }
+
+
+    private ContractConfigEntity getConfigData(String workflowId, Integer apiType) {
+        String workflowIds = WorkflowVersion.getVersionStringByWfid(workflowId);
+        ContractConfigEntity contractConfigEntity = CONFIG_MAPPER.selectContractConfig(workflowIds.split(","), apiType);
+        Util.getLogger().info("获取配置数据成功：" + JSON.toJSONString(contractConfigEntity));
+        ApiConfigEntity apiConfigEntity = CONFIG_MAPPER.selectApiConfig(contractConfigEntity.getApiConfigId());
+        Util.getLogger().info("获取接口配置数据成功：" + JSON.toJSONString(apiConfigEntity));
+        List<ApiConfigDetailEntity> mappings = CONFIG_MAPPER.selectApiConfigDetail(apiConfigEntity.getId());
+        if (mappings == null) {
+            mappings = new ArrayList<>();
+        }
+        List<ApiConfigDetailEntity> treeList = Util.listToTree(mappings, ApiConfigDetailEntity::getLineNum, ApiConfigDetailEntity::getParentLine,
+                ApiConfigDetailEntity::getChildList, ApiConfigDetailEntity::setChildList,
+                parentId -> parentId == null || parentId <= 0);
+        apiConfigEntity.setMappings(treeList);
+        contractConfigEntity.setApiConfigEntity(apiConfigEntity);
+        return contractConfigEntity;
+    }
+
+
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/service/ContractRevocationService.java b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/service/ContractRevocationService.java
new file mode 100644
index 0000000..8df0154
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/service/ContractRevocationService.java
@@ -0,0 +1,71 @@
+package weaver.aiyh_pcn.common_fadada.service;
+
+import aiyh.utils.Util;
+import aiyh.utils.excention.CustomerException;
+import aiyh.utils.httpUtil.ResponeVo;
+import com.alibaba.fastjson.JSON;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import weaver.aiyh_pcn.common_fadada.core.SignTypeFactory;
+import weaver.aiyh_pcn.common_fadada.core.SignTypeHandle;
+import weaver.aiyh_pcn.common_fadada.entity.ContractConfigEntity;
+import weaver.aiyh_pcn.common_fadada.entity.FaResultEntity;
+import weaver.aiyh_pcn.common_fadada.entity.RequestParamEntity;
+import weaver.aiyh_pcn.common_fadada.mapper.ConfigMapper;
+import weaver.aiyh_pcn.common_fadada.util.FaRequestUtils;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <h1>合同撤销service</h1>
+ *
+ * <p>create: 2023-02-01 10:15</p>
+ *
+ * @author youHong.ai
+ */
+
+public class ContractRevocationService implements IFaIntegration {
+
+    public static final String SUCCESS = "200";
+    private static final ConfigMapper CONFIG_MAPPER = Util.getMapper(ConfigMapper.class);
+    private String workflowId;
+    private String requestId;
+    private Integer userId;
+    private Integer contractStatus = 1;
+    private Integer apiType = 7;
+
+
+    @Override
+    public List<FaResultEntity> execute(String workflowId, String requestId, Integer userId) throws JsonProcessingException {
+        this.requestId = requestId;
+        this.workflowId = workflowId;
+        this.userId = userId;
+        CommonService commonService = new CommonService();
+        return commonService.execute(workflowId, requestId, userId, apiType, this::detailHandle, this::request, this::doLog);
+    }
+
+    @Override
+    public List<FaResultEntity> detailHandle(ContractConfigEntity configData, RequestParamEntity execute) {
+        Util.getLogger().info("处理明细数据撤销方式：" + JSON.toJSONString(execute));
+        List<Map<String, Object>> paramMapList = execute.getParamMapList();
+        String apiUrl = configData.getApiConfigEntity().getApiUrl();
+        SignTypeHandle signTypeHandler = SignTypeFactory.createSignTypeHandler(configData.getSignType());
+        try {
+            return signTypeHandler.execute(workflowId, requestId, userId, configData, paramMapList, apiUrl, this::request, this::doLog);
+        } catch (JsonProcessingException e) {
+            e.printStackTrace();
+            throw new CustomerException("json转换异常", e);
+        }
+    }
+
+    @Override
+    public ResponeVo request(Map<String, Object> paramMap, String apiUrl) {
+        Util.getLogger().info("开始撤销->数据：" + JSON.toJSONString(paramMap));
+        return FaRequestUtils.RevocationContract(paramMap, apiUrl);
+    }
+
+    @Override
+    public void doLog(String workflowId, String requestId, Integer userId, ContractConfigEntity configData, ResponeVo contract, int nextId) throws JsonProcessingException {
+
+    }
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/service/ContractStatusService.java b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/service/ContractStatusService.java
new file mode 100644
index 0000000..7ec3c59
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/service/ContractStatusService.java
@@ -0,0 +1,72 @@
+package weaver.aiyh_pcn.common_fadada.service;
+
+import aiyh.utils.Util;
+import aiyh.utils.httpUtil.ResponeVo;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import weaver.aiyh_pcn.common_fadada.entity.ContractConfigEntity;
+import weaver.aiyh_pcn.common_fadada.entity.FaResultEntity;
+import weaver.aiyh_pcn.common_fadada.entity.RequestParamEntity;
+import weaver.aiyh_pcn.common_fadada.mapper.ConfigMapper;
+import weaver.aiyh_pcn.common_fadada.util.FaContractUtil;
+import weaver.aiyh_pcn.common_fadada.util.FaRequestUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>查询合同详情信息</p>
+ * <p>create 2022/4/11 4:09 PM</p>
+ *
+ * @author ayh
+ */
+
+public class ContractStatusService implements IFaIntegration {
+    private static final ConfigMapper CONFIG_MAPPER = Util.getMapper(ConfigMapper.class);
+    public static final Integer SUCCESS = 200;
+    private String workflowId;
+    private String requestId;
+    private Integer userId;
+
+    @Override
+    public List<FaResultEntity> execute(String workflowId, String requestId, Integer userId) throws JsonProcessingException {
+        this.requestId = requestId;
+        this.workflowId = workflowId;
+        this.userId = userId;
+        CommonService commonService = new CommonService();
+        return commonService.execute(workflowId, requestId, userId, 5, this::detailHandle, this::request, this::doLog);
+    }
+
+    @Override
+    public List<FaResultEntity> detailHandle(ContractConfigEntity configData, RequestParamEntity execute) {
+        List<FaResultEntity> resultList = new ArrayList<>();
+        List<Map<String, Object>> paramMapList = execute.getParamMapList();
+        String apiUrl = configData.getApiConfigEntity().getApiUrl();
+        for (Map<String, Object> paramMap : paramMapList) {
+            ResponeVo contract = this.request(paramMap, apiUrl);
+            try {
+                doLog(workflowId, requestId, userId, configData, contract, 0);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+            FaResultEntity faResultEntity = new FaResultEntity();
+            faResultEntity.setResponeVo(contract);
+            faResultEntity.setType(2);
+            faResultEntity.setDetailTable(configData.getWorkflowDetailTableName());
+            Object devDetailId = paramMap.get("devDetailId");
+            faResultEntity.setDetailId(Integer.parseInt(String.valueOf(devDetailId)));
+            resultList.add(faResultEntity);
+        }
+        return resultList;
+    }
+
+    @Override
+    public ResponeVo request(Map<String, Object> paramMap, String apiUrl) {
+        return FaRequestUtils.contractStatus(paramMap, apiUrl);
+    }
+
+    @Override
+    public void doLog(String workflowId, String requestId, Integer userId, ContractConfigEntity configData, ResponeVo contract, int nextId) throws JsonProcessingException {
+        FaContractUtil.writeLog(userId, contract, 5, workflowId, this.requestId);
+    }
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/service/CreateContractService.java b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/service/CreateContractService.java
new file mode 100644
index 0000000..42965c6
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/service/CreateContractService.java
@@ -0,0 +1,132 @@
+package weaver.aiyh_pcn.common_fadada.service;
+
+import aiyh.utils.Util;
+import aiyh.utils.excention.CustomerException;
+import aiyh.utils.httpUtil.ResponeVo;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import weaver.aiyh_pcn.common_fadada.entity.ContractConfigEntity;
+import weaver.aiyh_pcn.common_fadada.entity.CreateFileEntity;
+import weaver.aiyh_pcn.common_fadada.entity.FaResultEntity;
+import weaver.aiyh_pcn.common_fadada.entity.RequestParamEntity;
+import weaver.aiyh_pcn.common_fadada.mapper.ConfigMapper;
+import weaver.aiyh_pcn.common_fadada.util.FaContractUtil;
+import weaver.aiyh_pcn.common_fadada.util.FaRequestUtils;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>创建合同业务处理</p>
+ * <p>create 2022/3/30 5:02 PM</p>
+ *
+ * @author ayh
+ */
+
+public class CreateContractService implements IFaIntegration {
+    private final ConfigMapper CONFIG_MAPPER = Util.getMapper(ConfigMapper.class);
+    public static final String SUCCESS = "200";
+    private String workflowId;
+    private String requestId;
+    private Integer userId;
+    private String contractFileName;
+
+    @Override
+    public List<FaResultEntity> execute(String workflowId, String requestId, Integer userId) throws JsonProcessingException {
+        this.requestId = requestId;
+        this.workflowId = workflowId;
+        this.userId = userId;
+        CommonService commonService = new CommonService();
+        return commonService.execute(workflowId, requestId, userId, 0, this::detailHandle, this::request, this::doLog);
+    }
+
+    @Override
+    public void doLog(String workflowId, String requestId, Integer userId, ContractConfigEntity configData, ResponeVo contract, int nextId) throws JsonProcessingException {
+        try {
+            Util.getLogger().info("进入日志记录！");
+            if (contract.getCode() == 200) {
+                Map<String, Object> entityMap = contract.getEntityMap();
+                String code = String.valueOf(entityMap.get("code"));
+                if (SUCCESS.equals(code)) {
+                    Map<String, Object> data = (Map<String, Object>) entityMap.get("data");
+                    String contractNo = String.valueOf(data.get("contractNo"));
+                    Map<String, Object> map = new HashMap<>(16);
+                    map.put("workflow_type", this.workflowId);
+                    map.put("request_id", this.requestId);
+                    map.put("api_param_id", configData.getId());
+                    map.put("contract_file_name", contractFileName);
+                    map.put("contract_id", contractNo);
+                    map.put("contract_status", 0);
+                    map.put("user_id", userId);
+                    map.put("workflow_table", configData.getWorkflowTableName());
+                    map.put("workflow_detail_table", configData.getWorkflowDetailTableName());
+                    String tableName = "uf_contract_log";
+                    String modelId = Util.getModeIdByTableName(tableName);
+                    int modeDataId = Util.getModeDataId(tableName, Integer.parseInt(modelId), 1);
+                    String sql = builderUpdateSql(tableName, map, modeDataId);
+                    boolean b = CONFIG_MAPPER.updateDataInfo(sql, map);
+                    if (b) {
+                        Util.rebuildModeDataShare(1, Integer.parseInt(modelId), modeDataId);
+                    } else {
+                        CONFIG_MAPPER.deleteDataById(tableName, modeDataId);
+                    }
+                    FaContractUtil.writeLog(userId, contract, 0, this.workflowId, this.requestId);
+                }
+            }
+        } catch (Exception e) {
+            throw new CustomerException("创建合同日志记录失败！", e);
+        }
+    }
+
+    public static String builderUpdateSql(String modelTableName, Map<String, Object> mapping, int dataId) {
+        StringBuilder sb = new StringBuilder("update ");
+        sb.append(modelTableName)
+                .append(" set ");
+        int n = 0;
+        for (Map.Entry<String, Object> entry : mapping.entrySet()) {
+            n++;
+            sb.append(entry.getKey()).append("=#{").append(entry.getKey()).append("}");
+            if (n < mapping.size()) {
+                sb.append(",");
+            }
+        }
+        sb.append(" where id = ").append(dataId);
+        return sb.toString();
+    }
+
+    @Override
+    public List<FaResultEntity> detailHandle(ContractConfigEntity configData, RequestParamEntity execute) {
+        List<FaResultEntity> resultList = new ArrayList<>();
+        List<Map<String, Object>> paramMapList = execute.getParamMapList();
+        String apiUrl = configData.getApiConfigEntity().getApiUrl();
+        for (Map<String, Object> paramMap : paramMapList) {
+            ResponeVo contract = this.request(paramMap, apiUrl);
+            try {
+                doLog(workflowId, requestId, userId, configData, contract, 0);
+            } catch (Exception e) {
+                e.printStackTrace();
+                throw new CustomerException("写入合同日志失败！", e);
+            }
+            FaResultEntity faResultEntity = new FaResultEntity();
+            faResultEntity.setResponeVo(contract);
+            faResultEntity.setDetailTable(configData.getWorkflowDetailTableName());
+            faResultEntity.setType(2);
+            Object devDetailId = paramMap.get("devDetailId");
+            faResultEntity.setDetailId(Integer.parseInt(String.valueOf(devDetailId)));
+            resultList.add(faResultEntity);
+        }
+        return resultList;
+    }
+
+
+    @Override
+    public ResponeVo request(Map<String, Object> paramMap, String apiUrl) {
+        String customerNo = String.valueOf(paramMap.get("customerNo"));
+        CreateFileEntity contractFileObj = (CreateFileEntity) paramMap.get("contractFileObj");
+        contractFileObj.setCustomerNo(customerNo);
+        contractFileName = contractFileObj.getImageFileName();
+        return FaRequestUtils.createContract(contractFileObj, apiUrl);
+    }
+
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/service/DownloadContractService.java b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/service/DownloadContractService.java
new file mode 100644
index 0000000..0289146
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/service/DownloadContractService.java
@@ -0,0 +1,163 @@
+package weaver.aiyh_pcn.common_fadada.service;
+
+import aiyh.utils.Util;
+import aiyh.utils.excention.CustomerException;
+import aiyh.utils.httpUtil.ResponeVo;
+import com.alibaba.fastjson.JSON;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import org.apache.http.*;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.drools.core.util.IoUtils;
+import weaver.aiyh_pcn.common_fadada.entity.ContractConfigEntity;
+import weaver.aiyh_pcn.common_fadada.entity.FaResultEntity;
+import weaver.aiyh_pcn.common_fadada.entity.RequestParamEntity;
+import weaver.aiyh_pcn.common_fadada.mapper.ConfigMapper;
+import weaver.aiyh_pcn.common_fadada.util.FaContractUtil;
+import weaver.aiyh_pcn.common_fadada.util.FaRequestUtils;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * <p>下载合同</p>
+ * <p>create 2022/4/11 2:50 PM</p>
+ *
+ * @author ayh
+ */
+
+public class DownloadContractService implements IFaIntegration {
+    public static final Integer SUCCESS = 200;
+    private static final ConfigMapper CONFIG_MAPPER = Util.getMapper(ConfigMapper.class);
+    private String workflowId;
+    private String requestId;
+    private Integer userId;
+
+    public static String getFileName(HttpResponse response) {
+        Header contentHeader = response.getFirstHeader("Content-Disposition");
+        String filename = null;
+        if (contentHeader != null) {
+            HeaderElement[] values = contentHeader.getElements();
+            if (values.length == 1) {
+                NameValuePair param = values[0].getParameterByName("filename");
+                if (param != null) {
+                    try {
+                        //filename = new String(param.getValue().toString().getBytes(), "utf-8");
+                        //filename=URLDecoder.decode(param.getValue(),"utf-8");
+                        filename = param.getValue();
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                }
+            }
+        }
+        return filename;
+    }
+
+    /**
+     * 功能描述: byte数组转 InputStream
+     *
+     * @param bytes byte数组
+     * @return java.io.InputStream
+     */
+    public static InputStream byte2InputStream(byte[] bytes) {
+        return new ByteArrayInputStream(bytes);
+    }
+
+    @Override
+    public List<FaResultEntity> execute(String workflowId, String requestId, Integer userId) throws JsonProcessingException {
+        this.requestId = requestId;
+        this.workflowId = workflowId;
+        this.userId = userId;
+        CommonService commonService = new CommonService();
+        return commonService.execute(workflowId, requestId, userId, 4, this::detailHandle, this::request, this::doLog);
+    }
+
+    @Override
+    public List<FaResultEntity> detailHandle(ContractConfigEntity configData, RequestParamEntity execute) {
+        List<Map<String, Object>> paramMapList = execute.getParamMapList();
+        List<FaResultEntity> resultList = new ArrayList<>();
+        String apiUrl = configData.getApiConfigEntity().getApiUrl();
+        for (Map<String, Object> paramMap : paramMapList) {
+            Util.getLogger().info("参数信息：" + JSON.toJSONString(paramMap));
+            Object devDetailId = paramMap.get("devDetailId");
+            ResponeVo contract = this.request(paramMap, apiUrl);
+            try {
+                doLog(workflowId, requestId, userId, configData, contract, Integer.parseInt(Util.null2DefaultStr(devDetailId, "-1")));
+            } catch (Exception e) {
+                e.printStackTrace();
+                throw new CustomerException("合同下载日志书写失败！", e);
+            }
+            FaResultEntity faResultEntity = new FaResultEntity();
+            faResultEntity.setResponeVo(contract);
+            faResultEntity.setType(2);
+            faResultEntity.setImageFileId(Integer.parseInt(contract.getEntityString()));
+            faResultEntity.setDetailTable(configData.getWorkflowDetailTableName());
+            if (contract.getContentByteArr() != null && contract.getContentByteArr().length != 0) {
+                faResultEntity.setFileInputStream(new ByteArrayInputStream(contract.getContentByteArr()));
+            }
+            faResultEntity.setDetailId(Integer.parseInt(Util.null2DefaultStr(devDetailId, "-1")));
+            resultList.add(faResultEntity);
+        }
+        return resultList;
+    }
+
+    @Override
+    public ResponeVo request(Map<String, Object> paramMap, String apiUrl) {
+        return FaRequestUtils.downContract(paramMap, this::downloadContract, apiUrl);
+    }
+
+    @Override
+    public void doLog(String workflowId, String requestId, Integer userId, ContractConfigEntity configData, ResponeVo contract, int nextId) throws JsonProcessingException {
+        if (contract.getCode() == 200) {
+            FaContractUtil.writeLog(userId, new ResponeVo(), 4, this.workflowId, this.requestId);
+        }
+    }
+
+    private ResponeVo downloadContract(Map<String, Object> requestParam, CloseableHttpResponse response) {
+        HttpEntity entity = response.getEntity();
+        InputStream content = null;
+        if (response.getStatusLine().getStatusCode() != SUCCESS) {
+            throw new CustomerException("法大大请求接口错误！");
+        }
+        try {
+            content = entity.getContent();
+            Util.getLogger().info("文件流长度：" + entity.getContentLength());
+        } catch (IOException e) {
+            throw new CustomerException("获取Content错误", e);
+        }
+        byte[] contentByteArr = new byte[0];
+        try {
+            contentByteArr = IoUtils.readBytesFromInputStream(content);
+        } catch (IOException e) {
+            e.printStackTrace();
+            throw new CustomerException("获取文件内容错误,无法将文件流读取为数组：", e);
+        }
+        InputStream inputStream = byte2InputStream(contentByteArr);
+        String contractNo = Util.null2DefaultStr(requestParam.get("contractNo"), "");
+        String fileName = CONFIG_MAPPER.selectContractFileName(contractNo);
+        if (Objects.isNull(fileName) || "".equals(fileName)) {
+            fileName = getFileName(response);
+        }
+        if (Objects.isNull(fileName) || "".equals(fileName)) {
+            Util.getLogger().info("can not find fileName for response, fileName=" + fileName);
+            fileName = Util.getCusConfigValueNullOrEmpty("default_contract_file", "default_contract_file.pdf");
+        }
+        int imgFileId = Util.createFileByInputSteam(inputStream, fileName);
+        ResponeVo responeVo = new ResponeVo();
+        responeVo.setCode(200);
+        responeVo.setEntityString(String.valueOf(imgFileId));
+        try {
+            content.close();
+            inputStream.close();
+        } catch (IOException e) {
+            e.printStackTrace();
+            Util.getLogger().error("关闭文件流出错！");
+        }
+        return responeVo;
+    }
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/service/IFaIntegration.java b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/service/IFaIntegration.java
new file mode 100644
index 0000000..ff11e46
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/service/IFaIntegration.java
@@ -0,0 +1,25 @@
+package weaver.aiyh_pcn.common_fadada.service;
+
+import aiyh.utils.httpUtil.ResponeVo;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import weaver.aiyh_pcn.common_fadada.entity.ContractConfigEntity;
+import weaver.aiyh_pcn.common_fadada.entity.FaResultEntity;
+import weaver.aiyh_pcn.common_fadada.entity.RequestParamEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>发大大集成业务逻辑统一接口</p>
+ * <p>create 2022/4/1 11:40 AM</p>
+ *
+ * @author ayh
+ */
+
+public interface IFaIntegration {
+
+    List<FaResultEntity> execute(String workflowId, String requestId,Integer userId) throws JsonProcessingException;
+    List<FaResultEntity> detailHandle(ContractConfigEntity configData, RequestParamEntity execute);
+    ResponeVo request(Map<String, Object> paramMap, String apiUrl);
+    void doLog(String workflowId, String requestId, Integer userId, ContractConfigEntity configData, ResponeVo contract,int nextId) throws JsonProcessingException;
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/service/OneselfSignContractService.java b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/service/OneselfSignContractService.java
new file mode 100644
index 0000000..a8ae442
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/service/OneselfSignContractService.java
@@ -0,0 +1,41 @@
+package weaver.aiyh_pcn.common_fadada.service;
+
+import aiyh.utils.httpUtil.ResponeVo;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import weaver.aiyh_pcn.common_fadada.entity.ContractConfigEntity;
+import weaver.aiyh_pcn.common_fadada.entity.FaResultEntity;
+import weaver.aiyh_pcn.common_fadada.entity.RequestParamEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>本方签署</p>
+ * <p>create 2022/4/11 10:14 AM</p>
+ *
+ * @author ayh
+ */
+
+public class OneselfSignContractService implements IFaIntegration{
+    private final SignContractService service = new SignContractService();
+    @Override
+    public List<FaResultEntity> execute(String workflowId, String requestId, Integer userId) throws JsonProcessingException {
+        service.setApiType(2);
+        return service.execute(workflowId,requestId,userId);
+    }
+
+    @Override
+    public List<FaResultEntity> detailHandle(ContractConfigEntity configData, RequestParamEntity execute) {
+        return service.detailHandle(configData,execute);
+    }
+
+    @Override
+    public ResponeVo request(Map<String, Object> paramMap, String apiUrl) {
+        return service.request(paramMap,apiUrl);
+    }
+
+    @Override
+    public void doLog(String workflowId, String requestId, Integer userId, ContractConfigEntity configData, ResponeVo contract, int nextId) throws JsonProcessingException {
+        service.doLog(workflowId,requestId,userId,configData,contract,nextId);
+    }
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/service/PigeonholeContractService.java b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/service/PigeonholeContractService.java
new file mode 100644
index 0000000..46acbb1
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/service/PigeonholeContractService.java
@@ -0,0 +1,126 @@
+package weaver.aiyh_pcn.common_fadada.service;
+
+import aiyh.utils.Util;
+import aiyh.utils.httpUtil.ResponeVo;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import weaver.aiyh_pcn.common_fadada.entity.ContractConfigEntity;
+import weaver.aiyh_pcn.common_fadada.entity.FaResultEntity;
+import weaver.aiyh_pcn.common_fadada.entity.RequestParamEntity;
+import weaver.aiyh_pcn.common_fadada.mapper.ConfigMapper;
+import weaver.aiyh_pcn.common_fadada.util.FaContractUtil;
+import weaver.aiyh_pcn.common_fadada.util.FaRequestUtils;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>合同归档</p>
+ * <p>create 2022/4/11 10:18 AM</p>
+ *
+ * @author ayh
+ */
+
+public class PigeonholeContractService implements IFaIntegration {
+    private static final ConfigMapper CONFIG_MAPPER = Util.getMapper(ConfigMapper.class);
+    public static final String SUCCESS = "200";
+    private String workflowId;
+    private String requestId;
+    private Integer userId;
+
+    @Override
+    public List<FaResultEntity> execute(String workflowId, String requestId, Integer userId) throws JsonProcessingException {
+        this.requestId = requestId;
+        this.workflowId = workflowId;
+        this.userId = userId;
+        CommonService commonService = new CommonService();
+        return commonService.execute(workflowId, requestId, userId, 3, this::detailHandle, this::request, this::doLog);
+    }
+
+    @Override
+    public List<FaResultEntity> detailHandle(ContractConfigEntity configData, RequestParamEntity execute) {
+        List<Map<String, Object>> paramMapList = execute.getParamMapList();
+        List<FaResultEntity> resultList = new ArrayList<>();
+        String apiUrl = configData.getApiConfigEntity().getApiUrl();
+        for (Map<String, Object> paramMap : paramMapList) {
+            ResponeVo contract = this.request(paramMap, apiUrl);
+            try {
+                doLog(workflowId, requestId, userId, configData, contract, 0);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+            FaResultEntity faResultEntity = new FaResultEntity();
+            faResultEntity.setResponeVo(contract);
+            faResultEntity.setType(2);
+            Object devDetailId = paramMap.get("devDetailId");
+            faResultEntity.setDetailTable(configData.getWorkflowDetailTableName());
+            faResultEntity.setDetailId(Integer.parseInt(String.valueOf(devDetailId)));
+            resultList.add(faResultEntity);
+        }
+        return resultList;
+    }
+
+    @Override
+    public ResponeVo request(Map<String, Object> paramMap, String apiUrl) {
+        return FaRequestUtils.pigeonholeContract(paramMap, apiUrl);
+    }
+
+    @Override
+    public void doLog(String workflowId, String requestId, Integer userId, ContractConfigEntity configData, ResponeVo contract, int nextId) throws JsonProcessingException {
+        Map<String, Object> entityMap = contract.getEntityMap();
+        String code = String.valueOf(entityMap.get("code"));
+        if (SUCCESS.equals(code)) {
+            Map<String, Object> data = (Map<String, Object>) entityMap.get("data");
+            String contractNo = String.valueOf(data.get("contractNo"));
+            Map<String, Object> whereMap = new HashMap<>(16);
+            whereMap.put("contract_id", contractNo);
+            whereMap.put("request_id", this.requestId);
+            Map<String, Object> map = new HashMap<>(16);
+            map.put("workflow_type", workflowId);
+            map.put("api_param_id", configData.getId());
+            map.put("contract_status", 3);
+            map.put("user_id", userId);
+            map.put("next_operation", 3);
+            if (configData.getSequenceSign() == 1) {
+                map.put("next_id", nextId);
+            }
+            String tableName = "uf_contract_log";
+            String modelId = Util.getModeIdByTableName(tableName);
+            //            int modeDataId = Util.getModeDataId(tableName, Integer.parseInt(modelId), 1);
+            String sql = builderUpdateSql(tableName, map, whereMap);
+            map.putAll(whereMap);
+            boolean b = CONFIG_MAPPER.updateDataInfo(sql, map);
+            //            if (b) {
+            //                Util.rebuildModeDataShare(1, Integer.parseInt(modelId), modeDataId);
+            FaContractUtil.writeLog(userId, contract, 3, workflowId, this.requestId);
+            //            } else {
+            //                CONFIG_MAPPER.deleteDataById(tableName, modeDataId);
+            //            }
+        }
+    }
+
+    public static String builderUpdateSql(String modelTableName, Map<String, Object> mapping, Map<String, Object> whereMap) {
+        StringBuilder sb = new StringBuilder("update ");
+        sb.append(modelTableName)
+                .append(" set ");
+        int n = 0;
+        for (Map.Entry<String, Object> entry : mapping.entrySet()) {
+            n++;
+            sb.append(entry.getKey()).append("=#{").append(entry.getKey()).append("}");
+            if (n < mapping.size()) {
+                sb.append(",");
+            }
+        }
+        sb.append(" where ");
+        n = 0;
+        for (Map.Entry<String, Object> entry : whereMap.entrySet()) {
+            n++;
+            sb.append(entry.getKey()).append("=#{").append(entry.getKey()).append("}");
+            if (n < whereMap.size()) {
+                sb.append(" and ");
+            }
+        }
+        return sb.toString();
+    }
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/service/SignContractService.java b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/service/SignContractService.java
new file mode 100644
index 0000000..3330e7e
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/service/SignContractService.java
@@ -0,0 +1,143 @@
+package weaver.aiyh_pcn.common_fadada.service;
+
+import aiyh.utils.Util;
+import aiyh.utils.excention.CustomerException;
+import aiyh.utils.httpUtil.ResponeVo;
+import com.alibaba.fastjson.JSON;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import weaver.aiyh_pcn.common_fadada.core.SignTypeFactory;
+import weaver.aiyh_pcn.common_fadada.core.SignTypeHandle;
+import weaver.aiyh_pcn.common_fadada.entity.ContractConfigEntity;
+import weaver.aiyh_pcn.common_fadada.entity.FaResultEntity;
+import weaver.aiyh_pcn.common_fadada.entity.RequestParamEntity;
+import weaver.aiyh_pcn.common_fadada.mapper.ConfigMapper;
+import weaver.aiyh_pcn.common_fadada.util.FaContractUtil;
+import weaver.aiyh_pcn.common_fadada.util.FaRequestUtils;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * <p>合同签署业务处理逻辑</p>
+ * <p>create 2022/4/1 10:53 AM</p>
+ *
+ * @author ayh
+ */
+
+public class SignContractService implements IFaIntegration {
+	public static final String SUCCESS = "200";
+	private static final ConfigMapper CONFIG_MAPPER = Util.getMapper(ConfigMapper.class);
+	private String workflowId;
+	private String requestId;
+	private Integer userId;
+	private Integer contractStatus = 1;
+	private Integer apiType = 1;
+	
+	@Override
+	public List<FaResultEntity> execute(String workflowId, String requestId, Integer userId) throws JsonProcessingException {
+		this.requestId = requestId;
+		this.workflowId = workflowId;
+		this.userId = userId;
+		CommonService commonService = new CommonService();
+		return commonService.execute(workflowId, requestId, userId, apiType, this::detailHandle, this::request, this::doLog);
+	}
+	
+	@Override
+	public List<FaResultEntity> detailHandle(ContractConfigEntity configData, RequestParamEntity execute) {
+		Util.getLogger().info("处理明细数据签署方式：" + JSON.toJSONString(execute));
+		List<Map<String, Object>> paramMapList = execute.getParamMapList();
+		String apiUrl = configData.getApiConfigEntity().getApiUrl();
+		SignTypeHandle signTypeHandler = SignTypeFactory.createSignTypeHandler(configData.getSignType());
+		try {
+			return signTypeHandler.execute(workflowId, requestId, userId, configData, paramMapList, apiUrl, this::request, this::doLog);
+		} catch (JsonProcessingException e) {
+			e.printStackTrace();
+			throw new CustomerException("json转换异常", e);
+		}
+	}
+	
+	@Override
+	public ResponeVo request(Map<String, Object> paramMap, String apiUrl) {
+		Util.getLogger().info("开始签署->数据：" + JSON.toJSONString(paramMap));
+		return FaRequestUtils.signedContract(paramMap, apiUrl);
+	}
+	
+	@Override
+	public void doLog(String workflowId, String requestId, Integer userId, ContractConfigEntity configData, ResponeVo contract, int nextId) throws JsonProcessingException {
+		Map<String, Object> entityMap = contract.getEntityMap();
+		String code = String.valueOf(entityMap.get("code"));
+		if (SUCCESS.equals(code)) {
+			Map<String, Object> data = (Map<String, Object>) entityMap.get("data");
+			String contractNo = String.valueOf(data.get("contractNo"));
+			Map<String, Object> whereMap = new HashMap<>(16);
+			whereMap.put("contract_id", contractNo);
+			whereMap.put("request_id", this.requestId);
+			Map<String, Object> map = new HashMap<>(16);
+			map.put("workflow_type", workflowId);
+			map.put("api_param_id", configData.getId());
+			map.put("contract_status", contractStatus);
+			map.put("user_id", userId);
+			if (configData.getSignType() == 1) {
+				map.put("next_operation", 3);
+			} else if (configData.getSignType() == 2) {
+				if (contractStatus == 1) {
+					map.put("next_operation", 1);
+				} else {
+					map.put("next_operation", 2);
+				}
+			}
+			
+			if (!Objects.isNull(configData.getSequenceSign())) {
+				if (configData.getSequenceSign() == 1) {
+					map.put("next_id", nextId);
+				}
+			}
+			String tableName = "uf_contract_log";
+			String modelId = Util.getModeIdByTableName(tableName);
+			//            int modeDataId = Util.getModeDataId(tableName, Integer.parseInt(modelId), 1);
+			String sql = builderUpdateSql(tableName, map, whereMap);
+			map.putAll(whereMap);
+			boolean b = CONFIG_MAPPER.updateDataInfo(sql, map);
+			//            if(b){
+			//                Util.rebuildModeDataShare(1,Integer.parseInt(modelId),modeDataId);
+			FaContractUtil.writeLog(userId, contract, apiType, workflowId, this.requestId);
+			//            }else {
+			//                CONFIG_MAPPER.deleteDataById(tableName,modeDataId);
+			//            }
+		}
+	}
+	
+	public static String builderUpdateSql(String modelTableName, Map<String, Object> mapping, Map<String, Object> whereMap) {
+		StringBuilder sb = new StringBuilder("update ");
+		sb.append(modelTableName)
+				.append(" set ");
+		int n = 0;
+		for (Map.Entry<String, Object> entry : mapping.entrySet()) {
+			n++;
+			sb.append(entry.getKey()).append("=#{").append(entry.getKey()).append("}");
+			if (n < mapping.size()) {
+				sb.append(",");
+			}
+		}
+		sb.append(" where ");
+		n = 0;
+		for (Map.Entry<String, Object> entry : whereMap.entrySet()) {
+			n++;
+			sb.append(entry.getKey()).append("=#{").append(entry.getKey()).append("}");
+			if (n < whereMap.size()) {
+				sb.append(" and ");
+			}
+		}
+		return sb.toString();
+	}
+	
+	public void setContractStatus(Integer contractStatus) {
+		this.contractStatus = contractStatus;
+	}
+	
+	public void setApiType(Integer apiType) {
+		this.apiType = apiType;
+	}
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/util/FaContractUtil.java b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/util/FaContractUtil.java
new file mode 100644
index 0000000..f9dd966
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/util/FaContractUtil.java
@@ -0,0 +1,117 @@
+package weaver.aiyh_pcn.common_fadada.util;
+
+import aiyh.utils.Util;
+import aiyh.utils.excention.CustomerException;
+import aiyh.utils.httpUtil.ResponeVo;
+import com.alibaba.fastjson.JSON;
+import org.jetbrains.annotations.NotNull;
+import weaver.aiyh_pcn.common_fadada.core.ContractParamTypeFactory;
+import weaver.aiyh_pcn.common_fadada.core.ContractParamTypeHandle;
+import weaver.aiyh_pcn.common_fadada.core.ConversionRuleFactory;
+import weaver.aiyh_pcn.common_fadada.core.ConversionRuleHandler;
+import weaver.aiyh_pcn.common_fadada.entity.ApiConfigDetailEntity;
+import weaver.aiyh_pcn.common_fadada.entity.ApiConfigEntity;
+import weaver.aiyh_pcn.common_fadada.entity.ParsingEntity;
+import weaver.aiyh_pcn.common_fadada.mapper.ConfigMapper;
+
+import java.util.*;
+
+/**
+ * <p>发大大工具类</p>
+ * <p>create 2022/3/30 4:59 PM</p>
+ *
+ * @author ayh
+ */
+
+public class FaContractUtil {
+
+    private static final ConfigMapper MAPPER = Util.getMapper(ConfigMapper.class);
+
+    public Map<String, Object> parsingMainData(ParsingEntity parsingEntity) {
+        Util.getLogger().info("parsingMainData：" + JSON.toJSONString(parsingEntity));
+        ApiConfigEntity apiConfigEntity = parsingEntity.getApiConfigEntity();
+        Map<String, String> mainData = getMainData(parsingEntity);
+        List<ApiConfigDetailEntity> mappings = apiConfigEntity.getMappings();
+        return childHandler(mappings, mainData);
+    }
+
+    @NotNull
+    private Map<String, String> getMainData(ParsingEntity parsingEntity) {
+        Map<String, String> mainDataTem = parsingEntity.getMainData();
+        Map<String, String> mainData = new HashMap<>();
+        for (Map.Entry<String, String> entry : mainDataTem.entrySet()) {
+            mainData.put("main_" + entry.getKey(), entry.getValue());
+        }
+        mainData.put("requestId", parsingEntity.getRequestId());
+        return mainData;
+    }
+
+    public List<Map<String, Object>> parsingDetailData(ParsingEntity parsingEntity) {
+        ApiConfigEntity apiConfigEntity = parsingEntity.getApiConfigEntity();
+        List<Map<String, String>> detailData = parsingEntity.getDetailData();
+        List<Map<String, Object>> dataList = new ArrayList<>();
+        Map<String, String> mainData = getMainData(parsingEntity);
+        String detailPrefix = getDetailPrefix(parsingEntity.getDetailTableName());
+        List<ApiConfigDetailEntity> mappings = apiConfigEntity.getMappings();
+        List<Map<String, String>> allDataList = new ArrayList<>();
+//        处理数据
+        for (Map<String, String> detailDatum : detailData) {
+            Map<String, String> detailDataTem = new HashMap<>();
+            detailDataTem.put("devDetailId", detailDatum.get("id"));
+            for (Map.Entry<String, String> entry : detailDatum.entrySet()) {
+                detailDataTem.put(detailPrefix + "_" + entry.getKey(), entry.getValue());
+            }
+            detailDataTem.putAll(mainData);
+            allDataList.add(detailDataTem);
+        }
+//        处理配置映射关系
+        for (Map<String, String> detailDataTem : allDataList) {
+            Map<String, Object> map = childHandler(mappings, detailDataTem);
+            map.put("devDetailId", detailDataTem.get("devDetailId"));
+            dataList.add(map);
+        }
+        return dataList;
+    }
+
+    public Map<String, Object> childHandler(List<ApiConfigDetailEntity> mappings, Map<String, String> mainData) {
+        Map<String, Object> requestParam = new HashMap<>();
+        if (mappings == null || mappings.isEmpty()) {
+            throw new CustomerException("没有查询到映射关系！请检查查询语句是否正确！== == == == == ");
+        }
+        for (ApiConfigDetailEntity mapping : mappings) {
+            List<ApiConfigDetailEntity> childList = mapping.getChildList();
+            if (childList == null || childList.isEmpty()) {
+                ConversionRuleHandler conversionRuleHandler = ConversionRuleFactory.createRuleHandler(mapping.getChangeRule());
+                Object execute = null;
+                if (!Objects.isNull(conversionRuleHandler)) {
+                    execute = conversionRuleHandler.execute(mainData, mapping);
+                }
+                ContractParamTypeHandle paramType = ContractParamTypeFactory.createParamType(mapping.getParamType());
+                Object value = paramType.execute(execute, mapping, mainData);
+                requestParam.put(mapping.getParamName(), value);
+            } else {
+                Map<String, Object> map = childHandler(childList, mainData);
+                requestParam.put(mapping.getParamName(), map);
+            }
+        }
+        return requestParam;
+    }
+
+    private String getDetailPrefix(String detailTableName) {
+        return "detail_" + detailTableName.substring(detailTableName.indexOf("_dt") + 3);
+    }
+
+    public static void writeLog(Integer userId, ResponeVo responeVo, Integer apiType, String workflowId, String requestId) {
+        Map<String, Object> map = new HashMap<>(8);
+        map.put("user_id", userId);
+        map.put("workflow_id", workflowId);
+        map.put("request_id", requestId);
+        map.put("api_type", apiType);
+        map.put("api_result", responeVo.getEntityString());
+        String formId = Util.getModeIdByTableName("uf_request_log");
+        int dataId = Util.getModeDataId("uf_request_log", Integer.parseInt(formId), 1);
+        map.put("id", dataId);
+        MAPPER.updateModelData(map);
+        Util.rebuildModeDataShare(1, Integer.parseInt(formId), dataId);
+    }
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/util/FaRequestUtils.java b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/util/FaRequestUtils.java
new file mode 100644
index 0000000..291c97b
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/common_fadada/util/FaRequestUtils.java
@@ -0,0 +1,418 @@
+package weaver.aiyh_pcn.common_fadada.util;
+
+import aiyh.utils.Util;
+import aiyh.utils.excention.CustomerException;
+import aiyh.utils.httpUtil.HttpArgsType;
+import aiyh.utils.httpUtil.ResponeVo;
+import aiyh.utils.httpUtil.util.HttpUtils;
+import aiyh.utils.zwl.common.ToolUtil;
+import cn.hutool.json.JSONUtil;
+import com.alibaba.fastjson.JSONObject;
+import org.apache.commons.codec.binary.Hex;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.log4j.Logger;
+import org.h2.util.StringUtils;
+import weaver.aiyh_pcn.common_fadada.entity.CreateFileEntity;
+
+import java.io.IOException;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.util.*;
+import java.util.function.BiFunction;
+
+/**
+ * <p>发大大合同相关请求</p>
+ * <p>create 2022/3/31 12:07 PM</p>
+ *
+ * @author ayh
+ */
+
+public class FaRequestUtils {
+	private final static ToolUtil TOOL_UTIL = new ToolUtil();
+	private final static HttpUtils HTTP_UTILS = new HttpUtils();
+	private final static Map<String, String> HEADER = HTTP_UTILS.getGlobalCache().header;
+	private final static Logger log = Util.getLogger();
+	
+	static {
+		try {
+			String appId = TOOL_UTIL.getSystemParamValue("FDD_appId");
+			if (StringUtils.isNullOrEmpty(appId)) {
+				appId = "100001";
+				log.error("查询到的FDD_appId为空！");
+			}
+			HEADER.put("appId", appId);
+			HEADER.put("signType", "SHA256");
+			String apiKey = TOOL_UTIL.getSystemParamValue("FDD_apiKey");
+			if (StringUtils.isNullOrEmpty(apiKey)) {
+				apiKey = "TulQxnZSRKeHoQfmeZzOUzGn6KpTDkDK";
+				log.error("查询到的FDD_apiKey为空！");
+			}
+			HEADER.put("apikey", apiKey);
+			HEADER.put("Content-Type", HttpArgsType.APPLICATION_JSON);
+			log.info(JSONObject.toJSONString("发大大整体请求头数据：" + HEADER));
+		} catch (Exception e) {
+			log.error("发大大整体请求头数据初始化失败！");
+		}
+	}
+	
+	/**
+	 * 创建合同
+	 *
+	 * @param fileInfo 合同信息
+	 * @param url      请求地址
+	 * @return 请求结果
+	 */
+	public static ResponeVo createContract(CreateFileEntity fileInfo, String url) {
+		Map<String, Object> data = new HashMap<>(16);
+		data.put("contractExtension", fileInfo.getContractExtension());
+		data.put("contractTitle", fileInfo.getContractTitle());
+		data.put("uploadType", fileInfo.getUploadType());
+		data.put("customerNo", fileInfo.getCustomerNo());
+		HEADER.put("sign", builderSign(data));
+		HEADER.put("Content-Type", "multipart/form-data");
+		ResponeVo responeVo = null;
+		//        ResponeVo responeVo = new ResponeVo();
+		try {
+			log.info("创建合同：" + JSONObject.toJSONString(data));
+			responeVo = HTTP_UTILS.apiUploadFile(url,
+					fileInfo.getFile(), "file", fileInfo.getImageFileName(), data, null);
+			//            Future<ResponeVo> file = HTTP_UTILS.apiUploadFileAsync(url, fileInfo.getFile(), "file", fileInfo.getImageFileName(), data, null);
+			//            log.info("创建合同数据发送成功！");
+			//            responeVo = file.get();
+			log.info("返回信息：" + responeVo.getEntityString() + "\t 状态码：" + responeVo.getCode());
+			fileInfo.getFile().close();
+		} catch (Exception e) {
+			e.printStackTrace();
+			log.error("创建合同报错：" + Util.getErrString(e));
+		}
+		return responeVo;
+	}
+	
+	/**
+	 * 签署合同方法
+	 *
+	 * @param data 请求参数
+	 * @param url  请求地址
+	 * @return 请求结果
+	 */
+	public static ResponeVo signedContract(Map<String, Object> data, String url) {
+		log.info("签署合同方法");
+		try {
+			HEADER.put("sign", builderSign(data));
+		} catch (Exception e) {
+			throw new CustomerException("签名失败！", e);
+		}
+		HEADER.put("Content-Type", "application/json");
+		ResponeVo responeVo = null;
+		try {
+			log.info("签署合同：" + JSONObject.toJSONString(data));
+			responeVo = HTTP_UTILS.apiPost(url,
+					data, null);
+			log.info("签署结果数据：" + responeVo.getEntityString() + "\n");
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+		return responeVo;
+	}
+	
+	public static ResponeVo RevocationContract(Map<String, Object> data, String url) {
+		log.info("撤销合同方法");
+		try {
+			HEADER.put("sign", builderSign(data));
+		} catch (Exception e) {
+			throw new CustomerException("签名失败！", e);
+		}
+		HEADER.put("Content-Type", "application/json");
+		ResponeVo responeVo = null;
+		try {
+			log.info("撤销合同：" + JSONObject.toJSONString(data));
+			responeVo = HTTP_UTILS.apiPost(url,
+					data, null);
+			log.info("撤销结果数据：" + responeVo.getEntityString() + "\n");
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+		return responeVo;
+	}
+	
+	
+	public static ResponeVo batchSignedContract(Map<String, Object> paramMapList, String apiUrl) {
+		log.info("签署合同方法");
+		try {
+			HEADER.put("sign", builderSign(paramMapList));
+		} catch (Exception e) {
+			throw new CustomerException("签名失败！", e);
+		}
+		HEADER.put("Content-Type", "application/json");
+		ResponeVo responeVo = null;
+		try {
+			log.info("签署合同：" + JSONObject.toJSONString(paramMapList));
+			responeVo = HTTP_UTILS.apiPostObject(apiUrl,
+					paramMapList, null);
+			log.info("签署结果数据：" + responeVo.getEntityString() + "\n");
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+		return responeVo;
+	}
+	
+	/**
+	 * 合同归档
+	 *
+	 * @param data   参数
+	 * @param apiUrl 地址
+	 * @return 请求结果
+	 */
+	public static ResponeVo pigeonholeContract(Map<String, Object> data, String apiUrl) {
+		HEADER.put("sign", builderSign(data));
+		HEADER.put("Content-Type", "application/json");
+		ResponeVo responeVo = null;
+		try {
+			log.info("合同归档：" + JSONObject.toJSONString(data));
+			responeVo = HTTP_UTILS.apiPost(apiUrl,
+					data, null);
+			log.info("请求响应数据：" + responeVo.getEntityString() + "\n");
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+		return responeVo;
+	}
+	
+	/**
+	 * 下载合同
+	 *
+	 * @param data     下载合同参数
+	 * @param consumer 下载合同回调
+	 * @param url      下载合同地址
+	 * @return 请求结果
+	 */
+	public static ResponeVo downContract(Map<String, Object> data, BiFunction<Map<String, Object>, CloseableHttpResponse, ResponeVo> consumer, String url) {
+		Map<String, Object> param = new HashMap<>(data);
+		data.remove("devDetailId");
+		HEADER.put("sign", builderSign(data));
+		HEADER.put("Content-Type", "application/json");
+		ResponeVo responeVo = null;
+		try {
+			log.info("下载合同文件：" + JSONObject.toJSONString(data));
+			responeVo = HTTP_UTILS.apiPost(url,
+					data, null, consumer);
+			responeVo.setRequestData(param);
+			return responeVo;
+		} catch (IOException e) {
+			throw new CustomerException("合同下载出错！" + JSONObject.toJSONString(data) + " ::::: " + url, e);
+		}
+	}
+	
+	
+	/**
+	 * 查看合同详情
+	 *
+	 * @param data   参数
+	 * @param apiUrl 地址
+	 * @return 请求结果
+	 */
+	public static ResponeVo contractStatus(Map<String, Object> data, String apiUrl) {
+		HEADER.put("sign", builderSign(data));
+		HEADER.put("Content-Type", "application/json");
+		ResponeVo responeVo = null;
+		try {
+			responeVo = HTTP_UTILS.apiPost(apiUrl,
+					data, null);
+			log.info("查询合同详情：" + JSONObject.toJSONString(data));
+			return responeVo;
+		} catch (IOException e) {
+			throw new CustomerException("合同下载出错！" + JSONObject.toJSONString(data) + " ::::: " + apiUrl, e);
+		}
+	}
+	
+	
+	/**
+	 * <h2>注册发大大账号信息</h2>
+	 *
+	 * @param data   注册数据
+	 * @param apiUrl 请求地址
+	 * @return 响应结果
+	 */
+	public static ResponeVo registerAccount(Map<String, Object> data, String apiUrl) {
+		HEADER.put("sign", builderSign(data));
+		HEADER.put("Content-Type", "application/json");
+		ResponeVo responeVo = null;
+		try {
+			responeVo = HTTP_UTILS.apiPost(apiUrl,
+					data, null);
+			log.info("注册发大大账号：" + JSONObject.toJSONString(data));
+			return responeVo;
+		} catch (IOException e) {
+			throw new CustomerException("注册法大大账号出错出错！" + JSONObject.toJSONString(data) + " ::: " + apiUrl, e);
+		}
+	}
+	
+	/**
+	 * 构建签署验证信息
+	 *
+	 * @param data 请求参数
+	 * @return 构建结果
+	 */
+	private static String builderSign(Object data) {
+		HEADER.put("timestamp", Util.getTime("yyyy-MM-dd HH:mm:ss"));
+		HEADER.put("bizContent", builderBizContent(data));
+		String signStr = "appId=" + HEADER.get("appId") +
+				                 "&bizContent=" + HEADER.get("bizContent") +
+				                 "&signType=" + HEADER.get("signType") +
+				                 "&timestamp=" + HEADER.get("timestamp");
+		String appKey = TOOL_UTIL.getSystemParamValue("FDD_appKey");
+		if (StringUtils.isNullOrEmpty(appKey)) {
+			log.error("查询到的FDD_appKey为空！");
+			appKey = "L7P59oqA2An0XgJ1LeMN0fRu1";
+		}
+		log.info("app签名：" + appKey);
+		log.info("signStr：" + signStr);
+		log.info("请求头信息：" + JSONObject.toJSONString(HEADER));
+		String sha256 = string2SHA256(signStr) + appKey;
+		return Base64.getEncoder().encodeToString(string2SHA256(sha256).getBytes(StandardCharsets.UTF_8));
+	}
+	
+	/**
+	 * 压缩请求信息
+	 *
+	 * @param data 请求数据
+	 * @return 压缩结果
+	 */
+	public static String builderBizContent(Object data) {
+		// String jsonString = JSONUtil.toJsonStr(data);
+		// log.info("bizContent进行JSON编码：" + jsonString);
+		// cn.hutool.json.JSON json = cn.hutool.json.JSONUtil.isJsonArray(jsonString)?
+		//        JSONUtil.parseArray(jsonString):JSONUtil.parseObj(jsonString);
+		// java.util.TreeMap<String,Object> jsonMap= (TreeMap<String, Object>) sortKey(json);
+		////if (data instanceof List) {
+		////    List<Object> dataArr = new ArrayList<>();
+		////    ((List<?>) data).forEach(item -> {
+		////        String jsonObjStr = JSONUtil.toJsonStr(item);
+		////        TreeMap<String, Object> treeMap = JSONUtil.parseObj(jsonObjStr).toBean(TreeMap.class);
+		////        dataArr.add(treeMap);
+		////    });
+		////    jsonString = JSONUtil.toJsonStr(dataArr);
+		////} else {
+		////    TreeMap<String, Object> treeMap = JSONUtil.parseObj(jsonString).toBean(TreeMap.class);
+		////    jsonString = JSONUtil.toJsonStr(treeMap);
+		////
+		// jsonMap = (java.util.TreeMap<String, Object>) sortKey(jsonMap);
+		// jsonString = cn.hutool.json.JSONUtil.toJsonStr(jsonMap);
+		// log.info("排序后json编码：" + jsonString);
+		// String encode;
+		// encode = URLUtil.encodeAll(jsonString, StandardCharsets.UTF_8);
+		// log.info("bizContent进行JSON编码后URLEncoder编码：" + encode);
+		// String s = cn.hutool.core.codec.Base64.encode(StrUtil.bytes(encode, StandardCharsets.UTF_8));
+		// log.info("bizContent进行JSON编码后URLEncoder编码后进行base64编码：" + s);
+		// return s;
+		// 将对象转为 JSON 字符串
+		String bizContent = cn.hutool.json.JSONUtil.toJsonStr(data);
+		log.info("bizContent进行JSON编码：" + bizContent);
+		// 根据Key进行排序
+		cn.hutool.json.JSON json = cn.hutool.json.JSONUtil.isJsonArray(bizContent) ? JSONUtil.parseArray(bizContent) : JSONUtil.parseObj(bizContent);
+		java.util.TreeMap<String, Object> jsonMap = (TreeMap<String, Object>) sortKey(json);
+		// 调用排序函数根据Key排序
+		jsonMap = (java.util.TreeMap<String, Object>) sortKey(jsonMap);
+		bizContent = cn.hutool.json.JSONUtil.toJsonStr(jsonMap);
+		log.info("排序后json编码：" + bizContent);
+		// 将 JSON 字符串内特殊字符进行编码
+		bizContent = cn.hutool.core.util.URLUtil.encodeAll(bizContent,
+				Charset.forName("UTF-8"));
+		log.info("bizContent进行JSON编码后URLEncoder编码：" + bizContent);
+		// 将编码后的 JSON 字符串进行 base64 加密
+		bizContent =
+				cn.hutool.core.codec.Base64.encode(cn.hutool.core.util.StrUtil.bytes(bizContent,
+						Charset.forName("UTF-8")));
+		log.info("bizContent进行JSON编码后URLEncoder编码后进行base64编码：" + bizContent);
+		return bizContent;
+		
+		// String bizContent = JSON.toJSONString(data);
+		// log.info("bizContent进行JSON编码：" + bizContent);
+		// // 根据Key进行排序
+		// //cn.hutool.json.JSON json = cn.hutool.json.JSONUtil.isJsonArray(bizContent)?JSONUtil.parseArray(bizContent):JSONUtil.parseObj(bizContent);
+		// //java.util.TreeMap<String,Object> jsonMap= (TreeMap<String, Object>) sortKey(json);
+		// // 调用排序函数根据Key排序
+		// //jsonMap= (java.util.TreeMap<String, Object>) sortKey(jsonMap);
+		// TreeMap<String, Object> treeMap = new TreeMap<>((Map<String, Object>) data);
+		// treeMap = (TreeMap<String, Object>) sortKeyMySelf(treeMap);
+		// log.info("treeMap: " + treeMap);
+		// bizContent = JSON.toJSONString(treeMap);
+		// log.info("排序后json编码：" + bizContent);
+		// // 将 JSON 字符串内特殊字符进行编码
+		// bizContent = cn.hutool.core.util.URLUtil.encodeAll(bizContent,
+		//         Charset.forName("UTF-8"));
+		// log.info("bizContent进行JSON编码后URLEncoder编码：" + bizContent);
+		// // 将编码后的 JSON 字符串进行 base64 加密
+		// bizContent =
+		//         Base64.getEncoder().encodeToString(bizContent.getBytes(StandardCharsets.UTF_8));
+		// log.info("bizContent进行JSON编码后URLEncoder编码后进行base64编码：" + bizContent);
+		// return bizContent;
+	}
+	
+	private static Object sortKeyMySelf(Map<String, Object> obj) {
+		TreeMap<String, Object> treeMap = new TreeMap<>(obj);
+		for (Map.Entry<String, Object> entry : treeMap.entrySet()) {
+			if (entry.getValue() instanceof List) {
+				List<Object> sortList = new ArrayList<>();
+				((List<?>) entry.getValue()).forEach(item -> {
+					if (item instanceof Map) {
+						sortList.add(new TreeMap<>((Map<String, Object>) item));
+					} else {
+						sortList.add(item);
+					}
+				});
+				entry.setValue(sortList);
+			}
+		}
+		return treeMap;
+	}
+	
+	// 参数排序函数
+	private static Object sortKey(Object obj) {
+		if (obj instanceof cn.hutool.json.JSONArray) {
+			List<TreeMap> values = new ArrayList<>();
+			cn.hutool.json.JSONArray jsonArray = (cn.hutool.json.JSONArray) obj;
+			jsonArray.forEach(e -> {
+				e = sortKey(e);
+				values.add((java.util.TreeMap) e);
+			});
+			return values;
+		} else if (obj instanceof cn.hutool.json.JSONObject) {
+			java.util.TreeMap<String, Object> jsonMap = cn.hutool.json.JSONUtil.toBean((cn.hutool.json.JSONObject) obj, java.util.TreeMap.class);
+			jsonMap.forEach((key, value) -> {
+				if (value instanceof cn.hutool.json.JSON) {
+					value = sortKey(value);
+					jsonMap.put(key, value);
+				}
+			});
+			return jsonMap;
+		}
+		return obj;
+	}
+	
+	/**
+	 * 加密请求信息
+	 *
+	 * @param str 加密字符串
+	 * @return 被加密后的字符串
+	 */
+	private static String string2SHA256(String str) {
+		MessageDigest messageDigest;
+		String encdeStr = "";
+		try {
+			messageDigest = MessageDigest.getInstance("SHA-256");
+			byte[] hash = messageDigest.digest(str.getBytes(StandardCharsets.UTF_8));
+			encdeStr = Hex.encodeHexString(hash);
+			log.info("进行SHA-256加密：" + encdeStr);
+		} catch (NoSuchAlgorithmException e) {
+			e.printStackTrace();
+		}
+		String s = encdeStr.toUpperCase();
+		log.info("进行SHA-256加密后转为全大写：" + s);
+		return s;
+	}
+	
+	
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_pcn/convert_pdf/ConvertPdfAction.java b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/convert_pdf/ConvertPdfAction.java
new file mode 100644
index 0000000..07dee7e
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/convert_pdf/ConvertPdfAction.java
@@ -0,0 +1,201 @@
+package weaver.aiyh_pcn.convert_pdf;
+
+import aiyh.utils.Util;
+import aiyh.utils.mapUtil.ParaMap;
+import aiyh.utils.sqlUtil.sqlResult.impl.PrepSqlResultImpl;
+import aiyh.utils.zwl.common.ToolUtil;
+import org.apache.axiom.util.base64.Base64Utils;
+import org.apache.commons.io.IOUtils;
+import org.h2.util.StringUtils;
+import weaver.conn.RecordSet;
+import weaver.docs.docs.seconddev.CreateDocForJSGJXT;
+import weaver.file.ImageFileManager;
+import weaver.hrm.User;
+import weaver.interfaces.workflow.action.Action;
+import weaver.soa.workflow.FileProcessor;
+import weaver.soa.workflow.request.RequestInfo;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Map;
+
+/**
+ * @author EBU7-dev1-ayh
+ * @create 2021/11/15 0015 14:38
+ * PDF 合并action
+ */
+
+
+public class ConvertPdfAction implements Action {
+
+//	需要合并的字段
+	private String mergeField;
+//	合并后存放文件的字段
+	private String mergeToField;
+//	1.流程字段，2，action参数，3流程字段+action参数,4 流程多字段拼接
+	private String mergePDFNameType;
+//	action参数的文件名
+	private String mergePDFName;
+//	流程字段和多字段
+	private String mergePDFNameFields;
+
+
+	@Override
+	public String execute(RequestInfo requestInfo) {
+		ToolUtil toolUtil = new ToolUtil();
+		toolUtil.writeDebuggerLog("进入PDF转换action！");
+		User user = requestInfo.getRequestManager().getUser();
+		String billTableName = requestInfo.getRequestManager().getBillTableName();
+		String requestId = requestInfo.getRequestid();
+		String workflowId = requestInfo.getWorkflowid();
+
+		if(StringUtils.isNullOrEmpty(mergeField)){
+			return Action.SUCCESS;
+		}
+        toolUtil.writeDebuggerLog(Util.logStr("action 参数：[mergePDFNameType:{}],[mergePDFName:{}],[mergePDFNameFields:{}]",mergePDFNameType,mergePDFName,mergePDFNameFields));
+		if(StringUtils.isNullOrEmpty(mergeToField)){
+//			TODO 修改labelId
+			requestInfo.getRequestManager().setMessagecontent(Util.getHtmlLabelName(-88650,user.getLanguage(),"没有配置合并后PDF存放字段，请联系管理员！"));
+			requestInfo.getRequestManager().setMessageid("1");
+			return Action.FAILURE_AND_CONTINUE;
+		}
+//		获取流程数据
+		RecordSet rs = new RecordSet();
+		String query = "select * from " + billTableName + " where requestid = ?";
+		rs.executeQuery(query,requestId);
+		Map<String, Object> workflowData = Util.recordSet2Map(rs);
+		toolUtil.writeDebuggerLog("流程数据：" + workflowData);
+		if(workflowData == null){
+			toolUtil.writeErrorLog("未查询到流程数据：" + query + " --> " + requestId);
+			return Action.SUCCESS;
+		}
+//		获取文件id
+		String docIds = Util.null2String(workflowData.get(mergeField));
+		toolUtil.writeDebuggerLog("文件id：" + docIds);
+		if(StringUtils.isNullOrEmpty(docIds)){
+			return Action.SUCCESS;
+		}
+
+//		查询字段的目录
+		String docCategorys = Util.getDocCategorys(workflowId, mergeField);
+		CreateDocForJSGJXT createDocForJSGJXT = new CreateDocForJSGJXT();
+		String[] docCategoryArray = docCategorys.split(",");
+		int docCategory = 0;
+		if(docCategoryArray.length == 3){
+			docCategory = Integer.parseInt(docCategoryArray[2]);
+		}else{
+			for (String s : docCategoryArray) {
+				docCategory = Integer.parseInt(s);
+			}
+		}
+		StringBuilder fileName = new StringBuilder();
+		String defaultFileName = "合同水印合并文件";
+		if("1".equals(mergePDFNameType.trim())){
+//			1.流程字段，2，action参数，3流程字段+action参数,4 流程多字段拼接
+			String fields = Util.null2String(workflowData.get(mergePDFNameFields));
+			fileName = new StringBuilder(Util.null2DefaultStr(fields, defaultFileName));
+		}else if("2".equals(mergePDFNameType.trim())){
+//			1.流程字段，2，action参数，3流程字段+action参数,4 流程多字段拼接
+			fileName = new StringBuilder(mergePDFName);
+		}else if("3".equals(mergePDFNameType.trim())){
+//			1.流程字段，2，action参数，3流程字段+action参数,4 流程多字段拼接
+			fileName = new StringBuilder(Util.null2DefaultStr(workflowData.get(mergePDFNameFields), defaultFileName) + mergePDFName);
+		}else if("4".equals(mergePDFNameType.trim())){
+//			1.流程字段，2，action参数，3流程字段+action参数,4 流程多字段拼接
+			String fields = Util.null2String(mergePDFNameFields);
+			String[] fieldArr = fields.split(",");
+			for (String field : fieldArr) {
+				fileName.append(Util.null2String(workflowData.get(field)));
+			}
+		}
+		if(StringUtils.isNullOrEmpty(fileName.toString())){
+			fileName = new StringBuilder(defaultFileName);
+		}
+		toolUtil.writeDebuggerLog("合并文件参数：fileName：" +  fileName + "  docCategory：" + docCategory + "  docIds：" + docIds);
+		int fileId;
+		if(docIds.split(",").length <= 1){
+//			查询真实文件id
+			query = "select imagefileid from docimagefile where docid = ?";
+			toolUtil.writeDebuggerLog(query + " --->  " + docIds);
+			rs.executeQuery(query,docIds);
+			rs.next();
+			fileId = Util.getIntValue(rs.getString("imagefileid"),0);
+			FileProcessor fileProcessor = new FileProcessor();
+			InputStream inputStreamById = ImageFileManager.getInputStreamById(fileId);
+			byte[] bytes = new byte[0];
+			try {
+				bytes = IOUtils.toByteArray(inputStreamById);
+			} catch (IOException e) {
+				e.printStackTrace();
+				toolUtil.writeErrorLog("复制文件时，文件转为base64出错，文件转换出错！" + e);
+			}
+			String base64 = Base64Utils.encode(bytes);
+			fileId = fileProcessor.Process("base64:" + base64, docCategorys, user, fileName + ".pdf");
+			if(fileId <= 0){
+				toolUtil.writeErrorLog(docCategorys + "---------->" + fileName);
+				toolUtil.writeDebuggerLog("文件创建错误、错误id：" + fileId);
+				toolUtil.writeErrorLog(base64);
+//			TODO 修改labelId
+				requestInfo.getRequestManager().setMessagecontent(Util.getHtmlLabelName(-88651,user.getLanguage(),"合并pdf错误，请联系管理员！"));
+				requestInfo.getRequestManager().setMessageid("1");
+				return Action.FAILURE_AND_CONTINUE;
+			}
+		}else{
+			fileId = createDocForJSGJXT.creatDoc(user, fileName.toString(), docCategory, docIds);
+		}
+
+		if(fileId <= 0){
+			toolUtil.writeDebuggerLog("文件合并错误！(-2:用户为空,-1:文档获取异常)、错误id：" + fileId);
+//			TODO 修改labelId
+			requestInfo.getRequestManager().setMessagecontent(Util.getHtmlLabelName(-88651,user.getLanguage(),"合并pdf错误，请联系管理员！"));
+			requestInfo.getRequestManager().setMessageid("1");
+			return Action.FAILURE_AND_CONTINUE;
+		}
+//		将合并的文件回写到流程中
+		PrepSqlResultImpl sqlResult = Util.createSqlBuilder().updateSql(billTableName, ParaMap.create().put(mergeToField, fileId),
+				Util.createPrepWhereImpl().whereAnd("requestid").whereEqual(requestId));
+		toolUtil.writeDebuggerLog("数据回写：" + sqlResult.getSqlStr() + " --> 参数： " + sqlResult.getArgs());
+		rs.executeUpdate(sqlResult.getSqlStr(),sqlResult.getArgs());
+		return Action.SUCCESS;
+	}
+
+	public String getMergeField() {
+		return mergeField;
+	}
+
+	public void setMergeField(String mergeField) {
+		this.mergeField = mergeField;
+	}
+
+	public String getMergeToField() {
+		return mergeToField;
+	}
+
+	public void setMergeToField(String mergeToField) {
+		this.mergeToField = mergeToField;
+	}
+
+	public String getMergePDFNameType() {
+		return mergePDFNameType;
+	}
+
+	public void setMergePDFNameType(String mergePDFNameType) {
+		this.mergePDFNameType = mergePDFNameType;
+	}
+
+	public String getMergePDFName() {
+		return mergePDFName;
+	}
+
+	public void setMergePDFName(String mergePDFName) {
+		this.mergePDFName = mergePDFName;
+	}
+
+	public String getMergePDFNameFields() {
+		return mergePDFNameFields;
+	}
+
+	public void setMergePDFNameFields(String mergePDFNameFields) {
+		this.mergePDFNameFields = mergePDFNameFields;
+	}
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_pcn/copy_attachment/AttachmentIdName.java b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/copy_attachment/AttachmentIdName.java
new file mode 100644
index 0000000..2173fd3
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/copy_attachment/AttachmentIdName.java
@@ -0,0 +1,37 @@
+package weaver.aiyh_pcn.copy_attachment;
+
+/**
+ * @author EBU7-dev1-ayh
+ * @create 2021/10/9 0009 14:39
+ * id和name
+ */
+
+
+public class AttachmentIdName {
+	private String docid;
+	private String imagefilename;
+
+	@Override
+	public String toString() {
+		return "AttachmentIdName{" +
+				"docId='" + docid + '\'' +
+				", imagefilename='" + imagefilename + '\'' +
+				'}';
+	}
+
+	public String getDocid() {
+		return docid;
+	}
+
+	public void setDocid(String docId) {
+		this.docid = docId;
+	}
+
+	public String getImagefilename() {
+		return imagefilename;
+	}
+
+	public void setImagefilename(String imagefilename) {
+		this.imagefilename = imagefilename;
+	}
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_pcn/copy_attachment/CopyAttachmentAction.java b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/copy_attachment/CopyAttachmentAction.java
new file mode 100644
index 0000000..db91c13
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/copy_attachment/CopyAttachmentAction.java
@@ -0,0 +1,132 @@
+package weaver.aiyh_pcn.copy_attachment;
+
+import aiyh.utils.Util;
+import aiyh.utils.mapUtil.ParaMap;
+import aiyh.utils.sqlUtil.sqlResult.impl.PrepSqlResultImpl;
+import aiyh.utils.zwl.common.ToolUtil;
+import com.api.aiyh_pcn.copy_attachment.dao.ConfigTableData;
+import com.api.aiyh_pcn.copy_attachment.model.ConfigEmpty;
+import weaver.conn.RecordSet;
+import weaver.interfaces.workflow.action.Action;
+import weaver.soa.workflow.request.RequestInfo;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author EBU7-dev1-ayh
+ * @create 2021/10/9 0009 13:42
+ * 模板覆盖文件
+ */
+
+
+public class CopyAttachmentAction extends ToolUtil implements Action {
+    //当前类名称
+    private final String className = "AddCustomer_Action";
+    private String overrideField;
+
+
+    @Override
+    public String execute(RequestInfo requestInfo) {
+        this.writeDebuggerLog(className + "======>" + overrideField);
+        try {
+            String workflowid = requestInfo.getWorkflowid();
+            //流程请求ID
+            String requestid = Util.null2String(requestInfo.getRequestid());
+            //流程表单名称
+            String tableName = requestInfo.getRequestManager().getBillTableName();
+            ConfigEmpty config = ConfigTableData.getConfig(workflowid);
+//		查询是流程数据
+            String query = "select * from " + tableName + " where requestid = ?";
+            RecordSet rs = new RecordSet();
+            rs.executeQuery(query, requestid);
+            Map<String, Object> requestMap = Util.recordSet2Map(rs);
+            if (requestMap == null || config == null) {
+                return Action.SUCCESS;
+            }
+            if (!requestMap.get(config.getShowField()).equals(config.getShowValue())) {
+                return Action.SUCCESS;
+            }
+//		需要模板覆盖
+            String attachmentValue = String.valueOf(requestMap.get(config.getAttachmentField()));
+            String overrideValue = String.valueOf(requestMap.get(overrideField));
+            this.writeDebuggerLog(requestMap.toString());
+//		查询这些文件的相关信息
+            query = "select distinct docid,imagefilename from docimagefile where docid in (" + attachmentValue + ")";
+            this.writeDebuggerLog("查询附件信息说sql:" + query);
+            rs.executeQuery(query);
+            List<AttachmentIdName> attachmentList = Util.recordeSet2Array(rs, AttachmentIdName.class);
+            query = "select distinct docid,imagefilename from docimagefile where docid in (" + overrideValue + ")";
+            rs.executeQuery(query);
+            this.writeDebuggerLog("查询覆盖文件信息:" + query);
+            List<AttachmentIdName> overrideList = Util.recordeSet2Array(rs, AttachmentIdName.class);
+            this.writeDebuggerLog(attachmentList.toString());
+            this.writeDebuggerLog(overrideList.toString());
+            if (attachmentList.size() != overrideList.size()) {
+                requestInfo.getRequestManager().setMessagecontent("合同模板与上传模板数量不一致");
+                requestInfo.getRequestManager().setMessageid("合同模板与上传模板数量不一致");
+                return Action.FAILURE_AND_CONTINUE;
+            }
+//		需要移除的文件
+            List<AttachmentIdName> removeFile = new ArrayList<>();
+//		移除所有的pdf文件
+            for (AttachmentIdName overrideIdName : overrideList) {
+                String fileName = overrideIdName.getImagefilename();
+                String extension = "";
+                this.writeDebuggerLog(overrideIdName.toString());
+                int index = fileName.lastIndexOf('.');
+                if (index > 0) {
+                    extension = fileName.substring(index + 1);
+                }
+                this.writeDebuggerLog(extension);
+                if ("pdf".equalsIgnoreCase(extension)) {
+                    removeFile.add(overrideIdName);
+                }
+            }
+//			删除文件
+            for (AttachmentIdName overrideIdName : removeFile) {
+                overrideList.remove(overrideIdName);
+            }
+//		添加pdf文件
+            for (AttachmentIdName attachmentIdName : attachmentList) {
+                String fileName = attachmentIdName.getImagefilename();
+                String extension = "";
+                this.writeDebuggerLog(attachmentIdName.toString());
+                int index = fileName.lastIndexOf('.');
+                if (index > 0) {
+                    extension = fileName.substring(index + 1);
+                }
+                this.writeDebuggerLog(extension);
+                if ("pdf".equalsIgnoreCase(extension)) {
+                    overrideList.add(attachmentIdName);
+                }
+            }
+            if (attachmentList.size() != overrideList.size()) {
+                requestInfo.getRequestManager().setMessagecontent("合同模板与上传模板数量不一致");
+                requestInfo.getRequestManager().setMessageid("合同模板与上传模板数量不一致");
+                return Action.FAILURE_AND_CONTINUE;
+            }
+            StringBuilder overrideBuilder = new StringBuilder();
+            for (AttachmentIdName overrideIdName : overrideList) {
+                overrideBuilder.append(",").append(overrideIdName.getDocid());
+            }
+            String overrideResult = Util.removeSeparator(overrideBuilder);
+            this.writeDebuggerLog(overrideResult);
+            PrepSqlResultImpl sqlResult = Util.createSqlBuilder().updateSql(tableName, ParaMap.create().put(this.overrideField, overrideResult),
+                    Util.createPrepWhereImpl().whereAnd("requestid").whereEqual(requestid));
+            rs.executeUpdate(sqlResult.getSqlStr(), sqlResult.getArgs());
+        } catch (Exception e) {
+            this.writeErrorLog(e.getMessage());
+        }
+        return Action.SUCCESS;
+    }
+
+    public String getOverrideField() {
+        return overrideField;
+    }
+
+    public void setOverrideField(String overrideField) {
+        this.overrideField = overrideField;
+    }
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_pcn/copy_attachment/CopyAttachmentSecretAction.java b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/copy_attachment/CopyAttachmentSecretAction.java
new file mode 100644
index 0000000..f04413a
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/copy_attachment/CopyAttachmentSecretAction.java
@@ -0,0 +1,294 @@
+package weaver.aiyh_pcn.copy_attachment;
+
+import aiyh.utils.Util;
+import aiyh.utils.mapUtil.ParaMap;
+import aiyh.utils.sqlUtil.sqlResult.impl.PrepSqlResultImpl;
+import aiyh.utils.zwl.common.ToolUtil;
+import com.api.aiyh_pcn.copy_attachment.dao.DocTemplateDao;
+import com.api.aiyh_pcn.copy_attachment.model.ConfigEmpty;
+import org.h2.util.StringUtils;
+import weaver.conn.RecordSet;
+import weaver.hrm.User;
+import weaver.interfaces.workflow.action.Action;
+import weaver.soa.workflow.request.RequestInfo;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * @author EBU7-dev1-ayh
+ * @create 2021/11/8 0008 15:38
+ * baomixieyi
+ */
+
+
+public class CopyAttachmentSecretAction extends ToolUtil implements Action {
+	//	模板id
+	private String attachmentTemplateId;
+	//	是否属于浏览框
+	private String isBrowseBox;
+	//	第一次添加附件标识字段
+	private String firstAddField;
+	//	第一次添加附件的值
+	private String firstAddValue;
+	//	第一次添加成功后的回写值
+	private String addSuccessValue;
+	//	安全协议单独id字段
+	private String secretField;
+
+	@Override
+	public String execute(RequestInfo requestInfo) {
+		ToolUtil toolUtil = new ToolUtil();
+
+		try {
+			User user = requestInfo.getRequestManager().getUser();
+			String billTableName = requestInfo.getRequestManager().getBillTableName();
+			String requestId = requestInfo.getRequestid();
+			String workflowId = requestInfo.getWorkflowid();
+			RecordSet rs_1 = new RecordSet();
+//		查询流程数据
+			String query = "select * from " + billTableName + " where requestid = ?";
+			toolUtil.writeDebuggerLog("进入保密协议action！");
+			rs_1.executeQuery(query, requestId);
+			Map<String, Object> requestData = Util.recordSet2Map(rs_1);
+			toolUtil.writeDebuggerLog(requestData.toString());
+//			如果不是第一次添加，则直接返回  隐藏bug，如果用户第一次选择添加，后面被退回后，将附件清空了，重新上传，然后又需要安全协议，但是已经不是第一次添加了，所以并不会生效
+			if (StringUtils.isNullOrEmpty(secretField)) {
+				if (requestData.get(firstAddField) != null && !Util.null2String(firstAddValue).equals(String.valueOf(requestData.get(firstAddField)))) {
+					return Action.SUCCESS;
+				}
+			}
+//		查询配置表，获取配置数据
+			String querySql = "select ufta.id,ufta.workflow_type,wftva.fieldname as template_field,  " +
+					"wftvb.fieldname as attachment_field,wftv.fieldname as show_field, wftvb.id as attachment_field_id,  " +
+					"ufta.is_template_show,ufta.model_table_name, ufta.model_field,wsl.selectvalue as show_value,  " +
+					"wftv.tablename as show_table_name,wftva.tablename as template_table_name,wftvb.tablename as attachment_table_name,  " +
+					"wsla.selectvalue as hidden_value from uf_temp_attachment as ufta  " +
+					"left join workflow_selectitem as wsl on wsl.id = ufta.show_value " +
+					"left join workflow_selectitem as wsla on wsla.id = ufta.hidden_value " +
+					"left join workflow_field_table_view as wftv on wftv.id = ufta.show_field " +
+					"left join workflow_field_table_view as wftva on wftva.id = ufta.template_field " +
+					"left join workflow_field_table_view as wftvb on wftvb.id = ufta.attachment_field " +
+					"where workflow_type in " +
+					"(select id from workflow_base where activeVersionID in " +
+					"(select activeVersionID  from workflow_base where id = ?) or id = ?) and attachment_type = ?";
+			RecordSet rs = new RecordSet();
+			rs.executeQuery(querySql, workflowId, workflowId, 1);
+			ConfigEmpty configEmpty = null;
+			while (rs.next()) {
+//			    id
+				int id = Util.getIntValue(rs.getString("id"));
+//			    显示值
+				int showValue = Util.getIntValue(rs.getString("show_value"));
+//			    隐藏值
+				int hiddenValue = Util.getIntValue(rs.getString("hidden_value"));
+//			    流程id
+				String workflowType = rs.getString("workflow_type");
+//			    模板字段
+				String templateField = rs.getString("template_field");
+//			    附件字段
+				String attachmentField = rs.getString("attachment_field");
+//			    是否用字段控制模板
+				String isTemplateShow = rs.getString("is_template_show");
+//			    模板建模表表名
+				String modelTableName = rs.getString("model_table_name");
+//			    控制模板显示与否的字段
+				String showField = rs.getString("show_field");
+//			    建模表福建模板字段
+				String modelField = rs.getString("model_field");
+//			    控制显示所在表
+				String showTableName = rs.getString("show_table_name");
+//			    模板字段所在表
+				String templateTableName = rs.getString("template_table_name");
+//			    附件字段所在表
+				String attachmentTableName = rs.getString("attachment_table_name");
+//			    附件字段id
+				String attachmentFieldId = rs.getString("attachment_field_id");
+				toolUtil.writeDebuggerLog("保密协议已经查询到数据！");
+
+				configEmpty = ConfigEmpty.create()
+						.id(id)
+						.showValue(showValue)
+						.hiddenValue(hiddenValue)
+						.workflowType(workflowType)
+						.templateField(templateField)
+						.attachmentField(attachmentField)
+						.isTemplateShow(isTemplateShow)
+						.modelTableName(modelTableName)
+						.showField(showField)
+						.modelField(modelField)
+						.showTableName(showTableName)
+						.templateTableName(templateTableName)
+						.attachmentTableName(attachmentTableName)
+						.attachmentFieldId(attachmentFieldId)
+						.builder();
+				if (!StringUtils.isNullOrEmpty(secretField)) {
+					//				原字段的文件id
+					String fileIds = Util.null2String(rs_1.getString(configEmpty.getAttachmentField()));
+					String[] split = fileIds.split(",");
+//				转为list
+					List<String> list = Arrays.stream(split).collect(Collectors.toList());
+//				如果配置了secretField字段
+					if (!StringUtils.isNullOrEmpty(secretField)) {
+						String secretIds = Util.null2String(rs_1.getString(secretField));
+						String[] secretIdArr = secretIds.split(",");
+						List<String> secretFieldList = Arrays.stream(secretIdArr).collect(Collectors.toList());
+						list.removeAll(secretFieldList);
+					}
+					Map<String, Object> data = ParaMap.create().put(configEmpty.getAttachmentField(), String.join(",", list));
+//			修改流程数据，将保密协议的docid更新到流程中
+					PrepSqlResultImpl sqlResult = Util.createSqlBuilder().updateSql(billTableName,
+							data,
+							Util.createPrepWhereImpl().whereAnd("requestid").whereEqual(requestId));
+					toolUtil.writeDebuggerLog("sql ： " + sqlResult.getSqlStr() + "  参数： ---> " + sqlResult.getArgs());
+					rs.executeUpdate(sqlResult.getSqlStr(), sqlResult.getArgs());
+				}
+				toolUtil.writeDebuggerLog("保密协议数据：" + configEmpty.toString());
+//			    如果不控制是否使用模板，那就默认不添加保密协议
+				if ("1".equals(isTemplateShow)) {
+//				不使用模板
+					toolUtil.writeDebuggerLog("不使用安全协议数据！因为不控制模板的使用！");
+					return Action.SUCCESS;
+				}
+				String showFieldValue = String.valueOf(requestData.get(configEmpty.getShowField()));
+//			不使用保密协议模板
+				if (configEmpty.getShowValue() != Integer.parseInt(showFieldValue)) {
+					toolUtil.writeDebuggerLog("不使用安全协议数据！因为不使用保密协议！");
+					return Action.SUCCESS;
+				}
+			}
+			if (configEmpty != null) {
+//			使用保密协议模板
+				String docIds = copyFile(user, configEmpty, String.valueOf(requestData.get(configEmpty.getTemplateField())));
+				toolUtil.writeDebuggerLog("复制完成文件id：" + docIds);
+				if (StringUtils.isNullOrEmpty(docIds)) {
+					requestInfo.getRequestManager().setMessageid("1");
+//				TODO 修改htmlLabel
+					requestInfo.getRequestManager().setMessagecontent(aiyh.utils.Util.getHtmlLabelName(-87783, user.getLanguage(), "保密协议复制失败，未能正确复制保密协议！"));
+					return Action.FAILURE_AND_CONTINUE;
+				}
+//				原字段的文件id
+				String fileIds = Util.null2String(rs_1.getString(configEmpty.getAttachmentField()));
+				String[] split = fileIds.split(",");
+//				转为list
+				List<String> list = Arrays.stream(split).collect(Collectors.toList());
+//				如果配置了secretField字段
+				if (!StringUtils.isNullOrEmpty(secretField)) {
+					String secretIds = Util.null2String(rs_1.getString(secretField));
+					String[] secretIdArr = secretIds.split(",");
+					List<String> secretFieldList = Arrays.stream(secretIdArr).collect(Collectors.toList());
+					list.removeAll(secretFieldList);
+				}
+				String[] docList = docIds.split(",");
+				list.addAll(Arrays.stream(docList).collect(Collectors.toList()));
+				Map<String, Object> data = ParaMap.create().put(configEmpty.getAttachmentField(), String.join(",", list));
+				if (!StringUtils.isNullOrEmpty(secretField)) {
+					data.put(secretField, docIds);
+				} else {
+					data.put(firstAddField, addSuccessValue);
+				}
+//			修改流程数据，将保密协议的docid更新到流程中
+				PrepSqlResultImpl sqlResult = Util.createSqlBuilder().updateSql(billTableName,
+						data,
+						Util.createPrepWhereImpl().whereAnd("requestid").whereEqual(requestId));
+				toolUtil.writeDebuggerLog("sql ： " + sqlResult.getSqlStr() + "  参数： ---> " + sqlResult.getArgs());
+				rs.executeUpdate(sqlResult.getSqlStr(), sqlResult.getArgs());
+			}
+		} catch (Exception e) {
+			toolUtil.writeErrorLog("出现错误： " + e);
+		}
+		return Action.SUCCESS;
+	}
+
+	public String copyFile(User user, ConfigEmpty configEmpty, String browseBoxId) {
+		ToolUtil toolUtil = new ToolUtil();
+//		建模表名称  params.get("tableName")
+		String tableName = String.valueOf(configEmpty.getModelTableName());
+//		建模字段名 params.get("fieldName")
+		String fieldName = String.valueOf(configEmpty.getModelField());
+//		附件字段id  params.get("fileFieldId")
+		String fileFieldId = String.valueOf(configEmpty.getAttachmentField());
+//		配置id params.get("configId")
+//		String configId = String.valueOf(configEmpty.getId());
+		String configId;
+		if ("true".equals(isBrowseBox)) {
+//			如果是流程中的某个浏览框，则读取配置文件的浏览框值，否则直接赋值为action中配置的模板id
+			configId = browseBoxId;
+		} else {
+			configId = attachmentTemplateId;
+		}
+//		流程id params.get("workflowId")
+		String workflowId = String.valueOf(configEmpty.getWorkflowType());
+		DocTemplateDao docTemplateDao = new DocTemplateDao();
+		int[] docIds = null;
+		try {
+			docIds = docTemplateDao.copyFile(user.getUID(), tableName, fieldName, configId);
+		} catch (Exception e) {
+			toolUtil.writeErrorLog("复制文件出错： " + e);
+			return null;
+		}
+		if (docIds == null) {
+			return null;
+		}
+		try {
+			docTemplateDao.updateFileInfo(workflowId, fileFieldId, docIds);
+		} catch (Exception e) {
+			toolUtil.writeErrorLog("复制文件更新权限和目录出错： " + e);
+			return null;
+		}
+		toolUtil.writeDebuggerLog("数据更新成功！" + Arrays.toString(docIds));
+		List<String> intList = Arrays.stream(docIds).boxed().collect(Collectors.toList())
+				.stream().map(String::valueOf).collect(Collectors.toList());
+		return String.join(",", intList);
+	}
+
+	public String getAttachmentTemplateId() {
+		return attachmentTemplateId;
+	}
+
+	public void setAttachmentTemplateId(String attachmentTemplateId) {
+		this.attachmentTemplateId = attachmentTemplateId;
+	}
+
+	public String getIsBrowseBox() {
+		return isBrowseBox;
+	}
+
+	public void setIsBrowseBox(String isBrowseBox) {
+		this.isBrowseBox = isBrowseBox;
+	}
+
+	public String getFirstAddField() {
+		return firstAddField;
+	}
+
+	public void setFirstAddField(String firstAddField) {
+		this.firstAddField = firstAddField;
+	}
+
+	public String getFirstAddValue() {
+		return firstAddValue;
+	}
+
+	public void setFirstAddValue(String firstAddValue) {
+		this.firstAddValue = firstAddValue;
+	}
+
+	public String getSecretField() {
+		return secretField;
+	}
+
+	public void setSecretField(String secretField) {
+		this.secretField = secretField;
+	}
+
+	public String getAddSuccessValue() {
+		return addSuccessValue;
+	}
+
+	public void setAddSuccessValue(String addSuccessValue) {
+		this.addSuccessValue = addSuccessValue;
+	}
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_pcn/fadada/FaDDContractAction.java b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/fadada/FaDDContractAction.java
new file mode 100644
index 0000000..9308c19
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/fadada/FaDDContractAction.java
@@ -0,0 +1,163 @@
+package weaver.aiyh_pcn.fadada;
+
+import aiyh.utils.Util;
+import aiyh.utils.zwl.common.ToolUtil;
+import com.api.aiyh_pcn.fadada.dao.FaDDContractMapping;
+import com.api.aiyh_pcn.fadada.entity.FaDaDaConfigDTO;
+import org.h2.util.StringUtils;
+import weaver.aiyh_pcn.fadada.util.FaddContractUtil;
+import weaver.hrm.User;
+import weaver.interfaces.workflow.action.Action;
+import weaver.soa.workflow.request.RequestInfo;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author EBU7-dev1-ayh
+ * @create 2021/11/3 0003 15:20
+ */
+
+
+public class FaDDContractAction extends ToolUtil implements Action {
+	private final FaDDContractMapping faDDContractMapping = new FaDDContractMapping();
+	private final ToolUtil toolUtil = new ToolUtil();
+	//	合同字段
+	private String contractField;
+	//	客户编号字段
+	private String customerNoField;
+	//	客户编号
+	private String customerNo;
+	//	是否是顺序签订
+	private String queueSigned;
+	//	签订字段,用于是否电子签
+	private String signedField;
+	//	签订值
+	private String signedValue;
+	
+	
+	@Override
+	public String execute(RequestInfo requestInfo) {
+		FaddContractUtil faddContractUtil = null;
+		Map<String, Object> mainMap = null;
+		User user = null;
+		try {
+
+//		获取user
+			user = requestInfo.getRequestManager().getUser();
+//		获取流程id
+			String workflowId = requestInfo.getWorkflowid();
+//		获取请求id
+			String requestId = requestInfo.getRequestid();
+//		获取主表名称
+			String mainTableName = requestInfo.getRequestManager().getBillTableName();
+//		获取法大大配置信息
+			FaDaDaConfigDTO faDaDaConfigDTO = faDDContractMapping.queryConfig(workflowId, 2);
+//		获取明细数据在那个表
+			String tableName = faDaDaConfigDTO.getCheckSource();
+//		查询主表信息
+			mainMap = faDDContractMapping.queryMainMap(requestId, mainTableName);
+//		判断主表中的电子签章类型
+			String value = Util.null2String(mainMap.get(signedField));
+			if (StringUtils.isNullOrEmpty(value)) {
+				value = String.valueOf(System.currentTimeMillis());
+			}
+//		如果不需要进行电子签章，则放行流程
+			if (!value.equals(signedValue)) {
+				return Action.SUCCESS;
+			}
+			String mainId = Util.null2String(mainMap.get("id"));
+//      查询明细数据
+			List<Map<String, Object>> detailMaps = faDDContractMapping.queryDetailMaps(mainId, tableName);
+//		开始签署合同
+			faddContractUtil = new FaddContractUtil(workflowId, requestId, mainTableName, tableName,
+					customerNo, customerNoField, contractField, queueSigned, detailMaps, mainMap, user);
+			try {
+				faddContractUtil.createContract(mainMap);
+			} catch (Exception e) {
+				toolUtil.writeErrorLog("合同创建失败，失败原因：" + e);
+//			TODO 更换labelIndex
+				requestInfo.getRequestManager().setMessagecontent(Util.getHtmlLabelName(-87660, user.getLanguage(), "合同创建失败，未能正确创建法大大合同！"));
+				requestInfo.getRequestManager().setMessageid("1");
+				return Action.FAILURE_AND_CONTINUE;
+			}
+			if (faDaDaConfigDTO.getSignedType() == 1) {
+//			需要控制签署规则
+				if (Integer.parseInt(Util.null2String(mainMap.get(faDaDaConfigDTO.getFieldControl1()))) == faDaDaConfigDTO.getOnlyOwn()) {
+//				只需要本方签署
+					return Action.SUCCESS;
+				}
+
+/*
+			if(Integer.parseInt(Util.null2String(mainMap.get(faDaDaConfigDTO.getFieldControl1()))) == faDaDaConfigDTO.getOnlyOther()){
+//				只需要对方签署
+			}
+//			双方签署
+*/
+			
+			}
+		} catch (Exception e) {
+			Util.getLogger().error("合同创建失败： " + Util.getErrString(e));
+			throw e;
+		}
+		try {
+			faddContractUtil.signedContract(mainMap);
+		} catch (Exception e) {
+			toolUtil.writeErrorLog("合同已创建，但发起签署失败，失败原因：" + e);
+//			TODO 更换labelIndex
+			requestInfo.getRequestManager().setMessagecontent(Util.getHtmlLabelName(-87659, user.getLanguage(), "合同已创建，当合同发起签署时失败！"));
+			requestInfo.getRequestManager().setMessageid("2");
+			return Action.FAILURE_AND_CONTINUE;
+		}
+		return Action.SUCCESS;
+	}
+	
+	
+	public String getContractField() {
+		return contractField;
+	}
+	
+	public void setContractField(String contractField) {
+		this.contractField = contractField;
+	}
+	
+	public String getCustomerNoField() {
+		return customerNoField;
+	}
+	
+	public void setCustomerNoField(String customerNoField) {
+		this.customerNoField = customerNoField;
+	}
+	
+	public String getCustomerNo() {
+		return customerNo;
+	}
+	
+	public void setCustomerNo(String customerNo) {
+		this.customerNo = customerNo;
+	}
+	
+	public String getSignedField() {
+		return signedField;
+	}
+	
+	public void setSignedField(String signedField) {
+		this.signedField = signedField;
+	}
+	
+	public String getSignedValue() {
+		return signedValue;
+	}
+	
+	public void setSignedValue(String signedValue) {
+		this.signedValue = signedValue;
+	}
+	
+	public String getQueueSigned() {
+		return queueSigned;
+	}
+	
+	public void setQueueSigned(String queueSigned) {
+		this.queueSigned = queueSigned;
+	}
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_pcn/fadada/UploadFile2FaDDAction.java b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/fadada/UploadFile2FaDDAction.java
new file mode 100644
index 0000000..044bf17
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/fadada/UploadFile2FaDDAction.java
@@ -0,0 +1,493 @@
+package weaver.aiyh_pcn.fadada;
+
+import aiyh.utils.Util;
+import aiyh.utils.entity.ApiConfigDetailDTO;
+import aiyh.utils.entity.ApiConfigMainDTO;
+import aiyh.utils.httpUtil.ResponeVo;
+import aiyh.utils.mapUtil.ParaMap;
+import aiyh.utils.sqlUtil.sqlResult.impl.PrepSqlResultImpl;
+import aiyh.utils.zwl.common.ToolUtil;
+import com.api.aiyh_pcn.fadada.dao.FaDDServiceMapping;
+import com.api.aiyh_pcn.fadada.entity.FaDaDaConfigDTO;
+import com.api.aiyh_pcn.fadada.util.FaDDRequestUtils;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import org.h2.util.StringUtils;
+import weaver.aiyh_pcn.fadada.entity.FileInfo;
+import weaver.conn.RecordSet;
+import weaver.file.ImageFileManager;
+import weaver.hrm.User;
+import weaver.interfaces.workflow.action.Action;
+import weaver.soa.workflow.request.RequestInfo;
+import weaver.workflow.workflow.WorkflowVersion;
+
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author EBU7-dev1-ayh
+ * @create 2021/10/13 0013 19:41
+ * 上传合同
+ */
+
+
+public class UploadFile2FaDDAction extends ToolUtil implements Action {
+	private final FaDDServiceMapping faDDServiceMapping = new FaDDServiceMapping();
+	private String workflowId;
+	private String requestId;
+	private String mainTableName;
+	private String tableName;
+	private final RecordSet rs = new RecordSet();
+	private String contractField;
+	private String customerNoField;
+	private String customerNo;
+	private String manySigned;
+	private String manySignedNum;
+	private String manySignedCompanyNo;
+	private String signedField;
+	private String signedValue;
+	private String manySignedKeyWord;
+	private List<Map<String, Object>> detailMaps;
+	private Map<String, Object> mainMap;
+
+	@Override
+	public String execute(RequestInfo requestInfo) {
+		this.workflowId = requestInfo.getWorkflowid();
+		this.requestId = requestInfo.getRequestid();
+		this.mainTableName = requestInfo.getRequestManager().getBillTableName();
+		FaDaDaConfigDTO faDaDaConfigDTO = faDDServiceMapping.queryConfig(workflowId, 2);
+		this.tableName = faDaDaConfigDTO.getCheckSource();
+		super.writeErrorLog("进入action：workflowId:" + workflowId + ",requestId:" + requestId + "，mainTableName："
+				+ mainTableName + ",tableName:" + tableName + ",contractField:" + contractField + ",customerNoField:" + customerNoField);
+		String query = "select * from " + this.mainTableName + " where requestid = ?";
+		RecordSet rs_1 = new RecordSet();
+		rs_1.executeQuery(query, this.requestId);
+		this.mainMap = Util.recordSet2Map(rs_1);
+		String value = String.valueOf(mainMap.get(signedField));
+		if(signedValue == null){
+			signedValue = "";
+		}
+		if(!signedValue.equals(value)){
+			return Action.SUCCESS;
+		}
+		try {
+			this.createContract();
+			try {
+				this.signedContract();
+			} catch (Exception e) {
+				super.writeErrorLog("合同签署时发生错误：" + e);
+				throw e;
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
+			super.writeErrorLog("合同action出现错误，错误原因：" + e.toString());
+			User user = requestInfo.getRequestManager().getUser();
+			Map<String, String> map = Util.queryLanguage(1, user.getLanguage());
+			requestInfo.getRequestManager().setMessagecontent(map.get("actionInfo"));
+			requestInfo.getRequestManager().setMessageid(map.get("actionInfo"));
+			return Action.FAILURE_AND_CONTINUE;
+		}
+//		this.signedContract();
+		return Action.SUCCESS;
+	}
+
+	public void createContract() {
+		String versionStringByWfid = WorkflowVersion.getVersionStringByWfid(workflowId);
+		RecordSet rs = new RecordSet();
+		rs.executeQuery("select * from uf_contract_config where workflow_type in ( " + versionStringByWfid + " ) and api_type = ?", 2);
+		rs.next();
+		ApiConfigMainDTO apiConfigMainDTO = Util.queryApiConfig(rs.getString("params_config"));
+		String query = "select * from " + this.mainTableName + " where requestid = ?";
+		RecordSet rs_1 = new RecordSet();
+		rs_1.executeQuery(query, this.requestId);
+		this.mainMap = Util.recordSet2Map(rs_1);
+		String mainId = "";
+		if (this.mainMap != null) {
+			mainId = String.valueOf(this.mainMap.get("id"));
+		} else {
+			super.writeErrorLog("没有查询到相关的请求id的数据！");
+		}
+		query = "select * from " + this.tableName + " where mainid = ?";
+		super.writeErrorLog(mainMap.toString());
+		this.rs.executeQuery(query, mainId);
+		this.detailMaps = Util.recordSet2MapList(this.rs);
+		if (detailMaps == null) {
+			super.writeErrorLog("查询明细失败！maps为null");
+			throw  new RuntimeException("明细查询失败！maps为null");
+		}
+		super.writeErrorLog("明细表数据：" + detailMaps);
+		for (Map<String, Object> detail : detailMaps) {
+			List<FileInfo> fileInfos = this.contractHandle(detail, this.contractField);
+			List<String> contractNoIds = new ArrayList<>();
+			List<String> fileNoIds = new ArrayList<>();
+			List<String> fileName = new ArrayList<>();
+			if (fileInfos == null || fileInfos.size() == 0) {
+				throw new RuntimeException("创建合同失败！");
+			}
+			for (FileInfo fileInfo : fileInfos) {
+				ResponeVo contract = FaDDRequestUtils.createContract(fileInfo, apiConfigMainDTO.getApiUrl());
+				Map<String, Object> result;
+				try {
+					Map<String, Object> entityMap = contract.getEntityMap();
+					if (!"200".equals(String.valueOf(entityMap.get("code")))) {
+						super.writeErrorLog("创建合同失败，错误信息:" + entityMap.get("message"));
+						throw new RuntimeException("创建合同失败！");
+					}
+					result = (Map<String, Object>) entityMap.get("data");
+					contractNoIds.add(Util.null2String(result.get("contractNo")));
+					fileNoIds.add(Util.null2String(result.get("fileNo")));
+					fileName.add(fileInfo.getImagefilename());
+				} catch (JsonProcessingException e) {
+					super.writeErrorLog(e.toString());
+					throw new RuntimeException("创建合同失败！");
+				}
+			}
+			String joinContract = String.join(",", contractNoIds);
+			String joinFileNoIds = String.join(",", fileNoIds);
+			String joinFileName = String.join(",", fileName);
+			Map<String, Object> updateMap = ParaMap.create().put("contract_no", joinContract)
+					.put("file_no", joinFileNoIds)
+					.put("file_name", joinFileName);
+			PrepSqlResultImpl sqlResult = Util.createSqlBuilder().updateSql(this.tableName, updateMap,
+					Util.createPrepWhereImpl().whereAnd("id").whereEqual(detail.get("id")));
+			super.writeErrorLog(sqlResult.getSqlStr() + "，参数：" + sqlResult.getArgs());
+			rs.executeUpdate(sqlResult.getSqlStr(), sqlResult.getArgs());
+
+		}
+	}
+
+	public List<FileInfo> contractHandle(Map<String, Object> detail, String contractField) {
+		String fileIds = Util.null2String(detail.get(contractField));
+		if (StringUtils.isNullOrEmpty(fileIds)) {
+			fileIds = Util.null2String(this.mainMap.get(contractField));
+		}
+		if ("".equals(fileIds)) {
+			return null;
+		}
+		List<FileInfo> fileInfos = faDDServiceMapping.queryImgFileIdByDocIds(fileIds);
+		String customer = customerNo;
+		;
+		if (StringUtils.isNullOrEmpty(customerNo)) {
+
+			String query = " select fadadaechapter from  uf_gyszsjb where vendorCode = ?";
+			rs.executeQuery(query, String.valueOf(detail.get(customerNoField)));
+			rs.next();
+			customer = rs.getString(1);
+		}
+//		super.writeErrorLog("fileInfos:" + fileInfos + ",fileIds:" + fileIds + ",customerNo:" + customerNo);
+		for (FileInfo fileInfo : fileInfos) {
+			InputStream inputStreamById = ImageFileManager.getInputStreamById(fileInfo.getImagefileid());
+			fileInfo.setFile(inputStreamById);
+			String imagefilename = fileInfo.getImagefilename();
+			if (imagefilename == null) {
+				return null;
+			}
+			fileInfo.setContractExtension(imagefilename.substring(imagefilename.lastIndexOf(".")));
+			fileInfo.setContractTitle(imagefilename);
+//			fileInfo.setCustomerNo(Util.null2String(detail.get("customer_no")));
+//			fileInfo.setCustomerNo("e23deb7a29714d0da5b806665ab3e2f8");
+			fileInfo.setCustomerNo(Util.null2String(customer));
+			if (StringUtils.isNullOrEmpty(fileInfo.getCustomerNo())) {
+				fileInfo.setCustomerNo(Util.null2String(detail.get("companyno")));
+			}
+			fileInfo.setUploadType(1);
+		}
+		return fileInfos;
+	}
+
+	public void signedContract() {
+		String query = "select * from " + this.tableName + " where mainid = ?";
+		this.rs.executeQuery(query, String.valueOf(mainMap.get("id")));
+		this.detailMaps = Util.recordSet2MapList(this.rs);
+		if (detailMaps == null) {
+			super.writeErrorLog("查询明细失败！maps为null");
+			return;
+		}
+		FaDaDaConfigDTO faDaDaConfigDTO = faDDServiceMapping.queryConfig(workflowId, 3);
+		ApiConfigMainDTO apiConfigMainDTO = Util.queryApiConfigTree(faDaDaConfigDTO.getParamsConfig());
+		List<Map<String, Object>> dataArr = new ArrayList<>();
+		String detailTable;
+		String dt = this.tableName.substring(this.tableName.indexOf("_dt") + 3);
+		detailTable = "detail_" + dt;
+		for (Map<String, Object> detailMap : this.detailMaps) {
+			Map<String, Object> dataMap = new HashMap<>();
+			for (Map.Entry<String, Object> entry : detailMap.entrySet()) {
+				dataMap.put(detailTable + "." + entry.getKey(), entry.getValue());
+			}
+			for (Map.Entry<String, Object> entry : this.mainMap.entrySet()) {
+				dataMap.put("main" + "." + entry.getKey(), entry.getValue());
+			}
+			dataArr.add(dataMap);
+		}
+		List<Map<String, Object>> maps = objectAndListHandle(apiConfigMainDTO.getDetails(), dataArr);
+		int n = 0;
+		for (Map<String, Object> map : maps) {
+			int contractNum = 0;
+			if ("true".equals(manySigned)) {
+				String[] companyNos = manySignedCompanyNo.split(",");
+				String[] keyWords = manySignedKeyWord.split(",");
+				for (int i = 0; i < companyNos.length; i++) {
+					String companyNo = String.valueOf(detailMaps.get(n).get(companyNos[i]));
+					String keyWord = String.valueOf(detailMaps.get(n).get(keyWords[i]));
+					map.put("companyNo", companyNo);
+					map.put("locateKey", keyWord);
+					String contractNos = Util.null2String(map.get("contractNo"));
+					String[] split = contractNos.split(",");
+					for (String s : split) {
+						map.put("contractNo", s);
+						ResponeVo responeVo = FaDDRequestUtils.signedContract(map, apiConfigMainDTO.getApiUrl());
+						contractNum++;
+						Map<String, Object> response = null;
+						try {
+							response = responeVo.getEntityMap();
+						} catch (JsonProcessingException e) {
+							e.printStackTrace();
+						}
+						if (!"200".equals(response.get("code"))) {
+							super.writeErrorLog("法大大接口签署合同失败！");
+						}
+					}
+				}
+			} else {
+				String contractNos = Util.null2String(map.get("contractNo"));
+				String[] split = contractNos.split(",");
+				for (String s : split) {
+					map.put("contractNo", s);
+					ResponeVo responeVo = FaDDRequestUtils.signedContract(map, apiConfigMainDTO.getApiUrl());
+					contractNum++;
+					Map<String, Object> response = null;
+					try {
+						response = responeVo.getEntityMap();
+					} catch (JsonProcessingException e) {
+						e.printStackTrace();
+					}
+					if (!"200".equals(response.get("code"))) {
+						super.writeErrorLog("法大大接口签署合同失败！");
+					}
+				}
+			}
+//			更新合同数量
+			Map<String, Object> updateMap = new HashMap<>();
+			updateMap.put("contract_num", contractNum);
+			PrepSqlResultImpl sqlResult = Util.createSqlBuilder().updateSql(tableName, updateMap,
+					Util.createPrepWhereImpl().whereAnd("id").whereEqual(String.valueOf(detailMaps.get(n).get("id"))));
+			rs.executeUpdate(sqlResult.getSqlStr(), sqlResult.getArgs());
+			n++;
+		}
+	}
+
+	private List<Map<String, Object>> objectAndListHandle(List<ApiConfigDetailDTO> treeList, List<Map<String, Object>> dataArr) {
+		List<Map<String, Object>> params = new ArrayList<>();
+		for (Map<String, Object> dataMap : dataArr) {
+			Map<String, Object> param = new HashMap<>();
+			for (ApiConfigDetailDTO apiConfigDetailDTO : treeList) {
+				Object value;
+				if (apiConfigDetailDTO.getParamType() == 3) {
+					Map<String, Object> map = new HashMap<>();
+//                  object类型
+					for (ApiConfigDetailDTO child : apiConfigDetailDTO.getChildren()) {
+						if (child.getChildren() == null || child.getChildren().size() == 0) {
+//							  handleChild(child.getChildren(), dataMap)
+							map.put(child.getParamName(), changeRuleHandle(child, dataMap));
+						} else {
+							map.put(child.getParamName(), handleChild(child.getChildren(), dataMap));
+						}
+					}
+					value = map;
+				} else if (apiConfigDetailDTO.getParamType() == 4) {
+					String sql = apiConfigDetailDTO.getArraySql();
+					String parsingSq = Util.parsingSq(sql, dataMap);
+//				    list类型
+					if (parsingSq.contains("delete") || parsingSq.contains("update") ||
+							parsingSq.contains("exec") || parsingSq.contains("drop") ||
+							parsingSq.contains("truncate")) {
+						value = new ArrayList<>();
+					} else {
+						RecordSet rs = new RecordSet();
+						rs.executeQuery(parsingSq.replace("ｓｅｌｅｃｔ", "select"));
+						value = Util.recordeSet2Array(rs, String.class);
+					}
+				} else {
+					value = changeRuleHandle(apiConfigDetailDTO, dataMap);
+				}
+				param.put(apiConfigDetailDTO.getParamName(), value);
+			}
+			params.add(param);
+		}
+		return params;
+	}
+
+	private Object handleChild(List<ApiConfigDetailDTO> children, Map<String, Object> dataMap) {
+		Map<String, Object> params = new HashMap<>();
+		for (ApiConfigDetailDTO child : children) {
+			Object value;
+			if (child.getChildren() != null) {
+				value = handleChild(child.getChildren(), dataMap);
+			} else {
+				value = changeRuleHandle(child, dataMap);
+			}
+			params.put(child.getParamName(), value);
+		}
+		return params;
+	}
+
+	private Object changeRuleHandle(ApiConfigDetailDTO apiConfigDetailDTO, Map<String, Object> dataMap) {
+		Object value;
+		String tableName;
+		String table;
+		String sql;
+		String resultSql;
+//			判断参数的转换规则
+		switch (apiConfigDetailDTO.getChangeRule()) {
+			case 0:
+//					不转换
+			case 2:
+//					流程字段值
+				table = apiConfigDetailDTO.getTablename();
+				if (!table.contains("_dt")) {
+//			        表示字段属于主表
+					tableName = "main";
+				} else {
+//			        字段属于明细表
+					String dt = table.substring(table.indexOf("_dt") + 3);
+					tableName = "detail_" + dt;
+				}
+//				super.writeErrorLog("参数值：" + dataMap.get(tableName + "." + apiConfigDetailDTO.getWorkflowField()) + ",参数map：" + dataMap);
+				value = dataMap.get(tableName + "." + apiConfigDetailDTO.getWorkflowField());
+				break;
+			case 1:
+//					固定值
+				value = apiConfigDetailDTO.getParamValue();
+				break;
+			case 3:
+//					系统日期
+				value = Util.getTime("yyyy-MM-dd");
+				break;
+			case 4:
+//					系统时间
+				value = Util.getTime("HH:mm:ss");
+				break;
+			case 5:
+//					系统日期-时间
+				value = Util.getTime("yyyy-MM-dd HH:mm:ss");
+				break;
+			case 6:
+//					自定义SQL
+			case 7:
+//					流程字段转SQL
+				sql = apiConfigDetailDTO.getParamValue();
+				resultSql = Util.parsingSq(sql, dataMap);
+				if (resultSql.contains("delete ") || resultSql.contains("update ") ||
+						resultSql.contains("exec ") || resultSql.contains("drop ") ||
+						resultSql.contains("truncate ")) {
+					value = null;
+				} else {
+					RecordSet rs = new RecordSet();
+					rs.executeQuery(resultSql.replace("ｓｅｌｅｃｔ", "select"));
+					rs.next();
+					value = Util.null2String(rs.getString(1));
+				}
+				break;
+			case 8:
+//
+//					流程名称
+				value = Util.getWorkflowNameById(String.valueOf(dataMap.get("workflowid")));
+				break;
+			case 9:
+//
+//					请求标题
+				value = Util.getRequestTitleById(String.valueOf(dataMap.get("requestid")));
+				break;
+			case 10:
+//
+//					流程requestId
+				value = dataMap.get("requestid");
+				break;
+			default:
+				value = null;
+				break;
+		}
+		if (apiConfigDetailDTO.getParamType() == 1) {
+//			Integer
+			value = Integer.parseInt(String.valueOf(value));
+		} else if (apiConfigDetailDTO.getParamType() == 2) {
+//          Boolean
+			value = Boolean.parseBoolean(String.valueOf(value));
+		}
+		return value;
+	}
+
+	public String getCustomerNo() {
+		return customerNo;
+	}
+
+	public void setCustomerNo(String customerNo) {
+		this.customerNo = customerNo;
+	}
+
+	public String getCustomerNoField() {
+		return customerNoField;
+	}
+
+	public void setCustomerNoField(String customerNoField) {
+		this.customerNoField = customerNoField;
+	}
+
+	public String getContractField() {
+		return contractField;
+	}
+
+	public void setContractField(String contractField) {
+		this.contractField = contractField;
+	}
+
+	public String getManySigned() {
+		return manySigned;
+	}
+
+	public void setManySigned(String manySigned) {
+		this.manySigned = manySigned;
+	}
+
+	public String getManySignedNum() {
+		return manySignedNum;
+	}
+
+	public void setManySignedNum(String manySignedNum) {
+		this.manySignedNum = manySignedNum;
+	}
+
+	public String getManySignedCompanyNo() {
+		return manySignedCompanyNo;
+	}
+
+	public void setManySignedCompanyNo(String manySignedCompanyNo) {
+		this.manySignedCompanyNo = manySignedCompanyNo;
+	}
+
+	public String getManySignedKeyWord() {
+		return manySignedKeyWord;
+	}
+
+	public void setManySignedKeyWord(String manySignedKeyWord) {
+		this.manySignedKeyWord = manySignedKeyWord;
+	}
+
+	public String getSignedField() {
+		return signedField;
+	}
+
+	public void setSignedField(String signedField) {
+		this.signedField = signedField;
+	}
+
+	public String getSignedValue() {
+		return signedValue;
+	}
+
+	public void setSignedValue(String signedValue) {
+		this.signedValue = signedValue;
+	}
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_pcn/fadada/entity/FileInfo.java b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/fadada/entity/FileInfo.java
new file mode 100644
index 0000000..9974d52
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/fadada/entity/FileInfo.java
@@ -0,0 +1,92 @@
+package weaver.aiyh_pcn.fadada.entity;
+
+import java.io.InputStream;
+
+/**
+ * @author EBU7-dev1-ayh
+ * @create 2021/10/18 0018 11:25
+ * 文件信息
+ */
+
+
+public class FileInfo {
+	private int imagefileid;
+	private String imagefilename;
+	private String contractExtension;
+	private String contractTitle;
+	private String customerNo;
+	private int uploadType = 1;
+	InputStream file;
+
+	{
+		this.uploadType = 1;
+	}
+	public int getImagefileid() {
+		return imagefileid;
+	}
+
+	public void setImagefileid(int imagefileid) {
+		this.imagefileid = imagefileid;
+	}
+
+	public String getImagefilename() {
+		return imagefilename;
+	}
+
+	public void setImagefilename(String imagefilename) {
+		this.imagefilename = imagefilename;
+	}
+
+	public String getContractExtension() {
+		return contractExtension;
+	}
+
+	public void setContractExtension(String contractExtension) {
+		this.contractExtension = contractExtension;
+	}
+
+	public String getContractTitle() {
+		return contractTitle;
+	}
+
+	public void setContractTitle(String contractTitle) {
+		this.contractTitle = contractTitle;
+	}
+
+	public String getCustomerNo() {
+		return customerNo;
+	}
+
+	public void setCustomerNo(String customerNo) {
+		this.customerNo = customerNo;
+	}
+
+	public int getUploadType() {
+		return uploadType;
+	}
+
+	public void setUploadType(int uploadType) {
+		this.uploadType = uploadType;
+	}
+
+	public InputStream getFile() {
+		return file;
+	}
+
+	public void setFile(InputStream file) {
+		this.file = file;
+	}
+
+	@Override
+	public String toString() {
+		return "FileInfo{" +
+				"imagefileid=" + imagefileid +
+				", imagefilename='" + imagefilename + '\'' +
+				", contractExtension='" + contractExtension + '\'' +
+				", contractTitle='" + contractTitle + '\'' +
+				", customerNo='" + customerNo + '\'' +
+				", uploadType='" + uploadType + '\'' +
+				", file=" + file +
+				'}';
+	}
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_pcn/fadada/util/FaddContractUtil.java b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/fadada/util/FaddContractUtil.java
new file mode 100644
index 0000000..984e9ca
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/fadada/util/FaddContractUtil.java
@@ -0,0 +1,387 @@
+package weaver.aiyh_pcn.fadada.util;
+
+import aiyh.utils.Util;
+import aiyh.utils.entity.ApiConfigMainDTO;
+import aiyh.utils.httpUtil.ResponeVo;
+import aiyh.utils.mapUtil.ParaMap;
+import aiyh.utils.sqlUtil.sqlResult.impl.PrepSqlResultImpl;
+import aiyh.utils.zwl.common.ToolUtil;
+import com.alibaba.fastjson.JSON;
+import com.api.aiyh_pcn.fadada.dao.FaDDContractMapping;
+import com.api.aiyh_pcn.fadada.entity.FaDaDaConfigDTO;
+import com.api.aiyh_pcn.fadada.service.impl.FaDDContractService;
+import com.api.aiyh_pcn.fadada.util.FaDDRequestUtils;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.weaver.general.TimeUtil;
+import org.h2.util.StringUtils;
+import weaver.aiyh_pcn.fadada.entity.FileInfo;
+import weaver.conn.RecordSet;
+import weaver.file.ImageFileManager;
+import weaver.formmode.data.ModeDataIdUpdate;
+import weaver.formmode.setup.ModeRightInfo;
+import weaver.hrm.User;
+
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author EBU7-dev1-ayh
+ * @create 2021/11/3 0003 16:50
+ * heton gonjvlei
+ */
+
+
+public class FaddContractUtil {
+    private String workflowId;
+    private String requestId;
+    private String mainTableName;
+    private String tableName;
+    private String customerNo;
+    private String contractField;
+    private String queueSigned;
+    private final String contractInfoTable = "uf_contract_info";
+    private String customerNoField;
+    private List<Map<String, Object>> detailMaps;
+    private Map<String, Object> mainMap;
+    private FaDDContractMapping faDDContractMapping = new FaDDContractMapping();
+    private FaDDContractService faDDContractService = new FaDDContractService();
+    private final ToolUtil toolUtil = new ToolUtil();
+    private User user;
+
+    public FaddContractUtil() {
+    }
+
+    public FaddContractUtil(String workflowId, String requestId, String mainTableName, String tableName, String customerNo,
+                            String customerNoField, String contractField, String queueSigned, List<Map<String, Object>> detailMaps, Map<String, Object> mainMap,
+                            User user) {
+        this.workflowId = workflowId;
+        this.requestId = requestId;
+        this.mainTableName = mainTableName;
+        this.tableName = tableName;
+        this.customerNo = customerNo;
+        this.customerNoField = customerNoField;
+        this.contractField = contractField;
+        this.queueSigned = queueSigned;
+        this.detailMaps = detailMaps;
+        this.mainMap = mainMap;
+        this.user = user;
+    }
+
+    /**
+     * 创建合同
+     */
+    public void createContract(Map<String, Object> mainMap) {
+//		查询配置参数
+        FaDaDaConfigDTO faDaDaConfigDTO = faDDContractMapping.queryConfig(workflowId, 2);
+//		查询api配置参数
+        ApiConfigMainDTO apiConfigMainDTO = Util.queryApiConfig(Util.null2String(faDaDaConfigDTO.getParamsConfig()));
+        RecordSet rs = new RecordSet();
+        List<FileInfo> fileInfos = this.contractHandle(this.contractField);
+        List<String> contractNoIds = new ArrayList<>();
+        List<String> fileNoIds = new ArrayList<>();
+        List<String> fileName = new ArrayList<>();
+        if (fileInfos.size() == 0) {
+            toolUtil.writeErrorLog("fileInfos 为空");
+        }
+//		多文件的时候会遍历文件去创建合同问文件，但是一个流程只创建一次，一次可能回有多份文件需要创建为合同文件
+        for (FileInfo fileInfo : fileInfos) {
+//				发起合同创建
+            ResponeVo contract = FaDDRequestUtils.createContract(fileInfo, apiConfigMainDTO.getApiUrl());
+            Map<String, Object> result;
+            try {
+                Map<String, Object> entityMap = contract.getEntityMap();
+                if (!"200".equals(String.valueOf(entityMap.get("code")))) {
+                    toolUtil.writeErrorLog("创建合同失败，错误信息:" + entityMap.get("message"));
+                    throw new RuntimeException("创建合同失败！");
+                }
+                result = (Map<String, Object>) entityMap.get("data");
+                contractNoIds.add(Util.null2String(result.get("contractNo")));
+                fileNoIds.add(Util.null2String(result.get("fileNo")));
+                fileName.add(fileInfo.getImagefilename());
+            } catch (JsonProcessingException e) {
+                toolUtil.writeErrorLog(e.toString());
+                throw new RuntimeException("创建合同失败！");
+            }
+        }
+//		创建合同文件成功之后收集合同编号，文件编号和合同文件的名字
+        String joinContract = String.join(",", contractNoIds);
+        String joinFileNoIds = String.join(",", fileNoIds);
+        String joinFileName = String.join(",", fileName);
+		/*
+			TODO 主表创建字段 contract_no(合同编号)、file_no(文件编号)、file_name(文件名称)
+			TODO 明细表添加字段，signed_status（合同方签署状态）
+		 */
+//		将合同的基本信息更新到流程主表中保存
+        Map<String, Object> updateMap = ParaMap.create().put("contract_no", joinContract)
+                .put("file_no", joinFileNoIds)
+                .put("file_name", joinFileName);
+        PrepSqlResultImpl sqlResult = Util.createSqlBuilder().updateSql(this.mainTableName, updateMap,
+                Util.createPrepWhereImpl().whereAnd("id").whereEqual(mainMap.get("id")));
+        toolUtil.writeDebuggerLog(sqlResult.getSqlStr() + "，参数：" + sqlResult.getArgs());
+        rs.executeUpdate(sqlResult.getSqlStr(), sqlResult.getArgs());
+//		将合同信息和流程表信息保存到自定义的建模表中
+        updateMap.put("workflow_type", workflowId);
+        updateMap.put("workflow_request_id", requestId);
+        updateMap.put("workflow_main_table", mainTableName);
+        updateMap.put("workflow_detail_table", tableName);
+        updateMap.put("user_info", JSON.toJSONString(user));
+//		1表示创建 2表示等待对方签署，3表示等待本方签署，4表示完成
+        updateMap.put("contract_status", 1);
+//		对方应该签署的数量
+        updateMap.put("should_signed_num", detailMaps.size());
+        updateMap.put("single_signed_num", 0);
+//		现在已经签署的数量
+        updateMap.put("signed_num", 0);
+        updateMap.put("signed_type", 3);
+
+        updateMap.put("main_id", String.valueOf(mainMap.get("id")));
+        updateMap.put("queue_signed", "true".equals(queueSigned) ? 1 : 0);
+        updateMap.put("single_contract_file_num", contractNoIds.size());
+        //		如果需要控制签署规则
+        if (faDaDaConfigDTO.getSignedType() == 1) {
+//			需要控制签署规则
+            if (Integer.parseInt(Util.null2String(mainMap.get(faDaDaConfigDTO.getFieldControl1()))) == faDaDaConfigDTO.getOnlyOwn()) {
+//				只需要本方签署
+                updateMap.put("contract_status", 3);
+//		        对方应该签署的数量
+                updateMap.put("should_signed_num", 0);
+//		        现在已经签署的数量
+                updateMap.put("signed_num", 0);
+                updateMap.put("queue_signed", 0);
+                updateMap.put("signed_type", 1);
+            }
+            if (Integer.parseInt(Util.null2String(mainMap.get(faDaDaConfigDTO.getFieldControl1()))) == faDaDaConfigDTO.getOnlyOther()) {
+                updateMap.put("signed_type", 2);
+            }
+        }
+//		查询合同信息中，是否存在该信息，如果存在着更新，不存在则插入
+        String query = "select * from " + contractInfoTable + " where workflow_request_id = ?";
+        rs.executeQuery(query, requestId);
+        String formModeId = "52";
+        if (rs.next()) {
+            sqlResult = Util.createSqlBuilder().updateSql(contractInfoTable, updateMap,
+                    Util.createPrepWhereImpl().whereAnd("workflow_request_id").whereEqual(requestId));
+            toolUtil.writeDebuggerLog(sqlResult.getSqlStr() + "，参数：" + sqlResult.getArgs());
+            rs.executeUpdate(sqlResult.getSqlStr(), sqlResult.getArgs());
+//			权限重构
+            ModeRightInfo mri = new ModeRightInfo();
+            int dataId = rs.getInt("id");
+            toolUtil.writeDebuggerLog("id：" + dataId);
+            mri.rebuildModeDataShareByEdit(1, Util.getIntValue(formModeId, -1), dataId);
+        } else {
+            ModeDataIdUpdate mdu = ModeDataIdUpdate.getInstance();
+            int dataId = mdu.getModeDataNewId(contractInfoTable,
+                    Util.getIntValue(formModeId, -1),
+                    1, 0, TimeUtil.getCurrentDateString(),
+                    TimeUtil.getOnlyCurrentTimeString());
+            sqlResult = Util.createSqlBuilder().updateSql(contractInfoTable, updateMap,
+                    Util.createPrepWhereImpl().whereAnd("id").whereEqual(dataId));
+            toolUtil.writeDebuggerLog(sqlResult.getSqlStr() + "，参数：" + sqlResult.getArgs());
+            rs.executeUpdate(sqlResult.getSqlStr(), sqlResult.getArgs());
+            ModeRightInfo mri = new ModeRightInfo();
+            mri.rebuildModeDataShareByEdit(1, Util.getIntValue(formModeId, -1), dataId);
+        }
+    }
+
+    /**
+     * 处理合同创建数据
+     *
+     * @param contractField
+     * @return
+     */
+    public List<FileInfo> contractHandle(String contractField) {
+        String fileIds = Util.null2String(this.mainMap.get(contractField));
+//		如果没有合同字段的数据，则返回一个空的
+        if ("".equals(fileIds)) {
+            return new ArrayList<>();
+        }
+        List<FileInfo> fileInfos = faDDContractMapping.queryImgFileIdByDocIds(fileIds);
+        String customer = customerNo;
+//		查询创建合同的企业编号
+        if (StringUtils.isNullOrEmpty(customerNo)) {
+            toolUtil.writeErrorLog("创建合同失败，失败原因：customerNo 为空！");
+        }
+//		处理数据信息
+        for (FileInfo fileInfo : fileInfos) {
+            InputStream inputStreamById = ImageFileManager.getInputStreamById(fileInfo.getImagefileid());
+            fileInfo.setFile(inputStreamById);
+            String imagefilename = fileInfo.getImagefilename();
+            if (imagefilename == null) {
+                return new ArrayList<>();
+            }
+            fileInfo.setContractExtension(imagefilename.substring(imagefilename.lastIndexOf(".")));
+            fileInfo.setContractTitle(imagefilename);
+            fileInfo.setCustomerNo(Util.null2String(customer));
+            if (StringUtils.isNullOrEmpty(fileInfo.getCustomerNo())) {
+                toolUtil.writeErrorLog("创建合同失败，失败原因，customer！");
+//				fileInfo.setCustomerNo(Util.null2String(detail.get("companyno")));
+            }
+            fileInfo.setUploadType(1);
+        }
+        return fileInfos;
+    }
+
+    /**
+     * 签署合同
+     */
+    public void signedContract(Map<String, Object> mainMap) {
+//		获取配置表信息
+        FaDaDaConfigDTO faDaDaConfigDTO = faDDContractMapping.queryConfig(workflowId, 3);
+//      查询接口配置树形结构
+        ApiConfigMainDTO apiConfigMainDTO = Util.queryApiConfigTree(faDaDaConfigDTO.getParamsConfig());
+//		查询签署数据
+        List<Map<String, Object>> dataArr = faDDContractService.getDataArr(requestId, workflowId, mainTableName, tableName);
+//		处理数据
+        List<Map<String, Object>> maps = faDDContractService.objectAndListHandle(apiConfigMainDTO.getDetails(), dataArr);
+        if (maps == null) {
+            toolUtil.writeErrorLog("签署合同错误，错误原因：maps为null!");
+            throw new RuntimeException("签署合同错误，错误原因：maps为null！");
+        }
+        if (maps.size() == 0) {
+            return;
+        }
+        RecordSet rs = new RecordSet();
+        Map<String, Object> update = new HashMap<>();
+//		顺序签署合同
+        if ("true".equals(queueSigned)) {
+            Map<String, Object> map = maps.get(0);
+            Map<String,Object> dataMap = dataArr.get(0);
+            if (faDaDaConfigDTO.getSignedType() == 1) {
+//			需要控制签署规则
+                if (Integer.parseInt(Util.null2String(mainMap.get(faDaDaConfigDTO.getFieldControl1()))) == faDaDaConfigDTO.getOnlyOther()) {
+//				只需要对方签署
+                    map.put("autoArchive", 1);
+                }
+//			双方签署
+            }
+            List<Map<String, Object>> requestList = signedRequest(map, apiConfigMainDTO);
+            List<String> signedList = new ArrayList<>();
+//            遍历将数据保存到合同信息表中
+            for (Map<String, Object> result : requestList) {
+                signedList.add(String.valueOf(result.get("signerUrl")));
+            }
+//			将合同签署地址保存到建模信息中
+            update.put("contract_signed_url", String.join(" ; ", signedList));
+            //			将合同签署信息更新到合同信息表中
+            update.put("contract_status", 2);
+//			update.put("single_signed_num",0);
+            PrepSqlResultImpl sqlResult = Util.createSqlBuilder().updateSql(contractInfoTable, update,
+                    Util.createPrepWhereImpl().whereAnd("workflow_request_id").whereEqual(requestId));
+            rs.executeUpdate(sqlResult.getSqlStr(), sqlResult.getArgs());
+            update.clear();
+//			更新明细表合同信息  明细表添加字段，signed_status（合同方签署状态）
+//			签署状态，1 已发送待签署，2 已签蜀
+            update.put("signed_status", 1);
+            String dt = tableName.substring(tableName.indexOf("_dt") + 3);
+            String detail = "detail_" + dt + ".";
+            sqlResult = Util.createSqlBuilder().updateSql(tableName, update,
+                    Util.createPrepWhereImpl().whereAnd("id").whereEqual(String.valueOf(dataMap.get(detail+"id"))));
+            toolUtil.writeErrorLog("\n顺序签署合同更新明细数据：" + sqlResult + "\n");
+            rs.executeUpdate(sqlResult.getSqlStr(), sqlResult.getArgs());
+            return;
+        }
+//		不是顺序签署
+        for (Map<String, Object> map : maps) {
+            if (faDaDaConfigDTO.getSignedType() == 1) {
+//			需要控制签署规则
+                if (Integer.parseInt(Util.null2String(mainMap.get(faDaDaConfigDTO.getFieldControl1()))) == faDaDaConfigDTO.getOnlyOther()) {
+//				只需要对方签署
+                    map.put("autoArchive", 1);
+                }
+//			双方签署
+            }
+            signedRequest(map, apiConfigMainDTO);
+//           TODO 一起签署不好控制催一催，没有一起签署的需求，暂且不做
+        }
+        //			将合同签署信息更新到合同信息表中
+        update.put("contract_status", 2);
+        PrepSqlResultImpl sqlResult = Util.createSqlBuilder().updateSql(contractInfoTable, update,
+                Util.createPrepWhereImpl().whereAnd("workflow_request_id").whereEqual(requestId));
+        rs.executeUpdate(sqlResult.getSqlStr(), sqlResult.getArgs());
+
+    }
+
+    /**
+     * 合同签署发送请求
+     *
+     * @param map
+     * @param apiConfigMainDTO
+     */
+    private List<Map<String, Object>> signedRequest(Map<String, Object> map, ApiConfigMainDTO apiConfigMainDTO) {
+        String contractNos = Util.null2String(map.get("contractNo"));
+        String[] split = contractNos.split(",");
+        List<Map<String, Object>> list = new ArrayList<>();
+//		RecordSet rs = new RecordSet();
+        for (String s : split) {
+            map.put("contractNo", s);
+            ResponeVo responeVo = FaDDRequestUtils.signedContract(map, apiConfigMainDTO.getApiUrl());
+            Map<String, Object> response = null;
+            try {
+                response = responeVo.getEntityMap();
+            } catch (JsonProcessingException e) {
+                e.printStackTrace();
+            }
+            if (!"200".equals(response.get("code"))) {
+                toolUtil.writeErrorLog("法大大接口签署合同失败！");
+                throw new RuntimeException("法大大接口签署合同失败!");
+            }
+            list.add((Map<String, Object>) response.get("data"));
+        }
+        return list;
+    }
+
+
+    @Override
+    public String toString() {
+        return "FaddContractUtil{" +
+                "workflowId='" + workflowId + '\'' +
+                ", requestId='" + requestId + '\'' +
+                ", mainTableName='" + mainTableName + '\'' +
+                ", tableName='" + tableName + '\'' +
+                ", customerNo='" + customerNo + '\'' +
+                ", contractField='" + contractField + '\'' +
+                ", queueSigned='" + queueSigned + '\'' +
+                ", contractInfoTable='" + contractInfoTable + '\'' +
+                ", customerNoField='" + customerNoField + '\'' +
+                ", detailMaps=" + detailMaps +
+                ", mainMap=" + mainMap +
+                '}';
+    }
+
+    public String getWorkflowId() {
+        return workflowId;
+    }
+
+    public void setWorkflowId(String workflowId) {
+        this.workflowId = workflowId;
+    }
+
+    public String getRequestId() {
+        return requestId;
+    }
+
+    public void setRequestId(String requestId) {
+        this.requestId = requestId;
+    }
+
+    public String getMainTableName() {
+        return mainTableName;
+    }
+
+    public void setMainTableName(String mainTableName) {
+        this.mainTableName = mainTableName;
+    }
+
+    public String getTableName() {
+        return tableName;
+    }
+
+    public void setTableName(String tableName) {
+        this.tableName = tableName;
+    }
+
+
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_pcn/hrsystem/async_organization/MockHrmResourceData.java b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/hrsystem/async_organization/MockHrmResourceData.java
new file mode 100644
index 0000000..7272c37
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/hrsystem/async_organization/MockHrmResourceData.java
@@ -0,0 +1,14 @@
+package weaver.aiyh_pcn.hrsystem.async_organization;
+
+/**
+ * <h1>获取人员组织架构数据</h1>
+ *
+ * <p>create: 2022-11-21 16:31</p>
+ *
+ * @author youHong.ai
+ */
+
+public class MockHrmResourceData {
+
+
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_pcn/pdf_water/PdfMultipleWaterAction.java b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/pdf_water/PdfMultipleWaterAction.java
new file mode 100644
index 0000000..cb59fb7
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/pdf_water/PdfMultipleWaterAction.java
@@ -0,0 +1,363 @@
+package weaver.aiyh_pcn.pdf_water;
+
+import aiyh.utils.Util;
+import aiyh.utils.annotation.RequiredMark;
+import aiyh.utils.entity.DocImageInfo;
+import aiyh.utils.excention.CustomerException;
+import aiyh.utils.fileUtil.pdf.PdfUtil;
+import com.google.common.base.Strings;
+import lombok.AccessLevel;
+import lombok.Data;
+import lombok.Setter;
+import weaver.aiyh_pcn.pdf_water.entity.DetailPdfInfo;
+import weaver.aiyh_pcn.pdf_water.entity.PdfWaterConfig;
+import weaver.aiyh_pcn.pdf_water.mapper.PdfWaterActionMapper;
+import weaver.interfaces.workflow.action.Action;
+import weaver.soa.workflow.request.RequestInfo;
+import weaver.workflow.request.RequestManager;
+import weaver.workflow.workflow.WorkflowBillComInfo;
+import weaver.workflow.workflow.WorkflowComInfo;
+import weaver.workflow.workflow.WorkflowVersion;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>pdf附件添加多图水印</p>
+ * <p>create 2022/6/28 20:01</p>
+ *
+ * @author ayh
+ */
+
+@Data
+public class PdfMultipleWaterAction implements Action {
+	
+	
+	@RequiredMark
+	private String onlyMarks;
+	
+	@Setter(AccessLevel.NONE)
+	private String requestId;
+	@Setter(AccessLevel.NONE)
+	private String workflowId;
+	@Setter(AccessLevel.NONE)
+	private String billTableName;
+	
+	private final PdfWaterActionMapper mapper = Util.getMapper(PdfWaterActionMapper.class);
+	
+	
+	@Override
+	public String execute(RequestInfo requestInfo) {
+		RequestManager requestManager = requestInfo.getRequestManager();
+		boolean b = Util.verifyRequiredField(this);
+		if (!b) {
+			Util.actionFail(requestManager, "必填参数未配置，请检查action必填配置参数！");
+		}
+		try {
+			requestId = requestInfo.getRequestid();
+			workflowId = requestInfo.getWorkflowid();
+			billTableName = requestManager.getBillTableName();
+			if ("".equals(billTableName)) {
+				WorkflowComInfo workflowComInfo = new WorkflowComInfo();
+				String formId = workflowComInfo.getFormId(workflowId);
+				WorkflowBillComInfo workflowBillComInfo = new WorkflowBillComInfo();
+				billTableName = workflowBillComInfo.getTablename(formId);
+			}
+			String workflowAllVersion = WorkflowVersion.getVersionStringByWfid(workflowId);
+//            查询配置信息，需要配置组中的添加水印文件的字段是同一个字段，且目前只支持一条流程中的一个action中只能添加一个字段上的附件的水印
+			List<PdfWaterConfig> pdfWaterConfigs = mapper.getPdfWatersConfigs(onlyMarks, workflowAllVersion.split(","));
+			Util.getLogger().info("配置表参数：" + pdfWaterConfigs);
+			try {
+				addWatermark(requestId, billTableName, pdfWaterConfigs);
+			} catch (Exception e) {
+				e.printStackTrace();
+				Util.getLogger().error("水印添加失败：" + Util.getErrString(e));
+				return Util.actionFail(requestManager, "添加水印失败！" + e.getMessage());
+			}
+			return Action.SUCCESS;
+		} catch (Exception e) {
+			Util.getLogger().error("水印添加失败,很烦：" + Util.getErrString(e));
+			return Util.actionFail(requestManager, "添加水印失败！" + e.getMessage());
+		}
+	}
+	
+	/**
+	 * 添加水印
+	 *
+	 * @param requestId       请求ID
+	 * @param billTableName   主表表名
+	 * @param pdfWaterConfigs pdf水印配置
+	 */
+	private void addWatermark(String requestId, String billTableName, List<PdfWaterConfig> pdfWaterConfigs) {
+		Map<String, Object> mainData = mapper.selectMainTableData(requestId, billTableName);
+		List<Map<String, Object>> detailData = null;
+//        同一附件字段，添加多个图片水印，每个水印对应不同的关键字
+		List<DocImageInfo> imageFileIdList = null;
+		List<List<DocImageInfo>> detailImageFileIdList = null;
+		for (PdfWaterConfig pdfWaterConfig : pdfWaterConfigs) {
+			if (pdfWaterConfig.getOnDetail() == 0) {
+				//              主表
+				DocImageInfo waterPicInfo;
+//              水印图片
+				if (pdfWaterConfig.getWaterPicType() == 0) {
+//                    固定
+					String waterPic = Util.null2String(pdfWaterConfig.getWaterPic());
+					if ("".equals(waterPic) || waterPic.split(",").length > 1) {
+						throw new CustomerException("水印图片有且只能有一张！");
+					}
+					waterPicInfo = Util.selectImageInfoByDocId(waterPic);
+				} else {
+//                    流程
+					String picDocs = Util.null2String(mainData.get(pdfWaterConfig.getWaterPicFieldName()));
+					if ("".equals(picDocs) || picDocs.split(",").length > 1) {
+						throw new CustomerException("水印图片有且只能有一张！");
+					}
+					waterPicInfo = Util.selectImageInfoByDocId(picDocs);
+				}
+				// 查询主表字段的目录
+				String docCategorys = Util.getDocCategorysByTable(workflowId, pdfWaterConfig.getTargetFieldName(), billTableName);
+				String[] docCategoryArray = docCategorys.split(",");
+				String docCategory = docCategoryArray[docCategoryArray.length - 1];
+//                水印生成的临时文件
+				List<List<Integer>> imageFileTempList = new ArrayList<>();
+				if (imageFileIdList == null || imageFileIdList.isEmpty()) {
+					String docIds = mapper.selectSourcePdfInMainTable(requestId, billTableName, pdfWaterConfig.getSourceFieldName());
+					if (Strings.isNullOrEmpty(docIds)) {
+						throw new CustomerException("无法查询到需要添加水印的pdf文件！");
+					}
+					String[] docArray = docIds.split(",");
+					imageFileIdList = new ArrayList<>();
+					List<Integer> tempList = new ArrayList<>();
+					for (String docId : docArray) {
+						DocImageInfo imageInfo = Util.selectImageInfoByDocId(docId);
+						Integer waterImageFileId = getWaterImageFileId(pdfWaterConfig, waterPicInfo, imageInfo, mainData);
+						imageInfo.setImageFileId(waterImageFileId);
+						imageFileIdList.add(imageInfo);
+						tempList.add(waterImageFileId);
+					}
+					imageFileTempList.add(tempList);
+				} else {
+//                    使用添加过一次的附件
+					List<Integer> tempList = new ArrayList<>();
+					for (DocImageInfo imageInfo : imageFileIdList) {
+						Integer waterImageFileId = getWaterImageFileId(pdfWaterConfig, waterPicInfo, imageInfo, mainData);
+						imageInfo.setImageFileId(waterImageFileId);
+						tempList.add(waterImageFileId);
+					}
+					imageFileTempList.add(tempList);
+				}
+//                获取添加完成水印后的最后一组文件ID
+				List<Integer> finalWaterImageFileIds = imageFileTempList.get(imageFileIdList.size() - 1);
+				List<Integer> finalWaterDocFileIds = new ArrayList<>();
+				for (Integer finalWaterImageFileId : finalWaterImageFileIds) {
+					int docByImageFileId = 0;
+					try {
+						docByImageFileId = Util.createDocByImageFileId(Integer.parseInt(docCategory), finalWaterImageFileId, 1);
+					} catch (Exception e) {
+						throw new CustomerException("创建doc文档信息" + finalWaterImageFileId + "出错！", e);
+					}
+					finalWaterDocFileIds.add(docByImageFileId);
+				}
+				String waterDocStr = Util.intJoin(finalWaterDocFileIds, ",");
+				writerBack(pdfWaterConfig, waterDocStr, "");
+				for (int i = 0; i < imageFileTempList.size() - 1; i++) {
+					Util.deleteImageFile(imageFileTempList.get(i));
+				}
+			} else if (pdfWaterConfig.getOnDetail() == 1) {
+//            TODO 明细表
+				if (detailData == null) {
+//                    查询明细数据
+					detailData = mapper.selectDetailTableData(String.valueOf(mainData.get("id")), pdfWaterConfig.getDetailTableName());
+				}
+				
+				List<DocImageInfo> waterPicInfoList = new ArrayList<>();
+//                循环明细添加水印
+				for (Map<String, Object> detailDatum : detailData) {
+					DocImageInfo waterPicInfo;
+//                  水印图片
+					if (pdfWaterConfig.getWaterPicType() == 0) {
+//                    固定
+						String waterPic = Util.null2String(pdfWaterConfig.getWaterPic());
+						if ("".equals(waterPic) || waterPic.split(",").length > 1) {
+							throw new CustomerException("水印图片有切只能有一张！");
+						}
+						waterPicInfo = Util.selectImageInfoByDocId(waterPic);
+					} else {
+//                    流程
+						String waterPicFieldTable = Util.null2String(pdfWaterConfig.getWaterPicFieldTable());
+						String picDocs;
+						if ("".equals(waterPicFieldTable) || !waterPicFieldTable.contains("_dt")) {
+//                            主表
+							picDocs = Util.null2String(mainData.get(pdfWaterConfig.getWaterPicFieldName()));
+						} else {
+//                            明细表
+							picDocs = Util.null2String(detailDatum.get(pdfWaterConfig.getWaterPicFieldName()));
+						}
+						if ("".equals(picDocs) || picDocs.split(",").length > 1) {
+							throw new CustomerException("水印图片有切只能有一张！");
+						}
+						waterPicInfo = Util.selectImageInfoByDocId(picDocs);
+					}
+					waterPicInfoList.add(waterPicInfo);
+				}
+				//                水印生成的临时文件
+				
+				List<List<List<Integer>>> imageFileTempList = new ArrayList<>();
+				if (detailImageFileIdList == null) {
+//               查询明细表中需要添加水印的字段的文件信息
+					List<DetailPdfInfo> detailDocIdsList = mapper.selectSourcePdfInDetailTable(requestId, billTableName, pdfWaterConfig.getDetailTableName(), pdfWaterConfig.getSourceFieldName());
+					if (detailDocIdsList == null || detailDocIdsList.size() == 0) {
+						return;
+					}
+					detailImageFileIdList = new ArrayList<>();
+//                    一个字段可能存在多个文件，这些文件都需要添加
+					int n = 0;
+					List<List<Integer>> rowImageFileId = new ArrayList<>();
+					for (DetailPdfInfo detailPdfInfo : detailDocIdsList) {
+						String docIds = detailPdfInfo.getDocIds();
+						String[] docArray = docIds.split(",");
+						List<DocImageInfo> rowDocImageInfoList = new ArrayList<>();
+						Map<String, Object> dataMap = new HashMap<>();
+						Map<String, Object> detailDatum = detailData.get(n);
+						for (Map.Entry<String, Object> entry : detailDatum.entrySet()) {
+							dataMap.put("detail." + entry.getKey(), entry.getValue());
+						}
+						dataMap.putAll(mainData);
+						String detailId = Util.null2String(detailDatum.get("id"));
+						if ("".equals(detailId)) {
+							throw new CustomerException("查询到明细数据不符合要求，请检查查询sql语句！");
+						}
+						List<Integer> fieldImageFileIds = new ArrayList<>();
+						for (String docId : docArray) {
+							DocImageInfo imageInfo = Util.selectImageInfoByDocId(docId);
+							imageInfo.setDetailId(Integer.parseInt(detailId));
+							Integer waterImageFileId = getWaterImageFileId(pdfWaterConfig, waterPicInfoList.get(n), imageInfo, dataMap);
+							imageInfo.setImageFileId(waterImageFileId);
+							rowDocImageInfoList.add(imageInfo);
+							fieldImageFileIds.add(waterImageFileId);
+						}
+						detailImageFileIdList.add(rowDocImageInfoList);
+						rowImageFileId.add(fieldImageFileIds);
+						n++;
+					}
+					imageFileTempList.add(rowImageFileId);
+				} else {
+//                    已经添加过一次水印，需要在添加过水印的文件的基础上再次添加水印
+					int n = 0;
+					List<List<Integer>> rowImageFileId = new ArrayList<>();
+					for (List<DocImageInfo> docImageInfos : detailImageFileIdList) {
+//                       每条明细的一个字段，可能对应多个文件 docImageInfos单条明细的字段的所有文件，且是添加过一次水印的文件
+						Map<String, Object> detailDatum = detailData.get(n);
+						Map<String, Object> dataMap = new HashMap<>();
+						for (Map.Entry<String, Object> entry : detailDatum.entrySet()) {
+							dataMap.put("detail." + entry.getKey(), entry.getValue());
+						}
+						dataMap.putAll(mainData);
+						List<Integer> fieldImageFileIds = new ArrayList<>();
+						for (DocImageInfo docImageInfo : docImageInfos) {
+							Integer waterImageFileId = getWaterImageFileId(pdfWaterConfig, waterPicInfoList.get(n), docImageInfo, dataMap);
+//                            将添加过的水印文件放入，等待下一次从次基础上再次添加
+							docImageInfo.setImageFileId(waterImageFileId);
+							fieldImageFileIds.add(waterImageFileId);
+						}
+						rowImageFileId.add(fieldImageFileIds);
+					}
+					imageFileTempList.add(rowImageFileId);
+				}
+//                每行的水印文件信息
+				String docCategorys = Util.getDocCategorysByTable(workflowId, pdfWaterConfig.getTargetFieldName(), pdfWaterConfig.getDetailTableName());
+				String[] docCategoryArray = docCategorys.split(",");
+				String docCategory = docCategoryArray[docCategoryArray.length - 1];
+				int n = 0;
+				for (List<List<Integer>> lists : imageFileTempList) {
+//                    每行的最终的水印文件
+					List<DocImageInfo> docImageInfos = detailImageFileIdList.get(n);
+					DocImageInfo docImageInfo = docImageInfos.get(0);
+					Integer detailId = docImageInfo.getDetailId();
+					List<Integer> finalImageFieldIdList = lists.get(lists.size() - 1);
+//                  TODO 额，封装一下明细
+					List<Integer> finalWaterDocFileIds = new ArrayList<>();
+					for (Integer finalWaterImageFileId : finalImageFieldIdList) {
+						int docByImageFileId = 0;
+						try {
+							docByImageFileId = Util.createDocByImageFileId(Integer.parseInt(docCategory), finalWaterImageFileId, 1);
+						} catch (Exception e) {
+							throw new CustomerException("创建doc文档信息" + finalWaterImageFileId + "出错！", e);
+						}
+						finalWaterDocFileIds.add(docByImageFileId);
+					}
+					String waterDocStr = Util.intJoin(finalWaterDocFileIds, ",");
+					writerBack(pdfWaterConfig, waterDocStr, String.valueOf(detailId));
+					n++;
+					for (int i = 0; i < lists.size() - 1; i++) {
+						Util.deleteImageFile(lists.get(i));
+					}
+				}
+				
+			} else {
+				Util.getLogger().error("水印文件配置错误！" + pdfWaterConfig);
+				throw new CustomerException("水印文件配置错误，请查询建模配置表！");
+			}
+		}
+	}
+	
+	private Integer getWaterImageFileId(PdfWaterConfig pdfWaterConfig, DocImageInfo waterPicInfo, DocImageInfo imageInfo, Map<String, Object> dataMap) {
+		int imageFileId = 0;
+		String keyword = "";
+		if (pdfWaterConfig.getKeyWordType() == 0) {
+//            固定
+			keyword = pdfWaterConfig.getKeyWord();
+		} else {
+//            流程
+			String keyWordFieldName = pdfWaterConfig.getKeyWordFieldName();
+			String keyWordFieldTable = pdfWaterConfig.getKeyWordFieldTable();
+			if (keyWordFieldTable == null || "".equals(keyWordFieldTable) || !keyWordFieldTable.contains("_dt")) {
+//                主表
+				keyword = String.valueOf(dataMap.get(keyWordFieldName));
+			} else {
+				keyword = String.valueOf(dataMap.get("detail." + keyWordFieldName));
+			}
+		}
+		boolean allMark = pdfWaterConfig.getAddWaterType() == 1;
+		try {
+			imageFileId = PdfUtil.addPictureWater2pdfByKeyword(imageInfo.getImageFileId(), waterPicInfo.getImageFileId(),
+					keyword, allMark, pdfWaterConfig.getOpacity(),
+					pdfWaterConfig.getPicWidth(), pdfWaterConfig.getPciHeight(),
+					pdfWaterConfig.getOffsetX(), pdfWaterConfig.getOffsetY());
+		} catch (CustomerException e) {
+			if (e.getCode() != null) {
+				if (e.getCode() == -2) {
+					throw new CustomerException(e.getMessage(), e);
+				}
+			}
+			throw e;
+		} catch (Exception e) {
+			Util.getLogger().error("水印文件生成失败！" + e.getMessage());
+			throw new CustomerException("水印文件生成失败！" + e.getMessage(), e);
+		}
+		Util.getLogger().info("水印文件ID： " + imageFileId);
+		return imageFileId;
+	}
+	
+	private void writerBack(PdfWaterConfig pdfWaterConfig, String waterDocStr, String detailId) {
+		if (pdfWaterConfig.getOnDetail() == 0) {
+//            主表
+			boolean writerFlag = mapper.waterBackWaterPdfInMain(billTableName, pdfWaterConfig.getTargetFieldName(), waterDocStr, requestId);
+			if (!writerFlag) {
+				throw new CustomerException("水印文件写入失败！");
+			}
+		} else if (pdfWaterConfig.getOnDetail() == 1) {
+//            明细表
+			boolean writerFlag = mapper.waterBackWaterPdfInDetail(pdfWaterConfig.getDetailTableName(), pdfWaterConfig.getTargetFieldName(), waterDocStr, detailId);
+			if (!writerFlag) {
+				throw new CustomerException("水印文件写入失败！");
+			}
+		} else {
+			Util.getLogger().error("水印文件配置错误！" + pdfWaterConfig);
+			throw new CustomerException("水印文件配置错误，请查询建模配置表！");
+		}
+	}
+	
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_pcn/pdf_water/PdfWaterAction.java b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/pdf_water/PdfWaterAction.java
new file mode 100644
index 0000000..8917956
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/pdf_water/PdfWaterAction.java
@@ -0,0 +1,183 @@
+package weaver.aiyh_pcn.pdf_water;
+
+import aiyh.utils.Util;
+import aiyh.utils.entity.DocImageInfo;
+import aiyh.utils.excention.CustomerException;
+import aiyh.utils.fileUtil.pdf.PdfUtil;
+import com.google.common.base.Strings;
+import org.jetbrains.annotations.NotNull;
+import weaver.aiyh_pcn.pdf_water.entity.DetailPdfInfo;
+import weaver.aiyh_pcn.pdf_water.entity.PdfWaterConfig;
+import weaver.aiyh_pcn.pdf_water.mapper.PdfWaterActionMapper;
+import weaver.interfaces.workflow.action.Action;
+import weaver.soa.workflow.request.RequestInfo;
+import weaver.workflow.request.RequestManager;
+import weaver.workflow.workflow.WorkflowBillComInfo;
+import weaver.workflow.workflow.WorkflowComInfo;
+import weaver.workflow.workflow.WorkflowVersion;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * <p>pdf添加水印</p>
+ * <p>create 2022/5/6 2:25 PM</p>
+ *
+ * @author ayh
+ */
+
+public class PdfWaterAction implements Action {
+
+    private String keyword;
+    private String onlyMark;
+    private String allMark;
+
+    private String requestId;
+    private String workflowId;
+    private String billTableName;
+
+    private final PdfWaterActionMapper mapper = Util.getMapper(PdfWaterActionMapper.class);
+
+
+    @Override
+    public String execute(RequestInfo requestInfo) {
+        RequestManager requestManager = requestInfo.getRequestManager();
+        try {
+            requestId = requestInfo.getRequestid();
+            workflowId = requestInfo.getWorkflowid();
+            billTableName = requestManager.getBillTableName();
+            if ("".equals(billTableName)) {
+                WorkflowComInfo workflowComInfo = new WorkflowComInfo();
+                String formId = workflowComInfo.getFormId(workflowId);
+                WorkflowBillComInfo workflowBillComInfo = new WorkflowBillComInfo();
+                billTableName = workflowBillComInfo.getTablename(formId);
+            }
+            if (Strings.isNullOrEmpty(onlyMark) || Strings.isNullOrEmpty(keyword) || Strings.isNullOrEmpty(allMark)) {
+                return Util.actionFail(requestManager, "未正确配置水印action，请检查action配置参数！");
+            }
+            String workflowAllVersion = WorkflowVersion.getVersionStringByWfid(workflowId);
+            PdfWaterConfig pdfWaterConfig = mapper.getPdfWaterConfig(onlyMark, workflowAllVersion.split(","));
+            Util.getLogger().info("配置表参数：" + pdfWaterConfig);
+            try {
+                addWatermark(requestId, billTableName, pdfWaterConfig);
+            } catch (Exception e) {
+                e.printStackTrace();
+                Util.getLogger().error("水印添加失败：" + Util.getErrString(e));
+                return Util.actionFail(requestManager, "添加水印失败！");
+            }
+            return Action.SUCCESS;
+        }catch (Exception e){
+            Util.getLogger().error("水印添加失败,很烦：" + Util.getErrString(e));
+            return Util.actionFail(requestManager, "添加水印失败！");
+        }
+    }
+
+    private void addWatermark(String requestId, String billTableName, PdfWaterConfig pdfWaterConfig) {
+        if (pdfWaterConfig.getWaterPic().split(",").length > 1) {
+            throw new CustomerException("水印图片只能有一张！");
+        }
+        DocImageInfo waterPicInfo = Util.selectImageInfoByDocId(pdfWaterConfig.getWaterPic());
+        if (pdfWaterConfig.getOnDetail() == 0) {
+//            主表
+            String docIds = mapper.selectSourcePdfInMainTable(requestId, billTableName, pdfWaterConfig.getSourceFieldName());
+            List<Integer> waterDocIds = getDocIds(billTableName, pdfWaterConfig, waterPicInfo, docIds);
+            String waterDocStr = Util.intJoin(waterDocIds, ",");
+            writerBack(pdfWaterConfig,waterDocStr,"");
+        } else if (pdfWaterConfig.getOnDetail() == 1) {
+//            明细表
+            List<DetailPdfInfo> detailDocIdsList = mapper.selectSourcePdfInDetailTable(requestId, billTableName, pdfWaterConfig.getDetailTableName(), pdfWaterConfig.getSourceFieldName());
+            if (detailDocIdsList == null || detailDocIdsList.size() == 0) {
+                return;
+            }
+            for (DetailPdfInfo detailPdfInfo : detailDocIdsList) {
+                String docIds = detailPdfInfo.getDocIds();
+                List<Integer> waterDocIds = getDocIds(billTableName, pdfWaterConfig, waterPicInfo, docIds);
+                String waterDocIdStr = Util.intJoin(waterDocIds, ",");
+                writerBack(pdfWaterConfig,waterDocIdStr,detailPdfInfo.getId());
+            }
+        } else {
+            Util.getLogger().error("水印文件配置错误！" + pdfWaterConfig);
+            throw new CustomerException("水印文件配置错误，请查询建模配置表！");
+        }
+    }
+
+    private void writerBack(PdfWaterConfig pdfWaterConfig, String waterDocStr,String detailId) {
+        if(pdfWaterConfig.getOnDetail() == 0){
+//            主表
+            boolean writerFlag = mapper.waterBackWaterPdfInMain(billTableName,pdfWaterConfig.getTargetFieldName(),waterDocStr,requestId);
+            if(!writerFlag){
+                throw new CustomerException("水印文件写入失败！");
+            }
+        }else if(pdfWaterConfig.getOnDetail() == 1){
+//            明细表
+            boolean writerFlag = mapper.waterBackWaterPdfInDetail(pdfWaterConfig.getDetailTableName(),pdfWaterConfig.getTargetFieldName(),waterDocStr,detailId);
+            if(!writerFlag){
+                throw new CustomerException("水印文件写入失败！");
+            }
+        }else {
+            Util.getLogger().error("水印文件配置错误！" + pdfWaterConfig);
+            throw new CustomerException("水印文件配置错误，请查询建模配置表！");
+        }
+    }
+
+    @NotNull
+    private List<Integer> getDocIds(String billTableName, PdfWaterConfig pdfWaterConfig, DocImageInfo waterPicInfo, String docIds) {
+        if (Strings.isNullOrEmpty(docIds)) {
+            throw new CustomerException("无法查询到需要添加水印的pdf文件！");
+        }
+        String[] docArray = docIds.split(",");
+        String docCategorys = Util.getDocCategorysByTable(workflowId, pdfWaterConfig.getTargetFieldName(), billTableName);
+        String[] docCategoryArray = docCategorys.split(",");
+        String docCategory = docCategoryArray[docCategoryArray.length - 1];
+        List<Integer> waterDocIds = new ArrayList<>();
+        Util.getLogger().info("目录：" + docCategory + "   , 表名：" + billTableName + " , 文件id：" + docIds);
+        for (String docId : docArray) {
+            DocImageInfo imageInfo = Util.selectImageInfoByDocId(docId);
+            int imageFileId;
+            try {
+                 imageFileId = PdfUtil.addPictureWater2pdfByKeyword(imageInfo.getImageFileId(), waterPicInfo.getImageFileId(),
+                        keyword, Boolean.parseBoolean(allMark), pdfWaterConfig.getOpacity(),
+                        pdfWaterConfig.getPicWidth(), pdfWaterConfig.getPciHeight(),
+                        pdfWaterConfig.getOffsetX(), pdfWaterConfig.getOffsetY());
+            }catch (Exception e) {
+                Util.getLogger().error("水印文件生成失败！" + e.getMessage());
+                throw new CustomerException("水印文件生成失败！");
+            }
+            Util.getLogger().info("水印文件ID： " + imageFileId);
+            try {
+                int docByImageFileId = Util.createDocByImageFileId(Integer.parseInt(docCategory), imageFileId, 1);
+                Util.getLogger().info("水印文档ID：" + docByImageFileId);
+                waterDocIds.add(docByImageFileId);
+            } catch (Exception e) {
+                throw new CustomerException("创建文档失败！",e);
+            }
+        }
+        Util.getLogger().info("最终文件：" + waterDocIds);
+        return waterDocIds;
+    }
+
+
+    public String getKeyword() {
+        return keyword;
+    }
+
+    public void setKeyword(String keyword) {
+        this.keyword = keyword;
+    }
+
+    public String getOnlyMark() {
+        return onlyMark;
+    }
+
+    public void setOnlyMark(String onlyMark) {
+        this.onlyMark = onlyMark;
+    }
+
+    public String getAllMark() {
+        return allMark;
+    }
+
+    public void setAllMark(String allMark) {
+        this.allMark = allMark;
+    }
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_pcn/pdf_water/entity/DetailPdfInfo.java b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/pdf_water/entity/DetailPdfInfo.java
new file mode 100644
index 0000000..3a41273
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/pdf_water/entity/DetailPdfInfo.java
@@ -0,0 +1,16 @@
+package weaver.aiyh_pcn.pdf_water.entity;
+
+import lombok.Data;
+
+/**
+ * <p>明细表附件信息</p>
+ * <p>create 2022/5/6 3:27 PM</p>
+ *
+ * @author ayh
+ */
+
+@Data
+public class DetailPdfInfo {
+    private String id;
+    private String docIds;
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_pcn/pdf_water/entity/PdfWaterConfig.java b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/pdf_water/entity/PdfWaterConfig.java
new file mode 100644
index 0000000..dc6beb0
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/pdf_water/entity/PdfWaterConfig.java
@@ -0,0 +1,108 @@
+package weaver.aiyh_pcn.pdf_water.entity;
+
+import lombok.Data;
+
+/**
+ * <p>实体类</p>
+ * <p>create 2022/5/6 2:28 PM</p>
+ *
+ * @author ayh
+ */
+
+@Data
+public class PdfWaterConfig {
+	/**
+	 * id
+	 */
+	private Integer id;
+	/**
+	 * 唯一值
+	 */
+	private String onlyMark;
+	/**
+	 * 流程
+	 */
+	private Integer workflowType;
+	/**
+	 * 水印图片
+	 */
+	private String waterPic;
+	/**
+	 * 水印透明度
+	 */
+	private float opacity;
+	/**
+	 * 源文件字段名
+	 */
+	private String sourceFieldName;
+	/**
+	 * 目标文件字段名
+	 */
+	private String targetFieldName;
+	/**
+	 * 流程表名
+	 */
+	private String workflowTableName;
+	/**
+	 * 是否是明细表
+	 */
+	private Integer onDetail;
+	/**
+	 * 明细表名
+	 */
+	private String detailTableName;
+	/**
+	 * 图片宽度
+	 */
+	private Integer picWidth;
+	/**
+	 * 图片高度
+	 */
+	private Integer pciHeight;
+	/**
+	 * x 偏移量
+	 */
+	private Integer offsetX;
+	/**
+	 * y 偏移量
+	 */
+	private Integer offsetY;
+	
+	
+	/**
+	 * 标记组
+	 */
+	private String onlyMarks;
+	
+	/**
+	 * 水印类型 0 固定 1 流程
+	 */
+	private Integer waterPicType;
+	
+	private String waterPicField;
+	
+	private String waterPicFieldName;
+	
+	private String waterPicFieldTable;
+	
+	/**
+	 * 水印添加方式 0 单个 1 全部
+	 */
+	private Integer addWaterType;
+	
+	
+	private String keyWordField;
+	
+	private String keyWordFieldName;
+	
+	/**
+	 * 关键字类型， 0 固定 1 流程字段
+	 */
+	private Integer keyWordType;
+	
+	private String keyWord;
+	
+	private String keyWordFieldTable;
+	
+	
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_pcn/pdf_water/mapper/PdfWaterActionMapper.java b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/pdf_water/mapper/PdfWaterActionMapper.java
new file mode 100644
index 0000000..8add3d2
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/pdf_water/mapper/PdfWaterActionMapper.java
@@ -0,0 +1,127 @@
+package weaver.aiyh_pcn.pdf_water.mapper;
+
+import aiyh.utils.annotation.recordset.ParamMapper;
+import aiyh.utils.annotation.recordset.Select;
+import aiyh.utils.annotation.recordset.SqlMapper;
+import aiyh.utils.annotation.recordset.Update;
+import weaver.aiyh_pcn.pdf_water.entity.DetailPdfInfo;
+import weaver.aiyh_pcn.pdf_water.entity.PdfWaterConfig;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>查询</p>
+ * <p>create 2022/5/6 2:27 PM</p>
+ *
+ * @author ayh
+ */
+
+@SqlMapper
+public interface PdfWaterActionMapper {
+
+    /**
+     * 查询添加水印配置
+     * @param onlyMark 唯一标识
+     * @param workflowIds 流程id
+     * @return 水印配置
+     */
+    @Select("select * from uf_pdf_water_config where only_mark = #{onlyMark} and workflow_type in (${workflowIds})")
+    PdfWaterConfig getPdfWaterConfig(@ParamMapper("onlyMark") String onlyMark,
+                                     @ParamMapper("workflowIds") String[] workflowIds);
+
+
+    /**
+     * 查询添加水印配置
+     * @param onlyMarks 唯一标识
+     * @param workflowIds 流程id
+     * @return 水印配置
+     */
+    @Select("select * from uf_pdf_water_config where only_marks = #{onlyMarks} and workflow_type in (${workflowIds})")
+    List<PdfWaterConfig> getPdfWaterConfigs(@ParamMapper("onlyMarks") String onlyMarks,
+                                     @ParamMapper("workflowIds") String[] workflowIds);
+
+    /**
+     * 查询添加水印配置
+     * @param onlyMarks 唯一标识
+     * @param workflowIds 流程id
+     * @return 水印配置
+     */
+    @Select("select * from uf_pdf_waters where only_marks = #{onlyMarks} and workflow_type in (${workflowIds})")
+    List<PdfWaterConfig> getPdfWatersConfigs(@ParamMapper("onlyMarks") String onlyMarks,
+                                            @ParamMapper("workflowIds") String[] workflowIds);
+
+
+    /**
+     * 查询主表水印文件
+     * @param requestId 请求ID
+     * @param billTableName 主表名称
+     * @param sourceFieldName 源字段名称
+     * @return 水印文件docid
+     */
+    @Select("select $t{sourceFieldName} from $t{billTableName} where requestid = #{requestId}")
+    String selectSourcePdfInMainTable(@ParamMapper("requestId") String requestId,
+                           @ParamMapper("billTableName") String billTableName,
+                           @ParamMapper("sourceFieldName") String sourceFieldName);
+
+    /**
+     * 查询明细表的水印源文件
+     * @param requestId 请求ID
+     * @param mainTable 主表
+     * @param detailTableName 明细表名
+     * @param sourceFieldName 源字段名称
+     * @return 水印文件docid
+     */
+    @Select("select detail.id,detail.$t{sourceFieldName} doc_ids from $t{mainTable} main " +
+            "INNER JOIN $t{detailTable} detail on main.id = detail.mainid " +
+            "where main.requestid = #{requestId}")
+    List<DetailPdfInfo> selectSourcePdfInDetailTable(@ParamMapper("requestId") String requestId,
+                                                     @ParamMapper("mainTable") String mainTable,
+                                                     @ParamMapper("detailTable") String detailTableName,
+                                                     @ParamMapper("sourceFieldName") String sourceFieldName);
+
+
+    /**
+     * 更新主表水印文件
+     * @param billTableName 主表名称
+     * @param targetFieldName 目标字段名称
+     * @param docIds 水印文件docid
+     * @param requestId 请求ID
+     * @return 更新结果
+     */
+    @Update("update $t{mainTable} set $t{targetFieldName} = #{docIds} where requestid = #{requestId}")
+    boolean waterBackWaterPdfInMain(@ParamMapper("mainTable") String billTableName,
+                                    @ParamMapper("targetFieldName") String targetFieldName,
+                                    @ParamMapper("docIds") String docIds,
+                                    @ParamMapper("requestId") String requestId);
+
+
+    @Update("update $t{detailTable} set $t{targetFieldName} = #{docIds} where id = #{id}")
+    boolean waterBackWaterPdfInDetail(
+            @ParamMapper("detailTable") String detailTableName,
+            @ParamMapper("targetFieldName") String targetFieldName,
+            @ParamMapper("docIds") String waterDocStr,
+            @ParamMapper("id") String id);
+
+    /**
+     * 查询主表数据
+     * @param requestId 请求ID
+     * @param billTableName 主表名称
+     * @return 主表数据
+     */
+    @Select("select * from $t{billTableName} where requestid = #{requestId}")
+    Map<String,Object> selectMainTableData(@ParamMapper("requestId") String requestId,
+                                           @ParamMapper("billTableName") String billTableName);
+
+
+    /**
+     * 查询明细表数据
+     * @param mainId 主表ID
+     * @param billTableName 主表名称
+     * @return 主表数据
+     */
+    @Select("select * from $t{billTableName} where mainId = #{mainId}")
+    List<Map<String,Object>> selectDetailTableData(@ParamMapper("mainId") String mainId,
+                                           @ParamMapper("billTableName") String billTableName);
+
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_pcn/workflow_to_customer/AddCustomer_Action.java b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/workflow_to_customer/AddCustomer_Action.java
new file mode 100644
index 0000000..60e3a7e
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/workflow_to_customer/AddCustomer_Action.java
@@ -0,0 +1,1085 @@
+package weaver.aiyh_pcn.workflow_to_customer;
+
+
+import aiyh.utils.zwl.common.ToolUtil;
+import com.engine.crm.util.CrmCommonUtil;
+import com.engine.crm.util.CrmRemindUtil;
+import org.h2.util.StringUtils;
+import weaver.aiyh_pcn.workflow_to_customer.config.CRM_Config;
+import weaver.aiyh_pcn.workflow_to_customer.exception.DataExistsException;
+import weaver.aiyh_pcn.workflow_to_customer.exception.LoginIdRepeatException;
+import weaver.aiyh_pcn.workflow_to_customer.model.MainResult;
+import weaver.aiyh_pcn.workflow_to_customer.utils.*;
+import weaver.conn.RecordSet;
+import weaver.crm.CrmShareBase;
+import weaver.crm.Maint.*;
+import weaver.crm.data.CustomerModifyLog;
+import weaver.general.Util;
+import weaver.hrm.city.CityComInfo;
+import weaver.hrm.city.CitytwoComInfo;
+import weaver.hrm.companyvirtual.DepartmentVirtualComInfo;
+import weaver.hrm.companyvirtual.SubCompanyVirtualComInfo;
+import weaver.hrm.outinterface.HrmOutInterface;
+import weaver.hrm.province.ProvinceComInfo;
+import weaver.hrm.resource.ResourceComInfo;
+import weaver.interfaces.workflow.action.Action;
+import weaver.soa.workflow.request.RequestInfo;
+
+import java.util.*;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicReference;
+
+/**
+ * @author EBU7-dev1-ayh
+ * @create 2021-08-05 09:33
+ * <p>
+ * 功能：流程转客户， 这里逻辑十分复杂，估计我现在看的话也看不懂，如果这个需求要改，建议重写代码。
+ * 不要问我为啥写这么复杂，因为我也刚来没多久就写这个东西，另外所有的字段都是可以通过配置
+ * 实现没有太好的思路。只能使用笨办法，下一位有缘人修改的话，建议重写逻辑，阿巴阿巴阿巴巴
+ * <p/>
+ */
+public class AddCustomer_Action extends ToolUtil implements Action {
+    //当前类名称
+    private final String className = "AddCustomer_Action";
+    private RequestInfo request;
+    MainResult mainResult;
+    String tableName;
+    String customerID;
+    String subId;
+    String deprtId;
+    String resourceid;
+
+    /**
+     * 实现父类方法
+     *
+     * @param requestInfo
+     * @return
+     */
+    @Override
+    public String execute(RequestInfo requestInfo) {
+        this.writeDebuggerLog(className, "------------" + className + " Begin -----------------");
+        RecordSet rs = new RecordSet();
+        this.request = requestInfo;
+        //获取流程类型ID
+        String workflowid = Util.null2String(requestInfo.getWorkflowid());
+        //流程请求ID
+        String requestid = Util.null2String(requestInfo.getRequestid());
+        //流程表单名称
+        this.tableName = requestInfo.getRequestManager().getBillTableName();
+        this.writeDebuggerLog("这个是创建者id:" + requestInfo.getRequestManager().getCreater());
+//      通过流程id查询表名
+        if ("".equals(this.tableName)) {
+            this.tableName = getBillTableNameByWorkflowId(workflowid);
+        }
+        this.writeDebuggerLog("wrokflowid:{" + workflowid + "},requestid:{" + requestid + "},tablename:{" + this.tableName + "}");
+        CRM_Config config = new CRM_Config(workflowid, this.tableName, requestid);
+        Map<String, List<Map<String, Object>>> configInfoMap = config.getConfigInfo();
+        this.mainResult = config.getMainResult();
+        try {
+            if (this.mainResult.getChangeSetting() == 0) {
+//			表示插入
+                this.insertCustomerModel(this.mainResult, configInfoMap);
+//				数据会写流程操作
+                if (this.mainResult.getWillWrite() == 1) {
+//					数据需要会写
+                    ParaMap map = ParaMap.create().put(this.mainResult.getWillWriteField(), this.resourceid);
+                    if ("main_table".equals(this.mainResult.getWillWriteTable())) {
+//						数据会写到流程主表
+                        this.updateHandle(this.tableName, map,
+                                PrepSQLWhere.creatPrepWhere()
+                                        .and("requestid").equal(requestid)
+                                        .create());
+                    } else {
+//						数据回写到明细表中
+                        this.updateHandle(this.mainResult.getWillWriteTable(), map,
+                                PrepSQLWhere.creatPrepWhere()
+                                        .and("mainid").equalSql("select id from " + this.tableName + " where requestid = " + requestid)
+                                        .create());
+                    }
+                }
+            } else {
+//			 表示根据流程字段判断是插入还是更新
+                String workflowName;
+                if ("main_table".equals(this.mainResult.getUpdateInsertTable())) {
+                    workflowName = this.tableName;
+                    rs.executeQuery("select " + this.mainResult.getUpdateInsert() + " from " + workflowName + " where requestid = ?", requestid);
+                } else {
+                    workflowName = this.mainResult.getUpdateInsertTable();
+                    rs.executeQuery("select " + this.mainResult.getUpdateInsert() + " from " + workflowName + " where mainid in (select id from " + this.tableName + " where requestid = ?)", requestid);
+                }
+                rs.next();
+                int mark = Util.getIntValue(rs.getString(1), -1);
+                if (mark != -1 && mark == this.mainResult.getInsertMark()) {
+                    this.insertCustomerModel(this.mainResult, configInfoMap);
+                } else if (mark != -1 && mark == this.mainResult.getUpdateMark()) {
+                    this.updateCustomerModel(this.mainResult, configInfoMap, rs.getString(this.mainResult.getCustomerId()));
+                }
+            }
+        } catch (LoginIdRepeatException e) {
+            this.writeErrorLog(e + "\n");
+            this.request.getRequestManager().setMessagecontent(aiyh.utils.Util.getHtmlLabelName(-91703,
+                    request.getRequestManager().getUser().getLanguage(), "登录名重复，请重新输入登录名"));
+            this.request.getRequestManager().setMessageid("1");
+            return Action.FAILURE_AND_CONTINUE;
+        } catch (Exception e) {
+            this.writeDebuggerLog("insert customer error!");
+            this.writeDebuggerLog(e + "\n");
+            this.request.getRequestManager().setMessagecontent(aiyh.utils.Util.getHtmlLabelName(-91704,
+                    request.getRequestManager().getUser().getLanguage(), "生成外部用户错误，请联系管理员！"));
+            this.request.getRequestManager().setMessageid("2");
+        } finally {
+            this.writeDebuggerLog(className, "------------" + className + " End -----------------");
+        }
+        return Action.SUCCESS;
+
+    }
+
+    /**
+     * 更新客户
+     *
+     * @param mainResult
+     * @param configInfoMap
+     * @param customerId
+     */
+    public void updateCustomerModel(MainResult mainResult, Map<String, List<Map<String, Object>>> configInfoMap, String customerId) {
+        //		1、更新客户基本信息crm_customerinfo
+        if (Utils.conformSql(configInfoMap, "CRM_CustomerInfo")) {
+//			 将客户基本信息更新
+            this.updateCustomerInfo(configInfoMap.get("CRM_CustomerInfo"), customerId);
+        } else {
+            return;
+        }
+//		2、判断更新客户联系信息crm_customercontacter
+        if (Utils.conformSql(configInfoMap, "CRM_CustomerContacter") || this.mainResult.getIsOutUser() == 1 || this.mainResult.getIsOutUser() == 0) {
+//			 将客户联系信息更新到客户联系表中
+            if (Utils.conformSql(configInfoMap, "CRM_CustomerContacter")) {
+                this.updateCustomerContacter(configInfoMap.get("CRM_CustomerContacter"), customerId);
+            } else {
+                this.updateCustomerContacter(configInfoMap.get("CRM_CustomerInfo"), customerId);
+            }
+        }
+//		3、判断更新客户地址信息CRM_CustomerAddress
+        if (Utils.conformSql(configInfoMap, "CRM_CustomerAddress")) {
+//			 将客户信息更新到客户地址表中
+            this.updateCustomerAddress(configInfoMap.get("CRM_CustomerAddress"), customerId);
+        }
+//		4、判断更新客户销售商机信息CRM_SellChance
+        if (Utils.conformSql(configInfoMap, "CRM_SellChance")) {
+//			 将客户联系信息更新到客户联系表中
+            this.updateCustomerSellChance(configInfoMap.get("CRM_SellChance"), customerId);
+        }
+//		5、判断更新虚拟分部信息hrmsubcompanyvirtual
+        if (Utils.conformSql(configInfoMap, "hrmsubcompanyvirtual") || this.mainResult.getIsOutUser() == 0) {
+//			 将客户信息更新到虚拟分部信息表中
+            this.updateHrmsubcompanyvirtual(configInfoMap.get("hrmsubcompanyvirtual"), customerId);
+        } else {
+            return;
+        }
+//		6、判断更新虚拟部门信息hrmdepartmentvirtual
+        if (Utils.conformSql(configInfoMap, "hrmdepartmentvirtual") || this.mainResult.getIsOutUser() == 0) {
+//			 见客户信息更新到虚拟部门信息表中
+            this.updateHrmdepartmentvirtual(configInfoMap.get("hrmdepartmentvirtual"), customerId);
+        } else {
+            return;
+        }
+//		7、判断更新外部人员信息hrmresource
+        if (Utils.conformSql(configInfoMap, "hrmResource") || this.mainResult.getIsOutUser() == 0) {
+//			 将客户更新到外部人员信息表中
+            this.updateHrmresource(configInfoMap.get("hrmResource"), customerId);
+        }
+    }
+
+    /**
+     * 更新客户基本信息
+     *
+     * @param mapList
+     * @param customerId
+     */
+    public void updateCustomerInfo(List<Map<String, Object>> mapList, String customerId) {
+        RecordSet rs = new RecordSet();
+//		查询客户表，是否存在该客户，如果存在则对客户信息进行修改，如果不存在则跳过
+        String querySql = "select * from crm_customerinfo where id = ?";
+        rs.executeQuery(querySql, customerId);
+        if (rs.next()) {
+//			表示存在该客户，需要修改该客户的信息，并添加修改的 默认信息
+            mapList.forEach(item -> this.updateCustomerInfo(item, customerId));
+        }
+    }
+
+    /**
+     * 更新客户基本信息
+     *
+     * @param map
+     * @param customerId
+     */
+    public void updateCustomerInfo(Map<String, Object> map, String customerId) {
+        map.put("lastupdateddate", Utils.getTime("yyyy-MM-dd"));
+        map.put("lastupdatedtime", Utils.getTime("HH:mm:ss"));
+        this.updateHandle("crm_customerInfo", map,
+                PrepSQLWhere.creatPrepWhere()
+                        .and("id").equal(customerId)
+                        .create());
+    }
+
+    /**
+     * 更新客户联系人
+     *
+     * @param mapList
+     * @param customerId
+     */
+    public void updateCustomerContacter(List<Map<String, Object>> mapList, String customerId) {
+//		存在BUG,如果批量修改则会出现所有联系人都会被修改为同一个
+        RecordSet rs = new RecordSet();
+//		查询客户表，是否存在该客户，如果存在则对客户信息进行修改，如果不存在则跳过
+        String querySql = "select * from crm_customercontacter where customerid = ?";
+        rs.executeQuery(querySql, customerId);
+        if (rs.next()) {
+//			表示存在该客户，需要修改该客户的信息，并添加修改的 默认信息
+            mapList.forEach(item -> {
+                if (item.containsKey("fullname")) {
+                    item.put("firstname", item.get("fullname"));
+                }
+                if (item.containsKey("firstname")) {
+                    item.put("fullname", item.get("firstname"));
+                }
+                String query = "select id from CRM_CustomerContacter where customerid = ? and fullname = ?";
+                rs.executeQuery(query, rs.getString("id"), item.get("fullname"));
+                if (rs.next()) {
+                    item.put("lastupdateddate", Utils.getTime("yyyy-MM-dd"));
+                    item.put("lastupdatedtime", Utils.getTime("HH:mm:ss"));
+                    this.updateCustomerContacter(item, rs.getString("id"));
+                }
+            });
+        }
+    }
+
+    /**
+     * 更新客户联系人
+     *
+     * @param map
+     * @param contacter
+     */
+    public void updateCustomerContacter(Map<String, Object> map, String contacter) {
+        map.put("lastupdateddate", Utils.getTime("yyyy-MM-dd"));
+        map.put("lastupdatedtime", Utils.getTime("HH:mm:ss"));
+        this.updateHandle("crm_customercontacter", map,
+                PrepSQLWhere.creatPrepWhere()
+                        .and("id").equal(contacter)
+                        .create());
+    }
+
+    /**
+     * 更新客户联系地址
+     *
+     * @param mapList
+     * @param customerId
+     */
+    public void updateCustomerAddress(List<Map<String, Object>> mapList, String customerId) {
+//		存在BUG,如果批量修改则会出现所有联系人都会被修改为同一个
+        RecordSet rs = new RecordSet();
+//		查询客户表，是否存在该客户，如果存在则对客户信息进行修改，如果不存在则跳过
+        String querySql = "select * from crm_customeraddress where customerid = ?";
+        rs.executeQuery(querySql, customerId);
+        if (rs.next()) {
+//			表示存在该客户，需要修改该客户的信息，并添加修改的 默认信息
+            mapList.forEach(item -> {
+                item.put("lastupdateddate", Utils.getTime("yyyy-MM-dd"));
+                item.put("lastupdatedtime", Utils.getTime("HH:mm:ss"));
+                this.updateHandle("crm_customeraddress", item,
+                        PrepSQLWhere.creatPrepWhere().and("customerid").equal(customerId)
+                                .and("id").equal(rs.getString("id")).create());
+            });
+        }
+    }
+
+    /**
+     * 更新客户商机
+     *
+     * @param mapList
+     * @param customerId
+     */
+    public void updateCustomerSellChance(List<Map<String, Object>> mapList, String customerId) {
+//		存在BUG,如果批量修改则会出现所有联系人都会被修改为同一个
+        RecordSet rs = new RecordSet();
+//		查询客户表，是否存在该客户，如果存在则对客户信息进行修改，如果不存在则跳过
+        String querySql = "select * from crm_sellchance where customerid = ?";
+        rs.executeQuery(querySql, customerId);
+        if (rs.next()) {
+//			表示存在该客户，需要修改该客户的信息，并添加修改的 默认信息
+            mapList.forEach(item -> {
+                item.put("lastupdateddate", Utils.getTime("yyyy-MM-dd"));
+                item.put("lastupdatedtime", Utils.getTime("HH:mm:ss"));
+                this.updateHandle("crm_sellchance", item,
+                        PrepSQLWhere.creatPrepWhere().and("customerid").equal(customerId)
+                                .and("id").equal(rs.getString("id")).create());
+            });
+        }
+    }
+
+    /**
+     * 更新人员虚拟分部信息
+     *
+     * @param mapList
+     * @param customerId
+     */
+    public void updateHrmsubcompanyvirtual(List<Map<String, Object>> mapList, String customerId) {
+        //		存在BUG,如果批量修改则会出现所有联系人都会被修改为同一个
+        RecordSet rs = new RecordSet();
+        String querySql = "select * from crm_customerinfo where id = ?";
+        rs.executeQuery(querySql, customerId);
+        CustomerInfoComInfo customerInfoComInfo = new CustomerInfoComInfo();
+//		查询客户表，是否存在该客户，如果存在则对客户信息进行修改，如果不存在则跳过
+        querySql = "select * from hrmsubcompanyvirtual where id = ?";
+        if (rs.next()) {
+            rs.executeQuery(querySql, this.subId);
+            if (rs.next()) {
+//			表示存在该客户，需要修改该客户的信息，并添加修改的 默认信息
+                mapList.forEach(item -> {
+                    this.updateHandle("hrmsubcompanyvirtual", item,
+                            PrepSQLWhere.creatPrepWhere()
+                                    .and("id").equal(rs.getString("id")).create());
+                });
+            }
+        }
+    }
+
+    /**
+     * 更新人员虚拟部门信息
+     *
+     * @param mapList
+     * @param customerId
+     */
+    public void updateHrmdepartmentvirtual(List<Map<String, Object>> mapList, String customerId) {
+//		存在BUG,如果批量修改则会出现所有联系人都会被修改为同一个
+        RecordSet rs = new RecordSet();
+        String querySql = "select * from crm_customerinfo where id = ?";
+        rs.executeQuery(querySql, customerId);
+        CustomerInfoComInfo customerInfoComInfo = new CustomerInfoComInfo();
+//		查询客户表，是否存在该客户，如果存在则对客户信息进行修改，如果不存在则跳过
+        querySql = "select * from hrmdepartmentvirtual where id = ?";
+        if (rs.next()) {
+            rs.executeQuery(querySql, this.deprtId);
+            if (rs.next()) {
+//			表示存在该客户，需要修改该客户的信息，并添加修改的 默认信息
+                mapList.forEach(item -> {
+                    this.updateHandle("hrmdepartmentvirtual", item,
+                            PrepSQLWhere.creatPrepWhere()
+                                    .and("id").equal(rs.getString("id")).create());
+                });
+            }
+        }
+    }
+
+    public void updateHrmresource(List<Map<String, Object>> mapList, String customerId) {
+//		先查询外部用户与人员表的对应关系
+
+    }
+
+    public void insertCustomerModel(MainResult mainResult, Map<String, List<Map<String, Object>>> configInfoMap) {
+        Map<String, Object> customer;
+//		1、插入客户基本信息crm_customerinfo
+        if (Utils.conformSql(configInfoMap, "CRM_CustomerInfo")) {
+//			 将客户基本信息插入表中
+            customer = this.insertCustomerInfo(configInfoMap.get("CRM_CustomerInfo"));
+        } else {
+            return;
+        }
+//		2、判断插入客户联系信息crm_customercontacter
+        if (Utils.conformSql(configInfoMap, "CRM_CustomerContacter") || this.mainResult.getIsOutUser() == 1 || this.mainResult.getIsOutUser() == 0) {
+//			 将客户联系信息插入到客户联系表中
+            if (Utils.conformSql(configInfoMap, "CRM_CustomerContacter")) {
+                this.insertCustomerContacter(configInfoMap.get("CRM_CustomerContacter"), customer, 0);
+            } else {
+                this.insertCustomerContacter(configInfoMap.get("CRM_CustomerInfo"), customer, 1);
+            }
+        }
+//		3、判断插入客户地址信息CRM_CustomerAddress
+        if (Utils.conformSql(configInfoMap, "CRM_CustomerAddress")) {
+//			 将客户信息出入到客户地址表中
+            this.insertCustomerAddress(configInfoMap.get("CRM_CustomerAddress"), customer);
+        }
+//		4、判断插入客户销售商机信息CRM_SellChance
+        if (Utils.conformSql(configInfoMap, "CRM_SellChance")) {
+//			 将客户联系信息插入到客户联系表中
+            this.insertCustomerSellChance(configInfoMap.get("CRM_SellChance"), customer);
+        }
+/*//		5、判断插入虚拟分部信息hrmsubcompanyvirtual
+
+		if (Utils.conformSql(configInfoMap, "hrmsubcompanyvirtual") || this.mainResult.getIsOutUser() == 0) {
+//			 将客户信息插入到虚拟分部信息表中
+			this.subId = this.insertHrmsubcompanyvirtual(configInfoMap.get("hrmsubcompanyvirtual"), customer);
+		} else {
+			return;
+		}
+//		6、判断插入虚拟部门信息hrmdepartmentvirtual
+
+		if (Utils.conformSql(configInfoMap, "hrmdepartmentvirtual") || this.mainResult.getIsOutUser() == 0) {
+//			 见客户信息插入到虚拟部门信息表中
+			this.deprtId = this.insertHrmdepartmentvirtual(configInfoMap.get("hrmdepartmentvirtual"), customer, subId);
+		} else {
+			return;
+		}*/
+//		7、判断插入外部人员信息hrmresource
+        if (Utils.conformSql(configInfoMap, "hrmResource") || this.mainResult.getIsOutUser() == 0) {
+//			 将客户插入到外部人员信息表中
+            this.insertHrmresource(configInfoMap.get("hrmResource"), customer, subId, deprtId);
+        }
+    }
+
+    public void insertHrmresourceVirtual(Map<String, Object> customer, String hrmid, String subId, String deparId) {
+        RecordSet rs = new RecordSet();
+        rs.executeQuery("select max(id) from HrmResourceVirtual");
+        int hrmvId = 0;
+        if (rs.next()) {
+            hrmvId = rs.getInt(1) + 1;
+        }
+        int finalHrmvId = hrmvId;
+        int finalHrmvId1 = hrmvId;
+        String queryCompanyId = "select id from HrmCompanyVirtual where companyname like '%客户维度%'";
+        rs.executeQuery(queryCompanyId);
+        rs.next();
+        String companyId = rs.getString("id");
+        Map<String, Object> hrmrVmap = Utils.createMap()
+                .uPut("id", finalHrmvId)
+                .uPut("resourceid", finalHrmvId1)
+                .uPut("managerid", 0)
+                .uPut("subcompanyid", subId)
+                .uPut("departmentid", deparId)
+                .uPut("managerstr", "")
+                .uPut("virtualtype", companyId);
+        this.insertHandle("HrmResourceVirtual", hrmrVmap);
+        Map<String, Object> hrmOMap = Utils.createMap()
+                .uPut("resourceid", hrmid)
+                .uPut("wxname", Util.null2String(customer.get("wxname")))
+                .uPut("wxopenid", Util.null2String(customer.get("wxopenid")))
+                .uPut("wxuuid", Util.null2String(customer.get("wxuuid")))
+                .uPut("customid", customer.get("customerId"))
+                .uPut("country", Util.null2String(customer.get("country")))
+                .uPut("province", Util.null2String(customer.get("province")))
+                .uPut("city", Util.null2String(customer.get("city")))
+                .uPut("customfrom", Util.null2String(customer.get("customfrom")))
+                .uPut("isoutmanager", 0);
+        this.insertHandle("hrmresourceout", hrmOMap);
+    }
+
+    public void insertHrmresource(List<Map<String, Object>> mapList, Map<String, Object> customer, String subId, String deparId) {
+
+        CrmCommonUtil crmCommonUtil = new CrmCommonUtil();
+        mapList.forEach(item -> {
+            RecordSet rs = new RecordSet();
+//            String hrmid;
+////			获取人员id
+//            rs.executeProc("HrmResourceMaxId_Get", "");
+//            rs.next();
+//            hrmid = rs.getString(1);
+//			整理数据
+            item.put("createdate", Utils.getTime("yyyy-MM-dd"));
+//			item.put("id", hrmid);
+            item.put("createrid", this.request.getRequestManager().getCreater());
+            if (!item.containsKey("lastname")) {
+                item.put("lastname", customer.get("name"));
+            }
+            if (!item.containsKey("loginid")) {
+                item.put("loginid", crmCommonUtil.getPinYin((String) customer.get("name"), 7).get("pinyin"));
+            }
+            if (item.containsKey("seclevel") && Integer.parseInt((String) item.get("seclevel")) > 0) {
+                item.put("seclevel", -10);
+            }
+            if (!item.containsKey("seclevel")) {
+                item.put("seclevel", -10);
+            }
+            if (!item.containsKey("password")) {
+                item.put("password", Util.getEncrypt((String) crmCommonUtil.getPinYin((String) customer.get("name"), 7).get("pinyin")));
+            }
+            if (item.containsKey("password")) {
+                item.put("password", Util.getEncrypt((String) item.get("password")));
+            }
+            if (!item.containsKey("lastmoddate")) {
+                item.put("lastmoddate", Utils.getTime("yyyy-MM-dd"));
+            }
+            if (!item.containsKey("lastmodid")) {
+                item.put("lastmodid", 1);
+            }
+            if (!item.containsKey("systemlanguage")) {
+                item.put("systemlanguage", 7);
+            }
+            if (!item.containsKey("departmentid")) {
+//				customerInfo.getCustomerInfoSubcompanyid(String.valueOf(customer.get("customerId")))
+                item.put("departmentid", deprtId);
+            }
+            if (!item.containsKey("subcompanyid1")) {
+//				customerInfo.getCustomerInfoDepartmentid(String.valueOf(customer.get("customerId")))
+                item.put("subcompanyid1", subId);
+            }
+            if (!item.containsKey("status")) {
+                item.put("status", 1);
+            }
+            if (!item.containsKey("accounttype")) {
+                item.put("accounttype", 0);
+            }
+            if (!item.containsKey("dsporder")) {
+//				item.put("dsporder", hrmid);
+            }
+            item.put("ecology_pinyin_search", crmCommonUtil.getPinYin((String) customer.get("name"), 7));
+//			查询loginid是否已经存在
+            String quertLogin = "select count(1) from hrmresource where loginid= ?";
+            rs.executeQuery(quertLogin, item.get("loginid"));
+            if (rs.next() && rs.getInt(1) > 0) {
+//				存在登录名
+                throw new LoginIdRepeatException("loginid is repeat,Please re-enter logind!");
+            }
+            //			this.insertHandle("hrmresource", item);
+//			if (this.mainResult.getManagerType() == 3) {
+//				//			将外部客户的客户经理更新为当前插入的外部用户，方便外部用户参与流程审批
+//				this.updateHandle("CRM_CustomerInfo", Utils.createMap().uPut("manager", Integer.parseInt(hrmid) + 1)
+//								.uPut("lastupdatedtime", Utils.getTime("HH:mm:ss"))
+//								.uPut("lastupdatedtime", Utils.getTime("HH:mm:ss")),
+//						PrepSQLWhere.creatPrepWhere()
+//								.and("id").equal(customer.get("customerId"))
+//								.create());
+//			}
+            HrmOutInterface hrmOutInterface = new HrmOutInterface();
+            Map<String, String> param = new HashMap<>();
+            param.put("crmid", Util.null2String(customer.get("customerId")));
+            param.put("lastname", Util.null2String(item.get("lastname")));
+            param.put("loginid", Util.null2String(item.get("loginid")));
+            param.put("password", Util.null2String(item.get("password")));
+            param.put("seclevel", Util.null2String(item.get("seclevel")));
+            param.put("mobile", Util.null2String(item.get("mobile")));
+            param.put("email", Util.null2String(item.get("email")));
+            param.put("isoutmanager", Util.null2s(Util.null2String(item.get("isoutmanager")), "1"));
+            param.put("wxname", Util.null2String(item.get("wxname")));
+            param.put("wxopenid", Util.null2String(item.get("wxopenid")));
+            param.put("wxuuid", Util.null2String(item.get("wxuuid")));
+            param.put("country", Util.null2String(item.get("country")));
+            param.put("province", Util.null2String(item.get("province")));
+            param.put("city", Util.null2String(item.get("city")));
+            param.put("customfrom", Util.null2String(item.get("customfrom")));
+            Map<String, String> returnObj = hrmOutInterface.createResource4Card(param);
+            String resourceid = returnObj.get("resourceid");
+            String errorinfo = returnObj.get("errorinfo");
+            if (!"".equals(errorinfo)) {
+                throw new RuntimeException(errorinfo);
+            }
+            String sql = "INSERT INTO CRM_ShareInfo (relateditemid, sharetype, seclevel, sharelevel, crmid, contents, deleted, seclevelMax, jobtitleid, joblevel, scopeid) VALUES (?, '1', '10','1','0',?, '0', '100', ?, '0', ',0,')";
+            rs.executeUpdate(sql, customer.get("customerId"), resourceid, resourceid);
+            this.resourceid = resourceid;
+
+
+            CustomerInfoComInfo customerInfo = new CustomerInfoComInfo();
+            customerInfo.removeCustomerInfoCache();
+            customerInfo.removeCache();
+            (new CustomerDescComInfo()).removeCache();
+            (new CustomerRatingComInfo()).removeCache();
+            (new CustomerSizeComInfo()).removeCache();
+            (new CustomerStatusComInfo()).removeCache();
+            customerInfo.addCustomerInfoCache(String.valueOf(customer.get("customerId")));
+            CrmRemindUtil crmRemindUtil = new CrmRemindUtil(request.getRequestManager().getUser());
+            crmRemindUtil.outResourceAddRemind(Integer.parseInt(resourceid));
+
+//			应该是
+//			hrmOutInterface.initMatrixDataOutManager(subId, hrmid);
+
+            ResourceComInfo resourceComInfo = null;
+            try {
+                resourceComInfo = new ResourceComInfo();
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+            if (!Objects.isNull(resourceComInfo)) {
+                resourceComInfo.removeResourceCache();
+                resourceComInfo.removeCache();
+            }
+//			this.insertHrmresourceVirtual(customer, hrmid, subId, deparId);
+//			Map<String, Object> map = new HashMap<String, Object>() {{
+//				put("relateditemid", Util.null2String(customer.get("customerId")));
+//				put("sharetype", "1");
+//				put("seclevel", "10");
+//				put("sharelevel", "1");
+//				put("crmid", "0");
+//				put("contents", hrmid);
+//				put("deleted", "0");
+//				put("seclevelMax", "100");
+//				put("jobtitleid", hrmid);
+//				put("joblevel", "0");
+//				put("scopeid", "0");
+//			}};
+//			this.insertHandle("CRM_ShareInfo", map);
+        });
+    }
+
+    public String insertHrmdepartmentvirtual(List<Map<String, Object>> mapList, Map<String, Object> customer, String subId) {
+        if (Objects.isNull(mapList) || mapList.isEmpty()) {
+            mapList = new ArrayList<>();
+            mapList.add(new HashMap<>());
+        }
+        CrmCommonUtil crmCommonUtil = new CrmCommonUtil();
+        RecordSet rs = new RecordSet();
+        String queryCompanyId = "select id from HrmCompanyVirtual where companyname like '%客户维度%'";
+        rs.executeQuery(queryCompanyId);
+        rs.next();
+        String companyId = rs.getString("id");
+//		查询是否存在客户经理的部门
+        String querydepartment = "select id from hrmdepartmentvirtual where subcompanyid1 = ? and departmentname = ?";
+        rs.executeQuery(querydepartment, subId, "客户经理");
+        if (rs.next()) {
+            this.insertHandle("hrmdepartmentvirtual", new ArrayList<Map<String, Object>>() {{
+                add(new HashMap<String, Object>() {
+                    {
+                        put("departmentname", "客户经理");
+                        put("departmentmark", "客户经理");
+                        put("subcompanyid1", subId);
+                        put("showOrderOfTree", "0");
+                        put("virtualtype", companyId);
+                        put("ecology_pinyin_search", crmCommonUtil.getPinYin("客户经理", 7));
+                    }
+                });
+            }});
+        }
+        String queryderId = "select id from hrmdepartmentvirtual where subcompanyid1 = ? and departmentname = ?";
+        rs.executeQuery(queryderId, subId, customer.get("name"));
+        if (!rs.next()) {
+            mapList.forEach(item -> {
+                item.put("departmentname", customer.get("name"));
+                item.put("departmentmark", customer.get("name"));
+                item.put("subcompanyid1", subId);
+                item.put("showOrderOfTree", "0");
+                item.put("virtualtype", companyId);
+                item.put("ecology_pinyin_search", crmCommonUtil.getPinYin((String) customer.get("name"), 7));
+            });
+            this.insertHandle("hrmdepartmentvirtual", mapList);
+            DepartmentVirtualComInfo departmentVirtualComInfo = new DepartmentVirtualComInfo();
+            departmentVirtualComInfo.removeCache();
+            departmentVirtualComInfo.removeDepartmentCache();
+            rs.executeQuery(queryderId, subId, customer.get("name"));
+            rs.next();
+            return rs.getString(1);
+        }
+        return rs.getString(1);
+    }
+
+    public String insertHrmsubcompanyvirtual(List<Map<String, Object>> mapList, Map<String, Object> customer) {
+        if (Objects.isNull(mapList) || mapList.isEmpty()) {
+            mapList = new ArrayList<>();
+            mapList.add(new HashMap<>());
+        }
+        CrmCommonUtil crmCommonUtil = new CrmCommonUtil();
+        RecordSet rs = new RecordSet();
+        String queryCompanyId = "select id from HrmCompanyVirtual where companyname like '%客户维度%'";
+        rs.executeQuery(queryCompanyId);
+        rs.next();
+        String companyId = rs.getString("id");
+        String quertSupsubcomId = "select id from hrmsubcompanyvirtual where subcompanyname = '新用户'";
+        rs.executeQuery(quertSupsubcomId);
+        rs.next();
+        String supcomId = rs.getString("id");
+        String querySubID = "select id from hrmsubcompanyvirtual where subcompanyname = ?";
+        rs.executeQuery(querySubID, customer.get("name"));
+        if (!rs.next()) {
+            mapList.forEach(item -> {
+                item.put("ecology_pinyin_search", crmCommonUtil.getPinYin((String) customer.get("name"), 7));
+                item.put("subcompanyname", customer.get("name"));
+                item.put("subcompanydesc", customer.get("name"));
+                item.put("companyid", companyId);
+                item.put("virtualtypeid", companyId);
+                item.put("supsubcomid", supcomId);
+            });
+            this.insertHandle("hrmsubcompanyvirtual", mapList);
+            SubCompanyVirtualComInfo subCompanyVirtualComInfo = new SubCompanyVirtualComInfo();
+            subCompanyVirtualComInfo.removeCache();
+            subCompanyVirtualComInfo.removeSubCompanyCache();
+            rs.executeQuery(querySubID, customer.get("name"));
+            rs.next();
+            return rs.getString("id");
+        }
+        return rs.getString("id");
+    }
+
+    public void insertCustomerSellChance(List<Map<String, Object>> mapList, Map<String, Object> customer) {
+        mapList.forEach(item -> {
+            item.put("customerid", Util.null2String(customer.get("customerId")));
+            item.put("createdate", Utils.getTime("yyyy-MM-dd"));
+            item.put("createtime", Utils.getTime("HH:mm:ss"));
+            item.put("createrid", this.request.getRequestManager().getCreater());
+            item.put("lastupdateddate", Utils.getTime("yyyy-MM-dd"));
+            item.put("lastupdatedtime", Utils.getTime("HH:mm:ss"));
+            item.put("creater", this.request.getRequestManager().getCreater());
+        });
+        this.insertHandle("CRM_SellChance", mapList);
+    }
+
+    public void insertCustomerAddress(List<Map<String, Object>> mapList, Map<String, Object> customer) {
+        RecordSet rs = new RecordSet();
+        mapList.forEach(item -> {
+            item.put("customerid", Util.null2String(customer.get("customerId")));
+            item.put("createdate", Utils.getTime("yyyy-MM-dd"));
+            item.put("createtime", Utils.getTime("HH:mm:ss"));
+            item.put("createrid", this.request.getRequestManager().getCreater());
+            item.put("lastupdatedby", this.request.getRequestManager().getCreater());
+            item.put("lastupdateddate", Utils.getTime("yyyy-MM-dd"));
+            item.put("lastupdatedtime", Utils.getTime("HH:mm:ss"));
+            if (item.containsKey("contacter")) {
+                if (Util.getIntValue(String.valueOf(item.get("contacter")), 0) == 0) {
+                    String queryContacter = "select id from crm_customercontacter where customerid = ? and (fullname = ? or firstname = ?)";
+                    rs.executeUpdate(queryContacter, customer.get("customerId"), item.get("contacter"), item.get("contacter"));
+                    rs.next();
+                    item.put("contacter", rs.getString(1));
+                }
+            }
+        });
+        this.insertHandle("crm_customeraddress", mapList);
+    }
+
+    public void insertCustomerContacter(List<Map<String, Object>> mapList, Map<String, Object> customer, int type) {
+        CrmCommonUtil crmCommonUtil = new CrmCommonUtil();
+        RecordSet rs = new RecordSet();
+        String querySql = "select id from CRM_CustomerContacter where customerid = ? and fullname = ?";
+
+        if (type == 1) {
+            if (rs.executeQuery(querySql, Util.null2String(customer.get("customerId")), Util.null2String(customer.get("name"))) && rs.next()) {
+//			已存在相关的联系人
+                return;
+            }
+//			表示需要创建联系人，但是没有指定联系人对应的流程字段，则默认将客户信息当做联系人信息，并且设置为主联系人
+            Map<String, Object> map = new HashMap<>();
+            map.put("customerid", Util.null2String(customer.get("customerId")));
+            map.put("fullname", Util.null2String(customer.get("name")));
+            map.put("firstname", Util.null2String(customer.get("name")));
+            map.put("jobtitle", Util.null2String(customer.get("name")));
+            map.put("ecology_pinyin_search", crmCommonUtil.getPinYin((String) customer.get("name"), 7));
+            map.put("main", 1);
+            map.put("email", Util.null2String(customer.get("email")));
+            map.put("mobilephone", Util.null2String(customer.get("phone")));
+            map.put("manager", Util.null2String(customer.get("manager")));
+            map.put("department", Util.null2String(customer.get("department")));
+            map.put("createdate", Utils.getTime("yyyy-MM-dd"));
+            map.put("createtime", Utils.getTime("HH:mm:ss"));
+            map.put("createrid", this.request.getRequestManager().getCreater());
+            map.put("lastupdateddate", Utils.getTime("yyyy-MM-dd"));
+            map.put("lastupdatedtime", Utils.getTime("HH:mm:ss"));
+            this.insertHandle("crm_customercontacter", new ArrayList<Map<String, Object>>() {{
+                add(map);
+            }});
+            return;
+        }
+        AtomicBoolean flag = new AtomicBoolean(true);
+        mapList.forEach(item -> {
+            if (flag.get()) {
+                item.put("main", 1);
+                flag.set(false);
+            }
+            if (!item.containsKey("fullname") && !item.containsKey("firstname")) {
+                item.put("fullname", Util.null2String(customer.get("name")));
+                item.put("firstname", Util.null2String(customer.get("name")));
+                item.put("ecology_pinyin_search", crmCommonUtil.getPinYin((String) customer.get("name"), 7));
+            }
+            if (item.containsKey("fullname")) {
+                item.put("fullname", Util.null2String(item.get("fullname")));
+                item.put("firstname", Util.null2String(item.get("fullname")));
+                item.put("ecology_pinyin_search", crmCommonUtil.getPinYin((String) item.get("fullname"), 7));
+            }
+            if (item.containsKey("firstname")) {
+                item.put("fullname", Util.null2String(item.get("firstname")));
+                item.put("firstname", Util.null2String(item.get("firstname")));
+                item.put("ecology_pinyin_search", crmCommonUtil.getPinYin((String) item.get("firstname"), 7));
+            }
+            if (!item.containsKey("jobtitle")) {
+                item.put("jobtitle", Util.null2String(customer.get("name")));
+            }
+            if (!item.containsKey("mobilephone")) {
+                item.put("mobilephone", Util.null2String(customer.get("phone")));
+            }
+            if (!item.containsKey("email")) {
+                item.put("email", Util.null2String(customer.get("email")));
+            }
+            if (rs.executeQuery(querySql, Util.null2String(customer.get("customerId")), Util.null2String(customer.get("name"))) && rs.next()) {
+//			已存在相关的联系人
+                this.updateCustomerContacter(item, rs.getString("id"));
+            }
+            item.put("customerid", Util.null2String(customer.get("customerId")));
+            item.put("createdate", Utils.getTime("yyyy-MM-dd"));
+            item.put("createtime", Utils.getTime("HH:mm:ss"));
+            item.put("createrid", this.request.getRequestManager().getCreater());
+            item.put("lastupdateddate", Utils.getTime("yyyy-MM-dd"));
+            item.put("lastupdatedtime", Utils.getTime("HH:mm:ss"));
+        });
+        this.insertHandle("crm_customercontacter", mapList);
+        CustomerContacterComInfo customerComInfo = new CustomerContacterComInfo();
+        customerComInfo.removeCustomerContacterCache();
+        customerComInfo.removeCache();
+    }
+
+    public Map<String, Object> insertCustomerInfo(List<Map<String, Object>> mapList) {
+        RecordSet rs = new RecordSet();
+        String managerId;
+        if (this.mainResult.getManagerType() == 0) {
+//          客户经理根据流程字段绑定
+            rs.executeQuery("select " + this.mainResult.getManagerField() + " from " + this.tableName + " where requestid = ?",
+                    this.request.getRequestid());
+            rs.next();
+            managerId = Util.null2String(rs.getString(1));
+            if (StringUtils.isNullOrEmpty(managerId) || "".equals(managerId)) {
+                managerId = String.valueOf(this.request.getRequestManager().getCreater());
+            }
+        } else if (this.mainResult.getManagerType() == 1) {
+//          客户经理为固定值
+            managerId = String.valueOf(this.mainResult.getCustomerManager());
+        } else {
+//			客户经理为流程创建者或外部用户
+            managerId = String.valueOf(this.request.getRequestManager().getCreater());
+        }
+        String creditlevel = "0";
+//		表示含有信用保证金额，需要调用存储过程
+        final Map<String, Object> cusMap = mapList.get(0);
+        if (!cusMap.containsKey("creditamount")) {
+            if (cusMap.get("creditamount") != null && !"".equals(cusMap.get("creditamount").toString().trim())) {
+                rs.executeProc("Sales_CRM_CreditInfo_Select", cusMap.get("creditamount") + "");
+                if (rs.next()) {
+                    creditlevel = rs.getString(1);
+                }
+            }
+        }
+//		 添加必要参数
+        CityComInfo cityComInfo = new CityComInfo();
+        ResourceComInfo resourceComInfo = null;
+        try {
+            resourceComInfo = new ResourceComInfo();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        ResourceComInfo finalResourceComInfo = resourceComInfo;
+        ProvinceComInfo province = new ProvinceComInfo();
+        String finalCreditlevel = creditlevel;
+        String finalManagerId = managerId;
+        CrmCommonUtil crmCommonUtil = new CrmCommonUtil();
+        AtomicReference<String> customerIdStr = new AtomicReference<>();
+        try {
+            mapList.forEach(item -> {
+
+//			判断字段，特殊字段特殊处理
+                if (item.containsKey("province")) {
+                    if (!"".equals(item.get("province")) && Util.getIntValue((String) item.get("province"), 0) > 0) {
+                        item.put("country", province.getProvincecountryid((String) item.get("province")));
+                    }
+                }
+                if (item.containsKey("city")) {
+                    if (!"".equals(item.get("city")) && Util.getIntValue(item.get("city").toString(), 0) > 0) {
+//					如果城市字段属于int类型的，则将城市字段进行替换，并且添加国家字段
+                        item.put("city", cityComInfo.getCityprovinceid((String) item.get("city")));
+                        item.put("country", cityComInfo.getCitycountryid((String) item.get("city")));
+                    }
+                }
+                if (item.containsKey("district")) {
+                    if (!"".equals(item.get("district")) && Util.getIntValue((String) item.get("district"), 0) > 0) {
+                        CitytwoComInfo citytwoComInfo = new CitytwoComInfo();
+                        item.put("city", citytwoComInfo.getCitypid((String) item.get("district")));
+                        item.put("province", cityComInfo.getCityprovinceid((String) item.get("city")));
+                        item.put("country", province.getProvincecountryid((String) item.get("province")));
+                    }
+                }
+                if (item.containsKey("type")) {
+                    item.put("type", 1);
+                }
+                if (item.containsKey("mobilephone")) {
+                    item.put("phone", item.get("mobilephone"));
+                    item.remove("mobilephone");
+                }
+                if (item.containsKey("contacteremail")) {
+                    item.put("email", item.get("contacteremail"));
+                    item.remove("contacteremail");
+                }
+
+                if (item.containsKey("engname")) {
+                    item.put("name", item.get("engname"));
+                }
+                if (item.containsKey("name")) {
+                    item.put("engname", item.get("name"));
+                }
+
+                if (item.containsKey("location")) {
+                    if (!"".equals(item.get("location"))) {
+                        String lng = item.get("location").toString().split(",")[0];
+                        String lat = item.get("location").toString().split(",")[1];
+                        item.put("lng1", lng);
+                        item.put("lat1", lat);
+                    }
+                }
+                if (!item.containsKey("lastupdatedby")) {
+                    item.put("lastupdatedby", this.request.getRequestManager().getCreater());
+                }
+                if (!item.containsKey("status")) {
+                    item.put("status", 2);
+                }
+                if (!item.containsKey("language")) {
+                    item.put("language", 7);
+                }
+                if (!item.containsKey("fincode")) {
+                    item.put("fincode", 0);
+                }
+                if (!item.containsKey("currency")) {
+                    item.put("currency", 0);
+                }
+                if (!item.containsKey("contractlevel")) {
+                    item.put("contractlevel", 0);
+                }
+                if (!item.containsKey("creditoffset")) {
+                    item.put("creditoffset", 0);
+                }
+                if (!item.containsKey("discount")) {
+                    item.put("discount", 100);
+                }
+                if (!item.containsKey("invoiceacount")) {
+                    item.put("invoiceacount", 0);
+                }
+                if (!item.containsKey("deliverytype")) {
+                    item.put("deliverytype", 0);
+                }
+                if (!item.containsKey("paymentterm")) {
+                    item.put("paymentterm", 0);
+                }
+                if (!item.containsKey("paymentway")) {
+                    item.put("paymentway", 0);
+                }
+                if (!item.containsKey("saleconfirm")) {
+                    item.put("saleconfirm", 0);
+                }
+                if (!item.containsKey("PortalStatus")) {
+                    item.put("PortalStatus", 0);
+                }
+                if (!item.containsKey("deleted")) {
+                    item.put("deleted", 0);
+                }
+                if (item.containsKey("seclevel")) {
+                    item.put("seclevel", (Integer) item.get("seclevel") >= 0 ? -1 : item.get("seclevel"));
+                }
+                if (item.containsKey("name")) {
+                    //		判断客户是否存在，通过用户id和客户姓名
+                    String querySql = "select * from crm_customerInfo where deleted <> 1 and name = ? and manager =?";
+                    if (rs.executeQuery(querySql, item.get("name"), finalManagerId) && rs.next()) {
+                        //       如果客户名重复则特殊处理，如果如果该客户就进行更新
+                        customerIdStr.set(rs.getString("id"));
+                        this.updateCustomerInfo(item, customerIdStr.get());
+                        throw new DataExistsException("break now forEach");
+//					String newName = item.get("name") + String.valueOf(System.currentTimeMillis());
+//					item.put("name", newName);
+//					item.put("engname", newName);
+                    }
+                }
+                item.put("createdate", Utils.getTime("yyyy-MM-dd"));
+                item.put("createtime", Utils.getTime("HH:mm:ss"));
+                item.put("createrid", this.request.getRequestManager().getCreater());
+                item.put("lastupdateddate", Utils.getTime("yyyy-MM-dd"));
+                item.put("lastupdatedtime", Utils.getTime("HH:mm:ss"));
+                item.put("department", finalResourceComInfo.getDepartmentID(finalManagerId));
+                item.put("subcompanyid1", finalResourceComInfo.getSubCompanyID(finalManagerId));
+                item.put("manager", finalManagerId);
+                item.put("creditlevel", finalCreditlevel);
+                item.put("typebegin", Utils.getTime("yyyy-MM-dd"));
+                item.put("ecology_pinyin_search", crmCommonUtil.getPinYin((String) item.get("name"), 7));
+
+            });
+        } catch (DataExistsException e) {
+            cusMap.put("customerId", customerIdStr.get());
+            this.customerID = customerIdStr.get();
+            return cusMap;
+        }
+//		 插入客户基本信息
+        this.insertHandle("CRM_CustomerInfo", mapList);
+        CustomerInfoComInfo customerInfo = new CustomerInfoComInfo();
+
+        customerInfo.removeCustomerInfoCache();
+        customerInfo.removeCache();
+        String queryIdSql = "select max(id) from CRM_CustomerInfo where name= ? and manager = ?";
+        String customerId = "";
+        rs.executeQuery(queryIdSql, cusMap.get("name"), managerId);
+        if (rs.next()) {
+            customerId = rs.getString(1);
+            customerInfo.addCustomerInfoCache(customerId);
+            if (!"".equals(customerId)) {
+                CustomerModifyLog customerModifyLog = new CustomerModifyLog();
+                customerModifyLog.modify(customerId, String.valueOf(this.request.getRequestManager().getCreater()), managerId);
+                CrmShareBase crmShareBase = new CrmShareBase();
+                try {
+                    crmShareBase.setDefaultShare("" + customerId);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+        } else {
+            this.writeDebuggerLog("this not this customer in database, customer name is: " + cusMap.get("name"));
+        }
+
+        customerInfo.removeCustomerInfoCache();
+        customerInfo.removeCache();
+        (new CustomerDescComInfo()).removeCache();
+        (new CustomerRatingComInfo()).removeCache();
+        (new CustomerSizeComInfo()).removeCache();
+        (new CustomerStatusComInfo()).removeCache();
+        customerInfo.addCustomerInfoCache(customerId);
+        if (cusMap.containsKey("agent") && !StringUtils.isNullOrEmpty(String.valueOf(cusMap.containsKey("agent")))) {
+            String finalCustomerId = customerId;
+            Map<String, Object> map = new HashMap<String, Object>() {{
+                put("relateditemid", finalCustomerId);
+                put("sharetype", "9");
+                put("sharelevel", "1");
+                put("crmid", "0");
+                put("contents", cusMap.containsKey("agent"));
+                put("deleted", "0");
+            }};
+            this.insertHandle("CRM_ShareInfo", map);
+        }
+        cusMap.put("customerId", customerId);
+        this.customerID = customerId;
+//		@debug
+        return cusMap;
+    }
+
+    public void insertHandle(String tableName, List<Map<String, Object>> mapList) {
+        RecordSet rs = new RecordSet();
+        if (mapList.size() == 1) {
+//			 单条数据插入
+            this.insertHandle(tableName, mapList.get(0));
+        } else {
+            mapList.forEach(item -> this.insertHandle(tableName, item));
+        }
+
+    }
+
+    public void insertHandle(String tableName, Map<String, Object> map) {
+        RecordSet rs = new RecordSet();
+//			 单条数据插入
+        SqlResult sqlResult = BuilderSqlUtil.builderInsertSql(tableName, map);
+        if (!Objects.isNull(sqlResult)) {
+//			 插入数据库数据
+            this.writeDebuggerLog(sqlResult.getSqlStr());
+            this.writeDebuggerLog(Arrays.toString(sqlResult.getArgs()) + "\n");
+            rs.executeUpdate(sqlResult.getSqlStr(), sqlResult.getArgs());
+        }
+    }
+
+    public void updateHandle(String tableName, List<Map<String, Object>> mapList, PrepSQLWhere where) {
+        RecordSet rs = new RecordSet();
+
+        if (mapList.size() == 1) {
+//			 单条数据插入
+            this.updateHandle(tableName, mapList.get(0), where);
+        } else {
+            mapList.forEach(item -> this.updateHandle(tableName, item, where));
+        }
+
+    }
+
+    public void updateHandle(String tableName, Map<String, Object> map, PrepSQLWhere where) {
+        RecordSet rs = new RecordSet();
+//			 单条数据插入
+        SqlResult sqlResult = BuilderSqlUtil.builderUpdateSql(tableName, map, where);
+        //			 插入数据库数据
+//		Console.log(sqlResult.getSqlStr());
+//		Console.log(Arrays.toString(sqlResult.getArgs()) + "\n");
+        this.writeDebuggerLog(sqlResult.getSqlStr());
+        this.writeDebuggerLog(Arrays.toString(sqlResult.getArgs()) + "\n");
+        rs.executeUpdate(sqlResult.getSqlStr(), sqlResult.getArgs());
+    }
+
+
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_pcn/workflow_to_customer/config/CRM_Config.java b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/workflow_to_customer/config/CRM_Config.java
new file mode 100644
index 0000000..ed73fdc
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/workflow_to_customer/config/CRM_Config.java
@@ -0,0 +1,369 @@
+package weaver.aiyh_pcn.workflow_to_customer.config;
+
+import aiyh.utils.zwl.common.ToolUtil;
+import org.h2.util.StringUtils;
+import weaver.aiyh_pcn.workflow_to_customer.model.MainResult;
+import weaver.aiyh_pcn.workflow_to_customer.model.TableFieldRelation;
+import weaver.aiyh_pcn.workflow_to_customer.utils.Utils;
+import weaver.conn.RecordSet;
+import weaver.general.Util;
+
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * 客户信息字段与流程字段映射配置
+ */
+public class CRM_Config extends ToolUtil {
+	private final String className = "CRM_Config";
+	private final String workflowId;
+	private final String mainTable;
+	private final String requestId;
+	private MainResult mainResult = null;
+	private final Map<String, List<Map<String,Object>>> configResult;
+
+
+	public CRM_Config(String workflowId, String mainTable, String requestId) {
+		this.workflowId = workflowId;
+		this.mainTable = mainTable;
+		this.requestId = requestId;
+		this.configResult = new HashMap<>();
+	}
+
+	/**
+	 * 获取客户信息字段映射配置
+	 *
+	 */
+	public Map<String, List<Map<String,Object>>> getConfigInfo() {
+		RecordSet rs = new RecordSet();
+		Map<String, Set<String>> configMap = new HashMap<>();
+		List<TableFieldRelation> configList = new ArrayList<>();
+
+//       查询配置表基本信息
+		String selectConfigBase = "select lf.id, lf.is_out_user,lf.is_sell_change,lf.will_write, " +
+				"wfvw.fieldname as will_write_field,wfvw.tablename as will_write_table, " +
+				"lf.is_customer_address,lf.workflow_type, lf.customer_id, " +
+				"lf.change_setting, wslu.selectvalue as update_mark, " +
+				"lf.manager_type, lf.customer_manager, wfvm.fieldname as manager_field, " +
+				"wsli.selectvalue as insert_mark,wfv.fieldname as update_insert, " +
+				"wfv.tablename as update_insert_table " +
+				"from uf_external_law_fir as lf " +
+				"left join workflow_selectitem as wslu on wslu.id = lf.update_mark " +
+				"left join workflow_selectitem as wsli on wsli.id = lf.insert_mark " +
+				"left join workflow_field_view as wfv on wfv.id = lf.update_insert " +
+				"left join workflow_field_view as wfvm on wfvm.id = lf.manager_field " +
+				"left join workflow_field_view as wfvw on wfvw.id = lf.will_write_field " +
+				"where workflow_type in " +
+				"(select id from workflow_base where activeVersionID in " +
+				"(select activeVersionID  from workflow_base where id = ?) or id = ?)";
+		rs.executeQuery(selectConfigBase, this.workflowId, this.workflowId);
+		while (rs.next()) {
+			int mainId = Util.getIntValue(rs.getInt("id"));
+//			流程类型
+			int workflowType = Util.getIntValue(rs.getString("workflow_type"));
+//			是否创建联系人
+			int isOutUser = Util.getIntValue(rs.getString("is_out_user"));
+//			是否创建销售商机
+			int isSellChange = Util.getIntValue(rs.getString("is_sell_change"));
+//			是否创建客户地址
+			int isCustomerAddress = Util.getIntValue(rs.getString("is_customer_address"));
+//			流转设置
+			int changeSetting = Util.getIntValue(rs.getInt("change_setting"));
+//			更新客户信息对应主键字段
+			String customerId = Util.null2String(rs.getString("customer_id"));
+//			更新和插入标识
+			String updateInsert = Util.null2String(rs.getString("update_insert"));
+//			更新标识值
+			int updateMark = Util.getIntValue(rs.getString("update_mark"),-1);
+//			插入标识值
+			int insertMark = Util.getIntValue(rs.getString("insert_mark"),-1);
+//          客户经理类型
+			int managerType = Util.getIntValue(rs.getString("manager_type"), -1);
+			//客户经理id
+			int customerManager = Util.getIntValue(rs.getString("customer_manager"),0);
+			//客户经理在流程中的字段
+			String managerField = Util.null2String(rs.getString("manager_field"));
+			String updateInsertTable = Util.null2String(rs.getString("update_insert_table"));
+//			是否回写到流程
+			int willWrite = Util.getIntValue(rs.getString("will_write"),0);
+//			会写到流程的某个字段
+			String willWriteField = Util.null2String(rs.getString("will_write_field"));
+			String willWriteTable = Util.null2String(rs.getString("will_write_table"));
+//			对查询数据进行一个实体类封装
+			this.mainResult = MainResult.builder()
+					.mainId(mainId)
+					.workflowType(workflowType)
+					.isOutUser(isOutUser)
+					.isSellChange(isSellChange)
+					.isCustomerAddress(isCustomerAddress)
+					.customerId(customerId)
+					.updateInsert(updateInsert)
+					.updateMark(updateMark)
+					.insertMark(insertMark)
+					.changeSetting(changeSetting)
+					.managerType(managerType)
+					.customerManager(customerManager)
+					.managerField(managerField.toLowerCase())
+					.updateInsertTable(updateInsertTable)
+					.willWrite(willWrite)
+					.willWriteField(willWriteField.toLowerCase())
+					.willWriteTable(willWriteTable)
+					.build();
+		}
+
+		this.writeDebuggerLog(mainResult.toString());
+		this.writeDebuggerLog("\n===============================================\n");
+
+//		如果该条流程没有配置信息，则表示不用执行流转客户操作
+		if (this.mainResult == null) {
+			return null;
+		}
+
+//        查询配置表明细表
+		String selectConfigData = "select lfd.id,lfd.change_rules, cv.fieldname as customer_field," +
+				"lfd.rules_value,wv.fieldname as workflow_field, wv.tablename as workflow_table, " +
+				"cv.tablename as customer_table,lfd.customer_type,lfd.out_user_field " +
+				"from uf_external_law_fir_dt1 as lfd " +
+				"left join workflow_field_view as wv on wv.id = lfd.workflow_field " +
+				"left join customer_view as cv on cv.id = lfd.customer_field " +
+				"where lfd.mainid = ?";
+		rs.executeQuery(selectConfigData, this.mainResult.getMainId());
+
+		while (rs.next()) {
+//			明细表id
+			int id = Util.getIntValue(rs.getInt("id"));
+//			转换规则
+			int changeRules = Util.getIntValue(rs.getString("change_rules"));
+//			客户模块类型
+			int customerType = Util.getIntValue(rs.getString("customer_type"));
+//			转换规则值
+			String rulesValue = Util.null2String(rs.getString("rules_value"));
+//			流程字段
+			String workflowField = Util.null2String(rs.getString("workflow_field"));
+//			客户模块字段
+			String customerField = Util.null2String(rs.getString("customer_field"));
+//			流程字段对应的流程表
+			String workflowTable = Util.null2String(rs.getString("workflow_table"));
+//			客户模块字段对应的客户模块表
+			String customerTable = Util.null2String(rs.getString("customer_table"));
+//			外部用户字段
+			String outUserField = Util.null2String(rs.getString("out_user_field"));
+			TableFieldRelation tableFieldRelation =
+					TableFieldRelation.builder()
+							.id(id)
+							.changeRules(changeRules)
+							.customerType(customerType)
+							.rulesValue(rulesValue)
+							.workflowField(workflowField.toLowerCase())
+							.customerField(customerField.toLowerCase())
+							.outUserField(outUserField.toLowerCase())
+							.workflowTable(workflowTable)
+							.customerTable(customerTable).build();
+			configList.add(tableFieldRelation);
+			if (!configMap.containsKey(customerTable)) {
+				if (customerType == 1) {
+					configMap.put("hrmResource", new HashSet<String>() {{
+						add(workflowTable);
+					}});
+				} else {
+					configMap.put(customerTable, new HashSet<String>() {{
+						add(workflowTable);
+					}});
+				}
+			} else {
+				if (customerType == 1) {
+					configMap.get("hrmResource").add(workflowTable);
+				} else {
+					configMap.get(customerTable).add(workflowTable);
+				}
+			}
+		}
+
+		this.writeDebuggerLog("configList： "+configList.toString());
+		this.writeDebuggerLog("configList： "+configMap.toString());
+//		获取客户基本信息
+		this.configResult.put("CRM_CustomerInfo",this.getCRM_CustomerInfoSqlMapList(configList,configMap));
+		this.writeDebuggerLog("configList： "+this.configResult.toString());
+//		判断是否需要创建外部用户
+		if (this.mainResult.getIsOutUser() == 0) {
+//			需要创建外部用户,获取外部用户字段映射信息
+			this.configResult.put("CRM_CustomerContacter",this.getCRM_CustomerContacterSqlMapList(configList,configMap));
+			this.configResult.put("hrmResource",this.getHrmResourceSqlMapList(configList,configMap));
+		}else if(this.mainResult.getIsOutUser() == 1){
+//	        不需要创建外部用户，但是需要创建联系人,获取联系人字段映射信息
+			this.configResult.put("CRM_CustomerContacter",this.getCRM_CustomerContacterSqlMapList(configList,configMap));
+		}
+
+//		判断是否需要创建商机
+		if(this.mainResult.getIsSellChange() == 0){
+//			需要创建商机，获取上级字段映射信息
+			this.configResult.put("CRM_SellChance",this.getCRM_SellChanceSqlMapList(configList,configMap));
+		}
+
+//	    判断是否需要创建客户地址
+		if(this.mainResult.getIsCustomerAddress() == 0){
+//			需要创建客户地址，获取客户地址字段映射信息
+			this.configResult.put("CRM_CustomerAddress",this.getCRM_CustomerAddressSqlMapList(configList,configMap));
+		}
+
+		return this.configResult;
+	}
+
+	public List<Map<String, Object>> getHrmResourceSqlMapList(List<TableFieldRelation> configList,Map<String, Set<String>> configMap) {
+		List<TableFieldRelation> hrmResourceList = configList
+				.stream().filter(item -> item.getCustomerType() == 1)
+				.collect(Collectors.toList());
+		List<Map<String, Object>> hrmResourceSqlMapList = this.getSqlMapList(hrmResourceList, configMap.get("hrmResource"));
+		return hrmResourceSqlMapList;
+	}
+
+	public List<Map<String,Object>> getCRM_CustomerInfoSqlMapList(List<TableFieldRelation> configList,Map<String, Set<String>> configMap) {
+		List<TableFieldRelation>  CRM_CustomerInfoList = configList
+				.stream().filter(item -> "CRM_CustomerInfo".equalsIgnoreCase(item.getCustomerTable()))
+				.collect(Collectors.toList());
+		List<Map<String,Object>> CRM_CustomerInfoSqlMapList = this.getSqlMapList(CRM_CustomerInfoList, configMap.get("CRM_CustomerInfo"));
+		return CRM_CustomerInfoSqlMapList;
+	}
+
+	public List<Map<String, Object>> getCRM_CustomerContacterSqlMapList(List<TableFieldRelation> configList,Map<String, Set<String>> configMap) {
+		List<TableFieldRelation>  CRM_CustomerContacterList = configList
+				.stream().filter(item -> "CRM_CustomerContacter".equalsIgnoreCase(item.getCustomerTable()))
+				.collect(Collectors.toList());
+		List<Map<String, Object>>  CRM_CustomerContacterSqlMapList = this.getSqlMapList(CRM_CustomerContacterList, configMap.get("CRM_CustomerContacter"));
+		return CRM_CustomerContacterSqlMapList;
+	}
+
+	public List<Map<String, Object>> getCRM_CustomerAddressSqlMapList(List<TableFieldRelation> configList,Map<String, Set<String>> configMap) {
+		List<TableFieldRelation> CRM_CustomerAddressList = configList
+				.stream().filter(item -> "CRM_CustomerAddress".equalsIgnoreCase(item.getCustomerTable()))
+				.collect(Collectors.toList());
+		List<Map<String, Object>> CRM_CustomerAddressSqlMapList = this.getSqlMapList(CRM_CustomerAddressList, configMap.get("CRM_CustomerAddress"));
+		return CRM_CustomerAddressSqlMapList;
+	}
+
+	public List<Map<String, Object>> getCRM_SellChanceSqlMapList(List<TableFieldRelation> configList,Map<String, Set<String>> configMap) {
+		List<TableFieldRelation>  CRM_SellChanceList = configList
+				.stream().filter(item -> "CRM_SellChance".equalsIgnoreCase(item.getCustomerTable()))
+				.collect(Collectors.toList());
+		List<Map<String, Object>> CRM_SellChanceSqlMapList = this.getSqlMapList(CRM_SellChanceList, configMap.get("CRM_SellChance"));
+		return CRM_SellChanceSqlMapList;
+	}
+	
+	public List<Map<String,Object>> getSqlMapList(List<TableFieldRelation> configList, Set<String> set){
+		this.writeDebuggerLog("getSqlMapList: configList： " + configList.toString());
+		this.writeDebuggerLog("getSqlMapList: set： " + set.toString());
+		if(Objects.isNull(configList) || configList.size() == 0 || Objects.isNull(set) || set.size() == 0){
+			this.writeDebuggerLog("table mapping error,error args is configList = [" + configList + "] and set = [" + set + "]");
+			return null;
+		}
+		RecordSet rs = new RecordSet();
+		List<Map<String,Object>> sqlMapList = new ArrayList<>();
+		for (String tableName : set) {
+//			过滤表数据
+			List<TableFieldRelation> tableList = configList
+					.stream().filter(item -> tableName.equals(item.getWorkflowTable()))
+					.collect(Collectors.toList());
+			String selectSql;
+//			判断属于那个表
+			if("main_table".equals(tableName)){
+//				表示数据来源于主表,通过表名查询数据信息
+				selectSql = "select * from " + this.mainTable + " where requestid = ?";
+			}else{
+//				属于明细表
+				selectSql = "select * from " + tableName + " where mainid in " +
+						"(select id from " + this.mainTable + " where requestid = ?)";
+			}
+			if(rs.executeQuery(selectSql, this.requestId)){
+//				获取查询所有数据
+				while(rs.next()){
+					Map<String,Object> sqlMap = new HashMap<>();
+//					循环获取字段和值的映射关系
+					tableList.forEach(tableField -> {
+						String value = "";
+						switch (tableField.getChangeRules()){
+							case 0:
+//								转换规则为不转换
+								value = Util.null2String(rs.getString(tableField.getWorkflowField()));
+								break;
+							case 1:
+//								转换规则为固定值
+								value = tableField.getRulesValue();
+								break;
+							case 2:
+//								转换规则为自定义SQL
+								String customSql = tableField.getRulesValue();
+								if (customSql.contains("delete") || customSql.contains("update") ||
+										customSql.contains("exec") || customSql.contains("drop") ||
+										customSql.contains("truncate")) {
+//					                sql 不包含delete，update，exec，drop，truncate等危险关键字
+									writeDebuggerLog("warning sql: " + customSql);
+								} else if (customSql.contains("select")) {
+//					                包含查询关键词
+									try {
+										rs.executeQuery(customSql);
+									} catch (Exception e) {
+										writeErrorLog("execute custom sql error: " + customSql);
+										writeErrorLog("error info:" + e.getMessage() + "\n");
+									}
+									rs.next();
+									value = Util.null2String(rs.getString(1));
+								}
+								break;
+							case 3:
+//								转换规则为requestId
+								value = this.requestId;
+								break;
+							case 6:
+//								转换规则是系统日期
+								String format = getSystemParamValue("ExternalLawFirmsFormatDate");
+								if(StringUtils.isNullOrEmpty(format)){
+									format = "yyyy-MM-dd";
+								}
+								try{
+									value = Utils.getTime(format);
+								}catch(Exception e){
+									writeErrorLog(className,"format date error, format string is: " + format);
+									writeErrorLog("error info:" + e.getMessage() + "\n");
+								}
+								break;
+							case 7:
+//								转换规则是系统日期时间
+								String formatTime = getSystemParamValue("ExternalLawFirmsFormatDateTime");
+								if(StringUtils.isNullOrEmpty(formatTime)){
+									formatTime = "yyyy-MM-dd HH:mm:ss";
+								}
+								try{
+									value = Utils.getTime(formatTime);
+								}catch(Exception e){
+									writeErrorLog(className,"format dateTime error, format string is: " + formatTime);
+									writeErrorLog("error info:" + e.getMessage() + "\n");
+								}
+								break;
+							default:
+								break;
+						}
+						if(tableField.getCustomerType() == 0){
+							sqlMap.put(tableField.getCustomerField().toLowerCase()
+									, value);
+						}else{
+//							 bug,外部用户的字段不能出现在客户基本信息里面
+							sqlMap.put(tableField.getOutUserField().toLowerCase()
+									, value);
+						}
+					});
+					this.writeDebuggerLog("SqlMap:" + sqlMap);
+					sqlMapList.add(sqlMap);
+				}
+			}else{
+				writeDebuggerLog("select workflow date error, error sql is: "
+						+ selectSql + " args is: " + this.workflowId);
+			}
+		}
+		return sqlMapList;
+	}
+
+
+	public MainResult getMainResult() {
+		return mainResult;
+	}
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_pcn/workflow_to_customer/exception/DataExistsException.java b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/workflow_to_customer/exception/DataExistsException.java
new file mode 100644
index 0000000..5b29576
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/workflow_to_customer/exception/DataExistsException.java
@@ -0,0 +1,14 @@
+package weaver.aiyh_pcn.workflow_to_customer.exception;
+
+/**
+ * @author EBU7-dev1-ayh
+ * @create 2021/8/21 0021 14:05
+ * reutrn method exception
+ */
+
+
+public class DataExistsException extends RuntimeException {
+	public DataExistsException(String msg) {
+		super(msg);
+	}
+}
\ No newline at end of file
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_pcn/workflow_to_customer/exception/LoginIdRepeatException.java b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/workflow_to_customer/exception/LoginIdRepeatException.java
new file mode 100644
index 0000000..aef704b
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/workflow_to_customer/exception/LoginIdRepeatException.java
@@ -0,0 +1,14 @@
+package weaver.aiyh_pcn.workflow_to_customer.exception;
+
+/**
+ * @author EBU7-dev1-ayh
+ * @create 2021/8/20 0020 18:48
+ * exception
+ */
+
+
+public class LoginIdRepeatException extends RuntimeException {
+	public LoginIdRepeatException(String msg){
+		super(msg);
+	}
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_pcn/workflow_to_customer/model/MainResult.java b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/workflow_to_customer/model/MainResult.java
new file mode 100644
index 0000000..e3dba27
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/workflow_to_customer/model/MainResult.java
@@ -0,0 +1,256 @@
+package weaver.aiyh_pcn.workflow_to_customer.model;
+
+/**
+ * @author EBU7-dev1-ayh
+ * @create 2021/8/11 0011 14:25
+ * 配置主表信息
+ */
+
+
+public class MainResult {
+	private int mainId;
+	private int workflowType;
+	private int isOutUser;
+	private int isSellChange;
+	private int isCustomerAddress;
+	private String customerId;
+	private String updateInsert;
+	private int updateMark;
+	private int insertMark;
+	private int changeSetting;
+	private int managerType;
+	private int customerManager;
+	private String managerField;
+	private String updateInsertTable;
+	private int willWrite;
+	private String willWriteField;
+	private String willWriteTable;
+
+	public int getWillWrite() {
+		return willWrite;
+	}
+
+	public String getWillWriteField() {
+		return willWriteField;
+	}
+
+	public String getWillWriteTable() {
+		return willWriteTable;
+	}
+
+	@Override
+	public String toString() {
+		return "MainResult{" +
+				"mainId=" + mainId +
+				", workflowType=" + workflowType +
+				", isOutUser=" + isOutUser +
+				", isSellChange=" + isSellChange +
+				", isCustomerAddress=" + isCustomerAddress +
+				", customerId='" + customerId + '\'' +
+				", updateInsert='" + updateInsert + '\'' +
+				", updateMark=" + updateMark +
+				", insertMark=" + insertMark +
+				", changeSetting=" + changeSetting +
+				", managerType=" + managerType +
+				", customerManager=" + customerManager +
+				", managerField='" + managerField + '\'' +
+				", updateInsertTable='" + updateInsertTable + '\'' +
+				", willWriteTable='" + willWriteTable + '\'' +
+				", willWrite=" + willWrite +
+				", willWriteField='" + willWriteField + '\'' +
+				'}';
+	}
+
+	public String getUpdateInsertTable() {
+		return updateInsertTable;
+	}
+
+	public MainResult() {
+	}
+
+
+	public MainResult(Builder builder) {
+		this.mainId = builder.mainId;
+		this.workflowType = builder.workflowType;
+		this.isOutUser = builder.isOutUser;
+		this.isSellChange = builder.isSellChange;
+		this.isCustomerAddress = builder.isCustomerAddress;
+		this.customerId = builder.customerId;
+		this.updateInsert = builder.updateInsert;
+		this.updateMark = builder.updateMark;
+		this.insertMark = builder.insertMark;
+		this.changeSetting = builder.changeSetting;
+		this.managerType = builder.managerType;
+		this.customerManager = builder.customerManager;
+		this.managerField = builder.managerField;
+		this.updateInsertTable = builder.updateInsertTable;
+		this.willWrite = builder.willWrite;
+		this.willWriteField = builder.willWriteField;
+		this.willWriteTable = builder.willWriteTable;
+	}
+
+	public static Builder builder(){
+		return new Builder();
+	}
+
+	public static class Builder{
+		private int mainId;
+		private int workflowType;
+		private int isOutUser;
+		private int isSellChange;
+		private int isCustomerAddress;
+		private String customerId;
+		private String updateInsert;
+		private int updateMark;
+		private int insertMark;
+		private int changeSetting;
+		private int managerType;
+		private int customerManager;
+		private String managerField;
+		private String updateInsertTable;
+		private int willWrite;
+		private String willWriteField;
+		private String willWriteTable;
+
+		public Builder willWrite(int willWrite) {
+			this.willWrite = willWrite;
+			return this;
+		}
+
+		public Builder willWriteTable(String willWriteTable) {
+			this.willWriteTable = willWriteTable;
+			return this;
+		}
+
+		public Builder willWriteField(String willWriteField) {
+			this.willWriteField = willWriteField;
+			return this;
+		}
+
+		public Builder managerType(int managerType) {
+			this.managerType = managerType;
+			return this;
+		}
+
+		public Builder customerManager(int customerManager) {
+			this.customerManager = customerManager;
+			return this;
+		}
+
+		public Builder managerField(String managerField) {
+			this.managerField = managerField;
+			return this;
+		}
+
+		public Builder updateInsertTable(String updateInsertTable) {
+			this.updateInsertTable = updateInsertTable;
+			return this;
+		}
+
+		public Builder mainId(int mainId) {
+			this.mainId = mainId;
+			return this;
+		}
+
+		public Builder workflowType(int workflowType) {
+			this.workflowType = workflowType;
+			return this;
+		}
+
+		public Builder isOutUser(int isOutUser) {
+			this.isOutUser = isOutUser;
+			return this;
+		}
+
+		public Builder isSellChange(int isSellChange) {
+			this.isSellChange = isSellChange;
+			return this;
+		}
+
+		public Builder isCustomerAddress(int isCustomerAddress) {
+			this.isCustomerAddress = isCustomerAddress;
+			return this;
+		}
+
+		public Builder customerId(String customerId) {
+			this.customerId = customerId;
+			return this;
+		}
+
+		public Builder updateInsert(String updateInsert) {
+			this.updateInsert = updateInsert;
+			return this;
+		}
+
+		public Builder updateMark(int updateMark) {
+			this.updateMark = updateMark;
+			return this;
+		}
+
+		public Builder insertMark(int insertMark) {
+			this.insertMark = insertMark;
+			return this;
+		}
+		public Builder changeSetting(int changeSetting) {
+			this.changeSetting = changeSetting;
+			return this;
+		}
+
+		public MainResult build(){
+			return new MainResult(this);
+		}
+	}
+
+	public int getMainId() {
+		return mainId;
+	}
+
+	public int getWorkflowType() {
+		return workflowType;
+	}
+
+	public int getIsOutUser() {
+		return isOutUser;
+	}
+
+	public int getIsSellChange() {
+		return isSellChange;
+	}
+
+	public int getIsCustomerAddress() {
+		return isCustomerAddress;
+	}
+
+	public String getCustomerId() {
+		return customerId;
+	}
+
+	public String getUpdateInsert() {
+		return updateInsert;
+	}
+
+	public int getUpdateMark() {
+		return updateMark;
+	}
+
+	public int getInsertMark() {
+		return insertMark;
+	}
+
+	public int getChangeSetting() {
+		return changeSetting;
+	}
+
+	public int getManagerType() {
+		return managerType;
+	}
+
+	public int getCustomerManager() {
+		return customerManager;
+	}
+
+	public String getManagerField() {
+		return managerField;
+	}
+
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_pcn/workflow_to_customer/model/TableFieldRelation.java b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/workflow_to_customer/model/TableFieldRelation.java
new file mode 100644
index 0000000..87cd9cf
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/workflow_to_customer/model/TableFieldRelation.java
@@ -0,0 +1,162 @@
+package weaver.aiyh_pcn.workflow_to_customer.model;
+
+/**
+ * @author EBU7-dev1-ayh
+ * @create 2021/8/11 0011 10:29
+ * 表字段映射
+ */
+
+
+public class TableFieldRelation {
+	private int id;
+	private int changeRules;
+	private String customerField;
+	private String rulesValue;
+	private String workflowField;
+	private String workflowTable;
+	private String customerTable;
+	private String outUserField;
+	private int customerType;
+
+	public TableFieldRelation(int id, int changeRules, String customerField, String rulesValue, String workflowField, String workflowTable, String customerTable, String outUserField) {
+		this.id = id;
+		this.changeRules = changeRules;
+		this.customerField = customerField;
+		this.rulesValue = rulesValue;
+		this.workflowField = workflowField;
+		this.workflowTable = workflowTable;
+		this.customerTable = customerTable;
+		this.outUserField = outUserField;
+	}
+
+	public TableFieldRelation(Builder builder) {
+		this.id = builder.id;
+		this.changeRules = builder.changeRules;
+		this.customerField = builder.customerField;
+		this.rulesValue = builder.rulesValue;
+		this.workflowField = builder.workflowField;
+		this.workflowTable = builder.workflowTable;
+		this.customerTable = builder.customerTable;
+		this.outUserField = builder.outUserField;
+		this.customerType = builder.customerType;
+	}
+
+
+	public static Builder builder(){
+		return new Builder();
+	}
+
+	public static class Builder{
+		private int id;
+		private int changeRules;
+		private String customerField;
+		private String rulesValue;
+		private String workflowField;
+		private String workflowTable;
+		private String customerTable;
+		private String outUserField;
+		private int customerType;
+
+		public Builder() {
+		}
+
+		public Builder id(int id) {
+			this.id = id;
+			return this;
+		}
+		public Builder customerType(int customerType) {
+			this.customerType = customerType;
+			return this;
+		}
+
+		public Builder changeRules(int changeRules) {
+			this.changeRules = changeRules;
+			return this;
+		}
+
+		public Builder customerField(String customerField) {
+			this.customerField = customerField;
+			return this;
+		}
+
+		public Builder rulesValue(String rulesValue) {
+			this.rulesValue = rulesValue;
+			return this;
+		}
+
+		public Builder workflowField(String workflowField) {
+			this.workflowField = workflowField;
+			return this;
+		}
+
+		public Builder workflowTable(String workflowTable) {
+			this.workflowTable = workflowTable;
+			return this;
+		}
+
+		public Builder customerTable(String customerTable) {
+			this.customerTable = customerTable;
+			return this;
+		}
+
+		public Builder outUserField(String outUserField) {
+			this.outUserField = outUserField;
+			return this;
+		}
+
+		public TableFieldRelation build() {
+			return new TableFieldRelation(this);
+		}
+	}
+
+	public int getCustomerType() {
+		return customerType;
+	}
+
+	public int getId() {
+		return id;
+	}
+
+	public int getChangeRules() {
+		return changeRules;
+	}
+
+	public String getCustomerField() {
+		return customerField;
+	}
+
+	public String getRulesValue() {
+		return rulesValue;
+	}
+
+	public String getWorkflowField() {
+		return workflowField;
+	}
+
+	public String getWorkflowTable() {
+		return workflowTable;
+	}
+
+	public String getCustomerTable() {
+		return customerTable;
+	}
+
+	public String getOutUserField() {
+		return outUserField;
+	}
+
+	@Override
+	public String toString() {
+		return "TableFieldRelation{" +
+				"id=" + id +
+				", changeRules=" + changeRules +
+				", customerField='" + customerField + '\'' +
+				", rulesValue='" + rulesValue + '\'' +
+				", workflowField='" + workflowField + '\'' +
+				", workflowTable='" + workflowTable + '\'' +
+				", customerTable='" + customerTable + '\'' +
+				", outUserField='" + outUserField + '\'' +
+				", customerType=" + customerType +
+				'}';
+	}
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_pcn/workflow_to_customer/utils/BuilderSqlUtil.java b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/workflow_to_customer/utils/BuilderSqlUtil.java
new file mode 100644
index 0000000..0cf64ec
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/workflow_to_customer/utils/BuilderSqlUtil.java
@@ -0,0 +1,204 @@
+package weaver.aiyh_pcn.workflow_to_customer.utils;
+
+import com.weaver.general.Util;
+import org.h2.util.StringUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.concurrent.atomic.AtomicInteger;
+
+/**
+ * @author EBU7-dev1-ayh
+ * @create 2021/8/12 0012 13:20
+ * 构建SQL工具类
+ */
+
+
+public class BuilderSqlUtil {
+	public static String builderInsertFullSql(String tableName, Map<String, Object> fieldsValuesMap){
+		if(Objects.isNull(fieldsValuesMap) || StringUtils.isNullOrEmpty(tableName)){
+			return null;
+		}
+		fieldsValuesMap = Utils.createMap().uPutAll(fieldsValuesMap)
+				.filter((key, value) -> !Objects.isNull(value));
+		if(fieldsValuesMap.size() == 0){
+			return null;
+		}
+		StringBuilder sqlBuilder = new StringBuilder("insert into ");
+		StringBuilder sqlFieldBuilder = new StringBuilder();
+		StringBuilder sqlValueBuilder = new StringBuilder();
+		sqlBuilder.append(tableName);
+		sqlBuilder.append(" ( ");
+		fieldsValuesMap.forEach((field,value) -> {
+			sqlFieldBuilder.append(field);
+			sqlFieldBuilder.append(", ");
+			sqlValueBuilder.append("'");
+			sqlValueBuilder.append(value);
+			sqlFieldBuilder.append("'");
+			sqlValueBuilder.append(", ");
+		});
+		sqlBuilder.append(Utils.removeSeparator(sqlFieldBuilder));
+		sqlBuilder.append(" ) values ( ");
+		sqlBuilder.append(Utils.removeSeparator(sqlValueBuilder));
+		sqlBuilder.append(" )");
+		return sqlBuilder.toString();
+	}
+
+	public static SqlResult builderInsertSql(String tableName, Map<String, Object> fieldsValuesMap){
+		if(Objects.isNull(fieldsValuesMap) || StringUtils.isNullOrEmpty(tableName)){
+			return null;
+		}
+		StringBuilder sqlBuilder = new StringBuilder("insert into ");
+		StringBuilder sqlFieldBuilder = new StringBuilder();
+		StringBuilder sqlValueBuilder = new StringBuilder();
+		sqlBuilder.append(tableName);
+		sqlBuilder.append(" ( ");
+		Object[] args = new Object[fieldsValuesMap.size()];
+		AtomicInteger i = new AtomicInteger();
+		fieldsValuesMap.forEach((field,value)->{
+			sqlFieldBuilder.append(field);
+			sqlFieldBuilder.append(", ");
+			sqlValueBuilder.append("?, ");
+			args[i.getAndIncrement()] = Util.null2String(String.valueOf(value));
+		});
+		sqlBuilder.append(Utils.removeSeparator(sqlFieldBuilder));
+		sqlBuilder.append(" ) values ( ");
+		sqlBuilder.append(Utils.removeSeparator(sqlValueBuilder));
+		sqlBuilder.append(" )");
+		return new SqlResult(sqlBuilder.toString(),args);
+	}
+
+	public static SqlResult builderBatchInsertSql(String tableName, List<Map<String, Object>> fieldsValuesMapList){
+		if(Objects.isNull(fieldsValuesMapList) || StringUtils.isNullOrEmpty(tableName)){
+			return null;
+		}
+		StringBuilder sqlBuilder = new StringBuilder("insert into ");
+		StringBuilder sqlFieldBuilder = new StringBuilder();
+		StringBuilder sqlValueBuilder = new StringBuilder();
+		List<List> args = new ArrayList<>();
+		sqlBuilder.append(tableName);
+		sqlBuilder.append(" ( ");
+		AtomicInteger i = new AtomicInteger();
+		if(fieldsValuesMapList.size() >= 1){
+			fieldsValuesMapList.forEach(item->{
+				if(i.get() == 0){
+					item.forEach((field,value)->{
+						sqlFieldBuilder.append(field);
+						sqlFieldBuilder.append(", ");
+						sqlValueBuilder.append("?, ");
+					});
+					i.getAndIncrement();
+				}
+				ArrayList<Object> list = new ArrayList<>();
+				item.forEach((field,value)-> list.add(value));
+				args.add(list);
+			});
+		}
+		sqlBuilder.append(Utils.removeSeparator(sqlFieldBuilder));
+		sqlBuilder.append(" ) values ( ");
+		sqlBuilder.append(Utils.removeSeparator(sqlValueBuilder));
+		sqlBuilder.append(" )");
+		return new SqlResult(sqlBuilder.toString(),args);
+	}
+
+	public static String builderUpdateFullSql(String tableName, Map<String, Object> fieldsValuesMap, String conditions){
+		if(Objects.isNull(fieldsValuesMap) || StringUtils.isNullOrEmpty(tableName)){
+			return null;
+		}
+		fieldsValuesMap = Utils.createMap().uPutAll(fieldsValuesMap)
+				.filter((key, value) -> !Objects.isNull(value));
+		if(fieldsValuesMap.size() == 0){
+			return null;
+		}
+		StringBuilder sqlBuilder = new StringBuilder("update ");
+		StringBuilder sqlFieldBuilder = new StringBuilder();
+		sqlBuilder.append(tableName);
+		sqlBuilder.append(" set ");
+		fieldsValuesMap.forEach((field, value)->{
+			sqlFieldBuilder.append(field);
+			sqlFieldBuilder.append(" = ");
+			sqlFieldBuilder.append("'");
+			sqlFieldBuilder.append(value);
+			sqlFieldBuilder.append("'");
+			sqlFieldBuilder.append(", ");
+		});
+		sqlBuilder.append(Utils.removeSeparator(sqlFieldBuilder));
+		sqlBuilder.append(" where ");
+		sqlBuilder.append(conditions);
+		return sqlBuilder.toString();
+	}
+
+	public static String builderUpdateFullSql(String tableName, Map<String, Object> fieldsValuesMap, SQLWhere sqlWhere){
+		if(Objects.isNull(fieldsValuesMap) || StringUtils.isNullOrEmpty(tableName)){
+			return null;
+		}
+		fieldsValuesMap = Utils.createMap().uPutAll(fieldsValuesMap)
+				.filter((key, value) -> !Objects.isNull(value));
+		if(fieldsValuesMap.size() == 0){
+			return null;
+		}
+		StringBuilder sqlBuilder = new StringBuilder("update ");
+		StringBuilder sqlFieldBuilder = new StringBuilder();
+		sqlBuilder.append(tableName);
+		sqlBuilder.append(" set ");
+		fieldsValuesMap.forEach((field,value) -> {
+			sqlFieldBuilder.append(field);
+			sqlFieldBuilder.append(" = ");
+			sqlFieldBuilder.append("'");
+			sqlFieldBuilder.append(value);
+			sqlFieldBuilder.append("'");
+			sqlFieldBuilder.append(", ");
+		});
+		sqlBuilder.append(Utils.removeSeparator(sqlFieldBuilder));
+		sqlBuilder.append(" where ");
+		sqlBuilder.append(sqlWhere.getSqlWhere());
+		return sqlBuilder.toString();
+	}
+	public static SqlResult builderUpdateSql(String tableName, Map<String, Object> fieldsValuesMap, PrepSQLWhere prepSQLWhere){
+		StringBuilder sqlBuilder = new StringBuilder("update ");
+		StringBuilder sqlFieldBuilder = new StringBuilder();
+		List<Object> args = new ArrayList<>();
+		sqlBuilder.append(tableName);
+		sqlBuilder.append(" set ");
+		fieldsValuesMap.forEach((field, value)->{
+			sqlFieldBuilder.append(field);
+			sqlFieldBuilder.append(" = ? ");
+			sqlFieldBuilder.append(", ");
+			args.add(value);
+		});
+		args.addAll(prepSQLWhere.getArgs());
+		sqlBuilder.append(Utils.removeSeparator(sqlFieldBuilder));
+		sqlBuilder.append(" where ");
+		sqlBuilder.append(prepSQLWhere.getPstSqlWhere());
+		return new SqlResult(sqlBuilder.toString(),args.toArray(new Object[args.size()]));
+	}
+
+	public static SqlResult builderBatchUpdateSql(String tableName, List<Map<String, Object>> fieldsValuesMapList, PrepSQLWhere prepSQLWhere){
+		StringBuilder sqlBuilder = new StringBuilder("update ");
+		StringBuilder sqlFieldBuilder = new StringBuilder();
+		sqlBuilder.append(tableName);
+		sqlBuilder.append(" set ");
+		List<List> args = new ArrayList<>();
+		fieldsValuesMapList.forEach(item->{
+			item.forEach((field, value)->{
+				sqlFieldBuilder.append(field);
+				sqlFieldBuilder.append(" = ? ");
+				sqlFieldBuilder.append(", ");
+			});
+			ArrayList<Object> list = new ArrayList<>();
+			item.forEach((field,value)-> list.add(value));
+			list.addAll(prepSQLWhere.getArgs());
+			args.add(list);
+		});
+		sqlBuilder.append(Utils.removeSeparator(sqlFieldBuilder));
+		sqlBuilder.append(" where ");
+		sqlBuilder.append(prepSQLWhere.getPstSqlWhere());
+
+		return new SqlResult(sqlBuilder.toString(),args);
+	}
+
+
+
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_pcn/workflow_to_customer/utils/ParaMap.java b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/workflow_to_customer/utils/ParaMap.java
new file mode 100644
index 0000000..4a72b4d
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/workflow_to_customer/utils/ParaMap.java
@@ -0,0 +1,27 @@
+package weaver.aiyh_pcn.workflow_to_customer.utils;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @author EBU7-dev1-ayh
+ * @create 2021/8/19 0019 19:40
+ * map
+ */
+
+
+public class ParaMap extends HashMap<String, Object> implements Map<String, Object> {
+
+	private ParaMap() {
+	}
+
+	public static ParaMap create() {
+		return new ParaMap();
+	}
+
+	@Override
+    public ParaMap put(String name, Object value) {
+		super.put(name, value);
+		return this;
+	}
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_pcn/workflow_to_customer/utils/PrepSQLWhere.java b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/workflow_to_customer/utils/PrepSQLWhere.java
new file mode 100644
index 0000000..4c8b1c5
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/workflow_to_customer/utils/PrepSQLWhere.java
@@ -0,0 +1,170 @@
+package weaver.aiyh_pcn.workflow_to_customer.utils;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author EBU7-dev1-ayh
+ * @create 2021/8/13 0013 17:06
+ * SQLwhere 构建SQL的条件，并且以prepareStatement参数的形式返回
+ */
+
+
+public class PrepSQLWhere {
+	private final StringBuilder pstSqlWhere;
+	private final List<Object> args;
+
+	public PrepSQLWhere(PrepWhere where) {
+		this.pstSqlWhere = where.pstSqlWhere;
+		this.args = where.args;
+	}
+
+	public StringBuilder getPstSqlWhere() {
+		return pstSqlWhere;
+	}
+
+	public List<Object> getArgs() {
+		return args;
+	}
+
+	public static PrepWhere creatPrepWhere() {
+		return new PrepWhere();
+	}
+
+	public static class PrepWhere {
+		private final StringBuilder pstSqlWhere;
+		private final PrepWhereOperator whereOperator;
+		private final List<Object> args;
+
+		public PrepWhere() {
+			this.pstSqlWhere = new StringBuilder(" 1 = 1 ");
+			this.whereOperator = new PrepWhereOperator(this);
+			args = new ArrayList<>();
+		}
+
+		public PrepWhereOperator and(String key) {
+			this.pstSqlWhere.append(" and ");
+			this.pstSqlWhere.append(key);
+			return whereOperator;
+		}
+
+		public PrepWhereOperator or(String key) {
+			this.pstSqlWhere.append(" or ");
+			this.pstSqlWhere.append(key);
+			return whereOperator;
+		}
+
+
+		public PrepSQLWhere create() {
+			return new PrepSQLWhere(this);
+		}
+	}
+
+	public static class PrepWhereOperator {
+		private final PrepWhere where;
+
+		public PrepWhereOperator(PrepWhere where) {
+			this.where = where;
+		}
+
+		public PrepWhere isNull(String key) {
+			where.pstSqlWhere.append(" is null ");
+			return where;
+		}
+
+		public PrepWhere isNotNUll(String key) {
+			where.pstSqlWhere.append(" is not null ");
+			where.pstSqlWhere.append(key);
+			return where;
+		}
+
+		public PrepWhere equal(Object value) {
+			where.pstSqlWhere.append(" = ? ");
+			where.args.add(value);
+			return where;
+		}
+
+		public PrepWhere noEqual(Object value) {
+			where.pstSqlWhere.append(" <> ? ");
+			where.args.add(value);
+			return where;
+		}
+
+		public PrepWhere equalSql(Object value) {
+			where.pstSqlWhere.append(" in ( ");
+			where.pstSqlWhere.append(value);
+			where.pstSqlWhere.append(" ) ");
+			return where;
+		}
+
+		public PrepWhere noEqualSql(Object value) {
+			where.pstSqlWhere.append(" not in ( ");
+			where.pstSqlWhere.append(value);
+			where.pstSqlWhere.append(" ) ");
+			return where;
+		}
+
+		public PrepWhere in(List<Object> list) {
+			where.pstSqlWhere.append(" in ( ");
+			list.forEach(item -> where.pstSqlWhere.append(" ? "));
+			where.pstSqlWhere.append(" ) ");
+			where.args.addAll(list);
+			return where;
+		}
+
+		public PrepWhere in(Object ...list) {
+			where.pstSqlWhere.append(" in ( ");
+			for(Object obj : list){
+				where.pstSqlWhere.append(" ? ");
+				where.args.add(obj);
+			}
+			where.pstSqlWhere.append(" ) ");
+			return where;
+		}
+
+		public PrepWhere notIn(List<Object> list) {
+			where.pstSqlWhere.append(" not in ( ");
+			list.forEach(item -> where.pstSqlWhere.append(" ? "));
+			where.pstSqlWhere.append(" ) ");
+			where.args.addAll(list);
+			return where;
+		}
+
+		public PrepWhere notIn(Object ...list) {
+			where.pstSqlWhere.append(" not in ( ");
+			for(Object obj : list){
+				where.pstSqlWhere.append(" ? ");
+				where.args.add(obj);
+			}
+			where.pstSqlWhere.append(" ) ");;
+			return where;
+		}
+
+		public PrepWhere like(Object value) {
+			where.pstSqlWhere.append(" like ? ");
+			where.args.add(value);
+			return where;
+		}
+
+		public PrepWhere greaterOrEqual(Object value) {
+			where.pstSqlWhere.append(" >= ? ");
+			where.args.add(value);
+			return where;
+		}
+
+		public PrepWhere lessOrEqual(Object value) {
+			where.pstSqlWhere.append(" <= ? ");
+			where.args.add(value);
+			return where;
+		}
+
+		public PrepWhere BetweenAnd(Object value1, Object value2) {
+			where.pstSqlWhere.append(" between ? ");
+			where.args.add(value1);
+			where.pstSqlWhere.append(" and ? ");
+			where.args.add(value2);
+			return where;
+		}
+	}
+
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_pcn/workflow_to_customer/utils/SQLWhere.java b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/workflow_to_customer/utils/SQLWhere.java
new file mode 100644
index 0000000..147f4f3
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/workflow_to_customer/utils/SQLWhere.java
@@ -0,0 +1,198 @@
+package weaver.aiyh_pcn.workflow_to_customer.utils;
+
+import java.util.List;
+
+
+/**
+ * @author EBU7-dev1-ayh
+ * @create 2021/8/13 0013 15:58
+ * sqlWhere 构建SQL的条件
+ */
+
+
+public class SQLWhere {
+	private final StringBuilder sqlWhere;
+
+
+	public SQLWhere(Where where) {
+		this.sqlWhere = where.sqlWhere;
+	}
+
+	public StringBuilder getSqlWhere() {
+		return sqlWhere;
+	}
+
+
+	public static Where creatWhere() {
+		return new Where();
+	}
+
+
+	public static class Where {
+		private final StringBuilder sqlWhere;
+		private final WhereOperator whereOperator;
+
+		public Where() {
+			this.sqlWhere = new StringBuilder(" 1 = 1 ");
+			this.whereOperator = new WhereOperator(this);
+		}
+
+		public WhereOperator and(String key) {
+			this.sqlWhere.append(" and ");
+			this.sqlWhere.append(key);
+			return whereOperator;
+		}
+
+		public WhereOperator or(String key) {
+			this.sqlWhere.append(" or ");
+			this.sqlWhere.append(key);
+			return whereOperator;
+		}
+
+		public SQLWhere create() {
+			return new SQLWhere(this);
+		}
+	}
+
+
+	public static class WhereOperator {
+		private final Where where;
+
+		public WhereOperator(Where where) {
+			this.where = where;
+		}
+
+		public Where isNull(String key) {
+			where.sqlWhere.append(" is null ");
+			return where;
+		}
+
+		public Where isNotNUll(String key) {
+			where.sqlWhere.append(" is not null ");
+			where.sqlWhere.append(key);
+			return where;
+		}
+
+		public Where equal(Object value) {
+			where.sqlWhere.append(" = ");
+			where.sqlWhere.append("'");
+			where.sqlWhere.append(value);
+			where.sqlWhere.append("'");
+			return where;
+		}
+
+		public Where noEqual(Object value) {
+			where.sqlWhere.append(" <> ");
+			where.sqlWhere.append("'");
+			where.sqlWhere.append(value);
+			where.sqlWhere.append("'");
+			return where;
+		}
+
+		public Where in(List<Object> list) {
+			where.sqlWhere.append(" in ( ");
+			for (int i = 0; i < list.size(); i++) {
+				where.sqlWhere.append("'");
+				where.sqlWhere.append(list.get(i));
+				where.sqlWhere.append("'");
+				if (i != list.size() - 1) {
+					where.sqlWhere.append(" , ");
+				}
+			}
+			where.sqlWhere.append(" ) ");
+			return where;
+		}
+
+		public Where in(Object ...list) {
+			where.sqlWhere.append(" in ( ");
+			for (int i = 0; i < list.length; i++) {
+				where.sqlWhere.append("'");
+				where.sqlWhere.append(list[i]);
+				where.sqlWhere.append("'");
+				if (i != list.length - 1) {
+					where.sqlWhere.append(" , ");
+				}
+			}
+			where.sqlWhere.append(" ) ");
+			return where;
+		}
+
+		public Where noIn(List<Object> list) {
+			where.sqlWhere.append(" not in ( ");
+			for (int i = 0; i < list.size(); i++) {
+				where.sqlWhere.append("'");
+				where.sqlWhere.append(list.get(i));
+				where.sqlWhere.append("'");
+				if (i != list.size() - 1) {
+					where.sqlWhere.append(" , ");
+				}
+			}
+			where.sqlWhere.append(" ) ");
+			return where;
+		}
+		public Where noIn(Object ...list) {
+			where.sqlWhere.append(" not in ( ");
+			for (int i = 0; i < list.length; i++) {
+				where.sqlWhere.append("'");
+				where.sqlWhere.append(list[i]);
+				where.sqlWhere.append("'");
+				if (i != list.length - 1) {
+					where.sqlWhere.append(" , ");
+				}
+			}
+			where.sqlWhere.append(" ) ");
+			return where;
+		}
+
+		public Where equalSql(Object value) {
+			where.sqlWhere.append(" in ( ");
+			where.sqlWhere.append(value);
+			where.sqlWhere.append(" ) ");
+			return where;
+		}
+
+		public Where noEqualSql(Object value) {
+			where.sqlWhere.append(" not in ( ");
+			where.sqlWhere.append(value);
+			where.sqlWhere.append(" ) ");
+			return where;
+		}
+
+		public Where like(Object value) {
+			where.sqlWhere.append(" like ");
+			where.sqlWhere.append("'");
+			where.sqlWhere.append(value);
+			where.sqlWhere.append("'");
+			return where;
+		}
+
+		public Where greaterOrEqual(Object value) {
+			where.sqlWhere.append(" >= ");
+			where.sqlWhere.append("'");
+			where.sqlWhere.append(value);
+			where.sqlWhere.append("'");
+			return where;
+		}
+
+		public Where lessOrEqual(Object value) {
+			where.sqlWhere.append(" <= ");
+			where.sqlWhere.append("'");
+			where.sqlWhere.append(value);
+			where.sqlWhere.append("'");
+			return where;
+		}
+
+		public Where BetweenAnd(Object value1, Object value2) {
+			where.sqlWhere.append(" between ");
+			where.sqlWhere.append("'");
+			where.sqlWhere.append(value1);
+			where.sqlWhere.append("'");
+			where.sqlWhere.append(" and ");
+			where.sqlWhere.append("'");
+			where.sqlWhere.append(value2);
+			where.sqlWhere.append("'");
+			return where;
+		}
+
+	}
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_pcn/workflow_to_customer/utils/SqlResult.java b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/workflow_to_customer/utils/SqlResult.java
new file mode 100644
index 0000000..18817aa
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/workflow_to_customer/utils/SqlResult.java
@@ -0,0 +1,50 @@
+package weaver.aiyh_pcn.workflow_to_customer.utils;
+
+import java.util.List;
+
+/**
+ * @author EBU7-dev1-ayh
+ * @create 2021/8/12 0012 16:57
+ * sql参数和语句
+ */
+
+
+public class SqlResult {
+	private String sqlStr;
+	private Object[] args;
+	private List<List> batchList;
+
+	public SqlResult(String sqlStr, Object[] args) {
+		this.sqlStr = sqlStr;
+		this.args = args;
+	}
+
+	public SqlResult(String sqlStr, List<List> batchList) {
+		this.sqlStr = sqlStr;
+		this.batchList = batchList;
+	}
+
+	public String getSqlStr() {
+		return sqlStr;
+	}
+
+	public void setSqlStr(String sqlStr) {
+		this.sqlStr = sqlStr;
+	}
+
+	public Object[] getArgs() {
+		return args;
+	}
+
+	public void setArgs(Object[] args) {
+		this.args = args;
+	}
+
+	public List<List> getBatchList() {
+		return batchList;
+	}
+
+	public void setBatchList(List<List> batchList) {
+		this.batchList = batchList;
+	}
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_pcn/workflow_to_customer/utils/UtilMap.java b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/workflow_to_customer/utils/UtilMap.java
new file mode 100644
index 0000000..bb93468
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/workflow_to_customer/utils/UtilMap.java
@@ -0,0 +1,42 @@
+package weaver.aiyh_pcn.workflow_to_customer.utils;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @author EBU7-dev1-ayh
+ * @create 2021/8/19 0019 19:45
+ * utilMap
+ */
+
+
+public class UtilMap<K, V> extends HashMap<K, V> implements Map<K, V> {
+	public UtilMap(){
+		super();
+	}
+	public UtilMap<K,V> uPut(K key, V value) {
+		this.put(key,value);
+		return this;
+	}
+
+
+	public UtilMap<K,V> uPutAll(Map<? extends K, ? extends V> m) {
+		super.putAll(m);
+		return this;
+	}
+
+	public UtilMap<K,V> uReplace(K key, V value) {
+		super.replace(key, value);
+		return this;
+	}
+
+	public UtilMap<K,V> filter(UtilMapFilter<? super K, ? super V> predicate){
+		UtilMap<K,V> newMap = new UtilMap<>();
+		for (Map.Entry<K,V> entry : this.entrySet()){
+			if(predicate.test(entry.getKey(), entry.getValue())){
+				newMap.put(entry.getKey(),entry.getValue());
+			}
+		}
+		return newMap;
+	}
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_pcn/workflow_to_customer/utils/UtilMapFilter.java b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/workflow_to_customer/utils/UtilMapFilter.java
new file mode 100644
index 0000000..20fc985
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/workflow_to_customer/utils/UtilMapFilter.java
@@ -0,0 +1,11 @@
+package weaver.aiyh_pcn.workflow_to_customer.utils;
+
+/**
+ * @author @author EBU7-dev1-ay
+ * @create 2021/8/19 0019 21:18
+ * utilMapFilter
+ */
+
+public interface UtilMapFilter<K,V> {
+	boolean test(K k,V v);
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_pcn/workflow_to_customer/utils/Utils.java b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/workflow_to_customer/utils/Utils.java
new file mode 100644
index 0000000..57556ee
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_pcn/workflow_to_customer/utils/Utils.java
@@ -0,0 +1,44 @@
+package weaver.aiyh_pcn.workflow_to_customer.utils;
+
+import com.ibm.icu.text.SimpleDateFormat;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * @author EBU7-dev1-ayh
+ * @create 2021/8/10 0010 10:42
+ * mybatisTest.dao class
+ */
+
+
+public class Utils {
+	public static String getTime(String format) {
+		Date date = new Date();
+		SimpleDateFormat formatter = new SimpleDateFormat(format);
+		return formatter.format(date);
+	}
+
+	public static boolean conformSql(Map<String, List<Map<String, Object>>> configInfoMap,String key){
+		return configInfoMap.containsKey(key) && !Objects.isNull(configInfoMap.get(key));
+	}
+
+	public static UtilMap<String, Object> createMap(){
+		return new UtilMap<>();
+	}
+
+	public static String removeSeparator(StringBuilder sqlBuilder){
+		String str = sqlBuilder.toString().trim();
+		String removeSeparator = ",";
+		if(str.endsWith(removeSeparator)){
+//			如果以分割号结尾，则去除分割号
+			str = str.substring(0,str.length() - 1);
+		}
+		if(str.trim().startsWith(removeSeparator)){
+			str = str.substring(1);
+		}
+		return  str;
+	}
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_quanshi/QsAPI.java b/src/main/youhong_ai_old_src/weaver/aiyh_quanshi/QsAPI.java
new file mode 100644
index 0000000..28ff64d
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_quanshi/QsAPI.java
@@ -0,0 +1,373 @@
+package weaver.aiyh_quanshi;
+
+import aiyh.utils.zwl.common.ToolUtil;
+import org.apache.http.HttpEntity;
+import org.apache.http.HttpResponse;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.conn.scheme.Scheme;
+import org.apache.http.conn.ssl.SSLSocketFactory;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.DefaultHttpClient;
+import org.apache.http.protocol.HTTP;
+import org.apache.http.util.EntityUtils;
+import weaver.aiyh_quanshi.entity.QsConfParty;
+import weaver.aiyh_quanshi.entity.QsConfSetting;
+import weaver.aiyh_quanshi.entity.QsResponse;
+
+import javax.net.ssl.KeyManagerFactory;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.TrustManager;
+import javax.net.ssl.TrustManagerFactory;
+import java.io.FileInputStream;
+import java.security.KeyStore;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class QsAPI {
+
+	private static boolean initialized = false;
+	private static final ToolUtil logger = new ToolUtil();
+
+	private static final String KEY_STORE_TYPE_JKS = "jks";
+	private static final String KEY_STORE_TYPE_P12 = "PKCS12";
+	private static final String SCHEME_HTTPS = "https";
+	private static final int HTTPS_PORT = 443;
+
+	private static final String KEY_STORE_PASSWORD = "111111";
+	private static final String KEY_STORE_TRUST_PASSWORD = "111111";
+
+	static SSLContext sslContext = null;
+	static HttpClient httpClient = new DefaultHttpClient();
+
+	private static Integer appId = 6;
+	private static String productId = "";
+	private static String siteUrl = "";
+
+	/**
+	 * 初始化
+	 */
+	public static void init(String _appId, String _siteUrl, String _p12Path, String _trustPath) {
+//		logger.writeErrorLog("Init is beginning!");
+		try {
+			appId = Integer.parseInt(_appId);
+			siteUrl = _siteUrl;
+			if (appId == 2) {
+				productId = "20000";
+			} else if (appId == 5) {
+				productId = "50000";
+			} else if (appId == 3) {
+				productId = "30000";
+			} else if (appId == 4) {
+				productId = "40000";
+			} else if (appId == 6) {
+				productId = "60000";
+			}
+
+			System.setProperty("javax.net.ssl.keyStore", _p12Path);
+			System.setProperty("javax.net.ssl.keyStorePassword", KEY_STORE_PASSWORD);
+			System.setProperty("javax.net.ssl.keyStoreType", KEY_STORE_TYPE_P12);
+			System.setProperty("javax.net.ssl.trustStore", _trustPath);
+			System.setProperty("javax.net.ssl.trustStorePassword", KEY_STORE_TRUST_PASSWORD);
+			System.setProperty("javax.net.ssl.trustStoreType", KEY_STORE_TYPE_JKS);
+
+			KeyStore kstore = KeyStore.getInstance(KEY_STORE_TYPE_P12);
+			kstore.load(new FileInputStream(_p12Path), KEY_STORE_PASSWORD.toCharArray());
+			//sunx509, IbmX509
+			KeyManagerFactory keyFactory = KeyManagerFactory.getInstance("sunx509");
+			keyFactory.init(kstore, KEY_STORE_PASSWORD.toCharArray());
+			KeyStore tstore = KeyStore.getInstance(KEY_STORE_TYPE_JKS);
+			tstore.load(new FileInputStream(_trustPath), KEY_STORE_TRUST_PASSWORD.toCharArray());
+
+			TrustManager[] tm;
+			// sunx509
+			TrustManagerFactory tmf = TrustManagerFactory.getInstance("sunx509");
+			tmf.init(tstore);
+			tm = tmf.getTrustManagers();
+
+			sslContext = SSLContext.getInstance("SSL");
+			sslContext.init(keyFactory.getKeyManagers(), tm, null);
+
+			initialized = true;
+//			logger.writeErrorLog("Init is success!");
+		} catch (Exception e) {
+			logger.writeErrorLog(e.getMessage(), e.toString());
+			logger.writeErrorLog("Init error:please check cert path is set correctly");
+		}
+	}
+
+	/**
+	 * 创建预约会议
+	 *
+	 * @param email       创建人邮箱
+	 * @param confTitle   会议标题
+	 * @param confLen     会议时长，分钟为单位
+	 * @param startTime   会议开始时间
+	 * @param setting     会议设置
+	 * @param inviteeList 参会人员列表
+	 * @return
+	 */
+	public static QsResponse reservConference(String email, String confTitle, int confLen, String startTime, QsConfSetting setting, List<QsConfParty> inviteeList) {
+		String URL = "https://openapi.quanshi.com/conference/conference/reservConference";
+		if (!initialized) {
+			return genError(QsErrorCode.CERT_ERROR);
+		} else {
+			Map<String, Object> param = new HashMap<String, Object>();
+			param.put("appId", appId);
+			param.put("title", confTitle);
+			param.put("length", confLen);
+			param.put("starttime", startTime);
+			param.put("from", "OA");
+//			param.put("userId", userId);
+			param.put("email", email);
+			param.put("inviteeList", inviteeList);
+			if (setting != null) {
+				Map<String, Object> settingMap = new HashMap<String, Object>();
+				if (setting.isShowInfo() != null) {
+					settingMap.put("isShowInfo", setting.isShowInfo() ? 1 : 0);
+				}
+				if (setting.isAllowUnmute() != null) {
+					settingMap.put("isAllowUnmute", setting.isAllowUnmute() ? 1 : 0);
+				}
+//			    settingMap.put("isShowVideo", setting.isShowVideo()!=null&&setting.isShowVideo() ? 1 : 0);  不用了
+				if (setting.isOnly() != null) {
+					settingMap.put("isOnly", setting.isOnly() ? 1 : 0);
+				}
+				param.put("seting", settingMap);
+				if (setting.isSmsNotify() != null) {
+					param.put("sms_notify", setting.isSmsNotify());
+				}
+				if (setting.isEmailNotify() != null) {
+					param.put("email_notify", setting.isEmailNotify());
+				}
+				if (setting.getPasscodeType() != null) {
+					param.put("password_type", setting.getPasscodeType());
+				}
+				if (setting.getAutoRecord() != null) {
+					param.put("autoRecord", setting.getAutoRecord());
+				}
+				if (setting.getConfLevelMute() != null) {
+					param.put("confLevelMute", setting.getConfLevelMute());
+				}
+				if (setting.getMustSelectAudio() != null) {
+					param.put("mustSelectAudio", setting.getMustSelectAudio());
+				}
+				if (setting.getExtend() != null) {
+					param.put("extend", setting.getExtend());
+				}
+			}
+			String result = httpPost(URL, QsUtil.jsonOTS(param));
+			return parseResult(QsUtil.jsonSTM(result));
+		}
+	}
+
+
+	/**
+	 * 取消预约会议(参考接口文档3.3章节)
+	 *
+	 * @param conferenceId 会议ID
+	 * @param email        会议主持人邮件
+	 * @return 服务器返回的JSON
+	 */
+	public static QsResponse cancelConference(String conferenceId, String email, Boolean emailNotify, Boolean smsNotify) {
+		String URL = "https://openapi.quanshi.com/conference/conference/cancelReservConference";
+		if (!initialized) {
+			return genError(QsErrorCode.CERT_ERROR);
+		} else {
+			String url = URL + "/" + appId + "/" + conferenceId + "/zh-CN/" + email;
+			if (emailNotify != null && smsNotify != null) {
+				url += "//" + emailNotify + "/" + smsNotify;
+			}
+			String result = httpGet(url);
+			return parseResult(QsUtil.jsonSTM(result));
+		}
+	}
+
+
+	/**
+	 * 取消预约会议(参考接口文档3.3章节)
+	 *
+	 * @param conferenceId 会议ID
+	 * @param userId       会议主持人ID
+	 * @return 服务器返回的JSON
+	 */
+	public static QsResponse cancelConference(String conferenceId, Integer userId, Boolean emailNotify, Boolean smsNotify) {
+		String URL = "https://openapi.quanshi.com/conference/conference/cancelReservConference";
+		if (!initialized) {
+			return genError(QsErrorCode.CERT_ERROR);
+		} else {
+			String url = URL + "/" + appId + "/" + conferenceId + "/zh-CN/" + userId;
+			if (emailNotify != null && smsNotify != null) {
+				url += "//" + emailNotify + "/" + smsNotify;
+			}
+			String result = httpGet(url);
+			return parseResult(QsUtil.jsonSTM(result));
+		}
+	}
+
+	/**
+	 * 通过邮箱查询账号信息
+	 * @param emails 电子邮箱数组
+	 * @return 服务器返回的JSON
+	 */
+	public static QsResponse getUserIdsByEmails(List<String> emails) {
+		String URL = "https://openapi.quanshi.com/confopenapi/account/getUsersByEmailsMobiles";
+		if (!initialized) {
+			return genError(QsErrorCode.CERT_ERROR);
+		}
+		else {
+			Map<String, Object> param = new HashMap<String, Object>();
+//			param.put("appId", appId);
+//			param.put("appKey", appKey);
+			param.put("emails", emails);
+			String result = httpPost(URL, QsUtil.jsonOTS(param));
+			return parseResult(QsUtil.jsonSTM(result));
+		}
+	}
+
+
+	/**
+	 * 获取预约会议基本信息(参考接口文档3.5章节)
+	 *
+	 * @param conferenceId 会议ID
+	 * @return 服务器返回的JSON
+	 */
+	public static QsResponse getConferenceInfo(String conferenceId) {
+		String URL = "https://openapi.quanshi.com/conference/conference/getConferenceBaseInfoById/6/";
+		if (!initialized) {
+			return genError(QsErrorCode.CERT_ERROR);
+		} else {
+			String result = httpGet(URL + conferenceId);
+			return parseResult(QsUtil.jsonSTM(result));
+		}
+	}
+
+	/**
+	 * 解析返回值
+	 *
+	 * @param resultMap
+	 * @return
+	 */
+	private static QsResponse parseResult(Map<String, Object> resultMap) {
+		QsResponse response = new QsResponse();
+		if (resultMap != null && resultMap.containsKey("status")) {
+			String status = String.valueOf(resultMap.get("status"));
+			response.setStatus(status);
+			response.setReqid(String.valueOf(resultMap.get("reqid")));
+			response.setResult(String.valueOf(resultMap.get("result")));
+		}
+		return response;
+	}
+
+	/**
+	 * 返回错误码
+	 *
+	 * @param errorCode 错误代码
+	 * @return JSON格式错误字符串
+	 */
+	private static QsResponse genError(String errorCode) {
+		Map<String, Object> errorMap = new HashMap<String, Object>();
+		errorMap.put("status", QsErrorCode.CERT_ERROR);
+		if (errorCode.equals(QsErrorCode.CERT_ERROR)) {
+			errorMap.put("desc", "please initialized API, check cert path!");
+		}
+		errorMap.put("result", null);
+		return parseResult(errorMap);
+	}
+
+
+	/**
+	 * Get方式请求
+	 *
+	 * @param url 请求地址
+	 * @return 请求Response
+	 */
+	public static String httpGet(String url) {
+		try {
+			SSLSocketFactory socketFactory = new SSLSocketFactory(sslContext);
+			Scheme sch = new Scheme(SCHEME_HTTPS, HTTPS_PORT, socketFactory);
+			httpClient.getConnectionManager().getSchemeRegistry().register(sch);
+			HttpGet httpGet = new HttpGet(url);
+			httpGet.addHeader("Content-Type", "application/json");
+			httpGet.addHeader("charset", HTTP.UTF_8);
+
+//			logger.writeErrorLog("executing request " + httpGet.getRequestLine());
+
+			HttpResponse response = httpClient.execute(httpGet);
+
+			HttpEntity entity = response.getEntity();
+			if (entity != null) {
+				String result = EntityUtils.toString(entity, "utf-8");
+//				System.out.println(result);
+//				logger.writeErrorLog("Response content length: " + result;
+//				logger.writeErrorLog("Response content: " + result);
+/*				BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(entity.getContent()));
+				String text;
+				StringBuffer buf = new StringBuffer();
+				while ((text = bufferedReader.readLine()) != null) {
+					buf.append(text);
+				}
+				bufferedReader.close();*/
+				return result;
+			}
+			EntityUtils.consume(entity);
+		} catch (Exception e) {
+			logger.writeErrorLog(e.getMessage(), e.toString());
+		}
+		return "{}";
+	}
+
+	/**
+	 * Post方式请求
+	 *
+	 * @param url       请求地址
+	 * @param jsonParam 请求参数
+	 * @return 请求Response
+	 */
+	public static String httpPost(String url, String jsonParam) {
+		try {
+			httpClient = new DefaultHttpClient();
+			SSLSocketFactory socketFactory = new SSLSocketFactory(sslContext);
+			Scheme sch = new Scheme(SCHEME_HTTPS, HTTPS_PORT, socketFactory);
+			httpClient.getConnectionManager().getSchemeRegistry().register(sch);
+			HttpPost httpPost = new HttpPost(url);
+			httpPost.addHeader("Content-Type", "application/json; charset=utf-8");
+			httpPost.setHeader("Accept", "application/json");
+			httpPost.addHeader("charset", HTTP.UTF_8);
+			httpPost.setEntity(new StringEntity(jsonParam.toString(), HTTP.UTF_8));
+
+//			logger.writeErrorLog("executing request " + httpPost.getRequestLine());
+//			logger.writeErrorLog("executing params " + jsonParam.toString());
+			HttpResponse response = httpClient.execute(httpPost);
+			HttpEntity entity = response.getEntity();
+			if (entity != null) {
+//            	EntityUtils.consume(entity);
+				String result = EntityUtils.toString(entity, "utf-8");
+//				logger.writeErrorLog("Response content is : " + result);
+//                BufferedReader bufferedReader = new BufferedReader( new InputStreamReader(entity.getContent())); 
+//                String text;
+//                StringBuffer buf = new StringBuffer();
+//                while ((text = bufferedReader.readLine()) != null ) {
+//                	buf.append(text);
+//                }
+//                bufferedReader.close();
+//                return buf.toString();
+				return result;
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
+			logger.writeErrorLog(e.getMessage(), e.toString());
+		}
+		return "";
+	}
+
+	static class QsErrorCode {
+		/**
+		 * 客户端证书未配置
+		 **/
+		public static final String CERT_ERROR = "50100";
+
+	}
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_quanshi/QsUtil.java b/src/main/youhong_ai_old_src/weaver/aiyh_quanshi/QsUtil.java
new file mode 100644
index 0000000..1143f23
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_quanshi/QsUtil.java
@@ -0,0 +1,103 @@
+package weaver.aiyh_quanshi;
+
+import net.sf.json.JSONArray;
+import net.sf.json.JSONObject;
+import net.sf.json.JsonConfig;
+import net.sf.json.util.JSONUtils;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Map;
+
+public class QsUtil {
+	static JsonConfig jsonConfig = new JsonConfig();  
+	//设置默认忽略
+	static {
+		jsonConfig.setIgnoreDefaultExcludes(false);
+	}
+	
+	/**
+	 * @brief 将JSON字符串解析成Map<String, String>类型
+	 * @param[in] json 需要解析的JSON字符串
+	 * @return Map<String, Object> 解析后的Map<String, Object>类型数据
+	 */
+	@SuppressWarnings("unchecked")
+	public static Map<String, Object> jsonSTM(String json) {
+		return (Map<String, Object>) JSONObject.fromObject(json, jsonConfig);
+	}
+	
+	/**
+	 * @brief 转换JSON字符串成JSONObject
+	 * @param[in] json JSON字符串
+	 * @return JSONObject
+	 */
+	public static JSONObject jsonSTO(String json){
+		return JSONObject.fromObject(json, jsonConfig);
+	}
+	
+	/**
+	 * @brief 取得JSON字符串中key对应的JSONArray
+	 * @param[in] json JSON字符串
+	 * @param[in] key JSONArray字符串对应的key
+	 * @return key对应的JSONArray
+	 */
+	public static JSONArray jsonGetArray(String json, String key) throws Exception{
+		return jsonSTO(json).getJSONArray(key);
+	}
+	
+	/**
+	 * @brief 将Map<String, String>类型数据转换成JSON字符串
+	 * @param[in] map 要封装成JSON字符串的Map<String, String>类型数据
+	 * @return String 组装后的JSON串
+	 */
+	public static String jsonMTS(Map<String, Object> map) {
+		return JSONObject.fromObject(map, jsonConfig).toString();
+	}
+	
+	/**
+	 * @brief 将Object类型数据转换成JSON字符串
+	 * @param object 要封装成JSON的Object类型数据对象
+	 * @return String 组装后的JSON串
+	 */
+	public static String jsonOTS(Object object) {
+		if (JSONUtils.isArray(object)) {
+			return JSONArray.fromObject(object, jsonConfig).toString();
+		}
+		return JSONObject.fromObject(object, jsonConfig).toString();
+	}
+	
+	/**
+	 * @brief 将Object类型数据组装成Map<String, String>类型数据
+	 * @details
+	 * -# 首先调用jsonOTS转换对象成JSON String类型
+	 * -# 再调用jsonSTM转成JSON String类型为Map<String, String>
+	 * 
+	 * @param[in] object 要封装成Map<String, String>类型数据的对象
+	 * @return Map<String, String> 解析后的JSON数据
+	 */
+	@SuppressWarnings("unchecked")
+	public static Map<String, Object> jsonOTM(Object object) {
+		return (Map<String, Object>)JSONObject.fromObject(object, jsonConfig);
+	}
+
+	/**
+	 * 判断字符串是否为JSON格式
+	 */
+	public static boolean mayBeJSON(String jsonStr) {
+		return JSONUtils.mayBeJSON(jsonStr);
+	}
+	
+	public static String getStringFromDate(Date date) {
+        if (date == null) return null;
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        return sdf.format(date);
+    }
+	public static Date addTimes(Date date, Long times) {
+		if (null == date || null == times)
+			return null;
+
+		long resultTime = date.getTime() + times;
+		Date resultDate = new Date(resultTime);
+		return resultDate;
+	}
+}
\ No newline at end of file
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_quanshi/RequestApi.java b/src/main/youhong_ai_old_src/weaver/aiyh_quanshi/RequestApi.java
new file mode 100644
index 0000000..dd946ee
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_quanshi/RequestApi.java
@@ -0,0 +1,49 @@
+package weaver.aiyh_quanshi;
+
+import weaver.aiyh_quanshi.entity.QsConfParty;
+import weaver.aiyh_quanshi.entity.QsResponse;
+
+import java.io.File;
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * @author EBU7-dev1-ayh
+ * @create 2021/9/16 0016 16:04
+ * qinqiujiekou
+ */
+
+
+public class RequestApi {
+	public RequestApi(){
+		String keyPath = Objects.requireNonNull(this.getClass().getResource("")).getPath();
+		QsAPI.init("6", "configtest.quanshi.com"
+				, keyPath + "key_store" + File.separator + "mg.client.p12"
+				, keyPath + "key_store" + File.separator + "server.truststore");
+	}
+
+	/**
+	 * 创建预约会议
+	 * @param email 创建人邮箱
+	 * @param title 会议标题
+	 * @param length 会议时长，分钟为单位
+	 * @param startTime 会议开始时间
+	 * @param list 参会人员列表
+	 * @return
+	 */
+	public QsResponse createMeting(String email, String title, int length, String startTime, List<QsConfParty> list){
+		return QsAPI.reservConference(email,title,length,startTime, null, list);
+	}
+
+	public QsResponse cancelConference(String conferenceId, String email){
+		return QsAPI.cancelConference(conferenceId,email, false,false);
+	}
+
+	public QsResponse getQuanShiInfo(String conferenceId){
+		return QsAPI.getConferenceInfo(conferenceId);
+	}
+
+	public QsResponse getInfoByEmail(List<String> list){
+		return QsAPI.getUserIdsByEmails(list);
+	}
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_quanshi/entity/QsAccount.java b/src/main/youhong_ai_old_src/weaver/aiyh_quanshi/entity/QsAccount.java
new file mode 100644
index 0000000..da87b4d
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_quanshi/entity/QsAccount.java
@@ -0,0 +1,195 @@
+package weaver.aiyh_quanshi.entity;
+
+public class QsAccount {
+	private String accountType;
+	private String userId = "";
+	private String userName = "";
+	private String userEmail = "";
+	private String userTel = "";
+	private String userPassword = "";
+	private String userMobile = "";
+	private String userCompany = "";
+	private String collectInfoId = "";
+	private String billInfoId = "";
+	private Integer confScale ;
+	private String hostUserId = "";
+	private String callbackUrl ="";
+
+	public Integer getConfScale() {
+		return confScale;
+	}
+
+	public void setConfScale(Integer confScale) {
+		this.confScale = confScale;
+	}
+
+	/**
+	 * @return the accountType
+	 */
+	public String getAccountType() {
+		return accountType;
+	}
+
+	/**
+	 * @param accountType the accountType to set
+	 */
+	public void setAccountType(String accountType) {
+		this.accountType = accountType;
+	}
+
+	
+	/**
+	 * @return the userId
+	 */
+	public String getUserId() {
+		return userId;
+	}
+
+	/**
+	 * @param userId the userId to set
+	 */
+	public void setUserId(String userId) {
+		this.userId = userId;
+	}
+
+	/**
+	 * @return the userName
+	 */
+	public String getUserName() {
+		return userName;
+	}
+
+	/**
+	 * @param userName
+	 *            the userName to set
+	 */
+	public void setUserName(String userName) {
+		this.userName = userName;
+	}
+
+	/**
+	 * @return the userEmail
+	 */
+	public String getUserEmail() {
+		return userEmail;
+	}
+
+	/**
+	 * @param userEmail
+	 *            the userEmail to set
+	 */
+	public void setUserEmail(String userEmail) {
+		this.userEmail = userEmail;
+	}
+
+	/**
+	 * @return the userTel
+	 */
+	public String getUserTel() {
+		return userTel;
+	}
+
+	/**
+	 * @param userTel
+	 *            the userTel to set
+	 */
+	public void setUserTel(String userTel) {
+		this.userTel = userTel;
+	}
+
+	/**
+	 * @return the userPassword
+	 */
+	public String getUserPassword() {
+		return userPassword;
+	}
+
+	/**
+	 * @param userPassword
+	 *            the userPassword to set
+	 */
+	public void setUserPassword(String userPassword) {
+		this.userPassword = userPassword;
+	}
+
+	/**
+	 * @return the userMobile
+	 */
+	public String getUserMobile() {
+		return userMobile;
+	}
+
+	/**
+	 * @param userMobile
+	 *            the userMobile to set
+	 */
+	public void setUserMobile(String userMobile) {
+		this.userMobile = userMobile;
+	}
+
+	/**
+	 * @return the userCompany
+	 */
+	public String getUserCompany() {
+		return userCompany;
+	}
+
+	/**
+	 * @param userCompany the userCompany to set
+	 */
+	public void setUserCompany(String userCompany) {
+		this.userCompany = userCompany;
+	}
+
+	/**
+	 * @return the collectInfoId
+	 */
+	public String getCollectInfoId() {
+		return collectInfoId;
+	}
+
+	/**
+	 * @param collectInfoId the collectInfoId to set
+	 */
+	public void setCollectInfoId(String collectInfoId) {
+		this.collectInfoId = collectInfoId;
+	}
+
+	/**
+	 * @return the billInfoId
+	 */
+	public String getBillInfoId() {
+		return billInfoId;
+	}
+
+	/**
+	 * @param billInfoId the billInfoId to set
+	 */
+	public void setBillInfoId(String billInfoId) {
+		this.billInfoId = billInfoId;
+	}
+
+
+	/**
+	 * @return the hostUserId
+	 */
+	public String getHostUserId() {
+		return hostUserId;
+	}
+
+	/**
+	 * @param hostUserId the hostUserId to set
+	 */
+	public void setHostUserId(String hostUserId) {
+		this.hostUserId = hostUserId;
+	}
+
+	public String getCallbackUrl() {
+		return callbackUrl;
+	}
+
+	public void setCallbackUrl(String callbackUrl) {
+		this.callbackUrl = callbackUrl;
+	}
+	
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_quanshi/entity/QsConfParty.java b/src/main/youhong_ai_old_src/weaver/aiyh_quanshi/entity/QsConfParty.java
new file mode 100644
index 0000000..370de64
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_quanshi/entity/QsConfParty.java
@@ -0,0 +1,86 @@
+package weaver.aiyh_quanshi.entity;
+
+public class QsConfParty {
+	private String name;
+	private String mobile;
+	private String email;
+	private Long userId;
+/*
+	private String extName;
+	private Integer extType; //扩展名类型 1,微信号,2,QQ 号
+*/
+
+	public Long getUserId() {
+		return userId;
+	}
+
+	public void setUserId(Long userId) {
+		this.userId = userId;
+	}
+
+/*
+	public String getExtName() {
+		return extName;
+	}
+*/
+
+/*
+	public void setExtName(String extName) {
+		this.extName = extName;
+	}
+
+	public Integer getExtType() {
+		return extType;
+	}
+
+	public void setExtType(Integer extType) {
+		this.extType = extType;
+	}
+*/
+
+	/**
+	 * @return the name
+	 */
+	public String getName() {
+		return name;
+	}
+
+	/**
+	 * @param name
+	 *            the name to set
+	 */
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	/**
+	 * @return the mobile
+	 */
+	public String getMobile() {
+		return mobile;
+	}
+
+	/**
+	 * @param mobile
+	 *            the mobile to set
+	 */
+	public void setMobile(String mobile) {
+		this.mobile = mobile;
+	}
+
+	/**
+	 * @return the email
+	 */
+	public String getEmail() {
+		return email;
+	}
+
+	/**
+	 * @param email
+	 *            the email to set
+	 */
+	public void setEmail(String email) {
+		this.email = email;
+	}
+
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_quanshi/entity/QsConfSetting.java b/src/main/youhong_ai_old_src/weaver/aiyh_quanshi/entity/QsConfSetting.java
new file mode 100644
index 0000000..7fb47d7
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_quanshi/entity/QsConfSetting.java
@@ -0,0 +1,169 @@
+package weaver.aiyh_quanshi.entity;
+
+public class QsConfSetting {
+	
+	private Boolean showInfo;
+	private Boolean showVideo;
+	private Boolean allowUnmute;
+	private Boolean only;
+	private Boolean emailNotify;
+	private Boolean smsNotify;
+	//0:不自动录音，1:自动录音，默认 0
+	private Integer autoRecord;
+	private Integer passcodeType;
+	//1:会议级别允许参会人解除静音 2:会议级别不允许参会人自我解除静音  值默认为 0
+	private Integer confLevelMute;
+	//0: 用户可以关闭音频选择框 （默认值）1: 用户不能关闭音频选择框（如果 api 传入这个值，这个用户即使有其他端已经入会并连入音频，还是会让他选择音频）
+	private Integer mustSelectAudio;
+	//会议级别视频清晰度 1:标清,2:高清,4:超 清 选填，默认 0 表示未设置
+	private Integer confLevelVideoStandard;
+	//参会人邮箱后缀扩展字段，支持当参会人为非邮箱格式时，拼接此扩展字段设定有效邮箱。 例如：参会人中某一数据为“zhangsan”，该扩展字段为
+	//“quanshi.com”或者“@quanshi.com”，则拼接后的实际参会人邮箱为“zhangsan@quanshi.com”
+	private String extend;
+
+	public String getExtend() {
+		return extend;
+	}
+
+	public void setExtend(String extend) {
+		this.extend = extend;
+	}
+
+	public Integer getAutoRecord() {
+		return autoRecord;
+	}
+
+	public void setAutoRecord(Integer autoRecord) {
+		this.autoRecord = autoRecord;
+	}
+
+	public Integer getConfLevelMute() {
+		return confLevelMute;
+	}
+
+	public void setConfLevelMute(Integer confLevelMute) {
+		this.confLevelMute = confLevelMute;
+	}
+
+	public Integer getMustSelectAudio() {
+		return mustSelectAudio;
+	}
+
+	public void setMustSelectAudio(Integer mustSelectAudio) {
+		this.mustSelectAudio = mustSelectAudio;
+	}
+
+	public Integer getConfLevelVideoStandard() {
+		return confLevelVideoStandard;
+	}
+
+	public void setConfLevelVideoStandard(Integer confLevelVideoStandard) {
+		this.confLevelVideoStandard = confLevelVideoStandard;
+	}
+
+	/**
+	 * @return the showInfo
+	 */
+	public Boolean isShowInfo() {
+		return showInfo;
+	}
+
+	/**
+	 * @param showInfo
+	 *            the showInfo to set
+	 */
+	public void setShowInfo(Boolean showInfo) {
+		this.showInfo = showInfo;
+	}
+
+	/**
+	 * @return the showVideo
+	 */
+	public Boolean isShowVideo() {
+		return showVideo;
+	}
+
+	/**
+	 * @param showVideo
+	 *            the showVideo to set
+	 */
+	public void setShowVideo(Boolean showVideo) {
+		this.showVideo = showVideo;
+	}
+
+	/**
+	 * @return the allowUnmute
+	 */
+	public Boolean isAllowUnmute() {
+		return allowUnmute;
+	}
+
+	/**
+	 * @param allowUnmute
+	 *            the allowUnmute to set
+	 */
+	public void setAllowUnmute(Boolean allowUnmute) {
+		this.allowUnmute = allowUnmute;
+	}
+
+	/**
+	 * @return the only
+	 */
+	public Boolean isOnly() {
+		return only;
+	}
+
+	/**
+	 * @param only
+	 *            the only to set
+	 */
+	public void setOnly(Boolean only) {
+		this.only = only;
+	}
+
+	/**
+	 * @return the emailNotify
+	 */
+	public Boolean isEmailNotify() {
+		return emailNotify;
+	}
+
+	/**
+	 * @param emailNotify
+	 *            the emailNotify to set
+	 */
+	public void setEmailNotify(Boolean emailNotify) {
+		this.emailNotify = emailNotify;
+	}
+
+	/**
+	 * @return the smsNotify
+	 */
+	public Boolean isSmsNotify() {
+		return smsNotify;
+	}
+
+	/**
+	 * @param smsNotify
+	 *            the smsNotify to set
+	 */
+	public void setSmsNotify(Boolean smsNotify) {
+		this.smsNotify = smsNotify;
+	}
+
+	/**
+	 * @return the passcodeType
+	 */
+	public Integer getPasscodeType() {
+		return passcodeType;
+	}
+
+	/**
+	 * @param passcodeType
+	 *            the passcodeType to set
+	 */
+	public void setPasscodeType(Integer passcodeType) {
+		this.passcodeType = passcodeType;
+	}
+
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_quanshi/entity/QsConfig.java b/src/main/youhong_ai_old_src/weaver/aiyh_quanshi/entity/QsConfig.java
new file mode 100644
index 0000000..ede2c0c
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_quanshi/entity/QsConfig.java
@@ -0,0 +1,148 @@
+package weaver.aiyh_quanshi.entity;
+
+public class QsConfig {
+    private Integer isFreeJoin;//参会人提前入会设置 0：主持人入会后方可入会；1：不限(默认)
+    private Integer allowMobile;//允许手机入会 0:禁止参会人手机端入会，1:允许参会人手机端入会(默认)
+    private Integer videoConferenceMode;//视频入会，0:入会不自动开视频(默认)，1:入会自动开视频
+    private Integer videoControl;//视频权限 1:会中由主持人控制，2:参会人会中可自由开关（默认）
+    private Integer videoStandardSet;//视频清晰度 1:标清(默认),2:高清,4:超清
+    private Integer relieveMute;//解除静音 0:仅主持人才能解除(默认)，1:允许参会人自己解除
+    private Integer enableDoc;//共享文档 0:不允许共享文档(默认)， 1:仅主持人共享文档，2:所有人都可以共享文档
+    private Integer enableWhiteboard;//共享白板 0:不允许共享白板(默认)， 1:仅主持人共享白板，2:所有人都可以共享白板
+    private Integer shareNotes;//共享批注 0:不允许参会人批注 1:允许自由批注(默认)
+    private Integer sharePageTurn;//共享翻页 0:不允许参会人翻页 1：允许自由翻页(默认)
+    private Integer watermark;//查看共享桌面 0:不加水印(默认) 1:加水印
+    private Integer saveShare;//保存共享 0:不允许保存共享 1:允许保存共享(默 认)
+    private Integer autoRecord;//录制 0:手动开启录制(默认) 1:入会自动开启录制
+    private Integer showWholeAttendList;//参会列表 0:对参会人隐藏参会列表 1:显示完整参会列表(默认)
+    private Integer isFreeChat;//会中聊天 0:仅与主持人聊天，1:允许自由聊天(默认)
+    private Integer muteSoundMsg;//提示语音 0:关闭语音提示， 1:开启语音提示(默 认)
+
+    public Integer getIsFreeJoin() {
+        return isFreeJoin;
+    }
+
+    public void setIsFreeJoin(Integer isFreeJoin) {
+        this.isFreeJoin = isFreeJoin;
+    }
+
+    public Integer getAllowMobile() {
+        return allowMobile;
+    }
+
+    public void setAllowMobile(Integer allowMobile) {
+        this.allowMobile = allowMobile;
+    }
+
+    public Integer getVideoConferenceMode() {
+        return videoConferenceMode;
+    }
+
+    public void setVideoConferenceMode(Integer videoConferenceMode) {
+        this.videoConferenceMode = videoConferenceMode;
+    }
+
+    public Integer getVideoControl() {
+        return videoControl;
+    }
+
+    public void setVideoControl(Integer videoControl) {
+        this.videoControl = videoControl;
+    }
+
+    public Integer getVideoStandardSet() {
+        return videoStandardSet;
+    }
+
+    public void setVideoStandardSet(Integer videoStandardSet) {
+        this.videoStandardSet = videoStandardSet;
+    }
+
+    public Integer getRelieveMute() {
+        return relieveMute;
+    }
+
+    public void setRelieveMute(Integer relieveMute) {
+        this.relieveMute = relieveMute;
+    }
+
+    public Integer getEnableDoc() {
+        return enableDoc;
+    }
+
+    public void setEnableDoc(Integer enableDoc) {
+        this.enableDoc = enableDoc;
+    }
+
+    public Integer getEnableWhiteboard() {
+        return enableWhiteboard;
+    }
+
+    public void setEnableWhiteboard(Integer enableWhiteboard) {
+        this.enableWhiteboard = enableWhiteboard;
+    }
+
+    public Integer getShareNotes() {
+        return shareNotes;
+    }
+
+    public void setShareNotes(Integer shareNotes) {
+        this.shareNotes = shareNotes;
+    }
+
+    public Integer getSharePageTurn() {
+        return sharePageTurn;
+    }
+
+    public void setSharePageTurn(Integer sharePageTurn) {
+        this.sharePageTurn = sharePageTurn;
+    }
+
+    public Integer getWatermark() {
+        return watermark;
+    }
+
+    public void setWatermark(Integer watermark) {
+        this.watermark = watermark;
+    }
+
+    public Integer getSaveShare() {
+        return saveShare;
+    }
+
+    public void setSaveShare(Integer saveShare) {
+        this.saveShare = saveShare;
+    }
+
+    public Integer getAutoRecord() {
+        return autoRecord;
+    }
+
+    public void setAutoRecord(Integer autoRecord) {
+        this.autoRecord = autoRecord;
+    }
+
+    public Integer getShowWholeAttendList() {
+        return showWholeAttendList;
+    }
+
+    public void setShowWholeAttendList(Integer showWholeAttendList) {
+        this.showWholeAttendList = showWholeAttendList;
+    }
+
+    public Integer getIsFreeChat() {
+        return isFreeChat;
+    }
+
+    public void setIsFreeChat(Integer isFreeChat) {
+        this.isFreeChat = isFreeChat;
+    }
+
+    public Integer getMuteSoundMsg() {
+        return muteSoundMsg;
+    }
+
+    public void setMuteSoundMsg(Integer muteSoundMsg) {
+        this.muteSoundMsg = muteSoundMsg;
+    }
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_quanshi/entity/QsConsts.java b/src/main/youhong_ai_old_src/weaver/aiyh_quanshi/entity/QsConsts.java
new file mode 100644
index 0000000..1b63469
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_quanshi/entity/QsConsts.java
@@ -0,0 +1,12 @@
+package weaver.aiyh_quanshi.entity;
+
+public class QsConsts {
+	/** (MAX)用户类型-账号 **/
+	public static final String ACCOUNT_TYPE_ACCOUNT = "1";
+	/** (MAX)用户类型-用户 **/
+	public static final String ACCOUNT_TYPE_USER = "2";
+	/** (MAX)产品版本-标准版**/
+	public static final String VERSIONMODE_STANDARD = "0";
+	/** (MAX)产品版本-简约版**/
+	public static final String VERSIONMODE_SIMPLE = "1";
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_quanshi/entity/QsDialoutParty.java b/src/main/youhong_ai_old_src/weaver/aiyh_quanshi/entity/QsDialoutParty.java
new file mode 100644
index 0000000..df580da
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_quanshi/entity/QsDialoutParty.java
@@ -0,0 +1,20 @@
+package weaver.aiyh_quanshi.entity;
+
+public class QsDialoutParty {
+	private String phone;
+	private String role;
+	public String getPhone() {
+		return phone;
+	}
+	public void setPhone(String phone) {
+		this.phone = phone;
+	}
+	public String getRole() {
+		return role;
+	}
+	public void setRole(String role) {
+		this.role = role;
+	}
+	
+	
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_quanshi/entity/QsResponse.java b/src/main/youhong_ai_old_src/weaver/aiyh_quanshi/entity/QsResponse.java
new file mode 100644
index 0000000..0d06e1e
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_quanshi/entity/QsResponse.java
@@ -0,0 +1,68 @@
+package weaver.aiyh_quanshi.entity;
+
+public class QsResponse {
+	
+	private String status;
+	private String result;
+	private String reqid;
+	private String msg;
+
+	public String getMsg() {
+		return msg;
+	}
+
+	public void setMsg(String msg) {
+		this.msg = msg;
+	}
+
+	public String getReqid() {
+		return reqid;
+	}
+
+	public void setReqid(String reqid) {
+		this.reqid = reqid;
+	}
+
+	public boolean isSuccess() {
+		return status != null && status.equals("0");
+	}
+	
+	/**
+	 * @return the status
+	 */
+	public String getStatus() {
+		return status;
+	}
+
+	/**
+	 * @param status
+	 *            the status to set
+	 */
+	public void setStatus(String status) {
+		this.status = status;
+	}
+
+	/**
+	 * @return the result
+	 */
+	public String getResult() {
+		return result;
+	}
+
+	/**
+	 * @param result
+	 *            the result to set
+	 */
+	public void setResult(String result) {
+		this.result = result;
+	}
+
+	/* (non-Javadoc)
+	 * @see java.lang.Object#toString()
+	 */
+	@Override
+	public String toString() {
+		return "QsResponse [status=" + status + ", result=" + result +  ", reqid=" + reqid +"]";
+	}
+	
+}
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_quanshi/key_store/mg.client.p12 b/src/main/youhong_ai_old_src/weaver/aiyh_quanshi/key_store/mg.client.p12
new file mode 100644
index 0000000..ed9870a
Binary files /dev/null and b/src/main/youhong_ai_old_src/weaver/aiyh_quanshi/key_store/mg.client.p12 differ
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_quanshi/key_store/mg.client_cert.pem b/src/main/youhong_ai_old_src/weaver/aiyh_quanshi/key_store/mg.client_cert.pem
new file mode 100644
index 0000000..c0d2d2c
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_quanshi/key_store/mg.client_cert.pem
@@ -0,0 +1,83 @@
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 71 (0x47)
+        Signature Algorithm: sha256WithRSAEncryption
+        Issuer: C=CN, ST=BJ, L=BJ, O=quanshi, OU=quanshi, CN=openapi.quanshi.com/emailAddress=openapi@quanshi.com
+        Validity
+            Not Before: Sep  6 08:32:15 2021 GMT
+            Not After : Sep  1 08:32:15 2041 GMT
+        Subject: C=CN, ST=BJ, O=015095, OU=015095, CN=openapi-quanshi.mg.com/emailAddress=openapi-quanshi@mg.com
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+                RSA Public-Key: (2048 bit)
+                Modulus:
+                    00:d8:c5:74:d9:a6:98:27:50:a9:82:5b:27:b3:30:
+                    6f:f1:e2:17:e2:02:a7:d6:9e:e8:d5:55:ed:67:3a:
+                    5a:ee:dc:52:12:b9:92:ca:ba:86:f7:9a:68:5d:8f:
+                    de:29:6e:4a:c5:58:a6:3d:75:7b:61:53:13:ab:32:
+                    8a:da:7a:50:d5:5c:97:29:c2:ee:bc:96:57:0a:c9:
+                    a0:6b:dd:d2:c5:2a:24:d2:68:08:af:4f:6d:da:75:
+                    a8:e7:a9:0d:2c:7e:25:8a:b3:96:72:01:74:30:fc:
+                    7a:41:50:e1:2a:b1:63:69:61:fb:8f:05:4c:c8:aa:
+                    e2:1f:ac:99:03:10:ac:11:df:a0:dc:65:1c:0f:bd:
+                    de:42:0d:b6:57:14:73:d6:ac:b1:75:1e:26:10:b8:
+                    0b:b0:a2:e4:98:34:a6:b8:04:4a:11:b0:8d:15:13:
+                    5e:75:a6:1b:0b:53:95:3a:61:fd:d2:a4:b6:83:0b:
+                    af:7c:90:70:5d:ae:d2:d2:db:09:ec:90:35:d9:f8:
+                    7b:a3:c6:01:1c:67:17:f3:46:61:dd:35:25:dc:84:
+                    1a:05:1a:29:f2:2e:bd:7c:92:cb:20:a0:ff:08:4b:
+                    b3:d6:92:ed:8d:09:c5:f8:1a:a1:af:39:b9:a2:89:
+                    79:82:94:17:de:34:ff:dd:11:34:c2:c9:cd:32:de:
+                    1c:bf
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Basic Constraints: 
+                CA:TRUE
+            Netscape Comment: 
+                OpenSSL Generated Certificate
+            X509v3 Subject Key Identifier: 
+                5A:64:4D:EE:07:58:6D:2B:21:7E:33:03:91:2D:63:AA:2C:18:58:87
+            X509v3 Authority Key Identifier: 
+                keyid:8A:72:94:93:B9:A5:84:F8:D8:00:0B:34:E7:23:74:A7:BC:5A:A9:4F
+
+    Signature Algorithm: sha256WithRSAEncryption
+         c6:f1:0d:bf:4a:bb:e7:e4:51:1f:d8:c0:80:42:3f:6c:f0:cb:
+         92:b9:ea:3a:3b:31:3b:29:79:51:4f:10:83:33:1b:27:51:57:
+         f0:73:7a:59:e4:0d:1e:80:c6:16:3e:c3:88:88:22:24:45:94:
+         50:79:c6:59:82:04:13:3c:66:c8:00:0d:bd:76:0b:7f:7a:03:
+         da:6f:23:5d:6f:bd:41:c9:ba:25:0f:b4:43:78:0e:f9:c4:84:
+         08:d1:33:72:49:39:55:c9:09:6f:03:89:fd:11:f7:c0:2f:1f:
+         55:c3:7e:4c:33:45:e4:36:bf:c7:cb:1d:4f:36:ee:b6:6b:71:
+         78:2d:da:e3:5c:b5:97:e5:2e:9a:f6:17:99:d9:08:6b:f1:9f:
+         7b:f6:41:0d:36:19:6b:8d:9d:59:b5:9f:21:75:30:b9:af:2a:
+         2c:42:1c:a8:01:c7:ae:90:95:0a:f3:9b:d2:58:5a:00:e3:67:
+         41:90:01:94:0e:fd:55:fc:b3:21:c8:ea:41:4a:4e:d2:94:4d:
+         4c:18:1a:f9:d0:19:1f:82:10:49:64:1d:70:27:86:24:13:13:
+         fa:9c:22:d7:35:96:f3:b1:d1:71:f4:6d:5c:f1:43:f5:71:b6:
+         60:38:a0:a5:6c:bb:eb:be:d2:c8:aa:fb:64:5a:46:a5:0e:cb:
+         54:20:8c:a0
+-----BEGIN CERTIFICATE-----
+MIIEDDCCAvSgAwIBAgIBRzANBgkqhkiG9w0BAQsFADCBjTELMAkGA1UEBhMCQ04x
+CzAJBgNVBAgTAkJKMQswCQYDVQQHEwJCSjEQMA4GA1UEChMHcXVhbnNoaTEQMA4G
+A1UECxMHcXVhbnNoaTEcMBoGA1UEAxMTb3BlbmFwaS5xdWFuc2hpLmNvbTEiMCAG
+CSqGSIb3DQEJARYTb3BlbmFwaUBxdWFuc2hpLmNvbTAeFw0yMTA5MDYwODMyMTVa
+Fw00MTA5MDEwODMyMTVaMIGEMQswCQYDVQQGEwJDTjELMAkGA1UECAwCQkoxDzAN
+BgNVBAoMBjAxNTA5NTEPMA0GA1UECwwGMDE1MDk1MR8wHQYDVQQDDBZvcGVuYXBp
+LXF1YW5zaGkubWcuY29tMSUwIwYJKoZIhvcNAQkBFhZvcGVuYXBpLXF1YW5zaGlA
+bWcuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2MV02aaYJ1Cp
+glsnszBv8eIX4gKn1p7o1VXtZzpa7txSErmSyrqG95poXY/eKW5KxVimPXV7YVMT
+qzKK2npQ1VyXKcLuvJZXCsmga93SxSok0mgIr09t2nWo56kNLH4lirOWcgF0MPx6
+QVDhKrFjaWH7jwVMyKriH6yZAxCsEd+g3GUcD73eQg22VxRz1qyxdR4mELgLsKLk
+mDSmuARKEbCNFRNedaYbC1OVOmH90qS2gwuvfJBwXa7S0tsJ7JA12fh7o8YBHGcX
+80Zh3TUl3IQaBRop8i69fJLLIKD/CEuz1pLtjQnF+Bqhrzm5ool5gpQX3jT/3RE0
+wsnNMt4cvwIDAQABo34wfDAMBgNVHRMEBTADAQH/MCwGCWCGSAGG+EIBDQQfFh1P
+cGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUWmRN7gdYbSsh
+fjMDkS1jqiwYWIcwHwYDVR0jBBgwFoAUinKUk7mlhPjYAAs05yN0p7xaqU8wDQYJ
+KoZIhvcNAQELBQADggEBAMbxDb9Ku+fkUR/YwIBCP2zwy5K56jo7MTspeVFPEIMz
+GydRV/BzelnkDR6AxhY+w4iIIiRFlFB5xlmCBBM8ZsgADb12C396A9pvI11vvUHJ
+uiUPtEN4DvnEhAjRM3JJOVXJCW8Dif0R98AvH1XDfkwzReQ2v8fLHU827rZrcXgt
+2uNctZflLpr2F5nZCGvxn3v2QQ02GWuNnVm1nyF1MLmvKixCHKgBx66QlQrzm9JY
+WgDjZ0GQAZQO/VX8syHI6kFKTtKUTUwYGvnQGR+CEElkHXAnhiQTE/qcItc1lvOx
+0XH0bVzxQ/VxtmA4oKVsu+u+0siq+2RaRqUOy1QgjKA=
+-----END CERTIFICATE-----
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_quanshi/key_store/mg.client_key.pem b/src/main/youhong_ai_old_src/weaver/aiyh_quanshi/key_store/mg.client_key.pem
new file mode 100644
index 0000000..e883645
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/aiyh_quanshi/key_store/mg.client_key.pem
@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEpQIBAAKCAQEA2MV02aaYJ1CpglsnszBv8eIX4gKn1p7o1VXtZzpa7txSErmS
+yrqG95poXY/eKW5KxVimPXV7YVMTqzKK2npQ1VyXKcLuvJZXCsmga93SxSok0mgI
+r09t2nWo56kNLH4lirOWcgF0MPx6QVDhKrFjaWH7jwVMyKriH6yZAxCsEd+g3GUc
+D73eQg22VxRz1qyxdR4mELgLsKLkmDSmuARKEbCNFRNedaYbC1OVOmH90qS2gwuv
+fJBwXa7S0tsJ7JA12fh7o8YBHGcX80Zh3TUl3IQaBRop8i69fJLLIKD/CEuz1pLt
+jQnF+Bqhrzm5ool5gpQX3jT/3RE0wsnNMt4cvwIDAQABAoIBAQCQgoI1nvQMMZ/v
+gSlkMcRPMnTNfQu67lE194S+ro50cnhcd04+zD6xzkQJK6HlaNt72G9qxWktJp8U
+ICulHqnIs2MqugNBwc/hJy1E+6pJOqE1i5lOldscKhgh5/caVDZe0v5WnlWBWq99
+35dcSMmHNYTogZYAqLr6dqvC+VhcyMfw4RS9vCYTUltg+rm/JZ77VqQH5QAeDBu/
+48yj3AzLCbZz5JaKbK1RuXUTVIdOLn6saSZo3AFAGq4T/uv4wi5ouUjb1nzi3qOs
+4KkAH0bUni8xzQySqjwuXAQQO0X+6z1WdwogGBnQtzpcbPXsE95eQf4ZCstOJ/6t
+vfb09SQhAoGBAPljuPmQBJTc++j7A72hOtX+xOtB9IhH/A7uT5dBIZ+39gTf8rU8
+7BuaefCa4Jn+/MwN+Xv0IIw2gN1tvSJ/ma67aGI8aXBKbNsN7xCfiXxn1j01AUK5
+73Q1CpkpF6AdTwP7t6TLn6DCdzk71vmkinHlJUO5ejVocss6NVw02Wu3AoGBAN6E
+ZaXLAz730roP/EIKLqMBsFcYEkCy0cki2TWfi8oIOHR2pFsV5wkASQnbuDgWa3nw
+RfKBKz24XaFOxlEh2wFCrrMmR0qmqsfEm6+w3bI43xtJXQLsyMeMIirvI1UtqRgk
+tQG4b8VeCgA8f42VPe8xJd1TNqJrCWyy/KRZ1ec5AoGBAN+U8unyntjjAYlPOXxR
+xtDBlsOfnt5rQuQT7REamE17/LlEGXE4zCi3Jml6QLBvNS6vvKLPLDroRkG+N5lt
+Mle/toaTyKeeYddFt7V8giMhaKX5Fkc/MRlK0FSdzYuDmypkCrFYyKS0k3ShXEr1
+pBUWLYF5EMI/AOOILPyceOwjAoGBAMG7XdCKP0o8dEDAmC1bNh1/4+sALywbRGEt
+MRXp0chVfemQPip7mEoS8IRfwzU599sToaKwaVh0QzilIC8VHdssFnQtmJZbI4eI
+GtBNWcfIkh7ssclRJMHvtPPSft2zQmyd0OYtkUqyRFzOT3OSg3jUPpZC0+d2756u
++x2QhZapAoGAMACaXX7xK4dTYrNFKxBPbnTHkKX6rASBWK6GAWSCOTrOnyS13Ol/
+x2M2Um6jy08iwxXpT7oGM7lkbz+oajdepGla6xRTGF9O78SWcymhssknu82o4n3A
+tFzRpPa9uwJ2q7+v38qnIp4Rqcjowc6KdpSOhS7yYrDZZhUVN9DVhYM=
+-----END RSA PRIVATE KEY-----
diff --git a/src/main/youhong_ai_old_src/weaver/aiyh_quanshi/key_store/server.truststore b/src/main/youhong_ai_old_src/weaver/aiyh_quanshi/key_store/server.truststore
new file mode 100644
index 0000000..896e2bb
Binary files /dev/null and b/src/main/youhong_ai_old_src/weaver/aiyh_quanshi/key_store/server.truststore differ
diff --git a/src/main/youhong_ai_old_src/weaver/alioss/AliOSSObjectManager.java b/src/main/youhong_ai_old_src/weaver/alioss/AliOSSObjectManager.java
new file mode 100644
index 0000000..3387f28
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/alioss/AliOSSObjectManager.java
@@ -0,0 +1,369 @@
+/*
+* Created on 2014-11-04
+* Copyright (c) 2001-2014 泛微软件
+* 泛微协同商务系统，版权所有。
+* 
+*/
+
+package weaver.alioss;
+
+import weaver.alioss.AliOSSObjectUtil;
+import weaver.conn.RecordSet;
+import weaver.file.AESCoder;
+import weaver.file.Prop;
+import weaver.general.BaseBean;
+import weaver.general.IpUtils;
+import weaver.general.Util;
+
+import javax.servlet.http.HttpServletRequest;
+import java.io.BufferedInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.util.zip.ZipInputStream;
+
+/**
+ * Description: 阿里云基本类
+ * @author 方观生
+ * @date 2014-11-04
+ */
+
+public class AliOSSObjectManager extends BaseBean {
+
+
+	/**
+	 * 构造函数
+	 */
+	public AliOSSObjectManager() {
+		try {
+
+		} catch (Exception ex) {
+		}
+	}
+
+    /**
+     * 上传文件到阿里云
+     * @param filerealpath 文件存储路径
+     * @param filename 文件名称
+     * @param iszip 是否压缩
+     * @param isaesencrypt 是否加密
+     * @param aescode 加密串
+     */		
+	public void  uploadFile(final String filerealpath,final String filename,final String iszip,final String isaesencrypt,final String aescode){
+		//判断阿里云工具类能否正常加载
+		if(!isexistAliOSSObjectUtil()){
+			return ;
+		}		
+		//判断是否启用了阿里云
+		if(!AliOSSObjectUtil.isEnable()){
+			return ;
+		}
+		
+		try {
+			if(isonlyAliOSS()){
+				uploadFileThread(filerealpath, filename, iszip, isaesencrypt,aescode);				
+			}else{
+				new Thread(new Runnable() {
+					public void run() {
+						uploadFileThread(filerealpath, filename, iszip, isaesencrypt,aescode);
+					}
+				}).start();				
+			}
+
+		} catch (Exception ex) {
+		}				
+	}
+    /**
+     * 上传文件到阿里云  线程方法
+     * @param filerealpath 文件存储路径
+     * @param filename 文件名称
+     * @param iszip 是否压缩
+     * @param isaesencrypt 是否加密
+     * @param aescode 加密串
+     */		
+	private void uploadFileThread(String filerealpath,String filename,String iszip,String isaesencrypt,String aescode){
+
+		 InputStream imagefile = null;
+		try {
+			String tokenKey=this.getTokenKeyByFileRealPath(filerealpath);
+            File thefile = new File(filerealpath) ;
+
+            if(iszip.equals("1")) {
+                ZipInputStream zin = new ZipInputStream(new FileInputStream(thefile)) ;
+                if(zin.getNextEntry() != null)
+                    imagefile = new BufferedInputStream(zin);
+            } else{
+                imagefile = new BufferedInputStream(new FileInputStream(thefile)) ;
+            }			
+			if(isaesencrypt.equals("1")){
+				imagefile = AESCoder.decrypt(imagefile, aescode);
+			}  
+	        AliOSSObjectUtil.autoUploadFile(tokenKey, filename,imagefile);	
+        
+		} catch (Exception ex) {
+		}finally{			
+            try{
+            	if(imagefile!=null){
+            		imagefile.close() ;
+            	}
+            }catch(Exception ex){
+            }          
+		}
+	}
+    /**
+     * 根据文件存储路径获取存储Key
+     * @param filerealpath 文件存储路径
+     * @return 存储Key
+     */	
+	public  static String getTokenKeyByFileRealPath(String filerealpath){
+		String tokenKey="";
+		try {
+			if(filerealpath==null||filerealpath.trim().equals("")){
+				return tokenKey;
+			}
+        	int i = filerealpath.lastIndexOf("/");
+        	int j = filerealpath.lastIndexOf("\\");			
+        	int index = i >j?i:j;
+        	if(index<0){
+				return tokenKey;        		
+        	}
+        	int point = 0;        	
+        	String tempstr = filerealpath.substring(index,filerealpath.length());
+        	if(tempstr.indexOf(".")!=-1){
+        		point = index + tempstr.lastIndexOf(".");
+        	}else{
+        		point = filerealpath.length();
+        	}
+        	tokenKey = filerealpath.substring(index-8,point)+".wfile";
+        	tokenKey = tokenKey.replaceAll("\\\\", "/");       	
+        	
+		} catch (Exception ex) {
+		}				
+		return tokenKey;
+	}
+	
+    /**
+     * 判断当前用户是否通过云盘查看文档
+     * @param req 页面请求信息
+     * @return 是否能够通过云盘查看文档
+     */		
+	public  static boolean isEnableForDsp(HttpServletRequest req){
+		boolean isEnableForDsp=false;
+		try {
+			if(!isexistAliOSSObjectUtil()){
+				return isEnableForDsp;
+			}
+			boolean isEnable=AliOSSObjectUtil.isEnable();
+			if(!isEnable){
+				return isEnableForDsp;
+			}
+			String ip=Util.getIpAddr(req);
+			boolean checktmp = checkIpInner(ip);
+			if(isEnable&&(!checktmp)){
+				isEnableForDsp=true;
+			}
+			
+		} catch (Exception ex) {
+		}				
+		return isEnableForDsp;		
+	}
+	
+    /**
+     * 判断该附件能否通过云盘查看
+     * @param imageFileId 附件id
+     * @return 是否能够通过云盘查看文档
+     */		
+	public  static boolean isEnableForImageFile(int imageFileId){
+		boolean isEnableForImageFile=false;
+		try {
+			String tokenKey="";
+			String storageStatus="";
+			RecordSet rs=new RecordSet();
+			rs.executeSql("select TokenKey,StorageStatus from ImageFile where imageFileId="+imageFileId);
+			if(rs.next()){
+				tokenKey=Util.null2String(rs.getString("TokenKey"));
+				storageStatus=Util.null2String(rs.getString("StorageStatus"));
+			}
+			if(!tokenKey.equals("")&&storageStatus.equals("1")){
+				isEnableForImageFile=true;
+			}
+		} catch (Exception ex) {
+		}				
+		return isEnableForImageFile;		
+	}	
+
+    /**
+     * 根据附件id获取tokenKey
+     * @param imageFileId 附件id
+     * @return tokenKey    注：storageStatus不为1时tokenKey为空
+     */		
+	public  static String getTokenKeyByImageFileId(int imageFileId){
+		String tokenKey="";
+		try {
+			String storageStatus="";
+			RecordSet rs=new RecordSet();
+			rs.executeSql("select TokenKey,StorageStatus from ImageFile where imageFileId="+imageFileId);
+			if(rs.next()){
+				tokenKey=Util.null2String(rs.getString("TokenKey"));
+				storageStatus=Util.null2String(rs.getString("StorageStatus"));
+			}
+			if(!storageStatus.equals("1")){
+				tokenKey="";
+			}
+		} catch (Exception ex) {
+		}				
+		return tokenKey;		
+	}
+	
+	/**
+	 * 判断网址是否为内网地址
+	 * @param ipaddress
+	 * @return boolean  true :是     false:否
+	 */
+	private static boolean checkIpInner(String ipaddress) {		
+		boolean checktmp = false;
+		String isInner = Util.null2String(Prop.getPropValue("alioss","isInner"));
+		if(isInner.equals("false")){
+			return checktmp;
+		}
+		
+		ipaddress=Util.null2String(ipaddress);
+		long ipNum = IpUtils.ip2number(ipaddress);    
+		long a1=IpUtils.ip2number("10.0.0.0");
+		long a2=IpUtils.ip2number("10.255.255.255");
+		long b1=IpUtils.ip2number("172.16.0.0");
+		long b2=IpUtils.ip2number("172.31.255.255");       
+		long c1=IpUtils.ip2number("192.168.0.0");
+		long c2=IpUtils.ip2number("192.168.255.255");
+		
+		if(isInner(ipNum,a1,a2) || isInner(ipNum,b1,b2) || isInner(ipNum,c1,c2) || ipaddress.equals("127.0.0.1")){
+			checktmp=true;
+		}
+		
+        return checktmp;
+	}
+	
+	private static boolean isInner(long userIp,long begin,long end){
+	    return (userIp>=begin) && (userIp<=end);
+	}
+	
+	
+    /**
+     * 判断当前用户是否通过Safari浏览器查看文档
+     * @param req 页面请求信息
+     * @return isEnableForDsp
+     */		
+	public  static boolean isSafari(HttpServletRequest req){
+		boolean isSafari=false;
+		try {
+			String  userAgent=Util.null2String(req.getHeader("USER-AGENT"));
+			if(userAgent.indexOf("Safari") > -1 && userAgent.indexOf("Chrome") < 1 && userAgent.indexOf("Edge") < 1){
+				isSafari=true;
+			}
+			
+		} catch (Exception ex) {
+		}				
+		return isSafari;		
+	}
+    /**
+     * 判断阿里云工具类能否正常加载
+     * @return isexist   
+     */			
+	public  static boolean isexistAliOSSObjectUtil(){
+		boolean isexist= true;
+		try{    
+			Class.forName("weaver.alioss.AliOSSObjectUtil");
+		}catch(ExceptionInInitializerError e){
+			isexist = false;	//判断云存储是否正常
+		}catch(IllegalArgumentException e){
+			isexist = false;	//判断云存储是否正常
+		}catch(NoClassDefFoundError e){
+			isexist = false;	//判断云存储是否正常
+		}catch(Exception e){ 
+			isexist = false;	//判断云存储是否正常
+		}
+		return isexist;
+	}
+	
+    /**
+     * 判断是否将数据流传输到服务器再下载
+     * 
+     * @return isexist   
+     */			
+	public  static boolean isAliOSSToServer(String comefrom){
+		boolean isAliOSSToServer= false;
+		if(comefrom==null||comefrom.trim().equals("")){
+			return isAliOSSToServer;
+		}
+		try{
+			//判断阿里云工具类能否正常加载
+			if(!isexistAliOSSObjectUtil()){
+				return isAliOSSToServer;
+			}		
+			//判断是否启用了阿里云
+			if(!AliOSSObjectUtil.isEnable()){
+				return isAliOSSToServer;
+			}			
+
+			//判断是否配置的是阿里云的内网地址
+			if(AliOSSObjectUtil.getAliossServerAddress().contains("internal.aliyuncs")){
+				isAliOSSToServer =  true;
+			}
+
+			String AliOSSToServerComeFrom = Util.null2String(Prop.getPropValue("alioss","AliOSSToServerComeFrom"));
+			if(AliOSSToServerComeFrom.trim().equals("")){
+				AliOSSToServerComeFrom="WorkflowToDoc";
+			}
+			if((","+AliOSSToServerComeFrom+",").indexOf(","+comefrom+",")>=0){
+				isAliOSSToServer=true;
+			}
+			
+		}catch(Exception e){ 
+			isAliOSSToServer = false;	//判断云存储是否正常
+		}
+		return isAliOSSToServer;
+	}
+
+    /**
+     * 判断是否仅启用阿里云
+     * 
+     * @return true:   
+     */			
+	public  static boolean isonlyAliOSS(){
+		boolean isonlyAliOSS= false;
+
+		try{
+			//判断阿里云工具类能否正常加载
+			if(!isexistAliOSSObjectUtil()){
+				return isonlyAliOSS;
+			}		
+			//判断是否启用了阿里云
+			if(!AliOSSObjectUtil.isEnable()){
+				return isonlyAliOSS;
+			}				
+			
+			String onlyAliOSS = Util.null2String(Prop.getPropValue("alioss","onlyAliOSS"));
+			if(onlyAliOSS.trim().equals("1")){
+				isonlyAliOSS=true;
+			}
+		}catch(Exception e){ 
+			isonlyAliOSS = false;	//判断云存储是否正常
+		}
+		return isonlyAliOSS;
+	}
+	
+    /**
+     * 是否启用阿里云oss服务
+     * @return
+     */
+    public static boolean isEnable(){
+    	boolean isEnable=false;
+		//判断阿里云工具类能否正常加载
+		if(!isexistAliOSSObjectUtil()){
+			return isEnable;
+		}	    	
+    	isEnable=Prop.getPropValue("alioss","status").equalsIgnoreCase("1");
+    	return  isEnable;
+    }	
+	
+}
\ No newline at end of file
diff --git a/src/main/youhong_ai_old_src/weaver/ddbx/base/ActionLog.java b/src/main/youhong_ai_old_src/weaver/ddbx/base/ActionLog.java
new file mode 100644
index 0000000..10760e6
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/ddbx/base/ActionLog.java
@@ -0,0 +1,57 @@
+package weaver.ddbx.base;
+
+import weaver.conn.RecordSet;
+import weaver.general.Util;
+
+/**
+ * Action操作日志写入
+ */
+public class ActionLog extends BaseLog {
+    //日志类型
+    private static int logType = 1;
+    /**
+     * 调式日志写入
+     * @param logstr
+     */
+    public static void writeDebuggerLog(String logstr){
+        writeNewLog(logType,LogLevel.DEBUGGER.getIndex(),logstr);
+    }
+
+    /**
+     * 警告日志写入
+     * @param logstr
+     */
+    public static void writeWaringLog(String logstr){
+        writeNewLog(logType,LogLevel.ERROR.getIndex(),logstr);
+    }
+
+    /**
+     * 错误日志写入
+     * @param logstr
+     */
+    public static void writeErrorLog(String logstr){
+        writeNewLog(logType,LogLevel.ERROR.getIndex(),logstr);
+    }
+
+    /**
+     * 根据流程类型ID获取其对应的表单名称
+     * @param workflowid 流程类型ID
+     * @return 字符串
+     */
+    public static String getBillTableNameByWorkflowId(String workflowid){
+        String tablename = "";
+
+        RecordSet rs = new RecordSet();
+        if(!"".equals(workflowid)){
+            String select_data = "select tablename from workflow_bill where id in (select formid from workflow_base where id = ?)";
+
+            if(rs.executeQuery(select_data, workflowid)){
+                if(rs.next()){
+                    tablename = Util.null2String(rs.getString(1));
+                }
+            }
+        }
+
+        return tablename;
+    }
+}
diff --git a/src/main/youhong_ai_old_src/weaver/ddbx/base/ApiLog.java b/src/main/youhong_ai_old_src/weaver/ddbx/base/ApiLog.java
new file mode 100644
index 0000000..99f7b26
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/ddbx/base/ApiLog.java
@@ -0,0 +1,19 @@
+package weaver.ddbx.base;
+
+/**
+ * 接口API接口日志操作
+ */
+public class ApiLog extends BaseLog{
+    private static int logType = 0;
+    public static void writeDebuggerLog(String logstr){
+        writeNewLog(logType,LogLevel.DEBUGGER.getIndex(),logstr);
+    }
+
+    public static void writeWaringLog(String logstr){
+        writeNewLog(logType,LogLevel.WARNING.getIndex(),logstr);
+    }
+
+    public static void writeErrorLog(String logstr){
+        writeNewLog(logType,LogLevel.ERROR.getIndex(),logstr);
+    }
+}
diff --git a/src/main/youhong_ai_old_src/weaver/ddbx/base/BaseLog.java b/src/main/youhong_ai_old_src/weaver/ddbx/base/BaseLog.java
new file mode 100644
index 0000000..27f3f1b
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/ddbx/base/BaseLog.java
@@ -0,0 +1,100 @@
+package weaver.ddbx.base;
+
+import weaver.conn.RecordSet;
+import weaver.general.BaseBean;
+import weaver.general.GCONST;
+import weaver.general.TimeUtil;
+import weaver.general.Util;
+
+import java.io.*;
+
+/**
+ * 大地保险
+ * 基础日志操作写入工具
+ */
+public class BaseLog extends BaseBean {
+
+    /**
+     * 写入同步的日志文件
+     * @param datatype 0-API日志  1-流程日志  2-建模日志 3-定时任务日志
+     * @param  s
+     */
+    protected static void writeNewLog(int datatype,String s){
+        writeNewLog(datatype,LogLevel.DEBUGGER.getIndex(),s);
+    }
+    /**
+     * 写入同步的日志文件
+     * @param datatype 0-API日志  1-流程日志  2-建模日志 3-定时任务日志
+     * @param logLevel 0-DEBUG 1-WARNING 2-ERROR
+     * @param  s 日志信息
+     */
+    protected static void writeNewLog(int datatype,int logLevel,String s){
+        try {
+            String filename = "";
+
+            if(datatype == 0){
+                filename = "api_" + TimeUtil.getCurrentDateString().replace("-","") + ".log";
+            }else if(datatype == 1){
+                filename = "workflow_" + TimeUtil.getCurrentDateString().replace("-","") + ".log";
+            }else if(datatype == 2){
+                filename = "formmode_" + TimeUtil.getCurrentDateString().replace("-","") + ".log";
+            }else if(datatype == 3){
+                filename = "job_" + TimeUtil.getCurrentDateString().replace("-","") + ".log";
+            }
+
+            String levelChar = "DEBUG";
+
+            if(logLevel == LogLevel.WARNING.getIndex()){
+                levelChar = "WARNING";
+            }else if(logLevel == LogLevel.ERROR.getIndex()){
+                levelChar = "ERROR";
+            }
+            //日志文件路径
+            String logFolder = GCONST.getRootPath() + "log" + File.separatorChar + "cus";
+
+            File f = new File(logFolder);
+
+            // 创建文件夹
+            if (!f.exists()) {
+                f.mkdirs();
+            }
+
+            f = new File(logFolder + File.separatorChar  + filename);
+            //文件不存在，则直接创建
+            if(!f.exists()){
+                f.createNewFile();
+            }
+
+            BufferedWriter out = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(f, true)));
+
+            out.write("[" + levelChar + "][" + TimeUtil.getCurrentTimeString() + "]:"+ s + "\r\n");
+
+            //关闭写入流
+            out.close();
+
+        } catch (IOException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+            new BaseBean().writeLog("创建日志文件存在异常:[" + e.getMessage() + "/" + e.toString() + "]");
+        }
+    }
+
+
+    /**
+     * 获取系统参数设置值
+     * @param uuid 参数标识
+     * @return 返回配置值
+     */
+    public static String getSystemParamValue(String uuid){
+        if(!"".equals(uuid)){
+            String select_sql = "select paramvalue from uf_systemconfig where uuid = ?";
+
+            RecordSet rs = new RecordSet();
+            rs.executeQuery(select_sql,uuid);
+            if(rs.next()){
+                return Util.null2String(rs.getString(1));
+            }
+        }
+        return "";
+    }
+}
diff --git a/src/main/youhong_ai_old_src/weaver/ddbx/base/JobLog.java b/src/main/youhong_ai_old_src/weaver/ddbx/base/JobLog.java
new file mode 100644
index 0000000..7204dc5
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/ddbx/base/JobLog.java
@@ -0,0 +1,33 @@
+package weaver.ddbx.base;
+
+/**
+ * 计划任务日志写入操作类
+ *
+ */
+public class JobLog extends BaseLog {
+    //日志类型
+    private static int logType = 3;
+    /**
+     * 调式日志写入
+     * @param logstr
+     */
+    public static void writeDebuggerLog(String logstr){
+        writeNewLog(logType,LogLevel.DEBUGGER.getIndex(),logstr);
+    }
+
+    /**
+     * 警告日志写入
+     * @param logstr
+     */
+    public static void writeWaringLog(String logstr){
+        writeNewLog(logType,LogLevel.ERROR.getIndex(),logstr);
+    }
+
+    /**
+     * 错误日志写入
+     * @param logstr
+     */
+    public static void writeErrorLog(String logstr){
+        writeNewLog(logType,LogLevel.ERROR.getIndex(),logstr);
+    }
+}
diff --git a/src/main/youhong_ai_old_src/weaver/ddbx/base/LogLevel.java b/src/main/youhong_ai_old_src/weaver/ddbx/base/LogLevel.java
new file mode 100644
index 0000000..9ccf322
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/ddbx/base/LogLevel.java
@@ -0,0 +1,42 @@
+package weaver.ddbx.base;
+
+public enum LogLevel {
+    DEBUGGER(0,"调试"),
+    WARNING(1,"警告"),
+    ERROR(2,"错误");
+
+    /**
+     * 描述
+     */
+    private String desc;
+    /**
+     * 级别标识
+     */
+    private int index;
+
+    /**
+     * 构造方法
+     * @param index
+     * @param desc
+     */
+    private LogLevel(int index,String desc){
+        this.desc = desc;
+        this.index = index;
+    }
+
+    public String getDesc() {
+        return desc;
+    }
+
+    public void setDesc(String desc) {
+        this.desc = desc;
+    }
+
+    public int getIndex() {
+        return index;
+    }
+
+    public void setIndex(int index) {
+        this.index = index;
+    }
+}
diff --git a/src/main/youhong_ai_old_src/weaver/ddbx/base/ModeLog.java b/src/main/youhong_ai_old_src/weaver/ddbx/base/ModeLog.java
new file mode 100644
index 0000000..25f400f
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/ddbx/base/ModeLog.java
@@ -0,0 +1,29 @@
+package weaver.ddbx.base;
+
+public class ModeLog extends BaseLog {
+    //日志类型
+    private static int logType = 2;
+    /**
+     * 调式日志写入
+     * @param logstr
+     */
+    public static void writeDebuggerLog(String logstr){
+        writeNewLog(logType,LogLevel.DEBUGGER.getIndex(),logstr);
+    }
+
+    /**
+     * 警告日志写入
+     * @param logstr
+     */
+    public static void writeWaringLog(String logstr){
+        writeNewLog(logType,LogLevel.ERROR.getIndex(),logstr);
+    }
+
+    /**
+     * 错误日志写入
+     * @param logstr
+     */
+    public static void writeErrorLog(String logstr){
+        writeNewLog(logType,LogLevel.ERROR.getIndex(),logstr);
+    }
+}
diff --git a/src/main/youhong_ai_old_src/weaver/docs/docs/DocManager.java b/src/main/youhong_ai_old_src/weaver/docs/docs/DocManager.java
new file mode 100644
index 0000000..058a2d8
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/docs/docs/DocManager.java
@@ -0,0 +1,9998 @@
+package weaver.docs.docs;
+
+import com.api.doc.detail.service.DocSaveService;
+import com.api.doc.detail.util.DocDownloadCheckUtil;
+import weaver.conn.RecordSet;
+import weaver.conn.RecordSetData;
+import weaver.conn.constant.DBConstant;
+import weaver.crm.Maint.CustomerInfoComInfo;
+import weaver.docs.DocDetailLog;
+import weaver.docs.category.DocTreeDocFieldComInfo;
+import weaver.docs.category.DocTreeDocFieldManager;
+import weaver.docs.category.SecCategoryComInfo;
+import weaver.docs.category.SubCategoryComInfo;
+import weaver.docs.docs.reply.DocReplyManager;
+import weaver.docs.util.DocTriggerUtils;
+import weaver.file.FileUpload;
+import weaver.file.ImageFileManager;
+import weaver.general.*;
+import weaver.hrm.User;
+import weaver.hrm.appdetach.AppDetachComInfo;
+import weaver.hrm.company.DepartmentComInfo;
+import weaver.hrm.contract.ContractTypeComInfo;
+import weaver.hrm.resource.ResourceComInfo;
+import weaver.share.ShareManager;
+import weaver.system.SendToAllForNew;
+import weaver.system.SysRemindWorkflow;
+import weaver.system.ThreadForAllForNew;
+import weaver.systeminfo.SysMaintenanceLog;
+import weaver.systeminfo.setting.HrmUserSettingComInfo;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+import java.util.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * Title: 文档处理基本类
+ * Company: weaver
+ * 
+ * @author zh
+ * @version 1.0
+ */
+
+
+
+
+public class DocManager extends BaseBean {
+
+	private static DocIdUpdate docIdUpdate = new DocIdUpdate();
+	
+	private static ImageFileIdUpdate imageFileIdUpdate = new ImageFileIdUpdate();
+	
+	private static VersionIdUpdate versionIdUpdate = new VersionIdUpdate();	
+		
+    private ResourceComInfo hrc;
+
+    private CustomerInfoComInfo cici;
+
+    private DepartmentComInfo dci;
+ 
+    private SecCategoryComInfo scc;
+    
+    private SubCategoryComInfo subc;
+    
+    
+    private DocComInfo dc;
+
+
+    private RecordSetData rs = new RecordSetData();
+    
+    private RecordSetData tmprs = new RecordSetData();
+    
+    private RecordSetData recorder = new RecordSetData();
+    
+    private RecordSetData record = new RecordSetData();
+    
+
+    private DocDetailLog log;
+
+    private DocImageManager imgManger;
+
+    private ContractTypeComInfo ctci = new ContractTypeComInfo();
+
+    private String action;
+
+    private String clientip;
+
+    private int userid;
+
+    private int languageid;
+
+    private String sql_where;
+
+    private int id; /* 文档id */
+    
+    private int oldVersionId;//文件版本id
+
+    private int maincategory; /* 文档主目录 */
+
+    private int subcategory; /* 文档分目录 */
+
+    private int seccategory; /* 文档子目录 */
+
+    private int doclangurage; /* 文档语言 */
+
+    private String docapprovable; /* 是否需要审批 0:否 1:是 */
+
+    private String docreplyable; /* 可否回复 0:否 1:是 */
+
+    private String isreply; /* 是否回复文档 0:否 1:是 */
+
+    private int replydocid; /* 回复文件id */
+
+    private String docsubject; /* 文档主题 */
+
+    private String doccontent; /* 文档内容 HTML格式 */
+
+    private String docpublishtype;
+
+    /*
+     * 文档发布类型 1:正常(不发布) 2:新闻 3:标题新闻
+     */
+    private String docpublishtypeold;
+
+    private int itemid; /* 文档中选择的物品id */
+
+    private int itemmaincategoryid; /* 文档中选择的物品种类id */
+
+    private int hrmresid; /* 文档中选择的人力资源id */
+
+    private int assetid; // 文档中选择资产id
+
+    private int ownerid; // 创建人id   调整为  文档所有者id
+
+    private int crmid; /* 文档中选择的CRM id */
+
+    private int projectid; /* 文档中选择的项目id */
+
+    private int financeid; /* 文档中选择的财务-交易id */
+
+    private int doccreaterid; /* 文档创建者id */
+
+    private int docdepartmentid; /* 文档创建者所在部门id */
+
+    private String doccreatedate; /* 文档创建日期 */
+
+    private String doccreatetime; /* 文档创建时间 */
+
+    private int doclastmoduserid; /* 文档最后修改者id */
+
+    private String doclastmoddate; /* 文档最后修改日期 */
+
+    private String doclastmodtime; /* 文档最后修改时间 */
+
+    private int docapproveuserid; /* 文档审批者id */
+
+    private String docapprovedate; /* 文档审批日期 */
+
+    private String docapprovetime; /* 文档审批时间 */
+
+    private int docarchiveuserid; /* 文档归档者id */
+
+    private String docarchivedate; /* 文档归档日期 */
+
+    private String docarchivetime; /* 文档归档时间 */
+
+    private String docstatus; /* 文档状态:0:草稿,1:生效/正常(不需要审批，归档重新打开),2: 生效/正常(审批后,发布后),3:审批,4:退回(草稿),5:归档,6:待发布,7:失效,8:作废 */
+
+    private String parentids; /* 文档父节点 */
+
+    private String keyword; /* 文档的关键字 */
+
+    private int accessorycount; /* 附件总数 */
+
+    private int replaydoccount; /* 回复文档总数 */
+
+    private String usertype; /* 创建的用户类型 1: 内部 2: 外部 */  //该字段调整为：当前操作用户的用户类型  1: 内部用户 2: 外部用户
+
+    private int id2; /* remark表的id */
+
+    private String approveremark; /* 批复意见 */
+
+    private String isapprover; /* 是否批谁通过：是－１，否（退回）－０ */
+
+    private String docno;
+
+    private String topage; // link other module
+
+    private String oldstatus; // check if the pre status is return : "4"
+
+    private int oldownerid;
+
+    private String contractman = ""; // 合同人
+
+    private String contractstartdate = ""; // 合同开始日期
+
+    private String contractenddate = ""; // 合同结束日期
+
+    private String docmodule = ""; // 文档模板
+
+    private String proenddate = ""; // 试用期结束日期
+
+    private int typeid = 0; // contract type id
+
+    private String urlfrom = ""; // 用于判断来自以及返回的页面
+
+    // add by 王金永
+    private int docType = 1;
+
+    private int newsid = 0;// 杨国生2003-09-05加用于解决网站传递新闻组的接口
+
+    private String canCopy = "1"; // 1：表示在查看状态下此文档不能够拷贝； 2：表示在查看状态下此文档可以拷贝
+
+    private String canRemind = "1"; // 1：表示是否回复提醒； 1：没有回复提醒；2：有回复提醒
+
+    // add by 董平
+    private String userCatalogId = "0"; // 用户目录
+
+    private String orderable = "0"; // 此目录下的文档是否可订阅 0,不可以 1,可以
+
+    private String docextendname = ""; // 文档的扩展名 html doc xls ppt wps
+
+    private String opreateType = ""; // 操作者的ID
+    
+    // add by wdl
+    private String docCode = ""; //文档编码
+    private int docEdition = -1; //文档版本
+    private int docEditionId = -1; //文档版本ID
+    private int isHistory = 0;//是否历史版本
+    private int approveType = 0;//审批类型(1:生效审批,2:失效审批)
+    
+    private int mainDoc = -1; //主文档(默认当前文档)
+    private int readOpterCanPrint = 0; //允许只读操作人打印 0,不允许 1,允许
+    private int selectedPubMouldId = 0; //发布时所选的显示模版ID
+    private int canPrintedNum = 0;//可打印份数
+    
+    private int docValidUserId = 0;//生效操作人
+    private String docValidDate = "";//生效日期
+    private String docValidTime = "";//生效时间
+    
+    private int docPubUserId = 0;//发布操作人
+    private String docPubDate = "";//发布日期
+    private String docPubTime = "";//发布时间
+    
+    private int docReOpenUserId = 0;//重新打开操作人
+    private String docReOpenDate = "";//重新打开日期
+    private String docReOpenTime = "";//重新打开时间
+    
+    private int docInvalUserId = 0;//失效操作人
+    private String docInvalDate = "";//失效日期
+    private String docInvalTime = "";//失效时间
+
+    private String dummycata = "";//虚拟目录
+    
+    private int docCancelUserId = 0;//作废操作人
+    private String docCancelDate = "";//作废日期
+    private String docCancelTime = "";//作废时间
+    
+    private String invalidationDate = "";//失效时间
+    
+    private String checkOutStatus = "0";//签出状态  1：签出，0：未签出
+    private int checkOutUserId = 0;//签出用户
+    private String checkOutUserType = "";//签出用户类型   1:内部用户，2：外部用户
+    private String checkOutDate = "";//签出日期
+    private String checkOutTime = "";//签出时间   
+    
+    private String hasUsedTemplet = "";//是否已经套红
+    
+    private String docCreaterType; // 文档创建者类型（1:内部用户  2：外部用户）    
+    private String docLastModUserType; // 文档最后修改者类型（1:内部用户  2：外部用户）    
+    private String docApproveUserType; // 文档审批者类型（1:内部用户  2：外部用户）    
+    private String docValidUserType; // 生效操作人类型（1:内部用户  2：外部用户）    
+    private String docInvalUserType; // 失效操作人类型（1:内部用户  2：外部用户）    
+    private String docArchiveUserType; // 文档归档者类型（1:内部用户  2：外部用户）    
+    private String docCancelUserType; // 作废操作人类型（1:内部用户  2：外部用户）    
+    private String docPubUserType; // 发布操作人类型（1:内部用户  2：外部用户）    
+    private String docReopenUserType; // 重新打开操作人类型（1:内部用户  2：外部用户）    
+    private String ownerType; // 文档拥有者类型（1:内部用户  2：外部用户） 
+    private int secretLevel;  //文档密级
+    private String secretValidity;  //文档密级期限
+
+    private String[] customDataIdMapping; //自定义字段映射关系:"id1_id2"
+
+    private int hrmContractId;//合同id    
+    
+    private FileUpload fileUpload;//FileUpload对象
+    
+    private ShareManager ShareManager;
+
+	private SysMaintenanceLog SysMaintenanceLog;
+
+	private List imageFileIdOfPicChangeList;
+	
+	private int editMouldId=0;//文档编辑模板id
+
+	private int replyremind=0;//回复提醒
+
+	private int docVestIn;
+	
+	private String source;
+
+	private HrmUserSettingComInfo userSetting=null;
+	
+	public static final int DEFAILT_SECRET_LEVEL = 4;
+	
+    /**
+     * 构造函数
+     */
+    public DocManager() {
+        try {
+			userSetting=new HrmUserSettingComInfo();
+            hrc = new ResourceComInfo();
+            dci = new DepartmentComInfo();
+            cici = new CustomerInfoComInfo();
+            scc = new SecCategoryComInfo();
+            subc= new SubCategoryComInfo();
+            log = new DocDetailLog();
+            imgManger = new DocImageManager();
+            ShareManager = new ShareManager();
+			SysMaintenanceLog = new SysMaintenanceLog();
+            dc = new DocComInfo();
+            resetParameter();
+        } catch (Exception ex) {
+            writeLog(ex);
+        }
+    }
+
+    /**
+     * 重置各参数的值
+     */
+    public void resetParameter() {
+        imgManger.resetParameter();
+        this.action = "";
+        clientip = "";
+        userid = 0;
+        languageid = 0;
+        id = 0;
+        this.oldVersionId=0;
+        sql_where = "";
+        this.maincategory = 0;
+        this.subcategory = 0;
+        this.seccategory = 0;
+        this.doclangurage = 0;
+        this.docapprovable = "";
+        this.docreplyable = "";
+        this.isreply = "";
+        this.replydocid = 0;
+        this.docsubject = "";
+        this.doccontent = "";
+        this.docpublishtype = "";
+        this.docpublishtypeold = "";
+        this.itemid = 0;
+        this.itemmaincategoryid = 0;
+        this.hrmresid = 0;
+        this.assetid = 0;
+        this.ownerid = 0;
+        this.crmid = 0;
+        this.projectid = 0;
+        this.financeid = 0;
+        this.doccreaterid = 0;
+        this.docdepartmentid = 0;
+        this.doccreatedate = "";
+        this.doccreatetime = "";
+        this.doclastmoduserid = 0;
+        this.doclastmoddate = "";
+        this.doclastmodtime = "";
+        this.docapproveuserid = 0;
+        this.docapprovedate = "";
+        this.docapprovetime = "";
+        this.docarchiveuserid = 0;
+        this.docarchivedate = "";
+        this.docarchivetime = "";
+        this.docstatus = "";
+        this.parentids = "";
+        this.keyword = ""; /* 文档的关键字 */
+        this.accessorycount = 0; /* 附件总数 */
+        this.replaydoccount = 0; /* 回复文档总数 */
+        this.usertype = ""; /* 创建的用户类型 1: 内部 2: 外部 */   //该字段调整为：当前操作用户的用户类型  1: 内部用户 2: 外部用户
+        this.opreateType = "";
+
+        this.id2 = 0; /* remark表的id */
+        this.approveremark = ""; /* 批复意见 */
+        this.isapprover = ""; /* 是否批谁通过：是－１，否（退回）－０ */
+        this.docno = "";
+        this.oldstatus = "";
+        this.oldownerid = 0;
+
+        this.contractman = "";
+        this.contractstartdate = "";
+        this.contractenddate = "";
+        this.proenddate = "";
+        this.typeid = 0;
+        this.urlfrom = "";
+        this.newsid = 0;
+        this.userCatalogId = "0";
+        this.docextendname = "html";
+        
+        
+        
+        this.docCode = "";
+        this.docEdition = -1;
+        this.docEditionId = -1;
+        this.isHistory = 0;
+        this.mainDoc = -1;
+        this.readOpterCanPrint = 0;
+
+        this.docValidUserId = 0;
+        this.docValidDate = "";
+        this.docValidTime = "";
+        
+        this.docPubUserId = 0;
+        this.docPubDate = "";
+        this.docPubTime = "";
+        
+        this.docReOpenUserId = 0;
+        this.docReOpenDate = "";
+        this.docReOpenTime = "";
+        
+        this.docInvalUserId = 0;
+        this.docInvalDate = "";
+        this.docInvalTime = "";
+        
+        this.docCancelUserId = 0;
+        this.docCancelDate = "";
+        this.docCancelTime = "";
+        
+        this.invalidationDate = "";
+		this.dummycata = "";
+        this.canPrintedNum=0;
+		
+        this.checkOutStatus = "0";
+        this.checkOutUserId = 0;
+        this.checkOutUserType = "";
+        this.checkOutDate = "";
+        this.checkOutTime = "";  
+        
+        this.hasUsedTemplet="0";
+        
+        this.docCreaterType="1"; 
+        this.docLastModUserType=""; 
+        this.docApproveUserType=""; 
+        this.docValidUserType=""; 
+        this.docInvalUserType=""; 
+        this.docArchiveUserType=""; 
+        this.docCancelUserType=""; 
+        this.docPubUserType=""; 
+        this.docReopenUserType="";
+        this.ownerType="";
+
+        this.hrmContractId=0;        
+        this.fileUpload=null;
+        
+        this.imageFileIdOfPicChangeList=null;
+        this.editMouldId=0;	   
+        this.docVestIn = 0;
+        this.secretLevel = DEFAILT_SECRET_LEVEL;
+        this.secretValidity = "";
+        this.replyremind = 0;
+    }
+
+    /**
+     * 设置个人文档目录
+     * 
+     * @param userCatalogId 个人文档目录
+     */
+    public void setUserCatalogId(String userCatalogId) {
+        this.userCatalogId = userCatalogId;
+    }
+
+    /**
+     * 返回个人文档目录
+     * 
+     * @return 个人文档目录
+     */
+    public String getUserCatalogId() {
+        return this.userCatalogId;
+    }
+
+    /**
+     * 设置 sql条件语句
+     * 
+     * @param sql sql条件语句
+     */
+    public void setSql_where(String sql) {
+        this.sql_where = sql;
+    }
+
+    /**
+     * 设置文档id
+     * 
+     * @param id 文档id
+     */
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    /**
+     * 设置用户语言ID
+     * 
+     * @param id 用户语言ID
+     */
+    public void setLanguageid(int id) {
+        this.languageid = id;
+    }
+
+    /**
+     * 设置文档主目录
+     * 
+     * @param maincategory 文档主目录
+     */
+    public void setMaincategory(int maincategory) {
+        this.maincategory = maincategory;
+    }
+
+    /**
+     * 设置文档分目录
+     * 
+     * @param subcategory 文档分目录
+     */
+    public void setSubcategory(int subcategory) {
+        this.subcategory = subcategory;
+    }
+
+    /**
+     * 设置文档子目录
+     * 
+     * @param seccategory 文档子目录
+     */
+    public void setSeccategory(int seccategory) {
+        this.seccategory = seccategory;
+    }
+
+    /**
+     * 设置文档语言
+     * 
+     * @param doclangurage 文档语言
+     */
+    public void setDoclangurage(int doclangurage) {
+        this.doclangurage = doclangurage;
+    }
+
+    /**
+     * 设置 是否需要审批 0:否 1:是
+     * 
+     * @param docapprovable 是否需要审批 0:否 1:是
+     */
+    public void setDocapprovable(String docapprovable) {
+        this.docapprovable = docapprovable;
+    }
+
+    /**
+     * 设置可否回复
+     * 
+     * @param docreplyable 可否回复 0:否 1:是
+     */
+    public void setDocreplyable(String docreplyable) {
+        this.docreplyable = docreplyable;
+    }
+
+    /**
+     * 是否回复文档
+     * 
+     * @param isreply 是否回复文档
+     */
+    public void setIsreply(String isreply) {
+        this.isreply = isreply;
+    }
+
+    /**
+     * 回复文件id
+     * 
+     * @param replydocid 回复文件id
+     */
+    public void setReplydocid(int replydocid) {
+        this.replydocid = replydocid;
+    }
+
+    /**
+     * 设置文档主题
+     * 
+     * @param docsubject 文档主题
+     */
+    public void setDocsubject(String docsubject) {
+        this.docsubject = docsubject;
+    }
+
+    /**
+     * 设置文档内容
+     * 
+     * @param doccontent 文档内容
+     */
+    public void setDoccontent(String doccontent) {
+        this.doccontent = doccontent;
+    }
+
+    /**
+     * 设置文档发布类型
+     * 
+     * @param docpublishtype 文档发布类型 1:正常(不发布) 2:新闻 3:标题新闻
+     */
+    public void setDocpublishtype(String docpublishtype) {
+        if ("".equals(docpublishtype))
+            docpublishtype = "1";
+        this.docpublishtype = docpublishtype;
+    }
+
+    /**
+     * 设置 文档中选择的物品id
+     * 
+     * @param itemid 文档中选择的物品id
+     */
+    public void setItemid(int itemid) {
+        this.itemid = itemid;
+    }
+
+    /**
+     * 设置文档中选择的物品种类id
+     * 
+     * @param itemmaincategoryid 文档中选择的物品种类id
+     */
+    public void setItemmaincategoryid(int itemmaincategoryid) {
+        this.itemmaincategoryid = itemmaincategoryid;
+    }
+
+    /**
+     * 设置文档中选择的人力资源id
+     * 
+     * @param hrmresid 文档中选择的人力资源id
+     */
+    public void setHrmresid(int hrmresid) {
+        this.hrmresid = hrmresid;
+    }
+
+    /**
+     * 设置文档中选择资产id
+     * 
+     * @param assetid 文档中选择资产id
+     */
+    public void setAssetid(int assetid) {
+        this.assetid = assetid;
+    }
+
+    /**
+     * 设置 所有者id
+     * 
+     * @param ownerid 所有者id
+     */
+    public void setOwnerid(int ownerid) {
+        this.ownerid = ownerid;
+    }
+
+    /**
+     * 设置 文档中选择的CRM id
+     * 
+     * @param crmid 文档中选择的CRM id
+     */
+    public void setCrmid(int crmid) {
+        this.crmid = crmid;
+    }
+
+    /**
+     * 设置文档中选择的项目id
+     * 
+     * @param projectid 文档中选择的项目id
+     */
+    public void setProjectid(int projectid) {
+        this.projectid = projectid;
+    }
+
+    /**
+     * 设置文档中选择的财务-交易id
+     * 
+     * @param financeid 文档中选择的财务-交易id
+     */
+    public void setFinanceid(int financeid) {
+        this.financeid = financeid;
+    }
+
+    /**
+     * 设置文档创建者id
+     * 
+     * @param doccreaterid 文档创建者id
+     */
+    public void setDoccreaterid(int doccreaterid) {
+        this.doccreaterid = doccreaterid;
+    }
+
+    /**
+     * 设置文档创建者所在部门id
+     * 
+     * @param docdepartmentid 文档创建者所在部门id
+     */
+    public void setDocdepartmentid(int docdepartmentid) {
+        this.docdepartmentid = docdepartmentid;
+    }
+
+    /**
+     * 设置文档创建日期
+     * 
+     * @param doccreatedate 文档创建日期
+     */
+    public void setDoccreatedate(String doccreatedate) {
+        this.doccreatedate = doccreatedate;
+    }
+
+    /**
+     * 设置文档创建时间
+     * 
+     * @param doccreatetime 文档创建时间
+     */
+    public void setDoccreatetime(String doccreatetime) {
+        this.doccreatetime = doccreatetime;
+    }
+
+    /**
+     * 设置文档最后修改者id
+     * 
+     * @param doclastmoduserid 文档最后修改者id
+     */
+    public void setDoclastmoduserid(int doclastmoduserid) {
+        this.doclastmoduserid = doclastmoduserid;
+    }
+
+    /**
+     * 设置文档最后修改日期
+     * 
+     * @param doclastmoddate 文档最后修改日期
+     */
+    public void setDoclastmoddate(String doclastmoddate) {
+        this.doclastmoddate = doclastmoddate;
+    }
+
+    /**
+     * 设置文档最后修改时间
+     * 
+     * @param doclastmodtime 文档最后修改时间
+     */
+    public void setDoclastmodtime(String doclastmodtime) {
+        this.doclastmodtime = doclastmodtime;
+    }
+
+    /**
+     * 设置文档审批者id
+     * 
+     * @param docapproveuserid 文档审批者id
+     */
+    public void setDocapproveuserid(int docapproveuserid) {
+        this.docapproveuserid = docapproveuserid;
+    }
+
+    /**
+     * 设置文档审批日期
+     * 
+     * @param docapprovedate 文档审批日期
+     */
+    public void setDocapprovedate(String docapprovedate) {
+        this.docapprovedate = docapprovedate;
+    }
+
+    /**
+     * 设置文档审批时间
+     * 
+     * @param docapprovetime 文档审批时间
+     */
+    public void setDocapprovetime(String docapprovetime) {
+        this.docapprovetime = docapprovetime;
+    }
+
+    /**
+     * 设置文档归档者id
+     * 
+     * @param docarchiveuserid 文档归档者id
+     */
+    public void setDocarchiveuserid(int docarchiveuserid) {
+        this.docarchiveuserid = docarchiveuserid;
+    }
+
+    /**
+     * 设置文档归档日期
+     * 
+     * @param docarchivedate 文档归档日期
+     */
+    public void setDocarchivedate(String docarchivedate) {
+        this.docarchivedate = docarchivedate;
+    }
+
+    /**
+     * 设置文档归档时间
+     * 
+     * @param docarchivetime 文档归档时间
+     */
+    public void setDocarchivetime(String docarchivetime) {
+        this.docarchivetime = docarchivetime;
+    }
+
+    /**
+     * 设置文档状态
+     * 
+     * @param docstatus 文档状态
+     */
+    public void setDocstatus(String docstatus) {
+        this.docstatus = docstatus;
+    }
+
+    /**
+     * 设置文档父节点
+     * 
+     * @param parentids 文档父节点
+     */
+    public void setParentids(String parentids) {
+        this.parentids = parentids;
+    }
+
+    /**
+     * 设置文档的关键字
+     * 
+     * @param keyword 文档的关键字
+     */
+    public void setKeyword(String keyword) {
+        this.keyword = keyword;
+    }
+
+    /**
+     * 设置 附件总数
+     * 
+     * @param accessorycount 附件总数
+     */
+    public void setAccessorycount(int accessorycount) {
+        this.accessorycount = accessorycount;
+    }
+
+    /**
+     * 设置回复文档总数
+     * 
+     * @param replaydoccount 回复文档总数
+     */
+    public void setReplaydoccount(int replaydoccount) {
+        this.replaydoccount = replaydoccount;
+    }
+
+    /**
+     * 设置创建的用户类型
+     * 
+     * @param usertype 创建的用户类型
+     */
+    public void setUsertype(String usertype) {
+        this.usertype = usertype;
+    }
+
+    /**
+     * 设置remark表的id
+     * 
+     * @param id2 remark表的id
+     */
+    public void setId2(int id2) {
+        this.id2 = id2;
+    }
+
+    /**
+     * 设置
+     * 
+     * @param approveremark
+     */
+    public void setApproveremark(String approveremark) {
+        this.approveremark = approveremark;
+    }
+
+    /**
+     * 设置批复意见
+     * 
+     * @param isapprover 批复意见
+     */
+    public void setIsapprover(String isapprover) {
+        this.isapprover = isapprover;
+    }
+
+    /**
+     * 设置跳转页面
+     * 
+     * @param topage 跳转页面
+     */
+    public void setToPage(String topage) {
+        this.topage = topage;
+    }
+
+    /**
+     * 设置文档归档编号
+     * 
+     * @param docno 文档归档编号
+     */
+    public void setDocno(String docno) {
+        this.docno = docno;
+    }
+
+    /**
+     * 设置合同人
+     * 
+     * @param contractman 合同人
+     */
+    public void setContractMan(String contractman) {
+        this.contractman = contractman;
+    }
+
+    /**
+     * 设置合同开始日期
+     * 
+     * @param contractstartdate 合同开始日期
+     */
+    public void setContractStartDate(String contractstartdate) {
+        this.contractstartdate = contractstartdate;
+    }
+
+    /**
+     * 设置合同结束日期
+     * 
+     * @param contractenddate 合同结束日期
+     */
+    public void setContractEndDate(String contractenddate) {
+        this.contractenddate = contractenddate;
+    }
+
+    /**
+     * 设置文档模板
+     * 
+     * @param docmodule 文档模板
+     */
+    public void setDocModule(String docmodule) {
+        this.docmodule = docmodule;
+    }
+
+    /**
+     * 设置试用期结束日期
+     * 
+     * @param proenddate 试用期结束日期
+     */
+    public void setProEndDate(String proenddate) {
+        this.proenddate = proenddate;
+    }
+
+    /**
+     * 设置客户类型ID
+     * 
+     * @param typeid 客户类型ID
+     */
+    public void setContractType(int typeid) {
+        this.typeid = typeid;
+    }
+
+    /**
+     * 设置用于判断来自以及返回的页面
+     * 
+     * @param urlfrom 用于判断来自以及返回的页面
+     */
+    public void setUrlFrom(String urlfrom) {
+        this.urlfrom = urlfrom;
+    }
+
+    /**
+     * 设置解决网站传递新闻组的接口
+     * 
+     * @param newsid 解决网站传递新闻组的接口
+     */
+    public void setNewsId(int newsid) {
+        this.newsid = newsid;
+    }
+
+    /**
+     * 设置 能否拷贝
+     * 
+     * @param canCopy 能否拷贝 1：表示在查看状态下此文档不能够拷贝； 2：表示在查看状态下此文档可以拷贝
+     */
+    public void setCanCopy(String canCopy) {
+        this.canCopy = canCopy;
+    }
+
+    /**
+     * 设置能否提醒
+     * 
+     * @param canRemind 能否提醒 1：表示是否回复提醒； 1：没有回复提醒；2：有回复提醒
+     */
+    public void setCanRemind(String canRemind) {
+        this.canRemind = canRemind;
+    }
+
+    /**
+     * 设置文件扩展名
+     * 
+     * @param docextendname 文件扩展名
+     */
+    public void setDocextendname(String docextendname) {
+        this.docextendname = docextendname;
+    }
+
+    /**
+     * 返回文件扩展名
+     * 
+     * @return 文件扩展名
+     */
+    public String getDocextendname() {
+        return this.docextendname;
+    }
+
+    /**
+     * 返回文档id
+     * 
+     * @return 文档id
+     */
+    public int getId() {
+        return id;
+    }
+
+    /**
+     * 返回新闻ID
+     * 
+     * @return 新闻ID
+     * @throws Exception
+     */
+    public int getNewsId() throws Exception {
+        return this.newsid;
+    }
+    
+    public int getSecretLevel() throws Exception{
+    	return this.secretLevel;
+    }
+    public void setSecretLevel(int secretLevel){
+    	this.secretLevel = secretLevel;
+    }
+
+    public String getSecretValidity() {
+        return secretValidity;
+    }
+
+    public void setSecretValidity(String secretValidity) {
+        this.secretValidity = secretValidity;
+    }
+
+    public int getDocSecretLevel() throws Exception{
+    	return rs.getInt("secretLevel");
+    }
+    public String getDocSecretValidity() throws Exception{
+        return rs.getString("secretValidity");
+    }
+    public int getReplyremind() {
+        return this.replyremind;
+    }
+
+    public void setReplyremind(int replyremind) {
+        this.replyremind = replyremind;
+    }
+
+    public int getDocReplyremind() {
+        return rs.getInt("replyremind");
+    }
+    /**
+     * 返回 文档ID
+     * 
+     * @return 文档ID
+     * @throws Exception
+     */
+    public int getDocid() throws Exception {
+        return rs.getInt("id");
+    }
+
+    /**
+     * 返回文档类型
+     * 
+     * @return 文档类型
+     * @throws Exception
+     */
+    public int getDocType() throws Exception {
+        return rs.getInt("doctype");
+    }
+
+    /**
+     * 返回能否拷贝
+     * 
+     * @return 能否拷贝
+     * @throws Exception
+     */
+    public String getCanCopy() throws Exception {
+        return rs.getString("cancopy");
+    }
+
+    /**
+     * 返回能否提醒
+     * 
+     * @return 能否提醒
+     * @throws Exception
+     */
+    public String getCanRemind() throws Exception {
+        return rs.getString("canremind");
+    }
+
+    /**
+     * 返回文档主目录
+     * 
+     * @return 文档主目录
+     * @throws Exception
+     */
+    public int getMaincategory() throws Exception {
+        return rs.getInt("maincategory");
+    }
+
+    /**
+     * 返回文档分目录
+     * 
+     * @return 文档分目录
+     * @throws Exception
+     */
+    public int getSubcategory() throws Exception {
+        return rs.getInt("subcategory");
+    }
+
+    /**
+     * 返回文档子目录
+     * 
+     * @return 文档子目录
+     * @throws Exception
+     */
+    public int getSeccategory() throws Exception {
+        return rs.getInt("seccategory");
+    }
+
+    /**
+     * 返回文档语言
+     * 
+     * @return 文档语言
+     * @throws Exception
+     */
+    public int getDoclangurage() throws Exception {
+        return rs.getInt("doclangurage");
+    }
+
+    /**
+     * 返回是否需要审批
+     * 
+     * @return 是否需要审批 0:否 1:是
+     * @throws Exception
+     */
+    public String getDocapprovable() throws Exception {
+        return rs.getString("docapprovable");
+    }
+
+    /**
+     * 返回 可否回复
+     * 
+     * @return 可否回复 0:否 1:是
+     * @throws Exception
+     */
+    public String getDocreplyable() throws Exception {
+        return rs.getString("docreplyable");
+    }
+
+    /**
+     * 返回是否回复文档
+     * 
+     * @return 是否回复文档
+     * @throws Exception
+     */
+    public String getIsreply() throws Exception {
+        return rs.getString("isreply");
+    }
+
+    /**
+     * 返回回复文件id
+     * 
+     * @return 回复文件id
+     * @throws Exception
+     */
+    public int getReplydocid() throws Exception {
+        return rs.getInt("replydocid");
+    }
+
+    /**
+     * 返回文档主题
+     * 
+     * @return 文档主题
+     * @throws Exception
+     */
+    public String getDocsubject() throws Exception {
+    	String docsubject_tmp = Util.null2String(rs.getString("docsubject"));
+    	docsubject_tmp = docsubject_tmp.replaceAll("\n", "");//TD11607
+        return docsubject_tmp;
+    }
+
+    /**
+     * 返回文档内容
+     * 
+     * @return 文档内容
+     * @throws Exception
+     */
+    public String getDoccontent() throws Exception {
+        return Util.toBaseEncoding(rs.getString("doccontent"), languageid, "1");
+    }
+
+    /**
+     * 返回 文档发布类型
+     * 
+     * @return 文档发布类型
+     * @throws Exception
+     */
+    public String getDocpublishtype() throws Exception {
+        String tempDocpublishtype = Util.null2String(rs.getString("docpublishtype"));
+        if ("".equals(tempDocpublishtype))
+            tempDocpublishtype = "1";
+        return tempDocpublishtype;
+    }
+
+    /**
+     * 返回文档中选择的物品id
+     * 
+     * @return 文档中选择的物品id
+     * @throws Exception
+     */
+    public int getItemid() throws Exception {
+        return rs.getInt("itemid");
+    }
+
+    /**
+     * 返回文档中选择的物品种类id
+     * 
+     * @return 文档中选择的物品种类id
+     * @throws Exception
+     */
+    public int getItemmaincategoryid() throws Exception {
+        return rs.getInt("itemmaincategoryid");
+    }
+
+    /**
+     * 返回
+     * 
+     * @return
+     * @throws Exception
+     */
+    public int getHrmresid() throws Exception {
+        return rs.getInt("hrmresid");
+    }
+
+    /**
+     * 返回文档中选择的人力资源id
+     * 
+     * @return 文档中选择的人力资源id
+     * @throws Exception
+     */
+    public int getCrmid() throws Exception {
+        return rs.getInt("crmid");
+    }
+
+    /**
+     * 返回文档中选择的项目id
+     * 
+     * @return 返回文档中选择的项目id
+     * @throws Exception
+     */
+    public int getProjectid() throws Exception {
+        return rs.getInt("projectid");
+    }
+
+    /**
+     * 返回文档中选择的财务-交易id
+     * 
+     * @return 文档中选择的财务-交易id
+     * @throws Exception
+     */
+    public int getFinanceid() throws Exception {
+        return rs.getInt("financeid");
+    }
+
+    /**
+     * 返回文档创建者id
+     * 
+     * @return 文档创建者id
+     * @throws Exception
+     */
+    public int getDoccreaterid() throws Exception {
+        return rs.getInt("doccreaterid");
+    }
+    /**
+     * 获取阅读次数
+     * @return
+     * @throws Exception
+     */
+    public int getReadCount() throws Exception {
+        return rs.getInt("readCount");
+    }
+    /**
+     * 返回 文档创建者所在部门id
+     * 
+     * @return 文档创建者所在部门id
+     * @throws Exception
+     */
+    public int getDocdepartmentid() throws Exception {
+        return rs.getInt("docdepartmentid");
+    }
+
+    /**
+     * 返回文档创建日期
+     * 
+     * @return 文档创建日期
+     * @throws Exception
+     */
+    public String getDoccreatedate() throws Exception {
+        return rs.getString("doccreatedate");
+    }
+
+    /**
+     * 返回文档创建时间
+     * 
+     * @return 文档创建时间
+     * @throws Exception
+     */
+    public String getDoccreatetime() throws Exception {
+        return rs.getString("doccreatetime");
+    }
+
+    /**
+     * 返回文档最后修改者id
+     * 
+     * @return 文档最后修改者id
+     * @throws Exception
+     */
+    public int getDoclastmoduserid() throws Exception {
+        return rs.getInt("doclastmoduserid");
+    }
+
+    /**
+     * 返回文档最后修改日期
+     * 
+     * @return 文档最后修改日期
+     * @throws Exception
+     */
+    public String getDoclastmoddate() throws Exception {
+        return rs.getString("doclastmoddate");
+    }
+
+    /**
+     * 返回文档最后修改时间
+     * 
+     * @return 文档最后修改时间
+     * @throws Exception
+     */
+    public String getDoclastmodtime() throws Exception {
+        return rs.getString("doclastmodtime");
+    }
+
+    /**
+     * 返回文档审批者id
+     * 
+     * @return 文档审批者id
+     * @throws Exception
+     */
+    public int getDocapproveuserid() throws Exception {
+        return rs.getInt("docapproveuserid");
+    }
+
+    /**
+     * 返回文档审批日期
+     * 
+     * @return 文档审批日期
+     * @throws Exception
+     */
+    public String getDocapprovedate() throws Exception {
+        return rs.getString("docapprovedate");
+    }
+
+    /**
+     * 返回文档审批时间
+     * 
+     * @return 文档审批时间
+     * @throws Exception
+     */
+    public String getDocapprovetime() throws Exception {
+        return rs.getString("docapprovetime");
+    }
+
+    /**
+     * 返回文档归档者id
+     * 
+     * @return 文档归档者id
+     * @throws Exception
+     */
+    public int getDocarchiveuserid() throws Exception {
+        return rs.getInt("docarchiveuserid");
+    }
+
+    /**
+     * 返回文档归档日期
+     * 
+     * @return 文档归档日期
+     * @throws Exception
+     */
+    public String getDocarchivedate() throws Exception {
+        return rs.getString("docarchivedate");
+    }
+
+    /**
+     * 返回文档归档时间
+     * 
+     * @return 文档归档时间
+     * @throws Exception
+     */
+    public String getDocarchivetime() throws Exception {
+        return rs.getString("docarchivetime");
+    }
+
+    /**
+     * 返回文档状态
+     * 
+     * @return 文档状态
+     * @throws Exception
+     */
+    public String getDocstatus() throws Exception {
+        return rs.getString("docstatus");
+    }
+
+    /**
+     * 返回文档父节点
+     * 
+     * @return 文档父节点
+     * @throws Exception
+     */
+    public String getParentids() throws Exception {
+        return rs.getString("parentids");
+    }
+
+    /**
+     * 返回Assetid
+     * 
+     * @return Assetid
+     * @throws Exception
+     */
+    public int getAssetid() throws Exception {
+        return rs.getInt("assetid");
+    }
+
+    /**
+     * 返回 文档所有者ID
+     * 
+     * @return 文档所有者ID
+     * @throws Exception
+     */
+    public int getOwnerid() throws Exception {
+        return rs.getInt("ownerid");
+    }
+
+    /**
+     * 返回文档的关键字
+     * 
+     * @return 文档的关键字
+     * @throws Exception
+     */
+    public String getKeyword() throws Exception {
+        return rs.getString("keyword");
+    }
+
+    /**
+     * 返回附件总数
+     * 
+     * @return 附件总数
+     * @throws Exception
+     */
+    public int getAccessorycount() throws Exception {
+        return rs.getInt("accessorycount");
+    }
+
+    /**
+     * 返回回复文档总数
+     * 
+     * @return 回复文档总数
+     * @throws Exception
+     */
+    public int getReplaydoccount() throws Exception {
+        return rs.getInt("replaydoccount");
+    }
+
+    /**
+     * 返回创建的用户类型
+     * 
+     * @return 创建的用户类型
+     * @throws Exception
+     */
+    public String getUsertype() throws Exception {
+        return rs.getString("usertype");
+    }
+
+    /**
+     * 返回文档归档编号
+     * 
+     * @return 文档归档编号
+     * @throws Exception
+     */
+    public String getDocno() throws Exception {
+        return rs.getString("docno");
+    }
+    
+    /**
+     * 返回remark表的id
+     * 
+     * @return remark表的id
+     * @throws Exception
+     */
+    public int getId2() throws Exception {
+        return rs.getInt("id");
+    }
+
+    /**
+     * 返回批复意见
+     * 
+     * @return 批复意见
+     * @throws Exception
+     */
+    public String getApproveremark() throws Exception {
+        return rs.getString("approveremark");
+    }
+
+    /**
+     * 返回可打印份数
+     * 
+     * @return 可打印份数
+     * @throws Exception
+     */
+    public int getCanPrintedNum() throws Exception {
+        return Util.getIntValue(rs.getString("canPrintedNum"),0);
+    }   
+    
+    /**
+     * 返回  编辑模板id
+     * 
+     * @return 编辑模板id
+     * @throws Exception
+     */
+    public int getEditMouldId() throws Exception {
+        return Util.getIntValue(rs.getString("editMouldId"),0);
+    }
+    
+    /**
+     * 返回是否批谁通过：是－１，否（退回）－０
+     * 
+     * @return 是否批谁通过：是－１，否（退回）－０
+     * @throws Exception
+     */
+    public String getIsapprover() throws Exception {
+        return rs.getString("isapprover");
+    }
+
+    /**
+     * 返回文档主目录
+     * 
+     * @return 文档主目录
+     * @throws Exception
+     */
+    public int getMaincategory2() throws Exception {
+        return this.maincategory;
+    }
+
+    /**
+     * 返回文档分目录
+     * 
+     * @return 文档分目录
+     * @throws Exception
+     */
+    public int getSubcategory2() throws Exception {
+        return this.subcategory;
+    }
+
+    /**
+     * 返回文档子目录
+     * 
+     * @return 文档子目录
+     * @throws Exception
+     */
+    public int getSeccategory2() throws Exception {
+        return this.seccategory;
+    }
+
+    /**
+     * 返回文档语言
+     * 
+     * @return 文档语言
+     * @throws Exception
+     */
+    public int getDoclangurage2() throws Exception {
+        return this.doclangurage;
+    }
+
+    /**
+     * 返回是否需要审批
+     * 
+     * @return 是否需要审批
+     * @throws Exception
+     */
+    public String getDocapprovable2() throws Exception {
+        return this.docapprovable;
+    }
+
+    /**
+     * 返回可否回复
+     * 
+     * @return 可否回复
+     * @throws Exception
+     */
+    public String getDocreplyable2() throws Exception {
+        return this.docreplyable;
+    }
+
+    /**
+     * 返回是否回复文档
+     * 
+     * @return 是否回复文档
+     * @throws Exception
+     */
+    public String getIsreply2() throws Exception {
+        return this.isreply;
+    }
+
+    /**
+     * 返回回复文件id
+     * 
+     * @return 回复文件id
+     * @throws Exception
+     */
+    public int getReplydocid2() throws Exception {
+        return this.replydocid;
+    }
+
+    /**
+     * 返回文档主题
+     * 
+     * @return 文档主题
+     * @throws Exception
+     */
+    public String getDocsubject2() throws Exception {
+    	String docsubject_tmp = Util.null2String(this.docsubject);
+    	docsubject_tmp = docsubject_tmp.replaceAll("\n", "");//TD11607
+        return docsubject_tmp;
+    }
+
+    /**
+     * 返回文档内容
+     * 
+     * @return 文档内容
+     * @throws Exception
+     */
+    public String getDoccontent2() throws Exception {
+        return this.doccontent;
+    }
+
+    /**
+     * 返回文档发布类型
+     * 
+     * @return 文档发布类型
+     * @throws Exception
+     */
+    public String getDocpublishtype2() throws Exception {
+        return this.docpublishtype;
+    }
+
+    /**
+     * 返回文档的发布类型
+     * 
+     * @return 文档的发布类型
+     * @throws Exception
+     */
+    public String getDocpublishtypeold() throws Exception {
+        return this.docpublishtypeold;
+    }
+
+    /**
+     * 返回文档中选择的物品id
+     * 
+     * @return 文档中选择的物品id
+     * @throws Exception
+     */
+    public int getItemid2() throws Exception {
+        return this.itemid;
+    }
+
+    /**
+     * 返回文档中选择的物品种类id
+     * 
+     * @return 文档中选择的物品种类id
+     * @throws Exception
+     */
+    public int getItemmaincategoryid2() throws Exception {
+        return this.itemmaincategoryid;
+    }
+
+    /**
+     * 返回文档中选择的人力资源id
+     * 
+     * @return 文档中选择的人力资源id
+     * @throws Exception
+     */
+    public int getHrmresid2() throws Exception {
+        return this.hrmresid;
+    }
+
+    /**
+     * 文档中选择的CRM id
+     * 
+     * @return 文档中选择的CRM id
+     * @throws Exception
+     */
+    public int getCrmid2() throws Exception {
+        return this.crmid;
+    }
+
+    /**
+     * 返回文档中选择的项目id
+     * 
+     * @return 文档中选择的项目id
+     * @throws Exception
+     */
+    public int getProjectid2() throws Exception {
+        return this.projectid;
+    }
+
+    /**
+     * 返回档中选择的财务-交易id
+     * 
+     * @return 档中选择的财务-交易id
+     * @throws Exception
+     */
+    public int getFinanceid2() throws Exception {
+        return this.financeid;
+    }
+
+    /**
+     * 返回文档创建者id
+     * 
+     * @return 文档创建者id
+     * @throws Exception
+     */
+    public int getDoccreaterid2() throws Exception {
+        return this.doccreaterid;
+    }
+
+    /**
+     * 返回文档创建者所在部门id
+     * 
+     * @return 文档创建者所在部门id
+     * @throws Exception
+     */
+    public int getDocdepartmentid2() throws Exception {
+        return this.docdepartmentid;
+    }
+
+    /**
+     * 返回文档创建日期
+     * 
+     * @return 文档创建日期
+     * @throws Exception
+     */
+    public String getDoccreatedate2() throws Exception {
+        return this.doccreatedate;
+    }
+
+    /**
+     * 返回文档创建时间
+     * 
+     * @return 文档创建时间
+     * @throws Exception
+     */
+    public String getDoccreatetime2() throws Exception {
+        return this.doccreatetime;
+    }
+
+    /**
+     * 返回文档最后修改者id
+     * 
+     * @return 文档最后修改者id
+     * @throws Exception
+     */
+    public int getDoclastmoduserid2() throws Exception {
+        return this.doclastmoduserid;
+    }
+
+    /**
+     * 返回文档最后修改日期
+     * 
+     * @return 文档最后修改日期
+     * @throws Exception
+     */
+    public String getDoclastmoddate2() throws Exception {
+        return this.doclastmoddate;
+    }
+
+    /**
+     * 返回文档最后修改时间
+     * 
+     * @return 文档最后修改时间
+     * @throws Exception
+     */
+    public String getDoclastmodtime2() throws Exception {
+        return this.doclastmodtime;
+    }
+
+    /**
+     * 返回文档审批者id
+     * 
+     * @return 文档审批者id
+     * @throws Exception
+     */
+    public int getDocapproveuserid2() throws Exception {
+        return this.docapproveuserid;
+    }
+
+    /**
+     * 返回文档审批日期
+     * 
+     * @return 文档审批日期
+     * @throws Exception
+     */
+    public String getDocapprovedate2() throws Exception {
+        return this.docapprovedate;
+    }
+
+    /**
+     * 返回文档审批时间
+     * 
+     * @return 文档审批时间
+     * @throws Exception
+     */
+    public String getDocapprovetime2() throws Exception {
+        return this.docapprovetime;
+    }
+
+    /**
+     * 返回文档归档者id
+     * 
+     * @return 文档归档者id
+     * @throws Exception
+     */
+    public int getDocarchiveuserid2() throws Exception {
+        return this.docarchiveuserid;
+    }
+
+    /**
+     * 返回文档归档日期
+     * 
+     * @return 文档归档日期
+     * @throws Exception
+     */
+    public String getDocarchivedate2() throws Exception {
+        return this.docarchivedate;
+    }
+
+    /**
+     * 返回文档归档时间
+     * 
+     * @return 文档归档时间
+     * @throws Exception
+     */
+    public String getDocarchivetime2() throws Exception {
+        return this.docarchivetime;
+    }
+
+    /**
+     * 返回文档状态
+     * 
+     * @return 文档状态
+     * @throws Exception
+     */
+    public String getDocstatus2() throws Exception {
+        return this.docstatus;
+    }
+
+    /**
+     * 返回文档父节点
+     * 
+     * @return 文档父节点
+     * @throws Exception
+     */
+    public String getParentids2() throws Exception {
+        return this.parentids;
+    }
+
+    /**
+     * 返回Assetid
+     * 
+     * @return Assetid
+     * @throws Exception
+     */
+    public int getAssetid2() throws Exception {
+        return this.assetid;
+    }
+
+    /**
+     * 返回 文档所有者ID
+     * 
+     * @return 文档所有者
+     * @throws Exception
+     */
+    public int getOwnerid2() throws Exception {
+        return this.ownerid;
+    }
+
+    /**
+     * 返回文档的关键字
+     * 
+     * @return 文档的关键字
+     * @throws Exception
+     */
+    public String getKeyword2() throws Exception {
+        return this.keyword;
+    }
+
+    /**
+     * 返回附件总数
+     * 
+     * @return 附件总数
+     * @throws Exception
+     */
+    public int getAccessorycount2() throws Exception {
+        return this.accessorycount;
+    }
+
+    /**
+     * 返回回复文档总数
+     * 
+     * @return 回复文档总数
+     * @throws Exception
+     */
+    public int getReplaydoccount2() throws Exception {
+        return this.replaydoccount;
+    }
+
+    /**
+     * 返回创建的用户类型
+     * 
+     * @return 创建的用户类型
+     * @throws Exception
+     */
+    public String getUsertype2() throws Exception {
+        return this.usertype;
+    }
+
+    /**
+     * 返回remark表的id
+     * 
+     * @return remark表的id
+     * @throws Exception
+     */
+    public String getDocno2() throws Exception {
+        return this.docno;
+    }
+
+    /**
+     * 返回批复意见
+     * 
+     * @return 批复意见
+     * @throws Exception
+     */
+    public String getApproveremark2() throws Exception {
+        return this.approveremark;
+    }
+
+    /**
+     * 返回 是否批谁通过：是－１，否（退回）－０
+     * 
+     * @return 是否批谁通过：是－１，否（退回）－０
+     * @throws Exception
+     */
+    public String getIsapprover2() throws Exception {
+        return this.isapprover;
+    }
+
+    /**
+     * 返回合同人
+     * 
+     * @return 合同人
+     */
+    public String getContractMan() {
+        return this.contractman;
+    }
+
+    /**
+     * 返回合同开始日期
+     * 
+     * @return 合同开始日期
+     */
+    public String getContractStartDate() {
+        return this.contractstartdate;
+    }
+
+    /**
+     * 返回合同结束日期
+     * 
+     * @return 合同结束日期
+     */
+    public String getContractEndDate() {
+        return this.contractenddate;
+    }
+
+    /**
+     * 返回文档模板
+     * 
+     * @return 文档模板
+     */
+    public String getDocModule() {
+        return this.docmodule;
+    }
+
+    /**
+     * 返回试用期结束日期
+     * 
+     * @return 试用期结束日期
+     */
+    public String getProEndDate() {
+        return this.proenddate;
+    }
+
+    /**
+     * 返回联系人类型ID
+     * 
+     * @return 联系人类型ID
+     */
+    public int getContractType() {
+        return this.typeid;
+    }
+
+    /**
+     * 返回需返回的页面URL
+     * 
+     * @return 需返回的页面URL
+     */
+    public String getUrlFrom() {
+        return this.urlfrom;
+    }
+
+    /**
+     * 返回需返回的页面URL
+     * 
+     * @return 需返回的页面URL
+     */
+    public String getToPage() {
+        if(this.topage==null||this.topage.trim().equals("")){
+        	this.topage="";
+        }
+    	return topage;
+    }
+
+    /**
+     * 返回上一次的状态
+     * 
+     * @return 上一次的状态
+     */
+    public String getOldstatus() {
+        return oldstatus;
+    }
+
+    /**
+     * 返回上一次的所有者的ID
+     * 
+     * @return 上一次的所有者的ID
+     */
+    public int getOldownerid() {
+        return oldownerid;
+    }
+
+    /**
+     * 设置操作类型
+     * 
+     * @param action 操作类型
+     */
+    public void setAction(String action) {
+        this.action = Util.null2String(action);
+    }
+
+    /**
+     * 设置当前客户端IP
+     * 
+     * @param ip 客户端IP
+     */
+    public void setClientAddress(String ip) {
+        this.clientip = ip;
+    }
+
+    /**
+     * 设置当前用户ID
+     * 
+     * @param id 当前用户ID
+     */
+    public void setUserid(int id) {
+        this.userid = id;
+    }
+
+    /**
+     * 返回FileUpload对象
+     * 
+     * @return FileUpload对象
+     * @throws Exception
+     */
+    public FileUpload getFileUpload2() {
+        return this.fileUpload;
+    }    
+    
+    
+    public int getDocVestIn() {
+        return rs.getInt("docVestIn");
+    }
+
+    public void setDocVestIn(int docVestIn) {
+        this.docVestIn = docVestIn;
+    }
+
+    /**
+     * 选择新闻信息
+     * 
+     * @param newsclause sql条件
+     * @param user user对象
+     * @throws Exception
+     */
+    public void selectNewsDocInfo(String newsclause, User user) throws Exception {
+        RecordSet rsSql = new RecordSet();
+        String dbtype = rsSql.getDBType();
+        boolean isoracle = dbtype.equals(DBConstant.DB_TYPE_ORACLE);
+        boolean ismysql = dbtype.equals(DBConstant.DB_TYPE_MYSQL);
+
+        String userid = "" + user.getUID();
+        String logintype = Util.null2String(user.getLogintype());
+        String usertype = "" + user.getType();
+        String seclevel = user.getSeclevel();
+
+        String sql = "";
+
+        if (isoracle || ismysql) {
+            sql = " select a.id,a.docsubject,b.doccontent,a.doccreatedate,a.doccreaterid, a.usertype,a.doclastmoddate,a.doclastmodtime from DocDetail a,DocDetailContent b "
+                    + " where id in (select distinct t1.id from "
+                    + " DocDetail  t1,"
+                    + ShareManager.getShareDetailTableByUserNew("doc", user)
+                    + " t2,DocDetailContent t3 "
+                    + " where t1.id=t2.sourceid and t1.id = t3.docid "
+                    + newsclause+this.getDateDuringSql(this.getDateDuringForHp())
+                    + ")  and a.id=b.docid order by doclastmoddate desc, doclastmodtime desc";
+        } else {
+            sql = " select id,docsubject,doccontent,doccreatedate,doccreaterid, usertype from DocDetail "
+                    + " where id in (select distinct t1.id from " + " DocDetail  t1,"
+                    + ShareManager.getShareDetailTableByUserNew("doc", user) + " t2 " + " where t1.id=t2.sourceid "
+                    + newsclause + this.getDateDuringSql(this.getDateDuringForHp())+")  order by doclastmoddate desc, doclastmodtime desc";
+        }
+        rsSql.executeSql(sql);
+        rs = rsSql.getData();
+    }
+    /**
+     * 和selectNewsDocInfo 的唯一区别就是只返回id
+     * 
+     * @param newsclause sql条件
+     * @param user user对象
+     * @throws Exception
+     */
+    public void selectNewsDocIdInfo(String newsclause, User user) throws Exception {
+        RecordSet rsSql = new RecordSet();
+        String dbtype = rsSql.getDBType();
+        boolean isoracle = dbtype.equals(DBConstant.DB_TYPE_ORACLE);
+        boolean ismysql = dbtype.equals(DBConstant.DB_TYPE_MYSQL);
+        
+//        String userid = "" + user.getUID();
+//        String logintype = Util.null2String(user.getLogintype());
+//        String usertype = "" + user.getType();
+//        String seclevel = user.getSeclevel();
+        
+        String sql = "";
+        
+        if (isoracle || ismysql) {
+            sql = " select a.id from DocDetail a,DocDetailContent b "
+                + " where id in (select distinct t1.id from "
+                + " DocDetail  t1,"
+                + ShareManager.getShareDetailTableByUserNew("doc", user)
+                + " t2,DocDetailContent t3 "
+                + " where t1.id=t2.sourceid and t1.id = t3.docid "
+                + newsclause+this.getDateDuringSql(this.getDateDuringForHp())
+                + ")  and a.id=b.docid order by doclastmoddate desc, doclastmodtime desc";
+        } else {
+            sql = " select id from DocDetail "
+                + " where id in (select distinct t1.id from " + " DocDetail  t1,"
+                + ShareManager.getShareDetailTableByUserNew("doc", user) + " t2 " + " where t1.id=t2.sourceid "
+                + newsclause + this.getDateDuringSql(this.getDateDuringForHp())+")  order by doclastmoddate desc, doclastmodtime desc";
+        }
+        rsSql.executeSql(sql);
+        rs = rsSql.getData();
+    }
+
+    /**
+     * 选择文档信息
+     * 
+     * @param newsclause sql条件
+     * @param user user对象
+     * @throws Exception
+     */
+    public void selectNewsDocInfo(String newsclause, User user, int perpage, int pagenum) throws Exception {
+        RecordSet rsSql = new RecordSet();
+        String dbtype = rsSql.getDBType();
+        boolean isoracle = dbtype.equals(DBConstant.DB_TYPE_ORACLE);
+        boolean ismysql = dbtype.equals(DBConstant.DB_TYPE_MYSQL);
+        SplitPageParaBean sppb = new SplitPageParaBean();
+        SplitPageUtil spu = new SplitPageUtil();
+		String belongtoshow = userSetting.getBelongtoshowByUserId(user.getUID()+""); 
+	    String belongtoids =  user.getBelongtoids();
+	    String account_type = user.getAccount_type();
+        if (isoracle || ismysql) { // oralce
+
+            //sppb .setBackFields("a.id,a.docsubject,b.doccontent,a.doclastmoddate,a.doclastmodtime,a.doccreaterid, a.usertype,a.doccreatedate,a.doccreatetime");
+			if(belongtoshow.equals("1")&&account_type.equals("0")&&!belongtoids.equals("")){
+			 belongtoids+=","+user.getUID();
+			 	if(isoracle)
+			 		sppb.setOutfields("b.doccontent, nvl((select sum(readcount) from docReadTag where userType ="+user.getLogintype()+" and docid=r.id and userid in("+belongtoids+") and rownum=1),0) as readCount");
+			 	else
+			 		sppb.setOutfields("b.doccontent, ifnull((select sum(readcount) from docReadTag where userType ="+user.getLogintype()+" and docid=r.id and userid in("+belongtoids+") limit 1),0) as readCount");
+			 		
+			}else{
+				if(isoracle)
+					sppb.setOutfields("b.doccontent, nvl((select readcount from docReadTag where userType ="+user.getLogintype()+" and docid=r.id and userid="+user.getUID()+" and rownum=1),0) as readCount");
+				else
+					sppb.setOutfields("b.doccontent, ifnull((select readcount from docReadTag where userType ="+user.getLogintype()+" and docid=r.id and userid="+user.getUID()+" limit 1),0) as readCount");
+			}
+            sppb.setBackFields("t1.id,t1.docsubject,t1.doccreaterid,t1.istop,t1.topdate,t1.toptime,t1.doccreatedate,t1.doccreatetime,t1.doclastmoddate,t1.doclastmodtime,t1.usertype");
+            sppb.setSqlFrom(" DocDetail t1, "
+                    + ShareManager.getShareDetailTableByUserNew("doc", user) + " t2 ");
+            sppb.setSqlWhere(" where "
+                    + "t1.id=t2.sourceid " + newsclause  +this.getDateDuringSql(this.getDateDuringForHp()));
+            sppb.setOutsqlform("DocDetailContent b");
+            
+            sppb.setOutsqlwhere("where b.docid=r.id");
+            sppb.setDistinct(true);            
+            sppb.setPrimaryKey("t1.id");
+            //sppb.setSqlOrderBy("a.istop,a.topdate,a.toptime,a.doclastmoddate,a.doclastmodtime");
+            sppb.setSqlOrderBy("(case when t1.istop is null then 0 else t1.istop end),(case when t1.topdate is null or t1.istop is null then '1900-01-01' else t1.topdate end),(case when t1.toptime is null or t1.istop is null then '00:00:00' else t1.toptime end),t1.doclastmoddate,t1.doclastmodtime");
+            sppb.setSortWay(sppb.DESC);
+        } else {
+            //sppb.setBackFields("id,docsubject,doccontent,doclastmoddate,doclastmodtime,doccreaterid,usertype");
+            //sppb.setSqlFrom("from DocDetail");
+            //sppb.setSqlWhere(" where id in (select distinct t1.id from DocDetail  t1, "
+            //        + ShareManager.getShareDetailTableByUserNew("doc", user) + " t2 where " + "t1.id=t2.sourceid"
+            //        + newsclause + ")");
+
+            //sppb.setPrimaryKey("id");
+            //sppb.setSqlOrderBy("istop,topdate,toptime,doclastmoddate,doclastmodtime");
+            //sppb.setSortWay(sppb.DESC);
+            
+        	sppb.setBackFields("id,istop,topdate,toptime,doclastmoddate,doclastmodtime");
+			if(belongtoshow.equals("1")&&account_type.equals("0")&&!belongtoids.equals("")){
+			 belongtoids+=","+user.getUID();
+             sppb.setOutfields("a.id,a.docsubject,a.doccontent,a.doclastmoddate,a.doclastmodtime,a.doccreaterid,a.usertype, isnull((select sum(readcount) from docReadTag where userType ="+user.getLogintype()+" and docid=a.id and userid in("+belongtoids+") ),0) as readCount");
+			}else{
+			 sppb.setOutfields("a.id,a.docsubject,a.doccontent,a.doclastmoddate,a.doclastmodtime,a.doccreaterid,a.usertype, isnull((select top 1 readcount from docReadTag where userType ="+user.getLogintype()+" and docid=a.id and userid="+user.getUID()+"),0) as readCount");
+			}
+            sppb.setSqlFrom("from DocDetail  t1, "
+                    + ShareManager.getShareDetailTableByUserNew("doc", user) + " t2");
+            sppb.setOutsqlform("DocDetail  a");
+            sppb.setSqlWhere(" where " + "t1.id=t2.sourceid"+ newsclause +this.getDateDuringSql(this.getDateDuringForHp()));
+            sppb.setOutsqlwhere("where a.id=r.id");
+
+            sppb.setDistinct(true);
+            sppb.setPrimaryKey("id");
+            sppb.setSqlOrderBy("istop,topdate,toptime,doclastmoddate,doclastmodtime");
+            sppb.setSortWay(sppb.DESC);
+        }
+        if(pagenum==1) spu.setRecordCount(perpage);
+        spu.setSpp(sppb);
+        rsSql = spu.getCurrentPageRs(pagenum, perpage);
+        rs = rsSql.getData();
+    }
+    
+    /**
+     * 选择文档信息
+     * 
+     * @param newsclause sql条件
+     * @param user user对象
+     * @throws Exception
+     */
+    public void selectNewsDocInfo4Synergy(String newsfrom,String newsclause, User user, int perpage, int pagenum) throws Exception {
+        RecordSet rsSQL = new RecordSet();
+        String dbtype = rsSQL.getDBType();
+        boolean isoracle = dbtype.equals(DBConstant.DB_TYPE_ORACLE);
+        boolean ismysql = dbtype.equals(DBConstant.DB_TYPE_MYSQL);
+        SplitPageParaBean sppb = new SplitPageParaBean();
+        SplitPageUtil spu = new SplitPageUtil();
+	    String belongtoshow = userSetting.getBelongtoshowByUserId(user.getUID()+""); 
+	    String belongtoids =  user.getBelongtoids();
+	    String account_type = user.getAccount_type();
+        if (isoracle || ismysql) { // oralce
+
+            //sppb .setBackFields("a.id,a.docsubject,b.doccontent,a.doclastmoddate,a.doclastmodtime,a.doccreaterid, a.usertype,a.doccreatedate,a.doccreatetime");
+           if(belongtoshow.equals("1")&&account_type.equals("0")&&!belongtoids.equals("")){
+		    belongtoids+=","+user.getUID();
+		    	if(isoracle)
+		    		sppb.setOutfields("b.doccontent, nvl((select sum(readcount) from docReadTag where userType ="+user.getLogintype()+" and docid=r.id and userid in("+belongtoids+") and rownum=1),0) as readCount");
+		    	else
+		    		sppb.setOutfields("b.doccontent, ifnull((select sum(readcount) from docReadTag where userType ="+user.getLogintype()+" and docid=r.id and userid in("+belongtoids+") limit 1),0) as readCount");
+		    		
+		   }else{
+			   if(isoracle)
+				   sppb.setOutfields("b.doccontent, nvl((select readcount from docReadTag where userType ="+user.getLogintype()+" and docid=r.id and userid="+user.getUID()+" and rownum=1),0) as readCount");
+			   else
+				   sppb.setOutfields("b.doccontent, ifnull((select readcount from docReadTag where userType ="+user.getLogintype()+" and docid=r.id and userid="+user.getUID()+" limit 1),0) as readCount");
+		   }
+			sppb.setBackFields("t1.id,t1.docsubject,t1.doccreaterid,t1.istop,t1.topdate,t1.toptime,t1.doccreatedate,t1.doccreatetime,t1.doclastmoddate,t1.doclastmodtime,t1.usertype");
+            sppb.setSqlFrom(" DocDetail t1, "
+                    + ShareManager.getShareDetailTableByUserNew("doc", user) + " t2 ");
+            sppb.setSqlWhere(" where "+ "t1.id=t2.sourceid " + newsclause  +this.getDateDuringSql(this.getDateDuringForHp()));
+            sppb.setOutsqlform("DocDetailContent b");
+            
+            sppb.setOutsqlwhere("where b.docid=r.id");
+            sppb.setDistinct(true);            
+            sppb.setPrimaryKey("t1.id");
+            //sppb.setSqlOrderBy("a.istop,a.topdate,a.toptime,a.doclastmoddate,a.doclastmodtime");
+            sppb.setSqlOrderBy("(case when t1.istop is null then 0 else t1.istop end),(case when t1.topdate is null or t1.istop is null then '1900-01-01' else t1.topdate end),(case when t1.toptime is null or t1.istop is null then '00:00:00' else t1.toptime end),t1.doclastmoddate,t1.doclastmodtime");
+            sppb.setSortWay(sppb.DESC);
+        } else {
+            //sppb.setBackFields("id,docsubject,doccontent,doclastmoddate,doclastmodtime,doccreaterid,usertype");
+            //sppb.setSqlFrom("from DocDetail");
+            //sppb.setSqlWhere(" where id in (select distinct t1.id from DocDetail  t1, "
+            //        + ShareManager.getShareDetailTableByUserNew("doc", user) + " t2 where " + "t1.id=t2.sourceid"
+            //        + newsclause + ")");
+
+            //sppb.setPrimaryKey("id");
+            //sppb.setSqlOrderBy("istop,topdate,toptime,doclastmoddate,doclastmodtime");
+            //sppb.setSortWay(sppb.DESC);
+            
+        	sppb.setBackFields("t1.id,istop,topdate,toptime,doclastmoddate,doclastmodtime");
+			if(belongtoshow.equals("1")&&account_type.equals("0")&&!belongtoids.equals("")){
+		    belongtoids+=","+user.getUID();
+            sppb.setOutfields("a.id,a.docsubject,a.doccontent,a.doclastmoddate,a.doclastmodtime,a.doccreaterid,a.usertype, isnull((select sum(readcount) from docReadTag where userType ="+user.getLogintype()+" and docid=a.id and userid in("+belongtoids+") ),0) as readCount");
+            }else{
+			sppb.setOutfields("a.id,a.docsubject,a.doccontent,a.doclastmoddate,a.doclastmodtime,a.doccreaterid,a.usertype, isnull((select top 1 readcount from docReadTag where userType ="+user.getLogintype()+" and docid=a.id and userid="+user.getUID()+"),0) as readCount");
+			}
+			String sqlfrom = "from DocDetail  t1, "
+                + ShareManager.getShareDetailTableByUserNew("doc", user) + " t2";
+            if(!newsfrom.equals(""))
+            	sqlfrom += newsfrom;
+            sppb.setSqlFrom(sqlfrom);
+            sppb.setOutsqlform("DocDetail  a");
+            String sqlwhere = " where " + "t1.id=t2.sourceid"+ newsclause +this.getDateDuringSql(this.getDateDuringForHp());
+            if(!newsfrom.equals(""))
+            	sqlwhere += " and t3.scope = 'DocCustomFieldBySecCategory' and t1.id = t3.id ";
+            sppb.setSqlWhere(sqlwhere);
+            sppb.setOutsqlwhere("where a.id=r.id");
+
+            sppb.setDistinct(true);
+            sppb.setPrimaryKey("id");
+            sppb.setSqlOrderBy("istop,topdate,toptime,doclastmoddate,doclastmodtime");
+            sppb.setSortWay(sppb.DESC);
+        }
+        if(pagenum==1) spu.setRecordCount(perpage);
+        spu.setSpp(sppb);
+        rsSQL = spu.getCurrentPageRs(pagenum, perpage);
+        
+        rs = rsSQL.getData();
+    }
+
+    /**
+     * 选择文档信息(带有虚拟目录的)
+     * 
+     * @param newsclause sql条件
+     * @param user user对象
+     * @throws Exception
+     */
+    public void selectNewsDocInfo(String newsclause, User user, int perpage, int pagenum,String dummyids) throws Exception {
+    	if(",".equals(dummyids.substring(0,1))) dummyids=dummyids.substring(1);
+    		
+    	RecordSet rsSql = new RecordSet();
+    	String dbtype = rsSql.getDBType();
+        boolean isoracle = dbtype.equals(DBConstant.DB_TYPE_ORACLE);
+        boolean ismysql = dbtype.equals(DBConstant.DB_TYPE_MYSQL);
+        SplitPageParaBean sppb = new SplitPageParaBean(); 
+        SplitPageUtil spu = new SplitPageUtil();
+        if (isoracle || ismysql) { // oralce        	
+            sppb
+                    .setBackFields("a.id,a.docsubject,b.doccontent,a.doclastmoddate,a.doclastmodtime,a.doccreaterid, a.usertype,a.doccreatedate,a.doccreatetime");
+            sppb.setSqlFrom("from DocDetail a, DocDetailContent b");
+            sppb.setSqlWhere(" where a.id in (select distinct t1.id from DocDetail t1, "
+                    + ShareManager.getShareDetailTableByUser("doc", user) + " t2,DocDummyDetail  t3 where "
+                    + "t1.id=t2.sourceid and t1.id = t3.docid and t3.catelogid in("+dummyids+") " + newsclause + this.getDateDuringSql(this.getDateDuringForHp())+")  and a.id=b.docid");
+            sppb.setPrimaryKey("a.id");
+            sppb.setSqlOrderBy("(case when a.istop is null then 0 else a.istop end),(case when a.topdate is null or a.istop is null then '1900-01-01' else a.topdate end),(case when a.toptime is null or a.istop is null then '00:00:00' else a.toptime end),a.doclastmoddate,a.doclastmodtime");
+            sppb.setSortWay(sppb.DESC);
+        } else {
+            sppb.setBackFields("id,docsubject,doccontent,doclastmoddate,doclastmodtime,doccreaterid,usertype");
+            sppb.setSqlFrom("from DocDetail");
+            sppb.setSqlWhere(" where id in (select distinct t1.id from DocDetail  t1, "
+                    + ShareManager.getShareDetailTableByUser("doc", user) + " t2,DocDummyDetail  t3 where  t1.id=t2.sourceid  and t1.id=t3.docid and t3.catelogid in("+dummyids+") "
+                    + newsclause + this.getDateDuringSql(this.getDateDuringForHp())+")");
+
+            sppb.setPrimaryKey("id");
+            sppb.setSqlOrderBy("istop,topdate,toptime,doclastmoddate,doclastmodtime");
+            sppb.setSortWay(sppb.DESC);
+        }
+        if(pagenum==1) spu.setRecordCount(perpage);
+        spu.setSpp(sppb);
+        rsSql = spu.getCurrentPageRs(pagenum, perpage);
+        
+        rs = rsSql.getData();
+    }
+    /**
+     * 选择文档信息(带有虚拟目录的)
+     * 
+     * @param newsclause sql条件
+     * @param user user对象
+     * @throws Exception
+     */
+    public void selectNewsDocInfoForHp(String newsclause, User user, int perpage, int pagenum,String dummyids) throws Exception {
+    	if(",".equals(dummyids.substring(0,1))) dummyids=dummyids.substring(1);
+    		
+    	RecordSet rsSql = new RecordSet();
+    	String dbtype = rsSql.getDBType();
+        boolean isoracle = dbtype.equals(DBConstant.DB_TYPE_ORACLE);
+        boolean ismysql = dbtype.equals(DBConstant.DB_TYPE_MYSQL);
+        SplitPageParaBean sppb = new SplitPageParaBean(); 
+        SplitPageUtil spu = new SplitPageUtil();
+		String belongtoshow = userSetting.getBelongtoshowByUserId(user.getUID()+""); 
+	    String belongtoids =  user.getBelongtoids();
+	    String account_type = user.getAccount_type();
+        if (isoracle || ismysql) { // oralce
+        	//sppb.setOutfields("b.doccontent, nvl((select readcount from docReadTag where userType ="+user.getLogintype()+" and docid=a.id and userid="+user.getUID()+" and rownum=1),0) as readCount");
+        	if(belongtoshow.equals("1")&&account_type.equals("0")&&!belongtoids.equals("")){
+			 belongtoids+=","+user.getUID();
+			 	if(isoracle)
+			 		sppb.setOutfields("b.doccontent, nvl((select sum(readcount) from docReadTag where userType ="+user.getLogintype()+" and docid=r.id and userid in("+belongtoids+") and rownum=1),0) as readCount");
+			 	else
+			 		sppb.setOutfields("b.doccontent, ifnull((select sum(readcount) from docReadTag where userType ="+user.getLogintype()+" and docid=r.id and userid in("+belongtoids+") limit 1),0) as readCount");
+			}else{
+				if(isoracle)
+					sppb.setOutfields("b.doccontent, nvl((select readcount from docReadTag where userType ="+user.getLogintype()+" and docid=r.id and userid="+user.getUID()+" and rownum=1),0) as readCount");
+				else
+					sppb.setOutfields("b.doccontent, ifnull((select readcount from docReadTag where userType ="+user.getLogintype()+" and docid=r.id and userid="+user.getUID()+" limit 1),0) as readCount");
+			}
+        	sppb.setDistinct(true);        	
+            sppb.setBackFields(" t1.istop,t1.topdate,t1.toptime,t1.id,t1.docsubject,t1.doclastmoddate,t1.doclastmodtime,t1.doccreaterid, t1.usertype,t1.doccreatedate,t1.doccreatetime");
+            sppb.setSqlFrom("from DocDetail t1, "
+                    + ShareManager.getShareDetailTableByUser("doc", user) + " t2,DocDummyDetail  t3");
+            sppb.setOutsqlform("DocDetailContent  b");
+            sppb.setSqlWhere(" where "
+                    + "t1.id=t2.sourceid and t1.id = t3.docid and t3.catelogid in("+dummyids+") " + newsclause + this.getDateDuringSql(this.getDateDuringForHp()) );
+            sppb.setOutsqlwhere("where b.docid=r.id");
+            sppb.setPrimaryKey("t1.id");
+            sppb.setSqlOrderBy("(case when t1.istop is null then 0 else t1.istop end),(case when t1.topdate is null or t1.istop is null then '1900-01-01' else t1.topdate end),(case when t1.toptime is null or t1.istop is null then '00:00:00' else t1.toptime end),t1.doclastmoddate,t1.doclastmodtime");
+            sppb.setSortWay(sppb.DESC);
+        } else {
+			if(belongtoshow.equals("1")&&account_type.equals("0")&&!belongtoids.equals("")){
+			 belongtoids+=","+user.getUID();
+            sppb.setOutfields("a.id,a.docsubject,a.doccontent,a.doclastmoddate,a.doclastmodtime,a.doccreaterid,a.usertype, isnull((select sum(readcount) from docReadTag where userType ="+user.getLogintype()+" and docid=a.id and userid in("+belongtoids+") ),0) as readCount");
+			}else{
+			sppb.setOutfields("a.id,a.docsubject,a.doccontent,a.doclastmoddate,a.doclastmodtime,a.doccreaterid,a.usertype, isnull((select top 1 readcount from docReadTag where userType ="+user.getLogintype()+" and docid=a.id and userid="+user.getUID()+"),0) as readCount");
+			}
+            
+            sppb.setBackFields("t1.id,t1.doclastmoddate,t1.doclastmodtime,t1.istop,t1.topdate,t1.toptime");
+            sppb.setSqlFrom("from DocDetail  t1, "
+                    + ShareManager.getShareDetailTableByUserNew("doc", user) + " t2,DocDummyDetail  t3 ");
+            sppb.setOutsqlform("DocDetail  a");
+            sppb.setSqlWhere("where  t1.id=t2.sourceid  and t1.id=t3.docid and t3.catelogid in("+dummyids+") "+ newsclause+this.getDateDuringSql(this.getDateDuringForHp()) );
+            sppb.setOutsqlwhere("where a.id=r.id");
+            sppb.setPrimaryKey("t1.id");
+            sppb.setDistinct(true);
+            sppb.setSqlOrderBy("istop,topdate,toptime,doclastmoddate,doclastmodtime");
+            sppb.setSortWay(sppb.DESC);
+        }
+        if(pagenum==1) spu.setRecordCount(perpage);
+        spu.setSpp(sppb);
+        rsSql = spu.getCurrentPageRs(pagenum, perpage);
+        rs = rsSql.getData();
+    }
+    
+    /**
+     * 选择文档信息(带有虚拟目录的)
+     * 
+     * @param newsclause sql条件
+     * @param user user对象
+     * @throws Exception
+     */
+    public void selectNewsDocInfoForHpSynergy(String newsfrom, String newsclause, User user, int perpage, int pagenum,String dummyids) throws Exception {
+    	if(",".equals(dummyids.substring(0,1))) dummyids=dummyids.substring(1);
+    		
+    	RecordSet rsSql = new RecordSet();
+    	String dbtype = rsSql.getDBType();
+        boolean isoracle = dbtype.equals(DBConstant.DB_TYPE_ORACLE);
+        boolean ismysql = dbtype.equals(DBConstant.DB_TYPE_MYSQL);
+        SplitPageParaBean sppb = new SplitPageParaBean(); 
+        SplitPageUtil spu = new SplitPageUtil();
+		String belongtoshow = userSetting.getBelongtoshowByUserId(user.getUID()+""); 
+	    String belongtoids =  user.getBelongtoids();
+	    String account_type = user.getAccount_type();
+        if (isoracle || ismysql) { // oralce
+        	//sppb.setOutfields("b.doccontent, nvl((select readcount from docReadTag where userType ="+user.getLogintype()+" and docid=a.id and userid="+user.getUID()+" and rownum=1),0) as readCount");
+        	if(belongtoshow.equals("1")&&account_type.equals("0")&&!belongtoids.equals("")){
+			 belongtoids+=","+user.getUID();
+			 	if(isoracle)
+			 		sppb.setOutfields("b.doccontent, nvl((select sum(readcount) from docReadTag where userType ="+user.getLogintype()+" and docid=r.id and userid in("+belongtoids+") and rownum=1),0) as readCount");
+			 	else
+			 		sppb.setOutfields("b.doccontent, ifnull((select sum(readcount) from docReadTag where userType ="+user.getLogintype()+" and docid=r.id and userid in("+belongtoids+") limit 1),0) as readCount");
+			}else{
+				if(isoracle)
+					sppb.setOutfields("b.doccontent, nvl((select readcount from docReadTag where userType ="+user.getLogintype()+" and docid=r.id and userid="+user.getUID()+" and rownum=1),0) as readCount");
+				else
+					sppb.setOutfields("b.doccontent, ifnull((select readcount from docReadTag where userType ="+user.getLogintype()+" and docid=r.id and userid="+user.getUID()+" limit 1),0) as readCount");
+			}
+        	        	
+            sppb.setBackFields("t1.id,t1.docsubject,t1.doclastmoddate,t1.doclastmodtime,t1.doccreaterid, t1.usertype,t1.doccreatedate,t1.doccreatetime");
+            sppb.setSqlFrom("from DocDetail t1, "
+                    + ShareManager.getShareDetailTableByUser("doc", user) + " t2,DocDummyDetail  t3");
+            sppb.setOutsqlform("DocDetailContent  b");
+            sppb.setSqlWhere(" where "
+                    + "t1.id=t2.sourceid and t1.id = t3.docid and t3.catelogid in("+dummyids+") " + newsclause + this.getDateDuringSql(this.getDateDuringForHp()) );
+            sppb.setOutsqlwhere("where b.docid=r.id");
+            sppb.setPrimaryKey("t1.id");
+            sppb.setSqlOrderBy("(case when t1.istop is null then 0 else t1.istop end),(case when t1.topdate is null or t1.istop is null then '1900-01-01' else t1.topdate end),(case when t1.toptime is null or t1.istop is null then '00:00:00' else t1.toptime end),t1.doclastmoddate,t1.doclastmodtime");
+            sppb.setSortWay(sppb.DESC);
+        } else {
+			if(belongtoshow.equals("1")&&account_type.equals("0")&&!belongtoids.equals("")){
+			 belongtoids+=","+user.getUID();
+            sppb.setOutfields("a.id,a.docsubject,a.doccontent,a.doclastmoddate,a.doclastmodtime,a.doccreaterid,a.usertype, isnull((select sum(readcount) from docReadTag where userType ="+user.getLogintype()+" and docid=a.id and userid in("+belongtoids+") ),0) as readCount");
+			}else{
+			sppb.setOutfields("a.id,a.docsubject,a.doccontent,a.doclastmoddate,a.doclastmodtime,a.doccreaterid,a.usertype, isnull((select top 1 readcount from docReadTag where userType ="+user.getLogintype()+" and docid=a.id and userid="+user.getUID()+"),0) as readCount");
+			}
+            
+            sppb.setBackFields("t1.id,t1.doclastmoddate,t1.doclastmodtime,t1.istop,t1.topdate,t1.toptime");
+            sppb.setSqlFrom("from DocDetail  t1, "
+                    + ShareManager.getShareDetailTableByUserNew("doc", user) + " t2,DocDummyDetail  t3 ");
+            sppb.setOutsqlform("DocDetail  a");
+            sppb.setSqlWhere("where  t1.id=t2.sourceid  and t1.id=t3.docid and t3.catelogid in("+dummyids+") "+ newsclause+this.getDateDuringSql(this.getDateDuringForHp()) );
+            sppb.setOutsqlwhere("where a.id=r.id");
+            sppb.setPrimaryKey("t1.id");
+            sppb.setDistinct(true);
+            sppb.setSqlOrderBy("istop,topdate,toptime,doclastmoddate,doclastmodtime");
+            sppb.setSortWay(sppb.DESC);
+        }
+        if(pagenum==1) spu.setRecordCount(perpage);
+        spu.setSpp(sppb);
+        rsSql = spu.getCurrentPageRs(pagenum, perpage);
+        rs = rsSql.getData();
+    }
+    
+    /**
+     * 选择文档信息
+     * 
+     * @throws Exception
+     */
+    public void selectDocInfo() throws Exception {
+        RecordSet rsSql = new RecordSet();
+        String dbtype = rsSql.getDBType();
+        boolean isoracle = dbtype.equals(DBConstant.DB_TYPE_ORACLE);
+        boolean ismysql = dbtype.equals(DBConstant.DB_TYPE_MYSQL);
+
+        String sql = "";
+        // TD2401 外部新闻页显示出现异常。
+        if (!"and".equalsIgnoreCase(sql_where.substring(0, 4).trim()))
+            sql_where = " and " + sql_where;
+        if (isoracle || ismysql) {
+            sql = "select t1.* , t2.doccontent from DocDetail t1 , DocDetailContent t2  where t1.id = t2.docid "
+                    + sql_where + " order by doclastmoddate desc, doclastmodtime desc";
+        } else
+            sql = "select * from DocDetail where id<>0 " + sql_where + " order by doclastmoddate desc, doclastmodtime desc";
+
+        rsSql.executeSql(sql);
+        rs = rsSql.getData();
+    }
+    /**
+     * 获取文档最新版本content字段
+     * @param docid
+     * @param ischeck
+     * @return
+     */
+    public String getNewDocid(String docid,boolean ischeck)
+    {
+    	String sDoceditionid="-1";
+    	String doccontent = "";
+    	if("".equals(docid)) return "";
+    	RecordSet rs= new RecordSet();
+    	rs.executeSql("select doceditionid,doccontent from docdetail where id="+docid);
+    	if(rs.next())
+    	{
+    		sDoceditionid=Util.null2String(rs.getString("doceditionid"));
+    		doccontent=Util.null2String(rs.getString("doccontent"));
+    	}
+        if("-1".equals(sDoceditionid) || "".equals(sDoceditionid)) return doccontent;
+        rs.executeSql("select id,doccontent from docdetail where docedition=(select max(docedition) from docdetail where doceditionid="+sDoceditionid+") " +
+        		"and doceditionid="+sDoceditionid);
+        
+        if(rs.next())
+        {
+        	doccontent=Util.null2String(rs.getString("doccontent"));
+        }
+          
+    	return doccontent;    	
+    }
+    /**
+     * 移到下一条记录并判断是否还有下一条记录
+     * 
+     * @return 判断是否还有下一条记录
+     * @throws Exception
+     */
+    public boolean next() throws Exception {
+        return rs.next();
+    }
+
+    /**
+     * 选择出来的得到文档总数
+     * 
+     * @return 选择出来的文档总数
+     * @throws Exception
+     */
+    public int getCount() throws Exception {
+        return rs.getCounts();
+    }
+
+    /**
+     * 关闭连结
+     */
+    public void closeStatement() {
+        try {
+           // statement.close();
+        } catch (Exception ex) {
+        }
+    }
+
+    /**
+     * 通过文档ID得到相应的文档信息
+     * 
+     * @throws Exception
+     */
+    public void getDocInfoById() throws Exception {
+
+        RecordSet rsSql = new RecordSet();
+        String dbtype = rsSql.getDBType();
+        boolean isoracle = dbtype.equals(DBConstant.DB_TYPE_ORACLE);
+        boolean ismysql = dbtype.equals(DBConstant.DB_TYPE_MYSQL);
+
+        String sql = "";
+
+        if (isoracle || ismysql) {
+            sql = "select t1.* , t2.doccontent from DocDetail t1 , DocDetailContent t2 where t1.id = t2.docid and id = "
+                    + id;
+        } else
+            sql = "select * from DocDetail where id = " + id;
+
+        rsSql.executeSql(sql);
+        rs = rsSql.getData();
+        rs.next();
+    }
+
+    /**
+     * 添加一个文档
+     * 
+     * @throws Exception
+     */
+    public void AddDocInfo() throws Exception {
+
+        String sql = "";
+        RecordSet statement = new RecordSet();
+        boolean isoracle = (statement.getDBType()).equals("oracle");
+		if(this.doccontent.contains("/FCKEditor/FlashVideo.jpg")){
+		 doccontent+="<script>initFlashVideo();</script>";
+		 
+		}
+        if (isoracle ||(statement.getDBType()).equals("mysql")) {
+
+            sql = "insert into DocDetail(" +
+                  "id,maincategory,subcategory,seccategory,doclangurage," +
+                  "docapprovable,docreplyable,isreply,replydocid,docsubject," +
+                  "docpublishtype,itemid,itemmaincategoryid,hrmresid,crmid," +
+                  "projectid,financeid,doccreaterid,docdepartmentid,doccreatedate," +
+                  "doccreatetime,doclastmoduserid,doclastmoddate,doclastmodtime,docapproveuserid," +
+                  "docapprovedate,docapprovetime,docarchiveuserid,docarchivedate,docarchivetime," +
+                  "docstatus,parentids,assetid,ownerid,keyword," +
+                  "accessorycount,replaydoccount,usertype,doctype,cancopy," +
+                  "canremind,orderable,docextendname" +
+                  
+                  ",doccode,docedition,doceditionid,ishistory,approveType,maindoc," +
+                  "readoptercanprint,docvaliduserid,docvaliddate,docvalidtime,invalidationdate" +
+                  
+                  ",docCreaterType,docLastModUserType,docApproveUserType,docValidUserType,docInvalUserType" +
+                  ",docArchiveUserType,docCancelUserType,docPubUserType,docReopenUserType,ownerType" +                
+                  ",canPrintedNum,editMouldId" +                
+                  ",secretLevel" +
+                  ",replyremind" +
+                  ",secretValidity" +
+
+                  ") values(" +
+                  "?,?,?,?,?,?,?,?,?,?," +
+                  "?,?,?,?,?,?,?,?,?,?," +
+                  "?,?,?,?,?,?,?,?,?,?," +
+                  "?,?,?,?,?,?,?,?,?,?," +
+                  "?,?,?" +
+                  
+                  ",?,?,?,?,?,?" +
+                  ",?,?,?,?,?" + 
+                  
+                  ",?,?,?,?,?" +
+                  ",?,?,?,?,?" +                  
+                  ",?,?" +                  
+                  ",?" +
+                  ",?" +
+                  ",?" +
+
+                  ")";
+
+            try {
+
+
+
+                statement.executeUpdate(sql
+	                , this.id
+	                , this.maincategory
+	                , this.subcategory
+	                , this.seccategory
+	                , this.doclangurage
+	                , this.docapprovable
+	                , this.docreplyable
+	                , this.isreply
+	                , this.replydocid
+	                , this.docsubject
+	                , this.docpublishtype
+	                , this.itemid
+	                , this.itemmaincategoryid
+	                , this.hrmresid
+	                , this.crmid
+	                , this.projectid
+	                , this.financeid
+	                , this.doccreaterid
+	                , this.docdepartmentid
+	                , this.doccreatedate
+	                , this.doccreatetime
+	                , this.doclastmoduserid
+	                , this.doclastmoddate
+	                , this.doclastmodtime
+	                , this.docapproveuserid
+	                , this.docapprovedate
+	                , this.docapprovetime
+	                , this.docarchiveuserid
+	                , this.docarchivedate
+	                , this.docarchivetime
+	                , this.docstatus
+	                , this.parentids
+	
+	
+	                , this.assetid
+	                , this.ownerid
+	                , this.keyword
+	                , this.accessorycount
+	                , this.replaydoccount
+	                //38, this.usertype
+	                , this.docCreaterType              
+	
+	
+	                , this.docType
+	                , this.canCopy
+	                , this.canRemind
+	                , this.orderable
+	                , this.docextendname                
+	                , this.docCode
+	
+	                , this.docEdition
+	                , this.docEditionId
+	                , this.isHistory
+	                , this.approveType             
+	                , this.mainDoc
+	                , this.readOpterCanPrint
+	                , this.docValidUserId
+	
+	                , this.docValidDate
+	                , this.docValidTime
+	
+	                , this.invalidationDate
+	                
+	                , this.docCreaterType               
+	                , this.docLastModUserType               
+	                , this.docApproveUserType               
+	                , this.docValidUserType               
+	                , this.docInvalUserType               
+	                , this.docArchiveUserType               
+	                , this.docCancelUserType               
+	                , this.docPubUserType               
+	                , this.docReopenUserType 
+	                , this.ownerType                
+	                , this.canPrintedNum
+	                , this.editMouldId
+	                , this.secretLevel
+	                , this.replyremind
+	                , this.secretValidity
+	               );
+                // 执行触发器docdetail_getpinyin
+                DocTriggerUtils docTriggerUtils = new DocTriggerUtils();
+                docTriggerUtils.docdetail_getpinyin(new RecordSet());
+                
+            	 sql = "insert into DocDetailContent (docid, doccontent) values(?,?) ";
+                 statement.executeUpdate(sql,this.id,this.doccontent);
+               
+                log.resetParameter();
+                log.setDocId(this.id);
+                log.setDocSubject(this.docsubject);
+                log.setOperateType("1");
+                log.setOperateUserid(userid);
+                log.setUsertype(this.usertype);
+                //log.setCreatertype(this.usertype);
+                log.setClientAddress(this.clientip);
+                log.setDocCreater(this.doccreaterid);
+                log.setCreatertype(this.docCreaterType);
+                log.setDocLogInfo();
+
+            } catch (Exception e) {
+                writeLog(e);
+                throw e;
+            } finally {
+            }
+
+        } else {
+
+            sql = "insert into DocDetail(" +
+                    "id,maincategory,subcategory,seccategory,doclangurage," +
+                    "docapprovable,docreplyable,isreply,replydocid,docsubject," +
+                    "doccontent,docpublishtype,itemid,itemmaincategoryid,hrmresid," +
+                    "crmid,projectid,financeid,doccreaterid,docdepartmentid," +
+                    "doccreatedate,doccreatetime,doclastmoduserid,doclastmoddate,doclastmodtime," +
+                    "docapproveuserid,docapprovedate,docapprovetime,docarchiveuserid,docarchivedate," +
+                    "docarchivetime,docstatus,parentids,assetid,ownerid," +
+                    "keyword,accessorycount,replaydoccount,usertype,doctype," +
+                    "cancopy,canremind,orderable,docextendname" +
+                    
+                    ",doccode,docedition,doceditionid,ishistory,approveType,maindoc," +
+                    "readoptercanprint,docvaliduserid,docvaliddate,docvalidtime,invalidationdate" +
+
+                    ",docCreaterType,docLastModUserType,docApproveUserType,docValidUserType,docInvalUserType" +
+                    ",docArchiveUserType,docCancelUserType,docPubUserType,docReopenUserType,ownerType" +                       
+                    ",canPrintedNum,editMouldId" +                       
+                    ",secretLevel" +
+                    ",replyremind" +
+                    ",secretValidity" +
+                    ") values(" +
+                    "?,?,?,?,?,?,?,?,?,?," +
+                    "?,?,?,?,?,?,?,?,?,?," +
+                    "?,?,?,?,?,?,?,?,?,?," +
+                    "?,?,?,?,?,?,?,?,?,?," +
+                    "?,?,?,?" +
+
+                    ",?,?,?,?,?,?" +
+                    ",?,?,?,?,?" + 
+                    
+                    ",?,?,?,?,?" +
+                    ",?,?,?,?,?" +                    
+                    ",?,?" +                    
+                    ",?" +
+                    ",?" +
+                    ",?" +
+
+                    ")";
+
+            try {
+
+                statement.executeUpdate(sql
+                , this.id
+                , this.maincategory
+                , this.subcategory
+                , this.seccategory
+                , this.doclangurage
+                , this.docapprovable
+                , this.docreplyable
+                , this.isreply
+                , this.replydocid
+                , this.docsubject
+                , this.doccontent
+                , this.docpublishtype
+                , this.itemid
+                , this.itemmaincategoryid
+                , this.hrmresid
+                , this.crmid
+                , this.projectid
+                , this.financeid
+                , this.doccreaterid
+                , this.docdepartmentid
+                , this.doccreatedate
+                , this.doccreatetime
+                , this.doclastmoduserid
+                , this.doclastmoddate
+                , this.doclastmodtime
+                , this.docapproveuserid
+                , this.docapprovedate
+                , this.docapprovetime
+                , this.docarchiveuserid
+                , this.docarchivedate
+                , this.docarchivetime
+                , this.docstatus
+                , this.parentids
+                , this.assetid
+                , this.ownerid
+                , this.keyword
+                , this.accessorycount
+                , this.replaydoccount
+                //39, this.usertype
+                , this.docCreaterType               
+                , this.docType
+                , this.canCopy
+                , this.canRemind
+                , this.orderable
+                , this.docextendname
+                
+                , this.docCode
+                , this.docEdition
+                , this.docEditionId
+                , this.isHistory
+                , this.approveType
+                
+                , this.mainDoc
+                , this.readOpterCanPrint
+                , this.docValidUserId
+                , this.docValidDate
+                , this.docValidTime
+                
+                , this.invalidationDate
+                
+                , this.docCreaterType               
+                , this.docLastModUserType               
+                , this.docApproveUserType               
+                , this.docValidUserType               
+                , this.docInvalUserType               
+                , this.docArchiveUserType               
+                , this.docCancelUserType               
+                , this.docPubUserType               
+                , this.docReopenUserType 
+                , this.ownerType                
+                , this.canPrintedNum                
+                , this.editMouldId
+                , this.secretLevel
+                , this.replyremind
+                , this.secretValidity
+                );
+
+
+                // 执行触发器docdetail_getpinyin
+                DocTriggerUtils docTriggerUtils = new DocTriggerUtils();
+                docTriggerUtils.docdetail_getpinyin(new RecordSet());
+                log.resetParameter();
+                log.setDocId(this.id);
+                log.setDocSubject(this.docsubject);
+                log.setOperateType("1");
+                log.setOperateUserid(userid);
+                log.setUsertype(this.usertype);
+                log.setCreatertype(this.usertype);
+                log.setClientAddress(this.clientip);
+                log.setDocCreater(this.doccreaterid);
+                log.setCreatertype(this.docCreaterType);
+                
+                log.setDocLogInfo();
+
+            } catch (Exception e) {
+                writeLog(e);
+                throw e;
+            } finally {
+            }
+        }
+		RecordSet rsDummyDoc=new RecordSet();
+		if (isreply.equals("1")) {
+			String realReplyDocId = "";
+            if (parentids != null) {
+                String tempStrs[] = Util.TokenizerString2(parentids, ",");
+                if (tempStrs.length >= 2)
+                    realReplyDocId = tempStrs[tempStrs.length - 2];
+            }
+	            
+			DocTreeDocFieldManager dtdfm=new DocTreeDocFieldManager();
+			this.dummycata=dtdfm.getDummyStr(Util.getIntValue(realReplyDocId));
+		}
+		if(this.dummycata!=null && !"".equals(dummycata)){
+			ArrayList dummyCataList=Util.TokenizerString(dummycata,",");
+			for(int i=0;i<dummyCataList.size();i++){
+				String strDummy=(String)dummyCataList.get(i);
+				if(!"".equals(strDummy)){
+					String importdate=TimeUtil.getCurrentDateString();
+					String importtime=TimeUtil.getOnlyCurrentTimeString();
+					DocTreeDocFieldComInfo ddfc=new DocTreeDocFieldComInfo();
+					if(!ddfc.isHaveSameOne(strDummy,""+this.id)) {
+						String strSql="insert into DocDummyDetail(catelogid,docid,importdate,importtime) values ("+strDummy+","+this.id+",'"+importdate+"','"+importtime+"')";
+						rsDummyDoc.executeSql(strSql);
+					}
+				}
+			}
+		}
+        //附件复制到对应的相关物理路径下
+        DocSaveService.copyDocFile(this.seccategory,this.id);
+		//TD12549 文档创建的时候就在docreadtag表中把创建人的纪录录入，以免发生未读文档统计出错的问题 chujun
+		char flag=Util.getSeparator();
+		rsDummyDoc.executeProc("docReadTag_AddByUser", ""+this.id+flag+this.doccreaterid+flag+this.docCreaterType);
+		if(this.docCreaterType == "" || this.docCreaterType == null){
+			rsDummyDoc.execute("update docreadtag set readcount=0 where docid="+this.id+" and userid="+this.doccreaterid+" and usertype= 1 ");
+		}else{
+			rsDummyDoc.execute("update docreadtag set readcount=0 where docid="+this.id+" and userid="+this.doccreaterid+" and usertype="+this.docCreaterType);
+		}
+		rsDummyDoc.execute("update docdetail set sumReadCount=0 where id="+this.id);
+    }
+
+
+    /**
+     * 编辑一个文档
+     * 
+     * @throws Exception
+     */
+    public void EditDocInfo() throws Exception {
+        String sql = "";
+        RecordSet statement = new RecordSet();
+
+        boolean isoracle = (statement.getDBType()).equals("oracle");
+		if(this.doccontent.contains("/FCKEditor/FlashVideo.jpg")){
+		 doccontent+="<script>initFlashVideo();</script>";
+		 
+		}
+
+		if (isoracle ||(statement.getDBType()).equals("mysql")) {
+
+            sql = "update DocDetail set maincategory=?,subcategory=?,seccategory=?,doclangurage=?,docapprovable=?,docreplyable=?,isreply=?,replydocid=?,docsubject=?,docpublishtype=?,itemid=?,itemmaincategoryid=?,hrmresid=?,crmid=?,projectid=?,financeid=?,doccreaterid=?,docdepartmentid=?,doccreatedate=?,doccreatetime=?,doclastmoduserid=?,doclastmoddate=?,doclastmodtime=?,docapproveuserid=?,docapprovedate=?,docapprovetime=?,docarchiveuserid=?,docarchivedate=?,docarchivetime=?,docstatus=?,assetid=?,ownerid=?,keyword=?,accessorycount=accessorycount+?,replaydoccount=?,usertype=? ,cancopy=?,canremind=? " +
+                    
+                    ",doccode=?,docedition=?,doceditionid=?,ishistory=?,approveType=?," +
+                    "maindoc=?,readoptercanprint=?,docvaliduserid=?," +
+                    "docvaliddate=?,docvalidtime=?,docpubuserid=?," +
+                    "docpubdate=?,docpubtime=?,docreopenuserid=?," +
+                    "docreopendate=?,docreopentime=?,docinvaluserid=?," +
+                    "docinvaldate=?,docinvaltime=?,doccanceluserid=?," +
+                    "doccanceldate=?,doccanceltime=?" +
+                    ",selectedpubmouldid=?" +
+                    ",invalidationdate=?" +
+ 
+                    ",docCreaterType=?,docLastModUserType=?,docApproveUserType=?,docValidUserType=?,docInvalUserType=?" +
+                    ",docArchiveUserType=?,docCancelUserType=?,docPubUserType=?,docReopenUserType=?,ownerType=?" +                    
+                    ",canPrintedNum=?,editMouldId=?" +                    
+                    ",secretLevel=?" +
+                    ",replyremind=?" +
+                    ",secretValidity=?" +
+                    " where id=?";
+
+            try {
+                statement.executeUpdate(sql
+                , this.maincategory
+                , this.subcategory
+                , this.seccategory
+                , this.doclangurage
+                , this.docapprovable
+                , this.docreplyable
+                , this.isreply
+                , this.replydocid
+                , this.docsubject
+                , this.docpublishtype
+                , this.itemid
+                , this.itemmaincategoryid
+                , this.hrmresid
+                , this.crmid
+                , this.projectid
+                , this.financeid
+                , this.doccreaterid
+                , this.docdepartmentid
+                , this.doccreatedate
+                , this.doccreatetime
+                , this.doclastmoduserid
+                , this.doclastmoddate
+                , this.doclastmodtime
+                , this.docapproveuserid
+                , this.docapprovedate
+                , this.docapprovetime
+                , this.docarchiveuserid
+                , this.docarchivedate
+                , this.docarchivetime
+                , this.docstatus
+                , this.assetid
+                , this.ownerid
+                , this.keyword
+                , this.accessorycount
+                , this.replaydoccount
+                //36, this.usertype
+                , this.docCreaterType                
+                , this.canCopy
+                , this.canRemind
+                
+                , this.docCode
+                , this.docEdition
+                , this.docEditionId
+                , this.isHistory
+                , this.approveType
+                
+                , this.mainDoc
+                , this.readOpterCanPrint
+                , this.docValidUserId
+                , this.docValidDate
+                , this.docValidTime
+                , this.docPubUserId
+                , this.docPubDate
+                , this.docPubTime
+                , this.docReOpenUserId
+                , this.docReOpenDate
+                , this.docReOpenTime
+                , this.docInvalUserId
+                , this.docInvalDate
+                , this.docInvalTime
+                , this.docCancelUserId
+                , this.docCancelDate
+                , this.docCancelTime
+                
+                , this.selectedPubMouldId
+                
+                , this.invalidationDate
+                
+                , this.docCreaterType               
+                , this.docLastModUserType               
+                , this.docApproveUserType               
+                , this.docValidUserType               
+                , this.docInvalUserType               
+                , this.docArchiveUserType               
+                , this.docCancelUserType               
+                , this.docPubUserType               
+                , this.docReopenUserType 
+                , this.ownerType                 
+
+                //73, this.id
+                , this.canPrintedNum
+                , this.editMouldId               
+                , this.secretLevel
+                , this.replyremind
+                , this.secretValidity
+                , this.id
+                );
+
+            	 sql = "update DocDetailContent set doccontent=? where docid=? ";
+                 statement.executeUpdate(sql,this.doccontent,this.id);
+               
+                // 执行触发器docdetail_getpinyin
+                DocTriggerUtils docTriggerUtils = new DocTriggerUtils();
+                docTriggerUtils.docdetail_getpinyin(this.id,new RecordSet());
+
+
+                log.resetParameter();
+                log.setDocId(this.id);
+                log.setDocSubject(this.docsubject);
+                log.setOperateType("2");
+                log.setOperateUserid(userid);
+                log.setUsertype(this.opreateType);
+                log.setClientAddress(this.clientip);
+                log.setDocCreater(this.doccreaterid);
+                log.setCreatertype(this.docCreaterType);
+                log.setDocLogInfo();
+            } catch (Exception e) {
+                writeLog(e);
+                throw e;
+            } finally {
+            }
+        } else {
+
+            sql = "update DocDetail set maincategory=?,subcategory=?,seccategory=?,doclangurage=?,docapprovable=?,docreplyable=?,isreply=?,replydocid=?,docsubject=?,doccontent=?,docpublishtype=?,itemid=?,itemmaincategoryid=?,hrmresid=?,crmid=?,projectid=?,financeid=?,doccreaterid=?,docdepartmentid=?,doccreatedate=?,doccreatetime=?,doclastmoduserid=?,doclastmoddate=?,doclastmodtime=?,docapproveuserid=?,docapprovedate=?,docapprovetime=?,docarchiveuserid=?,docarchivedate=?,docarchivetime=?,docstatus=?,assetid=?,ownerid=?,keyword=?,accessorycount=accessorycount+?,replaydoccount=?,usertype=?,cancopy=?,canremind=?" +
+
+            ",doccode=?,docedition=?,doceditionid=?,ishistory=?,approveType=?," +
+            "maindoc=?,readoptercanprint=?,docvaliduserid=?," +
+            "docvaliddate=?,docvalidtime=?,docpubuserid=?," +
+            "docpubdate=?,docpubtime=?,docreopenuserid=?," +
+            "docreopendate=?,docreopentime=?,docinvaluserid=?," +
+            "docinvaldate=?,docinvaltime=?,doccanceluserid=?," +
+            "doccanceldate=?,doccanceltime=?" +
+            ",selectedpubmouldid=?" +
+            ",invalidationdate=?" +
+            
+            ",docCreaterType=?,docLastModUserType=?,docApproveUserType=?,docValidUserType=?,docInvalUserType=?" +
+            ",docArchiveUserType=?,docCancelUserType=?,docPubUserType=?,docReopenUserType=?,ownerType=?" +  
+            ",canPrintedNum=?,editMouldId=?" + 
+            ",secretLevel=?" +
+            ",replyremind=?" +
+            ",secretValidity=?" +
+            " where id=?";
+            
+            try {
+                statement.executeUpdate(sql
+                , this.maincategory
+                , this.subcategory
+                , this.seccategory
+                , this.doclangurage
+                , this.docapprovable
+                , this.docreplyable
+                , this.isreply
+                , this.replydocid
+                , this.docsubject
+                , this.doccontent
+                , this.docpublishtype
+                , this.itemid
+                , this.itemmaincategoryid
+                , this.hrmresid
+                , this.crmid
+                , this.projectid
+                , this.financeid
+                , this.doccreaterid
+                , this.docdepartmentid
+                , this.doccreatedate
+                , this.doccreatetime
+                , this.doclastmoduserid
+                , this.doclastmoddate
+                , this.doclastmodtime
+                , this.docapproveuserid
+                , this.docapprovedate
+                , this.docapprovetime
+                , this.docarchiveuserid
+                , this.docarchivedate
+                , this.docarchivetime
+                , this.docstatus
+                , this.assetid
+                , this.ownerid
+                , this.keyword
+                , this.accessorycount
+                , this.replaydoccount
+                //37, this.usertype
+                , this.docCreaterType              
+                , this.canCopy
+                , this.canRemind
+
+                , this.docCode
+                , this.docEdition
+                , this.docEditionId
+                , this.isHistory
+                , this.approveType
+                
+                , this.mainDoc
+                , this.readOpterCanPrint
+                , this.docValidUserId
+                , this.docValidDate
+                , this.docValidTime
+                , this.docPubUserId
+                , this.docPubDate
+                , this.docPubTime
+                , this.docReOpenUserId
+                , this.docReOpenDate
+                , this.docReOpenTime
+                , this.docInvalUserId
+                , this.docInvalDate
+                , this.docInvalTime
+                , this.docCancelUserId
+                , this.docCancelDate
+                , this.docCancelTime
+                
+                , this.selectedPubMouldId
+
+                , this.invalidationDate
+
+                , this.docCreaterType               
+                , this.docLastModUserType               
+                , this.docApproveUserType               
+                , this.docValidUserType               
+                , this.docInvalUserType               
+                , this.docArchiveUserType               
+                , this.docCancelUserType               
+                , this.docPubUserType               
+                , this.docReopenUserType 
+                , this.ownerType                
+                
+                //74, this.id
+                , this.canPrintedNum
+                , this.editMouldId
+                , this.secretLevel
+                , this.replyremind
+                , this.secretValidity
+                , this.id);
+
+                // 执行触发器docdetail_getpinyin
+                DocTriggerUtils docTriggerUtils = new DocTriggerUtils();
+                docTriggerUtils.docdetail_getpinyin(this.id,new RecordSet());
+                log.resetParameter();
+                log.setDocId(this.id);
+                log.setDocSubject(this.docsubject);
+                log.setOperateType("2");
+                log.setOperateUserid(userid);
+                log.setUsertype(this.opreateType);
+                log.setClientAddress(this.clientip);
+                log.setDocCreater(this.doccreaterid);
+                log.setCreatertype(this.docCreaterType);                
+                log.setDocLogInfo();
+            } catch (Exception e) {
+                writeLog(e);
+                throw e;
+            } finally {
+            } 
+        }
+        //附件复制到对应相关物理路径下
+        DocSaveService.copyDocFile(this.seccategory,this.id);
+//        if (isreply.equals("1")) {
+//			String realReplyDocId = "";
+//            if (parentids != null) {
+//                String tempStrs[] = Util.TokenizerString2(parentids, ",");
+//                if (tempStrs.length >= 2)
+//                    realReplyDocId = tempStrs[tempStrs.length - 2];
+//            }
+//	            
+//			DocTreeDocFieldManager dtdfm=new DocTreeDocFieldManager();
+//			this.dummycata=dtdfm.getDummyStr(Util.getIntValue(realReplyDocId));
+//		}
+        
+		RecordSet rsDummyDoc=new RecordSet();
+		rsDummyDoc.executeSql("delete DocDummyDetail where docid="+this.id);
+		if(this.dummycata!=null && !"".equals(dummycata)){
+			ArrayList dummyCataList=Util.TokenizerString(dummycata,",");
+			for(int i=0;i<dummyCataList.size();i++){
+				String strDummy=(String)dummyCataList.get(i);
+				if(!"".equals(strDummy)){
+					String importdate=TimeUtil.getCurrentDateString();
+					String importtime=TimeUtil.getOnlyCurrentTimeString();
+					DocTreeDocFieldComInfo ddfc=new DocTreeDocFieldComInfo();
+					if(!ddfc.isHaveSameOne(strDummy,""+this.id)) {
+						String strSql="insert into DocDummyDetail(catelogid,docid,importdate,importtime) values ("+strDummy+","+this.id+",'"+importdate+"','"+importtime+"')";
+						rsDummyDoc.executeSql(strSql);
+					}
+				}
+			}
+		}
+    } 
+
+    /**
+     * 归档一个文档
+     * 
+     * @throws Exception
+     */
+    public void ArchiveDocInfo() throws Exception {
+        String sql = "update DocDetail set docarchiveuserid=?,docarchivedate=?,docarchivetime=?,docstatus=? , docno= ? where id=?";
+
+        RecordSet statement = new RecordSet();
+        try {
+           
+            statement.executeUpdate(sql
+            		, this.docarchiveuserid
+		            , this.docarchivedate
+		            , this.docarchivetime
+		            , this.docstatus
+		            , this.docno
+		            , this.id
+            		);
+            log.resetParameter();
+            log.setDocId(this.id);
+            log.setDocSubject(this.docsubject);
+            log.setOperateType("7");
+            log.setOperateUserid(userid);
+            log.setUsertype(this.usertype);
+            log.setClientAddress(this.clientip);
+            log.setDocCreater(this.doccreaterid);
+            log.setDocLogInfo();
+        } catch (Exception e) {
+            writeLog(e);
+            throw e;
+        } finally {
+            try {
+//                statement.close();
+            } catch (Exception ex) {
+            }
+        }
+    }
+
+    /**
+     * 退回一个文档
+     * 
+     * @throws Exception
+     */
+    public void ReloadDocInfo() throws Exception {
+        String sql = "update DocDetail set docarchiveuserid=?,docarchivedate=?,docarchivetime=?,docstatus=? where id=?";
+
+        RecordSet statement = new RecordSet();
+        try {
+
+            statement.executeUpdate(sql,0,"","",docstatus,id);
+            log.resetParameter();
+            log.setDocId(this.id);
+            log.setDocSubject(this.docsubject);
+            log.setOperateType("8");
+            log.setOperateUserid(userid);
+            log.setUsertype(this.usertype);
+            log.setClientAddress(this.clientip);
+            log.setDocCreater(this.doccreaterid);
+            log.setDocLogInfo();
+        } catch (Exception e) {
+            writeLog(e);
+            throw e;
+        } finally {
+        }
+    }
+
+    /**
+     * 退回一个文档
+     * 
+     * @throws Exception
+     */
+    public void ReturnDocInfo() throws Exception {
+        String sql = "update DocDetail set docstatus=? where id=?";
+
+        RecordSet statement = new RecordSet();
+
+        try {
+
+            statement.executeUpdate(sql,docstatus,id);
+            log.resetParameter();
+            log.setDocId(this.id);
+            log.setDocSubject(this.docsubject);
+            log.setOperateType("5");
+            log.setOperateUserid(userid);
+            log.setUsertype(this.usertype);
+            log.setClientAddress(this.clientip);
+            log.setDocCreater(this.doccreaterid);
+            log.setDocLogInfo();
+        } catch (Exception e) {
+            writeLog(e);
+            throw e;
+        } finally {
+        }
+    }
+
+    /**
+     * 重打开一个文档
+     * 
+     * @throws Exception
+     */
+    public void ReopenDocInfo() throws Exception {
+        String sql = "update DocDetail set docapproveuserid=?,docapprovedate=?,docapprovetime=?,docstatus=? where id=?";
+
+        RecordSet statement = new RecordSet();
+        try {
+
+            statement.executeUpdate(sql,0,"","",docstatus,id);
+            log.resetParameter();
+            log.setDocId(this.id);
+            log.setDocSubject(this.docsubject);
+            log.setOperateType("6");
+            log.setOperateUserid(userid);
+            log.setUsertype(this.usertype);
+            log.setClientAddress(this.clientip);
+            log.setDocCreater(this.doccreaterid);
+            log.setDocLogInfo();
+        } catch (Exception e) {
+            writeLog(e);
+            throw e;
+        } finally {
+        }
+    }
+
+    /**
+     * 删除一个文档
+     * 
+     * @throws Exception
+     */
+    public void DeleteDocInfo() throws Exception {
+        DocExtUtil deu = new DocExtUtil();
+        try {
+            deu.deleteDoc(this.id);
+
+            log.resetParameter();
+            log.setDocId(this.id);
+            log.setDocSubject(this.docsubject);
+            //log.setOperateType("2");
+            log.setOperateType("3");           
+            log.setOperateUserid(userid);
+            log.setUsertype(this.usertype);
+            log.setClientAddress(this.clientip);
+            log.setDocCreater(this.doccreaterid);
+            log.setCreatertype(this.docCreaterType);
+            log.setDocLogInfo();
+        } catch (Exception e) {
+            writeLog(e);
+            throw e;
+        } finally {
+            try {
+               // statement.close();
+            } catch (Exception ex) {
+            }
+        }
+    }
+
+    /**
+     * 得到文档的扩展名
+     * 
+     * @param file 文档全名
+     * @return 文档的扩展名
+     */
+    public String getFileExt(String file) {
+        if (file == null || file.trim().equals("")) {
+            return "";
+        } else {
+            int idx = file.lastIndexOf(".");
+            if (idx == -1) {
+                return "";
+            } else {
+                if (idx + 1 >= file.length()) {
+                    return "";
+                } else {
+                    return file.substring(idx + 1);
+                }
+            }
+        }
+    }
+
+    /**
+     * add by wjy 保存自定义数据
+     * 
+     * @param fu
+     * @param docId
+     */
+    private void addCustomData(FileUpload fu, int docId) {
+        int secid = Util.getIntValue(fu.getParameter("seccategory"), 0);
+        CustomFieldManager cfm = new CustomFieldManager("DocCustomFieldBySecCategory", secid);
+        cfm.getCustomFields();
+        String sql = "insert into cus_fielddata";
+        String nameStr = "";
+        String valueStr = "";
+        while (cfm.next()) {
+            nameStr += "," + cfm.getFieldName(""+cfm.getId());
+            if (cfm.getFieldDbType().startsWith("text") || cfm.getFieldDbType().startsWith("char")
+                    || cfm.getFieldDbType().startsWith("varchar")|| cfm.getFieldDbType().startsWith("browser")) {
+                valueStr += ",'" + Util.null2String(fu.getParameter("customfield" + cfm.getId())) + "'";
+            } else {
+                if (Util.null2String(fu.getParameter("customfield" + cfm.getId())).equals("")) {
+                    valueStr += ",null";
+                } else {
+                    valueStr += "," + Util.null2String(fu.getParameter("customfield" + cfm.getId()));
+                }
+            }
+        }
+        if (!nameStr.equals("")) {
+            nameStr = nameStr.substring(1);
+            valueStr = valueStr.substring(1);
+
+            sql += "(scope,scopeid,id," + nameStr + ") values('DocCustomFieldBySecCategory'," + secid + "," + docId
+                    + "," + valueStr + ")";
+            // System.out.println("sql = " + sql);
+            RecordSet rs=new RecordSet();
+            rs.executeSql(sql);
+        }
+
+    }
+
+    /**
+     * add by wjy 编辑自定义数据
+     * 
+     * @param fu
+     * @param docId
+     */
+    private void editCustomData(FileUpload fu, int docId) {
+        int secid = Util.getIntValue(fu.getParameter("seccategory"), 0);
+        RecordSet rsSql = new RecordSet();
+        rsSql.executeSql("select id from cus_fielddata where scope='DocCustomFieldBySecCategory' and scopeid=" + secid
+                + " and id=" + docId);
+        int rsCount=rsSql.getCounts();        
+        if (rsSql.next()&&rsCount==1) {
+            CustomFieldManager cfm = new CustomFieldManager("DocCustomFieldBySecCategory", secid);
+            cfm.getCustomFields();
+            String sql = "update cus_fielddata set ";
+            String setStr = "";
+            while (cfm.next()) {
+                setStr += "," + cfm.getFieldName(""+cfm.getId()) + "=";
+                if (cfm.getFieldDbType().startsWith("text") || cfm.getFieldDbType().startsWith("char")
+                        || cfm.getFieldDbType().startsWith("varchar")|| cfm.getFieldDbType().startsWith("browser")) {
+                    setStr += "'" + Util.null2String(fu.getParameter("customfield" + cfm.getId())) + "'";
+                } else {
+                    if (Util.null2String(fu.getParameter("customfield" + cfm.getId())).equals("")) {
+                        setStr += "null";
+                    } else {
+                        setStr += Util.null2String(fu.getParameter("customfield" + cfm.getId()));
+                    }
+                }
+            }
+            if (!setStr.equals("")) {
+                setStr = setStr.substring(1);
+
+                sql += setStr + " where scope='DocCustomFieldBySecCategory' and scopeid=" + secid + " and id=" + docId;
+                // System.out.println("sql = " + sql);
+                rsSql.executeSql(sql);
+            }
+        } else {
+        	if(rsCount<=0){
+                addCustomData(fu, docId);        		
+        	}else{
+        	    rsSql.executeSql("delete from cus_fielddata where scope='DocCustomFieldBySecCategory' and scopeid=" + secid
+                        + " and id=" + docId);
+                addCustomData(fu, docId);
+        	}
+        }
+
+    }
+
+    /**
+     * add by wjy 删除自定义数据
+     * 
+     * @param docId
+     */
+    private void deleteCustomData(int docId) {
+        setId(docId);
+        try {
+            getDocInfoById();
+            RecordSet rsSql = new RecordSet();
+            rsSql.executeSql("delete from cus_fielddata where scope='DocCustomFieldBySecCategory' and scopeid="
+                    + getSeccategory() + " and id=" + docId);
+        } catch (Exception e) {
+            writeLog(this.getClass().getName(), e);
+        }
+    }
+    
+    
+    /**
+     * 用来识别编辑器中文本内的图片的标记. #2007-08-24 add by yeriwei!
+     * @param i as int
+     * @return ' alt="docimages_$i" '
+     */
+    public static String getImgAltFlag(int i){
+    	return " alt=\"docimages_" + i + "\" ";
+    }
+    
+    /**
+     * 新建文档
+     * @param fu FileUpload对象
+     * @param opera 操作类型
+     * @throws Exception
+     */
+    public void addDoc(FileUpload fu,String opera) throws Exception {
+        RecordSet rs = new RecordSet();
+        
+        this.id = Util.getIntValue(fu.getParameter("docId"), 0);
+
+        if (this.id == 0) {
+            // 获得下一个可用的文档id
+            this.id = getNextDocId(rs);
+            this.docType = 1;
+            this.docextendname = "html";
+        } else {
+            docType = 2;
+
+            // Get Doc Extend Name
+            //isextfile <> '1'是正文 TD8782
+            String strSql = "select imagefilename from docimagefile where (isextfile <> '1' or isextfile is null) and docid=" + this.id;
+            RecordSet rsForExtendName = new RecordSet();
+            rsForExtendName.executeSql(strSql);
+            if (rsForExtendName.next()) {
+                String imageFileName = Util.null2String(rsForExtendName.getString(1));
+                int tempPos = imageFileName.lastIndexOf(".");
+                if (tempPos != -1) {
+                    this.docextendname = imageFileName.substring(tempPos + 1);
+                }
+            }
+        }
+
+        // add by wjy for add custom data
+        addCustomData(fu, this.id);
+
+        // 开始进行存储附件的操作
+        int accessorynum = Util.getIntValue(fu.getParameter("accessorynum"), 0);
+        String[] needuploads = new String[accessorynum];
+
+        for (int i = 0; i < accessorynum; i++) {
+            needuploads[i] = "accessory" + (i + 1);
+        }
+
+        // 上传附件并返回存储到数据库中后附件的对应id
+        String[] fileids = fu.uploadFiles(needuploads);
+        // 返回附件的对应文件名称
+        String[] filenames = fu.getFileNames();
+
+        int accessorynumtrue = 0;
+        
+        
+        /*附加新的附件,通过swfupload方法传上来的附件*/
+        String imageidsExt=Util.null2String(fu.getParameter("imageidsExt"));
+        String imagenamesExt=Util.null2String(fu.getParameter("imagenamesExt"));        
+        ArrayList fildIdList_ext=Util.TokenizerString(imageidsExt,",");
+        ArrayList fildNameList_ext=Util.TokenizerString(imagenamesExt,"|");
+        
+        ArrayList fileidList=new ArrayList();
+        ArrayList filenameList=new ArrayList();
+        
+        for(int i=0;i<fileids.length;i++){
+        	fileidList.add(fileids[i]);
+        	filenameList.add(filenames[i]);
+        }
+        for(int i=0;i<fildIdList_ext.size();i++){
+        	fileidList.add(fildIdList_ext.get(i));
+        	filenameList.add(fildNameList_ext.get(i));
+        }
+        
+        // 存储文档附件的相关信息和附件的id
+        for (int i = 0; i < fileidList.size(); i++) {
+            if (Util.getIntValue((String)fileidList.get(i), 0) == 0)       continue;
+            accessorynumtrue++;
+            imgManger.resetParameter();
+            imgManger.setDocid(this.id);
+            imgManger.setImagefileid(Util.getIntValue((String)fileidList.get(i), 0));
+            imgManger.setImagefilename((String)filenameList.get(i));
+            imgManger.setIsextfile("1");
+            String ext = getFileExt((String)filenameList.get(i));
+            if (ext.equalsIgnoreCase("doc")) {
+                imgManger.setDocfiletype("3");
+            } else if (ext.equalsIgnoreCase("xls")) {
+                imgManger.setDocfiletype("4");
+            } else if (ext.equalsIgnoreCase("ppt")) {
+                imgManger.setDocfiletype("5");
+            } else if (ext.equalsIgnoreCase("wps")) {
+                imgManger.setDocfiletype("6");
+            } else if (ext.equalsIgnoreCase("docx")) {
+                imgManger.setDocfiletype("7");
+            } else if (ext.equalsIgnoreCase("xlsx")) {
+                imgManger.setDocfiletype("8");
+            } else if (ext.equalsIgnoreCase("pptx")) {
+                imgManger.setDocfiletype("9");
+            } else if (ext.equalsIgnoreCase("et")) {
+                imgManger.setDocfiletype("10");
+            } else {
+                imgManger.setDocfiletype("2");
+            }
+            imgManger.AddDocImageInfo();
+            
+            //将附件从上传临时表中删除
+            rs.executeSql("delete from imagefiletemp where imagefileid = " + Util.getIntValue((String)fileidList.get(i), 0) + " and docid = 0");
+        }
+        
+        //删除新建文档时删除的附件
+        String delImageidsExt=Util.null2String(fu.getParameter("delImageidsExt"));        
+        ArrayList delImageids=Util.TokenizerString(delImageidsExt,",");
+        for (int i = 0; i < delImageids.size(); i++) {
+        	if (Util.getIntValue((String)delImageids.get(i), 0) == 0) continue;
+        	imgManger.resetParameter();
+        	imgManger.setImagefileid(Util.getIntValue((String)delImageids.get(i), 0));
+        	imgManger.DeleteImageInfo();
+            //将附件从上传临时表中删除
+            rs.executeSql("delete from imagefiletemp where imagefileid = " + Util.getIntValue((String)delImageids.get(i), 0) + " and docid = 0");
+        }
+        
+        
+        // 开始存储文档中的图片的操作 和文档附件的存储基本一样
+        int docimages_num = Util.getIntValue(fu.getParameter("docimages_num"), 0);
+        
+        needuploads = new String[docimages_num];
+
+        for (int i = 0; i < docimages_num; i++) {
+            needuploads[i] = "docimages_" + i;
+        }
+
+        fu.needImagewidth(true);
+        fileids = fu.uploadFiles(needuploads);
+        filenames = fu.getFileNames();
+        int[] imagesizes = fu.getFileSizes();
+        int[] imagewidths = fu.getWidths();
+        int[] imageheights = fu.getHeights();
+
+        for (int i = 0; i < docimages_num; i++) {
+            if (Util.getIntValue(fileids[i], 0) == 0)
+                continue;
+            imgManger.resetParameter();
+            imgManger.setDocid(this.id);
+            imgManger.setImagefileid(Util.getIntValue(fileids[i], 0));
+            imgManger.setImagefilename(filenames[i]);
+            imgManger.setDocfiletype("1");
+
+            imgManger.setImagefielsize(imagesizes[i]);
+            imgManger.setimagefilewidth(imagewidths[i]);
+            imgManger.setImagefileheight(imageheights[i]);
+            
+            imgManger.AddDocImageInfo();
+        }
+
+        // 存储文档的内容
+        this.doccontent = Util.fromBaseEncoding(fu.getParameter("doccontent"), languageid);
+        this.doccontent =Util.htmlFilter4UTF8(this.doccontent );
+        //替换文档内容中可能存在的 textarea|input|form 标签
+        String rex_html = "<(textarea|input|form)[^>]*>";
+        String rex_html2 = "</(textarea|form)>";
+        
+		Pattern p_script = Pattern.compile(rex_html, Pattern.CASE_INSENSITIVE);
+		Matcher m_html = p_script.matcher(this.doccontent);
+		this.doccontent = m_html.replaceAll("");
+		
+		p_script = Pattern.compile(rex_html2, Pattern.CASE_INSENSITIVE);
+		m_html = p_script.matcher(this.doccontent);
+		this.doccontent = m_html.replaceAll("");
+        
+        this.updateDocImageFileOfPic(this.id,this.doccontent);
+
+        String moduleimages[] = fu.getParameters("moduleimages");
+
+        // 如果文档中图片的路径是全路径则将其改为相对路径使其不含服务器的路径。
+        if (moduleimages != null && moduleimages.length > 0) {
+            int tmppos = doccontent.indexOf("/weaver/weaver.file.FileDownload?fileid=");
+            while (tmppos != -1) {
+                int startpos = doccontent.lastIndexOf("\"", tmppos);
+                if ((tmppos - startpos) > 1) {
+                    String tmpcontent = doccontent.substring(0, startpos + 1);
+                    tmpcontent += doccontent.substring(tmppos);
+                    doccontent = tmpcontent;
+                    tmppos = doccontent.indexOf("/weaver/weaver.file.FileDownload?fileid=", tmppos + 1);
+                } else
+                    tmppos = doccontent.indexOf("/weaver/weaver.file.FileDownload?fileid=", tmppos + 1);
+            }
+        }
+
+        for (int i = 0; i < docimages_num; i++) {
+            int pos = doccontent.indexOf(getImgAltFlag(i));
+            // 如果此文档有相关的图片 则把其组合成正确的下载路径
+            if (pos != -1) {
+                int temppos = pos;
+                String tmpcontent = doccontent.substring(0, pos);
+                tmpcontent += " alt=\"" + filenames[i] + "\" ";
+
+                pos = doccontent.indexOf("src=\"", pos);
+                int endpos = doccontent.indexOf("\"", pos + 5);
+
+                tmpcontent += doccontent.substring(temppos + getImgAltFlag(i).length(), pos);
+                tmpcontent += "src=\""+weaver.general.GCONST.getContextPath()+"/weaver/weaver.file.FileDownload?fileid=" + Util.getFileidOut(fileids[i]);
+                tmpcontent += "\"";
+                tmpcontent += doccontent.substring(endpos + 1);
+                doccontent = tmpcontent;
+            }
+            // 如果没有这个相关的图片文件，则删除和此文档相关地这个图片的数据
+            else {
+                imgManger.resetParameter();
+                imgManger.setImagefileid(fileids[i]);
+                imgManger.setDocid(this.id);
+                imgManger.DeleteSingleDocImageInfo();
+            }
+        }
+
+        // ...
+        if (moduleimages != null) {
+            for (int i = 0; i < moduleimages.length; i++) {
+                String moduleimageid = moduleimages[i];
+                rs.executeProc("imagefile_AddByDoc", moduleimageid);
+            }
+        }
+
+        // 下面的操作可以得到此知识文档的相关资料
+        Calendar today = Calendar.getInstance();
+        String formatdate = Util.add0(today.get(Calendar.YEAR), 4) + "-"
+                + Util.add0(today.get(Calendar.MONTH) + 1, 2) + "-"
+                + Util.add0(today.get(Calendar.DAY_OF_MONTH), 2);
+        String formattime = Util.add0(today.get(Calendar.HOUR_OF_DAY), 2) + ":"
+                + Util.add0(today.get(Calendar.MINUTE), 2) + ":" + Util.add0(today.get(Calendar.SECOND), 2);
+
+        this.maincategory = Util.getIntValue(fu.getParameter("maincategory"), 0);
+        this.subcategory = Util.getIntValue(fu.getParameter("subcategory"), 0);
+        this.seccategory = Util.getIntValue(fu.getParameter("seccategory"), 0);
+        this.doclangurage = Util.getIntValue(fu.getParameter("doclangurage"), 0);
+        //this.docapprovable = fu.getParameter("docapprovable");
+        this.docreplyable = fu.getParameter("docreplyable");
+        this.isreply = Util.null2String(fu.getParameter("isreply"));
+        this.replydocid = Util.getIntValue(fu.getParameter("replydocid"), 0);
+        this.ownerid = Util.getIntValue(fu.getParameter("ownerid"), 0);
+        this.ownerType = this.usertype;       
+        this.docsubject = Util.toHtml2(fu.getParameter("docsubject"));
+        this.docsubject = interceptString(this.docsubject,400);
+        
+        this.docpublishtype = fu.getParameter("docpublishtype");
+        if (docpublishtype.equals("2")) {
+            //String docmain = fu.getParameter("docmain");
+        	String docmain = Util.toHtml2(Util.encodeAnd(Util.null2String(fu.getParameter("docmain"))));            
+            this.doccontent = docmain + "!@#$%^&*" + this.doccontent;
+        }
+
+        this.itemid = Util.getIntValue(fu.getParameter("itemid"), 0);
+        this.itemmaincategoryid = Util.getIntValue(fu.getParameter("itemmaincategoryid"), 0);
+        this.hrmresid = Util.getIntValue(fu.getParameter("hrmresid"), 0);
+        this.assetid = Util.getIntValue(fu.getParameter("assetid"), 0);
+        this.crmid = Util.getIntValue(fu.getParameter("crmid"), 0);
+        this.projectid = Util.getIntValue(fu.getParameter("projectid"), 0);
+        this.financeid = Util.getIntValue(fu.getParameter("financeid"), 0);
+        this.doccreaterid = this.userid;
+        this.docCreaterType=this.usertype;
+        // TD1715 新建或者编辑文档时，更改文档的所有者，促使文档所在的部门被清除 DP
+//        this.docdepartmentid = Util.getIntValue(hrc.getDepartmentID("" + ownerid));
+        // this.docdepartmentid =
+        // Util.getIntValue(fu.getParameter("docdepartmentid"), 0);
+        
+        if("2".equals(this.ownerType)){
+        	this.docdepartmentid = Util.getIntValue(hrc.getDepartmentID("" + cici.getCustomerInfomanager(""+ownerid)));
+        }else{
+        	this.docdepartmentid = Util.getIntValue(hrc.getDepartmentID("" + ownerid));
+        }
+
+        this.doccreatedate = formatdate;
+        this.doccreatetime = formattime;
+        this.doclastmoduserid = this.userid;
+        this.docLastModUserType=this.usertype;
+        this.doclastmoddate = formatdate;
+        this.doclastmodtime = formattime;
+        this.docapproveuserid = 0;
+        this.docApproveUserType = "";
+        this.docapprovedate = "";
+        this.docapprovetime = "";
+        this.docarchiveuserid = 0;
+        this.docArchiveUserType = "";
+        this.docarchivedate = "";
+        this.docarchivetime = "";
+        this.newsid = Util.getIntValue(fu.getParameter("newsid"), 0);
+
+        rs = new RecordSet();
+        SysRemindWorkflow srw = new SysRemindWorkflow();
+        String sql = "";
+        if (replydocid != 0) {
+            sql = "select id,canremind,docsubject,doccreaterid from DocDetail where id=" + replydocid;
+            //System.out.println("sql = " + sql);
+            String canRemind = "";
+            rs.executeSql(sql);
+            if (rs.next()) {
+                canRemind = rs.getString("canremind");
+                if (canRemind.equals("2")) {
+                    srw.setSysRemindInfo("回复提醒:" + rs.getString("docsubject"), this.id, 0, 0, 0, this.userid,
+                            rs.getString("doccreaterid") + "", "");
+                }
+            }
+        }
+
+        if (Util.null2String(fu.getParameter("parentids")).equals("")) {
+            this.parentids = this.id + "";
+        } else {
+            this.parentids = Util.null2String(fu.getParameter("parentids")) + "," + this.id;
+        }
+
+        this.keyword = Util.null2String(fu.getParameter("keyword"));
+        /* 文档的关键字 */
+
+        int docid = this.id;
+
+        this.accessorycount = accessorynumtrue;
+
+        if (isreply.equals("1")) {
+            AddReplayDocCount(rs); // 修改回复记录条数
+        }
+
+        /* 回复文档总数 */
+        this.replaydoccount = 0;
+        /* 创建的用户类型 1: 内部 2: 外部 */
+        //this.usertype = Util.null2String(fu.getParameter("usertype"));
+        this.topage = Util.null2String(fu.getParameter("topage"));
+
+        this.contractman = Util.null2String(fu.getParameter("contractman"));
+        this.contractstartdate = Util.null2String(fu.getParameter("contractstartdate"));
+        this.contractenddate = Util.null2String(fu.getParameter("contractenddate"));
+        this.docmodule = Util.null2String(fu.getParameter("docmodule"));
+        this.proenddate = Util.null2String(fu.getParameter("proenddate"));
+        this.typeid = Util.getIntValue(fu.getParameter("typeid"), 0);
+        this.urlfrom = Util.null2String(fu.getParameter("urlfrom"));
+        this.canCopy = "" + Util.getIntValue(fu.getParameter("cancopy"), 1);
+        this.canRemind = "" + Util.getIntValue(fu.getParameter("canremind"), 1);
+
+        // get catagory's orderable
+        this.orderable = "" + scc.getSecOrderable(this.seccategory);
+        
+        this.docEdition = Util.getIntValue(fu.getParameter("docedition"),-1);
+        this.docEditionId = Util.getIntValue(fu.getParameter("doceditionid"),-1);
+        
+        this.mainDoc = Util.getIntValue(Util.null2String(fu.getParameter("maindoc")),-1);
+        if(this.mainDoc==-1) this.mainDoc = this.id;
+        
+        // added by wdl
+        this.docCode = Util.null2String(fu.getParameter("doccode"));
+        if(this.docCode.equals("")){
+            DocCoder dc = new DocCoder();
+            if(this.mainDoc == this.id){
+            	this.docCode = dc.getDocCoder(""+this.seccategory);
+            }else{
+            	this.docCode = dc.getSecDocCoder(""+mainDoc,""+this.seccategory);
+            }
+        }
+        
+        this.readOpterCanPrint = Util.getIntValue(fu.getParameter("readoptercanprint"), 0);
+        
+        this.invalidationDate = Util.null2String(fu.getParameter("invalidationdate"));
+		this.dummycata = Util.null2String(fu.getParameter("dummycata"));
+        
+        if(scc.isNoRepeatedName(this.seccategory)){
+            // TODO
+            
+        }
+        
+        this.docstatus = fu.getParameter("docstatus");
+        
+        // 如果在目录上设置了 创建者对此目录下的文档无权限查看则此文档被直接置为正常 TD4111 TD4112 begin
+        RecordSet rsCreater = new RecordSet();
+        int pcreater = 3;
+        String strCreaterSql = "select pcreater from secCreaterDocPope where secid=" + this.seccategory;
+
+        rsCreater.executeSql(strCreaterSql);
+        if (rsCreater.next()) {
+            pcreater = Util.getIntValue(rsCreater.getString("pcreater"), 0);
+        }
+        
+        /*
+        if (pcreater <= 0) { // 创建者对文档无权限
+            if("1".equals(this.docapprovable))
+                docstatus = "3"; // 需要审批则置成审批状态
+            else
+                docstatus = "1"; // 不需要审批直接置成正常状态
+        }
+        */
+        // end
+        // 判断新建的是不是个人文档
+        String from = Util.null2String(fu.getParameter("from"));
+
+        //保存草稿//预览
+        if(opera.equals("adddraft") || opera.equals("addpreview")){
+            this.docstatus = "0";
+        } else if(!"personalDoc".equals(from)){//提交
+            if(scc.needApprove(this.seccategory)) {//如果需要审批
+                this.docstatus = "-3";
+                this.approveType = 1;
+            } else if(scc.needPubOperation(this.seccategory)) {//如果需要发布
+                this.docstatus = "-6";
+            } else {//生效/正常
+                this.docstatus = "-1";
+                this.docValidUserId = this.userid;
+                this.docValidUserType=this.usertype;
+                this.docValidDate = formatdate;
+                this.docValidTime = formattime;
+                
+                if(scc.isEditionOpen(this.seccategory)) {//如果版本管理开启
+                    if(this.docEditionId == -1){// 如果不存在历史版本
+                        this.docEditionId = this.getNextEditionId(rs);
+                    } else {
+                        // TODO 否则，通过版本ID找到同文档的版本
+                        //新建文档不存在以前有版本
+                    }
+                    this.docEdition = dc.getEdition(this.docEditionId)+1;
+                }
+            }
+            
+            if(this.invalidationDate!=null&&!"".equals(this.invalidationDate)){
+                java.text.DateFormat sdf = new java.text.SimpleDateFormat("yyyy-MM-dd");
+                Date tmpidate = sdf.parse(this.invalidationDate);
+            	if(tmpidate.getTime()<today.getTime().getTime()){
+            		this.docstatus = "7";
+                    this.docInvalUserId = this.userid;
+                    this.docInvalUserType = this.usertype;
+                    this.docInvalDate = formatdate;
+                    this.docInvalTime = formattime;
+                    
+                    if(scc.isEditionOpen(this.seccategory)) {//如果版本管理开启
+                    	if(scc.needApprove(this.seccategory)||scc.needPubOperation(this.seccategory)) {//如果需要审批或者需要发布
+                            if(this.docEditionId==-1)
+                                this.docEditionId = this.getNextEditionId(rs);
+                            this.docEdition = dc.getEdition(this.docEditionId)+1;                    		
+                    	}
+                    }                      
+            	}
+            }
+        }
+        if (!contractman.equals("")) {
+            this.docstatus = "1";
+            docCreaterType="1";
+        }
+        this.canPrintedNum = Util.getIntValue(fu.getParameter("canPrintedNum"),0);
+        this.editMouldId = Util.getIntValue(fu.getParameter("editMouldId"),0);
+        
+        this.secretLevel = Util.getIntValue(fu.getParameter("secretLevel"),DEFAILT_SECRET_LEVEL);
+        this.secretValidity = Util.null2s(fu.getParameter("secretValidity"),"");
+
+        this.replyremind = Util.getIntValue(fu.getParameter("replyremind"),0);
+
+        // 进行实际的保存文档内容的操作
+        AddDocInfo();
+
+
+        if (!contractman.equals("")) {
+            addHrmContract();
+        }else{
+            // 进行保存共享信息的实际操作
+            AddShareInfo();
+        }
+    }
+    
+    
+    
+    
+    public void setDocType(int docType) {
+		this.docType = docType;
+	}
+
+	/**
+     * 编辑文档
+     * @param fu FileUpload对象
+     * @param opera 操作类型
+     * @throws Exception
+     */
+    public void editDoc(FileUpload fu,String opera) throws Exception {
+        // 编辑的时候进行的操作 基本通新增的时候的操作
+        RecordSet rs = new RecordSet();
+        
+        this.id = Util.getIntValue(fu.getParameter("id"), 0);
+        this.oldVersionId = Util.getIntValue(fu.getParameter("versionId"), 0);
+        String versionDetail = Util.null2String(fu.getParameter("versionDetail"));
+        //add by wdl
+        int oldDocId = -1;
+        boolean needAddNewEdition = false;
+        this.imageFileIdOfPicChangeList=new ArrayList();
+       
+        this.maincategory = Util.getIntValue(fu.getParameter("maincategory"), 0);
+        this.subcategory = Util.getIntValue(fu.getParameter("subcategory"), 0);
+        this.seccategory = Util.getIntValue(fu.getParameter("seccategory"), 0);
+        
+        this.docstatus = fu.getParameter("docstatus");
+        this.oldstatus = docstatus;
+        this.docCode = Util.null2String(fu.getParameter("doccode"));
+        this.docEdition = Util.getIntValue(fu.getParameter("docedition"),-1);
+        this.docEditionId = Util.getIntValue(fu.getParameter("doceditionid"),-1);
+        this.docsubject = Util.toHtml2(Util.null2String(fu.getParameter("docsubject")));
+        this.docsubject = interceptString(this.docsubject,400);
+		
+        String deleteaccessory = Util.null2String(fu.getParameter("deleteaccessory"));
+        if(deleteaccessory.startsWith(",")) deleteaccessory = deleteaccessory.substring(1);
+        if(deleteaccessory.endsWith(",")) deleteaccessory = deleteaccessory.substring(0,deleteaccessory.length()-1);
+        
+        //需要拷贝当前版本的文档新建为草稿文档后再作操作
+        //if(scc.isEditionOpen(this.seccategory)&&this.docEdition>0&&!"0".equals(this.oldstatus)) {
+        //if(scc.isEditionOpen(this.seccategory)&&!"0".equals(this.oldstatus)&&!"4".equals(this.oldstatus)) {       	
+        if(scc.isEditionOpen(this.seccategory)&&((!"0".equals(this.oldstatus)&&!"4".equals(this.oldstatus))||(this.docEditionId>0&&this.docEdition>0))) {       	
+
+            needAddNewEdition = true;
+            oldDocId = this.id;
+            // 获得一个新版本的文档id
+            this.id = getNextDocId(rs);        	
+        	
+        	if(this.docEditionId<=0) {//之前一个版本为非版本管理
+                this.docEditionId = this.getNextEditionId(rs);
+                this.docEdition = 1;                 
+                rs.executeSql("update DocDetail set docEditionId="+this.docEditionId+",docEdition="+this.docEdition+" where id="+oldDocId);
+                rs.executeSql("update docdetail set docstatus = 7,ishistory = 1 where id <> " + this.id + " and docedition > 0 and docedition <= " + this.docEdition + " and doceditionid > 0 and doceditionid = " + this.docEditionId);    
+            }else if(this.docEdition<=0){//之前一个版本没有设置版本号  如为审批状态
+                this.docEdition = dc.getEdition(this.docEditionId)+1;            	
+                rs.executeSql("update DocDetail set docEditionId="+this.docEditionId+",docEdition="+this.docEdition+" where id="+oldDocId);
+                rs.executeSql("update docdetail set docstatus = 7,ishistory = 1 where id <> " + this.id + " and docedition > 0 and docedition <= " + this.docEdition + " and doceditionid > 0 and doceditionid = " + this.docEditionId);                
+            }else if(this.docEditionId>0&&this.docEdition>0){
+                rs.executeSql("update docdetail set docstatus = 7,ishistory = 1 where id <> " + this.id + " and docedition > 0 and docedition <= " + this.docEdition + " and doceditionid > 0 and docstatus in (0,4,-6,-3,-1) and doceditionid = " + this.docEditionId);             	
+            }
+
+            //拷贝原文档到新文档
+            addNewDocForEdition(oldDocId,deleteaccessory);
+            
+            RecordSet rs1 = new RecordSet();
+            List isExistedImageFileIds = new ArrayList();
+            rs1.executeSql("select * from DocImageFile where docid ="+oldDocId);
+            while(rs1.next()){
+            	isExistedImageFileIds.add(Util.null2String(rs1.getString("imagefileid")));
+            }
+            
+            /*附加新的附件,通过swfupload方法传上来的附件*/
+            String imageidsExt=Util.null2String(fu.getParameter("imageidsExt"));
+            String imagenamesExt=Util.null2String(fu.getParameter("imagenamesExt"));        
+            ArrayList fildIdList_ext=Util.TokenizerString(imageidsExt,",");
+            ArrayList fildNameList_ext=Util.TokenizerString(imagenamesExt,"|");
+            ArrayList fileidList=new ArrayList();
+            ArrayList filenameList=new ArrayList();
+            for(int i=0;i<fildIdList_ext.size();i++){
+            	fileidList.add(fildIdList_ext.get(i));
+            	filenameList.add(fildNameList_ext.get(i));
+            }
+            // 存储文档附件的相关信息和附件的id
+            for (int i = 0; i < fileidList.size(); i++) {
+                if(Util.getIntValue((String)fileidList.get(i), 0) == 0) continue;
+                if(isExistedImageFileIds.indexOf(Util.null2String((String)fileidList.get(i)))>-1) continue; 
+                imgManger.resetParameter();
+                imgManger.setDocid(this.id);
+                imgManger.setImagefileid(Util.getIntValue((String)fileidList.get(i), 0));
+                imgManger.setImagefilename((String)filenameList.get(i));
+                imgManger.setIsextfile("1");
+                String ext = getFileExt((String)filenameList.get(i));
+                if (ext.equalsIgnoreCase("doc")) {
+                    imgManger.setDocfiletype("3");
+                } else if (ext.equalsIgnoreCase("xls")) {
+                    imgManger.setDocfiletype("4");
+                } else if (ext.equalsIgnoreCase("ppt")) {
+                    imgManger.setDocfiletype("5");
+                } else if (ext.equalsIgnoreCase("wps")) {
+                    imgManger.setDocfiletype("6");
+                } else if (ext.equalsIgnoreCase("docx")) {
+                    imgManger.setDocfiletype("7");
+                } else if (ext.equalsIgnoreCase("xlsx")) {
+                    imgManger.setDocfiletype("8");
+                } else if (ext.equalsIgnoreCase("pptx")) {
+                    imgManger.setDocfiletype("9");
+                } else if (ext.equalsIgnoreCase("et")) {
+                    imgManger.setDocfiletype("10");
+                } else {
+                    imgManger.setDocfiletype("2");
+                }
+                imgManger.AddDocImageInfo();
+                
+                //将附件从上传临时表中删除
+                rs.executeSql("delete from imagefiletemp where imagefileid = " + Util.getIntValue((String)fileidList.get(i), 0) + " and docid = "+oldDocId);
+            	rs.executeSql(" update docdetail set accessorycount = (select count(distinct id) from DocImageFile where isextfile = '1' and docid = " + this.id + " and docfiletype <> '1'  and docfiletype <> '11' ) where id = " + this.id);
+            }
+
+            this.docEdition = -1;
+        } else if(Util.getIntValue(Util.null2String(fu.getParameter("isFromAccessory")))==1 || (scc.isEditionOpen(this.seccategory)&&("0".equals(this.oldstatus)||"4".equals(this.oldstatus)))){
+			RecordSet rs1 = new RecordSet();
+             List isExistedImageFileIds = new ArrayList();
+             rs1.executeSql("select * from DocImageFile where docid ="+this.id);
+             while(rs1.next()){
+             	isExistedImageFileIds.add(Util.null2String(rs1.getString("imagefileid")));
+             }
+             /*附加新的附件,通过swfupload方法传上来的附件*/
+             String isSubmit = Util.null2String(fu.getParameter("isSubmit"));
+             String imageidsExt=Util.null2String(fu.getParameter("imageidsExt"));
+             String imagenamesExt=Util.null2String(fu.getParameter("imagenamesExt"));        
+             ArrayList fildIdList_ext=Util.TokenizerString(imageidsExt,",");
+             ArrayList fildNameList_ext=Util.TokenizerString(imagenamesExt,"|");
+             ArrayList fileidList=new ArrayList();
+             ArrayList filenameList=new ArrayList();
+             for(int i=0;i<fildIdList_ext.size();i++){
+             	fileidList.add(fildIdList_ext.get(i));
+             	filenameList.add(fildNameList_ext.get(i));
+             }
+            	 // 存储文档附件的相关信息和附件的id
+               for (int i = 0; i < fileidList.size(); i++) {
+                   if(Util.getIntValue((String)fileidList.get(i), 0) == 0) continue;
+                   if(isExistedImageFileIds.indexOf(Util.null2String((String)fileidList.get(i)))>-1) continue; 
+                   imgManger.resetParameter();
+                   imgManger.setDocid(this.id);
+                   imgManger.setImagefileid(Util.getIntValue((String)fileidList.get(i), 0));
+                   imgManger.setImagefilename((String)filenameList.get(i));
+                   imgManger.setIsextfile("1");
+                   String ext = getFileExt((String)filenameList.get(i));
+                   if (ext.equalsIgnoreCase("doc")) {
+                       imgManger.setDocfiletype("3");
+                   } else if (ext.equalsIgnoreCase("xls")) {
+                       imgManger.setDocfiletype("4");
+                   } else if (ext.equalsIgnoreCase("ppt")) {
+                       imgManger.setDocfiletype("5");
+                   } else if (ext.equalsIgnoreCase("wps")) {
+                       imgManger.setDocfiletype("6");
+                   } else if (ext.equalsIgnoreCase("docx")) {
+                       imgManger.setDocfiletype("7");
+                   } else if (ext.equalsIgnoreCase("xlsx")) {
+                       imgManger.setDocfiletype("8");
+                   } else if (ext.equalsIgnoreCase("pptx")) {
+                       imgManger.setDocfiletype("9");
+                   } else if (ext.equalsIgnoreCase("et")) {
+                       imgManger.setDocfiletype("10");
+                   } else {
+                       imgManger.setDocfiletype("2");
+                   }
+                   imgManger.AddDocImageInfo();
+				    //将附件从上传临时表中删除
+                   rs.executeSql("delete from imagefiletemp where imagefileid = " + Util.getIntValue((String)fileidList.get(i), 0) + " and docid = "+this.id);
+                   rs.executeSql(" update docdetail set accessorycount = (select count(distinct id) from DocImageFile where isextfile = '1' and docid = " + this.id + " and docfiletype <> '1'  and docfiletype <> '11') where id = " + this.id);
+                }
+               String[] deleteaccessoryArray = deleteaccessory.split(",");
+               for(int j = 0;j<deleteaccessoryArray.length;j++){
+            	   if(deleteaccessoryArray[j] != null && !deleteaccessoryArray[j].equals("")){
+            		   String sql = "delete from docimagefile where docid = " + this.id + " and imagefileid = "+ deleteaccessoryArray[j]+"";
+            		   rs.executeSql(sql);
+            	   }
+               }
+        	rs.executeSql(" delete from docimagefile where docid = " + this.id + " and imagefileid in (select imagefiledesc from docimagefile where isextfile = '1' and docid = -" + this.id + ")");
+        	rs.executeSql(" update imagefile set imagefileused = imagefileused - 1 where imagefileid in (select imagefiledesc from docimagefile where isextfile = '1' and docid = -" + this.id + ")");
+        	rs.executeSql(" update docimagefile set imagefiledesc = '' where isextfile = '1' and docid = -" + this.id);
+        	rs.executeSql(" update docimagefile set docid = " + this.id + " where docid = -" + this.id);
+        	rs.executeSql(" update docdetail set accessorycount = (select count(distinct id) from DocImageFile where isextfile = '1' and docid = " + this.id + " and docfiletype <> '1'  and docfiletype <> '11') where id = " + this.id);
+        }else if(!scc.isEditionOpen(this.seccategory)) { //版本管理尚未启用，复制生成的正文被编辑时
+
+        	int tempImageFileId=0;
+            rs.executeSql("select imagefileid from docimagefile where versionId = " + this.oldVersionId + " and docid = " + this.id);
+            if(rs.next()){
+            	tempImageFileId = Util.getIntValue(Util.null2String(rs.getString("imagefileid")));
+            }
+
+            boolean otherrelated = false;
+            rs.executeSql("select imagefileused from imagefile where imagefileid = " + tempImageFileId);
+            if(rs.next()&&Util.getIntValue(Util.null2String(rs.getString(1)))>1) {
+            	otherrelated = true;        	
+            }
+            if(otherrelated){
+            	rs.executeSql(" delete from docimagefile where docid = " + this.id + " and imagefileid in (select imagefiledesc from docimagefile where isextfile = '1' and docid = -" + this.id + ")");
+            	rs.executeSql(" update imagefile set imagefileused = imagefileused - 1 where imagefileid in (select imagefiledesc from docimagefile where isextfile = '1' and docid = -" + this.id + ")");
+            	rs.executeSql(" update docimagefile set imagefiledesc = '' where isextfile = '1' and docid = -" + this.id);
+            	rs.executeSql(" update docimagefile set docid = " + this.id + " where docid = -" + this.id);
+            	rs.executeSql(" update docdetail set accessorycount = (select count(distinct id) from DocImageFile where isextfile = '1' and docid = " + this.id + " and docfiletype <> '1'   and docfiletype <> '11') where id = " + this.id);            	
+            }
+        }
+
+        // add by wjy for edit custom data
+        editCustomData(fu, this.id);
+
+        this.doccontent = Util.fromBaseEncoding(fu.getParameter("doccontent"), languageid);
+        this.doccontent =Util.htmlFilter4UTF8(this.doccontent );
+		int doccontentflag = Util.getIntValue(fu.getParameter("doccontentflag"),-1);
+        if(doccontentflag==1){//草稿状态提交的时候  不改变文档内容
+        	DocManager dm2=new DocManager();
+        	dm2.resetParameter();
+        	dm2.setId(this.id);
+        	dm2.getDocInfoById();
+        	this.doccontent=dm2.getDoccontent();
+        }
+        //替换文档内容中可能存在的 textarea|input|form 标签
+        String rex_html = "<(textarea|input|form)[^>]*>";
+        String rex_html2 = "</(textarea|form)>";
+        
+		Pattern p_script = Pattern.compile(rex_html, Pattern.CASE_INSENSITIVE);
+		Matcher m_html = p_script.matcher(this.doccontent);
+		this.doccontent = m_html.replaceAll("");
+		
+		p_script = Pattern.compile(rex_html2, Pattern.CASE_INSENSITIVE);
+		m_html = p_script.matcher(this.doccontent);
+		this.doccontent = m_html.replaceAll("");
+		
+        if(this.imageFileIdOfPicChangeList!=null&&this.imageFileIdOfPicChangeList.size()>0){
+        	Map imageFileIdOfPicChangeMap=null;
+        	int oldImageFileId=0;
+        	int newImageFileId=0;
+        	for(int i=0;i<this.imageFileIdOfPicChangeList.size();i++){
+        		imageFileIdOfPicChangeMap=(Map)imageFileIdOfPicChangeList.get(i);
+        		oldImageFileId=Util.getIntValue((String)imageFileIdOfPicChangeMap.get("oldImageFileId"));
+        		newImageFileId=Util.getIntValue((String)imageFileIdOfPicChangeMap.get("newImageFileId"));
+        		if(oldImageFileId!=newImageFileId){
+        			this.doccontent=Util.StringReplace(this.doccontent, "/weaver/weaver.file.FileDownload?fileid="+oldImageFileId+"\"", "/weaver/weaver.file.FileDownload?fileid="+newImageFileId+"\"");
+        			this.doccontent=Util.StringReplace(this.doccontent, "/weaver/weaver.file.FileDownload?fileid="+oldImageFileId+"&", "/weaver/weaver.file.FileDownload?fileid="+newImageFileId+"&");       			
+        		}
+        	}
+        }
+        this.updateDocImageFileOfPic(this.id,this.doccontent);        
+        
+        int tmppos = doccontent.indexOf("/weaver/weaver.file.FileDownload?fileid=");
+        while (tmppos != -1) {
+            int startpos = doccontent.lastIndexOf("\"", tmppos);
+            if ((tmppos - startpos) > 1) {
+                String tmpcontent = doccontent.substring(0, startpos + 1);
+                tmpcontent += doccontent.substring(tmppos);
+                doccontent = tmpcontent;
+                tmppos = doccontent.indexOf("/weaver/weaver.file.FileDownload?fileid=", tmppos + 1);
+            } else
+                tmppos = doccontent.indexOf("/weaver/weaver.file.FileDownload?fileid=", tmppos + 1);
+        }
+
+        int olddocimagesnum = Util.getIntValue(fu.getParameter("olddocimagesnum"), 0);
+		if(needAddNewEdition){
+        	olddocimagesnum=0;
+        }
+        // 删除老的文档图片数据
+        for (int i = 0; i < olddocimagesnum; i++) {
+            String tmpid = Util.null2String(fu.getParameter("olddocimages" + i));
+            String tmpid1 = "/weaver/weaver.file.FileDownload?fileid=" + tmpid + "\"";
+            if (doccontent.indexOf(tmpid1) == -1) {
+                imgManger.resetParameter();
+                imgManger.setImagefileid(tmpid);
+                imgManger.setDocid(this.id);
+                imgManger.DeleteSingleDocImageInfo();
+            }
+        }
+
+        // 增加新的文档附件数据
+        int accessorynum = Util.getIntValue(fu.getParameter("accessorynum"), 0);
+        String[] needuploads = new String[accessorynum];
+        for (int i = 0; i < accessorynum; i++) {
+            needuploads[i] = "accessory" + (i + 1);
+        }
+
+        String[] fileids = fu.uploadFiles(needuploads);
+        String[] filenames = fu.getFileNames();
+
+        int accessorynumtrue = 0;
+        for (int i = 0; i < accessorynum; i++) {
+            if (Util.getIntValue(fileids[i], 0) == 0)
+                continue;
+            accessorynumtrue++;
+            imgManger.resetParameter();
+            imgManger.setDocid(this.id);
+            imgManger.setImagefileid(Util.getIntValue(fileids[i], 0));
+            imgManger.setImagefilename(filenames[i]);
+            imgManger.setIsextfile("1");
+            String ext = getFileExt(filenames[i]);
+            if (ext.equals("doc")) {
+                imgManger.setDocfiletype("3");
+            } else if (ext.equals("xls")) {
+                imgManger.setDocfiletype("4");
+            } else if (ext.equalsIgnoreCase("ppt")) {
+                imgManger.setDocfiletype("5");
+            } else if (ext.equalsIgnoreCase("wps")) {
+                imgManger.setDocfiletype("6");
+            } else if (ext.equalsIgnoreCase("docx")) {
+                imgManger.setDocfiletype("7");
+            } else if (ext.equalsIgnoreCase("xlsx")) {
+                imgManger.setDocfiletype("8");
+            } else if (ext.equalsIgnoreCase("pptx")) {
+                imgManger.setDocfiletype("9");
+            } else if (ext.equalsIgnoreCase("et")) {
+                imgManger.setDocfiletype("10");
+            } else {
+                imgManger.setDocfiletype("2");
+            }
+            imgManger.AddDocImageInfo();
+        }
+
+        // 增加新的文档图片信息
+        int docimages_num = Util.getIntValue(fu.getParameter("docimages_num"), 0);
+        needuploads = new String[docimages_num];
+
+        for (int i = 0; i < docimages_num; i++) {
+            needuploads[i] = "docimages_" + i;
+        }
+
+        fu.needImagewidth(true);
+        fileids = fu.uploadFiles(needuploads);
+        filenames = fu.getFileNames();
+        int[] imagesizes = fu.getFileSizes();
+        int[] imagewidths = fu.getWidths();
+        int[] imageheights = fu.getHeights();
+
+        for (int i = 0; i < docimages_num; i++) {
+            if (Util.getIntValue(fileids[i], 0) == 0)
+                continue;
+            imgManger.resetParameter();
+            imgManger.setDocid(this.id);
+            imgManger.setImagefileid(Util.getIntValue(fileids[i], 0));
+            imgManger.setImagefilename(filenames[i]);
+            imgManger.setDocfiletype("1");
+
+            imgManger.setImagefielsize(imagesizes[i]);
+            imgManger.setimagefilewidth(imagewidths[i]);
+            imgManger.setImagefileheight(imageheights[i]);
+            
+            imgManger.AddDocImageInfo();
+        }
+
+        for (int i = 0; i < docimages_num; i++) {
+            int pos = doccontent.indexOf(getImgAltFlag(i));
+            if (pos != -1) {
+                int temppos = pos;
+                String tmpcontent = doccontent.substring(0, pos);
+                tmpcontent += " alt=\"" + filenames[i] + "\" ";
+
+                pos = doccontent.indexOf("src=\"", pos);
+                int endpos = doccontent.indexOf("\"", pos + 6);
+
+                tmpcontent += doccontent.substring(temppos + getImgAltFlag(i).length(), pos);
+                tmpcontent += "src=\""+weaver.general.GCONST.getContextPath()+"/weaver/weaver.file.FileDownload?fileid=" + Util.getFileidOut(fileids[i]);
+                tmpcontent += "\"";
+                tmpcontent += doccontent.substring(endpos + 1);
+                doccontent = tmpcontent;
+            } else {
+                imgManger.resetParameter();
+                imgManger.setImagefileid(fileids[i]);
+                imgManger.setDocid(this.id);
+                imgManger.DeleteSingleDocImageInfo();
+            }
+        }
+
+        Calendar today = Calendar.getInstance();
+        String formatdate = Util.add0(today.get(Calendar.YEAR), 4) + "-"
+                + Util.add0(today.get(Calendar.MONTH) + 1, 2) + "-"
+                + Util.add0(today.get(Calendar.DAY_OF_MONTH), 2);
+        String formattime = Util.add0(today.get(Calendar.HOUR_OF_DAY), 2) + ":"
+                + Util.add0(today.get(Calendar.MINUTE), 2) + ":" + Util.add0(today.get(Calendar.SECOND), 2);
+
+        this.doclangurage = Util.getIntValue(fu.getParameter("doclangurage"), 0);
+        //this.docapprovable = Util.null2String(fu.getParameter("docapprovable"));
+        this.docreplyable = Util.null2String(fu.getParameter("docreplyable"));
+        this.isreply = Util.null2String(fu.getParameter("isreply"));
+        this.replydocid = Util.getIntValue(fu.getParameter("replydocid"), 0);
+        
+        
+        this.oldownerid = Util.getIntValue(fu.getParameter("oldownerid"), 0);
+
+        this.docpublishtype = Util.null2String(fu.getParameter("docpublishtype"));
+        this.docpublishtypeold = Util.null2String(fu.getParameter("docpublishtypeold"));
+
+        if (docpublishtype.equals(""))
+            docpublishtype = "1";
+        if (docpublishtypeold.equals(""))
+            docpublishtypeold = "1";
+
+        if (docpublishtype.equals("2")&&doccontentflag!=1) {
+            //String docmain = fu.getParameter("docmain");
+        	String docmain = Util.toHtml2(Util.encodeAnd(Util.null2String(fu.getParameter("docmain"))));
+            this.doccontent = docmain + "!@#$%^&*" + this.doccontent;
+        }
+        
+        this.itemid = Util.getIntValue(fu.getParameter("itemid"), 0);
+        this.itemmaincategoryid = Util.getIntValue(fu.getParameter("itemmaincategoryid"), 0);
+        this.hrmresid = Util.getIntValue(fu.getParameter("hrmresid"), 0);
+        this.assetid = Util.getIntValue(fu.getParameter("assetid"), 0);
+        this.ownerid = Util.getIntValue(fu.getParameter("ownerid"), 0);
+        this.ownerType = Util.null2String(fu.getParameter("ownerType"));
+        this.crmid = Util.getIntValue(fu.getParameter("crmid"), 0);
+        this.projectid = Util.getIntValue(fu.getParameter("projectid"), 0);
+        this.financeid = Util.getIntValue(fu.getParameter("financeid"), 0);
+        this.doccreaterid = Util.getIntValue(fu.getParameter("doccreaterid"), 0);
+        this.docCreaterType = Util.null2String(fu.getParameter("docCreaterType"));       
+        // TD1715 新建或者编辑文档时，更改文档的所有者，促使文档所在的部门被清除 DP
+//        this.docdepartmentid = Util.getIntValue(hrc.getDepartmentID("" + ownerid));
+        // this.docdepartmentid =
+        // Util.getIntValue(fu.getParameter("docdepartmentid"), 0);
+
+        if("2".equals(this.ownerType)){
+        	this.docdepartmentid = Util.getIntValue(hrc.getDepartmentID("" + cici.getCustomerInfomanager(""+ownerid)));
+        }else{
+        	this.docdepartmentid = Util.getIntValue(hrc.getDepartmentID("" + ownerid));
+        }        
+        
+        if(needAddNewEdition){
+            this.doccreatedate = formatdate;
+            this.doccreatetime = formattime;
+        } else {
+            this.doccreatedate = Util.null2String(fu.getParameter("doccreatedate"));
+            this.doccreatetime = Util.null2String(fu.getParameter("doccreatetime"));
+        }
+        this.doclastmoduserid = this.userid;
+        this.docLastModUserType = this.usertype;        
+        this.doclastmoddate = formatdate;
+        this.doclastmodtime = formattime;
+        this.docapproveuserid = Util.getIntValue(fu.getParameter("docapproveuserid"), 0);
+        this.docapprovedate = Util.null2String(fu.getParameter("docapprovedate"));
+        this.docapprovetime = Util.null2String(fu.getParameter("docapprovetime"));
+        this.docarchiveuserid = Util.getIntValue(fu.getParameter("docarchiveuserid"), 0);
+        this.docarchivedate = Util.null2String(fu.getParameter("docarchivedate"));
+        this.docarchivetime = Util.null2String(fu.getParameter("docarchivetime"));
+        this.newsid = Util.getIntValue(fu.getParameter("newsid"), 0);
+
+        this.keyword = Util.null2String(fu.getParameter("keyword")); // 文档的关键字
+
+        this.accessorycount = accessorynumtrue;
+        this.replaydoccount = Util.getIntValue(fu.getParameter("replaydoccount"), 0); // 回复文档总数
+        //this.usertype = Util.null2String(fu.getParameter("usertype")); // 创建的用户类型
+        // 1:
+        // 内部
+        // 2:
+        // 外部
+        this.opreateType = Util.null2String(fu.getParameter("opreateType"));
+        if ("".equals(opreateType)) {
+            this.opreateType = this.usertype;
+        }
+        this.topage = Util.null2String(fu.getParameter("topage"));
+        
+        this.contractman = Util.null2String(fu.getParameter("contractman"));
+        this.contractstartdate = Util.null2String(fu.getParameter("contractstartdate"));
+        this.contractenddate = Util.null2String(fu.getParameter("contractenddate"));
+        this.docmodule = Util.null2String(fu.getParameter("docmodule"));
+        this.proenddate = Util.null2String(fu.getParameter("proenddate"));
+        this.typeid = Util.getIntValue(fu.getParameter("typeid"), 0);
+        this.urlfrom = Util.null2String(fu.getParameter("urlfrom"));
+
+        this.canCopy = "" + Util.getIntValue(fu.getParameter("cancopy"), 1);
+        this.canRemind = "" + Util.getIntValue(fu.getParameter("canremind"), 1);
+        
+        // added by wdl
+        this.mainDoc = Util.getIntValue(Util.null2String(fu.getParameter("maindoc")),-1);
+        if(this.mainDoc==oldDocId || this.mainDoc==-1){
+            this.mainDoc = this.id;
+        }
+        
+        this.readOpterCanPrint = Util.getIntValue(fu.getParameter("readoptercanprint"), 0);
+        
+        this.invalidationDate = Util.null2String(fu.getParameter("invalidationdate"));
+		this.dummycata = Util.null2String(fu.getParameter("dummycata"));
+
+		this.hrmContractId = Util.getIntValue(fu.getParameter("hrmContractId"), 0);		
+        
+        if(scc.isNoRepeatedName(this.seccategory)){
+            // TODO
+            
+        }
+        
+        //this.docstatus = fu.getParameter("docstatus");
+        
+        //保存草稿//预览
+        if(opera.equals("editdraft") || opera.equals("editpreview")){
+            this.docstatus = "0";
+        } else {//提交
+        	rs.executeSql("update  DocDetail set checkOutStatus='0',checkOutUserId=-1,checkOutUserType='',checkOutDate='',checkOutTime='' where id ="+this.id);         	
+            if(scc.needApprove(this.seccategory)) {//如果需要审批
+                if(this.oldstatus!=null&&(this.oldstatus.equals("0")||this.oldstatus.equals("4")||Util.getIntValue(this.oldstatus,0)<=0)) this.docstatus = "-3";
+                else this.docstatus = "3";
+                this.approveType = 1;
+            } else if(scc.needPubOperation(this.seccategory)) {//如果需要发布
+                if(this.oldstatus!=null&&(this.oldstatus.equals("0")||this.oldstatus.equals("4")||Util.getIntValue(this.oldstatus,0)<=0)) this.docstatus = "-6";
+                else this.docstatus = "6";
+            } else {//生效/正常
+                if(this.oldstatus!=null&&(this.oldstatus.equals("0")||this.oldstatus.equals("4")||Util.getIntValue(this.oldstatus,0)<=0)) this.docstatus = "-1";
+                else this.docstatus = "1";
+                this.docValidUserId = this.userid;
+                this.docValidDate = formatdate;
+                this.docValidTime = formattime;
+                
+                if(scc.isEditionOpen(this.seccategory)) {//如果版本管理开启
+                    if(this.docEditionId==-1)
+                        this.docEditionId = this.getNextEditionId(rs);
+                    this.docEdition = dc.getEdition(this.docEditionId)+1;
+                }
+            }
+
+            if(this.invalidationDate!=null&&!"".equals(this.invalidationDate)){
+                java.text.DateFormat sdf = new java.text.SimpleDateFormat("yyyy-MM-dd");
+                Date tmpidate = sdf.parse(this.invalidationDate);
+            	if(tmpidate.getTime()<today.getTime().getTime()){
+            		this.docstatus = "7";
+                    this.docInvalUserId = this.userid;
+                    this.docInvalUserType = this.usertype;
+                    this.docInvalDate = formatdate;
+                    this.docInvalTime = formattime;
+                    
+                    if(scc.isEditionOpen(this.seccategory)) {//如果版本管理开启
+                    	if(scc.needApprove(this.seccategory)||scc.needPubOperation(this.seccategory)) {//如果需要审批或者需要发布
+                            if(this.docEditionId==-1)
+                                this.docEditionId = this.getNextEditionId(rs);
+                            this.docEdition = dc.getEdition(this.docEditionId)+1;                    		
+                    	}
+                    }                      
+            	}
+            }
+        }
+        
+        this.selectedPubMouldId = Util.getIntValue(fu.getParameter("selectedpubmouldid"),-1);
+        this.canPrintedNum = Util.getIntValue(fu.getParameter("canPrintedNum"),0);
+        this.editMouldId = Util.getIntValue(fu.getParameter("editMouldId"),0);
+        
+        this.secretLevel = Util.getIntValue(fu.getParameter("secretLevel"),DEFAILT_SECRET_LEVEL);
+        this.secretValidity = Util.null2s(fu.getParameter("secretValidity"),"");
+
+
+        this.replyremind = Util.getIntValue(fu.getParameter("replyremind"),0);
+        
+        String conId = Util.null2String(fu.getParameter("conId"));
+        EditDocInfo();
+        editHrmContract(conId);
+        
+        // lyx 如果开启版本，生成新版本时，同步上一版本的回复数据
+        if(scc.isEditionOpen(this.seccategory)) {//如果版本管理开启，同步回复数据
+            DocReplyManager docReplyManager = new DocReplyManager();
+            docReplyManager.synOldVersionReplyData(oldDocId+"", this.id+"");
+        } 
+        
+        
+        //将原有版本状态变为失效//并更新版本ID
+        if((this.docstatus.equals("1")||this.docstatus.equals("-1")||this.docstatus.equals("7"))&&this.docEdition>1){
+        	
+        	//关联子文档
+        	relateSonDocWithNewDoc(this.id);
+        	
+            rs.executeSql(" update docdetail set docstatus = 7,ishistory = 1 where id <> " + this.id + " and docedition > 0 and docedition < " + this.docEdition + " and doceditionid > 0 and doceditionid = " + this.docEditionId);
+            
+            log.resetParameter();
+            log.setDocId(oldDocId);
+            log.setDocSubject(this.docsubject);
+            log.setOperateType("14");
+            log.setOperateUserid(userid);
+            log.setUsertype(this.usertype);
+            log.setClientAddress(this.clientip);
+            log.setDocCreater(this.doccreaterid);
+            log.setDocLogInfo();
+        }
+	    if(this.docstatus.equals("0")){
+        	relateSonDocWithNewDoc(this.id);
+        }
+    }
+    
+    private void copyDocToNewDoc(int oldDocId) throws Exception {
+    	copyDocToNewDoc(oldDocId,true,"");
+    }
+    
+    private void copyDocToNewDoc(int oldDocId,String deleteaccessory) throws Exception {
+    	copyDocToNewDoc(oldDocId,true,deleteaccessory);
+    }
+    
+    private void copyDocToNewDoc(int oldDocId,String deleteaccessory,boolean copyfile,boolean copyreallyfile) throws Exception {
+    	copyDocToNewDoc(oldDocId,copyfile,deleteaccessory,false,true,"'1'",false,copyreallyfile);
+    }
+    
+    private void copyDocToNewDoc(int oldDocId,boolean copyfile) throws Exception {
+    	copyDocToNewDoc(oldDocId,copyfile,"");
+    }
+
+    private void copyDocToNewDoc(int oldDocId,boolean copyfile,String deleteaccessory) throws Exception {
+    	copyDocToNewDoc(oldDocId,copyfile,deleteaccessory,false);
+    }
+    
+    private void copyDocToNewDoc(int oldDocId,boolean copyfile,String deleteaccessory,boolean isNewDocEditionId) throws Exception {
+    	//copyDocToNewDoc(oldDocId,copyfile,deleteaccessory,isNewDocEditionId,true,"'1'");
+    	copyDocToNewDoc(oldDocId,copyfile,deleteaccessory,isNewDocEditionId,true,"'1'",false,false);    	
+    }
+    private void copyDocToNewDoc(int oldDocId,boolean copyfile,String deleteaccessory,boolean isNewDocEditionId,boolean copyRight,String newStatus,boolean isLatestOnly) throws Exception {
+    	copyDocToNewDoc(oldDocId,copyfile,deleteaccessory,isNewDocEditionId,copyRight,newStatus,isLatestOnly,false);
+    }
+    /**
+     * 复制文档到新文档
+     * @param oldDocId 被复制文档
+     * @param copyfile 是否复制附件信息
+     * @param deleteaccessory 被删除附件
+     * @param isNewDocEditionId 是否作为新的文档，即不作为原文档的新版本。
+     * @param copyRight 是否复制权限
+     * @param newStatus 新文档的状态，若为""则复制原来文档的状态
+     * @param isLatestOnly 是否只复制最新版本的文档
+     * @param copyReallyFile 是否复制附件文件
+     */    
+	private void copyDocToNewDoc(int oldDocId,boolean copyfile,String deleteaccessory,boolean isNewDocEditionId,boolean copyRight,String newStatus,boolean isLatestOnly,boolean copyReallyFile) throws Exception {
+        copyDocToNewDoc(oldDocId,copyfile,deleteaccessory,isNewDocEditionId,copyRight,newStatus,isLatestOnly,copyReallyFile,true);
+    }
+     
+    private void copyDocToNewDoc(int oldDocId,boolean copyfile,String deleteaccessory,boolean isNewDocEditionId,boolean copyRight,String newStatus,boolean isLatestOnly,boolean copyReallyFile,boolean updatereplydoc) throws Exception {
+        DocViewer dv = new DocViewer();
+        RecordSet rs = new RecordSet();
+        RecordSet recorder = new RecordSet();
+
+        int oldid = oldDocId;
+        String dbtype = rs.getDBType();
+        boolean isoracle = dbtype.equals("oracle");
+        boolean ismysql = dbtype.equals(DBConstant.DB_TYPE_MYSQL);
+
+        String sql = "";
+        String sqllog = "";
+        
+        String docStatusString="docstatus";
+        newStatus=Util.null2String(newStatus);
+        if(newStatus.equals("'0'")||newStatus.equals("'1'")||newStatus.equals("'2'")||newStatus.equals("'3'")||newStatus.equals("'4'")||newStatus.equals("'5'")
+         ||newStatus.equals("'6'")||newStatus.equals("'7'")||newStatus.equals("'8'")||newStatus.equals("'9'")){
+        	docStatusString=newStatus;
+        }
+     
+       
+        if (isoracle || ismysql) {
+            sql = "insert into DocDetail(" +
+                    "id,maincategory,subcategory," +
+                    "seccategory,doclangurage,docapprovable," +
+                    "docreplyable,isreply,replydocid,docsubject,"
+                    + "docpublishtype,itemid,itemmaincategoryid,hrmresid,crmid,projectid,"
+                    + "financeid,doccreaterid,docdepartmentid,doccreatedate,doccreatetime,"
+                    + "doclastmoduserid,doclastmoddate,doclastmodtime,docapproveuserid,"
+                    + "docapprovedate,docapprovetime,docarchiveuserid,docarchivedate,"
+                    + "docarchivetime,docstatus,parentids,assetid,ownerid,keyword,"
+                    + "accessorycount,replaydoccount,usertype,doctype,cancopy,canremind,docextendname"
+                    
+                    + ",doccode,doceditionid,ishistory,approveType,readoptercanprint,invalidationdate,docvaliduserid,docvaliddate,docvalidtime,"
+                    + "docpubuserid,docpubdate,docpubtime,docreopenuserid,docreopendate,docreopentime,"
+                    + "docinvaluserid,docinvaldate,docinvaltime,doccanceluserid,doccanceldate,doccanceltime"
+                    
+                    +",docCreaterType,docLastModUserType,docApproveUserType,docValidUserType,docInvalUserType"
+                    +",docArchiveUserType,docCancelUserType,docPubUserType,docReopenUserType,ownerType"
+                    +",hasUsedTemplet"                   
+                    +",canPrintedNum,editMouldId,orderable"    
+                    +",secretLevel"
+                    +",secretValidity"
+                    +",replyremind"
+
+                    + ") "
+                    + "select " + this.id + "," + (this.maincategory==0?"maincategory":this.maincategory) + "," + (this.subcategory==0?"subcategory":this.subcategory) + "," + (this.seccategory==0?"seccategory":this.seccategory)
+                    + ",doclangurage,docapprovable,docreplyable,isreply,replydocid,"
+                    + "docsubject,docpublishtype,itemid,itemmaincategoryid,hrmresid,crmid,"
+                    + "projectid,financeid,doccreaterid,docdepartmentid,doccreatedate,"
+                    + "doccreatetime,doclastmoduserid,doclastmoddate,doclastmodtime,"
+                    + "docapproveuserid,docapprovedate,docapprovetime,docarchiveuserid,"
+                    + "docarchivedate,docarchivetime,"
+                    //+ "'1',"
+                    + docStatusString+","                    
+                    + // docstatus
+                    "parentids,assetid,ownerid,keyword,accessorycount,replaydoccount,"
+                    + "usertype  ,doctype,cancopy,canremind,docextendname"
+                    
+                    + ",doccode,doceditionid,ishistory,approveType,readoptercanprint,invalidationdate,docvaliduserid,docvaliddate,docvalidtime,"
+                    + "docpubuserid,docpubdate,docpubtime,docreopenuserid,docreopendate,docreopentime,"
+                    + "docinvaluserid,docinvaldate,docinvaltime,doccanceluserid,doccanceldate,doccanceltime"
+                    
+                    +",docCreaterType,docLastModUserType,docApproveUserType,docValidUserType,docInvalUserType"
+                    +",docArchiveUserType,docCancelUserType,docPubUserType,docReopenUserType,ownerType"
+                    
+                    +",hasUsedTemplet"                   
+                    +",canPrintedNum,editMouldId,orderable"        
+                    +",secretLevel"
+                    +",secretValidity"
+                    +",replyremind"
+
+                    + " from DocDetail where id = "
+                    + oldid;
+            //writeLog(sql);
+            rs.executeSql(sql);
+
+            // 执行触发器docdetail_getpinyin
+            DocTriggerUtils docTriggerUtils = new DocTriggerUtils();
+            docTriggerUtils.docdetail_getpinyin(rs);
+            sql = "insert into DocDetailContent(docid,doccontent) select " + this.id + ",doccontent "
+                    + "from DocDetailContent where docid = " + oldid;
+            //writeLog(sql);
+            rs.executeSql(sql);
+            sql = "insert into DocDummyDetail(catelogid,docid,importdate,importtime,publicdate,publictime,status) select catelogid,"+this.id
+	      	  	+",importdate,importtime,publicdate,publictime,status from DocDummyDetail where docid="+oldDocId;
+            rs.execute(sql);
+        } else {
+            sql = "insert into DocDetail(id,maincategory,subcategory,seccategory,doclangurage,"
+                    + "docapprovable,docreplyable,isreply,replydocid,docsubject,doccontent,"
+                    + "docpublishtype,itemid,itemmaincategoryid,hrmresid,crmid,projectid,"
+                    + "financeid,doccreaterid,docdepartmentid,doccreatedate,doccreatetime,"
+                    + "doclastmoduserid,doclastmoddate,doclastmodtime,docapproveuserid,"
+                    + "docapprovedate,docapprovetime,docarchiveuserid,docarchivedate,"
+                    + "docarchivetime,docstatus,parentids,assetid,ownerid,keyword,"
+                    + "accessorycount,replaydoccount,usertype,doctype,cancopy,canremind,docextendname"
+                    
+                    + ",doccode,doceditionid,ishistory,approveType,readoptercanprint,invalidationdate,docvaliduserid,docvaliddate,docvalidtime,"
+                    + "docpubuserid,docpubdate,docpubtime,docreopenuserid,docreopendate,docreopentime,"
+                    + "docinvaluserid,docinvaldate,docinvaltime,doccanceluserid,doccanceldate,doccanceltime"
+                    
+                    +",docCreaterType,docLastModUserType,docApproveUserType,docValidUserType,docInvalUserType"
+                    +",docArchiveUserType,docCancelUserType,docPubUserType,docReopenUserType,ownerType"   
+                    
+                    +",hasUsedTemplet"                      
+                    +",canPrintedNum,editMouldId,orderable"   
+                    +",secretLevel"
+                    +",secretValidity"
+                    +",replyremind"
+
+                    + ") "
+					+ "select " + this.id + "," + (this.maincategory==0?"maincategory":this.maincategory) + "," + (this.subcategory==0?"subcategory":this.subcategory) + "," + (this.seccategory==0?"seccategory":this.seccategory)
+                    + ",doclangurage,docapprovable,docreplyable,isreply,replydocid,"
+                    + "docsubject,doccontent,docpublishtype,itemid,itemmaincategoryid,"
+                    + "hrmresid,crmid,projectid,financeid,doccreaterid,docdepartmentid,"
+                    + "doccreatedate,doccreatetime,doclastmoduserid,doclastmoddate,doclastmodtime,"
+                    + "docapproveuserid,docapprovedate,docapprovetime,docarchiveuserid,"
+                    //+ "docarchivedate,docarchivetime,'1',"
+                    + "docarchivedate,docarchivetime,"                    
+                    + docStatusString+","                    
+                    + // docstatus
+                    "parentids,assetid,ownerid,keyword,accessorycount,replaydoccount,"
+                    + "usertype ,doctype,cancopy,canremind,docextendname"
+                    
+                    + ",doccode,doceditionid,ishistory,approveType,readoptercanprint,invalidationdate,docvaliduserid,docvaliddate,docvalidtime,"
+                    + "docpubuserid,docpubdate,docpubtime,docreopenuserid,docreopendate,docreopentime,"
+                    + "docinvaluserid,docinvaldate,docinvaltime,doccanceluserid,doccanceldate,doccanceltime"
+                    
+                    +",docCreaterType,docLastModUserType,docApproveUserType,docValidUserType,docInvalUserType"
+                    +",docArchiveUserType,docCancelUserType,docPubUserType,docReopenUserType,ownerType"                    
+                    
+                    +",hasUsedTemplet"                      
+                    +",canPrintedNum,editMouldId,orderable"  
+                    +",secretLevel"
+                    +",secretValidity"
+                    +",replyremind"
+
+                    + " from DocDetail where id = " + oldid;
+            //writeLog(sql);
+            rs.executeSql(sql);
+            // 执行触发器docdetail_getpinyin
+            DocTriggerUtils docTriggerUtils = new DocTriggerUtils();
+            docTriggerUtils.docdetail_getpinyin(rs);
+            sql = "insert into DocDummyDetail(catelogid,docid,importdate,importtime,publicdate,publictime,status) select catelogid,"+this.id
+		      	  +",importdate,importtime,publicdate,publictime,status from DocDummyDetail where docid="+oldDocId;
+		    rs.execute(sql);
+        }
+        
+        //copy主题图片
+        rs.executeQuery("select themeshowpic from DocDetail where id=?",oldDocId);
+        if(rs.next()){
+        	int themeshowpic = rs.getInt("themeshowpic");
+        	if(themeshowpic > 0){
+        		int newthemeshowpic = ImageFileManager.copyImageFile(themeshowpic);
+        		if(newthemeshowpic > 0){
+        			rs.executeUpdate("update DocDetail set themeshowpic=? where id=?",newthemeshowpic,this.id);
+        		}
+        	}
+        }
+                
+        RecordSet rsIn=new RecordSet(); //reply doc
+        //rs.executeSql("select id,parentids from docdetail where ','+parentids+',' like '%,"+oldid+",%'");
+        if(isoracle){
+        	rs.executeSql("select id,parentids from docdetail where ','||parentids||',' like '%,"+oldid+",%'");       	
+        }else{
+        	rs.executeSql("select id,parentids from docdetail where ','+parentids+',' like '%,"+oldid+",%'");
+        }
+        while(rs.next()){        	
+        	 String newParentids="";    
+        	 String tempId=Util.null2String(rs.getString(1));
+        	 String oldParentids=Util.null2String(rs.getString(2));
+        	 
+        	 ArrayList oPList=Util.TokenizerString(oldParentids, ",");
+        	 for(int i=0;i<oPList.size();i++){
+        		 String oP=(String)oPList.get(i);
+        		 if(oP.equals(""+oldid)){
+        			 newParentids+=this.id+",";
+        		 } else {
+        			 newParentids+=oP+",";
+        		 }
+        	 }
+        	 if(!newParentids.equals("")) newParentids=newParentids.substring(0,newParentids.length()-1);
+        	 String strNewSql="update docdetail set parentids='"+newParentids+"' where id="+tempId;
+        	 rsIn.executeSql(strNewSql);        	 
+        }
+          
+        
+        
+        if(isNewDocEditionId){
+        	this.docEditionId=-1;
+        	this.docEdition=-1;
+            if(scc.isEditionOpen(this.seccategory)) {//如果版本管理开启
+                this.docEditionId = this.getNextEditionId(rs);
+                this.docEdition = 1;
+            }
+            rs.executeSql("update DocDetail set docEditionId="+this.docEditionId+",docEdition="+this.docEdition+" where id="+this.id);
+        }
+        
+        dc.updateDocInfoCache("" + id);
+
+        //替换文档正文中的图片链接为新生成的图片
+        String contentSql = "";
+        String newDocContent = "";
+        if (isoracle || ismysql) {
+            contentSql = "select doccontent from docdetailcontent where docid = ?";
+        }else{
+            contentSql = "select doccontent from docdetail where id = ?";
+        }
+        rs.executeQuery(contentSql,this.id);
+        if(rs.next()){
+            newDocContent = Util.null2String(rs.getString("doccontent"));
+        }
+        //加密串or非加密串
+        List<String> oldFileidArr = getImgByContent(newDocContent);
+		
+        if(copyfile){
+	        // 写文档附件信息
+	
+	        int imagefileid = 0;
+	        String imagefilename = "";
+	        String imagefiledesc = "";
+	        int imagefilewidth = 0;
+	        int imagefileheight = 0;
+	        int imagefielsize = 0;
+	        String docfiletype = "";
+	        int imagefileused = 0;
+	        String versionid = "";
+	        String versionDetail = "";
+	        String isextfile = "";
+			String hasUsedTemplet = "";
+	        int isaesencrypt = 0;
+	        String aescode = "";
+	        String operateuserid = "";
+	        String operatedate  = "";
+	        String operatetime  = "";
+
+	        
+	        String sqlstr = "select * from docimagefile where docid=" + oldid + " and imagefileid not in (select imagefiledesc from docimagefile where docid = -"+oldid+") ";
+	        deleteaccessory=this.getAllDeleteaccessory(oldid,deleteaccessory);	        
+	        if(deleteaccessory!=null&&!"".equals(deleteaccessory)){
+	        	sqlstr+=" and imagefileid not in (" + deleteaccessory + ")";
+	        }
+	        //sqlstr+=" order by id asc,versionId desc ";
+	        if(isLatestOnly){
+	        	sqlstr+=" order by id asc,versionId desc ";
+	        }else{
+	        	sqlstr+=" order by id asc,versionId asc ";
+	        }	        
+	        //boolean hasFirst=false;
+	        int oldDocImageFileId=0;
+	        ArrayList oldDocImageFileIdList=new ArrayList();
+	        Map docimagefileidMap=new HashMap();
+			Map<String,String> oldFileidMap = new HashMap<>();
+	        rs.executeSql(sqlstr);
+			//用来记录html正文中的图片新生成的图片id
+	        Map<String,String> newfileidmap = new HashMap<>();
+	        while (rs.next()) {
+	        	
+	        	oldDocImageFileId = rs.getInt("id");
+	        	if(isLatestOnly&&oldDocImageFileIdList.indexOf(""+oldDocImageFileId)>=0){
+	        		continue;
+	        	}
+	        	
+	            //int docimagefileid = imgManger.getNextDocImageFileId();
+	        	int docimagefileid=Util.getIntValue((String)docimagefileidMap.get(""+oldDocImageFileId),-1);
+	        	if(docimagefileid<=0){
+	        		docimagefileid = imgManger.getNextDocImageFileId();
+	        		docimagefileidMap.put(""+oldDocImageFileId,""+docimagefileid);
+	        	}
+	        	
+        		RecordSet rs1 = new RecordSet();
+				docfiletype = rs.getString("docfiletype");
+	        	if(copyReallyFile){
+	        		
+	        		imagefileid = rs.getInt("imagefileid");
+					int oldfileidval = imagefileid;
+                	int imageid =ImageFileManager.copyImageFile(imagefileid);	                
+	                if(imageid>0) {
+
+
+						
+//	            		rs1.executeProc("SequenceIndex_SelectVersionId", "");
+//	            		if (rs1.next()) {
+//	            			versionid = rs1.getString(1);
+//	            		}
+	                	versionid=""+versionIdUpdate.getVersionNewId();
+
+	            		if(imageFileIdOfPicChangeList!=null){
+		                	Map imageFileIdOfPicChangeMap=new HashMap();
+		                	imageFileIdOfPicChangeMap.put("oldImageFileId",""+imagefileid);
+		                	imageFileIdOfPicChangeMap.put("newImageFileId",""+imageid);		                	
+		                	imageFileIdOfPicChangeList.add(imageFileIdOfPicChangeMap);
+	            		}
+	            		
+	                	imagefileid = imageid;
+	                }
+					if("1".equals(docfiletype) || "11".equals(docfiletype)){
+                       newfileidmap.put(oldfileidval+"",imagefileid+"");
+                       for(int j=0;j<oldFileidArr.size();j++){
+                           String fileidval = oldFileidArr.get(j);						  
+                           if((""+oldfileidval).equals(DocDownloadCheckUtil.getDownloadfileidstr(fileidval))){
+                               oldFileidMap.put(fileidval,imagefileid+"");
+                           }
+                       }
+					  
+                    }
+	        	} else {
+	        		imagefileid = rs.getInt("imagefileid");
+	        		rs1.executeProc("imagefile_AddByDoc", "" + imagefileid);
+	        		versionid = rs.getString("versionid");
+	        	}
+	
+	            imagefilename = rs.getString("imagefilename");
+	            imagefiledesc = rs.getString("imagefiledesc");
+	            imagefilewidth = rs.getInt("imagefilewidth");
+	            imagefileheight = rs.getInt("imagefileheight");
+	            imagefielsize = rs.getInt("imagefielsize");
+	            //docfiletype = rs.getString("docfiletype");
+                operateuserid = Util.null2s(rs.getString("operateuserid"),"0");
+                operatedate = rs.getString("operatedate");
+                operatetime = rs.getString("operatetime");
+	            //versionid = rs.getString("versionid");
+	            versionDetail = rs.getString("versionDetail");
+	            isextfile = Util.null2String(Util.getIntValue(rs.getString("isextfile"), 0)+"");
+	            hasUsedTemplet = Util.null2String(Util.getIntValue(rs.getString("hasUsedTemplet"), 0)+"");	            
+	            String tempsql = "insert into docimagefile(id,docid,imagefileid,imagefilename,imagefiledesc,"
+	                    + "imagefilewidth,imagefileheight,imagefielsize,docfiletype,versionid,versionDetail,isextfile,hasUsedTemplet" +
+                        " ,operateuserid,operatedate,operatetime) values("
+	                    + docimagefileid + "," + id + "," + imagefileid + ",'" + Util.toHtml100(imagefilename) + "','" + Util.toHtml100(imagefiledesc)
+	                    + "'," + imagefilewidth + "," + imagefileheight + "," + imagefielsize + ",'" + docfiletype + "','"
+	                    + versionid + "','" + Util.toHtml100(versionDetail) + "', '"+isextfile+"', '"+hasUsedTemplet+"'" +
+                        " ,"+operateuserid+", '"+operatedate+"','"+operatetime+"'" +")";
+	            recorder.executeSql(tempsql);
+	            
+	            oldDocImageFileIdList.add(""+oldDocImageFileId);	            
+	        }
+			//遍历
+            for (int i=0;i<oldFileidArr.size();i++){
+	            String oldfileval1 = oldFileidArr.get(i);
+	            String oldfilencodeval = DocDownloadCheckUtil.getDownloadfileidstr(oldfileval1);				
+	            for (Map.Entry<String,String> entry : oldFileidMap.entrySet()){
+					
+	                if(entry.getKey().equals(oldfileval1) && entry.getKey().equals(oldfileval1)){                   
+                        newDocContent = newDocContent.replaceAll(oldfileval1,entry.getValue());                     
+                    }
+                }
+            }
+            if (isoracle || ismysql) {               
+                recorder.executeUpdate("update DocDetailContent set doccontent=? where docid=?", newDocContent, this.id);
+            }else{
+				recorder.executeUpdate("update DocDetail set doccontent=? where id=?",newDocContent,""+this.id);
+			}			
+        }
+      if(copyRight){    
+        // 写文档共享信息
+        rs.executeProc("DocShare_SelectByDocId", "" + oldid);
+        while (rs.next()) {
+            String ProcPara = "";
+            char flag = 2;
+            String docid = "" + this.id;
+            String sharetype = Util.null2String(rs.getString("sharetype"));
+            String seclevel = Util.null2String(rs.getString("seclevel"));
+            String rolelevel = Util.null2String(rs.getString("rolelevel"));
+            String sharelevel = Util.null2String(rs.getString("sharelevel"));
+            String userid = Util.null2String(rs.getString("userid"));
+            String subcompanyid = Util.null2String(rs.getString("subcompanyid"));
+            String departmentid = Util.null2String(rs.getString("departmentid"));
+            String roleid = Util.null2String(rs.getString("roleid"));
+            String foralluser = Util.null2String(rs.getString("foralluser"));
+            String crmid = Util.null2String(rs.getString("crmid"));
+            String orgGroupId = Util.null2String(rs.getString("orgGroupId"));
+
+            String sharesource = Util.null2String(rs.getString("sharesource"));           
+            String isSecDefaultShare = Util.null2String(rs.getString("isSecDefaultShare"));
+
+
+			int orgid = Util.getIntValue(rs.getString("orgid"),0);
+			int seclevelmax = Util.getIntValue(rs.getString("seclevelmax"),255);
+			int includesub = Util.getIntValue(rs.getString("includesub"),0);
+			int allmanagers = Util.getIntValue(rs.getString("allmanagers"),0);
+
+			    String joblevel=Util.getIntValue(rs.getString("joblevel"),0)+"";
+				String jobdepartment=Util.getIntValue(rs.getString("jobdepartment"),0)+"";
+				String jobsubcompany=Util.getIntValue(rs.getString("jobsubcompany"),0)+"";
+				String jobids=Util.getIntValue(rs.getString("jobids"),0)+"";
+				
+
+            ProcPara = docid;
+            ProcPara += flag + sharetype;
+            ProcPara += flag + seclevel;
+            ProcPara += flag + rolelevel;
+            ProcPara += flag + sharelevel;
+            ProcPara += flag + userid;
+            ProcPara += flag + subcompanyid;
+            ProcPara += flag + departmentid;
+            ProcPara += flag + roleid;
+            ProcPara += flag + foralluser;
+            ProcPara += flag + crmid; // CRMID
+            ProcPara += flag + orgGroupId; // orgGroupId
+
+            //recorder.executeProc("DocShare_IFromDocSecCategory", ProcPara);
+            /** TD12005  =========文档下载权限 开始=============*/
+            String downloadlevel = String.valueOf(Util.getIntValue(rs.getString("downloadlevel"), 0));//TD12005
+            ProcPara += flag + downloadlevel; // 文档下载权限
+            /** TD12005  =========文档下载权限 结束=============*/
+            recorder.executeProc("DocShare_IFromDocSecCat_G", ProcPara);            
+            
+            if (!"".equals(isSecDefaultShare)) {
+            	if(recorder.next()){
+            		String newid = Util.null2String(recorder.getString(1));
+            		RecordSet tmpcopyrs = new RecordSet();
+            		tmpcopyrs.executeSql("update docshare set isSecDefaultShare=" + isSecDefaultShare + ",allmanagers='"+allmanagers+"',includesub='"+includesub+"', orgid='"+orgid+"',seclevelmax='"+seclevelmax+"',joblevel='"+joblevel+"',jobdepartment='"+jobdepartment+"',jobsubcompany='"+jobsubcompany+"',jobids='"+jobids+"' where id="
+                        + newid);
+					if(!"".equals(sharesource)){
+                		tmpcopyrs.executeSql("update docshare set sharesource="+sharesource+" where id="+ newid);
+            		}	
+            	}
+            }else{
+
+				if(recorder.next()){
+            		String newid = Util.null2String(recorder.getString(1));
+            		RecordSet tmpcopyrs = new RecordSet();
+            		tmpcopyrs.executeSql("update docshare set allmanagers='"+allmanagers+"',includesub='"+includesub+"', orgid='"+orgid+"',seclevelmax='"+seclevelmax+"',joblevel='"+joblevel+"',jobdepartment='"+jobdepartment+"',jobsubcompany='"+jobsubcompany+"',jobids='"+jobids+"' where id="
+                        + newid);
+					if(!"".equals(sharesource)){
+                		tmpcopyrs.executeSql("update docshare set sharesource="+sharesource+" where id="+ newid);
+            		}	
+            	}
+			
+			
+			
+			}
+                    
+            
+        }
+        dv.setDocShareByDoc("" + this.id);
+      }
+
+      //复制自定义信息
+      if(customDataIdMapping==null || customDataIdMapping.length == 0) {
+	      CustomFieldManager cfm = new CustomFieldManager("DocCustomFieldBySecCategory", this.seccategory);
+	      cfm.getCustomFields();
+	      String nameStr = "";
+	      while (cfm.next()) {
+	          nameStr += "," + cfm.getFieldName(""+cfm.getId());
+	      }       
+	      if (!nameStr.equals("")) {
+	          nameStr = nameStr.substring(1);
+	
+	          sql = "insert into cus_fielddata(scope,scopeid,id," + nameStr + ") "
+	               +" select 'DocCustomFieldBySecCategory'," + this.seccategory + "," + this.id+ "," + nameStr 
+	               + "  from cus_fielddata where scope='DocCustomFieldBySecCategory'  and id="+oldid;
+	           //System.out.println("sql = " + sql);//test
+	          rs.executeSql(sql);
+	      }
+      } else {
+	        String srcNameStr = "";
+      	    List srcNameList=new ArrayList();
+    	    int srcFieldId=-1;
+    	    String srcFieldValue=null;
+    	    String srcFieldShowName=null;
+	      
+	        String objNameStr = "";
+        	List objNameList=new ArrayList();
+        	int objFieldId=-1;
+        	String objFieldValue=null;            	
+            String cusFieldDataObjSql=null;
+            String cusFieldDataObjStr="";
+            
+        	Map objNameSrcNameMap=new HashMap();
+        	Map srcFieldValueAndFieldShowNameMap=null;
+	        RecordSet rsCus=new RecordSet();
+			//customDataIdMapping = removedouble(customDataIdMapping);
+	        for(int i=0;i<customDataIdMapping.length;i++){
+	    	    List ids = Util.TokenizerString(customDataIdMapping[i], "_");
+				rsCus.execute("select fieldname from cus_formdict where id="+ids.get(0));
+				if(rsCus.next()){
+					srcNameStr += ","+rsCus.getString("fieldname");
+				}
+				rsCus.execute("select fieldname from cus_formdict where id="+ids.get(1));
+				if(rsCus.next()){
+					objNameStr += ","+rsCus.getString("fieldname");
+				}
+	    	    //srcNameStr += ",field" + ids.get(0);
+	    	    //objNameStr += ",field" + ids.get(1);
+	    	    
+        		objNameSrcNameMap.put(""+ids.get(1),""+ids.get(0));
+        		srcNameList.add(""+ids.get(0));
+        		objNameList.add(""+ids.get(1));	    	    
+	        }
+	      
+	        if (!srcNameStr.equals("")&&!objNameStr.equals("")) {
+	    	    srcNameStr = srcNameStr.substring(1);
+	    	    objNameStr = objNameStr.substring(1);
+	    	    
+            	RecordSet rsTemp=new RecordSet();	    	    
+            	String fieldDbType=null;
+            	String fieldHtmlType=null;
+				String fieldName=null;
+
+                int fieldLength=0;            	
+            	Map fieldHtmlTypeMap=new HashMap();
+            	
+            	Map cusFormDictDataMap=new HashMap();	
+				rs.executeSql("select id,fieldDbType,fieldHtmlType,type,fieldname from cus_formdict");
+
+	            while(rs.next()){
+	            	cusFormDictDataMap.put("fieldDbType"+Util.null2String(rs.getString("id")),Util.null2String(rs.getString("fieldDbType")));
+	            	cusFormDictDataMap.put("fieldHtmlType"+Util.null2String(rs.getString("id")),Util.null2String(rs.getString("fieldHtmlType")));
+	            	cusFormDictDataMap.put("type"+Util.null2String(rs.getString("id")),Util.null2String(rs.getString("type")));	            	
+					cusFormDictDataMap.put("fieldName"+Util.null2String(rs.getString("id")),Util.null2String(rs.getString("fieldname")));	            	
+	            }
+	            
+            	srcFieldValueAndFieldShowNameMap=new HashMap();
+            	cusFieldDataObjSql="insert into cus_fielddata";
+            	cusFieldDataObjStr="";
+            	
+            	int oldSecCategoryId=-1;
+            	rs.executeSql("select secCategory from DocDetail where id=" + oldid);
+            	if(rs.next()){
+            		oldSecCategoryId=Util.getIntValue(rs.getString("secCategory"),-1);
+            	}
+            		
+            	rs.executeSql("select "+srcNameStr+" from cus_fielddata where scope='DocCustomFieldBySecCategory' and scopeId="+oldSecCategoryId+" and id=" + oldid);
+            	if(rs.next()){
+            		for(int i=0;i<srcNameList.size();i++){
+            			srcFieldId=Util.getIntValue((String)srcNameList.get(i),-1);
+            			srcFieldValue=Util.null2String(rs.getString(i+1));
+            			srcFieldShowName="";
+            			fieldDbType=Util.null2String((String)cusFormDictDataMap.get("fieldDbType"+srcFieldId));	            			
+            			fieldHtmlType=Util.null2String((String)cusFormDictDataMap.get("fieldHtmlType"+srcFieldId));
+            		    fieldName=Util.null2String((String)cusFormDictDataMap.get("fieldName"+srcFieldId));
+						if(fieldHtmlType.equals("5")){
+                    		rsTemp.executeSql("  select selectName from cus_selectitem where fieldId="+srcFieldId+" and selectValue="+srcFieldValue);
+                    		if(rsTemp.next()){
+                    			srcFieldShowName=Util.null2String(rsTemp.getString("selectName"));
+                    			srcFieldValueAndFieldShowNameMap.put("srcFieldShowName"+srcFieldId,srcFieldShowName);           			
+                    		}	            				
+            			}
+            			srcFieldValueAndFieldShowNameMap.put("srcFieldValue"+srcFieldId,srcFieldValue);
+            			                			
+            		}
+	            }
+            	
+            	for(int i=0;i<objNameList.size();i++){
+        			objFieldId=Util.getIntValue((String)objNameList.get(i),-1);
+        			srcFieldId=Util.getIntValue((String)objNameSrcNameMap.get(""+objFieldId));
+        			srcFieldShowName=Util.null2String((String)srcFieldValueAndFieldShowNameMap.get("srcFieldShowName"+srcFieldId));           			
+        			objFieldValue=Util.null2String((String)srcFieldValueAndFieldShowNameMap.get("srcFieldValue"+srcFieldId));
+
+        			fieldDbType=Util.null2String((String)cusFormDictDataMap.get("fieldDbType"+objFieldId));	            			
+        			fieldHtmlType=Util.null2String((String)cusFormDictDataMap.get("fieldHtmlType"+objFieldId));
+        			
+                    if (fieldDbType.startsWith("text") || fieldDbType.startsWith("char")|| fieldDbType.startsWith("varchar")|| fieldDbType.startsWith("browser")) {
+                		if(fieldDbType.indexOf("(")>=0&&fieldDbType.indexOf(")")>fieldDbType.indexOf("(")+1){
+                			fieldLength=Util.getIntValue(fieldDbType.substring(fieldDbType.indexOf("(")+1,fieldDbType.indexOf(")")),0);
+                		}
+                		if(fieldLength>0){
+                			cusFieldDataObjStr += ",'" + Util.toHtml100(interceptString(objFieldValue,fieldLength)) + "'";
+                		}else{
+                			cusFieldDataObjStr += ",'" + Util.toHtml100(objFieldValue) + "'";
+                		}
+                    } else {
+                    	if(fieldHtmlType.equals("5")){
+                    		objFieldValue=this.getNewSelectValue(srcFieldShowName,objFieldValue,objFieldId);
+                    	}
+                    	cusFieldDataObjStr += ","+Util.getIntValue(objFieldValue,-1);
+                    }            			
+        			
+            	}	            	
+                
+                if (!cusFieldDataObjStr.equals("")) {
+                	cusFieldDataObjStr = cusFieldDataObjStr.substring(1);
+                	cusFieldDataObjSql += "(scope,scopeid,id," + objNameStr + ") values('DocCustomFieldBySecCategory'," + this.seccategory + "," + this.id
+                    + "," + cusFieldDataObjStr + ")";           
+                    rs.executeSql(cusFieldDataObjSql);
+                }	     
+	        }
+      }
+    }
+    
+    public static String[] removedouble(String[] arrStr) {
+        String[] result = null;
+        List<String> list = new ArrayList<String>();
+        for (int i = 0; i < arrStr.length; i++) {
+            if (!list.contains(arrStr[i])) {
+                list.add(arrStr[i]);
+            }
+        }
+        // 返回一个包含所有对象的指定类型的数组
+        if (list.size() >= 1) {
+            result =  list.toArray(new String[1]);
+        }
+        return result;
+    }
+    public static List<String> getImgByContent(String content){
+        List<String> lists = new ArrayList<String>();
+        List<String> resultLists = new ArrayList<String>();
+
+        if(content == null || content.isEmpty()) return lists;
+
+
+        String reg = "/weaver/weaver.file.FileDownload\\?fileid=([0-9A-Za-z]+)";
+        Pattern pattern = Pattern.compile(reg);
+        Matcher matcher = pattern.matcher(content);
+        while(matcher.find()){
+            lists.add(matcher.group());
+        }
+        for (int i=0;i<lists.size();i++){
+            String liststr = lists.get(i);
+            String reg1 = "/weaver/weaver.file.FileDownload\\?fileid=([0-9A-Za-z]+)";
+            Pattern pattern1 = Pattern.compile(reg1);
+            Matcher matcher1 = pattern1.matcher(liststr);
+            while(matcher1.find()){
+                ArrayList list=Util.matchAll(matcher1.group(),"/weaver/weaver.file.FileDownload\\?fileid=([A-Za-z0-9]+)",1,1);
+                String val1 = Util.null2String((String) list.get(0));
+                resultLists.add(val1);
+            }
+
+        }
+        return resultLists;
+    }
+    
+    /**
+     * 为文档添加新版本
+     * @param oldDocId 旧文档ID
+     * @param deleteaccessory 需要在新版本中删除的附件
+     * @throws Exception
+     */
+    public void addNewDocForEdition(int oldDocId) throws Exception {
+    	addNewDocForEdition(oldDocId,"");
+    }
+
+    public void addNewDocForEdition(int oldDocId,String deleteaccessory) throws Exception {
+    	copyDocToNewDoc(oldDocId,deleteaccessory,true,true);
+    	
+    	RecordSet rs = new RecordSet();
+    	rs.executeSql(" update docimagefile set imagefiledesc = '' where docid = -" + oldDocId);
+
+    	rs.executeSql(" update docimagefile set docid = " + this.id + " where docid = -" + oldDocId);
+//    	更新附件数 isextfile = '1' 是附件条件 TD8782
+    	rs.executeSql("update docdetail set accessorycount = (select count(distinct id) from DocImageFile where isextfile = '1' and docid = " + this.id + " and docfiletype <> '1'   and docfiletype <> '11') where id = " + this.id);
+        
+        log.resetParameter();
+        log.setDocId(this.id);
+        log.setDocSubject(this.docsubject);
+        log.setOperateType("16");
+        log.setOperateUserid(userid);
+        log.setUsertype(this.usertype);
+        log.setClientAddress(this.clientip);
+        log.setDocCreater(this.doccreaterid);
+        log.setCreatertype(this.docCreaterType);       
+        log.setDocLogInfo();
+        
+    }
+    
+    
+
+    /**
+     * 存储文档内容
+     * 
+     * @param request 一个HttpServletRequest对象存储了文档地所有信息
+     * @return 文档的操作类型
+     * @throws Exception 抛出异常
+     */
+    public String UploadDoc(HttpServletRequest request) throws Exception {
+
+        String opera = "";
+        String docmain = "";
+        RecordSet rsSql = new RecordSet();
+
+        try {
+            FileUpload fu = new FileUpload(request);
+
+            this.fileUpload=fu;
+            
+            // add by 王金永
+            // 1 代表html类型；2代表 world 或者 excel 类型
+            opera = fu.getParameter("operation");
+
+            this.urlfrom = Util.null2String(fu.getParameter("urlfrom"));
+            
+            this.source = Util.null2String(fu.getParameter("source"));
+           
+            // 新建时候的进行的操作
+            if (opera.equals("addsave") || opera.equals("adddraft") || opera.equals("addpreview")) {
+                
+                addDoc(fu,opera);
+
+            } else if (opera.equals("editsave") || opera.equals("editdraft") || opera.equals("editpreview")) {
+            
+                editDoc(fu,opera);
+            
+            } else if (opera.equals("publish")) {
+            
+                publishDoc(fu);
+            
+            } else if (opera.equals("invalidate")) {
+                
+                invalidateDoc(fu);
+
+            } else if (opera.equals("archive")) {
+
+                archiveDoc(fu);
+                
+            } else if (opera.equals("cancel")) {
+
+                cancelDoc(fu);
+                
+            } else if (opera.equals("reopen")) {
+
+                reopenDoc(fu);
+                
+            } else if (opera.equals("reload")) {
+                // 刷新时进行的操作
+                this.id = Util.getIntValue(fu.getParameter("id"), 0);
+                this.docsubject = fu.getParameter("docsubject");
+                this.docsubject = interceptString(this.docsubject,400);                
+                //this.docapprovable = Util.null2String(fu.getParameter("docapprovable"));
+                //if (docapprovable.equals("1")) {
+                if(scc.needApprove(this.seccategory)) {//如果需要审批
+                    this.docstatus = "2";
+                } else {
+                    this.docstatus = "1";
+                }
+
+                ReloadDocInfo();
+            /*
+            } else if (opera.equals("reopen")) {
+                // 从新打开时进行的操作
+                this.id = Util.getIntValue(fu.getParameter("id"), 0);
+                this.docsubject = fu.getParameter("docsubject");
+
+                this.docstatus = "0";
+
+                ReopenDocInfo();
+            */
+            } else if (opera.equals("delete")) {
+            	RecordSet rs_del=new RecordSet();
+            	int docsrecycle=0;
+            	rs_del.executeSql("select propvalue from doc_prop where propkey='docsrecycle' ");
+            	if(rs_del.next()){
+            		docsrecycle=rs_del.getInt("propvalue");
+            	}
+            	User recycleuser=new User(userid);
+            	if(docsrecycle==1&&"1".equals(recycleuser.getLogintype())){//开启回收站
+            		this.id = Util.getIntValue(fu.getParameter("id"), 0);
+            		DocRecycleManager docRecycleManager=new DocRecycleManager();
+            		docRecycleManager.moveDocToRecycle(userid, this.usertype, this.id, this.clientip);
+            	}else{
+                // 删除此文档的操作
+                this.id = Util.getIntValue(fu.getParameter("id"), 0);
+
+                // add by wjy for delete custom data
+                deleteCustomData(this.id);
+
+                /* 需要注意删除该文档所有图片时候的情况 */
+
+                imgManger.resetParameter();
+                imgManger.setDocid(this.id);
+                imgManger.DeleteAllDocImageInfo();
+
+                this.docsubject = fu.getParameter("docsubject");
+                this.docsubject = interceptString(this.docsubject,400);
+                
+                this.doccontent = Util.fromBaseEncoding(fu.getParameter("doccontent"), languageid);
+                this.doccontent =Util.htmlFilter4UTF8(this.doccontent );
+                
+                //DeleteReplayDocCount(); // 需对前级文档的回复文档记录数减1，才可删此文档（DeleteDocInfo()实现）
+                DeleteDocInfo();
+                deleteHrmContract();
+            	}
+
+            } else if (opera.equals("delpic")) {
+                // 删除图片时进行的操作
+                this.id = Util.getIntValue(fu.getParameter("id"), 0);
+                int imgid = Util.getIntValue(Util.getFileidOut(fu.getParameter("delimgid")), 0);
+                String sql = "delete from docimagefile where imagefileid=" + imgid + " and docid = " + this.id;
+                rsSql.executeSql(sql);
+
+                imgManger.resetParameter();
+                imgManger.setImagefileid(imgid);
+                imgManger.setDocid(this.id);
+                imgManger.DeleteSingleDocImageInfo();
+                //更新附件数 isextfile = '1' 是附件条件 TD8782
+                rsSql.executeSql("update docdetail set accessorycount = (select count(distinct id) from DocImageFile where isextfile = '1' and docid = " + this.id + " and docfiletype <> '1'   and docfiletype <> '11') where id = " + this.id);
+                
+            }else if(opera.equals("checkOut")){
+            	//签出
+                this.id = Util.getIntValue(fu.getParameter("id"), 0);
+                
+                rsSql.executeSql("select 1 from DocDetail  where id="+this.id+" and ((checkOutStatus<>'1' and checkOutStatus<>'2')or checkOutStatus is null)");
+                if(!rsSql.next()){
+                	return opera;
+                }
+                
+                
+                Calendar today = Calendar.getInstance();
+                String formatDate = Util.add0(today.get(Calendar.YEAR), 4) + "-"
+                        + Util.add0(today.get(Calendar.MONTH) + 1, 2) + "-"
+                        + Util.add0(today.get(Calendar.DAY_OF_MONTH), 2);
+                String formatTime = Util.add0(today.get(Calendar.HOUR_OF_DAY), 2) + ":"
+                        + Util.add0(today.get(Calendar.MINUTE), 2) + ":" + Util.add0(today.get(Calendar.SECOND), 2);                
+                //rs.executeSql("update  DocDetail set checkOutStatus='1',checkOutUserId="+this.userid+",checkOutUserType='"+this.usertype+"',checkOutDate='"+formatDate+"',checkOutTime='"+formatTime+"' where id="+this.id);
+                rsSql.executeSql("update  DocDetail set checkOutStatus='2',checkOutUserId="+this.userid+",checkOutUserType='"+this.usertype+"',checkOutDate='"+formatDate+"',checkOutTime='"+formatTime+"' where id="+this.id);
+
+                this.opreateType = Util.null2String(fu.getParameter("opreateType"));//1:内部   2:外部
+                if ("".equals(opreateType)) {
+                    this.opreateType = this.usertype;
+                }
+                rsSql.executeSql("select docSubject,docCreaterId,docCreaterType from DocDetail where id="+this.id);
+                if(rsSql.next()){
+                	this.docsubject=Util.null2String(rsSql.getString("docSubject"));
+                    this.docsubject = interceptString(this.docsubject,400);                	
+                	this.doccreaterid=Util.getIntValue(rsSql.getString("docCreaterId"),0);
+                	docCreaterType=Util.null2String(rsSql.getString("docCreaterType"));            	
+                }                
+                log.resetParameter();
+                log.setDocId(this.id);
+                log.setDocSubject(this.docsubject);
+                log.setOperateType("17");
+                log.setOperateUserid(userid);
+                log.setUsertype(this.opreateType);
+                log.setClientAddress(this.clientip);
+                log.setDocCreater(this.doccreaterid);
+                log.setCreatertype(this.docCreaterType);
+                log.setDocLogInfo();                 
+            }else if(opera.equals("checkIn")){
+            	//签入
+                this.id = Util.getIntValue(fu.getParameter("id"), 0); 
+                
+                rsSql.executeSql("select 1 from DocDetail  where id="+this.id+" and (checkOutStatus='1' or checkOutStatus='2')");
+                if(!rsSql.next()){
+                	return opera;
+                }
+                
+                rsSql.executeSql("update  DocDetail set checkOutStatus='0',checkOutUserId=-1,checkOutUserType='',checkOutDate='',checkOutTime='' where id ="+this.id);
+
+                this.opreateType = Util.null2String(fu.getParameter("opreateType"));//1:内部   2:外部
+                if ("".equals(opreateType)) {
+                    this.opreateType = this.usertype;
+                }
+                rsSql.executeSql("select docSubject,docCreaterId,docCreaterType from DocDetail where id="+this.id);
+                if(rsSql.next()){
+                	this.docsubject=Util.null2String(rsSql.getString("docSubject"));
+                    this.docsubject = interceptString(this.docsubject,400);               	
+                	this.doccreaterid=Util.getIntValue(rsSql.getString("docCreaterId"),0);
+                	docCreaterType=Util.null2String(rsSql.getString("docCreaterType"));            	
+                }                
+            	log.resetParameter();
+                log.setDocId(this.id);
+                log.setDocSubject(this.docsubject);
+                log.setOperateType("19");
+                log.setOperateUserid(userid);
+                log.setUsertype(this.opreateType);
+                log.setClientAddress(this.clientip);
+                log.setDocCreater(this.doccreaterid);
+                log.setCreatertype(this.docCreaterType);
+                log.setDocLogInfo();              	
+            }else if(opera.equals("useTemplet")){
+            	//套红
+                this.id = Util.getIntValue(fu.getParameter("id"), 0);
+                this.topage = Util.null2String(fu.getParameter("topage"));
+                this.docstatus = fu.getParameter("docstatus");
+            	this.oldstatus = docstatus;
+            	editDoc(fu,opera);
+            	rsSql.executeSql("update  DocDetail set hasUsedTemplet='1' where id ="+this.id);
+            	//rs.executeSql("update  docimagefile set docId=-docId where docId<0 and docId=-"+this.id);           	
+            }
+            
+            
+            // 判断新建的是不是个人文档
+            String from = Util.null2String(fu.getParameter("from"));
+            String userId = Util.null2String(fu.getParameter("userId"));
+            if ("personalDoc".equals(from)) {
+                DocUserSelfUtil dusu = new DocUserSelfUtil();
+                String userCatalogId = Util.null2String(fu.getParameter("userCategory"));
+                String userType = Util.null2String(fu.getParameter("userType"));
+                
+                if(opera.equals("addsave")){
+                    // 修改表DocUserselfDocs
+                    String strSql = "insert into DocUserselfDocs (docid,usercatalogid,userid,doctype,usertype) values ("
+                            + id + "," + userCatalogId + "," + userId + "," + docType + "," + userType + ")";
+                    rsSql.executeSql(strSql);
+                    dusu.writDocShare("" + id, userId, userType, "2");                    
+                }
+
+                setUserCatalogId(userCatalogId);
+                opera = "addPersonalDoc";
+            }
+        } catch (Exception e) {
+            writeLog(e);
+            return opera + "_1";
+        }
+        // 返回进行的操作类型
+        return opera;
+
+    }
+
+    /**
+     * 存储文档内容
+     * 
+     * @param fu 一个FileUpload对象存储了文档地所有信息
+     * @param createrid 创建者ID
+     * @param doccontent 文档内容
+     * @param userneed 附件个数
+     * @return 文档的操作类型
+     * @throws Exception
+     */
+    public String UploadDocHtmlAndFile(FileUpload fu, int createrid, String doccontent, int userneed) throws Exception {
+        String opera = "";
+        String docmain = "";
+        RecordSet rsSql = new RecordSet();
+        ResourceComInfo rc = new ResourceComInfo();
+        try {
+
+            this.id = getNextDocId(rsSql);
+            int accessorynum = userneed;
+            String[] needuploads = new String[accessorynum];
+
+            for (int i = 0; i < accessorynum; i++) {
+                needuploads[i] = "accessory" + (i + 1);
+            }
+
+            String[] fileids = fu.uploadFiles(needuploads);
+            String[] filenames = fu.getFileNames();
+
+            int accessorynumtrue = 0;
+
+            for (int i = 0; i < accessorynum; i++) {
+                if (Util.getIntValue(fileids[i], 0) == 0)
+                    continue;
+                accessorynumtrue++;
+                imgManger.resetParameter();
+                imgManger.setDocid(this.id);
+                imgManger.setImagefileid(Util.getIntValue(fileids[i], 0));
+                imgManger.setImagefilename(filenames[i]);
+                imgManger.setDocfiletype("2");
+                imgManger.setIsextfile("1");
+                imgManger.AddDocImageInfo();
+            }
+
+            int docimages_num = Util.getIntValue(fu.getParameter("docimages_num"), 0);
+
+            needuploads = new String[docimages_num];
+            for (int i = 0; i < docimages_num; i++) {
+                needuploads[i] = "docimages_" + i;
+            }
+
+            fileids = fu.uploadFiles(needuploads);
+            filenames = fu.getFileNames();
+            for (int i = 0; i < docimages_num; i++) {
+                if (Util.getIntValue(fileids[i], 0) == 0)
+                    continue;
+                imgManger.resetParameter();
+                imgManger.setDocid(this.id);
+                imgManger.setImagefileid(Util.getIntValue(fileids[i], 0));
+                imgManger.setImagefilename(filenames[i]);
+                imgManger.setDocfiletype("1");
+                imgManger.AddDocImageInfo();
+            }
+
+            int tmppos = doccontent.indexOf("src=");
+            while (tmppos != -1) {
+                int startpos = doccontent.indexOf("\"", tmppos);
+                int endpos = doccontent.indexOf("\"", startpos + 1);
+                String tempStr = doccontent.substring(startpos + 1, endpos);
+
+                for (int i = 1; i < docimages_num; i++) {
+                    if (tempStr.indexOf(filenames[i]) != -1) {
+                        String replaceStr = weaver.general.GCONST.getContextPath()+"/weaver/weaver.file.FileDownload?fileid=" + fileids[i];
+                        doccontent = Util.StringReplace(doccontent, tempStr, replaceStr);
+
+                    }
+                }
+
+                tmppos = doccontent.indexOf("src=", endpos);
+            }
+
+            doccontent = Util.toScreen(doccontent, 7, "0");
+            // System.out.println("doccontent" + doccontent) ;
+
+            Calendar today = Calendar.getInstance();
+            String formatdate = Util.add0(today.get(Calendar.YEAR), 4) + "-"
+                    + Util.add0(today.get(Calendar.MONTH) + 1, 2) + "-"
+                    + Util.add0(today.get(Calendar.DAY_OF_MONTH), 2);
+            String formattime = Util.add0(today.get(Calendar.HOUR_OF_DAY), 2) + ":"
+                    + Util.add0(today.get(Calendar.MINUTE), 2) + ":" + Util.add0(today.get(Calendar.SECOND), 2);
+
+            this.maincategory = Util.getIntValue(fu.getParameter("mainCatoryid"), 0);
+            this.subcategory = Util.getIntValue(fu.getParameter("subCatoryid"), 0);
+            this.seccategory = Util.getIntValue(fu.getParameter("secCatoryid"), 0);
+            this.doclangurage = 7;
+            this.docapprovable = "0";
+            this.docreplyable = fu.getParameter("docreplyable");
+            this.isreply = Util.null2String(fu.getParameter("isreply"));
+            this.replydocid = Util.getIntValue(fu.getParameter("replydocid"), 0);
+            this.docsubject = fu.getParameter("docSubject");
+            this.docsubject = interceptString(this.docsubject,400);           
+            this.doccontent = doccontent;
+            this.docpublishtype = "0";
+            if (docpublishtype.equals("2")) {
+                //docmain = fu.getParameter("docmain");
+            	docmain = Util.toHtml2(Util.encodeAnd(Util.null2String(fu.getParameter("docmain"))));            	
+                this.doccontent = docmain + "!@#$%^&*" + this.doccontent;
+            }
+
+            this.itemid = Util.getIntValue(fu.getParameter("itemid"), 0);
+            this.itemmaincategoryid = Util.getIntValue(fu.getParameter("itemmaincategoryid"), 0);
+            this.hrmresid = Util.getIntValue(fu.getParameter("hrmresid"), 0);
+            this.assetid = Util.getIntValue(fu.getParameter("assetid"), 0);
+            this.ownerid = createrid;
+            this.crmid = Util.getIntValue(fu.getParameter("crmid"), 0);
+            this.projectid = Util.getIntValue(fu.getParameter("projectid"), 0);
+            this.financeid = Util.getIntValue(fu.getParameter("financeid"), 0);
+            this.doccreaterid = createrid;
+            this.docdepartmentid = Util.getIntValue(rc.getDepartmentID("" + createrid), 0);
+            this.doccreatedate = formatdate;
+            this.doccreatetime = formattime;
+            this.doclastmoduserid = this.userid;
+            this.doclastmoddate = formatdate;
+            this.doclastmodtime = formattime;
+            this.docapproveuserid = 0;
+            this.docapprovedate = "";
+            this.docapprovetime = "";
+            this.docarchiveuserid = 0;
+            this.docarchivedate = "";
+            this.docarchivetime = "";
+
+            this.docstatus = Util.null2String(fu.getParameter("docStatus"));
+
+            if (Util.null2String(fu.getParameter("parentids")).equals("")) {
+                this.parentids = this.id + "";
+            } else
+                this.parentids = Util.null2String(fu.getParameter("parentids")) + "," + this.id;
+
+            this.keyword = Util.null2String(fu.getParameter("keyword"));
+            /* 文档的关键字 */
+
+            int docid = this.id;
+
+            this.accessorycount = accessorynumtrue;
+
+            if (isreply.equals("1")) {
+                AddReplayDocCount(rsSql); // 修改回复记录条数
+            }
+
+            this.replaydoccount = 0; /* 回复文档总数 */
+            this.usertype = "1"; /* 创建的用户类型 1: 内部 2: 外部 */
+            this.topage = Util.null2String(fu.getParameter("topage"));
+
+            this.contractman = Util.null2String(fu.getParameter("contractman"));
+            this.contractstartdate = Util.null2String(fu.getParameter("contractstartdate"));
+            this.contractenddate = Util.null2String(fu.getParameter("contractenddate"));
+            this.docmodule = Util.null2String(fu.getParameter("docmodule"));
+            this.proenddate = Util.null2String(fu.getParameter("proenddate"));
+            this.typeid = Util.getIntValue(fu.getParameter("typeid"), 0);
+            this.urlfrom = Util.null2String(fu.getParameter("urlfrom"));
+            this.orderable = "" + scc.getSecOrderable(this.seccategory);
+            AddDocInfo();
+            AddShareInfo();
+            if (!contractman.equals("")) {
+                addHrmContract();
+            }
+
+            String note = Util.null2String(fu.getParameter("note"));
+            String sql_note = "update docdetail set note = '" + note + "' where id =" + id;
+            rsSql.executeSql(sql_note);
+
+            DocViewer DocViewer = new DocViewer();
+            DocViewer.setDocShareByDoc("" + id);
+
+        } catch (Exception e) {
+            writeLog(e);
+            return "err_Exception";
+        }
+
+        return "err_uploadSuccess";
+
+    }
+
+    /**
+     * 存储文档内容
+     * 
+     * @param fu 一个FileUpload对象存储了文档地所有信息
+     * @param docid_html 文档ID
+     */
+    public void UploadImage(FileUpload fu, String docid_html) {
+
+        String opera = "";
+        String doccontent = " ";
+        String docmain = "";
+        String newdoccontent = "";
+        // rs = new RecordSet();
+
+        int docimages_num = Util.getIntValue(fu.getParameter("docimages_num"), 0);
+        this.id = Util.getIntValue(docid_html);
+        String[] needuploads = new String[docimages_num];
+        for (int i = 0; i < docimages_num; i++) {
+            needuploads[i] = "docimages_" + i;
+        }
+
+        String[] fileids = fu.uploadFiles(needuploads);
+        String[] filenames = fu.getFileNames();
+        for (int i = 0; i < docimages_num; i++) {
+            if (Util.getIntValue(fileids[i], 0) == 0)
+                continue;
+            imgManger.resetParameter();
+            imgManger.setDocid(this.id);
+            imgManger.setImagefileid(Util.getIntValue(fileids[i], 0));
+            imgManger.setImagefilename(filenames[i]);
+            imgManger.setDocfiletype("1");
+            imgManger.AddDocImageInfo();
+        }
+    }
+
+    /**
+     * 存储文档内容
+     * 
+     * @param fu 一个FileUpload对象存储了文档地所有信息
+     * @param createrid 创建者ID
+     * @return 文档的操作类型
+     * @throws Exception
+     */
+    public String UploadDoc(FileUpload fu, int createrid) throws Exception {
+
+        String opera = "";
+        String docmain = "";
+        RecordSet rsSql = new RecordSet();
+
+        try {
+            opera = fu.getParameter("operation");
+
+            if (opera.equals("addsave") || opera.equals("adddraft")) {
+
+                this.id = getNextDocId(rsSql);
+
+                int accessorynum = Util.getIntValue(fu.getParameter("accessorynum"), 1);
+
+                String filenames;
+                String fileids;
+                fileids = fu.uploadFiles("accessory1");
+                filenames = fu.getFileName();
+
+                int accessorynumtrue = 0;
+
+                for (int i = 0; i < accessorynum; i++) {
+                    if (Util.getIntValue(fileids, 0) == 0)
+                        continue;
+                    accessorynumtrue++;
+                    imgManger.resetParameter();
+                    imgManger.setDocid(this.id);
+                    imgManger.setImagefileid(Util.getIntValue(fileids, 0));
+                    imgManger.setImagefilename(filenames);
+                    imgManger.setDocfiletype("2");
+                    imgManger.setIsextfile("1");
+                    imgManger.AddDocImageInfo();
+                }
+
+                this.doccontent = Util.fromBaseEncoding(fu.getParameter("doccontent"), languageid);
+                this.doccontent =Util.htmlFilter4UTF8(this.doccontent );
+                
+                Calendar today = Calendar.getInstance();
+                String formatdate = Util.add0(today.get(Calendar.YEAR), 4) + "-"
+                        + Util.add0(today.get(Calendar.MONTH) + 1, 2) + "-"
+                        + Util.add0(today.get(Calendar.DAY_OF_MONTH), 2);
+                String formattime = Util.add0(today.get(Calendar.HOUR_OF_DAY), 2) + ":"
+                        + Util.add0(today.get(Calendar.MINUTE), 2) + ":" + Util.add0(today.get(Calendar.SECOND), 2);
+
+                this.maincategory = Util.getIntValue(fu.getParameter("maincategory"), 0);
+                this.subcategory = Util.getIntValue(fu.getParameter("subcategory"), 0);
+                this.seccategory = Util.getIntValue(fu.getParameter("seccategory"), 0);
+                this.doclangurage = Util.getIntValue(fu.getParameter("doclangurage"), 7);
+                this.docapprovable = fu.getParameter("docapprovable");
+                this.docreplyable = fu.getParameter("docreplyable");
+                this.isreply = Util.null2String(fu.getParameter("isreply"));
+                this.replydocid = Util.getIntValue(fu.getParameter("replydocid"), 0);
+                this.docsubject = fu.getParameter("docsubject");
+                this.docsubject = interceptString(this.docsubject,400);
+                this.docpublishtype = "0";
+
+                this.itemid = Util.getIntValue(fu.getParameter("itemid"), 0);
+                this.itemmaincategoryid = Util.getIntValue(fu.getParameter("itemmaincategoryid"), 0);
+                this.hrmresid = Util.getIntValue(fu.getParameter("hrmresid"), 0);
+                this.assetid = Util.getIntValue(fu.getParameter("assetid"), 0);
+                this.crmid = Util.getIntValue(fu.getParameter("crmid"), 0);
+                this.projectid = Util.getIntValue(fu.getParameter("projectid"), 0);
+                this.financeid = Util.getIntValue(fu.getParameter("financeid"), 0);
+                this.doccreaterid = createrid;
+                this.ownerid = this.doccreaterid;
+
+                ResourceComInfo rc = new ResourceComInfo();
+                this.docdepartmentid = Util.getIntValue(rc.getDepartmentID("createrid"), 0);
+                this.doccreatedate = formatdate;
+                this.doccreatetime = formattime;
+                this.doclastmoduserid = this.doccreaterid;
+                this.doclastmoddate = formatdate;
+                this.doclastmodtime = formattime;
+                this.docapproveuserid = 0;
+                this.docapprovedate = "";
+                this.docapprovetime = "";
+                this.docarchiveuserid = 0;
+                this.docarchivedate = "";
+                this.docarchivetime = "";
+
+                String tmpstatus = "0";
+                if (tmpstatus.equals("1") && docapprovable.equals("1") && !isreply.equals("1")) { // 是保存的非回复文档,要审批，还没有审批的(isreply可能为空），置为需审批状态
+                    tmpstatus = "3";
+                }
+                if (tmpstatus.equals("1") && isreply.equals("1")) { // 是保存的回复文档的（是不要审批，直接置成１）
+                    tmpstatus = "1";
+                }
+                this.docstatus = tmpstatus;
+
+                if (Util.null2String(fu.getParameter("parentids")).equals("")) {
+                    this.parentids = this.id + "";
+                } else
+                    this.parentids = Util.null2String(fu.getParameter("parentids")) + "," + this.id;
+
+                this.keyword = Util.null2String(fu.getParameter("keyword"));
+                /* 文档的关键字 */
+
+                int docid = this.id;
+
+                this.accessorycount = accessorynumtrue;
+
+                if (isreply.equals("1")) {
+                    AddReplayDocCount(rsSql); // 修改回复记录条数
+                }
+
+                this.replaydoccount = 0; /* 回复文档总数 */
+                this.usertype = Util.null2String(fu.getParameter("usertype"));
+                /* 创建的用户类型 1: 内部 2: 外部 */
+                this.topage = Util.null2String(fu.getParameter("topage"));
+
+                this.contractman = Util.null2String(fu.getParameter("contractman"));
+                this.contractstartdate = Util.null2String(fu.getParameter("contractstartdate"));
+                this.contractenddate = Util.null2String(fu.getParameter("contractenddate"));
+                this.docmodule = Util.null2String(fu.getParameter("docmodule"));
+                this.proenddate = Util.null2String(fu.getParameter("proenddate"));
+                this.typeid = Util.getIntValue(fu.getParameter("typeid"), 0);
+                this.urlfrom = Util.null2String(fu.getParameter("urlfrom"));
+                this.orderable = "" + scc.getSecOrderable(this.seccategory);
+                AddDocInfo();
+                AddShareInfo();
+            }
+        } catch (Exception e) {
+            writeLog(e);
+            return opera + "_1";
+        }
+
+        return opera;
+
+    }
+
+    /**
+     * 存储文档内容
+     * 
+     * @param userName 用户ID
+     * @param passwd 用户密码
+     * @param docSubject 文档主题
+     * @param mainCatory 主目录ID
+     * @param secCatory 分目录ID
+     * @param subCatory 子目录ID
+     * @param content 文档内容
+     * @param filenames 上传附件文本框的名称
+     * @param req HttpServletRequest 对象
+     * @param res HttpServletResponse 对象
+     * @param fu FileUpload对象存储了文档地所有信息
+     * @param creatid 创建者ID
+     * @param docStatus 文档状态
+     * @return 文档的操作类型
+     * @throws Exception
+     */
+    public String UploadDoc(String userName, String passwd, String docSubject, String mainCatory, String secCatory,
+            String subCatory, String content, String filenames, HttpServletRequest req, HttpServletResponse res,
+            FileUpload fu, int creatid, String docStatus) throws Exception {
+
+        String opera = "";
+        String docmain = "";
+        RecordSet rsSql = new RecordSet();
+        // System.out.println("creatid is " +creatid) ;
+
+        try {
+            opera = "addsave";
+
+            if (opera.equals("addsave") || opera.equals("adddraft")) {
+
+                this.id = getNextDocId(rsSql);
+
+                int accessorynum = 1;
+                String fileids;
+                fileids = "0";
+
+                int accessorynumtrue = 0;
+
+                for (int i = 0; i < accessorynum; i++) {
+                    if (Util.getIntValue(fileids, 0) == 0)
+                        continue;
+                    accessorynumtrue++;
+                    imgManger.resetParameter();
+                    imgManger.setDocid(this.id);
+                    imgManger.setImagefileid(Util.getIntValue(fileids, 0));
+                    imgManger.setImagefilename(filenames);
+                    imgManger.setDocfiletype("2");
+                    imgManger.setIsextfile("1");
+                    imgManger.AddDocImageInfo();
+                }
+
+                this.doccontent = Util.toScreen(content, 7, "0");
+                // System.out.println("newcontent is " +doccontent) ;
+
+                Calendar today = Calendar.getInstance();
+                String formatdate = Util.add0(today.get(Calendar.YEAR), 4) + "-"
+                        + Util.add0(today.get(Calendar.MONTH) + 1, 2) + "-"
+                        + Util.add0(today.get(Calendar.DAY_OF_MONTH), 2);
+                String formattime = Util.add0(today.get(Calendar.HOUR_OF_DAY), 2) + ":"
+                        + Util.add0(today.get(Calendar.MINUTE), 2) + ":" + Util.add0(today.get(Calendar.SECOND), 2);
+
+                this.maincategory = Util.getIntValue(mainCatory, 0);
+                this.subcategory = Util.getIntValue(secCatory, 0);
+                this.seccategory = Util.getIntValue(subCatory, 0);
+                this.doclangurage = 7;
+                this.docapprovable = " ";
+                this.docreplyable = " ";
+                this.isreply = Util.null2String(fu.getParameter("isreply"));
+                this.replydocid = Util.getIntValue(fu.getParameter("replydocid"), 0);
+                this.docsubject = docSubject;
+                this.docsubject = interceptString(this.docsubject,400);                
+                // System.out.println("docsubject is :" + docsubject) ;
+
+                this.docpublishtype = "0";
+
+                this.itemid = Util.getIntValue(fu.getParameter("itemid"), 0);
+                this.itemmaincategoryid = Util.getIntValue(fu.getParameter("itemmaincategoryid"), 0);
+                this.hrmresid = Util.getIntValue(fu.getParameter("hrmresid"), 0);
+                this.assetid = Util.getIntValue(fu.getParameter("assetid"), 0);
+                this.crmid = Util.getIntValue(fu.getParameter("crmid"), 0);
+                this.projectid = Util.getIntValue(fu.getParameter("projectid"), 0);
+                this.financeid = Util.getIntValue(fu.getParameter("financeid"), 0);
+                this.doccreaterid = creatid;
+                this.ownerid = this.doccreaterid;
+
+                ResourceComInfo rc = new ResourceComInfo();
+                this.docdepartmentid = Util.getIntValue(rc.getDepartmentID("" + creatid), 0);
+                // System.out.println(docdepartmentid) ;
+                this.doccreatedate = formatdate;
+                this.doccreatetime = formattime;
+                this.doclastmoduserid = this.doccreaterid;
+                this.doclastmoddate = formatdate;
+                this.doclastmodtime = formattime;
+                this.docapproveuserid = 0;
+                this.docapprovedate = "";
+                this.docapprovetime = "";
+                this.docarchiveuserid = 0;
+                this.docarchivedate = "";
+                this.docarchivetime = "";
+
+                /*
+                 * String tmpstatus = "0" ; if(tmpstatus.equals("1") && docapprovable.equals("1") &&
+                 * !isreply.equals("1"))//是保存的非回复文档,要审批，还没有审批的(isreply可能为空），置为需审批状态 {tmpstatus="3";}
+                 * if(tmpstatus.equals("1") && isreply.equals("1"))//是保存的回复文档的（是不要审批，直接置成１） {tmpstatus="1";}
+                 */
+                this.docstatus = docStatus;
+
+                if (Util.null2String(fu.getParameter("parentids")).equals("")) {
+                    this.parentids = this.id + "";
+                } else
+                    this.parentids = Util.null2String(fu.getParameter("parentids")) + "," + this.id;
+
+                this.keyword = Util.null2String(fu.getParameter("keyword"));
+                /* 文档的关键字 */
+
+                int docid = this.id;
+
+                this.accessorycount = accessorynumtrue;
+
+                if (isreply.equals("1")) {
+                    AddReplayDocCount(rsSql); // 修改回复记录条数
+                }
+
+                this.replaydoccount = 0; /* 回复文档总数 */
+                this.usertype = "1"; /* 创建的用户类型 1: 内部 2: 外部 */
+                this.topage = Util.null2String(fu.getParameter("topage"));
+
+                this.contractman = Util.null2String(fu.getParameter("contractman"));
+                this.contractstartdate = Util.null2String(fu.getParameter("contractstartdate"));
+                this.contractenddate = Util.null2String(fu.getParameter("contractenddate"));
+                this.docmodule = Util.null2String(fu.getParameter("docmodule"));
+                this.proenddate = Util.null2String(fu.getParameter("proenddate"));
+                this.typeid = Util.getIntValue(fu.getParameter("typeid"), 0);
+                this.urlfrom = Util.null2String(fu.getParameter("urlfrom"));
+                this.orderable = "" + scc.getSecOrderable(this.seccategory);
+                AddDocInfo();
+                AddShareInfo();
+            }
+        } catch (Exception e) {
+            writeLog(e);
+            return opera + "_1";
+        }
+
+        return opera;
+        // System.out.println("doccontent is :" + doccontent) ;
+
+    }
+
+    /**
+     * 上传文档到一个文件
+     * 
+     * @param userName 用户ID
+     * @param passwd 用户密码
+     * @param docSubject 文档主题
+     * @param mainCatory 主目录ID
+     * @param secCatory 分目录ID
+     * @param subCatory 子目录ID
+     * @param content 文档内容
+     * @param filenames 上传附件文本框的名称
+     * @param req HttpServletRequest 对象
+     * @param res HttpServletResponse 对象
+     * @param fu FileUpload对象存储了文档地所有信息
+     * @param creatid 创建者ID
+     * @param docStatus 文档状态
+     * @param isNeedReturnDocid 是否需要返回文档ID
+     * @param note 文档的备注信息
+     * @return 文档的操作类型
+     * @throws Exception
+     */
+    public String UploadDocToFile(String userName, String passwd, String docSubject, String mainCatory,
+            String subCatory, String secCatory, String content, String filenames, HttpServletRequest req,
+            HttpServletResponse res, FileUpload fu, int createrid, String docStatus, boolean isNeedReturnDocid,
+            String note) throws Exception {
+
+        String opera = "";
+        String docmain = "";
+        RecordSet rsSql = new RecordSet();
+
+        try {
+            opera = "addsave";
+
+            if (opera.equals("addsave") || opera.equals("adddraft")) {
+
+                this.id = getNextDocId(rsSql);
+
+                //writeLog(" doc id is " + id);
+
+                int accessorynum = 1;
+
+                String fileids;
+                fileids = fu.uploadFiles("accessory1");
+                filenames = fu.getFileName();
+
+                //writeLog(" fileids  is " + fileids);
+                //writeLog(" filenames  is " + filenames);
+
+                int accessorynumtrue = 0;
+
+                for (int i = 0; i < accessorynum; i++) {
+                    if (Util.getIntValue(fileids, 0) == 0)
+                        continue;
+                    accessorynumtrue++;
+                    imgManger.resetParameter();
+                    imgManger.setDocid(this.id);
+                    imgManger.setImagefileid(Util.getIntValue(fileids, 0));
+                    imgManger.setImagefilename(filenames);
+                    imgManger.setDocfiletype("2");
+                    imgManger.setIsextfile("1");
+                    imgManger.AddDocImageInfo();
+                }
+
+                this.doccontent = Util.fromBaseEncoding(fu.getParameter("doccontent"), languageid);
+                this.doccontent =Util.htmlFilter4UTF8(this.doccontent );
+                
+                Calendar today = Calendar.getInstance();
+                String formatdate = Util.add0(today.get(Calendar.YEAR), 4) + "-"
+                        + Util.add0(today.get(Calendar.MONTH) + 1, 2) + "-"
+                        + Util.add0(today.get(Calendar.DAY_OF_MONTH), 2);
+                String formattime = Util.add0(today.get(Calendar.HOUR_OF_DAY), 2) + ":"
+                        + Util.add0(today.get(Calendar.MINUTE), 2) + ":" + Util.add0(today.get(Calendar.SECOND), 2);
+
+                this.maincategory = Util.getIntValue(mainCatory);
+                this.subcategory = Util.getIntValue(subCatory);
+                this.seccategory = Util.getIntValue(secCatory);
+                this.doclangurage = 7;
+                this.docapprovable = "0";
+                this.docreplyable = fu.getParameter("docreplyable");
+                this.isreply = Util.null2String(fu.getParameter("isreply"));
+                this.replydocid = Util.getIntValue(fu.getParameter("replydocid"), 0);
+                this.docsubject = docSubject;
+                this.docsubject = interceptString(this.docsubject,400);
+                
+                this.docpublishtype = "0";
+
+                this.itemid = Util.getIntValue(fu.getParameter("itemid"), 0);
+                this.itemmaincategoryid = Util.getIntValue(fu.getParameter("itemmaincategoryid"), 0);
+                this.hrmresid = Util.getIntValue(fu.getParameter("hrmresid"), 0);
+                this.assetid = Util.getIntValue(fu.getParameter("assetid"), 0);
+                this.crmid = Util.getIntValue(fu.getParameter("crmid"), 0);
+                this.projectid = Util.getIntValue(fu.getParameter("projectid"), 0);
+                this.financeid = Util.getIntValue(fu.getParameter("financeid"), 0);
+                this.doccreaterid = createrid;
+                this.ownerid = this.doccreaterid;
+
+                ResourceComInfo rc = new ResourceComInfo();
+                this.docdepartmentid = Util.getIntValue(rc.getDepartmentID("" + createrid), 0);
+                this.doccreatedate = formatdate;
+                this.doccreatetime = formattime;
+                this.doclastmoduserid = this.doccreaterid;
+                this.doclastmoddate = formatdate;
+                this.doclastmodtime = formattime;
+                this.docapproveuserid = 0;
+                this.docapprovedate = "";
+                this.docapprovetime = "";
+                this.docarchiveuserid = 0;
+                this.docarchivedate = "";
+                this.docarchivetime = "";
+
+                String tmpstatus = "0";
+                if (tmpstatus.equals("1") && docapprovable.equals("1") && !isreply.equals("1")) { // 是保存的非回复文档,要审批，还没有审批的(isreply可能为空），置为需审批状态
+                    tmpstatus = "3";
+                }
+                if (tmpstatus.equals("1") && isreply.equals("1")) { // 是保存的回复文档的（是不要审批，直接置成１）
+                    tmpstatus = "1";
+                }
+                this.docstatus = docStatus;
+
+                if (Util.null2String(fu.getParameter("parentids")).equals("")) {
+                    this.parentids = this.id + "";
+                } else
+                    this.parentids = Util.null2String(fu.getParameter("parentids")) + "," + this.id;
+
+                this.keyword = Util.null2String(fu.getParameter("keyword"));
+                /* 文档的关键字 */
+
+                /*
+                 * if (isNeedReturnDocid) { return ""+docid ; }
+                 */
+
+                this.accessorycount = accessorynumtrue;
+
+                if (isreply.equals("1")) {
+                    AddReplayDocCount(rsSql); // 修改回复记录条数
+                }
+
+                this.replaydoccount = 0; /* 回复文档总数 */
+                this.usertype = "1"; /* 创建的用户类型 1: 内部 2: 外部 */
+                this.topage = Util.null2String(fu.getParameter("topage"));
+
+                this.contractman = Util.null2String(fu.getParameter("contractman"));
+                this.contractstartdate = Util.null2String(fu.getParameter("contractstartdate"));
+                this.contractenddate = Util.null2String(fu.getParameter("contractenddate"));
+                this.docmodule = Util.null2String(fu.getParameter("docmodule"));
+                this.proenddate = Util.null2String(fu.getParameter("proenddate"));
+                this.typeid = Util.getIntValue(fu.getParameter("typeid"), 0);
+                this.urlfrom = Util.null2String(fu.getParameter("urlfrom"));
+                this.orderable = "" + scc.getSecOrderable(this.seccategory);
+                AddDocInfo();
+                AddShareInfo();
+
+            }
+        } catch (Exception e) {
+            writeLog(e);
+            return "";
+        }
+
+        return "" + id;
+
+    }
+
+    /**
+     * 上传文档到一个文件
+     * 
+     * @param userName 用户ID
+     * @param passwd 用户密码
+     * @param docSubject 文档主题
+     * @param mainCatory 主目录ID
+     * @param secCatory 分目录ID
+     * @param subCatory 子目录ID
+     * @param content 文档内容
+     * @param filenames 上传附件文本框的名称
+     * @param req HttpServletRequest 对象
+     * @param res HttpServletResponse 对象
+     * @param fu FileUpload对象存储了文档地所有信息
+     * @param creatid 创建者ID
+     * @param docStatus 文档状态
+     * @param isNeedReturnDocid 是否需要返回文档ID
+     * @param note 文档的备注信息
+     * @return 文档的操作类型
+     * @throws Exception
+     */
+    public String UploadDocToContent(String userName, String passwd, String docSubject, String mainCatory,
+            String subCatory, String secCatory, String content, String filenames, HttpServletRequest req,
+            HttpServletResponse res, FileUpload fu, int creatid, String docStatus, String note) throws Exception {
+
+        String opera = "";
+        String docmain = "";
+        RecordSet rsSql = new RecordSet();
+        // System.out.println("creatid is " +creatid) ;
+
+        try {
+            opera = "addsave";
+
+            if (opera.equals("addsave") || opera.equals("adddraft")) {
+
+                this.id = getNextDocId(rsSql);
+
+                //writeLog(" doc id is " + id);
+
+                int accessorynum = 1;
+                String fileids;
+                fileids = "0";
+
+
+                int accessorynumtrue = 0;
+
+                for (int i = 0; i < accessorynum; i++) {
+                    if (Util.getIntValue(fileids, 0) == 0)
+                        continue;
+                    accessorynumtrue++;
+                    imgManger.resetParameter();
+                    imgManger.setDocid(this.id);
+                    imgManger.setImagefileid(Util.getIntValue(fileids, 0));
+                    imgManger.setImagefilename(filenames);
+                    imgManger.setDocfiletype("2");
+                    imgManger.setIsextfile("1");
+                    imgManger.AddDocImageInfo();
+                }
+
+                this.doccontent = Util.toScreen(content, 7, "0");
+                // System.out.println("newcontent is " +doccontent) ;
+
+                Calendar today = Calendar.getInstance();
+                String formatdate = Util.add0(today.get(Calendar.YEAR), 4) + "-"
+                        + Util.add0(today.get(Calendar.MONTH) + 1, 2) + "-"
+                        + Util.add0(today.get(Calendar.DAY_OF_MONTH), 2);
+                String formattime = Util.add0(today.get(Calendar.HOUR_OF_DAY), 2) + ":"
+                        + Util.add0(today.get(Calendar.MINUTE), 2) + ":" + Util.add0(today.get(Calendar.SECOND), 2);
+
+                this.maincategory = Util.getIntValue(mainCatory, 0);
+                this.subcategory = Util.getIntValue(secCatory, 0);
+                this.seccategory = Util.getIntValue(subCatory, 0);
+                this.doclangurage = 7;
+                this.docapprovable = " ";
+                this.docreplyable = " ";
+                this.isreply = Util.null2String(fu.getParameter("isreply"));
+                this.replydocid = Util.getIntValue(fu.getParameter("replydocid"), 0);
+                this.docsubject = docSubject;
+                this.docsubject = interceptString(this.docsubject,400);                
+                // System.out.println("docsubject is :" + docsubject) ;
+
+                this.docpublishtype = "0";
+
+                this.itemid = Util.getIntValue(fu.getParameter("itemid"), 0);
+                this.itemmaincategoryid = Util.getIntValue(fu.getParameter("itemmaincategoryid"), 0);
+                this.hrmresid = Util.getIntValue(fu.getParameter("hrmresid"), 0);
+                this.assetid = Util.getIntValue(fu.getParameter("assetid"), 0);
+                this.crmid = Util.getIntValue(fu.getParameter("crmid"), 0);
+                this.projectid = Util.getIntValue(fu.getParameter("projectid"), 0);
+                this.financeid = Util.getIntValue(fu.getParameter("financeid"), 0);
+                this.doccreaterid = creatid;
+                this.ownerid = this.doccreaterid;
+
+                ResourceComInfo rc = new ResourceComInfo();
+                this.docdepartmentid = Util.getIntValue(rc.getDepartmentID("" + creatid), 0);
+                // System.out.println(docdepartmentid) ;
+                this.doccreatedate = formatdate;
+                this.doccreatetime = formattime;
+                this.doclastmoduserid = this.doccreaterid;
+                this.doclastmoddate = formatdate;
+                this.doclastmodtime = formattime;
+                this.docapproveuserid = 0;
+                this.docapprovedate = "";
+                this.docapprovetime = "";
+                this.docarchiveuserid = 0;
+                this.docarchivedate = "";
+                this.docarchivetime = "";
+
+                /*
+                 * String tmpstatus = "0" ; if(tmpstatus.equals("1") && docapprovable.equals("1") &&
+                 * !isreply.equals("1"))//是保存的非回复文档,要审批，还没有审批的(isreply可能为空），置为需审批状态 {tmpstatus="3";}
+                 * if(tmpstatus.equals("1") && isreply.equals("1"))//是保存的回复文档的（是不要审批，直接置成１） {tmpstatus="1";}
+                 */
+                this.docstatus = docStatus;
+
+                if (Util.null2String(fu.getParameter("parentids")).equals("")) {
+                    this.parentids = this.id + "";
+                } else
+                    this.parentids = Util.null2String(fu.getParameter("parentids")) + "," + this.id;
+
+                this.keyword = Util.null2String(fu.getParameter("keyword"));
+                /* 文档的关键字 */
+
+                int docid = this.id;
+
+                this.accessorycount = accessorynumtrue;
+
+                if (isreply.equals("1")) {
+                    AddReplayDocCount(rsSql); // 修改回复记录条数
+                }
+
+                this.replaydoccount = 0; /* 回复文档总数 */
+                this.usertype = "1"; /* 创建的用户类型 1: 内部 2: 外部 */
+                this.topage = Util.null2String(fu.getParameter("topage"));
+
+                this.contractman = Util.null2String(fu.getParameter("contractman"));
+                this.contractstartdate = Util.null2String(fu.getParameter("contractstartdate"));
+                this.contractenddate = Util.null2String(fu.getParameter("contractenddate"));
+                this.docmodule = Util.null2String(fu.getParameter("docmodule"));
+                this.proenddate = Util.null2String(fu.getParameter("proenddate"));
+                this.typeid = Util.getIntValue(fu.getParameter("typeid"), 0);
+                this.urlfrom = Util.null2String(fu.getParameter("urlfrom"));
+                this.orderable = "" + scc.getSecOrderable(this.seccategory);
+                AddDocInfo();
+                AddShareInfo();
+            }
+        } catch (Exception e) {
+            writeLog(e);
+            return " ";
+        }
+
+        return "" + id;
+        // System.out.println("doccontent is :" + doccontent) ;
+
+    }
+
+    /**
+     * 上传文档到一个文件2
+     * 
+     * @param userName 用户ID
+     * @param passwd 用户密码
+     * @param docSubject 文档主题
+     * @param mainCatory 主目录ID
+     * @param secCatory 分目录ID
+     * @param subCatory 子目录ID
+     * @param content 文档内容
+     * @param filenames 上传附件文本框的名称
+     * @param req HttpServletRequest 对象
+     * @param res HttpServletResponse 对象
+     * @param fu FileUpload对象存储了文档地所有信息
+     * @param creatid 创建者ID
+     * @param docStatus 文档状态
+     * @param isNeedReturnDocid 是否需要返回文档ID
+     * @param note 文档的备注信息
+     */
+    public void UploadDocToFile2(String userName, String passwd, String docSubject, String mainCatory,
+            String subCatory, String secCatory, String content, String filenames, HttpServletRequest req,
+            HttpServletResponse res, FileUpload fu, int creatid, String docStatus, String docid, String note) {
+        String docid_new = "";
+        String content_new = " ";
+        boolean isNeedReturnDocid = true;
+        try {
+            docid_new = UploadDocToFile(userName, passwd, docSubject, mainCatory, subCatory, secCatory, content,
+                    filenames, req, res, fu, creatid, docStatus, isNeedReturnDocid, note);
+        } catch (Exception e) {
+            //System.out.println(e.getMessage());
+			writeLog(e);
+        }
+        RecordSet rsSql = new RecordSet();
+        String sql_updateImagefile = "update docimagefile set docid = " + docid + " where docid =" + docid_new;
+        String sql_deldocdetail = "delete docdetail where id = " + docid_new;
+        String sql_updatedocdetail = "update docdetail set accessorycount = 1 where id =" + docid;
+
+        rsSql.executeSql(sql_updateImagefile);
+        rsSql.executeSql(sql_deldocdetail);
+        rsSql.executeSql(sql_updatedocdetail);
+
+        // System.out.println("sql_updateImagefile is : "+sql_updateImagefile) ;
+        // System.out.println("sql_deldocdetail is : "+sql_deldocdetail) ;
+        // System.out.println("sql_updatedocdetail is : "+sql_updatedocdetail) ;
+
+    }
+
+    /**
+     * 文档移动
+     * 
+     * @throws Exception
+     */
+    public void moveDoc() throws Exception {
+    	int oldsecid = dc.getDocSecCategory(id+"");
+    	
+        String sql = "update DocDetail set maincategory=?,subcategory=?,seccategory=? where id = " + id;
+        String sqlDummy = "update DocDummyDetail set docid =? where docid="+id;
+        String sqllog = "update DocDetail set maincategory=" + maincategory + ",subcategory=" + subcategory
+                + ",seccategory=" + seccategory + " where id = " + id;
+        String sqlShareinnerdoc = " update shareinnerdoc set sec_category = "+seccategory +" where sourceid = "+id;
+        new RecordSet().executeUpdate(sqlShareinnerdoc);
+        RecordSet statement = new RecordSet();
+        try {
+            statement.executeUpdate(sql,maincategory,subcategory,seccategory);
+            
+            statement.executeUpdate(sqlDummy,id);
+            
+            if(customDataIdMapping==null || customDataIdMapping.length == 0) {
+                RecordSet rsSql = new RecordSet();
+                rsSql.executeSql("update cus_fielddata set  scopeId="+this.seccategory+" where   scope='DocCustomFieldBySecCategory'  and id="+this.id);            
+                int tempDocEditionId=-1;
+                rsSql.executeSql("select docEditionId from DocDetail where id="+this.id);
+                if(rsSql.next()){
+                	tempDocEditionId=Util.getIntValue(rsSql.getString("docEditionId"));
+                }
+                if(tempDocEditionId>0){
+                    rsSql.executeSql("update cus_fielddata set  scopeId="+this.seccategory+" where   scope='DocCustomFieldBySecCategory'  and exists (select 1 from DocDetail where id=cus_fielddata.id  and docEditionId="+tempDocEditionId+")");
+					rsSql.executeSql("update docdetail set seccategory=" + this.seccategory+" where docEditionId="+tempDocEditionId);
+                }
+            } else {
+            	String srcNameStr = "";
+            	List srcNameList=new ArrayList();
+            	int srcFieldId=-1;
+            	String srcFieldValue=null;
+            	String srcFieldShowName=null;
+                String cusFieldDataSrcSql=null;
+                String cusFieldDataSrcStr="";
+                
+            	String objNameStr = "";
+            	List objNameList=new ArrayList();
+            	int objFieldId=-1;
+            	String objFieldValue=null;            	
+                String cusFieldDataObjSql=null;
+                String cusFieldDataObjStr="";
+                
+            	Map objNameSrcNameMap=new HashMap();
+            	Map srcFieldValueAndFieldShowNameMap=null;
+            	
+				RecordSet rsCus=new RecordSet();
+				//customDataIdMapping = removedouble(customDataIdMapping);
+            	for(int i=0;i<customDataIdMapping.length;i++){
+            		List ids = Util.TokenizerString(customDataIdMapping[i], "_");					
+					rsCus.execute("select fieldname from cus_formdict where id="+ids.get(0));
+					if(rsCus.next()){
+						srcNameStr += ","+rsCus.getString("fieldname");
+					}
+					rsCus.execute("select fieldname from cus_formdict where id="+ids.get(1));
+					if(rsCus.next()){
+						objNameStr += ","+rsCus.getString("fieldname");
+					}
+            		//srcNameStr += ",field" + ids.get(0);
+            		//objNameStr += ",field" + ids.get(1);
+            		objNameSrcNameMap.put(""+ids.get(1),""+ids.get(0));
+            		srcNameList.add(""+ids.get(0));
+            		objNameList.add(""+ids.get(1));            		
+            	}
+            	srcNameStr = srcNameStr.substring(1);
+            	objNameStr = objNameStr.substring(1);
+            	
+            	RecordSet rsSql = new RecordSet();
+            	RecordSet rsTemp=new RecordSet();
+            	
+            	List seqorderList =new ArrayList();
+            	int seqorder = -1;
+            	String fieldDbType=null;
+            	String fieldHtmlType=null;
+				String fieldName=null;
+                int fieldLength=0;            	
+            	Map fieldHtmlTypeMap=new HashMap();
+            	
+            	int tempDocEditionId=-1;
+            	rsSql.executeSql("select docEditionId from DocDetail where id="+this.id);
+                if(rsSql.next()){
+                	tempDocEditionId=Util.getIntValue(rsSql.getString("docEditionId"));
+                }
+                if(tempDocEditionId>0){
+					rsSql.executeSql("update docdetail set seccategory=" + this.seccategory+" where docEditionId="+tempDocEditionId);
+                	sql = "select * from cus_fielddata where scope='DocCustomFieldBySecCategory' and scopeid=" + oldsecid + " and exists (select 1 from DocDetail where id=cus_fielddata.id  and docEditionId="+tempDocEditionId+")";
+                }else{
+                	sql = "select * from cus_fielddata where scope='DocCustomFieldBySecCategory' and scopeid=" + oldsecid + " and id="+this.id;
+                }
+                rsSql.executeSql(sql);
+            	while(rsSql.next()){
+	            	seqorder = Util.getIntValue(rsSql.getString("seqorder"),-1);
+	            	if(seqorder>0){
+		            	seqorderList.add(""+seqorder);
+	            	}
+            	}
+	            	
+            	Map cusFormDictDataMap=new HashMap();	            	
+			    rsSql.executeSql("select id,fieldDbType,fieldHtmlType,type,fieldname from cus_formdict");
+	            while(rsSql.next()){
+	            	cusFormDictDataMap.put("fieldDbType"+Util.null2String(rsSql.getString("id")),Util.null2String(rsSql.getString("fieldDbType")));
+	            	cusFormDictDataMap.put("fieldHtmlType"+Util.null2String(rsSql.getString("id")),Util.null2String(rsSql.getString("fieldHtmlType")));
+	            	cusFormDictDataMap.put("type"+Util.null2String(rsSql.getString("id")),Util.null2String(rsSql.getString("type")));	            	
+					cusFormDictDataMap.put("fieldName"+Util.null2String(rsSql.getString("id")),Util.null2String(rsSql.getString("fieldname")));	            	
+
+	            }
+	            	
+	            for(int seqorderIndex=0;seqorderIndex<seqorderList.size();seqorderIndex++){
+	            	seqorder=Util.getIntValue((String)seqorderList.get(seqorderIndex),-1);
+	            	srcFieldValueAndFieldShowNameMap=new HashMap();
+	            	cusFieldDataSrcSql="update cus_fielddata set ";
+	            	cusFieldDataObjSql="update cus_fielddata set scopeId="+this.seccategory+",";
+	            	cusFieldDataSrcStr="";
+	            	cusFieldDataObjStr="";
+	            		
+	            	rsSql.executeSql("select "+srcNameStr+" from cus_fielddata where seqorder= "+seqorder);
+	            	if(rsSql.next()){
+	            		for(int i=0;i<srcNameList.size();i++){
+	            			srcFieldId=Util.getIntValue((String)srcNameList.get(i),-1);
+	            			srcFieldValue=Util.null2String(rsSql.getString(i+1));
+	            			srcFieldShowName="";
+	            			fieldDbType=Util.null2String((String)cusFormDictDataMap.get("fieldDbType"+srcFieldId));	            			
+	            			fieldHtmlType=Util.null2String((String)cusFormDictDataMap.get("fieldHtmlType"+srcFieldId));
+	            			fieldName=Util.null2String((String)cusFormDictDataMap.get("fieldName"+srcFieldId));
+							if(fieldHtmlType.equals("5")){
+	                    		rsTemp.executeSql("  select selectName from cus_selectitem where fieldId="+srcFieldId+" and selectValue="+srcFieldValue);
+	                    		if(rsTemp.next()){
+	                    			srcFieldShowName=Util.null2String(rsTemp.getString("selectName"));
+	                    			srcFieldValueAndFieldShowNameMap.put("srcFieldShowName"+srcFieldId,srcFieldShowName);           			
+	                    		}	            				
+	            			}
+                			srcFieldValueAndFieldShowNameMap.put("srcFieldValue"+srcFieldId,srcFieldValue);
+                			
+                			if(cusFieldDataSrcStr.indexOf("," + fieldName + "=")<0){
+                    			cusFieldDataSrcStr += "," + fieldName + "=";
+                                if (fieldDbType.startsWith("text") || fieldDbType.startsWith("char")|| fieldDbType.startsWith("varchar")|| fieldDbType.startsWith("browser")) {
+                                	cusFieldDataSrcStr += "''";
+                                } else {
+                                	cusFieldDataSrcStr += -1;
+                                }                 				
+                			}                			
+               			
+	            		}
+		            }
+	            	
+	            	for(int i=0;i<objNameList.size();i++){
+            			objFieldId=Util.getIntValue((String)objNameList.get(i),-1);
+            			srcFieldId=Util.getIntValue((String)objNameSrcNameMap.get(""+objFieldId));
+            			srcFieldShowName=Util.null2String((String)srcFieldValueAndFieldShowNameMap.get("srcFieldShowName"+srcFieldId));           			
+            			objFieldValue=Util.null2String((String)srcFieldValueAndFieldShowNameMap.get("srcFieldValue"+srcFieldId));
+
+            			fieldDbType=Util.null2String((String)cusFormDictDataMap.get("fieldDbType"+objFieldId));	            			
+            			fieldHtmlType=Util.null2String((String)cusFormDictDataMap.get("fieldHtmlType"+objFieldId));
+            			fieldName=Util.null2String((String)cusFormDictDataMap.get("fieldName"+objFieldId));
+            			if(cusFieldDataObjStr.indexOf("," + fieldName + "=")<0){
+                			cusFieldDataObjStr += "," + fieldName + "=";
+                            if (fieldDbType.startsWith("text") || fieldDbType.startsWith("char")|| fieldDbType.startsWith("varchar")|| fieldDbType.startsWith("browser")) {
+                        		if(fieldDbType.indexOf("(")>=0&&fieldDbType.indexOf(")")>fieldDbType.indexOf("(")+1){
+                        			fieldLength=Util.getIntValue(fieldDbType.substring(fieldDbType.indexOf("(")+1,fieldDbType.indexOf(")")),0);
+                        		}
+                        		if(fieldLength>0){
+                        			cusFieldDataObjStr += "'" + interceptString(objFieldValue,fieldLength) + "'";
+                        		}else{
+                        			cusFieldDataObjStr += "'" + objFieldValue + "'";
+                        		}
+                            } else {
+                            	if(fieldHtmlType.equals("5")){
+                            		objFieldValue=this.getNewSelectValue(srcFieldShowName,objFieldValue,objFieldId);
+                            	}
+                            	cusFieldDataObjStr += Util.getIntValue(objFieldValue,-1);
+                            }           				
+            			}
+            			            			
+	            	}
+		            	
+	                if (!cusFieldDataSrcStr.equals("")) {
+	                	cusFieldDataSrcStr = cusFieldDataSrcStr.substring(1);
+	                    cusFieldDataSrcSql += cusFieldDataSrcStr + " where seqorder= "+seqorder;
+	                    rsSql.executeSql(cusFieldDataSrcSql);
+	                }
+	                
+	                if (!cusFieldDataObjStr.equals("")) {
+	                	cusFieldDataObjStr = cusFieldDataObjStr.substring(1);
+	                    cusFieldDataObjSql += cusFieldDataObjStr + " where seqorder= "+seqorder;
+	                    rsSql.executeSql(cusFieldDataObjSql);
+	                }	                
+
+		        }                    	
+            }
+            
+            log.resetParameter();
+            log.setDocId(this.id);
+            log.setDocSubject(this.docsubject);
+            log.setOperateType("11");
+            log.setOperateUserid(userid);
+            log.setUsertype(this.usertype);
+            log.setClientAddress(this.clientip);
+            log.setDocCreater(this.doccreaterid);
+            log.setDocLogInfo();
+
+            dc.updateDocInfoCache("" + id);
+        } catch (Exception e) {
+            writeLog(e);
+            throw e;
+        } finally {
+        }
+    }
+
+    /**
+     * 文档复制
+     * 
+     * @throws Exception
+     */
+    public int copyDoc() throws Exception {
+        RecordSet rs = new RecordSet();
+        int oldid = this.id;
+        this.id = getNextDocId(rs);
+        
+       	//copyDocToNewDoc(oldid);		
+		copyDocToNewDoc(oldid,true,"",true,true,"'1'",true,true,false);
+
+        log.resetParameter();
+        log.setDocId(this.id);
+        log.setDocSubject(this.docsubject);
+        log.setOperateType("12");
+        log.setOperateUserid(userid);
+        log.setUsertype(this.usertype);
+        log.setClientAddress(this.clientip);
+        log.setDocCreater(this.doccreaterid);
+        log.setDocLogInfo();
+        return this.id;
+    }
+
+    /**
+     * 文档复制
+     * aiyh 新增
+     * @throws Exception
+     */
+    public int copyDoc(boolean copyAttachment) throws Exception {
+        RecordSet rs = new RecordSet();
+        int oldid = this.id;
+        this.id = getNextDocId(rs);
+
+        if(copyAttachment){
+            copyDocToNewDoc(oldid,true,"",true,true,"'1'",true,true,false);
+        }else{
+            copyDocToNewDoc(oldid,true,"",true,true,"",true,false,false);
+        }
+
+        log.resetParameter();
+        log.setDocId(this.id);
+        log.setDocSubject(this.docsubject);
+        log.setOperateType("12");
+        log.setOperateUserid(userid);
+        log.setUsertype(this.usertype);
+        log.setClientAddress(this.clientip);
+        log.setDocCreater(this.doccreaterid);
+        log.setDocLogInfo();
+        return this.id;
+    }
+
+    /**
+     * 文档复制
+     *
+     * @throws Exception
+     */
+    public void copyDocNew() throws Exception {
+        RecordSet rs = new RecordSet();
+        int oldid = this.id;
+        this.id = getNextDocId(rs);
+
+        //copyDocToNewDoc(oldid);
+        copyDocToNewDoc(oldid,true,"",true,true,"'1'",false,true,true);
+
+        log.resetParameter();
+        log.setDocId(this.id);
+        log.setDocSubject(this.docsubject);
+        log.setOperateType("12");
+        log.setOperateUserid(userid);
+        log.setUsertype(this.usertype);
+        log.setClientAddress(this.clientip);
+        log.setDocCreater(this.doccreaterid);
+        log.setDocLogInfo();
+    }
+    /**
+     * 文档复制
+     * 
+     * 触发子流程时专用，
+     * 
+     * 不复制权限，不改变状态,只复制最新版本的文档
+     * 
+     * @throws Exception
+     */
+    public void copyDocForNoRightAndNoChangeStatus() throws Exception {
+        RecordSet rs = new RecordSet();
+        int oldid = this.id;
+        this.id = getNextDocId(rs);
+        
+        //copyDocToNewDoc(oldid,true,"",true,false,"");
+		copyDocToNewDoc(oldid,true,"",true,true,"",true,true,false);
+        log.resetParameter();
+        log.setDocId(this.id);
+        log.setDocSubject(this.docsubject);
+        log.setOperateType("12");
+        log.setOperateUserid(userid);
+        log.setUsertype(this.usertype);
+        log.setClientAddress(this.clientip);
+        log.setDocCreater(this.doccreaterid);
+        log.setDocLogInfo();
+    }
+    
+    
+    /**
+     * 得到最新文档的ID+1
+     * 
+     * @param rs RecordSet对象
+     * @return 最新文档的ID+1
+     * @throws Exception
+     */
+    public synchronized int getNextDocId(RecordSet rs) throws Exception {
+//        int docindex = 0;
+//        rs.executeProc("SequenceIndex_SelectNextID", "docid");
+//        if (rs.next())
+//            docindex = rs.getInt(1);
+        
+        int docindex=docIdUpdate.getDocNewId();
+
+        return docindex;
+    }
+
+    /**
+     * 得到最新文档Edition的ID+1
+     * 
+     * @param rs RecordSet对象
+     * @return 最新文档Edition的ID+1
+     * @throws Exception
+     */
+    public synchronized int getNextEditionId(RecordSet rs) throws Exception {
+        int docindex = 0;
+        rs.executeProc("SequenceIndex_SelectNextID", "doceditionid");
+        if (rs.next())
+            docindex = rs.getInt(1);
+
+        return docindex;
+    }
+    
+    /**
+     * 让文档的回复数自动加1
+     * 
+     * @param rs RecordSet对象
+     * @throws Exception
+     */
+    public void AddReplayDocCount(RecordSet rs) throws Exception {
+        String pare = this.parentids;
+        String sql = "update docdetail set replaydoccount=replaydoccount+1 where id in (" + pare + ")";
+        rs.executeSql(sql);
+    }
+
+    /**
+     * 据文档id得其parentids，再据parentids对其前级ＩＤ减１
+     * 
+     * @throws Exception
+     */
+    public void DeleteReplayDocCount() throws Exception {
+        RecordSet recordersql = new RecordSet();
+
+        int replydoccount = 1;
+        String pare = "";
+        String maindoc = "";
+        int docid = this.id;
+
+        String sql = "select maindoc, parentids from docdetail where id=" + docid;
+        recordersql.executeSql(sql);
+        if (recordersql.next()) {
+            pare = recordersql.getString("parentids");
+            maindoc = recordersql.getString("maindoc");
+        }
+        //TD19610
+		if(pare!=null&&!pare.equals("")){
+	        //是否是最新版本的删除，老版本删除不对前级ID处理
+	        if(("" + docid).equals(maindoc)) {
+		        String sql2 = "update docdetail set replaydoccount=replaydoccount-" + replydoccount + " where id in (" + pare
+		                + ")" + " and replaydoccount > 0";
+		        recordersql.executeSql(sql2);
+        	}
+        }
+    }
+
+    /**
+     * 添加文档的共享信息
+     * 
+     * @throws Exception
+     */
+    public void AddShareInfo() throws Exception {
+        char flag = Util.getSeparator();
+        RecordSet recordersql = new RecordSet();
+        RecordSet recordsql = new RecordSet();
+        String secid = "" + this.seccategory;
+        
+        AppDetachComInfo adci = new AppDetachComInfo();
+
+            //recorder.executeProc("DocSecCategoryShare_SBySecCate", secid);
+			recordersql.executeSql(" select * from DocSecCategoryShare where seccategoryid  = "+secid);
+            while (recordersql.next()) {
+                String ProcPara = "";
+
+                String docid = "" + this.id;
+                String sharetype = Util.null2String(recordersql.getString("sharetype"));
+                String seclevel = Util.null2String(recordersql.getString("seclevel"));
+                String rolelevel = Util.null2String(recordersql.getString("rolelevel"));
+                String sharelevel = Util.null2String(recordersql.getString("sharelevel"));
+                String userid = Util.null2String(recordersql.getString("userid"));
+                String subcompanyid = Util.null2String(recordersql.getString("subcompanyid"));
+                String departmentid = Util.null2String(recordersql.getString("departmentid"));
+                String roleid = Util.null2String(recordersql.getString("roleid"));
+                String foralluser = Util.null2String(recordersql.getString("foralluser"));
+                String crmid = Util.null2String(recordersql.getString("crmid"));
+                String orgGroupId = Util.null2String(recordersql.getString("orgGroupId"));
+
+				String operategroup = Util.null2String(recordersql.getString("operategroup"));
+				int orgid = Util.getIntValue(recordersql.getString("orgid"),0);
+				int seclevelmax = Util.getIntValue(recordersql.getString("seclevelmax"),255);
+				int includesub = Util.getIntValue(recordersql.getString("includesub"),0);
+				String custype = Util.null2String(recordersql.getString("custype"));
+				String allmanagers="0";
+				String joblevel=Util.getIntValue(recordersql.getString("joblevel"),0)+"";
+				String jobdepartment=Util.getIntValue(recordersql.getString("jobdepartment"),0)+"";
+				String jobsubcompany=Util.getIntValue(recordersql.getString("jobsubcompany"),0)+"";
+				String jobids=Util.getIntValue(recordersql.getString("jobids"),0)+"";
+				if(operategroup.equals("1")){
+					userid = "" + this.userid;
+					if(!this.docCreaterType.equals("1")){					
+					  continue;
+					}
+				  if(Util.null2String(recordersql.getString("sharetype")).equals("1")){
+					  sharetype="80";				  
+				  }else if(Util.null2String(recordersql.getString("sharetype")).equals("2")){
+					  sharetype="81";						  
+				  }else if(Util.null2String(recordersql.getString("sharetype")).equals("3")){
+					  sharetype="81";
+					  allmanagers="1";
+				  }else if(Util.null2String(recordersql.getString("sharetype")).equals("4")){
+					  sharetype="84";					 
+				  }else if(Util.null2String(recordersql.getString("sharetype")).equals("5")){
+					  sharetype="85";					 
+				  }else if(Util.null2String(recordersql.getString("sharetype")).equals("6")){
+					  sharetype="11";
+					  jobids=Util.getIntValue(hrc.getJobTitle(userid),0)+"";
+					  jobsubcompany=Util.getIntValue(hrc.getSubCompanyID(userid),0)+"";
+					  jobdepartment=Util.getIntValue(this.docdepartmentid+"",0)+"";
+
+					
+				  }
+				
+				}else if(operategroup.equals("2")){
+
+				   userid = "" + this.userid;
+				   if(!this.docCreaterType.equals("2")){					
+					  continue;
+					}
+				  if(Util.null2String(recordersql.getString("sharetype")).equals("1")){
+					  sharetype="-80";				  
+				  }else if(Util.null2String(recordersql.getString("sharetype")).equals("2")){
+					  sharetype="-81";						  
+				  }
+				
+				
+				}else{
+						
+				  if(Util.null2String(recordersql.getString("sharetype")).equals("7")){
+
+					  sharetype="9";				  
+				  }else if(Util.null2String(recordersql.getString("sharetype")).equals("8")){
+
+					  sharetype="-"+custype;						  
+				  }
+				
+				}
+				
+
+
+                if (sharetype.equals("3") && departmentid.equals("0"))
+                    departmentid = "" + docdepartmentid;
+
+                
+        		List scopes = adci.getAppDetachScopes(this.userid+"");
+            	
+                
+		                ProcPara = docid;
+		                ProcPara += flag + sharetype;
+		                ProcPara += flag + seclevel;
+		                ProcPara += flag + rolelevel;
+		                ProcPara += flag + sharelevel;
+		                ProcPara += flag + userid;
+		                ProcPara += flag + subcompanyid;
+		                ProcPara += flag + departmentid;
+		                ProcPara += flag + roleid;
+		                ProcPara += flag + foralluser;
+		                ProcPara += flag + crmid; // CRMID
+		                ProcPara += flag + orgGroupId; // orgGroupId
+		
+		                //record.executeProc("DocShare_IFromDocSecCategory", ProcPara);
+		                /** TD12005  =========文档下载权限 开始=============*/
+		                String downloadlevel = String.valueOf(Util.getIntValue(recordersql.getString("downloadlevel"), 0));//TD12005
+		                ProcPara += flag + downloadlevel; // 文档下载权限
+		                /** TD12005  =========文档下载权限 结束=============*/
+		                recordsql.executeProc("DocShare_IFromDocSecCat_G", ProcPara);                
+		                recordsql.next();
+		                int shareid = recordsql.getInt(1);		             
+		               recordsql.executeSql("update docshare set isSecDefaultShare=1,allmanagers='"+allmanagers+"',includesub='"+includesub+"', orgid='"+orgid+"',seclevelmax='"+seclevelmax+"',joblevel='"+joblevel+"',jobdepartment='"+jobdepartment+"',jobsubcompany='"+jobsubcompany+"',jobids='"+jobids+"' where id=" + shareid);
+            	
+            }
+           // setAboutCreaterShare(secid);
+      
+            // 得到实际回复的文档ID,是指被回复文档,而不是主文档,保留主文档的相关共享
+            String realReplyDocId = "";
+            if (parentids != null) {
+                String tempStrs[] = Util.TokenizerString2(parentids, ",");
+                if (tempStrs.length >= 2)
+                    realReplyDocId = tempStrs[tempStrs.length - 2];
+            }
+			if(!realReplyDocId.equals("")){
+            recordersql.executeProc("DocShare_SelectByDocId", "" + realReplyDocId);
+            // recorder.executeProc("DocShare_SelectByDocId", "" + replydocid);
+			
+            while (recordersql.next()) {
+                String ProcPara = "";
+                String docid = "" + this.id;
+                String sharetype = Util.null2String(recordersql.getString("sharetype"));
+                String seclevel = Util.null2String(recordersql.getString("seclevel"));
+                String rolelevel = Util.null2String(recordersql.getString("rolelevel"));
+                String sharelevel = Util.null2String(recordersql.getString("sharelevel"));
+                String userid = Util.null2String(recordersql.getString("userid"));
+                String subcompanyid = Util.null2String(recordersql.getString("subcompanyid"));
+                String departmentid = Util.null2String(recordersql.getString("departmentid"));
+                String roleid = Util.null2String(recordersql.getString("roleid"));
+                String foralluser = Util.null2String(recordersql.getString("foralluser"));
+                String crmid = Util.null2String(recordersql.getString("crmid"));
+                String orgGroupId = Util.null2String(recordersql.getString("orgGroupId"));
+
+				int orgid = Util.getIntValue(recordersql.getString("orgid"),0);
+				int seclevelmax = Util.getIntValue(recordersql.getString("seclevelmax"),255);
+				int includesub = Util.getIntValue(recordersql.getString("includesub"),0);
+				int allmanagers = Util.getIntValue(recordersql.getString("allmanagers"),0);
+				String downloadlevel = Util.null2String(recordersql.getString("downloadlevel"));
+
+
+                if ("80".equals(sharetype)) { // 本人
+                    sharetype = "1";
+
+                    String strtempSql = "select count(id) from docshare where docid='" + docid
+                            + "' and  sharetype=1 and userid=" + userid + " and sharelevel=" + sharelevel;
+                    recordsql.executeSql(strtempSql);
+                    if (recordsql.next()) {
+                        if (recordsql.getInt(1) > 0)
+                            continue;
+                    }
+                } else if ("81".equals(sharetype)) { // 上级
+					 sharetype = "1";
+					if(orgid==0){
+                    if(allmanagers==0){
+                    userid = hrc.getManagerID(userid);
+                    
+                    if(Util.getIntValue(userid,-1)<=0){
+                    	continue;
+                    }
+
+                    String strtempSql = "select count(id) from docshare where docid=" + docid
+                            + " and  sharetype=1 and userid=" + userid + " and sharelevel=" + sharelevel+"  and allmanagers=0";
+                    recordsql.executeSql(strtempSql);
+                    if (recordsql.next()) {
+                        if (recordsql.getInt(1) > 0)
+                            continue;
+                    }
+					}else if(allmanagers==1){
+                      String managerids= hrc.getManagersIDs(""+userid);
+					  if(managerids.equals("")){
+					            continue;
+					      }
+					  String[] shareids = Util.TokenizerString2(managerids, ",");
+	                  for(int i=0;i<shareids.length;i++){
+
+						   String strtempSql = "select count(id) from docshare where docid=" + docid
+                            + " and  sharetype=1 and userid=" + shareids[i] + " and sharelevel=" + sharelevel+"  and allmanagers=0";
+                    recordsql.executeSql(strtempSql);
+                    if (recordsql.next()) {
+                        if (recordsql.getInt(1) > 0)
+                            continue;
+                    }
+
+
+					ProcPara = docid;
+                    ProcPara += flag + sharetype;
+                    ProcPara += flag + seclevel;
+                    ProcPara += flag + rolelevel;
+                    ProcPara += flag + sharelevel;
+                    ProcPara += flag + shareids[i];
+                    ProcPara += flag + subcompanyid;
+                    ProcPara += flag + departmentid;
+                    ProcPara += flag + roleid;
+                    ProcPara += flag + foralluser;
+                    ProcPara += flag + crmid; // CRMID
+                    ProcPara += flag + orgGroupId; // orgGroupId
+
+                    //record.executeProc("DocShare_IFromDocSecCategory", ProcPara);
+                    /** TD12005  =========文档下载权限 开始=============*/
+                     downloadlevel = String.valueOf(Util.getIntValue(recordersql.getString("downloadlevel"), 0));//TD12005
+                    ProcPara += flag + downloadlevel; // 文档下载权限
+                    /** TD12005  =========文档下载权限 结束=============*/
+                    recordsql.executeProc("DocShare_IFromDocSecCat_G", ProcPara);               
+                    recordsql.next();
+                    int shareid = recordsql.getInt(1);
+                     recordsql.executeSql("update docshare set isSecDefaultShare=1,allmanagers=0,includesub='"+includesub+"', orgid=0,seclevelmax='"+seclevelmax+"' where id=" + shareid);
+                	
+					  
+					  }
+                    
+					continue;
+					
+					}
+					}else if(orgid<0){
+					 recordsql.executeSql("select * from HrmResourceVirtual where virtualtype= "+orgid+" and resourceid="+userid);
+                     String managerids2="";
+					 if(recordsql.next()){
+					   userid = recordsql.getString("managerid");
+					   managerids2=recordsql.getString("managerstr");
+					 }
+					
+
+						 if(allmanagers==0){
+							 if(userid.equals("")){
+					            continue;
+					          }
+							 String strtempSql = "select count(id) from docshare where docid=" + docid
+                            + " and  sharetype=1 and userid=" + userid + " and sharelevel=" + sharelevel+"  and allmanagers=0";
+                    recordsql.executeSql(strtempSql);
+                    if (recordsql.next()) {
+                        if (recordsql.getInt(1) > 0)
+                            continue;
+                    }
+						 
+						 
+					 }else if(allmanagers==1){
+						    if(managerids2.equals("")){
+					            continue;
+					          }
+
+					String[] shareids = Util.TokenizerString2(managerids2, ",");
+	                  for(int i=0;i<shareids.length;i++){
+
+						   String strtempSql = "select count(id) from docshare where docid=" + docid
+                            + " and  sharetype=1 and userid=" + shareids[i] + " and sharelevel=" + sharelevel+"  and allmanagers=0";
+                    recordsql.executeSql(strtempSql);
+                    if (recordsql.next()) {
+                        if (recordsql.getInt(1) > 0)
+                            continue;
+                    }
+
+
+					ProcPara = docid;
+                    ProcPara += flag + sharetype;
+                    ProcPara += flag + seclevel;
+                    ProcPara += flag + rolelevel;
+                    ProcPara += flag + sharelevel;
+                    ProcPara += flag + shareids[i];
+                    ProcPara += flag + subcompanyid;
+                    ProcPara += flag + departmentid;
+                    ProcPara += flag + roleid;
+                    ProcPara += flag + foralluser;
+                    ProcPara += flag + crmid; // CRMID
+                    ProcPara += flag + orgGroupId; // orgGroupId
+
+                    //record.executeProc("DocShare_IFromDocSecCategory", ProcPara);
+                    /** TD12005  =========文档下载权限 开始=============*/
+                     downloadlevel = String.valueOf(Util.getIntValue(recordersql.getString("downloadlevel"), 0));//TD12005
+                    ProcPara += flag + downloadlevel; // 文档下载权限
+                    /** TD12005  =========文档下载权限 结束=============*/
+                    recordsql.executeProc("DocShare_IFromDocSecCat_G", ProcPara);               
+                    recordsql.next();
+                    int shareid = recordsql.getInt(1);
+                     recordsql.executeSql("update docshare set isSecDefaultShare=1,allmanagers=0,includesub='"+includesub+"', orgid=0,seclevelmax='"+seclevelmax+"' where id=" + shareid);
+                	
+					  
+					  }
+                    
+					continue;
+						 
+				   }
+					
+					
+					
+				 }
+                } else if ("84".equals(sharetype)) { // 同分部
+                    sharetype = "2";
+					if(orgid==0){
+                    subcompanyid = Util.null2String(dci.getSubcompanyid1(hrc.getDepartmentID(userid)));
+					
+					}else if(orgid<0){
+					 recordsql.executeSql("select * from HrmResourceVirtual where virtualtype= "+orgid+" and resourceid="+userid);
+					 if(recordsql.next()){
+					 subcompanyid = recordsql.getString("subcompanyid");
+					  
+					 }
+					
+					}
+
+					if(subcompanyid.equals("")||subcompanyid.equals("0")){
+					            continue;
+					      }
+
+                    String strtempSql = "select count(id) from docshare where docid=" + docid
+                            + " and  sharetype=2 and subcompanyid=" + subcompanyid + "" + " and seclevel=" + seclevel+" and seclevelmax='"+seclevelmax+"' and includesub='"+includesub+"'"
+                            + " and sharelevel=" + sharelevel;
+                    recordsql.executeSql(strtempSql);
+                    if (recordsql.next()) {
+                        if (recordsql.getInt(1) > 0)
+                            continue;
+                    }
+                } else if ("85".equals(sharetype)) { // 同部门
+                    sharetype = "3";
+					if(orgid==0){
+                    departmentid = Util.null2String(hrc.getDepartmentID(userid));
+					
+					}else if(orgid<0){
+					   recordsql.executeSql("select * from HrmResourceVirtual where virtualtype= "+orgid+" and resourceid="+userid);
+					   if(recordsql.next()){
+					    departmentid = recordsql.getString("departmentid");
+						
+					   }
+					
+					}
+					 if(departmentid.equals("")||departmentid.equals("0")){
+					            continue;
+					      }
+
+                    String strtempSql = "select count(id) from docshare where docid=" + docid
+                            + " and  sharetype=3 and departmentid=" + departmentid + "" + " and seclevel=" + seclevel+" and seclevelmax='"+seclevelmax+"' and includesub='"+includesub+"'"
+                            + " and sharelevel=" + sharelevel;
+                    recordsql.executeSql(strtempSql);
+                    if (recordsql.next()) {
+                        if (recordsql.getInt(1) > 0)
+                            continue;
+                    }
+                } else if ("-80".equals(sharetype)) { // 创建人本人
+                    sharetype = "9";
+                    crmid = userid;
+
+                    String strtempSql = "select count(id) from docshare where docid=" + docid
+                            + " and  sharetype=9 and crmid=" + crmid + " and sharelevel=" + sharelevel;
+                    recordsql.executeSql(strtempSql);
+                    if (recordsql.next()) {
+                        if (recordsql.getInt(1) > 0)
+                            continue;
+                    }
+                } else if ("-81".equals(sharetype)) { // 创建人经理
+                    sharetype = "1";
+                    userid = cici.getCustomerInfomanager(userid);
+
+                    String strtempSql = "select count(id) from docshare where docid=" + docid
+                            + " and  sharetype=1 and userid=" + userid + " and sharelevel=" + sharelevel;
+                    recordsql.executeSql(strtempSql);
+                    if (recordsql.next()) {
+                        if (recordsql.getInt(1) > 0)
+                            continue;
+                    }
+                } else{ 
+				    String strtempSql="";
+					if("4".equals(sharetype)){
+					 strtempSql = "select count(id) from docshare where docid='" +docid+ "' and  sharetype='"+sharetype+"' and rolelevel='"+rolelevel+"' and userid='"+userid+"' and subcompanyid='"+subcompanyid+"' and departmentid='" + departmentid + "' and roleid='"+roleid+"' and"+"  foralluser='"+foralluser+"' and crmid='"+crmid+"' and orgGroupid='"+orgGroupId+"' and downloadlevel='"+downloadlevel+"' and seclevel='" + seclevel+"' and seclevelmax='"+seclevelmax+"' and includesub='"+includesub+"'"+ " and sharelevel='" + sharelevel+"' and allmanagers='"+allmanagers+"'";
+                       
+					}else if("1".equals(sharetype)||"9".equals(sharetype)){
+					 strtempSql = "select count(id) from docshare where docid='" +docid+ "' and  sharetype='"+sharetype+"' and userid='"+userid+"' and subcompanyid='"+subcompanyid+"' and departmentid='" + departmentid + "' and roleid='"+roleid+"' and"+"  foralluser='"+foralluser+"' and crmid='"+crmid+"' and orgGroupid='"+orgGroupId+"' and downloadlevel='"+downloadlevel+"' and includesub='"+includesub+"'"+ " and sharelevel='" + sharelevel+"' and allmanagers='"+allmanagers+"'";
+				    }else{
+                     strtempSql = "select count(id) from docshare where docid='" +docid+ "' and  sharetype='"+sharetype+"' and userid='"+userid+"' and subcompanyid='"+subcompanyid+"' and departmentid='" + departmentid + "' and roleid='"+roleid+"' and"+"  foralluser='"+foralluser+"' and crmid='"+crmid+"' and orgGroupid='"+orgGroupId+"' and downloadlevel='"+downloadlevel+"' and seclevel='" + seclevel+"' and seclevelmax='"+seclevelmax+"' and includesub='"+includesub+"'"+ " and sharelevel='" + sharelevel+"' and allmanagers='"+allmanagers+"'";
+                    }
+					recordsql.executeSql(strtempSql);			
+                    if (recordsql.next()) {
+                        if (recordsql.getInt(1) > 0)
+                            continue;
+                    }
+				}
+
+                
+            		
+        		List scopes = adci.getAppDetachScopes(this.userid+"");
+            	if(sharetype.equals("5")&&scopes!=null&&scopes.size()>0){
+
+        			for(int i=0;i<scopes.size();i++) {
+        				Map scope = (Map) scopes.get(i);
+        				sharetype = (String)scope.get("type");
+        				
+        				userid = "0" ;
+        				departmentid = "0" ;
+        				subcompanyid="0";
+        				roleid = "0" ;
+        				rolelevel = Util.null2o((String)scope.get("rolelevel"));
+        				if(sharetype.equals("1")) userid = (String)scope.get("content");
+        				if(sharetype.equals("2")) subcompanyid = (String)scope.get("content");
+        				if(sharetype.equals("3")) departmentid = (String)scope.get("content");
+        				if(sharetype.equals("4")) roleid = (String)scope.get("content");
+        		
+                        ProcPara = docid;
+                        ProcPara += flag + sharetype;
+                        ProcPara += flag + seclevel;
+                        ProcPara += flag + rolelevel;
+                        ProcPara += flag + sharelevel;
+                        ProcPara += flag + userid;
+                        ProcPara += flag + subcompanyid;
+                        ProcPara += flag + departmentid;
+                        ProcPara += flag + roleid;
+                        ProcPara += flag + foralluser;
+                        ProcPara += flag + crmid; // CRMID
+                        ProcPara += flag + orgGroupId; // orgGroupId
+
+                        //record.executeProc("DocShare_IFromDocSecCategory", ProcPara);
+                        /** TD12005  =========文档下载权限 开始=============*/
+                         downloadlevel = String.valueOf(Util.getIntValue(recordersql.getString("downloadlevel"), 0));//TD12005
+                        ProcPara += flag + downloadlevel; // 文档下载权限
+                        /** TD12005  =========文档下载权限 结束=============*/
+                        recordsql.executeProc("DocShare_IFromDocSecCat_G", ProcPara);               
+                        recordsql.next();
+                        int shareid = recordsql.getInt(1);
+                        recordsql.executeSql("update docshare set isSecDefaultShare=1,allmanagers='"+allmanagers+"',includesub='"+includesub+"', orgid='"+orgid+"',seclevelmax='"+seclevelmax+"' where id=" + shareid);
+        			}
+        		}else{
+
+                    
+                    ProcPara = docid;
+                    ProcPara += flag + sharetype;
+                    ProcPara += flag + seclevel;
+                    ProcPara += flag + rolelevel;
+                    ProcPara += flag + sharelevel;
+                    ProcPara += flag + userid;
+                    ProcPara += flag + subcompanyid;
+                    ProcPara += flag + departmentid;
+                    ProcPara += flag + roleid;
+                    ProcPara += flag + foralluser;
+                    ProcPara += flag + crmid; // CRMID
+                    ProcPara += flag + orgGroupId; // orgGroupId
+
+                    //record.executeProc("DocShare_IFromDocSecCategory", ProcPara);
+                    /** TD12005  =========文档下载权限 开始=============*/
+                     downloadlevel = String.valueOf(Util.getIntValue(recordersql.getString("downloadlevel"), 0));//TD12005
+                    ProcPara += flag + downloadlevel; // 文档下载权限
+                    /** TD12005  =========文档下载权限 结束=============*/
+                    recordsql.executeProc("DocShare_IFromDocSecCat_G", ProcPara);               
+                    recordsql.next();
+                    int shareid = recordsql.getInt(1);
+                    recordsql.executeSql("update docshare set isSecDefaultShare=1,allmanagers='"+allmanagers+"',includesub='"+includesub+"', orgid='"+orgid+"',seclevelmax='"+seclevelmax+"' where id=" + shareid);
+                	
+        		}
+            }
+
+          }
+          //  setAboutCreaterShare(secid);
+    }
+
+    /**
+     * 新建人力资源合同信息
+     * 
+     * @throws Exception
+     */
+    private void addHrmContract() throws Exception {
+        int docid = 0;
+        String sql1 = "select max(id) from DocDetail where doccreaterid=? and doccreatertype=?";
+        RecordSet stat1 = new RecordSet();
+        String sql = "insert into HrmContract(contractname,contractman,contracttypeid,contractstartdate,contractenddate,contractdocid,proenddate) values (?,?,?,?,?,?,?)";
+        RecordSet stat = new RecordSet();
+        String sqlhrm = "update HrmResource set startdate = ? , enddate = ? ,probationenddate = ? where id = ?";
+        RecordSet stathrm = new RecordSet();
+        try {
+            stat1.executeQuery(sql1,doccreaterid,docCreaterType);
+            while (stat1.next()) {
+                docid = stat1.getInt(1);
+            }
+
+            stat.executeUpdate(sql,docsubject,Util.getIntValue(this.contractman, 0),typeid,contractstartdate,contractenddate,docid,proenddate);
+
+            SysMaintenanceLog.resetParameter();
+            SysMaintenanceLog.setRelatedId(docid);
+            SysMaintenanceLog.setRelatedName(this.docsubject);
+            SysMaintenanceLog.setOperateType("1");
+            SysMaintenanceLog.setOperateDesc("HrmContract_Insert,"+this.docsubject+Util.getIntValue(this.contractman, 0));
+            SysMaintenanceLog.setOperateItem("105");
+            SysMaintenanceLog.setOperateUserid(this.userid);
+            SysMaintenanceLog.setClientAddress(this.clientip);
+            SysMaintenanceLog.setSysLogInfo();
+
+            if (ctci.isHireContract(this.typeid)) {
+                stathrm.executeUpdate(sqlhrm,contractstartdate,contractenddate,proenddate,Util.getIntValue(this.contractman, 0));
+            }
+
+        } catch (Exception e) {
+            writeLog(e);
+            writeLog(sql);
+        } finally {
+        }
+    }
+
+    /**
+     * 编辑人力资源合同信息
+     * 
+     * @throws Exception
+     */
+    private void editHrmContract(String conId) throws Exception {
+        String sql = "update HrmContract set contractname = ?,contractman = ?,contracttypeid = ?,contractstartdate = ?,contractenddate = ? ,proenddate = ? where contractdocid = ? ";
+        String sql_HrmContractId = "update HrmContract set contractname = ?,contractman = ?,contracttypeid = ?,contractstartdate = ?,contractenddate = ? ,proenddate = ?,contractdocid = ? where id=?";       
+        RecordSet stat = new RecordSet();
+        String sqlhrm = "update HrmResource set startdate = ? , enddate = ? ,probationenddate = ? where id = ?";
+        RecordSet stathrm = new RecordSet();
+        try {
+        	this.hrmContractId = this.id;
+        	if(hrmContractId>0){
+                stat.executeUpdate(sql_HrmContractId
+                		, this.docsubject
+		                , Util.getIntValue(this.contractman, 0)
+		                , this.typeid
+		                , this.contractstartdate
+		                , this.contractenddate
+		                , this.proenddate
+		                , this.hrmContractId
+		                , Util.getIntValue(conId,this.id)
+                		);         		
+        	}else{
+                
+                stat.executeUpdate(sql
+                		, this.docsubject
+		                , Util.getIntValue(this.contractman, 0)
+		                , this.typeid
+		                , this.contractstartdate
+		                , this.contractenddate
+		                , this.proenddate
+		                , Util.getIntValue(conId,this.id)
+                		);        		
+        	}
+  
+            SysMaintenanceLog.resetParameter();
+            SysMaintenanceLog.setRelatedId(this.id);
+            SysMaintenanceLog.setRelatedName(this.docsubject);
+            SysMaintenanceLog.setOperateType("2");
+            SysMaintenanceLog.setOperateDesc("HrmContract_Edit,"+this.docsubject+Util.getIntValue(this.contractman, 0));
+            SysMaintenanceLog.setOperateItem("105");
+            SysMaintenanceLog.setOperateUserid(this.userid);
+            SysMaintenanceLog.setClientAddress(this.clientip);
+            SysMaintenanceLog.setSysLogInfo();
+
+            if (ctci.isHireContract(this.typeid)) {
+                stathrm.executeUpdate(sqlhrm
+                		, this.contractstartdate
+		                , this.contractenddate
+		                , this.proenddate
+		                , Util.getIntValue(this.contractman, 0)
+		                );
+            }
+        } catch (Exception e) {
+            writeLog(e);
+            writeLog(sql);
+        } finally {
+        }
+    }
+
+    /**
+     * 删除人力资源合同信息
+     * 
+     * @throws Exception
+     */
+    private synchronized void deleteHrmContract() throws Exception {
+        String sql = "delete from HrmContract where contractdocid = " + this.id;
+        RecordSet rssql = new RecordSet();
+        try {
+            rssql.executeSql(sql);
+
+            SysMaintenanceLog.resetParameter();
+            SysMaintenanceLog.setRelatedId(this.id);
+            SysMaintenanceLog.setRelatedName(this.docsubject);
+            SysMaintenanceLog.setOperateType("3");
+            SysMaintenanceLog.setOperateDesc("HrmContract_del,"+this.docsubject+Util.getIntValue(this.contractman, 0));
+            SysMaintenanceLog.setOperateItem("105");
+            SysMaintenanceLog.setOperateUserid(this.userid);
+            SysMaintenanceLog.setClientAddress(this.clientip);
+            SysMaintenanceLog.setSysLogInfo();
+
+        } catch (Exception e) {
+            writeLog(e);
+        }
+    }
+
+    /**
+     * 得到文档是否可被订阅
+     * 
+     * @return 文档是否可被订阅
+     */
+    public String getOrderable() {
+        return orderable;
+    }
+
+    /**
+     * 设置文档是否可被订阅
+     * 
+     * @param orderable 文档是否可被订阅
+     */
+    public void setOrderable(String orderable) {
+        this.orderable = orderable;
+    }
+
+    /*
+     * 修改与创建人相关的默认共享 80:创建人本人 81:创建人直接上级 82:创建人间接上级 83:创建人下属 84:创建人同分部成员 85:创建人同部门成员 -80:外部用户创建人本人 -81:外部用户创建人经理
+     * -82:外部用户创建人经理的上级
+     */
+    /**
+     * 添加文档所在目录的默认共享
+     * 
+     * @param secId 分目录ID
+     */
+    public void setAboutCreaterShare(String secId) {
+        int docId = this.id;
+        String userId = "" + this.userid;
+        RecordSet rsCreater = new RecordSet();
+        char flag = 2;
+        String ProcPara = "";
+
+        String sharetype = "0";
+        String seclevel = "0";
+        String rolelevel = "0";
+        String sharelevel = "0";
+        String subcompanyid = "0";
+        String departmentid = "0";
+        String roleid = "0";
+        String foralluser = "0";
+        String crmId = "0";
+        String orgGroupId = "0";
+
+        int PCreater = 3;
+        int PCreaterManager = 1;
+        int PCreaterSubComp = 0;
+        int PCreaterDepart = 0;
+        int PCreaterSubCompLS = 0;
+        int PCreaterDepartLS = 0;
+
+        int PCreaterW = 3;
+        int PCreaterManagerW = 1;
+
+        /** TD12005 开始*/
+        String PCreaterDL = "1";
+        String PCreaterManagerDL = "1";
+        String PCreaterSubCompDL = "0";
+        String PCreaterDepartDL = "0";
+        String PCreaterWDL = "1";
+        String PCreaterManagerWDL = "1";
+        /** TD12005 结束*/
+        
+        String strCreaterSql = "select * from secCreaterDocPope where secid=" + secId;
+        rsCreater.executeSql(strCreaterSql);
+        if (rsCreater.next()) {
+            PCreater = rsCreater.getInt("PCreater");
+            PCreaterManager = rsCreater.getInt("PCreaterManager");
+            PCreaterSubComp = rsCreater.getInt("PCreaterSubComp");
+            PCreaterDepart = rsCreater.getInt("PCreaterDepart");
+
+            PCreaterSubCompLS = rsCreater.getInt("PCreaterSubCompLS"); // 安全级别开始数
+            PCreaterDepartLS = rsCreater.getInt("PCreaterDepartLS");
+
+            PCreaterW = rsCreater.getInt("PCreaterW");
+            PCreaterManagerW = rsCreater.getInt("PCreaterManagerW");
+            /** TD12005 开始*/
+            PCreaterDL = String.valueOf(Util.getIntValue(rsCreater.getString("PCreaterDL"), 1));
+            PCreaterManagerDL = String.valueOf(Util.getIntValue(rsCreater.getString("PCreaterManagerDL"), 1));
+            PCreaterSubCompDL = String.valueOf(Util.getIntValue(rsCreater.getString("PCreaterSubCompDL"), 0));
+            PCreaterDepartDL = String.valueOf(Util.getIntValue(rsCreater.getString("PCreaterDepartDL"), 0));
+            PCreaterWDL = String.valueOf(Util.getIntValue(rsCreater.getString("PCreaterWDL"), 1));
+            PCreaterManagerWDL = String.valueOf(Util.getIntValue(rsCreater.getString("PCreaterManagerWDL"), 1));
+            /** TD12005 结束*/
+        }
+
+        // 权限 0: 无权限 1:查看权限 2:编辑权限 3:完全控制权限(包括删除等权限)
+        if ("1".equals(this.usertype)) {
+            // 1 对创建者本人的处理 (shareType:80)
+            sharetype = "80";
+
+            switch (PCreater) {
+                case 0:
+                    break;
+                case 1:
+                    sharelevel = "1";
+                    break;
+                case 2:
+                    sharelevel = "2";
+                    break;
+                case 3:
+                    sharelevel = "3";
+                    break;
+            }
+            if (PCreater != 0) {
+                ProcPara = "" + docId;
+                ProcPara += flag + sharetype;
+                ProcPara += flag + seclevel;
+                ProcPara += flag + rolelevel;
+                ProcPara += flag + sharelevel;
+                ProcPara += flag + userId;
+                ProcPara += flag + subcompanyid;
+                ProcPara += flag + departmentid;
+                ProcPara += flag + roleid;
+                ProcPara += flag + foralluser;
+                ProcPara += flag + crmId; // CRMID
+                ProcPara += flag + orgGroupId; // orgGroupId
+
+                //rsCreater.executeProc("DocShare_IFromDocSecCategory", ProcPara);
+                /** TD12005 开始*/
+                ProcPara += flag + PCreaterDL;
+                /** TD12005 结束*/
+                rsCreater.executeProc("DocShare_IFromDocSecCat_G", ProcPara);                
+                rsCreater.next();
+                int shareid = rsCreater.getInt(1);
+                rsCreater.executeSql("update docshare set isSecDefaultShare=1 where id=" + shareid);
+
+            }
+
+            // 2 对创建者直接上级的处理 (shareType:81)
+            sharetype = "81";
+            switch (PCreaterManager) {
+                case 0:
+                    break;
+                case 1:
+                    sharelevel = "1";
+                    break;
+                case 2:
+                    sharelevel = "2";
+                    break;
+                case 3:
+                    sharelevel = "3";
+                    break;
+            }
+            if (PCreaterManager != 0) {
+                ProcPara = "" + docId;
+                ProcPara += flag + sharetype;
+                ProcPara += flag + seclevel;
+                ProcPara += flag + rolelevel;
+                ProcPara += flag + sharelevel;
+                ProcPara += flag + userId;
+                ProcPara += flag + subcompanyid;
+                ProcPara += flag + departmentid;
+                ProcPara += flag + roleid;
+                ProcPara += flag + foralluser;
+                ProcPara += flag + crmId; // CRMID
+                ProcPara += flag + orgGroupId;
+                /** TD12005 开始*/
+//              rsCreater.executeProc("DocShare_IFromDocSecCategory", ProcPara);
+                ProcPara += flag + PCreaterManagerDL;
+                rsCreater.executeProc("DocShare_IFromDocSecCategoryDL", ProcPara);
+                /** TD12005 结束*/
+                rsCreater.next();
+                int shareid = rsCreater.getInt(1);
+                rsCreater.executeSql("update docshare set isSecDefaultShare=1 where id=" + shareid);
+            }
+            // 5 对创建者同分部的处理 (shareType:84)
+            sharetype = "84";
+            switch (PCreaterSubComp) {
+                case 0:
+                    break;
+                case 1:
+                    sharelevel = "1";
+                    break;
+                case 2:
+                    sharelevel = "2";
+                    break;
+                case 3:
+                    sharelevel = "3";
+                    break;
+            }
+            if (PCreaterSubComp != 0) {
+                ProcPara = "" + docId;
+                ProcPara += flag + sharetype;
+                ProcPara += flag + "" + PCreaterSubCompLS;
+                ProcPara += flag + rolelevel;
+                ProcPara += flag + sharelevel;
+                ProcPara += flag + userId;
+                ProcPara += flag + subcompanyid;
+                ProcPara += flag + departmentid;
+                ProcPara += flag + roleid;
+                ProcPara += flag + foralluser;
+                ProcPara += flag + crmId; // CRMID
+                ProcPara += flag + orgGroupId;
+                /** TD12005 开始*/
+//              rsCreater.executeProc("DocShare_IFromDocSecCategory", ProcPara);
+                ProcPara += flag + PCreaterSubCompDL;
+                rsCreater.executeProc("DocShare_IFromDocSecCategoryDL", ProcPara);
+                /** TD12005 结束*/
+                rsCreater.next();
+                int shareid = rsCreater.getInt(1);
+                rsCreater.executeSql("update docshare set isSecDefaultShare=1 where id=" + shareid);
+            }
+            // 6 对创建都同部门的处理 (shareType:85)
+            sharetype = "85";
+            switch (PCreaterDepart) {
+                case 0:
+                    break;
+                case 1:
+                    sharelevel = "1";
+                    break;
+                case 2:
+                    sharelevel = "2";
+                    break;
+                case 3:
+                    sharelevel = "3";
+                    break;
+            }
+            if (PCreaterDepart != 0) {
+                ProcPara = "" + docId;
+                ProcPara += flag + sharetype;
+                ProcPara += flag + "" + PCreaterDepartLS;
+                ProcPara += flag + rolelevel;
+                ProcPara += flag + sharelevel;
+                ProcPara += flag + userId;
+                ProcPara += flag + subcompanyid;
+                ProcPara += flag + departmentid;
+                ProcPara += flag + roleid;
+                ProcPara += flag + foralluser;
+                ProcPara += flag + crmId; // CRMID
+                ProcPara += flag + orgGroupId;
+                /** TD12005 开始*/
+//              rsCreater.executeProc("DocShare_IFromDocSecCategory", ProcPara);
+                ProcPara += flag + PCreaterDepartDL;
+                rsCreater.executeProc("DocShare_IFromDocSecCategoryDL", ProcPara);
+                /** TD12005 结束*/
+                rsCreater.next();
+                int shareid = rsCreater.getInt(1);
+                rsCreater.executeSql("update docshare set isSecDefaultShare=1 where id=" + shareid);
+            }
+        } else {
+            // 7 对外部创建者的处理 (shareType:-80)
+            sharetype = "-80";
+            switch (PCreaterW) {
+                case 0:
+                    break;
+                case 1:
+                    sharelevel = "1";
+                    break;
+                case 2:
+                    sharelevel = "2";
+                    break;
+                case 3:
+                    sharelevel = "3";
+                    break;
+            }
+            if (PCreaterW != 0) {
+                ProcPara = "" + docId;
+                ProcPara += flag + sharetype;
+                ProcPara += flag + "" + PCreaterW;
+                ProcPara += flag + rolelevel;
+                ProcPara += flag + sharelevel;
+                ProcPara += flag + userId;
+                ProcPara += flag + subcompanyid;
+                ProcPara += flag + departmentid;
+                ProcPara += flag + roleid;
+                ProcPara += flag + foralluser;
+                ProcPara += flag + crmId; // CRMID
+                ProcPara += flag + orgGroupId;
+                /** TD12005 开始*/
+//              rsCreater.executeProc("DocShare_IFromDocSecCategory", ProcPara);
+                ProcPara += flag + PCreaterWDL;
+                rsCreater.executeProc("DocShare_IFromDocSecCategoryDL", ProcPara);
+                /** TD12005 结束*/
+                rsCreater.next();
+                int shareid = rsCreater.getInt(1);
+                rsCreater.executeSql("update docshare set isSecDefaultShare=1 where id=" + shareid);
+            }
+            // 8 对外部创建者的经理的处理 (shareType:-81)
+            sharetype = "-81";
+            switch (PCreaterManagerW) {
+                case 0:
+                    break;
+                case 1:
+                    sharelevel = "1";
+                    break;
+                case 2:
+                    sharelevel = "2";
+                    break;
+                case 3:
+                    sharelevel = "3";
+                    break;
+            }
+            if (PCreaterManagerW != 0) {
+                ProcPara = "" + docId;
+                ProcPara += flag + sharetype;
+                ProcPara += flag + "" + PCreaterManagerW;
+                ProcPara += flag + rolelevel;
+                ProcPara += flag + sharelevel;
+                ProcPara += flag + userId;
+                ProcPara += flag + subcompanyid;
+                ProcPara += flag + departmentid;
+                ProcPara += flag + roleid;
+                ProcPara += flag + foralluser;
+                ProcPara += flag + crmId; // CRMID
+                ProcPara += flag + orgGroupId;
+                /** TD12005 开始*/
+//              rsCreater.executeProc("DocShare_IFromDocSecCategory", ProcPara);
+                ProcPara += flag + PCreaterManagerWDL;
+                rsCreater.executeProc("DocShare_IFromDocSecCategoryDL", ProcPara);
+                /** TD12005 结束*/
+                rsCreater.next();
+                int shareid = rsCreater.getInt(1);
+                rsCreater.executeSql("update docshare set isSecDefaultShare=1 where id=" + shareid);
+            }
+        }
+    }
+
+    /**
+     * 返回操作类型
+     * 
+     * @return 操作类型
+     */
+    public String getOpreateType() {
+        return opreateType;
+    }
+
+    /**
+     * 设置操作类型
+     * 
+     * @param opreateType
+     */
+    public void setOpreateType(String opreateType) {
+        this.opreateType = opreateType;
+    }
+
+    
+    
+    /**
+     * @return the docCancelDate
+     */
+    public String getDocCancelDate() {
+        return rs.getString("docCancelDate");
+    }
+
+    /**
+     * @return the docCancelTime
+     */
+    public String getDocCancelTime() {
+        return rs.getString("docCancelTime");
+    }
+
+    /**
+     * @return the docCancelUserId
+     */
+    public int getDocCancelUserId() {
+        return rs.getInt("docCancelUserId");
+    }
+
+    /**
+     * @return the docCode
+     */
+    public String getDocCode() {
+        return rs.getString("docCode");
+    }
+
+    /**
+     * @return the docEdition
+     */
+    public int getDocEdition() {
+        return rs.getInt("docEdition");
+    }
+
+    /**
+     * @return the docEditionId
+     */
+    public int getDocEditionId() {
+        return rs.getInt("docEditionId");
+    }
+
+    /**
+     * @return the isHistory
+     */
+    public int getIsHistory() {
+        return Util.getIntValue(rs.getString("isHistory"),0);
+    }
+    
+    /**
+     * @return the approveType
+     */
+    public int getApproveType() {
+        return Util.getIntValue(rs.getString("approveType"),0);
+    }
+    
+    /**
+     * @return the selectedPubMouldId
+     */
+    public int getSelectedPubMouldId() {
+        return Util.getIntValue(rs.getString("selectedPubMouldId"),0);
+    }
+    
+    /**
+     * @return the docInvalDate
+     */
+    public String getDocInvalDate() {
+        return rs.getString("docInvalDate");
+    }
+
+    /**
+     * @return the docInvalTime
+     */
+    public String getDocInvalTime() {
+        return rs.getString("docInvalTime");
+    }
+
+    /**
+     * @return the docInvalUserId
+     */
+    public int getDocInvalUserId() {
+        return rs.getInt("docInvalUserId");
+    }
+
+    /**
+     * @return the docReOpenDate
+     */
+    public String getDocReOpenDate() {
+        return rs.getString("docReOpenDate");
+    }
+
+    /**
+     * @return the docReOpenTime
+     */
+    public String getDocReOpenTime() {
+        return rs.getString("docReOpenTime");
+    }
+
+    /**
+     * @return the docReOpenUserId
+     */
+    public int getDocReOpenUserId() {
+        return rs.getInt("docReOpenUserId");
+    }
+
+    /**
+     * @return the docPubDate
+     */
+    public String getDocPubDate() {
+        return rs.getString("docPubDate");
+    }
+
+    /**
+     * @return the docPubTime
+     */
+    public String getDocPubTime() {
+        return rs.getString("docPubTime");
+    }
+
+    /**
+     * @return the docPubUserId
+     */
+    public int getDocPubUserId() {
+        return rs.getInt("docPubUserId");
+    }
+
+    /**
+     * @return the docValidDate
+     */
+    public String getDocValidDate() {
+        return rs.getString("docValidDate");
+    }
+
+    /**
+     * @return the docValidTime
+     */
+    public String getDocValidTime() {
+        return rs.getString("docValidTime");
+    }
+
+    /**
+     * @return the docValidUserId
+     */
+    public int getDocValidUserId() {
+        return rs.getInt("docValidUserId");
+    }
+
+    /**
+     * @return the mainDoc
+     */
+    public int getMainDoc() {
+        return rs.getInt("mainDoc");
+    }
+
+    /**
+     * @return the readOpterCanPrint
+     */
+    public int getReadOpterCanPrint() {
+        return rs.getInt("readOpterCanPrint");
+    }
+
+    /**
+     * @return the invalidationDate
+     */
+    public String getInvalidationDate() {
+        return rs.getString("invalidationdate");
+    }
+
+    
+    /**
+     * @return the checkOutStatus
+     */
+    public String getCheckOutStatus() {
+        return rs.getString("checkOutStatus");
+    }   
+    
+    /**
+     * @return the checkOutUserId
+     */
+    public int getCheckOutUserId() {
+        return rs.getInt("checkOutUserId");
+    }
+    
+    /**
+     * @return the checkOutUserType
+     */
+    public String getCheckOutUserType() {
+        return rs.getString("checkOutUserType");
+    }       
+    
+    /**
+     * @return the checkOutDate
+     */
+    public String getCheckOutDate() {
+        return rs.getString("checkOutDate");
+    }       
+    
+    /**
+     * @return the checkOutTime
+     */
+    public String getCheckOutTime() {
+        return rs.getString("checkOutTime");
+    }       
+    
+    /**
+     * @return the hasUsedTemplet  返回  是否已经套红
+     */
+    public String getHasUsedTemplet() {
+        return rs.getString("hasUsedTemplet");
+    } 
+    
+    /**
+     * @return the docCreaterType  返回  文档创建者类型（1:内部用户  2：外部用户）
+     */
+    public String getDocCreaterType() {
+        return rs.getString("docCreaterType");
+    } 
+    
+    /**
+     * @return the docLastModUserType  返回  文档最后修改者类型（1:内部用户  2：外部用户）
+     */
+    public String getDocLastModUserType() {
+        return rs.getString("docLastModUserType");
+    } 
+    
+    /**
+     * @return the docApproveUserType  返回  文档审批者类型（1:内部用户  2：外部用户）
+     */
+    public String getDocApproveUserType() {
+        return rs.getString("docApproveUserType");
+    } 
+    
+    /**
+     * @return the docValidUserType  返回  生效操作人类型（1:内部用户  2：外部用户）
+     */
+    public String getDocValidUserType() {
+        return rs.getString("docValidUserType");
+    } 
+    
+    /**
+     * @return the docInvalUserType  返回  失效操作人类型（1:内部用户  2：外部用户）
+     */
+    public String getDocInvalUserType() {
+        return rs.getString("docInvalUserType");
+    } 
+    
+    /**
+     * @return the docArchiveUserType  返回  文档归档者类型（1:内部用户  2：外部用户）
+     */
+    public String getDocArchiveUserType() {
+        return rs.getString("docArchiveUserType");
+    } 
+    
+    /**
+     * @return the docCancelUserType  返回  作废操作人类型（1:内部用户  2：外部用户）
+     */
+    public String getDocCancelUserType() {
+        return rs.getString("docCancelUserType");
+    } 
+    
+    /**
+     * @return the docPubUserType  返回  发布操作人类型（1:内部用户  2：外部用户）
+     */
+    public String getDocPubUserType() {
+        return rs.getString("docPubUserType");
+    } 
+    
+    /**
+     * @return the docReopenUserType  返回  重新打开操作人类型（1:内部用户  2：外部用户）
+     */
+    public String getDocReopenUserType() {
+        return rs.getString("docReopenUserType");
+    } 
+     
+    /**
+     * @return the ownerType  返回  文档拥有者类型（1:内部用户  2：外部用户）
+     */
+    public String getOwnerType() {
+        return rs.getString("ownerType");
+    }    
+    
+    /**
+     * @return the docCancelDate
+     */
+    public String getDocCancelDate2() {
+        return docCancelDate;
+    }
+
+    /**
+     * @return the docCancelTime
+     */
+    public String getDocCancelTime2() {
+        return docCancelTime;
+    }
+
+    /**
+     * @return the docCancelUserId
+     */
+    public int getDocCancelUserId2() {
+        return docCancelUserId;
+    }
+
+    /**
+     * @return the docCode
+     */
+    public String getDocCode2() {
+        return docCode;
+    }
+
+    /**
+     * @return the docEdition
+     */
+    public int getDocEdition2() {
+        return docEdition;
+    }
+
+    /**
+     * @return the isHistory
+     */
+    public int getIsHistory2() {
+        return isHistory;
+    }
+    
+    /**
+     * @return the approveType
+     */
+    public int getApproveType2() {
+        return approveType;
+    }
+    
+    /**
+     * @return the selectedPubMouldId
+     */
+    public int getSelectedPubMouldId2() {
+        return selectedPubMouldId;
+    }
+
+    /**
+     * @return the docEditionId
+     */
+    public int getDocEditionId2() {
+        return docEditionId;
+    }
+
+    /**
+     * @return the docInvalDate
+     */
+    public String getDocInvalDate2() {
+        return docInvalDate;
+    }
+
+    /**
+     * @return the docInvalTime
+     */
+    public String getDocInvalTime2() {
+        return docInvalTime;
+    }
+
+    /**
+     * @return the docInvalUserId
+     */
+    public int getDocInvalUserId2() {
+        return docInvalUserId;
+    }
+
+    /**
+     * @return the docReOpenDate
+     */
+    public String getDocReOpenDate2() {
+        return docReOpenDate;
+    }
+
+    /**
+     * @return the docReOpenTime
+     */
+    public String getDocReOpenTime2() {
+        return docReOpenTime;
+    }
+
+    /**
+     * @return the docReOpenUserId
+     */
+    public int getDocReOpenUserId2() {
+        return docReOpenUserId;
+    }
+
+    /**
+     * @return the docPubDate
+     */
+    public String getDocPubDate2() {
+        return docPubDate;
+    }
+
+    /**
+     * @return the docPubTime
+     */
+    public String getDocPubTime2() {
+        return docPubTime;
+    }
+
+    /**
+     * @return the docPubUserId
+     */
+    public int getDocPubUserId2() {
+        return docPubUserId;
+    }
+
+    /**
+     * @return the docValidDate
+     */
+    public String getDocValidDate2() {
+        return docValidDate;
+    }
+
+    /**
+     * @return the docValidTime
+     */
+    public String getDocValidTime2() {
+        return docValidTime;
+    }
+
+    /**
+     * @return the docValidUserId
+     */
+    public int getDocValidUserId2() {
+        return docValidUserId;
+    }
+
+    /**
+     * @return the mainDoc
+     */
+    public int getMainDoc2() {
+        return mainDoc;
+    }
+
+    /**
+     * @return the readOpterCanPrint
+     */
+    public int getReadOpterCanPrint2() {
+        return readOpterCanPrint;
+    }
+
+    /**
+     * @return the invalidationDate
+     */
+    public String getInvalidationDate2() {
+        return invalidationDate;
+    }
+    
+
+   
+    /**
+     * @param docCancelDate the docCancelDate to set
+     */
+    public void setDocCancelDate(String docCancelDate) {
+        this.docCancelDate = docCancelDate;
+    }
+
+    /**
+     * @param docCancelTime the docCancelTime to set
+     */
+    public void setDocCancelTime(String docCancelTime) {
+        this.docCancelTime = docCancelTime;
+    }
+
+    /**
+     * @param docCancelUserId the docCancelUserId to set
+     */
+    public void setDocCancelUserId(int docCancelUserId) {
+        this.docCancelUserId = docCancelUserId;
+    }
+
+    /**
+     * @param docCode the docCode to set
+     */
+    public void setDocCode(String docCode) {
+        this.docCode = docCode;
+    }
+
+    /**
+     * @param docEdition the docEdition to set
+     */
+    public void setDocEdition(int docEdition) {
+        this.docEdition = docEdition;
+    }
+
+    /**
+     * @param docEdition the docEditionId to set
+     */
+    public void setDocEditionId(int docEditionId) {
+        this.docEditionId = docEditionId;
+    }
+
+    /**
+     * @param isHistory the isHistory to set
+     */
+    public void setIsHistory(int isHistory) {
+        this.isHistory = isHistory;
+    }
+    
+    /**
+     * @param approveType the approveType to set
+     */
+    public void setApproveType(int approveType) {
+        this.approveType = approveType;
+    }
+        
+    /**
+     * @param selectedPubMouldId the selectedPubMouldId to set
+     */
+    public void setSelectedPubMouldId(int selectedPubMouldId) {
+        this.selectedPubMouldId = selectedPubMouldId;
+    }
+    
+    /**
+     * @param docInvalDate the docInvalDate to set
+     */
+    public void setDocInvalDate(String docInvalDate) {
+        this.docInvalDate = docInvalDate;
+    }
+
+    /**
+     * @param docInvalTime the docInvalTime to set
+     */
+    public void setDocInvalTime(String docInvalTime) {
+        this.docInvalTime = docInvalTime;
+    }
+
+    /**
+     * @param docInvalUserId the docInvalUserId to set
+     */
+    public void setDocInvalUserId(int docInvalUserId) {
+        this.docInvalUserId = docInvalUserId;
+    }
+
+    /**
+     * @param docReOpenDate the docReOpenDate to set
+     */
+    public void setDocReOpenDate(String docReOpenDate) {
+        this.docReOpenDate = docReOpenDate;
+    }
+
+    /**
+     * @param docReOpenTime the docReOpenTime to set
+     */
+    public void setDocReOpenTime(String docReOpenTime) {
+        this.docReOpenTime = docReOpenTime;
+    }
+
+    /**
+     * @param docReOpenUserId the docReOpenUserId to set
+     */
+    public void setDocReOpenUserId(int docReOpenUserId) {
+        this.docReOpenUserId = docReOpenUserId;
+    }
+
+    /**
+     * @param docPubDate the DocPubDate to set
+     */
+    public void setDocPubDate(String docPubDate) {
+        this.docPubDate = docPubDate;
+    }
+
+    /**
+     * @param DocPubTime the DocPubTime to set
+     */
+    public void setDocPubTime(String docPubTime) {
+        this.docPubTime = docPubTime;
+    }
+
+    /**
+     * @param DocPubUserId the DocPubUserId to set
+     */
+    public void setDocPubUserId(int docPubUserId) {
+        this.docPubUserId = docPubUserId;
+    }
+
+    /**
+     * @param docValidDate the docValidDate to set
+     */
+    public void setDocValidDate(String docValidDate) {
+        this.docValidDate = docValidDate;
+    }
+
+    /**
+     * @param docValidTime the docValidTime to set
+     */
+    public void setDocValidTime(String docValidTime) {
+        this.docValidTime = docValidTime;
+    }
+
+    /**
+     * @param docValidUserId the docValidUserId to set
+     */
+    public void setDocValidUserId(int docValidUserId) {
+        this.docValidUserId = docValidUserId;
+    }
+
+    /**
+     * @param mainDoc the mainDoc to set
+     */
+    public void setMainDoc(int mainDoc) {
+        this.mainDoc = mainDoc;
+    }
+
+    /**
+     * @param readOpterCanPrint the readOpterCanPrint to set
+     */
+    public void setReadOpterCanPrint(int readOpterCanPrint) {
+        this.readOpterCanPrint = readOpterCanPrint;
+    }
+    
+    /**
+     * @param invalidationDate the invalidationDate to set
+     */
+    public void setInvalidationDate(String invalidationDate) {
+        this.invalidationDate = invalidationDate;
+    }
+    
+	 public void setDummycata(String dummycata) {
+        this.dummycata = dummycata;
+    }
+
+    
+    /**
+     * @param  docCreaterType  设置  文档创建者类型（1:内部用户  2：外部用户）
+     */
+    public void setDocCreaterType(String paraValue) {
+    	this.docCreaterType=paraValue;
+    } 
+    
+    /**
+     * @param  docLastModUserType  设置  文档最后修改者类型（1:内部用户  2：外部用户）
+     */
+    public void setDocLastModUserType(String paraValue) {
+    	this.docLastModUserType=paraValue;
+    } 
+    
+    /**
+     * @param  docApproveUserType  设置  文档审批者类型（1:内部用户  2：外部用户）
+     */
+    public void setDocApproveUserType(String paraValue) {
+    	this.docApproveUserType=paraValue;
+    } 
+    
+    /**
+     * @param  docValidUserType  设置  生效操作人类型（1:内部用户  2：外部用户）
+     */
+    public void setDocValidUserType(String paraValue) {
+    	this.docValidUserType=paraValue;
+    } 
+    
+    /**
+     * @param  docInvalUserType  设置  失效操作人类型（1:内部用户  2：外部用户）
+     */
+    public void setDocInvalUserType(String paraValue) {
+    	this.docInvalUserType=paraValue;
+    } 
+    
+    /**
+     * @param  docArchiveUserType  设置  文档归档者类型（1:内部用户  2：外部用户）
+     */
+    public void setDocArchiveUserType(String paraValue) {
+    	this.docArchiveUserType=paraValue;
+    } 
+    
+    /**
+     * @param  docCancelUserType  设置  作废操作人类型（1:内部用户  2：外部用户）
+     */
+    public void setDocCancelUserType(String paraValue) {
+    	this.docCancelUserType=paraValue;
+    } 
+    
+    /**
+     * @param  docPubUserType  设置  发布操作人类型（1:内部用户  2：外部用户）
+     */
+    public void setDocPubUserType(String paraValue) {
+    	this.docPubUserType=paraValue;
+    } 
+    
+    /**
+     * @param  docReopenUserType  设置  重新打开操作人类型（1:内部用户  2：外部用户）
+     */
+    public void setDocReopenUserType(String paraValue) {
+    	this.docReopenUserType=paraValue;
+    } 
+     
+    /**
+     * @param  ownerType  设置  文档拥有者类型（1:内部用户  2：外部用户）
+     */
+    public void setOwnerType(String paraValue) {
+    	this.ownerType=paraValue;
+    }    
+     
+    
+    /**
+     * 流程审批文档
+     * @param type 审批类型("reject","approve")
+     * @param docId 文档ID
+     * @param approveDate 审批日期
+     * @param approveTime 审批时间
+     * @param userId 审批用户
+     */
+    public void approveDocFromWF(String type,String docId,String approveDate,String approveTime,String userId) throws Exception {
+    	
+    	//安全性检查
+    	if(type==null
+    	 ||(!"reject".equals(type)&&!"approve".equals(type))
+     	 ||docId==null
+     	 ||Util.getIntValue(docId,-1)<=0
+    	){
+    		return ;
+    	}
+    	
+        RecordSet rs = new RecordSet();
+        
+        this.id = Util.getIntValue(docId);
+        this.getDocInfoById();
+        this.maincategory = this.getMaincategory();
+        this.subcategory = this.getSubcategory();
+        this.seccategory = this.getSeccategory();
+        this.docstatus = this.getDocstatus();
+        this.docEdition = this.getDocEdition();
+        this.docEditionId = this.getDocEditionId();
+        this.approveType = this.getApproveType();
+        this.docsubject=this.getDocsubject();
+        this.doccreaterid=this.getDoccreaterid();
+        //String createrType=this.getUsertype();
+        this.docCreaterType=this.getDocCreaterType(); 
+        
+        this.usertype=(this.usertype==null||this.usertype.trim().equals(""))?"1":this.usertype;
+        
+        String operateType="4";
+        
+        if(type.equals("reject")){
+            //this.docstatus = "4";
+        	//如果为失效审批，则退回后文档状态为“2：生效/正常”,否则为“4：退回”
+        	if(this.approveType==2){
+        		this.docstatus="2";
+        	}else{
+        		this.docstatus="4";
+        	}
+            operateType="5";//操作的类型：5：退回
+            
+            rs.executeSql(
+                    " UPDATE DocDetail SET " +
+                    " docstatus = " + this.docstatus +
+                    ",docapproveuserid = " + userId +
+                    ",docApproveUserType = '" + this.usertype +  "'" +                           
+                    ",docapprovedate = '" + approveDate + "'" +
+                    ",docapprovetime = '" + approveTime + "'" +    
+                    " WHERE ID = " + this.id
+            );            
+        }else if(type.equals("approve")){
+            operateType="4";//操作的类型：4：批准       	
+            if(this.approveType==1){//生效审批
+                if(scc.needPubOperation(this.seccategory)) {//如果需要发布
+                    this.docstatus = "6";
+                    rs.executeSql(
+                            " UPDATE DocDetail SET " +
+                            " docstatus = " + this.docstatus +
+                            ",docapproveuserid = " + userId +
+                            ",docApproveUserType = '" + this.usertype +  "'" +                           
+                            ",docapprovedate = '" + approveDate + "'" +
+                            ",docapprovetime = '" + approveTime + "'" +    
+                            " WHERE ID = " + this.id
+                    );                    
+                } else {//生效/正常
+                    this.docstatus = "2";
+    
+                    if(scc.isEditionOpen(this.seccategory)) {//如果版本管理开启
+                        if(this.docEditionId==-1)
+                            this.docEditionId = this.getNextEditionId(rs);
+                        this.docEdition = dc.getEdition(this.docEditionId)+1;
+                        rs.executeSql(" update docdetail set docstatus = 7,ishistory = 1 where id <> " + this.id + " and docedition > 0 and docedition < " + this.docEdition + " and doceditionid > 0 and doceditionid = " + this.docEditionId);
+                        
+                        rs.executeSql(" select id from docdetail where id <> " + this.id + " and docedition < " + this.docEdition + " and doceditionid = " + this.docEditionId + " order by docEdition desc ");
+                        if(rs.next()){
+                            int oldDocId = rs.getInt("id");
+                        
+                            log.resetParameter();
+                            log.setDocId(oldDocId);
+                            log.setDocSubject(this.docsubject);
+                            log.setOperateType("14");
+                            log.setOperateUserid(userid);
+                            log.setUsertype(this.usertype);
+                            log.setClientAddress(this.clientip);
+                            log.setDocCreater(this.doccreaterid);
+                            //log.setCreatertype(createrType);
+                            log.setCreatertype(this.docCreaterType);                              
+                            log.setDocLogInfo();
+                        }
+                    }
+    
+                    rs.executeSql(
+                            " UPDATE DocDetail SET " +
+                            " docstatus = " + this.docstatus +
+                            ",docEdition = " + this.docEdition +
+                            ",docEditionId = " + this.docEditionId +
+                            ",docapproveuserid = " + userId +
+                            ",docApproveUserType = '" + this.usertype +  "'" +                           
+                            ",docapprovedate = '" + approveDate + "'" +
+                            ",docapprovetime = '" + approveTime + "'" +
+                            ",docvaliduserid = " + userId +
+                            ",docValidUserType = '" + this.usertype +  "'" +                               
+                            ",docvaliddate = '" + approveDate + "'" +
+                            ",docvalidtime = '" + approveTime + "'" +
+                            " WHERE ID = " + docId
+                    );
+
+
+                }
+            } else if(this.approveType==2){//失效审批
+                this.docstatus = "7";
+                this.docInvalUserId = this.userid;
+                this.docInvalUserType = this.usertype;
+                this.docInvalDate = approveDate;
+                this.docInvalTime = approveTime;
+                    
+                if(scc.isEditionOpen(this.seccategory)) {//如果版本管理开启
+                    if(this.docEditionId==-1)
+                        this.docEditionId = this.getNextEditionId(rs);
+                    //this.docEdition = dc.getEdition(this.docEditionId)+1;
+                    this.docEdition = dc.getEdition(this.docEditionId);                   
+                    rs.executeSql(" update docdetail set docstatus = 7,ishistory = 1 where id <> " + this.id + " and docedition > 0 and docedition < " + this.docEdition + " and doceditionid > 0 and doceditionid = " + this.docEditionId);
+                }
+                
+                rs.executeSql(
+                        " UPDATE DocDetail SET " +
+                        " docstatus = " + this.docstatus +
+                        ",approvetype = " + this.approveType +
+                        ",docEdition = " + this.docEdition +
+                        ",docEditionId = " + this.docEditionId +
+                        ",docapproveuserid = " + userId +
+                        ",docApproveUserType = '" + this.usertype +  "'" +                           
+                        ",docapprovedate = '" + approveDate + "'" +
+                        ",docapprovetime = '" + approveTime + "'" +                        
+                        ",docinvaluserid = " + this.docInvalUserId +
+                        ",docInvalUserType = '" + this.docInvalUserType + "'" +                       
+                        ",docinvaldate = '" + this.docInvalDate + "'" +
+                        ",docinvaltime = '" + this.docInvalTime + "'" +
+                        " WHERE ID = " + this.id
+                );
+            }
+        }
+        
+        //char flag=Util.getSeparator();
+        //String para=userId+flag+this.docstatus+flag+approveDate+flag+approveTime+flag+docId;
+        //rs.executeProc("DocDetail_Approve",para);
+        
+        log.resetParameter();
+        log.setDocId(this.id);
+        log.setDocSubject(this.docsubject);
+        log.setOperateType(operateType);
+        log.setOperateUserid(this.userid);
+        log.setUsertype(this.usertype);
+        log.setClientAddress(this.clientip);
+        log.setDocCreater(this.doccreaterid);
+        //log.setCreatertype(createrType);
+        log.setCreatertype(this.docCreaterType);          
+        log.setDocLogInfo();
+        if(this.docstatus.equals("2") || this.docstatus.equals("1") || this.docstatus.equals("5")){
+            //RecordSet rsforsend = new RecordSet();
+          //  rsforsend.executeSql("select shareids from sendtoalltemp where status = 0 and docid=" + docId);
+          //  while (rsforsend.next()) {
+              //  String shareids = Util.null2String(rsforsend.getString("shareids"));
+                ThreadForAllForNew sendToAllfornew = new ThreadForAllForNew(docId,"",userId);
+                sendToAllfornew.start();
+           // }
+        }
+        
+    }
+
+
+	  public void approveDocFromWFGD(String type,String docId,String approveDate,String approveTime,String userId) throws Exception {
+    	
+    	//安全性检查
+    	if(type==null
+    	 ||(!"reject".equals(type)&&!"approve".equals(type))
+     	 ||docId==null
+     	 ||Util.getIntValue(docId,-1)<=0
+    	){
+    		return ;
+    	}
+    	
+        RecordSet rs = new RecordSet();
+		rs.writeLog("++++++++++++++++approveDocFromWF.type=="+type);
+		rs.writeLog("++++++++++++++++approveDocFromWF.docId=="+docId);
+		rs.writeLog("++++++++++++++++approveDocFromWF.approveDate=="+approveDate);
+		rs.writeLog("++++++++++++++++approveDocFromWF.approveTime=="+approveTime);
+		rs.writeLog("++++++++++++++++approveDocFromWF.userId=="+userId);
+        
+        this.id = Util.getIntValue(docId);
+        this.getDocInfoById();
+        this.maincategory = this.getMaincategory();
+        this.subcategory = this.getSubcategory();
+        this.seccategory = this.getSeccategory();
+        this.docstatus = this.getDocstatus();
+        this.docEdition = this.getDocEdition();
+        this.docEditionId = this.getDocEditionId();
+        this.approveType = this.getApproveType();
+        this.docsubject=this.getDocsubject();
+        this.doccreaterid=this.getDoccreaterid();
+        //String createrType=this.getUsertype();
+        this.docCreaterType=this.getDocCreaterType(); 
+        
+        this.usertype=(this.usertype==null||this.usertype.trim().equals(""))?"1":this.usertype;
+        
+        String operateType="4";
+        
+        if(type.equals("approve")){
+            operateType="4";//操作的类型：4：批准       	
+            if(this.approveType==1){//生效审批
+                if(scc.needPubOperation(this.seccategory)) {//如果需要发布
+                    this.docstatus = "6";
+                    rs.executeSql(
+                            " UPDATE DocDetail SET " +
+                            " docstatus = " + this.docstatus +
+                            ",docapproveuserid = " + userId +
+                            ",docApproveUserType = '" + this.usertype +  "'" +                           
+                            ",docapprovedate = '" + approveDate + "'" +
+                            ",docapprovetime = '" + approveTime + "'" +    
+                            " WHERE ID = " + this.id
+                    ); 
+					rs.writeLog("++++++++++++++++ fabusql== UPDATE DocDetail SET " +
+                            " docstatus = " + this.docstatus +
+                            ",docapproveuserid = " + userId +
+                            ",docApproveUserType = '" + this.usertype +  "'" +                           
+                            ",docapprovedate = '" + approveDate + "'" +
+                            ",docapprovetime = '" + approveTime + "'" +    
+                            " WHERE ID = " + this.id
+                    ); 
+					
+                } else {//生效/正常
+                    this.docstatus = "2";
+    
+                    if(scc.isEditionOpen(this.seccategory)) {//如果版本管理开启
+						rs.writeLog("++++++++++++++++isEditionOpen");
+                        if(this.docEditionId==-1)
+                            this.docEditionId = this.getNextEditionId(rs);
+                        this.docEdition = dc.getEdition(this.docEditionId)+1;
+                        rs.executeSql(" update docdetail set docstatus = 7,ishistory = 1 where id <> " + this.id + " and docedition > 0 and docedition < " + this.docEdition + " and doceditionid > 0 and doceditionid = " + this.docEditionId);
+                        
+                        rs.executeSql(" select id from docdetail where id <> " + this.id + " and docedition < " + this.docEdition + " and doceditionid = " + this.docEditionId + " order by docEdition desc ");
+                        if(rs.next()){
+                            int oldDocId = rs.getInt("id");
+                        
+                            log.resetParameter();
+                            log.setDocId(oldDocId);
+                            log.setDocSubject(this.docsubject);
+                            log.setOperateType("14");
+                            log.setOperateUserid(userid);
+                            log.setUsertype(this.usertype);
+                            log.setClientAddress(this.clientip);
+                            log.setDocCreater(this.doccreaterid);
+                            //log.setCreatertype(createrType);
+                            log.setCreatertype(this.docCreaterType);                              
+                            log.setDocLogInfo();
+                        }
+                    }
+    
+                    rs.executeSql(
+                            " UPDATE DocDetail SET " +
+                            " docstatus = " + this.docstatus +
+                            ",docEdition = " + this.docEdition +
+                            ",docEditionId = " + this.docEditionId +
+                            ",docapproveuserid = " + userId +
+                            ",docApproveUserType = '" + this.usertype +  "'" +                           
+                            ",docapprovedate = '" + approveDate + "'" +
+                            ",docapprovetime = '" + approveTime + "'" +
+                            ",docvaliduserid = " + userId +
+                            ",docValidUserType = '" + this.usertype +  "'" +                               
+                            ",docvaliddate = '" + approveDate + "'" +
+                            ",docvalidtime = '" + approveTime + "'" +
+                            ",docarchiveuserid = " + userId +
+                            ",docArchiveUserType = '" + this.usertype +  "'" +   
+						    						",docarchivedate = '" + approveDate + "'" +
+                            ",docarchivetime = '" + approveTime + "'" +
+                            " WHERE ID = " + docId
+                    );
+										rs.writeLog("++++++++++++++++zhengchangsql=== UPDATE DocDetail SET " +
+                            " docstatus = " + this.docstatus +
+                            ",docEdition = " + this.docEdition +
+                            ",docEditionId = " + this.docEditionId +
+                            ",docapproveuserid = " + userId +
+                            ",docApproveUserType = '" + this.usertype +  "'" +                           
+                            ",docapprovedate = '" + approveDate + "'" +
+                            ",docapprovetime = '" + approveTime + "'" +
+                            ",docvaliduserid = " + userId +
+                            ",docValidUserType = '" + this.usertype +  "'" +                               
+                            ",docvaliddate = '" + approveDate + "'" +
+                            ",docvalidtime = '" + approveTime + "'" +
+                            " WHERE ID = " + docId
+                    );
+
+                }
+            } else if(this.approveType==2){//失效审批
+                this.docstatus = "7";
+                this.docInvalUserId = this.userid;
+                this.docInvalUserType = this.usertype;
+                this.docInvalDate = approveDate;
+                this.docInvalTime = approveTime;
+                    
+                if(scc.isEditionOpen(this.seccategory)) {//如果版本管理开启
+                    if(this.docEditionId==-1)
+                        this.docEditionId = this.getNextEditionId(rs);
+                    //this.docEdition = dc.getEdition(this.docEditionId)+1;
+                    this.docEdition = dc.getEdition(this.docEditionId);                   
+                    rs.executeSql(" update docdetail set docstatus = 7,ishistory = 1 where id <> " + this.id + " and docedition > 0 and docedition < " + this.docEdition + " and doceditionid > 0 and doceditionid = " + this.docEditionId);
+                }
+                
+                rs.executeSql(
+                        " UPDATE DocDetail SET " +
+                        " docstatus = " + this.docstatus +
+                        ",approvetype = " + this.approveType +
+                        ",docEdition = " + this.docEdition +
+                        ",docEditionId = " + this.docEditionId +
+                        ",docapproveuserid = " + userId +
+                        ",docApproveUserType = '" + this.usertype +  "'" +                           
+                        ",docapprovedate = '" + approveDate + "'" +
+                        ",docapprovetime = '" + approveTime + "'" +                        
+                        ",docinvaluserid = " + this.docInvalUserId +
+                        ",docInvalUserType = '" + this.docInvalUserType + "'" +                       
+                        ",docinvaldate = '" + this.docInvalDate + "'" +
+                        ",docinvaltime = '" + this.docInvalTime + "'" +
+                        " WHERE ID = " + this.id
+                );
+            }
+        }
+        
+        //char flag=Util.getSeparator();
+        //String para=userId+flag+this.docstatus+flag+approveDate+flag+approveTime+flag+docId;
+        //rs.executeProc("DocDetail_Approve",para);
+        
+        log.resetParameter();
+        log.setDocId(this.id);
+        log.setDocSubject(this.docsubject);
+        log.setOperateType(operateType);
+        log.setOperateUserid(this.userid);
+        log.setUsertype(this.usertype);
+        log.setClientAddress(this.clientip);
+        log.setDocCreater(this.doccreaterid);
+        //log.setCreatertype(createrType);
+        log.setCreatertype(this.docCreaterType);          
+        log.setDocLogInfo();
+
+        if(this.docstatus.equals("2") || this.docstatus.equals("1") || this.docstatus.equals("5")){
+            //  RecordSet rsforsend = new RecordSet();
+            //  rsforsend.executeSql("select shareids from sendtoalltemp where status = 0 and docid=" + this.id);
+           //   while (rsforsend.next()) {
+           //       String shareids = Util.null2String(rsforsend.getString("shareids"));
+                  ThreadForAllForNew sendToAllfornew = new ThreadForAllForNew(this.id+"", "",this.userid+"");
+                  sendToAllfornew.start();
+            //  }
+          }
+
+    }
+    
+    /**
+     * 发布文档
+     * @param fu FileUpload对象
+     * @throws Exception
+     */
+    public void publishDoc(FileUpload fu) throws Exception {
+        RecordSet rs = new RecordSet();
+        
+        this.id = Util.getIntValue(fu.getParameter("id"), 0);
+
+        this.maincategory = Util.getIntValue(fu.getParameter("maincategory"), 0);
+        this.subcategory = Util.getIntValue(fu.getParameter("subcategory"), 0);
+        this.seccategory = Util.getIntValue(fu.getParameter("seccategory"), 0);
+        
+        this.docstatus = fu.getParameter("docstatus");
+        this.docEdition = Util.getIntValue(fu.getParameter("docedition"),-1);
+        this.docEditionId = Util.getIntValue(fu.getParameter("doceditionid"),-1);
+        
+        this.docsubject = Util.null2String(fu.getParameter("docsubject"));           
+        this.doccreaterid = Util.getIntValue(fu.getParameter("doccreaterid"),0);
+        this.docCreaterType = Util.null2String(fu.getParameter("docCreaterType"));           
+        
+        Calendar today = Calendar.getInstance();
+        String formatdate = Util.add0(today.get(Calendar.YEAR), 4) + "-"
+                + Util.add0(today.get(Calendar.MONTH) + 1, 2) + "-"
+                + Util.add0(today.get(Calendar.DAY_OF_MONTH), 2);
+        String formattime = Util.add0(today.get(Calendar.HOUR_OF_DAY), 2) + ":"
+                + Util.add0(today.get(Calendar.MINUTE), 2) + ":" + Util.add0(today.get(Calendar.SECOND), 2);
+        
+        this.docPubUserId = this.userid;
+        this.docPubUserType = this.usertype;
+        this.docPubDate = formatdate;
+        this.docPubTime = formattime;
+        
+        this.docValidUserId = this.userid;
+        this.docValidUserType = this.usertype;
+        this.docValidDate = formatdate;
+        this.docValidTime = formattime;
+        
+        this.selectedPubMouldId = Util.getIntValue(fu.getParameter("selectedpubmouldid"),-1);
+        
+        //if(scc.needPubOperation(this.seccategory)&&Util.getIntValue(this.docstatus)==6){
+        if(Util.getIntValue(this.docstatus)==6){        
+            //生效/正常
+            this.docstatus = "2";
+            
+            
+            if(scc.isEditionOpen(this.seccategory)) {//如果版本管理开启
+                if(this.docEditionId==-1)
+                    this.docEditionId = this.getNextEditionId(rs);
+                this.docEdition = dc.getEdition(this.docEditionId)+1;
+                
+                rs.executeSql(" update docdetail set docstatus = 7,ishistory = 1 where id <> " + this.id + " and docedition > 0 and docedition < " + this.docEdition + " and doceditionid > 0 and doceditionid = " + this.docEditionId);
+                
+                rs.executeSql(" select id from docdetail where id <> " + this.id + " and docedition < " + this.docEdition + " and doceditionid = " + this.docEditionId + " order by docEdition desc ");
+                if(rs.next()){
+                    int oldDocId = rs.getInt("id");
+                    
+                	//关联子文档
+                	relateSonDocWithNewDoc(this.id);
+                	
+                    log.resetParameter();
+                    log.setDocId(oldDocId);
+                    log.setDocSubject(this.docsubject);
+                    log.setOperateType("14");
+                    log.setOperateUserid(userid);
+                    log.setUsertype(this.usertype);
+                    log.setClientAddress(this.clientip);
+                    log.setDocCreater(this.doccreaterid);
+                    log.setCreatertype(this.docCreaterType);                      
+                    log.setDocLogInfo();
+                }
+            }
+
+            rs.executeSql(
+                    " UPDATE DocDetail SET " +
+                    " docstatus = " + this.docstatus +
+                    ",docEdition = " + this.docEdition +
+                    ",docEditionId = " + this.docEditionId +
+                    ",selectedpubmouldid = " + this.selectedPubMouldId +
+                    ",docpubuserid = " + this.docPubUserId +
+                    ",docPubUserType = '" + this.docPubUserType + "'" +                   
+                    ",docpubdate = '" + this.docPubDate + "'" +
+                    ",docpubtime = '" + this.docPubTime + "'" +
+                    ",docvaliduserid = " + this.docValidUserId +
+                    ",docValidUserType = '" + this.docValidUserType + "'" +                   
+                    ",docvaliddate = '" + this.docValidDate + "'" +
+                    ",docvalidtime = '" + this.docValidTime + "'" +
+                    " WHERE ID = " + this.id
+            );
+        
+            log.resetParameter();
+            log.setDocId(this.id);
+            log.setDocSubject(this.docsubject);
+            log.setOperateType("13");
+            log.setOperateUserid(userid);
+            log.setUsertype(this.usertype);
+            log.setClientAddress(this.clientip);
+            log.setDocCreater(this.doccreaterid);
+            log.setCreatertype(this.docCreaterType);              
+            log.setDocLogInfo();
+                
+            if (this.docstatus.equals("2")) {
+             //   RecordSet rsforsend = new RecordSet();
+             //   rsforsend.executeSql("select shareids from sendtoalltemp where status = 0 and docid=" + this.id);
+            //    while (rsforsend.next()) {
+             //       String shareids = Util.null2String(rsforsend.getString("shareids"));
+
+
+
+
+                    ThreadForAllForNew sendToAllfornew = new ThreadForAllForNew(this.id+"", "",this.userid+"");
+                    sendToAllfornew.start();
+               // }
+            }
+        }
+    }
+    
+    /**
+     * 归档文档
+     * @param fu FileUpload对象
+     * @throws Exception
+     */
+    public void archiveDoc(FileUpload fu) throws Exception {
+        // 归档时进行的操作
+        RecordSet rs = new RecordSet();
+
+        this.id = Util.getIntValue(fu.getParameter("id"), 0);
+
+        this.maincategory = Util.getIntValue(fu.getParameter("maincategory"), 0);
+        this.subcategory = Util.getIntValue(fu.getParameter("subcategory"), 0);
+        this.seccategory = Util.getIntValue(fu.getParameter("seccategory"), 0);
+        
+        this.docstatus = fu.getParameter("docstatus");
+        this.docEdition = Util.getIntValue(fu.getParameter("docedition"),-1);
+        this.docEditionId = Util.getIntValue(fu.getParameter("doceditionid"),-1);
+        
+  
+    
+        this.doccreaterid = Util.getIntValue(fu.getParameter("doccreaterid"),0);
+        this.docCreaterType = Util.null2String(fu.getParameter("docCreaterType"));        
+        
+        Calendar today = Calendar.getInstance();
+        String formatdate = Util.add0(today.get(Calendar.YEAR), 4) + "-"
+                + Util.add0(today.get(Calendar.MONTH) + 1, 2) + "-"
+                + Util.add0(today.get(Calendar.DAY_OF_MONTH), 2);
+        String formattime = Util.add0(today.get(Calendar.HOUR_OF_DAY), 2) + ":"
+                + Util.add0(today.get(Calendar.MINUTE), 2) + ":" + Util.add0(today.get(Calendar.SECOND), 2);
+        
+        
+        this.docarchiveuserid = this.userid;
+        this.docArchiveUserType = this.usertype;
+        this.docsubject = fu.getParameter("docsubject");
+        this.docno = fu.getParameter("docno");
+        this.docarchivedate = formatdate;
+        this.docarchivetime = formattime;
+
+        if(Util.getIntValue(this.docstatus)==1||Util.getIntValue(this.docstatus)==2){
+            //归档
+            this.docstatus = "5";
+
+            //ArchiveDocInfo();
+
+            if(scc.isEditionOpen(this.seccategory)) {//如果版本管理开启
+                if(this.docEditionId==-1)
+                    this.docEditionId = this.getNextEditionId(rs);
+                //this.docEdition = dc.getEdition(this.docEditionId)+1;
+                this.docEdition = dc.getEdition(this.docEditionId);
+                rs.executeSql(" update docdetail set docstatus = 7,ishistory = 1 where id <> " + this.id + " and docedition > 0 and docedition < " + this.docEdition + " and doceditionid > 0 and doceditionid = " + this.docEditionId);
+            }
+
+            rs.executeSql(
+                    " UPDATE DocDetail SET " +
+                    " docstatus = " + this.docstatus +
+                    ",docno = '" + this.docno + "'" +                   
+                    ",docEdition = " + this.docEdition +
+                    ",docEditionId = " + this.docEditionId +
+                    ",docarchiveuserid = " + this.userid +
+                    ",docArchiveUserType = '" + this.docArchiveUserType + "'" +                    
+                    ",docarchivedate = '" + this.docarchivedate + "'" +
+                    ",docarchivetime = '" + this.docarchivetime + "'" +
+                    " WHERE ID = " + this.id
+            );
+            
+            
+            log.resetParameter();
+            log.setDocId(this.id);
+            log.setDocSubject(this.docsubject);
+            log.setOperateType("7");
+            log.setOperateUserid(userid);
+            log.setUsertype(this.usertype);
+            log.setClientAddress(this.clientip);
+            log.setDocCreater(this.doccreaterid);
+            log.setCreatertype(this.docCreaterType);             
+            log.setDocLogInfo();
+            
+            
+        }
+    }
+
+    
+    /**
+     * 失效文档
+     * @param fu FileUpload对象
+     * @throws Exception
+     */
+    public void invalidateDoc(FileUpload fu) throws Exception {
+        RecordSet rs = new RecordSet();
+        
+        this.id = Util.getIntValue(fu.getParameter("id"), 0);
+
+        this.maincategory = Util.getIntValue(fu.getParameter("maincategory"), 0);
+        this.subcategory = Util.getIntValue(fu.getParameter("subcategory"), 0);
+        this.seccategory = Util.getIntValue(fu.getParameter("seccategory"), 0);
+        
+        this.docstatus = fu.getParameter("docstatus");
+        this.docEdition = Util.getIntValue(fu.getParameter("docedition"),-1);
+        this.docEditionId = Util.getIntValue(fu.getParameter("doceditionid"),-1);
+
+        this.docsubject = Util.null2String(fu.getParameter("docsubject"));           
+        this.doccreaterid = Util.getIntValue(fu.getParameter("doccreaterid"),0);
+        this.docCreaterType = Util.null2String(fu.getParameter("docCreaterType"));
+        
+        Calendar today = Calendar.getInstance();
+        String formatdate = Util.add0(today.get(Calendar.YEAR), 4) + "-"
+                + Util.add0(today.get(Calendar.MONTH) + 1, 2) + "-"
+                + Util.add0(today.get(Calendar.DAY_OF_MONTH), 2);
+        String formattime = Util.add0(today.get(Calendar.HOUR_OF_DAY), 2) + ":"
+                + Util.add0(today.get(Calendar.MINUTE), 2) + ":" + Util.add0(today.get(Calendar.SECOND), 2);
+
+        this.docInvalUserId = this.userid;
+        this.docInvalUserType = this.usertype;
+        this.docInvalDate = formatdate;
+        this.docInvalTime = formattime;
+        
+        if(Util.getIntValue(this.docstatus)==1||Util.getIntValue(this.docstatus)==2){
+            
+            if(scc.needApprove(this.seccategory,2)) {//如果需要审批
+                this.docstatus = "3";
+                this.approveType = 2;
+            } else {//失效
+                this.docstatus = "7";
+                //this.docInvalUserId = this.userid;
+                //this.docInvalDate = formatdate;
+                //this.docInvalTime = formattime;
+                    
+                if(scc.isEditionOpen(this.seccategory)) {//如果版本管理开启
+                    if(this.docEditionId==-1)
+                        this.docEditionId = this.getNextEditionId(rs);
+                    //this.docEdition = dc.getEdition(this.docEditionId)+1;
+                    this.docEdition = dc.getEdition(this.docEditionId);
+                    rs.executeSql(" update docdetail set docstatus = 7,ishistory = 1 where id <> " + this.id + " and docedition > 0 and docedition < " + this.docEdition + " and doceditionid > 0 and doceditionid = " + this.docEditionId);
+                }
+            }
+
+            rs.executeSql(
+                    " UPDATE DocDetail SET " +
+                    " docstatus = " + this.docstatus +
+                    ",approvetype = " + this.approveType +
+                    ",docEdition = " + this.docEdition +
+                    ",docEditionId = " + this.docEditionId +
+                    ",docinvaluserid = " + this.docInvalUserId +
+                    ",docInvalUserType = '" + this.docInvalUserType + "'" +                  
+                    ",docinvaldate = '" + this.docInvalDate + "'" +
+                    ",docinvaltime = '" + this.docInvalTime + "'" +
+                    " WHERE ID = " + this.id
+            );
+            
+            log.resetParameter();
+            log.setDocId(this.id);
+            log.setDocSubject(this.docsubject);
+            log.setOperateType("14");
+            log.setOperateUserid(userid);
+            log.setUsertype(this.usertype);
+            log.setClientAddress(this.clientip);
+            log.setDocCreater(this.doccreaterid);
+            log.setCreatertype(this.docCreaterType);             
+            log.setDocLogInfo();
+            
+        }
+    }
+    
+    /**
+     * 作废文档
+     * @param fu FileUpload对象
+     * @throws Exception
+     */
+    public void cancelDoc(FileUpload fu) throws Exception {
+        RecordSet rs = new RecordSet();
+        
+        this.id = Util.getIntValue(fu.getParameter("id"), 0);
+
+        this.maincategory = Util.getIntValue(fu.getParameter("maincategory"), 0);
+        this.subcategory = Util.getIntValue(fu.getParameter("subcategory"), 0);
+        this.seccategory = Util.getIntValue(fu.getParameter("seccategory"), 0);
+        
+        this.docstatus = fu.getParameter("docstatus");
+        this.docEdition = Util.getIntValue(fu.getParameter("docedition"),-1);
+        this.docEditionId = Util.getIntValue(fu.getParameter("doceditionid"),-1);
+
+        this.docsubject = Util.null2String(fu.getParameter("docsubject"));           
+        this.doccreaterid = Util.getIntValue(fu.getParameter("doccreaterid"),0);
+        this.docCreaterType = Util.null2String(fu.getParameter("docCreaterType"));
+        
+        Calendar today = Calendar.getInstance();
+        String formatdate = Util.add0(today.get(Calendar.YEAR), 4) + "-"
+                + Util.add0(today.get(Calendar.MONTH) + 1, 2) + "-"
+                + Util.add0(today.get(Calendar.DAY_OF_MONTH), 2);
+        String formattime = Util.add0(today.get(Calendar.HOUR_OF_DAY), 2) + ":"
+                + Util.add0(today.get(Calendar.MINUTE), 2) + ":" + Util.add0(today.get(Calendar.SECOND), 2);
+        
+        this.docCancelUserId = this.userid;
+        this.docCancelUserType = this.usertype;
+        this.docCancelDate = formatdate;
+        this.docCancelTime = formattime;
+        
+        if(Util.getIntValue(this.docstatus)==1||Util.getIntValue(this.docstatus)==2||Util.getIntValue(this.docstatus)==5||Util.getIntValue(this.docstatus)==7){
+            //作废
+            this.docstatus = "8";
+
+            if(scc.isEditionOpen(this.seccategory)) {//如果版本管理开启
+                if(this.docEditionId==-1)
+                    this.docEditionId = this.getNextEditionId(rs);
+                //this.docEdition = dc.getEdition(this.docEditionId)+1;
+                this.docEdition = dc.getEdition(this.docEditionId);
+                rs.executeSql(" update docdetail set docstatus = 7,ishistory = 1 where id <> " + this.id + " and docedition > 0 and docedition < " + this.docEdition + " and doceditionid > 0 and doceditionid = " + this.docEditionId);
+            }
+
+            rs.executeSql(
+                    " UPDATE DocDetail SET " +
+                    " docstatus = " + this.docstatus +
+                    ",docEdition = " + this.docEdition +
+                    ",docEditionId = " + this.docEditionId +
+                    ",doccanceluserid = " + this.docCancelUserId +
+                    ",docCancelUserType = '" + this.docCancelUserType + "'" +                   
+                    ",doccanceldate = '" + this.docCancelDate + "'" +
+                    ",doccanceltime = '" + this.docCancelTime + "'" +
+                    " WHERE ID = " + this.id
+            );
+            
+            log.resetParameter();
+            log.setDocId(this.id);
+            log.setDocSubject(this.docsubject);
+            log.setOperateType("15");
+            log.setOperateUserid(userid);
+            log.setUsertype(this.usertype);
+            log.setClientAddress(this.clientip);
+            log.setDocCreater(this.doccreaterid);
+            log.setCreatertype(this.docCreaterType);            
+            log.setDocLogInfo();
+            
+        }
+    }
+
+    /**
+     * 重新打开文档
+     * @param fu FileUpload对象
+     * @throws Exception
+     */
+    public void reopenDoc(FileUpload fu) throws Exception {
+        RecordSet rs = new RecordSet();
+        
+        this.id = Util.getIntValue(fu.getParameter("id"), 0);
+
+        this.maincategory = Util.getIntValue(fu.getParameter("maincategory"), 0);
+        this.subcategory = Util.getIntValue(fu.getParameter("subcategory"), 0);
+        this.seccategory = Util.getIntValue(fu.getParameter("seccategory"), 0);
+        
+        this.docstatus = fu.getParameter("docstatus");
+        this.docEdition = Util.getIntValue(fu.getParameter("docedition"),-1);
+        this.docEditionId = Util.getIntValue(fu.getParameter("doceditionid"),-1);
+        
+        this.docsubject = Util.null2String(fu.getParameter("docsubject"));        
+        this.doccreaterid = Util.getIntValue(fu.getParameter("doccreaterid"),0);
+        this.docCreaterType = Util.null2String(fu.getParameter("docCreaterType"));
+        
+        Calendar today = Calendar.getInstance();
+        String formatdate = Util.add0(today.get(Calendar.YEAR), 4) + "-"
+                + Util.add0(today.get(Calendar.MONTH) + 1, 2) + "-"
+                + Util.add0(today.get(Calendar.DAY_OF_MONTH), 2);
+        String formattime = Util.add0(today.get(Calendar.HOUR_OF_DAY), 2) + ":"
+                + Util.add0(today.get(Calendar.MINUTE), 2) + ":" + Util.add0(today.get(Calendar.SECOND), 2);
+        
+        this.docReOpenUserId = this.userid;
+        this.docReopenUserType=this.usertype;
+        this.docReOpenDate = formatdate;
+        this.docReOpenTime = formattime;
+        this.docInvalUserId = this.userid;
+        this.docInvalUserType = this.usertype;
+        this.docInvalDate = formatdate;
+        this.docInvalTime = formattime;
+        
+        if(Util.getIntValue(this.docstatus)==5||Util.getIntValue(this.docstatus)==8){
+            //重新打开
+            if(Util.getIntValue(this.docstatus)==5)
+                this.docstatus = "2";
+            if(Util.getIntValue(this.docstatus)==8)
+                this.docstatus = "7";
+
+            if(scc.isEditionOpen(this.seccategory)) {//如果版本管理开启
+                if(this.docEditionId==-1)
+                    this.docEditionId = this.getNextEditionId(rs);
+                //this.docEdition = dc.getEdition(this.docEditionId)+1;
+                this.docEdition = dc.getEdition(this.docEditionId);
+                rs.executeSql(" update docdetail set docstatus = 7,ishistory = 1 where id <> " + this.id + " and docedition > 0 and docedition < " + this.docEdition + " and doceditionid > 0 and doceditionid = " + this.docEditionId);
+            }
+
+            rs.executeSql(
+                    " UPDATE DocDetail SET " +
+                    " docstatus = " + this.docstatus +
+                    ",docEdition = " + this.docEdition +
+                    ",docEditionId = " + this.docEditionId +
+                    ",docreopenuserid = " + this.docReOpenUserId +
+                    ",docReopenUserType = '" + this.docReopenUserType +"'"+                    
+                    ",docreopendate = '" + this.docReOpenDate + "'" +
+                    ",docreopentime = '" + this.docReOpenTime + "'" +
+                    ",docinvaluserid = " + this.docInvalUserId +
+                    ",docInvalUserType = '" + this.docInvalUserType + "'" +                  
+                    ",docinvaldate = '" + this.docInvalDate + "'" +
+                    ",docinvaltime = '" + this.docInvalTime + "'" +
+                    " WHERE ID = " + this.id
+            );
+            
+            log.resetParameter();
+            log.setDocId(this.id);
+            log.setDocSubject(this.docsubject);
+            log.setOperateType("6");
+            log.setOperateUserid(userid);
+            log.setUsertype(this.usertype);           
+            log.setClientAddress(this.clientip);
+            log.setDocCreater(this.doccreaterid);
+            log.setCreatertype(this.docCreaterType);
+            log.setDocLogInfo();
+             
+        }
+    }   
+	//关联子文档
+    public void relateSonDocWithNewDoc(int newDocId){
+    	RecordSet rs1 = new RecordSet();
+    	RecordSet rs2 = new RecordSet();
+    	
+    	rs1.executeSql(" select doceditionid from docdetail where id = " + newDocId);
+    	if(rs1.next()){
+    		String doceditionid = Util.null2String(rs1.getString("doceditionid"));
+    		String docids = "";
+    		if("-1".equals(doceditionid)||"".equals(doceditionid) ){  //不应该查询所有非版本管理的文档
+    			return;
+    		}
+    		rs2.executeSql(" select id from docdetail where doceditionid = " + doceditionid);
+    		while(rs2.next()){
+    			docids += ",";
+    			docids += Util.null2String(rs2.getString("id"));
+    		}
+    		if(docids.startsWith(",")) docids=docids.substring(1);
+    		if(docids!=null&&!"".equals(docids))
+    		rs2.executeSql("update docdetail set maindoc = " + newDocId + " where maindoc in (" + docids + ")");
+    	}
+    }
+    public String getNewDocids(String docids){
+    	String sNewDocids="";
+    	ArrayList lstDocid=Util.TokenizerString(docids, ",");
+    	for(int i=0;i<lstDocid.size();i++) {
+    		String docid=(String)lstDocid.get(i);
+    		String newDocid=this.getNewDocid(docid);
+    		sNewDocids+=newDocid+",";    		
+    	}
+    	if(!"".equals(sNewDocids)) sNewDocids=sNewDocids.substring(0,sNewDocids.length()-1);
+    	return sNewDocids;
+    }
+    
+    public String getNewDocid(String docid){
+    	String sNewDocid="";    	
+    	String sDoceditionid="-1";
+    	if("".equals(docid)) return "";
+    	RecordSet rs= new RecordSet();
+    	rs.executeSql("select doceditionid from docdetail where id="+docid);
+    	if(rs.next()) sDoceditionid=Util.null2String(rs.getString("doceditionid"));
+        if("-1".equals(sDoceditionid) || "".equals(sDoceditionid)) return docid;
+        rs.executeSql("select id from docdetail where docedition=(select max(docedition) from docdetail where doceditionid="+sDoceditionid+") " +
+        		"and doceditionid="+sDoceditionid);
+        
+        if(rs.next()) sNewDocid=Util.null2String(rs.getString("id"));
+        
+        if("".equals(sNewDocid)) sNewDocid=docid;        
+    	return sNewDocid;    	
+    }
+    
+    
+    /**
+     * 新建文档
+     * @param request request对象
+     * @param opera 操作类型
+     * @param imgfileidList 附件列表集合
+     * @throws Exception
+     */
+    public void UploadFileToDoc(HttpServletRequest request,String fileid) throws Exception {
+    	
+        RecordSet rs = new RecordSet();
+        FileUpload fu = new FileUpload(request);   
+        
+        this.seccategory = Util.getIntValue(fu.getParameter("seccategory"), 0);
+        this.subcategory=Util.getIntValue(scc.getSubCategoryid(""+this.seccategory));
+        this.maincategory=Util.getIntValue(subc.getMainCategoryid(""+this.subcategory));
+        
+        String filename="";
+        
+        this.id=this.getNextDocId(rs);
+        this.docextendname = "html";  
+        
+        
+        rs.executeSql("select imagefilename from imagefile where imagefileid="+fileid);
+        if(rs.next()){
+        	filename=rs.getString(1);
+        }
+        String filename_bak=filename;
+        if(filename.indexOf(".")>0)
+			filename_bak=filename.substring(0,filename.lastIndexOf("."));
+       
+       rs.execute("select * from DocSecCategory where id="+seccategory+" and norepeatedname=1");
+       if(rs.next())
+       {
+    	   rs.execute("select * from DocDetail where seccategory="+seccategory+" and docsubject='"+filename_bak+"'");
+    	   if(rs.next())
+    	   {
+    		   String msg_str = ""+weaver.systeminfo.SystemEnv.getHtmlLabelName(10003405,weaver.general.ThreadVarLanguage.getLang())+"";
+    		   HttpSession session =request.getSession();
+    		   session.setAttribute("msg_str", msg_str);
+    		   return;
+    	   }
+       }
+
+        // add by wjy for add custom data
+        addCustomData(fu, this.id);
+
+        // 开始进行存储附件的操作
+        imgManger.resetParameter();
+        imgManger.setDocid(this.id);
+        imgManger.setImagefileid(Util.getIntValue(fileid, 0));
+        imgManger.setImagefilename(filename);
+        imgManger.setIsextfile("1");
+        imgManger.setVersionDetail("128095");
+        imgManger.setOperateuserid(userid);
+        String ext = getFileExt(filename);
+        if (ext.equalsIgnoreCase("doc")) {
+            imgManger.setDocfiletype("3");
+        } else if (ext.equalsIgnoreCase("xls")) {
+            imgManger.setDocfiletype("4");
+        } else if (ext.equalsIgnoreCase("ppt")) {
+            imgManger.setDocfiletype("5");
+        } else if (ext.equalsIgnoreCase("wps")) {
+            imgManger.setDocfiletype("6");
+        } else if (ext.equalsIgnoreCase("docx")) {
+            imgManger.setDocfiletype("7");
+        } else if (ext.equalsIgnoreCase("xlsx")) {
+            imgManger.setDocfiletype("8");
+        } else if (ext.equalsIgnoreCase("pptx")) {
+            imgManger.setDocfiletype("9");
+        } else if (ext.equalsIgnoreCase("et")) {
+            imgManger.setDocfiletype("10");
+        } else {
+            imgManger.setDocfiletype("2");
+        }
+        imgManger.AddDocImageInfo();
+        
+        // 存储文档的内容
+        this.doccontent = Util.fromBaseEncoding(fu.getParameter("doccontent"), languageid);
+        this.doccontent =Util.htmlFilter4UTF8(this.doccontent );
+
+        // 下面的操作可以得到此知识文档的相关资料
+        Calendar today = Calendar.getInstance();
+        String formatdate = Util.add0(today.get(Calendar.YEAR), 4) + "-"
+                + Util.add0(today.get(Calendar.MONTH) + 1, 2) + "-"
+                + Util.add0(today.get(Calendar.DAY_OF_MONTH), 2);
+        String formattime = Util.add0(today.get(Calendar.HOUR_OF_DAY), 2) + ":"
+                + Util.add0(today.get(Calendar.MINUTE), 2) + ":" + Util.add0(today.get(Calendar.SECOND), 2);
+
+        this.seccategory = Util.getIntValue(fu.getParameter("seccategory"), 0);
+        this.subcategory=Util.getIntValue(scc.getSubCategoryid(""+this.seccategory));
+        this.maincategory=Util.getIntValue(subc.getMainCategoryid(""+this.subcategory));
+        
+        this.doclangurage = Util.getIntValue(fu.getParameter("doclangurage"), 0);
+        this.docreplyable = fu.getParameter("docreplyable");
+        this.isreply = Util.null2String(fu.getParameter("isreply"));
+        this.replydocid = Util.getIntValue(fu.getParameter("replydocid"), 0);
+        this.ownerid = Util.getIntValue(fu.getParameter("ownerid"), 0);
+        this.ownerType = this.usertype;    
+        
+        this.doclangurage = Util.getIntValue(fu.getParameter("doclangurage"), 0);
+        
+        int tempPos=filename.lastIndexOf(".");
+        if(tempPos==-1) this.docsubject = filename;
+        else  this.docsubject = filename.substring(0, tempPos);
+
+        this.docpublishtype = fu.getParameter("docpublishtype");
+        if (docpublishtype.equals("2")) {
+            //String docmain = fu.getParameter("docmain");
+        	String docmain = Util.toHtml2(Util.encodeAnd(Util.null2String(fu.getParameter("docmain"))));        	
+            this.doccontent = docmain + "!@#$%^&*" + this.doccontent;
+        }
+
+        this.itemid = Util.getIntValue(fu.getParameter("itemid"), 0);
+        this.itemmaincategoryid = Util.getIntValue(fu.getParameter("itemmaincategoryid"), 0);
+        this.hrmresid = Util.getIntValue(fu.getParameter("hrmresid"), 0);
+        this.assetid = Util.getIntValue(fu.getParameter("assetid"), 0);
+        this.crmid = Util.getIntValue(fu.getParameter("crmid"), 0);
+        this.projectid = Util.getIntValue(fu.getParameter("projectid"), 0);
+        this.financeid = Util.getIntValue(fu.getParameter("financeid"), 0);
+        this.doccreaterid = this.userid;
+        this.docCreaterType=this.usertype;
+        // TD1715 新建或者编辑文档时，更改文档的所有者，促使文档所在的部门被清除 DP
+        this.docdepartmentid = Util.getIntValue(hrc.getDepartmentID("" + ownerid));
+        // this.docdepartmentid =
+        // Util.getIntValue(fu.getParameter("docdepartmentid"), 0);
+        this.doccreatedate = formatdate;
+        this.doccreatetime = formattime;
+        this.doclastmoduserid = this.userid;
+        this.docLastModUserType=this.usertype;
+        this.doclastmoddate = formatdate;
+        this.doclastmodtime = formattime;
+        this.docapproveuserid = 0;
+        this.docApproveUserType = "";
+        this.docapprovedate = "";
+        this.docapprovetime = "";
+        this.docarchiveuserid = 0;
+        this.docArchiveUserType = "";
+        this.docarchivedate = "";
+        this.docarchivetime = "";
+        this.newsid = Util.getIntValue(fu.getParameter("newsid"), 0);
+
+        rs = new RecordSet();
+        SysRemindWorkflow srw = new SysRemindWorkflow();
+        String sql = "";
+        if (replydocid != 0) {
+            sql = "select id,canremind,docsubject,doccreaterid from DocDetail where id=" + replydocid;
+            //System.out.println("sql = " + sql);
+            String canRemind = "";
+            rs.executeSql(sql);
+            if (rs.next()) {
+                canRemind = rs.getString("canremind");
+                if (canRemind.equals("2")) {
+                    srw.setSysRemindInfo("回复提醒:" + rs.getString("docsubject"), this.id, 0, 0, 0, this.userid,
+                            rs.getString("doccreaterid") + "", "");
+                }
+            }
+        }
+
+        if (Util.null2String(fu.getParameter("parentids")).equals("")) {
+            this.parentids = this.id + "";
+        } else {
+            this.parentids = Util.null2String(fu.getParameter("parentids")) + "," + this.id;
+        }
+
+        this.keyword = Util.null2String(fu.getParameter("keyword"));
+        /* 文档的关键字 */
+
+        int docid = this.id;
+
+        this.accessorycount = 1;
+
+        if (isreply.equals("1")) {
+            AddReplayDocCount(rs); // 修改回复记录条数
+        }
+
+        /* 回复文档总数 */
+        this.replaydoccount = 0;
+        /* 创建的用户类型 1: 内部 2: 外部 */
+        //this.usertype = Util.null2String(fu.getParameter("usertype"));
+        this.topage = Util.null2String(fu.getParameter("topage"));
+
+        this.contractman = Util.null2String(fu.getParameter("contractman"));
+        this.contractstartdate = Util.null2String(fu.getParameter("contractstartdate"));
+        this.contractenddate = Util.null2String(fu.getParameter("contractenddate"));
+        this.docmodule = Util.null2String(fu.getParameter("docmodule"));
+        this.proenddate = Util.null2String(fu.getParameter("proenddate"));
+        this.typeid = Util.getIntValue(fu.getParameter("typeid"), 0);
+        this.urlfrom = Util.null2String(fu.getParameter("urlfrom"));
+        this.canCopy = "" + Util.getIntValue(fu.getParameter("cancopy"), 1);
+        this.canRemind = "" + Util.getIntValue(fu.getParameter("canremind"), 1);
+
+        // get catagory's orderable
+        this.orderable = "" + scc.getSecOrderable(this.seccategory);
+        
+        this.docEdition = Util.getIntValue(fu.getParameter("docedition"),-1);
+        this.docEditionId = Util.getIntValue(fu.getParameter("doceditionid"),-1);
+        
+        if(scc.isEditionOpen(this.seccategory)) {//如果版本管理开启
+            if(this.docEditionId == -1){// 如果不存在历史版本
+                this.docEditionId = this.getNextEditionId(rs);
+            } else {
+                // TODO 否则，通过版本ID找到同文档的版本
+                //新建文档不存在以前有版本
+            }
+            this.docEdition = dc.getEdition(this.docEditionId)+1;
+        }
+        
+        this.mainDoc = Util.getIntValue(Util.null2String(fu.getParameter("maindoc")),-1);
+        if(this.mainDoc==-1) this.mainDoc = this.id;
+        
+        // added by wdl
+        this.docCode = Util.null2String(fu.getParameter("doccode"));
+        if(this.docCode.equals("")){
+            DocCoder dc = new DocCoder(); 
+            if(this.mainDoc == this.id){
+            	this.docCode = dc.getDocCoder(""+this.seccategory);
+            }else{
+            	this.docCode = dc.getSecDocCoder(""+mainDoc,""+this.seccategory);
+            }
+        }
+        
+        this.readOpterCanPrint = Util.getIntValue(fu.getParameter("readoptercanprint"), 0);
+        
+        this.invalidationDate = Util.null2String(fu.getParameter("invalidationdate"));
+		this.dummycata = Util.null2String(fu.getParameter("dummycata"));
+        
+        if(scc.isNoRepeatedName(this.seccategory)){
+            // TODO
+            
+        }
+        
+        this.docstatus = "1";
+        
+        // 如果在目录上设置了 创建者对此目录下的文档无权限查看则此文档被直接置为正常 TD4111 TD4112 begin
+        RecordSet rsCreater = new RecordSet();
+        int pcreater = 3;
+        String strCreaterSql = "select pcreater from secCreaterDocPope where secid=" + this.seccategory;
+
+        rsCreater.executeSql(strCreaterSql);
+        if (rsCreater.next()) {
+            pcreater = Util.getIntValue(rsCreater.getString("pcreater"), 0);
+        }
+       
+        if (!contractman.equals("")) {
+            this.docstatus = "1";
+            docCreaterType="";
+        }
+        
+        this.secretLevel = Util.getIntValue(fu.getParameter("secretLevel"),DEFAILT_SECRET_LEVEL);
+        this.secretValidity = Util.null2s(fu.getParameter("secretValidity"),"");
+
+        this.replyremind =  Util.getIntValue(fu.getParameter("replyremind"),0);
+
+        AddDocInfo();
+        AddShareInfo();
+        
+        DocViewer DocViewer = new DocViewer();
+        DocViewer.setDocShareByDoc("" + this.id);
+
+		DocComInfo docComInfo =new DocComInfo();
+        RecordSet rsforsend = new RecordSet();
+        SendToAllForNew  sendToAllForNew = new SendToAllForNew();
+        String sendToAll = sendToAllForNew.checkeSendingRightForDocid(  this.id+"");
+        int docId = this.id;
+        //设置推送提醒 start
+        String docstatus = docComInfo.getDocStatus(this.id+"");
+        if("1".equals(sendToAll)){
+            if("3".equals(docstatus)||"6".equals(docstatus)||"9".equals(docstatus)){
+                if("-1".equals(sendToAllForNew.checkIsExist(docId+""))){
+                    rsforsend.executeSql("insert into sendtoalltemp (docid,shareids,status) values ("+docId+",'',0)");
+                }
+            }else if("1".equals(docstatus) || "2".equals(docstatus)){
+                User user = new User(this.userid);
+                ThreadForAllForNew sendToAllfornew = new ThreadForAllForNew(docId+"","",user);
+                sendToAllfornew.start();
+            }
+
+        }
+        //设置推送提醒 end
+    }
+
+    /**
+     * 截取不大于指定字节长度的字符串
+     * @param initString 初始字符串
+     * @param byteLength 指定字节长度
+     * @return String 不大于指定字节长度的字符串
+     */  
+  	private static String interceptString(String initString,int byteLength) {
+  		try{
+  			
+  		    String returnString="";
+  			int counterOfDoubleByte = 0;
+  			byte[] b = initString.getBytes("UTF-8");
+  			  if(b.length <= byteLength)
+  			    return initString;
+  			  for(int i = 0; i < byteLength; i++){
+  			    if(b[i] < 0)
+  			      counterOfDoubleByte++;
+  			  }
+
+  			  if(counterOfDoubleByte % 2 == 0){
+  				returnString=new String(b, 0, byteLength, "UTF-8");
+  			  }else{
+  				returnString=new String(b, 0, byteLength - 1, "UTF-8");
+  			  }
+  			  
+  			  List noInterceptStringList =new ArrayList();
+  			  noInterceptStringList.add("&lt;");
+  			  noInterceptStringList.add("&gt;");  			  
+  			  noInterceptStringList.add("&quot;");
+  			  noInterceptStringList.add("<br>");
+  			  
+  			  List partList=new ArrayList();
+  			  List allList=new ArrayList();
+  			  
+  			  String noInterceptString=null;
+  			  for(int i=0;i<noInterceptStringList.size();i++){
+  				  noInterceptString = Util.null2String((String)noInterceptStringList.get(i));
+  				  for(int j=1;j<noInterceptString.length();j++){
+  					  partList.add(noInterceptString.substring(0,j));
+  					  allList.add(noInterceptString);					  
+  				  }
+  			  }
+  		  			  
+  			  String partString=null;
+  			  String allString=null;
+  			  int lastIndex=0;
+  			
+  			  for(int i=0;i<partList.size();i++){
+  				  partString = (String)partList.get(i);
+  				  allString  = (String)allList.get(i); 
+  				  
+  	  			  if(returnString.endsWith(partString)){
+  	  				  lastIndex = returnString.lastIndexOf(partString);
+  	  				  if(lastIndex==initString.indexOf(allString,lastIndex)){
+  	  					  returnString=initString.substring(0,lastIndex);
+  	  					  break;
+  	  				  }
+  	  			  } 				  
+  			  }  			
+  			  
+  			  return returnString;
+  			
+  		}catch(Exception ex){
+  			return "";
+  		}
+  	}
+
+	public String[] getCustomDataIdMapping() {
+		return customDataIdMapping;
+	}
+
+	public void setCustomDataIdMapping(String[] customDataIdMapping) {
+		this.customDataIdMapping = customDataIdMapping;
+	}
+	
+    /**
+	 * 获得新的下拉框的值
+	 * 
+	 * @param workflowFieldShowName 表单下拉框显示值
+	 * @param workflowFieldValue 表单下拉框字段值
+	 * @param fieldId 文档属性页字段id
+	 * 
+	 * @return String  新的下拉框的值
+	 */		
+	private  String getNewSelectValue(String workflowFieldShowName, String workflowFieldValue,int fieldId) {
+		try{
+			String newSelectValue="";
+			workflowFieldShowName=Util.null2String(workflowFieldShowName);
+			RecordSet rsTwo=new RecordSet();
+			rsTwo.executeSql("select selectValue from cus_selectitem where fieldId="+fieldId+" and selectName='"+Util.toHtml100(workflowFieldShowName)+"'");
+			if(rsTwo.next()){
+				newSelectValue=Util.null2String(rsTwo.getString("selectValue"));
+			}
+			if(newSelectValue.equals("")){
+				newSelectValue=workflowFieldValue;
+			}
+			return newSelectValue;
+		}catch(Exception ex){
+			return workflowFieldValue;
+		}
+	}
+	/**
+	 * 获取第一个查询期间
+	 * @return
+	 */
+	public int getDateDuringForFirst()
+	{
+		BaseBean baseBean = new BaseBean();
+		int date2during = 0;
+		String date2durings = "";
+		try
+		{
+			date2durings = Util.null2String(baseBean.getPropValue("docdateduring", "date2during"));
+		}
+		catch(Exception e)
+		{}
+		String[] date2duringTokens = Util.TokenizerString2(date2durings,",");
+		if(date2duringTokens.length>0)
+		{
+			date2during = Util.getIntValue(date2duringTokens[0],0);
+		}
+		if(date2during<0||date2during>36)
+		{
+			date2during = 0;
+		}
+		return date2during;
+	}
+	
+	/**
+	 * 获取门户文档中心查询间期
+	 * @return
+	 */
+	public int getDateDuringForHp(){
+		BaseBean baseBean = new BaseBean();
+		int date2during = 0;
+		String date2durings = "";
+		try
+		{
+			date2durings = Util.null2String(baseBean.getPropValue("docdateduring", "date2duringforhp"));
+		}
+		catch(Exception e)
+		{}
+		
+		date2during = Util.getIntValue(date2durings,0);
+		
+		if(date2during<0||date2during>36)
+		{
+			date2during = 0;
+		}
+		return date2during;
+	}
+	/**
+	 * 返回文档期间查询sql
+	 * @param date2during
+	 * @return
+	 */
+	public String getDateDuringSql(int date2during)
+	{
+		String strResult = "";
+		Calendar now = Calendar.getInstance();
+        String today=Util.add0(now.get(Calendar.YEAR), 4) +"-"+
+        	Util.add0(now.get(Calendar.MONTH) + 1, 2) +"-"+
+                Util.add0(now.get(Calendar.DAY_OF_MONTH), 2) ;
+        int year=now.get(Calendar.YEAR);
+        int month=now.get(Calendar.MONTH);
+        int day=now.get(Calendar.DAY_OF_MONTH);
+		if(date2during>0&&date2during<37)
+		{
+    		Calendar tempday = Calendar.getInstance();
+    		tempday.clear();
+    		tempday.set(year,month,day-30*date2during);
+    		
+    		String lastday=Util.add0(tempday.get(Calendar.YEAR), 4) +"-"+Util.add0(tempday.get(Calendar.MONTH) + 1, 2) +"-"+Util.add0(tempday.get(Calendar.DAY_OF_MONTH), 2) ;
+    	    strResult+=" and doclastmoddate>'"+lastday+"' ";
+    	}
+		return strResult;
+	}
+	
+    /**
+	 * 更新文档图片对应关系
+	 * 
+	 * @param docid 文档id
+	 * @param doccontent 文档内容
+	 * 
+	 */	
+	private void updateDocImageFileOfPic(int docid,String doccontent){
+		List existsimagefileidlist=new ArrayList();
+		List htmlimagefileidlist=new ArrayList();
+		List deletedimagefileidlist=new ArrayList();
+		int imagefileid=0;
+		RecordSet rsTwo=new RecordSet();
+		rsTwo.executeSql("select imagefileid from docimagefile where docid="+docid+" and docfiletype='1'");
+		while(rsTwo.next()){
+			imagefileid=Util.getIntValue(rsTwo.getString("imagefileid"),-1);
+			existsimagefileidlist.add(""+imagefileid);
+		}
+		List newimagefileidlist=new ArrayList();		
+        int tmppos = doccontent.indexOf("/weaver/weaver.file.FileDownload?fileid=");
+        while (tmppos != -1) {
+        	int imagefileidbeginpos=tmppos+"/weaver/weaver.file.FileDownload?fileid=".length();       	
+        	int imagefileidendpos1=doccontent.indexOf("\"",tmppos);
+        	int imagefileidendpos2=doccontent.indexOf("&",tmppos);
+        	//int imagefileidendpos=imagefileidendpos1<imagefileidendpos2?imagefileidendpos1:imagefileidendpos2;
+        	int imagefileidendpos=imagefileidendpos1;
+        	if(imagefileidendpos1>imagefileidendpos2&&imagefileidendpos2>tmppos){
+        		imagefileidendpos=imagefileidendpos2;
+        	}
+        	
+        	if(imagefileidendpos>imagefileidbeginpos){
+            	imagefileid=Util.getIntValue(doccontent.substring(imagefileidbeginpos,imagefileidendpos));
+				if(imagefileid>0){
+            		htmlimagefileidlist.add(""+imagefileid);
+            	}
+                if(existsimagefileidlist.indexOf(""+imagefileid)==-1){
+                	newimagefileidlist.add(""+imagefileid);
+                }
+        	}
+        	tmppos = doccontent.indexOf("/weaver/weaver.file.FileDownload?fileid=", tmppos + 1);
+        } 
+        for(int i=0;i<newimagefileidlist.size();i++){
+        	imagefileid=Util.getIntValue((String)newimagefileidlist.get(i));
+        	
+        	rsTwo.executeSql("select imagefilename,imagefilewidth,imagefileheight,imagefielsize from docimagefile where imagefileid="+imagefileid+" and docfiletype='1'");
+        	if(rsTwo.next()){
+        		String imagefilename=Util.null2String(rsTwo.getString("imagefilename"));       		
+        		int imagefilewidth=Util.getIntValue(rsTwo.getString("imagefilewidth"),-1);
+        		int imagefileheight=Util.getIntValue(rsTwo.getString("imagefileheight"),-1);
+        		int imagefielsize=Util.getIntValue(rsTwo.getString("imagefielsize"),-1);
+        		
+            	rsTwo.executeProc("imagefile_AddByDoc", ""+imagefileid);
+
+                imgManger.resetParameter();
+                imgManger.setDocid(docid);
+                imgManger.setImagefileid(imagefileid);
+                imgManger.setImagefilename(imagefilename);
+                imgManger.setDocfiletype("1");
+
+                imgManger.setImagefielsize(imagefielsize);
+                imgManger.setimagefilewidth(imagefilewidth);
+                imgManger.setImagefileheight(imagefileheight);
+                
+                imgManger.AddDocImageInfo();              	
+        	}else{
+            	rsTwo.executeSql("select a.imagefilename,a.fileSize,b.docfiletype from ImageFile a,ImageFileTempPic b where a.imageFileId=b.imageFileId and  a.imagefileid ="+imagefileid);
+            	if(rsTwo.next()){
+					String imagefilename=Util.null2String(rsTwo.getString("imagefilename"));       		
+	        		int imagefilewidth=Util.getIntValue("",-1);
+	        		int imagefileheight=Util.getIntValue("",-1);
+	        		int imagefielsize=Util.getIntValue(rsTwo.getString("fileSize"),-1);
+					String docfiletype=Util.null2String(rsTwo.getString("docfiletype"));
+					if(docfiletype.trim().equals("")){
+						docfiletype="1";
+					}
+
+	                imgManger.resetParameter();
+	                imgManger.setDocid(docid);
+	                imgManger.setImagefileid(imagefileid);
+	                imgManger.setImagefilename(imagefilename);
+	                imgManger.setDocfiletype(docfiletype);
+
+	                imgManger.setImagefielsize(imagefielsize);
+	                imgManger.setimagefilewidth(imagefilewidth);
+	                imgManger.setImagefileheight(imagefileheight);
+	                
+	                imgManger.AddDocImageInfo(); 
+	                
+	            	rsTwo.executeSql("delete from ImageFileTempPic where imageFileId="+imagefileid);
+            	}
+			}
+        }
+		for(int i=0;i<existsimagefileidlist.size();i++){
+        	imagefileid=Util.getIntValue((String)existsimagefileidlist.get(i));
+            if(htmlimagefileidlist.indexOf(""+imagefileid)==-1){
+            	deletedimagefileidlist.add(""+imagefileid);
+            }        	
+        }
+        for(int i=0;i<deletedimagefileidlist.size();i++){
+        	imagefileid=Util.getIntValue((String)deletedimagefileidlist.get(i));
+            if(imagefileid>0){
+                imgManger.resetParameter();
+                imgManger.setImagefileid(imagefileid);
+                imgManger.setDocid(docid);
+                imgManger.DeleteSingleDocImageInfo();            	
+            }
+        }  
+	}
+	
+	/**
+	 * 修正创建或者编辑文档时，文档内容中的图片和文档对应关系
+	 * @param docid
+	 * @param docContent
+	 * 备注：该方法建议停用
+	 */
+	public void correctDocImageFileByDocContent(int docid,String docContent){
+		ArrayList list=Util.matchAll(docContent,"/weaver/weaver.file.FileDownload\\?fileid=([0-9]+)",1,1);
+		RecordSet rsTwo= new RecordSet();
+		RecordSet rs2= new RecordSet();
+		for(int i=0;i<list.size();i++){
+			String fileid =  (String)list.get(i);
+			if(!isExists(docid,fileid)){
+				rsTwo.execute("select * from imagefile where imagefileid = '"+fileid+"'");
+				if(rsTwo.next()){
+					String imagefilename=Util.null2String(rsTwo.getString("imagefilename"));       		
+	        		int imagefilewidth=Util.getIntValue("",-1);
+	        		int imagefileheight=Util.getIntValue("",-1);
+	        		int imagefielsize=Util.getIntValue(rsTwo.getString("fileSize"),-1);
+	        		
+	            	rsTwo.executeProc("imagefile_AddByDoc", ""+fileid);
+
+	                imgManger.resetParameter();
+	                imgManger.setDocid(docid);
+	                imgManger.setImagefileid(fileid);
+	                imgManger.setImagefilename(imagefilename);
+	                imgManger.setDocfiletype("1");
+
+	                imgManger.setImagefielsize(imagefielsize);
+	                imgManger.setimagefilewidth(imagefilewidth);
+	                imgManger.setImagefileheight(imagefileheight);
+	                
+	                imgManger.AddDocImageInfo();  
+				}
+			}
+		}
+		
+	}
+	
+	/**
+	 * 判断文档内容中图片是否已经存在
+	 * @param docid
+	 * @param fileid
+	 * @return
+	 */
+	private boolean isExists(int docid,String fileid){
+		boolean flag = false;
+		RecordSet rsTwo= new RecordSet();
+		rsTwo.execute("select count(*) as count from docimagefile where docid='"+docid+"' and imagefileid='"+fileid+"'");
+		if(rsTwo.next()){
+			if(rsTwo.getInt("count")>0){
+				flag = true;
+			}
+		}
+		
+		return flag;
+	}
+	
+    /**
+	 * 更新文档图片对应关系
+	 * 
+	 * @param docid 文档id
+	 * @param deleteaccessory 被删除的附件id
+	 * @return String  被删除的所有版本的附件id
+	 */	
+	private String getAllDeleteaccessory(int docid,String deleteaccessory){
+		
+		if(deleteaccessory==null||deleteaccessory.trim().equals("")){
+			return "";
+		}
+		
+		String returndeleteaccessory=deleteaccessory;
+		int imagefileid=0;
+		RecordSet rsTwo=new RecordSet();
+		rsTwo.executeSql("select imagefileid from docimagefile a where a.docid="+docid+" and exists(select * from docimagefile b where b.docid="+docid+" and b.imagefileid in ("+deleteaccessory+") and b.id=a.id)");
+		while(rsTwo.next()){
+			imagefileid=Util.getIntValue(rsTwo.getString("imagefileid"),-1);
+			if(imagefileid<=0){
+				continue;
+			}
+			if((","+returndeleteaccessory+",").indexOf(","+imagefileid+",")==-1){
+				returndeleteaccessory=returndeleteaccessory+","+imagefileid;
+			}
+		}
+		return returndeleteaccessory;
+	}	
+	public static int getReplyCount125(String docid){
+        RecordSet rs125 = new RecordSet();
+        rs125.executeSql("select replaydoccount from DocDetail where id="+docid);
+        if(rs125.next()) return rs125.getInt(1);
+        return 0;
+  }
+	public String getSource() {
+		return source;
+	}
+
+	public void setSource(String source) {
+		this.source = source;
+	}
+}
diff --git a/src/main/youhong_ai_old_src/weaver/examine/integration/CusSyncData.java b/src/main/youhong_ai_old_src/weaver/examine/integration/CusSyncData.java
new file mode 100644
index 0000000..6099f11
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/examine/integration/CusSyncData.java
@@ -0,0 +1,170 @@
+package weaver.examine.integration;
+
+import aiyh.utils.zwl.common.ToolUtil;
+import com.alibaba.fastjson.JSON;
+import weaver.examine.integration.entity.ApiDepartData;
+import weaver.examine.integration.entity.ApiHrmResourceData;
+import weaver.examine.integration.entity.HrmDepartmentOrCompany;
+import weaver.examine.integration.entity.HrmResource;
+import weaver.examine.integration.sync.SyncFromApi;
+import weaver.interfaces.hrm.*;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+
+/**
+ * @author XiaoBokang
+ * @create 2022/4/26 17:17
+ */
+
+public class CusSyncData extends ToolUtil implements HrmSynService{
+
+    /** 同步结果 */
+    private HashMap<String, Object> synResult = new HashMap<>();
+
+    /**
+     * 同步分部信息
+     * @return
+     */
+    @Override
+    public String SynTimingToOASubCompany() {
+        this.writeDebuggerLog("===================开始同步分部信息===============");
+        SyncFromApi syncFromApi = new SyncFromApi();
+        ApiDepartData apiDepartData = syncFromApi.getApiDepartData();
+        this.writeDebuggerLog("分部信息请求结果："+ JSON.toJSONString(apiDepartData));
+        String code = apiDepartData.getCode();
+        List<Map<String,Object>> syncResultList = new ArrayList<>();
+        if("1".equals(code)){
+            try{
+                List<HrmDepartmentOrCompany> resultData = apiDepartData.getResultData();
+                List<HrmDepartmentOrCompany> subCompanyList = resultData.stream().filter(v -> "0".equals(v.getSign())).collect(Collectors.toList());
+                syncFromApi.syncHrmSubCompany(subCompanyList,syncResultList,"",0);
+            }catch (Exception e){
+                this.writeDebuggerLog("同步分部信息出现异常:"+e);
+            }
+        }
+        synResult.put("1",syncResultList);
+        this.writeDebuggerLog("===================同步分部信息结束===============");
+        return null;
+    }
+
+    /**
+     * 同步部门信息
+     * @return
+     */
+    @Override
+    public String SynTimingToOADepartment() {
+        this.writeDebuggerLog("===================开始同步部门信息===============");
+        SyncFromApi syncFromApi = new SyncFromApi();
+        ApiDepartData apiDepartData = syncFromApi.getApiDepartData();
+        this.writeDebuggerLog("部门信息请求结果："+ JSON.toJSONString(apiDepartData));
+        String code = apiDepartData.getCode();
+        List<Map<String,Object>> syncResultList = new ArrayList<>();
+        if("1".equals(code)){
+            try{
+                List<HrmDepartmentOrCompany> resultData = apiDepartData.getResultData();
+                List<HrmDepartmentOrCompany> departmentList = resultData.stream().filter(v -> "1".equals(v.getSign())).collect(Collectors.toList());
+                syncFromApi.syncHrmDepartment(departmentList,syncResultList);
+            }catch (Exception e){
+                this.writeDebuggerLog("同步部门信息出现异常:"+e);
+            }
+        }
+        synResult.put("2",syncResultList);
+        this.writeDebuggerLog("===================同步部门信息结束================");
+        return null;
+    }
+
+    /**
+     * 同步岗位信息
+     * @return
+     */
+    @Override
+    public String SynTimingToOAJobtitle() {
+        synResult.put("3",null);
+        return null;
+    }
+
+    /**
+     * 同步人员信息
+     * @return
+     */
+    @Override
+    public String SynTimingToOAHrmResource() {
+        this.writeDebuggerLog("===================开始同步人员信息================");
+        SyncFromApi syncFromApi = new SyncFromApi();
+        ApiHrmResourceData apiHrmResourceData = syncFromApi.getApiHrmResourceData();
+        this.writeDebuggerLog("人员信息请求结果："+ JSON.toJSONString(apiHrmResourceData));
+        String code = apiHrmResourceData.getCode();
+        List<Map<String,Object>> syncResultList = new ArrayList<>();
+        if("1".equals(code)){
+            try{
+                List<HrmResource> hrmResourceList = apiHrmResourceData.getResultData();
+                syncFromApi.syncHrmResource(hrmResourceList,syncResultList,"","0");
+            }catch (Exception e){
+                this.writeDebuggerLog("同步人员信息出现异常:"+e);
+            }
+        }
+        synResult.put("4",syncResultList);
+        this.writeDebuggerLog("===================同步人员信息结束===============");
+        return null;
+    }
+
+    @Override
+    public void SynTimingFromOASubCompany(SubCompanyBean[] subCompanyBeans) {
+
+    }
+
+    @Override
+    public void SynTimingFromOADepartment(DepartmentBean[] departmentBeans) {
+
+    }
+
+    @Override
+    public void SynTimingFromOAJobtitle(JobTitleBean[] jobTitleBeans) {
+
+    }
+
+    @Override
+    public void SynTimingFromOAHrmResource(UserBean[] userBeans) {
+
+    }
+
+    @Override
+    public void SynInstantSubCompany(SubCompanyBean subCompanyBean) {
+
+    }
+
+    @Override
+    public void SynInstantDepartment(DepartmentBean departmentBean) {
+
+    }
+
+    @Override
+    public void SynInstantJobtitle(JobTitleBean jobTitleBean) {
+
+    }
+
+    @Override
+    public void SynInstantHrmResource(UserBean userBean) {
+
+    }
+
+    @Override
+    public boolean SynSendMessage(String s, String s1, String s2, String s3, String s4) {
+        return false;
+    }
+
+    @Override
+    public HashMap getSynResult() {
+        return this.synResult;
+    }
+
+    @Override
+    public void removeSynResult() {
+        this.synResult = new HashMap();
+    }
+}
diff --git a/src/main/youhong_ai_old_src/weaver/examine/integration/annotation/FieldMapping.java b/src/main/youhong_ai_old_src/weaver/examine/integration/annotation/FieldMapping.java
new file mode 100644
index 0000000..df81a46
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/examine/integration/annotation/FieldMapping.java
@@ -0,0 +1,18 @@
+package weaver.examine.integration.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * @author XiaoBokang
+ * @create 2022/4/25 11:27
+ */
+
+@Target(ElementType.FIELD)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface FieldMapping {
+    String value();
+    boolean isUnique() default false;
+}
diff --git a/src/main/youhong_ai_old_src/weaver/examine/integration/entity/ApiDepartData.java b/src/main/youhong_ai_old_src/weaver/examine/integration/entity/ApiDepartData.java
new file mode 100644
index 0000000..ce4b2b8
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/examine/integration/entity/ApiDepartData.java
@@ -0,0 +1,17 @@
+package weaver.examine.integration.entity;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author XiaoBokang
+ * @create 2022/4/27 14:55
+ */
+
+@Data
+public class ApiDepartData {
+    /** 状态码（-1：身份验证失败，1：数据获取成功） */
+    private String code;
+    private List<HrmDepartmentOrCompany> resultData;
+}
diff --git a/src/main/youhong_ai_old_src/weaver/examine/integration/entity/ApiHrmResourceData.java b/src/main/youhong_ai_old_src/weaver/examine/integration/entity/ApiHrmResourceData.java
new file mode 100644
index 0000000..ef0e541
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/examine/integration/entity/ApiHrmResourceData.java
@@ -0,0 +1,17 @@
+package weaver.examine.integration.entity;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author XiaoBokang
+ * @create 2022/4/27 14:57
+ */
+
+@Data
+public class ApiHrmResourceData {
+    /** 状态码（-1：身份验证失败，1：数据获取成功） */
+    private String code;
+    private List<HrmResource> resultData;
+}
diff --git a/src/main/youhong_ai_old_src/weaver/examine/integration/entity/HrmDepartmentOrCompany.java b/src/main/youhong_ai_old_src/weaver/examine/integration/entity/HrmDepartmentOrCompany.java
new file mode 100644
index 0000000..5a70d16
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/examine/integration/entity/HrmDepartmentOrCompany.java
@@ -0,0 +1,28 @@
+package weaver.examine.integration.entity;
+
+import lombok.Data;
+
+/**
+ * @author XiaoBokang
+ * @create 2022/4/27 14:45
+ */
+
+@Data
+public class HrmDepartmentOrCompany {
+    /** 机构编码 */
+    private String departmentCode;
+    /** 机构全称 */
+    private String departmentMark;
+    /** 机构简称 */
+    private String departmentName;
+    /** 上级机构编码 */
+    private String higherLevelCode;
+    /** 层级 */
+    private String level;
+    /** 显示顺序 */
+    private String order;
+    /** 机构标识（0：分部，1：部门） */
+    private String sign;
+    /** 状态 */
+    private String status;
+}
diff --git a/src/main/youhong_ai_old_src/weaver/examine/integration/entity/HrmResource.java b/src/main/youhong_ai_old_src/weaver/examine/integration/entity/HrmResource.java
new file mode 100644
index 0000000..ae62907
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/examine/integration/entity/HrmResource.java
@@ -0,0 +1,48 @@
+package weaver.examine.integration.entity;
+
+import com.huawei.shade.com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import lombok.Data;
+import weaver.examine.integration.annotation.FieldMapping;
+
+/**
+ * @author XiaoBokang
+ * @create 2022/4/27 14:45
+ */
+
+@Data
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class HrmResource {
+    /** 人员编码 */
+    @FieldMapping(value = "",isUnique = true)
+    private String employeeNumber;
+    /** 人员名称 */
+    @FieldMapping("lastname")
+    private String employeeName;
+    /** 登录账号 */
+    @FieldMapping("loginid")
+    private String loginAccount;
+    /** 所属机构编码 */
+    @FieldMapping("departmentid")
+    private String institutionCode;
+    /** subCompanyId */
+    @FieldMapping("subcompanyid1")
+    private String subCompanyId;
+    /** 直接上级编码 */
+    @FieldMapping("managerid")
+    private String higherLevelCode;
+    /** 人员状态（1：在职，0：离职） */
+    @FieldMapping("status")
+    private String employeeStatus;
+    /** 性别 */
+    @FieldMapping("sex")
+    private String sex;
+    /** 安全等级 */
+    @FieldMapping("seclevel")
+    private String securityLevel;
+    /** 显示顺序 */
+    @FieldMapping("dsporder")
+    private String showOrder;
+    /** 岗位编码 */
+    @FieldMapping("jobtitle")
+    private String jobtitlecode;
+}
diff --git a/src/main/youhong_ai_old_src/weaver/examine/integration/sync/SyncFromApi.java b/src/main/youhong_ai_old_src/weaver/examine/integration/sync/SyncFromApi.java
new file mode 100644
index 0000000..ab1322b
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/examine/integration/sync/SyncFromApi.java
@@ -0,0 +1,441 @@
+package weaver.examine.integration.sync;
+
+import com.api.xiao.commons.utils.RequestBaseInfo;
+import com.api.xiao.commons.utils.RequestUtil;
+import org.springframework.beans.BeanUtils;
+import weaver.conn.RecordSet;
+import weaver.examine.integration.annotation.FieldMapping;
+import weaver.examine.integration.entity.ApiDepartData;
+import weaver.examine.integration.entity.ApiHrmResourceData;
+import weaver.examine.integration.entity.HrmDepartmentOrCompany;
+import weaver.examine.integration.entity.HrmResource;
+import weaver.general.Util;
+import weaver.hrm.company.DepartmentComInfo;
+import weaver.hrm.company.SubCompanyComInfo;
+import weaver.hrm.finance.SalaryManager;
+import weaver.hrm.resource.HrmSynDAO;
+import weaver.hrm.resource.ResourceComInfo;
+import weaver.interfaces.hrm.HrmServiceManager;
+import weaver.matrix.MatrixUtil;
+
+import java.lang.reflect.Field;
+import java.util.*;
+
+/**
+ * @author XiaoBokang
+ * @create 2022/4/27 14:44
+ */
+
+public class SyncFromApi {
+
+    /**
+     * 获取部门、分部信息
+     * @return ApiDepartData
+     */
+    public ApiDepartData getApiDepartData(){
+        Map<String,String> param = new HashMap<>();
+        Map<String,String> heard = new HashMap<>();
+        param.put("systemid","examine");
+        ApiDepartData apiDepartData = RequestUtil.apiRequest(RequestBaseInfo.create(
+                "GET",
+                "http://124.71.177.157:8080/api/kh/org",
+                heard,
+                param
+        ), ApiDepartData.class);
+        return apiDepartData;
+    }
+
+    /**
+     * 获取人员信息
+     * @return ApiHrmResourceData
+     */
+    public ApiHrmResourceData getApiHrmResourceData(){
+        Map<String,String> param = new HashMap<>();
+        Map<String,String> heard = new HashMap<>();
+        param.put("systemid","examine");
+        ApiHrmResourceData apiHrmResourceData = RequestUtil.apiRequest(RequestBaseInfo.create(
+                "GET",
+                "http://124.71.177.157:8080/api/kh/user",
+                heard,
+                param
+        ), ApiHrmResourceData.class);
+        return apiHrmResourceData;
+    }
+
+    /**
+     * 同步分部信息
+     * @param companyList 分部列表
+     * @param supCompanyId 分部id
+     */
+    public void syncHrmSubCompany(List<HrmDepartmentOrCompany> companyList, List<Map<String,Object>> syncResultList, String highCode, int supCompanyId) throws NoSuchFieldException, IllegalAccessException {
+        List<HrmDepartmentOrCompany> afterList = new ArrayList<>();
+        List<HrmDepartmentOrCompany> highCompanyList = this.filterList(companyList, afterList, "higherLevelCode", highCode, HrmDepartmentOrCompany.class);
+        if(companyList.isEmpty()){
+            return;
+        }
+        for (HrmDepartmentOrCompany hrmCompany : highCompanyList) {
+            //新增的分部id
+            int id = 0;
+            char separator = Util.getSeparator();
+            RecordSet rsSch = new RecordSet();
+            RecordSet updateRecordSet = new RecordSet();
+            RecordSet queryRecordSet = new RecordSet();
+
+            String subCompanyName = hrmCompany.getDepartmentName();
+            String subCompanyMark = hrmCompany.getDepartmentMark();
+            String subCompanyCode = hrmCompany.getDepartmentCode();
+            String level = hrmCompany.getLevel();
+            String order = hrmCompany.getOrder();
+            String status = hrmCompany.getStatus();
+
+            Map<String,Object> syncResult = new HashMap<>();
+            String querySql = "select id from HrmSubCompany where subcompanycode = ?";
+            String updateSql = "";
+            queryRecordSet.executeQuery(querySql,subCompanyCode);
+            if(queryRecordSet.next()){
+                id = Util.getIntValue(queryRecordSet.getString(1));
+                updateSql = "update HrmSubCompany set subcompanyname = ?,subcompanydesc= ?,supsubcomid = ?,showorder = ?,tlevel = ?,canceled = ? where id = ?";
+                boolean flag = updateRecordSet.executeUpdate(updateSql, subCompanyName, subCompanyMark, supCompanyId, order, level, status, id);
+                if (flag){
+                    syncResult = buildItemMap("","",subCompanyName,"1","分部更新成功");
+                    syncResultList.add(syncResult);
+                }else {
+                    syncResult = buildItemMap("","",subCompanyName,"0","分部更新失败");
+                    syncResultList.add(syncResult);
+                    continue;
+                }
+            }else {
+                //使用存储过程新增分部
+                String para = subCompanyName + separator + subCompanyMark + separator + "1" + separator +supCompanyId + separator + "" + separator + order;
+                rsSch.executeProc("HrmSubCompany_Insert", para);
+                if (rsSch.next()) {
+                    id = rsSch.getInt(1);
+                    syncResult = buildItemMap("","",subCompanyName,"1","分部插入成功");
+                    syncResultList.add(syncResult);
+                }else {
+                    syncResult = buildItemMap("","",subCompanyName,"0","分部插入失败");
+                    syncResultList.add(syncResult);
+                    continue;
+                }
+                updateSql = "update HrmSubCompany set subcompanycode = ?,tlevel= ?,canceled = ? where id = ?";
+                updateRecordSet.executeUpdate(updateSql,subCompanyCode,level,status,id);
+            }
+            SubCompanyComInfo sci = new SubCompanyComInfo();
+            //清除全部分部缓存
+            sci.removeCompanyCache();
+            //新增单个分部缓存
+            sci .addCache(String.valueOf(id));
+            //同步分部数据到矩阵
+            MatrixUtil.updateSubcompayData("" + id);
+            //同步下级分部
+            syncHrmSubCompany(afterList,syncResultList,subCompanyCode,id);
+        }
+    }
+
+    /**
+     * 同步部门信息
+     * @param departmentList 部门列表
+     * @param syncResultList 同步结果
+     */
+    public void syncHrmDepartment(List<HrmDepartmentOrCompany> departmentList,List<Map<String,Object>> syncResultList){
+        if(departmentList.isEmpty()){
+            return;
+        }
+        for (HrmDepartmentOrCompany department : departmentList) {
+            //新增的部门id
+            int id = 0;
+            char separator = Util.getSeparator();
+            RecordSet rsSch = new RecordSet();
+            RecordSet updateRecordSet = new RecordSet();
+            RecordSet queryRecordSet = new RecordSet();
+            RecordSet querySubCompanyRecordSet = new RecordSet();
+
+            String departmentName = department.getDepartmentName();
+            String departmentMark = department.getDepartmentMark();
+            String departmentCode = department.getDepartmentCode();
+            String higherLevelCode = department.getHigherLevelCode();
+            String level = department.getLevel();
+            String order = department.getOrder();
+            String status = department.getStatus();
+
+            Map<String,Object> syncResult = new HashMap<>();
+            String supCompanyId = "";
+            String queryCompanySql = "select id from HrmSubCompany where subcompanycode = ?";
+            querySubCompanyRecordSet.executeQuery(queryCompanySql,higherLevelCode);
+            if(querySubCompanyRecordSet.next()){
+                supCompanyId = querySubCompanyRecordSet.getString(1);
+            }
+            String updateSql = "";
+            String querySql = "select id from HrmDepartment where departmentcode = ?";
+            queryRecordSet.executeQuery(querySql,departmentCode);
+            if(queryRecordSet.next()){
+                id = Util.getIntValue(queryRecordSet.getString(1));
+                updateSql = "update HrmDepartment set departmentname = ?,departmentmark= ?,subcompanyid1 = ?,order = ?,tlevel = ?,canceled = ? where id = ?";
+                boolean flag = updateRecordSet.executeUpdate(updateSql, departmentMark, departmentName, supCompanyId, order, level, status, id);
+                if (flag){
+                    syncResult = buildItemMap("","",departmentName,"1","部门更新成功");
+                    syncResultList.add(syncResult);
+                }else {
+                    syncResult = buildItemMap("","",departmentName,"0","部门更新失败");
+                    syncResultList.add(syncResult);
+                    continue;
+                }
+            }else {
+                //使用存储过程新增部门
+                String para = departmentMark + separator + departmentName + separator + "" + separator + "" + separator + supCompanyId + separator + order + separator + "";
+                rsSch.executeProc("HrmDepartment_Insert", para);
+                if (rsSch.next()) {
+                    id = rsSch.getInt(1);
+                    syncResult = buildItemMap("","",departmentName,"1","部门插入成功");
+                    syncResultList.add(syncResult);
+                }else {
+                    syncResult = buildItemMap("","",departmentName,"0","部门插入失败");
+                    syncResultList.add(syncResult);
+                    continue;
+                }
+                updateSql = "update HrmDepartment set departmentcode = ?,tlevel= ?,canceled = ? where id = ?";
+                updateRecordSet.executeUpdate(updateSql,departmentCode,level,status,id);
+            }
+            DepartmentComInfo dci = new DepartmentComInfo();
+            //清除全部部门缓存
+            dci.removeCompanyCache();
+            //新增单个部门缓存
+            dci .addCache(String.valueOf(id));
+            HrmServiceManager hrmServiceManager = new HrmServiceManager();
+            hrmServiceManager.SynInstantDepartment(id+"", "2");
+            //同步分部数据到矩阵
+            MatrixUtil.updateDepartmentData("" + id);
+
+        }
+    }
+
+    /**
+     * 同步人员信息
+     * @param hrmResourceList 人员信息列表
+     * @param syncResultList 同步结果
+     * @param highCode 上级编码
+     * @param managerId 直接上级id
+     * @throws Exception
+     */
+    public void syncHrmResource(List<HrmResource> hrmResourceList, List<Map<String,Object>> syncResultList, String highCode, String managerId) throws Exception {
+        List<HrmResource> afterList = new ArrayList<>();
+        List<HrmResource> highCompanyList = this.filterList(hrmResourceList, afterList, "higherLevelCode", highCode, HrmResource.class);
+        if(hrmResourceList.isEmpty()){
+            return;
+        }
+        RecordSet queryRecordSet = new RecordSet();
+        RecordSet queryDepartRecordSet = new RecordSet();
+        RecordSet updateRecordSet = new RecordSet();
+        ResourceComInfo resourceComInfo = new ResourceComInfo();
+        SalaryManager salaryManager = new SalaryManager();
+        for (HrmResource hrmResource : highCompanyList) {
+            RecordSet rsSch = new RecordSet();
+            String hrmId = "";
+            List<Object> paramList = new ArrayList<>();
+            HrmResource tempHrmResource = new HrmResource();
+            BeanUtils.copyProperties(hrmResource,tempHrmResource);
+            String employeeStatus = tempHrmResource.getEmployeeStatus();
+            employeeStatus = "1".equals(employeeStatus) ? "1" : "5";
+            tempHrmResource.setEmployeeStatus(employeeStatus);
+            String querySql = getQuerySqlByUnique("HrmResource", tempHrmResource, HrmResource.class, paramList);
+            queryRecordSet.executeQuery(querySql,paramList);
+            String departmentId = "";
+            String subCompanyId = "";
+            String queryDepartSql = "select id,subcompanyid1 from HrmDepartment where departmentcode = ?";
+            queryDepartRecordSet.executeQuery(queryDepartSql,tempHrmResource.getInstitutionCode());
+            if(queryDepartRecordSet.next()){
+                departmentId = queryDepartRecordSet.getString(1);
+                subCompanyId = queryDepartRecordSet.getString(2);
+            }
+            tempHrmResource.setInstitutionCode(departmentId);
+            tempHrmResource.setSubCompanyId(subCompanyId);
+            tempHrmResource.setHigherLevelCode(managerId);
+            if(queryRecordSet.next()){
+                hrmId = queryRecordSet.getString(1);
+                List<Object> updateParamList = new ArrayList<>();
+                String updateSql = getUpdateSql("HrmResource",tempHrmResource,HrmResource.class,updateParamList);
+                updateParamList.add(hrmId);
+                boolean flag = updateRecordSet.executeUpdate(updateSql, updateParamList);
+                if (flag){
+                    Map<String, Object> syncResult = buildItemMap("", "", tempHrmResource.getEmployeeName(), "1", "人员更新成功");
+                    syncResultList.add(syncResult);
+                }else {
+                    Map<String, Object> syncResult = buildItemMap("","",tempHrmResource.getEmployeeName(),"0","人员更新失败");
+                    syncResultList.add(syncResult);
+                }
+            }else {
+                rsSch.executeProc("HrmResourceMaxId_Get", "");
+                rsSch.next();
+                //新增的人员id
+                hrmId = "" + rsSch.getInt(1);
+                List<Object> insertParamList = new ArrayList<>();
+                String insertSql = getInsertSql("HrmResource", tempHrmResource, HrmResource.class, insertParamList);
+                boolean flag = updateRecordSet.executeUpdate(insertSql, insertParamList);
+                if (flag){
+                    Map<String, Object> syncResult = buildItemMap("", "", tempHrmResource.getEmployeeName(), "1", "人员插入成功");
+                    syncResultList.add(syncResult);
+                }else {
+                    Map<String, Object> syncResult = buildItemMap("","",tempHrmResource.getEmployeeName(),"0","人员插入失败");
+                    syncResultList.add(syncResult);
+                    continue;
+                }
+                char separator = Util.getSeparator();
+                Calendar calendar = Calendar.getInstance();
+                String today = Util.add0(calendar.get(Calendar.YEAR), 4) + "-" +
+                        Util.add0(calendar.get(Calendar.MONTH) + 1, 2) + "-" +
+                        Util.add0(calendar.get(Calendar.DAY_OF_MONTH), 2);
+                String userParam = "" + 1 + separator + today;
+                rsSch.executeProc("HrmResource_CreateInfo", "" + hrmId + separator + userParam + 	separator + userParam);
+                resourceComInfo.addResourceInfoCache(hrmId);
+                salaryManager.initResourceSalary(hrmId);
+                String para1 = "" + hrmId + separator + "" + separator + tempHrmResource.getInstitutionCode() + separator + tempHrmResource.getSubCompanyId()+ separator + "0" + separator + "0";
+                rsSch.executeProc("HrmResource_Trigger_Insert", para1);
+                String sql_1 = ("insert into HrmInfoStatus (itemid,hrmid) values(1," + hrmId + ")");
+                rsSch.execute(sql_1);
+                String sql_2 = ("insert into HrmInfoStatus (itemid,hrmid) values(2," + hrmId + ")");
+                rsSch.execute(sql_2);
+                String sql_3 = ("insert into HrmInfoStatus (itemid,hrmid) values(3," + hrmId + ")");
+                rsSch.execute(sql_3);
+                String sql_10 = ("insert into HrmInfoStatus (itemid,hrmid) values(10," + hrmId + ")");
+                rsSch.execute(sql_10);
+                resourceComInfo.updateResourceInfoCache(hrmId);
+            }
+            //同步下属
+            syncHrmResource(afterList,syncResultList,hrmResource.getHigherLevelCode(),hrmId);
+        }
+    }
+    /**
+     * 过滤list集合信息
+     * @param sourceList 原始集合
+     * @param afterList 过滤后集合
+     * @param fieldName 过滤字段名
+     * @param paramName 过滤信息
+     * @param tClass 类文件
+     * @return
+     */
+    public <T> List<T> filterList(List<T> sourceList, List<T> afterList,String fieldName,String paramName,Class<T> tClass) throws NoSuchFieldException, IllegalAccessException {
+        List<T> tempList = new ArrayList<>();
+        for (T t : sourceList) {
+            Field declaredField = tClass.getDeclaredField(fieldName);
+            declaredField.setAccessible(true);
+            String value = Util.null2String(declaredField.get(t));
+            if(paramName.equals(value)){
+                tempList.add(t);
+            }else {
+                afterList.add(t);
+            }
+        }
+        return tempList;
+    }
+
+    /**
+     * 通过实体类获取查询语句
+     * @param tableName 表名
+     * @param data 实体类
+     * @param tClass 类文件
+     * @param paramList 查询参数集合（返回）
+     * @param <T> 泛型
+     * @return 查询sql
+     * @throws IllegalAccessException
+     */
+    public <T> String getQuerySqlByUnique(String tableName, T data,Class<T> tClass,List<Object> paramList) throws IllegalAccessException {
+        String querySql = "";
+        StringBuilder queryStringBuilder = new StringBuilder();
+        queryStringBuilder.append("select id from ").append(tableName);
+        Field[] declaredFields = tClass.getDeclaredFields();
+        for (Field field : declaredFields) {
+            field.setAccessible(true);
+            FieldMapping annotation = field.getAnnotation(FieldMapping.class);
+            if(annotation != null){
+                String value = annotation.value();
+                boolean unique = annotation.isUnique();
+                if(unique){
+                    queryStringBuilder.append(" and ").append(value).append(" = ? ");
+                    paramList.add(field.get(data));
+                }
+            }
+        }
+        querySql = queryStringBuilder.toString();
+        if(paramList == null || paramList.isEmpty()){
+            throw new RuntimeException("不存在唯一值");
+        }else {
+            querySql = querySql.replaceFirst(" and"," where");
+        }
+        return querySql;
+    }
+
+    /**
+     * 通过实体类获取更新语句
+     * @param tableName 表名
+     * @param data 实体类
+     * @param tClass 类文件
+     * @param paramList 更新参数集合（返回）
+     * @param <T> 泛型
+     * @return 更新sql
+     * @throws IllegalAccessException
+     */
+    public <T> String getUpdateSql(String tableName,T data,Class<T> tClass,List<Object> paramList) throws IllegalAccessException {
+        String updateSql = "";
+        StringBuilder updateStringBuilder = new StringBuilder();
+        updateStringBuilder.append("update ")
+                .append(tableName).append(" set ");
+        Field[] declaredFields = tClass.getDeclaredFields();
+        for (Field field : declaredFields) {
+            field.setAccessible(true);
+            FieldMapping annotation = field.getAnnotation(FieldMapping.class);
+            if(annotation != null){
+                String fieldName = annotation.value();
+                updateStringBuilder.append(fieldName).append(" = ?,");
+                paramList.add(field.get(data));
+            }
+        }
+        updateSql = updateStringBuilder.toString();
+        updateSql = updateSql.substring(0,updateSql.length()-1);
+        updateSql = updateSql+" where id = ?";
+        return updateSql;
+    }
+
+    /**
+     * 通过实体类获取插入语句
+     * @param tableName 表名
+     * @param data 实体类
+     * @param tClass 类文件
+     * @param paramList 插入参数集合（返回）
+     * @param <T> 泛型
+     * @return 插入sql
+     * @throws IllegalAccessException
+     */
+    public <T> String getInsertSql(String tableName,T data,Class<T> tClass,List<Object> paramList) throws IllegalAccessException {
+        StringBuilder suffixBuilder = new StringBuilder();
+        StringBuilder prefixBuilder = new StringBuilder();
+        prefixBuilder.append("insert into ")
+                .append(tableName).append("(");
+        suffixBuilder.append("(");
+        Field[] declaredFields = tClass.getDeclaredFields();
+        for (Field field : declaredFields) {
+            field.setAccessible(true);
+            FieldMapping annotation = field.getAnnotation(FieldMapping.class);
+            if(annotation != null){
+                String fieldName = annotation.value();
+                prefixBuilder.append(fieldName).append(",");
+                suffixBuilder.append("?,");
+                paramList.add(field.get(data));
+            }
+        }
+        String suffixString = suffixBuilder.substring(0, suffixBuilder.length() - 1);
+        String prefixString = prefixBuilder.substring(0, prefixBuilder.length() - 1);
+        return prefixString + ")" + suffixString+")";
+    }
+
+
+    private Map<String, Object> buildItemMap(String pkcode, String pk, String memo, String succ, String error) {
+        //保存结果
+        HashMap<String, Object> itemMap = new HashMap<>();
+        itemMap.put(weaver.hrm.resource.HrmSynDAO.OUTPK, pkcode);
+        itemMap.put(weaver.hrm.resource.HrmSynDAO.PK, pk);
+        itemMap.put(weaver.hrm.resource.HrmSynDAO.Memo, memo);
+        itemMap.put(weaver.hrm.resource.HrmSynDAO.Success, succ);
+        itemMap.put(HrmSynDAO.ErrorMessage, error);
+        return itemMap;
+    }
+}
diff --git a/src/main/youhong_ai_old_src/weaver/examine/workflow/action/DataToModeAction.java b/src/main/youhong_ai_old_src/weaver/examine/workflow/action/DataToModeAction.java
new file mode 100644
index 0000000..5ec56d9
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/examine/workflow/action/DataToModeAction.java
@@ -0,0 +1,58 @@
+package weaver.examine.workflow.action;
+
+import aiyh.utils.zwl.common.ToolUtil;
+import lombok.Setter;
+import weaver.conn.RecordSet;
+import weaver.examine.workflow.cmd.WorkflowCmd;
+import weaver.general.Util;
+import weaver.interfaces.workflow.action.Action;
+import weaver.soa.workflow.request.RequestInfo;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @author XiaoBokang
+ * @create 2022/4/27 21:05
+ */
+
+@Setter
+public class DataToModeAction extends ToolUtil implements Action {
+
+    private final String CLASS_NAME = "OpenApiAction";
+    private final WorkflowCmd workflowCmd = new WorkflowCmd();;
+
+    /** 建模模块id */
+    private String modelId = "";
+
+    @Override
+    public String execute(RequestInfo requestInfo) {
+        this.writeDebuggerLog(CLASS_NAME,"--------------"+CLASS_NAME+" Begin-----------------");
+        //获取流程RequestId
+        String requestId = Util.null2String(requestInfo.getRequestid());
+        String tableName = requestInfo.getRequestManager().getBillTableName();//表单名称
+        this.writeDebuggerLog(CLASS_NAME,"[tableName:" + tableName + "],[requestId:"+requestId+"]");
+        try{
+            RecordSet workflowMessage = workflowCmd.getWorkflowMessage(tableName, requestId);
+            if(workflowMessage.next()){
+                String bxr = Util.null2String(workflowMessage.getString("bxr"));
+                String fyrq = Util.null2String(workflowMessage.getString("fyrq"));
+                String fysx = Util.null2String(workflowMessage.getString("fysx"));
+                String sbje = Util.null2String(workflowMessage.getString("sbje"));
+                String bxsm = Util.null2String(workflowMessage.getString("bxsm"));
+                Map<String,Object> insertMap = new HashMap<>();
+                insertMap.put("bxr",bxr);
+                insertMap.put("fyrq",fyrq);
+                insertMap.put("fysx",fysx);
+                insertMap.put("sbje",sbje);
+                insertMap.put("bxsm",bxsm);
+                workflowCmd.insertToMode("uf_fybxtj",insertMap);
+            }
+        }catch (Exception e){
+            this.writeDebuggerLog("action执行异常："+e);
+            return Action.FAILURE_AND_CONTINUE;
+        }
+        this.writeDebuggerLog(CLASS_NAME,"--------------"+CLASS_NAME+" end-----------------");
+        return Action.SUCCESS;
+    }
+}
diff --git a/src/main/youhong_ai_old_src/weaver/examine/workflow/cmd/WorkflowCmd.java b/src/main/youhong_ai_old_src/weaver/examine/workflow/cmd/WorkflowCmd.java
new file mode 100644
index 0000000..038a8ed
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/examine/workflow/cmd/WorkflowCmd.java
@@ -0,0 +1,163 @@
+package weaver.examine.workflow.cmd;
+
+import aiyh.utils.zwl.common.ToolUtil;
+import weaver.conn.RecordSet;
+import weaver.formmode.data.ModeDataIdUpdate;
+import weaver.formmode.setup.ModeRightInfo;
+import weaver.general.TimeUtil;
+import weaver.general.Util;
+
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.lang.reflect.Field;
+import java.util.*;
+
+/**
+ * @author XiaoBokang
+ * @create 2022/2/24 17:12
+ */
+
+public class WorkflowCmd extends ToolUtil {
+
+    /**
+     * 查询流程基本信息
+     *
+     * @param tableName 流程主表名
+     * @param requestId 请求id
+     * @return
+     */
+    public RecordSet getWorkflowMessage(String tableName, String requestId) {
+        String querySql = "select * from " + tableName + " where requestId = ?";
+        RecordSet recordSet = new RecordSet();
+        this.writeDebuggerLog("执行查询的sql>>>" + querySql + " requestId>>>" + requestId);
+        recordSet.executeQuery(querySql, requestId);
+        return recordSet;
+    }
+
+    /**
+     * 通过列名将数据库结果集转换成指定的实体类
+     * @param recordSet 数据库结果集
+     * @param tClass 实体类文件
+     * @param <T> 泛型
+     * @return
+     */
+    public  <T> T recordSetToEntityByColumn(RecordSet recordSet,Class<T> tClass){
+        T res = null;
+        try{
+            String[] columnNames = recordSet.getColumnName();
+            if(tClass.equals(Map.class)){
+                Map<String,Object> tempRes = new HashMap<>();
+                for (String columnName : columnNames) {
+                    tempRes.put(columnName,recordSet.getString(columnName));
+                }
+                res = (T) tempRes;
+            }else {
+                res = tClass.newInstance();
+                for (String columnName : columnNames) {
+                    Field declaredField = tClass.getDeclaredField(columnName);
+                    declaredField.setAccessible(true);
+                    String value = recordSet.getString(columnName);
+                    declaredField.set(res,value);
+                }
+            }
+        }catch (Exception e){
+            String exceptionStr = getExceptionStr(e);
+            this.writeDebuggerLog("转换成实体类异常："+exceptionStr);
+        }
+        return res;
+    }
+
+    /**
+     * 将接口调用信息插入至建模中
+     * @param tableName 表名
+     * @param param 插入信息
+     * @return
+     */
+    public int insertToMode(String tableName,Map<String,Object> param){
+        this.writeDebuggerLog("=====插入日志信息====");
+        String modeId = this.getModeIdByTableName(tableName);
+        this.writeDebuggerLog("通过表名获取modeId ==>modeId"+modeId+" tableName==>"+tableName);
+        ModeDataIdUpdate mdu = ModeDataIdUpdate.getInstance();
+        ModeRightInfo mri = new ModeRightInfo();
+        Map<String,Object> whereParam = new HashMap<>();
+        int dataId = mdu.getModeDataNewId(tableName, Util.getIntValue(modeId,-1), 1, 0, TimeUtil.getCurrentDateString(), TimeUtil.getOnlyCurrentTimeString());
+        whereParam.put("id",dataId);
+        boolean updateFlag = this.updateMode(tableName, param, whereParam);
+        if(updateFlag){
+            mri.rebuildModeDataShareByEdit(1, Util.getIntValue(modeId,-1),dataId);
+        }
+        return dataId;
+    }
+
+    /**
+     * 构建更新语句
+     *
+     * @param tableName   表名
+     * @param updateParam 更新参数
+     * @param whereParam  条件参数
+     * @return
+     */
+    public boolean updateMode(String tableName, Map<String, Object> updateParam, Map<String, Object> whereParam) {
+
+        RecordSet recordSet = new RecordSet();
+        //构建更新sql语句,收集参数信息
+        List<Object> paramList = new ArrayList<>();
+        StringBuilder updateBuilder = new StringBuilder("update ");
+        updateBuilder.append(tableName).append(" set ");
+        Set<Map.Entry<String, Object>> updateEntries = updateParam.entrySet();
+        for (Map.Entry<String, Object> updateEntry : updateEntries) {
+            updateBuilder.append(updateEntry.getKey())
+                    .append(" = ?,");
+            paramList.add(updateEntry.getValue());
+        }
+        StringBuilder whereBuilder = new StringBuilder(" where 1=1 ");
+        Set<Map.Entry<String, Object>> whereEntries = whereParam.entrySet();
+        for (Map.Entry<String, Object> whereEntry : whereEntries) {
+            whereBuilder.append(" and ")
+                    .append(whereEntry.getKey())
+                    .append(" = ? ");
+            paramList.add(whereEntry.getValue());
+        }
+        String preStr = updateBuilder.substring(0, updateBuilder.length() - 1) + " ";
+        String fixStr = whereBuilder.toString();
+        String updateSql = preStr + fixStr;
+        this.writeDebuggerLog("向表"+tableName+"更新数据>>>" + updateSql + " param:" + paramList);
+        boolean updateFlag = recordSet.executeUpdate(updateSql, paramList);
+        this.writeDebuggerLog("更新标识：" + updateFlag);
+        return updateFlag;
+    }
+
+    /**
+     * 通过表名查询模块id
+     * @param tableName 表名
+     * @return
+     */
+    public String getModeIdByTableName(String tableName){
+        String modeId = "";
+        String querySql = "select id from modeinfo where formid = (select id from workflow_bill where tablename = ?)";
+        RecordSet recordSet = new RecordSet();
+        recordSet.executeQuery(querySql,tableName);
+        if(recordSet.next()){
+            modeId = Util.null2String(recordSet.getString("id"));
+        }
+        return modeId;
+    }
+
+    /**
+     * 获取堆栈中的异常信息
+     * @param throwable 异常
+     * @return
+     */
+    public static String getExceptionStr(Throwable throwable){
+        StringWriter stringWriter = new StringWriter();
+        throwable.printStackTrace(new PrintWriter(stringWriter,true));
+        String s = stringWriter.getBuffer().toString();
+        try{
+            stringWriter.close();
+        }catch (Exception ignored){
+            ignored.printStackTrace();
+        }
+        return s;
+    }
+
+}
diff --git a/src/main/youhong_ai_old_src/weaver/file/FileUpload.java b/src/main/youhong_ai_old_src/weaver/file/FileUpload.java
new file mode 100644
index 0000000..2184c6a
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/file/FileUpload.java
@@ -0,0 +1,1382 @@
+package weaver.file;
+
+
+/**
+ * Title:        hpsales
+ * Description:  for hp sales system
+ * Copyright:    Copyright (c) 2001
+ * Company:      weaver
+ *
+ * @author liuyu, Charoes Huang
+ * @version 1.0 ,2004-6-25
+ */
+
+import org.apache.commons.lang.StringEscapeUtils;
+import org.apache.commons.lang.StringUtils;
+import weaver.alioss.AliOSSObjectManager;
+import weaver.conn.RecordSet;
+import weaver.docs.docs.DocManager;
+import weaver.docs.docs.ImageFileIdUpdate;
+import weaver.email.MailCommonUtils;
+import weaver.email.service.MailAliOSSService;
+import weaver.file.multipart.DefaultFileRenamePolicy;
+import weaver.file.multipart.MultipartRequest;
+import weaver.file.multipart.UploadedFile;
+import weaver.file.util.FileSuffixCheckUtil;
+import weaver.file.util.PicCompression;
+import weaver.filter.XssUtil;
+import weaver.general.BaseBean;
+import weaver.general.GCONST;
+import weaver.general.StaticObj;
+import weaver.general.Util;
+import weaver.security.util.SecurityMethodUtil;
+import weaver.system.SystemComInfo;
+
+import javax.servlet.http.HttpServletRequest;
+import java.io.*;
+import java.net.URLDecoder;
+import java.util.*;
+import java.util.List;
+import java.util.zip.ZipInputStream;
+
+public class FileUpload extends BaseBean {
+	private static ImageFileIdUpdate imageFileIdUpdate = new ImageFileIdUpdate();
+
+
+	private MultipartRequest mpdata = null;
+	HttpServletRequest request = null;
+	private String[] filenames = null;
+	private InputStream source = null;
+	private ArrayList filesizes = new ArrayList();
+	private ArrayList imagewidth = new ArrayList();
+	private ArrayList imageheight = new ArrayList();
+	private ArrayList delfilerealpaths = new ArrayList();
+	private int mailid;
+	private boolean needimagewidth = false;
+	private boolean needzip = false;
+	private boolean needzipencrypt = false;
+	private String isaesencrypt = "0";
+	private String aescode = "";
+	private String remoteAddr = "";
+	private XssUtil xss = null;
+
+	public FileUpload(HttpServletRequest request) {
+		this.remoteAddr = request.getRemoteAddr();
+		if (isMultipartData(request)) mpdata = getAttachment(request);
+		this.request = request;
+		this.xss = new XssUtil();
+	}
+
+	public FileUpload(HttpServletRequest request, String encode) {
+		this.remoteAddr = request.getRemoteAddr();
+		if (isMultipartData(request)) mpdata = getAttachment(request, encode);
+		this.request = request;
+		this.xss = new XssUtil();
+	}
+
+	public FileUpload(HttpServletRequest request, String encode, boolean iszip, String isEmail) {
+		this.remoteAddr = request.getRemoteAddr();
+		if (isMultipartData(request) && "1".equals(isEmail)) mpdata = getEmailAttachment(request, encode, iszip);
+		this.request = request;
+		this.xss = new XssUtil();
+	}
+
+	public FileUpload(HttpServletRequest request, String encode, boolean iszip) {
+		this.remoteAddr = request.getRemoteAddr();
+		if (isMultipartData(request)) mpdata = getAttachment(request, encode, iszip);
+		this.request = request;
+		this.xss = new XssUtil();
+	}
+
+	public FileUpload(HttpServletRequest request, String encode, boolean iszip, boolean isoriginal) {
+		this.remoteAddr = request.getRemoteAddr();
+		if (isMultipartData(request)) mpdata = getAttachment(request, encode, iszip, isoriginal);
+		this.request = request;
+		this.xss = new XssUtil();
+	}
+
+	//modify by mackjoe at 2005-11-28 td3282 获得request对象
+	public HttpServletRequest getRequest() {
+		return request;
+	}
+
+	//for license upload by chenyingjie 2003-06-26
+	public FileUpload(HttpServletRequest request, boolean iszip) {
+		this.remoteAddr = request.getRemoteAddr();
+		if (isMultipartData(request)) mpdata = getAttachment(request, iszip);
+		this.request = request;
+	}
+
+	public FileUpload(HttpServletRequest request, boolean iszip, boolean isaesencrypt) {
+		this.remoteAddr = request.getRemoteAddr();
+		if (isMultipartData(request)) mpdata = getAttachment(request, iszip, isaesencrypt);
+		this.request = request;
+	}
+
+
+	//for homepage image upload by dongping 2006-8-24
+	public FileUpload(HttpServletRequest request, boolean iszip, String strDirAddr) {
+		this.remoteAddr = request.getRemoteAddr();
+		if (isMultipartData(request)) mpdata = getAttachment(request, iszip, strDirAddr);
+		this.request = request;
+	}
+
+	//html模板图片保存
+	public FileUpload(HttpServletRequest request, boolean iszip, boolean encoding, String strDirAddr) {
+		this.remoteAddr = Util.getIpAddr(request);
+		if (isMultipartData(request)) mpdata = getAttachment(request, iszip, encoding, strDirAddr);
+		this.request = request;
+	}
+
+	public Hashtable getUploadImgNames() {
+		String el = "", imgpath = "", imgname = "";
+		Hashtable ht = new Hashtable();
+		for (Enumeration e = mpdata.getFileUploadNames(); e.hasMoreElements(); ) {
+			el = (String) e.nextElement();
+			if (el.indexOf("docimages_") == -1) continue;
+			imgpath = Util.null2String(mpdata.getFilePath(el));
+			imgname = Util.null2String(mpdata.getFileName(el));
+			if (imgpath.equals("") || imgname.equals("")) continue;
+			String elNumber = el.substring(el.indexOf("_") + 1, el.length());
+			ht.put(elNumber, imgpath + imgname);
+
+		}
+		return ht;
+	}
+
+	public Hashtable getUploadFileNames() {
+		String el = "", imgpath = "", imgname = "";
+		Hashtable ht = new Hashtable();
+		for (Enumeration e = mpdata.getFileUploadNames(); e.hasMoreElements(); ) {
+			el = (String) e.nextElement();
+			UploadedFile uploadedFile = mpdata.getUploadedFile(el);
+			ht.put(el, uploadedFile);
+		}
+		return ht;
+	}
+
+	//modify by xhheng @20050315 for 流程附件上传
+	public String getRemoteAddr() {
+		return remoteAddr;
+	}
+
+	public String getParameter(String key) throws RuntimeException {
+		if (!isMultipartData(request)) return Util.null2String(request.getParameter(key));
+		if (mpdata == null) return "";
+//        return Util.null2String(mpdata.getParameter(key)) ;
+
+		try {
+			String value = Util.null2String(mpdata.getParameter(key));
+			if (!value.equals("")) {//特殊参数需要从paramsMap中获取
+				if (value.startsWith(XssUtil.__RANDOM__)) {
+					//xssUtil.cacheKey(Util.null2String(Thread.currentThread().hashCode()),value);
+					return xss.get(value);
+				}
+			}
+			return new String(value.getBytes("ISO8859_1"), "UTF-8");
+		} catch (Exception ex) {
+			return "";
+		}
+	}
+
+
+	public String getParameter2(String key) {
+		if (!isMultipartData(request)) return Util.null2String(request.getParameter(key));
+		if (mpdata == null) return "";
+		String value = Util.null2String(mpdata.getParameter(key));
+		return value;
+	}
+
+	/**
+	 * 本方法返回值不会对null进行特殊处理，如果是null则直接返回null，
+	 * 如果是空字符串("")则直接返回空字符串("")。
+	 *
+	 * @param key
+	 * @return
+	 */
+	public String getParameter3(String key) {
+		if (!isMultipartData(request)) {
+			return request.getParameter(key);
+		}
+		if (mpdata == null) {
+			return null;
+		}
+
+		String value = mpdata.getParameter(key);
+		if (value == null) {
+			return null;
+		}
+
+		try {
+			return new String(value.getBytes("ISO8859_1"), "UTF-8");
+		} catch (Exception ex) {
+			return value;
+		}
+	}
+
+	public String[] getParameters(String key) {
+		if (!isMultipartData(request)) return request.getParameterValues(key);
+		if (mpdata == null) return null;
+		String[] values = mpdata.getParameterValues(key);
+		return values;
+	}
+
+	public Enumeration getParameterNames() {
+		if (!isMultipartData(request)) return request.getParameterNames();
+		if (mpdata == null) return null;
+		return mpdata.getParameterNames();
+	}
+
+	public String[] getParameterValues(String name) {
+		if (!isMultipartData(request)) return request.getParameterValues(name);
+		if (mpdata == null) return null;
+		String[] values = mpdata.getParameterValues(name);
+		return values;
+	}
+
+	public String[] getParameterValues2(String name) {
+		String[] values = null;
+		if (!isMultipartData(request)) {
+			values = request.getParameterValues(name);
+			String[] multivalues = new String[values.length];
+			try {
+				for (int i = 0; i < values.length; i++) {
+					multivalues[i] = new String(Util.null2String(values[i]).getBytes("ISO8859_1"), "UTF-8");
+				}
+			} catch (UnsupportedEncodingException e) {
+				e.printStackTrace();
+			}
+			return multivalues;
+		}
+		if (mpdata == null) return null;
+		values = mpdata.getParameterValues(name);
+		String[] multivalues = new String[values.length];
+		try {
+			for (int i = 0; i < values.length; i++) {
+				multivalues[i] = new String(Util.null2String(values[i]).getBytes("ISO8859_1"), "UTF-8");
+			}
+		} catch (UnsupportedEncodingException e) {
+			e.printStackTrace();
+		}
+		return multivalues;
+	}
+
+
+	public String getFileName() {
+		return this.filenames[0].replace("'", "’");
+	}
+
+	public String[] getFileNames() {
+		return this.filenames;
+	}
+
+	public void setFileNames(String[] filenames) {
+		this.filenames = filenames;
+	}
+
+	public int getFileSize() {
+		return Util.getIntValue((String) this.filesizes.get(0));
+	}
+
+	public int[] getFileSizes() {
+		int[] filesizearr = new int[filesizes.size()];
+		for (int i = 0; i < filesizes.size(); i++) filesizearr[i] = Util.getIntValue((String) this.filesizes.get(i));
+		return filesizearr;
+	}
+
+	public void setFileSizes(ArrayList filesizes) {
+		this.filesizes = filesizes;
+	}
+
+	public int getWidth() {
+		return Util.getIntValue((String) this.imagewidth.get(0));
+	}
+
+	public int getHeight() {
+		return Util.getIntValue((String) this.imageheight.get(0));
+	}
+
+	public int[] getWidths() {
+		int[] imagewidtharr = new int[imagewidth.size()];
+		for (int i = 0; i < imagewidth.size(); i++)
+			imagewidtharr[i] = Util.getIntValue((String) this.imagewidth.get(i));
+		return imagewidtharr;
+	}
+
+	public int[] getHeights() {
+		int[] imageheightarr = new int[imageheight.size()];
+		for (int i = 0; i < imageheight.size(); i++)
+			imageheightarr[i] = Util.getIntValue((String) this.imageheight.get(i));
+		return imageheightarr;
+	}
+
+	public void setMailid(int mailid) {
+		this.mailid = mailid;
+	}
+
+	public int getMailid() {
+		return mailid;
+	}
+
+	public void needImagewidth(boolean needimagewidth) {
+		this.needimagewidth = needimagewidth;
+	}
+
+	public ArrayList getDelFilerealpaths() {
+		return delfilerealpaths;
+	}
+
+
+	public String uploadFiles(String uploadname) {
+		String[] uploadnames = new String[1];
+		uploadnames[0] = uploadname;
+		String paramFileName = this.getParameter("name"); //获取参数当中的文件名
+		//String[] filenames = uploadFiles(uploadnames) ;
+		String[] filenames = uploadFiles(uploadnames, paramFileName);
+		if (filenames == null || filenames.length < 1) {
+			return null;
+		}
+		return filenames[0];
+	}
+
+	//add by liuy 20190705 start
+	/* 上传文件文件名IOS系统出现错误问题修复
+	 *
+	 */
+	public String[] uploadFiles(String[] uploadnames, String paramFileName) {
+		if (mpdata == null) return null;
+
+		int upload_numbers = uploadnames.length;
+		String[] fileids = new String[upload_numbers];
+		this.filenames = new String[upload_numbers];
+		for (int i = 0; i < upload_numbers; i++) {
+			filenames[i] = SecurityMethodUtil.textXssClean(mpdata.getOriginalFileName(uploadnames[i]));
+			if (filenames[i] == null || "".equals(filenames[i])) {
+				return fileids;
+			}
+			//满足三个条件，否则走else；
+			//1 请求参数未包含文件名
+			//2 有请求参数并且和上传文件流里的文件名参数一致
+			//3 值不一致，但是文件流里的文件名为file，防止 IOS篡改
+			if (StringUtils.isBlank(paramFileName) || paramFileName.equals(filenames[i]) || (!paramFileName.equals(filenames[i]) && !"file".equals(filenames[i]))) {
+				fileids[i] = saveFile(uploadnames[i], mpdata);
+			} else {
+				filenames[i] = paramFileName; //修改文件名
+				fileids[i] = saveFile(uploadnames[i], paramFileName, mpdata);
+			}
+
+		}
+		return fileids;
+	}
+
+	public String[] uploadFiles(String[] uploadnames) {
+		if (mpdata == null) return null;
+		int upload_numbers = uploadnames.length;
+		String[] fileids = new String[upload_numbers];
+		this.filenames = new String[upload_numbers];
+		for (int i = 0; i < upload_numbers; i++) {
+			filenames[i] = SecurityMethodUtil.textXssClean(mpdata.getOriginalFileName(uploadnames[i]));
+			if (filenames[i] != null && !filenames[i].equals("")) {
+				fileids[i] = saveFile(uploadnames[i], mpdata);
+			}
+		}
+		return fileids;
+	}
+
+	/**
+	 * 处理邮件模块上传的附件存储
+	 *
+	 * @param uploadname
+	 * @return
+	 */
+	public String uploadFilesToEmail(String uploadname) {
+		String[] uploadnames = new String[1];
+		uploadnames[0] = uploadname;
+		String[] filenames = uploadFilesToEmail(uploadnames);
+		return filenames[0];
+	}
+
+	/**
+	 * 处理邮件模块上传的附件存储
+	 *
+	 * @param uploadnames
+	 * @return
+	 */
+	public String[] uploadFilesToEmail(String[] uploadnames) {
+		if (mpdata == null) return null;
+		int upload_numbers = uploadnames.length;
+		String[] fileids = new String[upload_numbers];
+		this.filenames = new String[upload_numbers];
+		for (int i = 0; i < upload_numbers; i++) {
+			filenames[i] = SecurityMethodUtil.textXssClean(mpdata.getOriginalFileName(uploadnames[i]));
+			if (filenames[i] != null && !filenames[i].equals("")) {
+				fileids[i] = saveFileToEmail(uploadnames[i], mpdata);
+			}
+		}
+		return fileids;
+	}
+
+	/**
+	 * 保存邮件附件记录到mailresourcefile表。
+	 *
+	 * @param uploadname
+	 * @param mpdata
+	 * @return
+	 */
+	private synchronized String saveFileToEmail(String uploadname, MultipartRequest mpdata) {
+		String imageid = "";
+		String filepath = mpdata.getFilePath(uploadname);
+		String filename = mpdata.getFileName(uploadname);
+		String originalfilename = SecurityMethodUtil.textXssClean(mpdata.getOriginalFileName(uploadname));
+		writeLog("-saveFileToEmail-filename:" + filename + "-originalfilename:" + originalfilename);
+		originalfilename = StringEscapeUtils.unescapeHtml(originalfilename);
+		writeLog("-saveFileToEmail-unescapeHtml-originalfilename:" + originalfilename);
+		String contenttype = mpdata.getContentType(uploadname);
+		long filesize = mpdata.getFileSize(uploadname);
+		String filerealpath = filepath + filename;
+		// WeavermailComInfo wmc = new WeavermailComInfo() ;
+		String isfileattrachment = "1";// wmc.getCurrentFileAttachment() ;
+		String fileContentId = "";// wmc.getCurrentFileContentId();
+		String isEncoded = "";// wmc.getCurrentFilenameencode();
+		String secretLevel = Util.null2s(getParameter("secretLevel"), "4");
+		String secretDeadline = Util.null2s(getParameter("secretLevelValidity"), "");
+
+		//判断实体文件是否存在，如果不存在，保存失败。
+		File file = new File(filerealpath);
+		if (!file.exists()) {
+			writeLog("检测到实体文件不存在，附件上传失败.originalfilename=" + originalfilename + ",filerealpath=" + filerealpath);
+			return imageid;
+		}
+
+		String iszip = "0";
+		String isencrypt = "0";
+		if (needzip) iszip = "1";
+		if (needzipencrypt) isencrypt = "1";
+
+		originalfilename = escapeSpecialCharactersForFileName(originalfilename);
+
+		RecordSet rs = new RecordSet();
+		char separator = Util.getSeparator();
+		String mailFileUUID = MailCommonUtils.getRandomUUID();
+		String para = "0" + separator + originalfilename + separator + contenttype + separator + filerealpath
+				+ separator + iszip + separator + isencrypt + separator + isfileattrachment + separator + fileContentId
+				+ separator + isEncoded + separator + String.valueOf(filesize) + separator + mailFileUUID;
+		rs.executeProc("MailResourceFile_Insert", para);
+		rs.executeQuery("select id from MailResourceFile where mrf_uuid = ?", mailFileUUID);
+		if (rs.next()) {
+			imageid = rs.getString("id");
+		}
+
+		// 更新加密信息
+		rs.executeUpdate("update MailResourceFile set isaesencrypt=?, aescode=?, secretLevel=?, secretDeadline=? where id=?", isaesencrypt, aescode, secretLevel, secretDeadline, imageid);
+
+		//处理oss存储逻辑
+		MailAliOSSService mailAliOSSService = new MailAliOSSService();
+		mailAliOSSService.updateFileToOSSByUUID(mailFileUUID);
+
+		return imageid;
+	}
+
+	/**
+	 * 过滤附件名称里的特殊字符，防止入库 是出现 问号?
+	 *
+	 * @param fileName
+	 * @return
+	 */
+	private String escapeSpecialCharactersForFileName(String fileName) {
+		fileName = Util.null2String(fileName);
+
+		fileName = fileName.replaceAll("(\r\n|\r|\n|\n\r)", "").replaceAll("\t", ""); // 替换换行符，tab符
+
+		//替换英文半角字符,防止半角字符展示为？问号 https://tbatm.iteye.com/blog/2196068
+		byte bytes[] = {(byte) 0xC2, (byte) 0xA0};
+		try {
+			String UTFSpace = new String(bytes, "utf-8");
+			fileName = fileName.replaceAll(UTFSpace, " ");
+		} catch (UnsupportedEncodingException e) {
+			e.printStackTrace();
+		}
+		return fileName;
+	}
+
+
+	/**
+	 * 处理邮件模块上传的附件存储
+	 *
+	 * @param uploadnames
+	 * @param withsave
+	 * @return
+	 */
+	public ArrayList uploadFilesToMail(String[] uploadnames, String withsave) {
+		if (mpdata == null) return null;
+		int upload_numbers = uploadnames.length;
+		ArrayList filecontents = new ArrayList();
+		this.filenames = new String[upload_numbers];
+		for (int i = 0; i < upload_numbers; i++) {
+			String tempfilename = SecurityMethodUtil.textXssClean(mpdata.getOriginalFileName(uploadnames[i]));
+			if (tempfilename != null && !tempfilename.equals("")) {
+				filenames[i] = tempfilename;
+				filecontents.add(getFileContent(uploadnames[i], mpdata, withsave));
+			}
+		}
+		return filecontents;
+	}
+
+
+	private MultipartRequest getAttachment(HttpServletRequest req) {
+		if (isMultipartData(req))
+			try {
+				DefaultFileRenamePolicy defpolicy = new DefaultFileRenamePolicy();
+				SystemComInfo syscominfo = new SystemComInfo();
+				String createdir = getCreateDir(syscominfo.getFilesystem());
+				isaesencrypt = syscominfo.getIsaesencrypt();
+				aescode = Util.getRandomString(13);
+				if ((syscominfo.getNeedzip()).equals("1")) needzip = true;
+				//       if( (syscominfo.getNeedzipencrypt()).equals("1") ) needzipencrypt = true ;
+
+				return new MultipartRequest(req, createdir, req.getContentLength(), defpolicy, needzip, needzipencrypt, "", isaesencrypt, aescode);
+			} catch (Exception ex) {
+				writeLog(ex);
+				return null;
+			}
+		return null;
+	}
+
+	private MultipartRequest getAttachment(HttpServletRequest req, String encoding) {
+		if (isMultipartData(req))
+			try {
+				DefaultFileRenamePolicy defpolicy = new DefaultFileRenamePolicy();
+				SystemComInfo syscominfo = new SystemComInfo();
+				String createdir = getCreateDir(syscominfo.getFilesystem());
+				isaesencrypt = syscominfo.getIsaesencrypt();
+				aescode = Util.getRandomString(13);
+				if ((syscominfo.getNeedzip()).equals("1")) needzip = true;
+				//       if( (syscominfo.getNeedzipencrypt()).equals("1") ) needzipencrypt = true ;
+
+				return new MultipartRequest(req, createdir, req.getContentLength(), defpolicy, needzip, needzipencrypt, encoding, isaesencrypt, aescode);
+			} catch (Exception ex) {
+				writeLog(ex);
+				return null;
+			}
+		return null;
+	}
+
+	private MultipartRequest getEmailAttachment(HttpServletRequest req, String encoding, boolean iszip) {
+		if (isMultipartData(req))
+			try {
+				DefaultFileRenamePolicy defpolicy = new DefaultFileRenamePolicy();
+				SystemComInfo syscominfo = new SystemComInfo();
+
+				//               String createdir = getCreateDir(syscominfo.getFilesystem()) ;
+				String createdir = GCONST.getRootPath() + "filesystem" + File.separatorChar;
+				createdir = getCreateDir(createdir + File.separatorChar);
+				RecordSet rs = new RecordSet();
+				rs.execute("select filePath from MailConfigureInfo");
+				while (rs.next()) {
+					String emailpath = rs.getString("filePath");
+					if (!"".equals(emailpath)) {
+						createdir = getCreateDir(emailpath + File.separatorChar);
+					}
+				}
+
+				isaesencrypt = syscominfo.getIsaesencrypt();
+				aescode = Util.getRandomString(13);
+				needzip = iszip;
+				//       if( (syscominfo.getNeedzipencrypt()).equals("1") ) needzipencrypt = true ;
+
+				return new MultipartRequest(req, createdir, req.getContentLength(), defpolicy, needzip, needzipencrypt, encoding, isaesencrypt, aescode);
+			} catch (Exception ex) {
+				writeLog(ex);
+				return null;
+			}
+		return null;
+	}
+
+	protected MultipartRequest getAttachment(HttpServletRequest req, String encoding, boolean iszip) {
+		if (isMultipartData(req))
+			try {
+				DefaultFileRenamePolicy defpolicy = new DefaultFileRenamePolicy();
+				SystemComInfo syscominfo = new SystemComInfo();
+				String createdir = getCreateDir(syscominfo.getFilesystem());
+				isaesencrypt = syscominfo.getIsaesencrypt();
+				aescode = Util.getRandomString(13);
+				needzip = iszip;
+				//       if( (syscominfo.getNeedzipencrypt()).equals("1") ) needzipencrypt = true ;
+
+				return new MultipartRequest(req, createdir, req.getContentLength(), defpolicy, needzip, needzipencrypt, encoding, isaesencrypt, aescode);
+			} catch (Exception ex) {
+				writeLog(ex);
+				return null;
+			}
+		return null;
+	}
+
+	private MultipartRequest getAttachment(HttpServletRequest req, String encoding, boolean iszip, boolean original) {
+		if (isMultipartData(req))
+			try {
+				DefaultFileRenamePolicy defpolicy = null;
+				SystemComInfo syscominfo = new SystemComInfo();
+				String createdir = getCreateDir(syscominfo.getFilesystem());
+				isaesencrypt = "0";
+				aescode = Util.getRandomString(13);
+				needzip = false;
+				if (!original) {
+					isaesencrypt = syscominfo.getIsaesencrypt();
+					aescode = Util.getRandomString(13);
+					needzip = iszip;
+				}
+
+				//       if( (syscominfo.getNeedzipencrypt()).equals("1") ) needzipencrypt = true ;
+
+				return new MultipartRequest(req, createdir, req.getContentLength(), defpolicy, needzip, needzipencrypt, encoding, isaesencrypt, aescode);
+			} catch (Exception ex) {
+				writeLog(ex);
+				return null;
+			}
+		return null;
+	}
+
+	//for license upload by chenyingjie 2003-06-26
+	private MultipartRequest getAttachment(HttpServletRequest req, boolean iszip) {
+		if (isMultipartData(req))
+			try {
+				DefaultFileRenamePolicy defpolicy = new DefaultFileRenamePolicy();
+				SystemComInfo syscominfo = new SystemComInfo();
+				String createdir = getCreateDir(syscominfo.getFilesystem());
+				isaesencrypt = syscominfo.getIsaesencrypt();
+				aescode = Util.getRandomString(13);
+				if ((syscominfo.getNeedzip()).equals("1")) needzip = true;
+				//       if( (syscominfo.getNeedzipencrypt()).equals("1") ) needzipencrypt = true ;
+
+				if (!iszip) needzip = false;
+				return new MultipartRequest(req, createdir, req.getContentLength(), defpolicy, needzip, needzipencrypt, "", isaesencrypt, aescode);
+			} catch (Exception ex) {
+				writeLog(ex);
+				return null;
+			}
+		return null;
+	}
+
+	private MultipartRequest getAttachment(HttpServletRequest req, boolean iszip, boolean isaesencryptBoolean) {
+		if (isMultipartData(req))
+			try {
+				DefaultFileRenamePolicy defpolicy = new DefaultFileRenamePolicy();
+				SystemComInfo syscominfo = new SystemComInfo();
+				String createdir = getCreateDir(syscominfo.getFilesystem());
+				if (isaesencryptBoolean) {
+					isaesencrypt = syscominfo.getIsaesencrypt();
+					aescode = Util.getRandomString(13);
+				}
+				if ((syscominfo.getNeedzip()).equals("1")) needzip = true;
+				//       if( (syscominfo.getNeedzipencrypt()).equals("1") ) needzipencrypt = true ;
+
+				if (!iszip) needzip = false;
+				return new MultipartRequest(req, createdir, req.getContentLength(), defpolicy, needzip, needzipencrypt, "", isaesencrypt, aescode);
+			} catch (Exception ex) {
+				writeLog(ex);
+				return null;
+			}
+		return null;
+	}
+
+	public List getFiles() {
+		if (mpdata == null) return null;
+		return mpdata.getFiles();
+	}
+
+	//for homepage edit by dongping 2006-08-24
+	private MultipartRequest getAttachment(HttpServletRequest req, boolean iszip, String strDirAddr) {
+		if (isMultipartData(req))
+			try {
+				DefaultFileRenamePolicy defpolicy = new DefaultFileRenamePolicy();
+				SystemComInfo syscominfo = new SystemComInfo();
+				//String createdir = getCreateDir(syscominfo.getFilesystem()) ;
+				isaesencrypt = syscominfo.getIsaesencrypt();
+				aescode = Util.getRandomString(13);
+				String createdir = getCreateDir(GCONST.getRootPath() + strDirAddr);
+				if ((syscominfo.getNeedzip()).equals("1")) needzip = true;
+				//if( (syscominfo.getNeedzipencrypt()).equals("1") ) needzipencrypt = true ;
+
+				if (!iszip) needzip = false;
+				return new MultipartRequest(req, createdir, req.getContentLength(), defpolicy, needzip, needzipencrypt, "", isaesencrypt, aescode);
+			} catch (Exception ex) {
+				writeLog(ex);
+				return null;
+			}
+		return null;
+	}
+
+	//html模板图片保存
+	private MultipartRequest getAttachment(HttpServletRequest req, boolean iszip, boolean encoding, String strDirAddr) {
+		if (isMultipartData(req))
+			try {
+				DefaultFileRenamePolicy defpolicy = new DefaultFileRenamePolicy();
+				SystemComInfo syscominfo = new SystemComInfo();
+				//String createdir = getCreateDir(syscominfo.getFilesystem()) ;
+				isaesencrypt = syscominfo.getIsaesencrypt();
+				if (!encoding) isaesencrypt = "0";
+				aescode = Util.getRandomString(13);
+				String createdir = getCreateDir(GCONST.getRootPath() + strDirAddr);
+				if ((syscominfo.getNeedzip()).equals("1")) needzip = true;
+				//if( (syscominfo.getNeedzipencrypt()).equals("1") ) needzipencrypt = true ;
+
+				if (!iszip) needzip = false;
+				return new MultipartRequest(req, createdir, req.getContentLength(), defpolicy, needzip, needzipencrypt, "", isaesencrypt, aescode);
+			} catch (Exception ex) {
+				writeLog(ex);
+				return null;
+			}
+		return null;
+	}
+
+	private InputStream getFileContent(String uploadname, MultipartRequest mpdata, String withsave) {
+		if (withsave.equals("1") || withsave.equals("2")) {
+
+			String filepath = mpdata.getFilePath(uploadname);
+			String filename = mpdata.getFileName(uploadname);
+			String originalfilename = SecurityMethodUtil.textXssClean(mpdata.getOriginalFileName(uploadname));
+			String contenttype = mpdata.getContentType(uploadname);
+			long filesize = mpdata.getFileSize(uploadname);
+			String filerealpath = filepath + filename;
+			//WeavermailComInfo wmc = new WeavermailComInfo() ;
+			String isfileattrachment = "1";//wmc.getCurrentFileAttachment() ;
+			String fileContentId = "";//wmc.getCurrentFileContentId();
+			String isEncoded = "";//wmc.getCurrentFilenameencode();
+
+			String iszip = "0";
+			String isencrypt = "0";
+			if (needzip) iszip = "1";
+			if (needzipencrypt) isencrypt = "1";
+
+			RecordSet rs = new RecordSet();
+			char separator = Util.getSeparator();
+
+			String para = "" + mailid + separator + originalfilename + separator
+					+ contenttype + separator + filerealpath + separator
+					+ iszip + separator + isencrypt + separator + isfileattrachment + separator
+					+ fileContentId + separator + isEncoded + separator + String.valueOf(filesize);
+
+			rs.executeProc("MailResourceFile_Insert", para);
+		} else {
+			String filepath = mpdata.getFilePath(uploadname);
+			String filename = mpdata.getFileName(uploadname);
+			String filerealpath = filepath + filename;
+			delfilerealpaths.add(filerealpath);
+		}
+
+		try {
+			File thefile = mpdata.getFile(uploadname);
+			if (needzip) {
+				ZipInputStream zin = new ZipInputStream(new FileInputStream(thefile));
+				if (zin.getNextEntry() != null) source = new BufferedInputStream(zin);
+			} else source = new BufferedInputStream(new FileInputStream(thefile));
+		} catch (Exception e) {
+			writeLog(e);
+		}
+
+		return source;
+
+            /* 原有的存储附件数据在数据库中的方式
+
+            boolean isoracle = (statement.getDBType()).equals("oracle") ;
+
+            try   {
+                statement = new ConnStatement();
+
+                File thefile = mpdata.getFile(uploadname) ;
+                int fileLength = new Long(thefile.length()).intValue();
+                source = new BufferedInputStream(new FileInputStream(thefile),500*1024) ;
+
+                String sql =  "" ;
+
+                if( isoracle) {
+                    sql = "insert into MailResourceFile(mailid,filename,attachfile,filetype) values(?,?,empty_blob(),?)";
+                    statement.setStatementSql(sql);
+                    statement.setInt(1,mailid);
+                    statement.setString(2,filename) ;
+                    statement.setString(3,contenttype) ;
+                    statement.executeUpdate();
+
+                    sql = "select rownum,  attachfile from ( select attachfile from MailResourceFile order by id desc ) where rownum = 1 " ;
+                    statement.setStatementSql(sql);
+                    statement.executeQuery();
+                    statement.next() ;
+                    BLOB theblob = statement.getBlob(2) ;
+
+                    int bytesize = theblob.getBufferSize() ;
+                    byte[] buffer = new byte[bytesize] ;
+                    OutputStream outstream = theblob.getBinaryOutputStream() ;
+                    int length = -1 ;
+
+                    while((length = source.read(buffer)) != -1)
+                        outstream.write(buffer, 0 , length) ;
+                    outstream.close() ;
+                }
+                else {
+                    sql = "insert into MailResourceFile(mailid,filename,attachfile,filetype) values(?,?,?,?)";
+                    statement.setStatementSql(sql);
+                    statement.setInt(1,mailid);
+                    statement.setString(2,filename) ;
+                    statement.setBinaryStream(3,source,fileLength);
+                    statement.setString(4,contenttype) ;
+                    statement.executeUpdate();
+                }
+
+                source.close() ;
+                thefile.delete() ;
+
+                if(withsave.equals("1")) {
+                    sql = "select max(id) from MailResourceFile " ;
+                    statement.setStatementSql(sql);
+                    statement.executeQuery();
+                    statement.next() ;
+                    int fileid = statement.getInt(1) ;
+
+                    sql = "select attachfile from MailResourceFile where id = " + fileid;
+                    statement.setStatementSql(sql);
+                    statement.executeQuery();
+                    statement.next() ;
+                    byte[] imagebyte = null ;
+                    if( isoracle ) imagebyte = statement.getBlobByte("attachfile") ;
+                    else imagebyte = statement.getBytes("attachfile") ;
+                    source = new BufferedInputStream(new ByteArrayInputStream(imagebyte),500*1024) ;
+                }
+                statement.close() ;
+
+
+            }catch(Exception ex){}
+        }
+        return source ;  */
+	}
+
+
+	private synchronized String saveFile(String uploadname, MultipartRequest mpdata) {
+
+		int imageid = 0;
+		String filepath = mpdata.getFilePath(uploadname);
+		String filename = mpdata.getFileName(uploadname);
+		String originalfilename = SecurityMethodUtil.textXssClean(mpdata.getOriginalFileName(uploadname));
+		String contenttype = mpdata.getContentType(uploadname);
+		long filesize = mpdata.getFileSize(uploadname);
+
+		String _imagefilename = Util.null2String(getParameter("imagefilename"));
+		String __originalfilename = Util.null2String(originalfilename);
+		String _extname = __originalfilename.contains(".") ? __originalfilename.substring(__originalfilename.indexOf(".")) : "";
+		if (!_imagefilename.isEmpty() && ("".equals(_extname) || _imagefilename.endsWith(_extname))) {
+			originalfilename = _imagefilename;
+		}
+
+		if (filesize == 0) {
+			writeLog("^^^^^^^^^(文件大小为0)(" + originalfilename + ")^^^^^^^^^^^filepath=" + filepath + filename);
+			return null;
+		}
+
+		String filerealpath = filepath + filename;
+		int fieldId = Util.getIntValue(getParameter("fieldId"));
+		int workflowId = Util.getIntValue(getParameter("workflowId"));
+		/*
+		 * QC675390概述：前后台增加附件上传格式控制
+		 * 如果上传文件的文件名后缀不符合配置文件中的要求，则不上传
+		 */
+		if (!FileSuffixCheckUtil.isEnableUpload(originalfilename) || (fieldId > 0 && workflowId > 0 && !checkFileSuffix(originalfilename, fieldId, workflowId))) {
+			writeLog("^^^^^^^^^(文件拦截)(" + originalfilename + ")^^^^^^^^^^^filepath=" + filepath + filename);
+			File _tempFile = new File(filerealpath);
+			// 如果文件存在，且是文件，删除
+			if (_tempFile.exists() && _tempFile.isFile()) {
+				FileSecurityUtil.deleteFile(_tempFile);
+				// _tempFile.delete();
+			}
+			return null;
+		}
+		//tagtag需要压缩图片
+		//System.out.println("contenttype:"+ contenttype);
+		//System.out.println("filerealpath:"+ filerealpath);
+		String needCompressionPic = (String) this.request.getAttribute("needCompressionPic");
+		if ("1".equals(needCompressionPic) && !needzip) {
+			PicCompression picCompression = new PicCompression();
+			String s = picCompression.compress(filerealpath, 1280, 1024, 1);
+		}
+
+
+		String imagefileused = "1";
+		String iszip = "0";
+		String isencrypt = "0";
+		if (needzip) iszip = "1";
+		if (needzipencrypt) isencrypt = "1";
+
+
+		RecordSet rs = new RecordSet();
+		char separator = Util.getSeparator();
+
+		//rs.executeProc("SequenceIndex_SelectFileid" , "" );
+		//if( rs.next() ) imageid = Util.getIntValue(rs.getString(1));
+		imageid = imageFileIdUpdate.getImageFileNewId();
+		String originalfilenameflag = originalfilename;
+		try {
+//			if(UrlEncoderUtils.hasUrlEncoded(originalfilename)){
+			//originalfilename = originalfilename.replaceAll("[%]","%25").replaceAll("[+]","%2B");
+			originalfilename = URLDecoder.decode(originalfilename, "utf-8");
+//			}
+		} catch (Exception e) {
+			originalfilename = originalfilenameflag;
+			//e.printStackTrace();
+		}
+
+		String para = "" + imageid + separator + originalfilename + separator
+				+ contenttype + separator + imagefileused + separator + filerealpath + separator
+				+ iszip + separator + isencrypt + separator + filesize;
+
+		rs.executeProc("ImageFile_Insert", para);
+		AliOSSObjectManager aliOSSObjectManager = new AliOSSObjectManager();
+		String tokenKey = aliOSSObjectManager.getTokenKeyByFileRealPath(filerealpath);
+		String secretLevel = Util.null2s(getParameter("secretLevel"), DocManager.DEFAILT_SECRET_LEVEL + "");
+		String secretValidity = Util.null2s(getParameter("secretLevelValidity"), "");
+		String name = Util.null2s(getParameter("name"), "");
+		String sql = "update imagefile set isaesencrypt=" + isaesencrypt + ", aescode='" + aescode + "',TokenKey='" + tokenKey + "',secretLevel=" + secretLevel + ",secretValidity='" + secretValidity + "' where imagefileid=" + imageid;
+//        rs.writeLog("fileupload1111-----fileid:"+imageid+"---name:"+name+"--secretLevel:"+secretLevel+"--secretValidity:"+secretValidity+"--sql"+sql);
+		// 更新加密信息
+		rs.executeUpdate(sql);
+
+
+		try {                                        // add by liuyu to get image file width and height
+			if (contenttype.indexOf("image") != -1 && needimagewidth) {
+				File thefile = mpdata.getFile(uploadname);
+				long fileLength = thefile.length();
+				filesizes.add("" + fileLength);
+
+				if (needzip) {
+					ZipInputStream zin = new ZipInputStream(new FileInputStream(thefile));
+					if (zin.getNextEntry() != null) source = new BufferedInputStream(zin);
+				} else source = new BufferedInputStream(new FileInputStream(thefile));
+
+				if (isaesencrypt.equals("1")) {
+					source = AESCoder.decrypt(source, aescode);
+				}
+				//byte[] imagebyte = new byte[64*1024] ;
+				//StringBuffer buf = new StringBuffer();
+				//while (source.read(imagebyte, 0, imagebyte.length) != -1) buf.append(imagebyte);
+				//ByteArraySeekableStream bs =  new ByteArraySeekableStream((buf.toString()).getBytes()) ;
+				//RenderedOp bimage = JAI.create("stream", bs);
+				//imagewidth.add(""+bimage.getWidth()) ;
+				//imageheight.add(""+bimage.getHeight()) ;
+
+
+				ImageInfo ii = new ImageInfo();
+				ii.setInput(source);
+				if (!ii.check()) {
+					imagewidth.add("0");
+					imageheight.add("0");
+				} else {
+					imagewidth.add("" + ii.getWidth());
+					imageheight.add("" + ii.getHeight());
+				}
+			} else {
+				imagewidth.add("0");
+				imageheight.add("0");
+				filesizes.add("0");
+			}
+		} catch (Exception imgex) {
+			imagewidth.add("0");
+			imageheight.add("0");
+			filesizes.add("0");
+		}
+
+		return imageid + "";
+
+        /* 原有的存储附件数据在数据库中的方式
+
+        try {
+          File thefile = mpdata.getFile(uploadname) ;
+          int fileLength = new Long(thefile.length()).intValue();
+          source = new BufferedInputStream(new FileInputStream(thefile),500*1024) ;
+
+          filesizes.add(""+fileLength) ;
+
+          statement = new ConnStatement();
+          boolean isoracle = (statement.getDBType()).equals("oracle") ;
+
+          String sql = "select currentid from SequenceIndex where indexdesc='imagefileid'";
+          statement.setStatementSql(sql);
+          statement.executeQuery();
+
+          if(statement.next()){
+              imageid = statement.getInt("currentid");
+          }
+
+          sql = "update SequenceIndex set currentid=? where indexdesc='imagefileid'";
+          statement.setStatementSql(sql);
+          statement.setInt(1,imageid+1);
+          statement.executeUpdate();
+
+          if( isoracle) {
+              sql = "insert into ImageFile values(?,?,?,empty_blob(),?)";
+              statement.setStatementSql(sql);
+              statement.setInt(1,imageid);
+              statement.setString(2,filename) ;
+              statement.setString(3,contenttype) ;
+              statement.setInt(4,1);
+              statement.executeUpdate();
+
+              sql = "select imagefile from ImageFile where imagefileid = " + imageid ;
+              statement.setStatementSql(sql);
+              statement.executeQuery();
+              statement.next() ;
+              BLOB theblob = statement.getBlob(1) ;
+
+              int bytesize = theblob.getBufferSize() ;
+              byte[] buffer = new byte[bytesize] ;
+              OutputStream outstream = theblob.getBinaryOutputStream() ;
+              int length = -1 ;
+
+              while((length = source.read(buffer)) != -1)
+                outstream.write(buffer, 0 , length) ;
+              outstream.close() ;
+          }
+          else {
+              sql = "insert into ImageFile values(?,?,?,?,?)";
+              statement.setStatementSql(sql);
+              statement.setInt(1,imageid);
+              statement.setString(2,filename) ;
+              statement.setString(3,contenttype) ;
+              statement.setBinaryStream(4,source,fileLength);
+              statement.setInt(5,1);
+              statement.executeUpdate();
+          }
+
+          source.close();
+          thefile.delete() ;
+
+          try   {                                        // add by liuyu to get image file width and height
+              if(contenttype.indexOf("image") != -1 && needimagewidth)  {
+                  sql = "select imagefile from ImageFile where imagefileid = "+imageid;
+                  statement.setStatementSql(sql);
+                  statement.executeQuery();
+                  statement.next() ;
+                  byte[] imagebyte = null ;
+                  if( isoracle ) imagebyte = statement.getBlobByte("imagefile") ;
+                  else imagebyte = statement.getBytes("imagefile") ;
+                  ByteArraySeekableStream bs =  new ByteArraySeekableStream(imagebyte) ;
+                  RenderedOp bimage = JAI.create("stream", bs);
+                  imagewidth.add(""+bimage.getWidth()) ;
+                  imageheight.add(""+bimage.getHeight()) ;
+              }
+              else {
+                  imagewidth.add("0") ;
+                  imageheight.add("0") ;
+              }
+          }
+          catch (Exception imgex) {
+              imagewidth.add("0") ;
+              imageheight.add("0") ;
+          }
+
+          statement.close() ;
+        }
+        catch (Exception ex) { writeLog(ex); }
+
+        return imageid+""; */
+	}
+
+	private synchronized String saveFile(String uploadname, String paramFileName, MultipartRequest mpdata) {
+
+		int imageid = 0;
+		String filepath = mpdata.getFilePath(uploadname);
+		String filename = mpdata.getFileName(uploadname);
+		String originalfilename = paramFileName;
+		String contenttype = mpdata.getContentType(uploadname);
+		long filesize = mpdata.getFileSize(uploadname);
+
+		String _imagefilename = Util.null2String(getParameter("imagefilename"));
+		String __originalfilename = Util.null2String(originalfilename);
+		String _extname = __originalfilename.contains(".") ? __originalfilename.substring(__originalfilename.indexOf(".")) : "";
+		if (!_imagefilename.isEmpty() && ("".equals(_extname) || _imagefilename.endsWith(_extname))) {
+			originalfilename = _imagefilename;
+		}
+		if (filesize == 0) {
+			writeLog("^^^^^^^^^(文件大小为0)(" + originalfilename + ")^^^^^^^^^^^filepath=" + filepath + filename);
+			return null;
+		}
+
+		String filerealpath = filepath + filename;
+
+		//tagtag需要压缩图片
+		//System.out.println("contenttype:"+ contenttype);
+		//System.out.println("filerealpath:"+ filerealpath);
+		String needCompressionPic = (String) this.request.getAttribute("needCompressionPic");
+		if ("1".equals(needCompressionPic) && !needzip) {
+			PicCompression picCompression = new PicCompression();
+			String s = picCompression.compress(filerealpath, 1280, 1024, 1);
+		}
+
+
+		String imagefileused = "1";
+		String iszip = "0";
+		String isencrypt = "0";
+		if (needzip) iszip = "1";
+		if (needzipencrypt) isencrypt = "1";
+
+
+		RecordSet rs = new RecordSet();
+		char separator = Util.getSeparator();
+
+		//rs.executeProc("SequenceIndex_SelectFileid" , "" );
+		//if( rs.next() ) imageid = Util.getIntValue(rs.getString(1));
+		imageid = imageFileIdUpdate.getImageFileNewId();
+		String originalfilenameflag = originalfilename;
+		try {
+//			if(UrlEncoderUtils.hasUrlEncoded(originalfilename)){
+			//originalfilename = originalfilename.replaceAll("[%]","%25").replaceAll("[+]","%2B");
+			originalfilename = URLDecoder.decode(originalfilename, "utf-8");
+//			}
+		} catch (Exception e) {
+			originalfilename = originalfilenameflag;
+			//e.printStackTrace();
+		}
+		String para = "" + imageid + separator + originalfilename + separator
+				+ contenttype + separator + imagefileused + separator + filerealpath + separator
+				+ iszip + separator + isencrypt + separator + filesize;
+
+		rs.executeProc("ImageFile_Insert", para);
+		AliOSSObjectManager aliOSSObjectManager = new AliOSSObjectManager();
+		String tokenKey = aliOSSObjectManager.getTokenKeyByFileRealPath(filerealpath);
+		String secretLevel = Util.null2s(getParameter("secretLevel"), DocManager.DEFAILT_SECRET_LEVEL + "");
+		String secretValidity = Util.null2s(getParameter("secretLevelValidity"), "");
+		String name = Util.null2s(getParameter("name"), "");
+
+		String sql = "update imagefile set isaesencrypt=" + isaesencrypt + ", aescode='" + aescode + "',TokenKey='" + tokenKey + "',secretLevel=" + secretLevel + ",secretValidity='" + secretValidity + "' where imagefileid=" + imageid;
+//        rs.writeLog("fileupload2222-----fileid:"+imageid+"---name:"+name+"--secretLevel:"+secretLevel+"--secretValidity:"+secretValidity+"--sql:"+sql);
+		// 更新加密信息
+		rs.executeUpdate(sql);
+
+		aliOSSObjectManager.uploadFile(filerealpath, originalfilename, iszip, isaesencrypt, aescode);
+
+		try {                                        // add by liuyu to get image file width and height
+			if (contenttype.indexOf("image") != -1 && needimagewidth) {
+				File thefile = mpdata.getFile(uploadname);
+				long fileLength = thefile.length();
+				filesizes.add("" + fileLength);
+
+				if (needzip) {
+					ZipInputStream zin = new ZipInputStream(new FileInputStream(thefile));
+					if (zin.getNextEntry() != null) source = new BufferedInputStream(zin);
+				} else source = new BufferedInputStream(new FileInputStream(thefile));
+
+				if (isaesencrypt.equals("1")) {
+					source = AESCoder.decrypt(source, aescode);
+				}
+				//byte[] imagebyte = new byte[64*1024] ;
+				//StringBuffer buf = new StringBuffer();
+				//while (source.read(imagebyte, 0, imagebyte.length) != -1) buf.append(imagebyte);
+				//ByteArraySeekableStream bs =  new ByteArraySeekableStream((buf.toString()).getBytes()) ;
+				//RenderedOp bimage = JAI.create("stream", bs);
+				//imagewidth.add(""+bimage.getWidth()) ;
+				//imageheight.add(""+bimage.getHeight()) ;
+
+
+				ImageInfo ii = new ImageInfo();
+				ii.setInput(source);
+				if (!ii.check()) {
+					imagewidth.add("0");
+					imageheight.add("0");
+				} else {
+					imagewidth.add("" + ii.getWidth());
+					imageheight.add("" + ii.getHeight());
+				}
+			} else {
+				imagewidth.add("0");
+				imageheight.add("0");
+				filesizes.add("0");
+			}
+		} catch (Exception imgex) {
+			imagewidth.add("0");
+			imageheight.add("0");
+			filesizes.add("0");
+		}
+
+		return imageid + "";
+	}
+
+
+	private boolean isMultipartData(HttpServletRequest req) {
+		return Util.null2String(req.getContentType()).toLowerCase().startsWith("multipart/form-data");
+	}
+
+
+	public static String getCreateDir(String createdir) {
+
+		if (createdir == null) {
+			StaticObj staticObj = StaticObj.getInstance();
+			staticObj.removeObject("SystemInfo");
+			SystemComInfo syscominfo = new SystemComInfo();
+			createdir = syscominfo.getFilesystem();
+		}
+
+
+		if (createdir == null || createdir.equals("")) createdir = GCONST.getSysFilePath();
+		else {
+			createdir = Util.StringReplace(createdir, "\\", "#$^123");
+			createdir = Util.StringReplace(createdir, "/", "#$^123");
+			createdir = Util.StringReplace(createdir, "#$^123", File.separator);
+			//if( createdir.lastIndexOf(File.separator) < 0 ) createdir += File.separator ;
+
+			if (!createdir.endsWith(File.separator)) {
+				createdir += File.separator;
+			}
+		}
+
+		Calendar today = Calendar.getInstance();
+		String currentyear = Util.add0(today.get(Calendar.YEAR), 4);
+		String currentmonth = Util.add0(today.get(Calendar.MONTH) + 1, 2);
+
+		Random random = new Random();
+		int randomint = 1 + random.nextInt(26);
+		String charstr = Util.getCharString(randomint);
+
+		createdir += currentyear + currentmonth + File.separatorChar + charstr + File.separatorChar;
+		String ostype = System.getProperty("os.arch");
+		String osname = System.getProperty("os.name").toLowerCase();
+		//if (!ostype.equals("x86")&&!ostype.equals("amd64")) {
+		if (!osname.startsWith("windows")) {
+			try {
+				if (!createdir.substring(0, 1).equals(File.separator)) {
+					new BaseBean().writeLog("WRAN................File path=[" + createdir + "]   os=[" + ostype + "]");
+					createdir = File.separator + createdir;
+					new BaseBean().writeLog("WRAN................Changed path=[" + createdir + "]   os=[" + ostype + "]");
+				}
+			} catch (Exception e) {
+			}
+		}
+		return createdir;
+	}
+
+	//获取文件的原始名称
+	public String getFileOriginalFileName(String uploadame) {
+		return SecurityMethodUtil.textXssClean(mpdata.getOriginalFileName(uploadame));
+	}
+
+	//根据文件名获取文件
+	public File getFile(String filename) {
+		return mpdata.getFile(filename);
+	}
+
+	/**
+	 * 根据参数名判断文件是否可以上传, 查询参数名为file对应的文件的后缀
+	 *
+	 * @return
+	 */
+	public boolean canUploadCheckBySecid() {
+		return canUploadCheckBySecid("file");
+	}
+
+	/**
+	 * 根据 uplaodfilename 查找指定的物理文件的文件名，判断文件是否可以上传
+	 *
+	 * @param uplaodfilename
+	 * @return
+	 */
+	public boolean canUploadCheckBySecid(String uplaodfilename) {
+		int secid = Util.getIntValue(this.getParameter("secid"), -1);
+
+		String paramFileName = this.getFileOriginalFileName(uplaodfilename); //获取参数当中的文件名
+		if (secid <= 0) {
+			return FileSuffixCheckUtil.isEnableUpload(paramFileName);
+		} else {
+			return FileSuffixCheckUtil.isEnableUploadBySecId(secid, paramFileName);
+		}
+	}
+
+
+	/**
+	 * @param fileName   文件名
+	 * @param fieldId    附件字段id
+	 * @param workflowId 流程id
+	 * @return 文件上传后端校验是否通过
+	 */
+	public boolean checkFileSuffix(String fileName, int fieldId, int workflowId) {
+		RecordSet rs1 = new RecordSet();
+		//查询单个字段设置
+		String sql1 = "select limittype,limitvalue from workflow_fileupload where fieldid = " + fieldId + " and workflowid =" + workflowId;
+		//查询默认设置
+		String sql2 = "select limitvalue from workflow_base where id = " + workflowId;
+		//查询新表单
+		String sql3 = "select FIELDHTMLTYPE,TYPE from workflow_billfield where id = " + fieldId;
+		//查询老表单主表
+		String sql4 = "select fieldhtmltype,type from workflow_formdict where id = " + fieldId;
+		//查询老表单明细表
+		String sql5 = "select fieldhtmltype,type from workflow_formdictdetail where id = " + fieldId;
+
+		String limitType = "";//单个字段设置类型
+		String limitValueField = "";//单个字段设置限制格式
+		String limitValueDefult = "";//默认限制格式
+		String fileNameSuffix = FileSuffixCheckUtil.getFileNameSuffix(fileName);//上传的文件名后缀
+
+		rs1.executeQuery(sql1);
+		while (rs1.next()) {
+			limitType = Util.null2String(rs1.getString("limittype"));
+			limitValueField = Util.null2String(rs1.getString("limitvalue"));
+		}
+		rs1.execute(sql2);
+		while (rs1.next()) {
+			limitValueDefult = Util.null2String(rs1.getString("limitvalue"));
+		}
+
+		//新表单
+		String fieldHtmlTypeNew = "";//新表单字段大类型
+		String typeNew = "";//新表单字段小类型
+		rs1.executeQuery(sql3);
+		while (rs1.next()) {
+			fieldHtmlTypeNew = Util.null2String(rs1.getString(1));
+			typeNew = Util.null2String(rs1.getString(2));
+		}
+		//校验新表单字段是否为图片，如果是图片，则不校验，直接放行
+		if ("6".equals(fieldHtmlTypeNew) && "2".equals(typeNew)) {
+			return true;
+		}
+
+
+		//老表单主表
+		String fieldHtmlTypeOld = "";//老表单字段大类型
+		String typeOld = "";//老表单字段小类型
+		rs1.execute(sql4);
+		while (rs1.next()) {
+			fieldHtmlTypeOld = Util.null2String(rs1.getString(1));
+			typeOld = Util.null2String(rs1.getString(2));
+		}
+		//校验老表单字段是否为图片，如果是图片，则不校验，直接放行
+		if ("6".equals(fieldHtmlTypeOld) && "2".equals(typeOld)) {
+			return true;
+		}
+
+		//老表单明细表
+		String fieldHtmlTypeDetailOld = "";//老表单明细字段大类型
+		String typeDetailOld = "";//老表单明细字段小类型
+		rs1.execute(sql5);
+		while (rs1.next()) {
+			fieldHtmlTypeDetailOld = Util.null2String(rs1.getString(1));
+			typeDetailOld = Util.null2String(rs1.getString(2));
+		}
+		//校验老表单字段是否为图片，如果是图片，则不校验，直接放行
+		if ("6".equals(fieldHtmlTypeDetailOld) && "2".equals(typeDetailOld)) {
+			return true;
+		}
+
+		//如果默认和字段都没有设置格式限制，或者字段选择了格式显示，但是格式限制为空，则直接允许提交
+		if (("".equals(limitValueField) && "".equals(limitValueDefult)) || ("1".equals(limitType) && "".equals(limitValueField))) {
+			return true;
+		}
+
+		//先校验单个字段，如果单个字段没有设置格式校验，则校验默认的格式设置
+		if ("1".equals(limitType)) {
+			String[] formats = limitValueField.split(",");
+			return Util.contains(formats, fileNameSuffix);
+		}
+		if ("0".equals(limitType)) {
+			String[] restrictedFormat = limitValueDefult.split(",");
+			return Util.contains(restrictedFormat, fileNameSuffix);
+		}
+
+		return false;
+	}
+
+}
+
diff --git a/src/main/youhong_ai_old_src/weaver/file/ImageFileManager_src.java b/src/main/youhong_ai_old_src/weaver/file/ImageFileManager_src.java
new file mode 100644
index 0000000..f9bfaa3
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/file/ImageFileManager_src.java
@@ -0,0 +1,1149 @@
+package weaver.file;
+
+import DBstep.iMsgServer2000;
+import com.api.odoc.util.OdocFileUtil;
+import weaver.alioss.AliOSSObjectManager;
+import weaver.conn.ConnStatement;
+import weaver.conn.RecordSet;
+import weaver.docs.docs.DocManager;
+import weaver.docs.docs.ImageFileIdUpdate;
+import weaver.file.util.FileDeleteUtil;
+import weaver.general.BaseBean;
+import weaver.general.Util;
+import weaver.sm.SM4Utils;
+import weaver.system.SystemComInfo;
+
+import java.io.*;
+import java.util.Date;
+import java.util.UUID;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipInputStream;
+import java.util.zip.ZipOutputStream;
+
+
+/**
+ * Title: 附件处理基本类
+ * Company: weaver
+ * 
+ * @author fanggsh
+ * @version 1.0
+ */
+
+public class ImageFileManager_src extends BaseBean {
+
+    private static ImageFileIdUpdate imageFileIdUpdate = new ImageFileIdUpdate();
+    
+    private int imageFileId; //附件id
+    
+    private String imageFileName;//文件名称
+
+    private String imageFileType; //文件MIME类型
+
+    private int imageFileUsed; //文件使用次数
+
+    private String fileRealPath; //文件存放目录
+
+    private String isZip; //是否压缩   0：否  1：是
+
+    private String isencrypt; //是否加密  0：否  1：是   该字段已经基本不使用
+
+    private String filesize; //文件大小   单位为字节
+
+    private int downloads; //下载次数
+
+    private String miniimgpath; //缩略图存放路径
+
+    private String imgsize; //缩略图大小
+
+    private String isFTP; //是否存储到FTP  1:是    0或其它：否
+
+    private int   FTPConfigId;//FTP服务器配置ID
+
+    private int  isaesencrypt;//是否使用AES附件加密  1:是    0或其它：否
+
+    private String aescode; //AES加密密码
+
+    private String tokenKey; //令牌标记
+
+    private String storageStatus; //传输标志 1：成功      2：文件异常  3：传输中  4：不需要传到云  其他：未传输
+
+    private String comefrom; // 附件来源   WorkflowToDoc：流程存为文档
+
+    private int secretlevel; //密级
+    private String secretvalidity; // 保密期限
+
+    private byte[] data;
+
+    /**
+     * 构造函数
+     */
+    public ImageFileManager_src() {
+        try {
+            resetParameter();
+        } catch (Exception ex) {
+            writeLog(ex);
+        }
+    }    
+    
+    /**
+     * 重置各参数的值
+     */
+    public void resetParameter() {
+        
+        imageFileId=0;
+        imageFileName="";
+        imageFileType="";
+        imageFileUsed=1;
+        fileRealPath="";
+        isZip="";
+        isencrypt="";
+        filesize="";
+        downloads=0;
+        miniimgpath="";
+        imgsize="";
+        isFTP="";
+        FTPConfigId=0;
+        isaesencrypt=0;
+        aescode="";
+        tokenKey="";
+        storageStatus="";
+        comefrom="";
+        secretlevel=DocManager.DEFAILT_SECRET_LEVEL;
+        secretvalidity="";
+        data=null;
+    }
+
+    /**
+     * 返回 附件ID
+     * 
+     * @return 附件ID
+     * @throws Exception
+     */
+    public int getImageFileId() {
+        return imageFileId;
+    }
+
+    /**
+     * 返回文件名称
+     * 
+     * @return 文件名称
+     * @throws Exception
+     */
+    public String getImageFileName() {
+        return imageFileName;
+    }
+
+    /**
+     * 返回文件MIME类型
+     * 
+     * @return 文件MIME类型
+     * @throws Exception
+     */
+    public String getImageFileType() {
+        return imageFileType;
+    }
+
+    public void setImageFileType(String para) {
+        this.imageFileType = para;
+    }
+
+    /**
+     * 返回文件使用次数
+     * 
+     * @return 文件使用次数
+     * @throws Exception
+     */
+    public int getImageFileUsed() {
+        return imageFileUsed;
+    }
+
+    /**
+     * 返回文件存放目录
+     * 
+     * @return 文件存放目录
+     * @throws Exception
+     */
+    public String getFileRealPath() {
+        return fileRealPath;
+    }
+
+    /**
+     * 返回是否压缩
+     * 
+     * @return 是否压缩
+     * @throws Exception
+     */
+    public String getIsZip() {
+        return isZip;
+    }
+
+    /**
+     * 返回是否加密   该方法已基本不使用
+     * 
+     * @return 是否加密
+     * @throws Exception
+     */
+    public String getIsencrypt()  {
+        return isencrypt;
+    }
+
+    /**
+     * 返回文件大小   单位为字节
+     * 
+     * @return 文件大小   单位为字节
+     * @throws Exception
+     */
+    public String getFilesize() {
+        return filesize;
+    }
+
+    /**
+     * 返回下载次数
+     * 
+     * @return 下载次数
+     * @throws Exception
+     */
+    public int getDownloads()  {
+        return downloads;
+    }
+
+    /**
+     * 返回 缩略图存放路径
+     * 
+     * @return 缩略图存放路径
+     * @throws Exception
+     */
+    public String getMiniimgpath() {
+        return miniimgpath;
+    }
+
+    /**
+     * 返回缩略图大小
+     * 
+     * @return 缩略图大小
+     * @throws Exception
+     */
+    public String getImgsize() {
+        return imgsize;
+    }
+
+    /**
+     * 返回是否存储到FTP  1:是    0或其它：否
+     * 
+     * @return 是否存储到FTP  1:是    0或其它：否
+     * @throws Exception
+     */
+    public String getIsFTP() {
+        return isFTP;
+    }
+
+    /**
+     * 返回FTP服务器配置ID
+     * 
+     * @return FTP服务器配置ID
+     * @throws Exception
+     */
+    public int getFTPConfigId() {
+        return FTPConfigId;
+    }
+
+    /**
+     * 返回是否使用AES附件加密
+     * 
+     * @return 是否使用AES附件加密
+     * @throws Exception
+     */
+    public int getIsaesencrypt() {
+        return isaesencrypt;
+    }
+
+    /**
+     * 返回AES加密密码
+     * 
+     * @return AES加密密码
+     * @throws Exception
+     */
+    public String getAescode() {
+        return aescode;
+    }
+
+    /**
+     * 返回令牌标记
+     * 
+     * @return 令牌标记
+     * @throws Exception
+     */
+    public String getTokenKey() {
+        return tokenKey;
+    }
+
+    /**
+     * 返回传输标志
+     * 
+     * @return 传输标志
+     * @throws Exception
+     */
+    public String getStorageStatus()  {
+        return storageStatus;
+    }
+
+    public void setImageFileId(int imageFileId) {
+        this.imageFileId = imageFileId;
+    }
+
+    public int getSecretlevel() {
+        return secretlevel;
+    }
+
+    public void setSecretlevel(int secretlevel) {
+        this.secretlevel = secretlevel;
+    }
+
+    public String getSecretvalidity() {
+        return secretvalidity;
+    }
+
+    public void setSecretvalidity(String secretvalidity) {
+        this.secretvalidity = secretvalidity;
+    }
+
+    /**
+     * 返回附件来源
+     * 
+     * @return 附件来源
+     * @throws Exception
+     */
+    public String getComefrom() {
+        return comefrom;
+    }
+
+    public Date getLastModified()
+    {
+        Date lastModified = null;
+        boolean isonlyAliOSS=false;
+        if(!tokenKey.equals("")&&storageStatus.equals("1")&&AliOSSObjectManager.isonlyAliOSS()){
+            isonlyAliOSS=true;
+        }
+        if(isonlyAliOSS){
+            lastModified = weaver.alioss.AliOSSObjectUtil.getLastModified(tokenKey);
+        }else{
+            if(fileRealPath!=null&&!fileRealPath.equals("")){
+                File file = new File(fileRealPath);
+                boolean bool = file.exists();
+                if(bool)
+                {
+                    long millisec = file.lastModified();
+                    lastModified = new Date(millisec);
+                }
+            }
+        }
+        return lastModified;
+    }
+
+    public Date getLastModified(String fileRealPath)
+    {
+        Date lastModified = null;
+       if(fileRealPath!=null&&!fileRealPath.equals("")) {
+           File file = new File(fileRealPath);
+           boolean bool = file.exists();
+           if (bool) {
+               long millisec = file.lastModified();
+               lastModified = new Date(millisec);
+           }
+       }
+        return lastModified;
+    }
+
+    /**
+     * 设置文件名称
+     * 
+     * @param docid_para
+     *            文件名称
+     */
+    public void setImagFileName(String  para) {
+        this.imageFileName = para;
+    }
+    
+    /**
+     * 设置附件来源
+     * 
+     * @param docid_para
+     *            附件来源
+     */
+    public void setComefrom(String para) {
+        this.comefrom = para;
+    }
+    
+    /**
+     * 设置文档ID
+     * 
+     * @param docid_para
+     *            文档ID
+     */
+    public void setData(byte[] para) {
+        this.data = para;
+    }
+    
+    
+    
+    /**
+     * 返回文件流   已经经过脱密、解压
+     * 
+     * @return 文件流
+     * @throws Exception
+     */    
+    public InputStream getInputStream() {
+        InputStream imagefile = null;
+        try{
+            boolean isonlyAliOSS=false;
+            if(!tokenKey.equals("")&&storageStatus.equals("1")&&AliOSSObjectManager.isonlyAliOSS()){
+                isonlyAliOSS=true;
+            }
+
+            if(isonlyAliOSS){
+                imagefile=weaver.alioss.AliOSSObjectUtil.downloadFile(tokenKey);
+            }else{
+                if(fileRealPath!=null&&!fileRealPath.equals("")){
+                    File thefile = new File(fileRealPath) ;
+                    if(isZip.equals("1")) {
+                        ZipInputStream zin = new ZipInputStream(new FileInputStream(thefile)) ;
+                        if(zin.getNextEntry() != null)
+                        imagefile = new BufferedInputStream(zin) ;
+                    } else{
+                        imagefile = new BufferedInputStream(new FileInputStream(thefile)) ;
+                    }
+                       
+                }else{
+                    ConnStatement statement = null;
+                    try {
+                        statement = new ConnStatement();
+                        boolean isoracle = ("oracle").equals(statement.getDBType()) ;
+                        String sql = "select imagefile from ImageFile where imagefileid = " + imageFileId;
+                        statement.setStatementSql(sql);
+                        statement.executeQuery();
+                        if(statement.next()){
+                            if( isoracle ) imagefile = new BufferedInputStream(statement.getBlobBinary("imagefile")) ;
+                            else imagefile = new BufferedInputStream(statement.getBinaryStream("imagefile")) ;                          
+                        }
+                    } catch(Exception ex) {
+                    }finally {
+                        try{
+                            if(statement!=null) statement.close() ;
+                        }catch(Exception ex){
+                        }                       
+                    }                   
+                }
+                if(isaesencrypt==1){
+                    imagefile = AESCoder.decrypt(imagefile, aescode); 
+                }               
+            }       
+        }catch(Exception ex){
+            
+        }
+        return imagefile;
+    }    
+
+    /**
+     * 返回文件流   已经经过脱密、解压
+     * @param imageFileId_para
+     * @return 文件流
+     * @throws Exception
+     */    
+    public static InputStream getInputStreamById(int imageFileId_para) {
+        InputStream imagefile = null;
+        try{
+            RecordSet rs = new RecordSet();
+            String sql = "select imagefilename,fileRealPath,isZip,isaesencrypt,aescode,tokenKey,storageStatus  from ImageFile where imageFileId = " + imageFileId_para;
+            rs.executeSql(sql);
+            if(rs.next()){
+                String static_fileRealPath=Util.null2String(rs.getString("fileRealPath"));
+                String static_isZip=Util.null2String(rs.getString("isZip"));
+                int static_isaesencrypt=Util.getIntValue(rs.getString("isaesencrypt"),0);
+                String static_aescode=Util.null2String(rs.getString("aescode"));
+                String static_tokenKey=Util.null2String(rs.getString("tokenKey"));
+                String static_storageStatus=Util.null2String(rs.getString("storageStatus"));
+                String imagefilename=Util.null2String(rs.getString("imagefilename"));
+                boolean isonlyAliOSS=false;
+                if(!static_tokenKey.equals("")&&static_storageStatus.equals("1")&&AliOSSObjectManager.isonlyAliOSS()){
+                    isonlyAliOSS=true;
+                }
+
+                if(isonlyAliOSS){
+                    imagefile=weaver.alioss.AliOSSObjectUtil.downloadFile(static_tokenKey);
+                }else{
+                    if(static_fileRealPath!=null&&!static_fileRealPath.equals("")){
+                        File thefile = new File(static_fileRealPath) ;
+                        if(static_isZip.equals("1")) {
+                            ZipInputStream zin = new ZipInputStream(new FileInputStream(thefile)) ;
+                            if(zin.getNextEntry() != null)
+                            imagefile = new BufferedInputStream(zin) ;
+                        } else{
+                            imagefile = new BufferedInputStream(new FileInputStream(thefile)) ;
+                        }
+                    }else{
+                        ConnStatement statement = null;
+                        try {
+                            statement = new ConnStatement();
+                            boolean isoracle = ("oracle").equals(statement.getDBType()) ;
+                            statement.setStatementSql("select imagefile from ImageFile where imagefileid = " + imageFileId_para);
+                            statement.executeQuery();
+                            if(statement.next()){
+                                if( isoracle ) imagefile = new BufferedInputStream(statement.getBlobBinary("imagefile")) ;
+                                else imagefile = new BufferedInputStream(statement.getBinaryStream("imagefile")) ;                          
+                            }
+                        } catch(Exception ex) {
+                        }finally {
+                            try{
+                                if(statement!=null) statement.close() ;
+                            }catch(Exception ex){
+                            }                       
+                        }                       
+                    }
+                    if(static_isaesencrypt==1){
+                        imagefile = AESCoder.decrypt(imagefile, static_aescode);
+                    }
+                    
+                }
+                if(null!=imagefile){
+                    String extName = OdocFileUtil.getFileExt(imagefilename);
+                    int byteread;
+                    byte data[] = new byte[1024];
+                    if(isOfficeToDocument(extName)&&isMsgObjToDocument()){
+                        //正文的处理
+                        ByteArrayOutputStream bout = null;
+                        try {
+                            bout = new ByteArrayOutputStream() ;
+                            while((byteread = imagefile.read(data)) != -1) {
+                                bout.write(data, 0, byteread) ;
+                                bout.flush() ;
+                            }
+                            byte[] fileBody = bout.toByteArray();
+                            iMsgServer2000 MsgObj = new iMsgServer2000();
+                            MsgObj.MsgFileBody(fileBody);           //将文件信息打包
+                            fileBody = MsgObj.ToDocument(MsgObj.MsgFileBody());    //通过iMsgServer200 将pgf文件流转化为普通Office文件流
+                            imagefile = new ByteArrayInputStream(fileBody);
+                            bout.close();
+                        }
+                        catch(Exception e) {
+                            if(bout!=null) bout.close();
+                            new BaseBean().writeLog("ImageFileManager.getInputStreamById(int imageFileId_para),exception1:",e);
+                        }
+
+                    }
+                }
+            }
+        }catch(Exception ex){
+            new BaseBean().writeLog("ImageFileManager.getInputStreamById(int imageFileId_para),exception:",ex);
+        }
+        return imagefile;       
+    }
+
+    private static boolean isOfficeToDocument(String extName){
+    	boolean isOfficeForToDocument=false;
+    	if("xls".equalsIgnoreCase(extName) || "doc".equalsIgnoreCase(extName)||"wps".equalsIgnoreCase(extName)||"ppt".equalsIgnoreCase(extName)||"docx".equalsIgnoreCase(extName)||"xlsx".equalsIgnoreCase(extName)||"pptx".equalsIgnoreCase(extName)){
+    		isOfficeForToDocument=true;
+    	}
+    	return isOfficeForToDocument;
+    }
+
+    private static boolean isMsgObjToDocument(){
+        boolean isMsgObjToDocument=true;
+
+        BaseBean basebean = new BaseBean();
+        String mClientName=Util.null2String(basebean.getPropValue("weaver_obj","iWebOfficeClientName"));
+        boolean isIWebOffice2003 = (mClientName.indexOf("iWebOffice2003")>-1)?true:false;
+        String isHandWriteForIWebOffice2009=Util.null2String(basebean.getPropValue("weaver_obj","isHandWriteForIWebOffice2009"));
+        if(isIWebOffice2003||isHandWriteForIWebOffice2009.equals("0")){
+            isMsgObjToDocument=false;
+        }
+		if(mClientName.indexOf("iWebOffice2009")>-1)
+		{
+			isMsgObjToDocument=true;
+		}
+
+        return isMsgObjToDocument;
+    }
+    
+    /**
+     * 通过附件ID得到相应的附件信息
+     * 
+     * @throws Exception
+     */
+    public void getImageFileInfoById(int imageFileId_para) {
+        
+        try{
+            RecordSet rs = new RecordSet();
+            String sql = "select t1.imageFileId,t1.imageFileName,t1.imageFileType,t1.imageFileUsed,t1.fileRealPath,t1.isZip,t1.isencrypt,t1.filesize,t1.downloads,t1.miniimgpath,t1.imgsize,t1.isFTP,t1.FTPConfigId,t1.isaesencrypt,t1.aescode,t1.tokenKey,t1.storageStatus,t1.comefrom,t2.imagefilename as realname  from ImageFile t1 left join DocImageFile t2 on t1.imagefileid = t2.imagefileid where t1.imagefileid =  " + imageFileId_para;
+            rs.executeSql(sql);
+            if(rs.next()){
+                imageFileId=Util.getIntValue(rs.getString("imageFileId"),0);
+                imageFileName=Util.null2String(rs.getString("realname"));
+                if(imageFileName.equals("")){
+                    imageFileName = Util.null2String(rs.getString("imageFileName"));
+                }                
+                imageFileType=Util.null2String(rs.getString("imageFileType"));
+                imageFileUsed=Util.getIntValue(rs.getString("imageFileUsed"),0);
+                fileRealPath=Util.null2String(rs.getString("fileRealPath"));
+                isZip=Util.null2String(rs.getString("isZip"));
+                isencrypt=Util.null2String(rs.getString("isencrypt"));
+                filesize=Util.null2String(rs.getString("filesize"));
+                downloads=Util.getIntValue(rs.getString("downloads"),0);
+                miniimgpath=Util.null2String(rs.getString("miniimgpath"));
+                imgsize=Util.null2String(rs.getString("imgsize"));
+                isFTP=Util.null2String(rs.getString("isFTP"));
+                FTPConfigId=Util.getIntValue(rs.getString("FTPConfigId"),0);
+                isaesencrypt=Util.getIntValue(rs.getString("isaesencrypt"),0);
+                aescode=Util.null2String(rs.getString("aescode"));
+                tokenKey=Util.null2String(rs.getString("tokenKey"));
+                storageStatus=Util.null2String(rs.getString("storageStatus"));
+                comefrom=Util.null2String(rs.getString("comefrom"));
+                secretlevel = Util.getIntValue(rs.getString("secretlevel"));
+                secretvalidity = Util.null2s(rs.getString(secretvalidity),"");
+            }
+        }catch(Exception ex){
+            
+        }
+    }
+
+    /**
+     * 复制物理文件
+     * @param imageFileId_para
+     * @return 新的附件id
+     */     
+    public static int copyImageFile(int imageFileId_para) {
+        int new_imageFileId=0;
+        if(imageFileId_para<=0){
+            return new_imageFileId;
+        }
+        try{
+            String static_imageFileName="";
+            String static_imageFileType="";
+            int static_imageFileUsed=0;
+            String static_fileRealPath="";
+            String static_isZip="";
+            String static_isencrypt="";
+            String static_filesize="";
+            int static_downloads=0;
+            String static_miniimgpath="";
+            String static_imgsize="";
+            String static_isFTP="";
+            int static_FTPConfigId=0;
+            int static_isaesencrypt=0;
+            String static_aescode="";
+            String static_tokenKey="";
+            String static_storageStatus="";
+            String static_comefrom="";
+            int static_mainimagefile=0;
+            int static_secretlevel=DocManager.DEFAILT_SECRET_LEVEL;
+            String static_secretvalidity="";
+
+            RecordSet rs = new RecordSet();         
+            String sql = "select t1.imageFileId,t1.imageFileName,t1.imageFileType,t1.imageFileUsed,t1.fileRealPath,t1.isZip,t1.isencrypt,t1.filesize,t1.downloads,t1.miniimgpath,t1.imgsize,t1.isFTP,t1.FTPConfigId,t1.isaesencrypt,t1.aescode,t1.tokenKey,t1.storageStatus,t1.comefrom,t1.mainimagefile," +
+                    "t1.secretlevel,t1.secretvalidity,t2.imagefilename as realname  from ImageFile t1 left join DocImageFile t2 on t1.imagefileid = t2.imagefileid where t1.imagefileid =  " + imageFileId_para;
+            rs.executeSql(sql);
+            if(rs.next()){
+                static_imageFileName=Util.null2String(rs.getString("realname"));
+                if(static_imageFileName.equals("")){
+                    static_imageFileName = Util.null2String(rs.getString("imageFileName"));
+                }     
+                static_imageFileType=Util.null2String(rs.getString("imageFileType"));
+                static_imageFileUsed=Util.getIntValue(rs.getString("imageFileUsed"),0);
+                static_fileRealPath=Util.null2String(rs.getString("fileRealPath"));
+                static_isZip=Util.null2String(rs.getString("isZip"));
+                static_isencrypt=Util.null2String(rs.getString("isencrypt"));
+                static_filesize=Util.null2String(rs.getString("filesize"));
+                static_downloads=Util.getIntValue(rs.getString("downloads"),0);
+                static_miniimgpath=Util.null2String(rs.getString("miniimgpath"));
+                static_imgsize=Util.null2String(rs.getString("imgsize"));
+                static_isFTP=Util.null2String(rs.getString("isFTP"));
+                static_FTPConfigId=Util.getIntValue(rs.getString("FTPConfigId"),0);
+                static_isaesencrypt=Util.getIntValue(rs.getString("isaesencrypt"),0);
+                static_aescode=Util.null2String(rs.getString("aescode"));
+                static_tokenKey=Util.null2String(rs.getString("tokenKey"));
+                static_storageStatus=Util.null2String(rs.getString("storageStatus"));
+                static_comefrom=Util.null2String(rs.getString("comefrom"));
+                static_mainimagefile=Util.getIntValue(rs.getString("mainimagefile"),0);
+                static_secretlevel=Util.getIntValue(rs.getString("secretlevel"),0);
+                static_secretvalidity=Util.null2String(rs.getString("secretvalidity"));
+            }
+            if(static_imageFileName==null||static_imageFileName.trim().equals("")){
+                return  new_imageFileId;
+            }
+
+            SystemComInfo syscominfo = new SystemComInfo();
+            String createdir = FileUpload.getCreateDir(syscominfo.getFilesystem()) ;
+            String fileName = UUID.randomUUID().toString();// System.currentTimeMillis() + "";解决高并发的情况下，文件重复 李迎新 
+            if(static_fileRealPath.lastIndexOf(".")>-1){
+                fileName+=static_fileRealPath.substring(static_fileRealPath.lastIndexOf("."));                      
+            }
+            String new_fileRealPath = createdir + fileName ;
+            String new_tokenKey=AliOSSObjectManager.getTokenKeyByFileRealPath(new_fileRealPath); 
+            String new_storageStatus="";
+            new_imageFileId=imageFileIdUpdate.getImageFileNewId();          
+            
+            boolean isonlyAliOSS=false;
+            if(!static_tokenKey.equals("")&&static_storageStatus.equals("1")&&AliOSSObjectManager.isonlyAliOSS()){
+                isonlyAliOSS=true;
+            }
+            
+            if(isonlyAliOSS){
+                boolean copyStatus=weaver.alioss.AliOSSObjectUtil.copyObject(static_tokenKey, new_tokenKey);
+                if(copyStatus){
+                    new_storageStatus="1";
+                }
+            }else if(!static_tokenKey.equals("")&&static_storageStatus.equals("1")&&AliOSSObjectManager.isEnable()){
+                boolean copyStatus=weaver.alioss.AliOSSObjectUtil.copyObject(static_tokenKey, new_tokenKey);
+                if(copyStatus){
+                    new_storageStatus="1";
+                }
+                FileManage.createDir(createdir);
+                FileManage.copy(static_fileRealPath, new_fileRealPath);             
+            }else{
+                FileManage.createDir(createdir);
+                FileManage.copy(static_fileRealPath, new_fileRealPath);                 
+            }
+            ConnStatement statement = null;            
+            try{
+                statement = new ConnStatement();            
+                sql = "insert into ImageFile(" +
+                        "imageFileId,imageFileName,imageFileType,imageFileUsed,fileRealPath" +
+                        ",isZip,isencrypt,filesize,downloads,miniimgpath" +
+                        ",imgsize,isFTP,FTPConfigId,isaesencrypt,aescode" +
+                        " ,tokenKey,storageStatus,comefrom,mainimagefile" +
+                        ",secretlevel,secretvalidity"+
+                        ") values(" +
+                        "?,?,?,?,?" +
+                        ",?,?,?,?,?" +
+                        ",?,?,?,?,?" +
+                        ",?,?,?,?" +
+                        ",?,?"+
+                        ")";
+                statement.setStatementSql(sql);
+                statement.setInt(1, new_imageFileId);
+                statement.setString(2, static_imageFileName);
+                statement.setString(3, static_imageFileType);
+                statement.setInt(4,static_imageFileUsed);
+                statement.setString(5, new_fileRealPath);
+                statement.setString(6, static_isZip);
+                statement.setString(7, static_isencrypt);
+                statement.setString(8, static_filesize);
+                statement.setInt(9, static_downloads);
+                statement.setString(10, static_miniimgpath);
+                statement.setString(11, static_imgsize);
+                statement.setString(12, static_isFTP);
+                statement.setInt(13,static_FTPConfigId);
+                statement.setInt(14, static_isaesencrypt);
+                statement.setString(15, static_aescode);
+                statement.setString(16, new_tokenKey);
+                statement.setString(17, new_storageStatus);
+                statement.setString(18, static_comefrom);
+                statement.setInt(19, static_mainimagefile);
+                statement.setInt(20, static_secretlevel);
+                statement.setString(21, static_secretvalidity);
+
+                statement.executeUpdate();                
+                
+            }catch(Exception ex){
+                new BaseBean().writeLog("imagefilemanager error",ex);
+                new BaseBean().writeLog("imagefilemanager error haha:"+ex.getMessage());
+            } finally {
+                try {
+                    statement.close();
+                } catch (Exception ex) {
+                }
+            }
+            
+            
+        }catch(Exception ee){
+            new BaseBean().writeLog("imagefilemanager error",ee);
+            new BaseBean().writeLog("imagefilemanager error haha:"+ee.getMessage());
+        }
+        return new_imageFileId;
+    }
+
+
+    /**
+     * 新建物理文件
+     * @return 新的附件id
+     */       
+    public int saveImageFile(){
+        int new_imageFileId=0;
+        if(this.data==null){
+            return new_imageFileId;
+        }
+        try{
+            String static_imageFileName=this.imageFileName;
+            String static_imageFileType="";
+            if(this.imageFileType==null||this.imageFileType.trim().equals("")){
+                static_imageFileType="application/octet-stream";
+            }
+            int static_imageFileUsed=1;
+            String static_fileRealPath="";
+            String static_isZip="";
+            String static_isencrypt="";
+            String static_filesize="";
+            if(this.data!=null){
+                static_filesize=""+this.data.length;
+            }           
+            int static_downloads=0;
+            String static_miniimgpath="";
+            String static_imgsize="";
+            String static_isFTP="";
+            int static_FTPConfigId=0;
+            int static_isaesencrypt=0;
+            String static_aescode="";
+            String static_tokenKey="";
+            String static_storageStatus="";
+            int static_secretlevel=DocManager.DEFAILT_SECRET_LEVEL;
+            String static_secretvalidity="";
+            String static_comefrom=this.comefrom;
+
+
+            SystemComInfo syscominfo = new SystemComInfo() ;
+            String createdir = FileUpload.getCreateDir(syscominfo.getFilesystem()) ;
+            String random= UUID.randomUUID().toString(); // 解决高并发下，文件重复问题 李迎新
+            String fileName = random ;
+            static_isZip = syscominfo.getNeedzip();
+            static_isaesencrypt = Util.getIntValue(syscominfo.getIsaesencrypt(),0);
+            static_aescode = Util.getRandomString(13);
+            
+            if("1".equals(static_isZip)){
+                fileName += ".zip";
+            }          
+            String fullName = createdir + fileName ;            
+            static_fileRealPath = fullName;
+            int fsize = 0;
+            FileManage.createDir(createdir);
+            //写压缩文件
+            OutputStream fileOut = null ;
+            try{
+                File file = new File(static_fileRealPath) ;
+                if(static_isZip.equals("1")) {
+                    ZipOutputStream filezipOut = new ZipOutputStream(new BufferedOutputStream(new FileOutputStream(file))) ;
+                    filezipOut.setMethod(ZipOutputStream.DEFLATED) ; //设置压缩方法
+                    filezipOut.putNextEntry(new ZipEntry(random)) ;
+                    fileOut = filezipOut ;
+                } else {
+                    fileOut = new BufferedOutputStream(new FileOutputStream(file)) ;
+                }
+
+                if(static_isaesencrypt==1){
+                    fileOut = AESCoder.encrypt(fileOut, static_aescode);
+					String sm4 = Util.null2String(getPropValue("weaver_security_type","reversible_enc_type"));
+					if("sm4".equalsIgnoreCase(sm4)&&static_aescode.startsWith("sm4start")&&static_aescode.endsWith("sm4end")){
+						SM4Utils sM4Utils=new SM4Utils();
+						byte[] _key=sM4Utils.getSMCode(static_aescode);
+						this.data = sM4Utils.encodeBytes(this.data,_key);
+					}  
+                }
+
+                fileOut.write(this.data, 0, this.data.length) ;
+                
+            }catch(Exception ex){           
+            }finally{
+                fileOut.close() ;
+            }           
+            
+            new_imageFileId=imageFileIdUpdate.getImageFileNewId();      
+            static_tokenKey=AliOSSObjectManager.getTokenKeyByFileRealPath(static_fileRealPath);         
+            
+            ConnStatement statement = null;            
+            try{
+                statement = new ConnStatement();            
+                String sql = "insert into ImageFile(" +
+                        "imageFileId,imageFileName,imageFileType,imageFileUsed,fileRealPath" +
+                        ",isZip,isencrypt,filesize,downloads,miniimgpath" +
+                        ",imgsize,isFTP,FTPConfigId,isaesencrypt,aescode" +
+                        " ,tokenKey,storageStatus,comefrom" + 
+                        ",secretlevel,secretvalidity"+
+                        ") values(" +
+                        "?,?,?,?,?" +
+                        ",?,?,?,?,?" +
+                        ",?,?,?,?,?" +
+                        ",?,?,?" + 
+                        ",?,?" +
+                        ")";
+                statement.setStatementSql(sql);
+                statement.setInt(1, new_imageFileId);
+                statement.setString(2, static_imageFileName);
+                statement.setString(3, static_imageFileType);
+                statement.setInt(4,static_imageFileUsed);
+                statement.setString(5, static_fileRealPath);
+                statement.setString(6, static_isZip);
+                statement.setString(7, static_isencrypt);
+                statement.setString(8, static_filesize);
+                statement.setInt(9, static_downloads);
+                statement.setString(10, static_miniimgpath);
+                statement.setString(11, static_imgsize);
+                statement.setString(12, static_isFTP);
+                statement.setInt(13,static_FTPConfigId);
+                statement.setInt(14, static_isaesencrypt);
+                statement.setString(15, static_aescode);
+                statement.setString(16, static_tokenKey);
+                statement.setString(17, static_storageStatus);
+                statement.setString(18, static_comefrom);
+                statement.setInt(19, static_secretlevel);
+                statement.setString(20, static_secretvalidity);
+
+                statement.executeUpdate();                
+                
+            }catch(Exception ex){
+                
+            } finally {
+                try {
+                    statement.close();
+                } catch (Exception ex) {
+                }
+            }
+            
+            AliOSSObjectManager aliOSSObjectManager=new AliOSSObjectManager();
+            aliOSSObjectManager.uploadFile(static_fileRealPath,static_imageFileName,static_isZip,""+static_isaesencrypt,static_aescode);       
+            
+        }catch(Exception ex){
+            
+        }
+        return new_imageFileId;
+    }
+    
+    public int saveImageFileByInputStream(InputStream is,String filename){
+    	 int new_imageFileId=0;
+         if(is==null){
+             return new_imageFileId;
+         }
+         try{
+             String static_imageFileName=filename;
+             String static_imageFileType="";
+             if(this.imageFileType==null||this.imageFileType.trim().equals("")){
+                 static_imageFileType="application/octet-stream";
+             }
+             int static_imageFileUsed=1;
+             String static_fileRealPath="";
+             String static_isZip="";
+             String static_isencrypt="";
+             String static_filesize="";
+                       
+             int static_downloads=0;
+             String static_miniimgpath="";
+             String static_imgsize="";
+             String static_isFTP="";
+             int static_FTPConfigId=0;
+             int static_isaesencrypt=0;
+             String static_aescode="";
+             String static_tokenKey="";
+             String static_storageStatus="";
+             int static_secretlevel=DocManager.DEFAILT_SECRET_LEVEL;
+             String static_secretvalidity="";
+             String static_comefrom=this.comefrom;
+
+
+             SystemComInfo syscominfo = new SystemComInfo() ;
+             String createdir = FileUpload.getCreateDir(syscominfo.getFilesystem()) ;
+             String random= UUID.randomUUID().toString(); // 解决高并发下，文件重复问题 李迎新
+             String fileName = random ;
+             static_isZip = syscominfo.getNeedzip();
+             static_isaesencrypt = Util.getIntValue(syscominfo.getIsaesencrypt(),0);
+             static_aescode = Util.getRandomString(13);
+             
+             if("1".equals(static_isZip)){
+                 fileName += ".zip";
+             }          
+             String fullName = createdir + fileName ;            
+             static_fileRealPath = fullName;
+             FileManage.createDir(createdir);
+             //写压缩文件
+             OutputStream fileOut = null ;
+             try{
+                 File file = new File(static_fileRealPath) ;
+                 if(static_isZip.equals("1")) {
+                     ZipOutputStream filezipOut = new ZipOutputStream(new BufferedOutputStream(new FileOutputStream(file))) ;
+                     filezipOut.setMethod(ZipOutputStream.DEFLATED) ; //设置压缩方法
+                     filezipOut.putNextEntry(new ZipEntry(random)) ;
+                     fileOut = filezipOut ;
+                 } else {
+                     fileOut = new BufferedOutputStream(new FileOutputStream(file)) ;
+                 }
+
+                 boolean writeInput = true;
+                 if(static_isaesencrypt==1){
+                    fileOut = AESCoder.encrypt(fileOut, static_aescode);
+ 					String sm4 = Util.null2String(getPropValue("weaver_security_type","reversible_enc_type"));
+ 					if("sm4".equalsIgnoreCase(sm4)&&static_aescode.startsWith("sm4start")&&static_aescode.endsWith("sm4end")){
+ 						
+ 						ByteArrayOutputStream bos = null;
+ 	                     try {
+ 	                         bos = new ByteArrayOutputStream();
+ 	                         byte[] b = new byte[1024];
+ 	                         int n;
+ 	                         while ((n = is.read(b)) != -1) {
+ 	                             bos.write(b, 0, n);
+ 	                         }
+ 	                         this.data = bos.toByteArray();
+ 	                         static_filesize = this.data.length + "";
+ 	                     }catch(Exception e){
+ 	                    	 
+ 	                     }finally{
+ 	                    	 if(bos != null){
+ 	                    		 try{
+ 	                    			 bos.close();
+ 	                    		 }catch(Exception e){}
+ 	                    	 }
+ 	                     }
+ 						
+ 						SM4Utils sM4Utils=new SM4Utils();
+ 						byte[] _key=sM4Utils.getSMCode(static_aescode);
+ 						this.data = sM4Utils.encodeBytes(this.data,_key);
+ 						writeInput = false;
+ 					}  
+                 }
+                	 
+                 
+                 if(writeInput){
+	            	 int n =0;
+	            	 byte []b = new byte[2048];
+	            	 long size = 0;
+	            	 while((n=is.read(b)) != -1){
+	            		 fileOut.write(b, 0, n) ;
+	            		 size += n;
+	            	 }
+	            	 static_filesize = size+"";
+                 }else{
+                	 fileOut.write(this.data,0,this.data.length);
+                 }
+
+                 
+             }catch(Exception ex){           
+             }finally{
+                 fileOut.close() ;
+             }           
+             
+             new_imageFileId=imageFileIdUpdate.getImageFileNewId();      
+             static_tokenKey=AliOSSObjectManager.getTokenKeyByFileRealPath(static_fileRealPath);         
+             
+             ConnStatement statement = null;            
+             try{
+                 statement = new ConnStatement();            
+                 String sql = "insert into ImageFile(" +
+                         "imageFileId,imageFileName,imageFileType,imageFileUsed,fileRealPath" +
+                         ",isZip,isencrypt,filesize,downloads,miniimgpath" +
+                         ",imgsize,isFTP,FTPConfigId,isaesencrypt,aescode" +
+                         " ,tokenKey,storageStatus,comefrom" + 
+                         ",secretlevel,secretvalidity"+
+                         ") values(" +
+                         "?,?,?,?,?" +
+                         ",?,?,?,?,?" +
+                         ",?,?,?,?,?" +
+                         ",?,?,?" + 
+                         ",?,?" +
+                         ")";
+                 statement.setStatementSql(sql);
+                 statement.setInt(1, new_imageFileId);
+                 statement.setString(2, static_imageFileName);
+                 statement.setString(3, static_imageFileType);
+                 statement.setInt(4,static_imageFileUsed);
+                 statement.setString(5, static_fileRealPath);
+                 statement.setString(6, static_isZip);
+                 statement.setString(7, static_isencrypt);
+                 statement.setString(8, static_filesize);
+                 statement.setInt(9, static_downloads);
+                 statement.setString(10, static_miniimgpath);
+                 statement.setString(11, static_imgsize);
+                 statement.setString(12, static_isFTP);
+                 statement.setInt(13,static_FTPConfigId);
+                 statement.setInt(14, static_isaesencrypt);
+                 statement.setString(15, static_aescode);
+                 statement.setString(16, static_tokenKey);
+                 statement.setString(17, static_storageStatus);
+                 statement.setString(18, static_comefrom);
+                 statement.setInt(19, static_secretlevel);
+                 statement.setString(20, static_secretvalidity);
+
+                 statement.executeUpdate();                
+                 
+             }catch(Exception ex){
+                 
+             } finally {
+                 try {
+                     statement.close();
+                 } catch (Exception ex) {
+                 }
+             }
+             
+             AliOSSObjectManager aliOSSObjectManager=new AliOSSObjectManager();
+             aliOSSObjectManager.uploadFile(static_fileRealPath,static_imageFileName,static_isZip,""+static_isaesencrypt,static_aescode);       
+             
+         }catch(Exception ex){
+             
+         }finally{
+        	 if(is != null){
+        		 try{
+        			 is.close();
+        		 }catch(Exception e){}
+        	 }
+         }
+         return new_imageFileId;
+    	
+    }
+
+    public void updatesecretlevel(){
+        RecordSet rs = new RecordSet();
+        String sql = "update imagefile set secretlevel=?,secretvalidity=? where imagefileid = ?";
+        rs.executeUpdate(sql,secretlevel,secretvalidity,imageFileId);
+    }
+    
+    /**
+     * 更改物理文件后相关触发操作
+     * @param imageFileId_para
+     */     
+    public static void ImageFileTrigger(int imageFileId_para) {
+        if(imageFileId_para<=0){
+            return ;
+        }
+        try{
+            RecordSet rs = new RecordSet();
+            rs.executeSql("insert into ImageFileBackUp(imageFileId) values("+imageFileId_para+")");
+            rs.executeSql("update DocPreview set mustReconverted='1' where imageFileId="+imageFileId_para);
+            rs.executeSql("update DocPreviewHtml set mustReconverted='1' where imageFileId="+imageFileId_para);
+            deletePdfImageFile(imageFileId_para);
+        }catch(Exception ex){
+            
+        }
+    }
+    
+    public static void deletePdfImageFile(int imageFileId) {
+        if(imageFileId<=0){
+            return ;
+        }
+        try{
+            RecordSet rs = new RecordSet();            
+            String sql = "select p.pdfimagefileid,i.filerealpath from pdf_imagefile p,imagefile i where p.pdfimagefileid = i.imagefileid and p.imagefileid = " + imageFileId;
+			rs.executeSql(sql);
+            if(rs.next())
+            {
+                String pdfimagefileid = rs.getString("pdfimagefileid");
+                String filerealpath = rs.getString("filerealpath");
+                File file = new File(filerealpath);
+                
+                new FileDeleteUtil().deleteFile(file);
+                
+                rs.executeSql("delete from pdf_imagefile where imagefileid="+imageFileId);
+                rs.executeSql("delete from imagefile where imagefileid="+pdfimagefileid);
+            }
+            
+            rs.executeUpdate("delete from convert_imagefile where imagefileid=?",imageFileId);
+            
+        }catch(Exception ex){
+            
+        }
+    }
+
+    /**
+     * 获取新的附件ID
+     */
+    public static int getNewImageFileId(){
+        if(null == imageFileIdUpdate) {
+            return -1;
+        }else {
+            return imageFileIdUpdate.getImageFileNewId();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/main/youhong_ai_old_src/weaver/fna/general/FnaCommon.java b/src/main/youhong_ai_old_src/weaver/fna/general/FnaCommon.java
new file mode 100644
index 0000000..7c190cd
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/fna/general/FnaCommon.java
@@ -0,0 +1,5920 @@
+/*
+ *
+ * Copyright (c) 2001-2016 泛微软件.
+ * 泛微协同商务系统,版权所有.
+ *
+ */
+package weaver.fna.general;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.UnsupportedEncodingException;
+import java.io.Writer;
+import java.text.DecimalFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Hashtable;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+import java.util.UUID;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
+
+import oracle.sql.CLOB;
+
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang.StringEscapeUtils;
+
+import weaver.conn.BatchRecordSet;
+import weaver.conn.ConnStatement;
+import weaver.conn.RecordSet;
+import weaver.fna.budget.BudgetApproveWFHandler;
+import weaver.fna.budget.BudgetHandler;
+import weaver.fna.budget.FnaFeeWfInfoComInfo;
+import weaver.fna.budget.FnaWfMultiSet;
+import weaver.fna.budget.FnaWfMultiSetFieldInfo;
+import weaver.fna.budget.FnaTableNameEnum;
+import weaver.fna.budget.FnaWfSet;
+import weaver.fna.budget.FnaWfSetCache;
+import weaver.fna.encrypt.Des;
+import weaver.fna.encrypt.RSAUtils;
+import weaver.fna.invoice.common.FnaInvoiceCommon;
+import weaver.fna.maintenance.BudgetfeeTypeComInfo;
+import weaver.fna.maintenance.FnaAdvanceAmountControl;
+import weaver.fna.maintenance.FnaAmountControl;
+import weaver.fna.maintenance.FnaBorrowAmountControl;
+import weaver.fna.maintenance.FnaChangeAmountControl;
+import weaver.fna.maintenance.FnaCostCenter;
+import weaver.fna.maintenance.FnaShareAmountControl;
+import weaver.fna.maintenance.FnaSplitTableByYearComInfo;
+import weaver.fna.maintenance.FnaSystemSetComInfo;
+import weaver.general.BaseBean;
+import weaver.general.TimeUtil;
+import weaver.general.Util;
+import weaver.hrm.User;
+import weaver.hrm.UserManager;
+import weaver.hrm.company.DepartmentComInfo;
+import weaver.hrm.company.SubCompanyComInfo;
+import weaver.hrm.resource.ResourceComInfo;
+import weaver.interfaces.workflow.action.FnaAdvanceEffectNew;
+import weaver.interfaces.workflow.action.FnaAdvanceReverseNew;
+import weaver.interfaces.workflow.action.FnaBorrowEffectNew;
+import weaver.interfaces.workflow.action.FnaBorrowReverseNew;
+import weaver.interfaces.workflow.action.FnaChangeEffectNew;
+import weaver.interfaces.workflow.action.FnaShareEffectNew;
+import weaver.interfaces.workflow.action.WorkflowFnaEffectNew;
+import weaver.interfaces.workflow.action.WorkflowFnaInWorkflowNew;
+import weaver.security.util.SecurityMethodUtil;
+import weaver.soa.workflow.request.RequestInfo;
+import weaver.soa.workflow.request.RequestService;
+import weaver.systeminfo.SysMaintenanceLog;
+import weaver.systeminfo.SystemEnv;
+import weaver.workflow.html.WFLayoutToHtml;
+import weaver.workflow.workflow.WorkflowVersion;
+
+import com.engine.fnaMulDimensions.biz.FnaExpenseInfoBiz;
+import com.engine.fnaMulDimensions.biz.TemplateFillReportBiz;
+import com.engine.fnaMulDimensions.biz.TemplateFillReportBizNew;
+import com.engine.fnaMulDimensions.biz.action.FnaFreezeBudget;
+import com.engine.fnaMulDimensions.biz.action.FnaReleaseBudget;
+import com.engine.fnaMulDimensions.util.FnaReimbursementUtils;
+import com.engine.fnaMulDimensions.util.FnaWorkflowSetUtils;
+import com.engine.fnaMulDimensions.util.FnaWorkflowUtil;
+
+/**
+ * 预算通用工具类
+ *
+ * @author 无聊的ck
+ */
+public class FnaCommon extends BaseBean {
+    /**
+     * 获取ip地址
+     *
+     * @param request
+     * @return
+     */
+    public static String getRemoteAddr(HttpServletRequest request) {
+        String ip = "";
+        try {
+            ip = request.getHeader("x-forwarded-for");
+        } catch (Exception e) {
+        }
+        if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+            try {
+                ip = request.getHeader("Proxy-Client-IP");
+            } catch (Exception e) {
+            }
+        }
+        if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+            try {
+                ip = request.getHeader("WL-Proxy-Client-IP");
+            } catch (Exception e) {
+            }
+        }
+        if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+            try {
+                ip = request.getRemoteAddr();
+            } catch (Exception e) {
+            }
+        }
+        return ip;
+    }
+
+    /**
+     * 加载流程html模板页面的流程的费用相关信息
+     *
+     * @param formid
+     * @param workflowid
+     * @param requestid
+     * @param otherPara_hs 传入WFLayoutToHtml的同名变量
+     */
+    public void loadWFLayoutToHtmlFnaInfo(int formid, int workflowid, int requestid, Hashtable otherPara_hs) {
+
+
+        String sql = "";
+        RecordSet rs = new RecordSet();
+
+        //启用多明细表报销
+        int fnaWfTypeMultiReim = 0;
+        sql = "select * from fnaFeeWfInfo where workflowid = " + workflowid;
+        rs.executeQuery(sql);
+        if (rs.next()) {
+            fnaWfTypeMultiReim = rs.getInt("fnaWfTypeMultiReim");
+        }
+        //启用多明细表报销,开关开启:当前流程的任意明细表都 【 可以用于也仅可以用于 】 费用报销;不再支持"还款,预付款冲销"功能;
+        if (fnaWfTypeMultiReim == 1) {
+            return;
+        }
+
+        String _key01 = "_isEnableFnaWfHm_FnaCommon.getIsEnableFnaWfHm_workflowid=" + workflowid + "__requestId=" + requestid;
+        HashMap<String, String> _isEnableFnaWfHm = new HashMap<String, String>();
+        if (otherPara_hs.containsKey(_key01)) {
+            _isEnableFnaWfHm = (HashMap<String, String>) otherPara_hs.get(_key01);
+        } else {
+            _isEnableFnaWfHm = FnaCommon.getIsEnableFnaWfHm(workflowid);
+            otherPara_hs.put(_key01, _isEnableFnaWfHm);
+        }
+
+        boolean isEnableFnaWfE8 = "true".equals(_isEnableFnaWfHm.get("isEnableFnaWfE8"));
+        boolean isEnableFnaChangeWf = "true".equals(_isEnableFnaWfHm.get("isEnableFnaChangeWf"));
+        boolean isEnableFnaShareWf = "true".equals(_isEnableFnaWfHm.get("isEnableFnaShareWf"));
+        boolean isEnableFnaBorrowWf = "true".equals(_isEnableFnaWfHm.get("isEnableFnaBorrowWf"));
+        boolean isEnableFnaRepaymentWf = "true".equals(_isEnableFnaWfHm.get("isEnableFnaRepaymentWf"));
+        boolean enableRepayment = "true".equals(_isEnableFnaWfHm.get("enableRepayment"));
+        boolean isEnableFnaAdvanceWf = "true".equals(_isEnableFnaWfHm.get("isEnableFnaAdvanceWf"));
+        boolean enableReverseAdvance = "true".equals(_isEnableFnaWfHm.get("enableReverseAdvance"));
+
+        if (isEnableFnaWfE8 || isEnableFnaChangeWf || isEnableFnaShareWf || isEnableFnaBorrowWf || isEnableFnaRepaymentWf || isEnableFnaAdvanceWf) {
+
+            //读取财务相关流程字段对应关系
+            String _key001 = "_isEnableFnaWfHm_fnaBudgetControl.getFnaWfFieldInfo4Expense_workflowid=" + workflowid + "__requestId=" + requestid;
+            Map<String, String> fnaWfSetMap = null;
+            if (otherPara_hs.containsKey(_key001)) {
+                fnaWfSetMap = (HashMap<String, String>) otherPara_hs.get(_key001);
+            } else {
+                fnaWfSetMap = new HashMap<String, String>();
+                FnaCommon.getFnaWfFieldInfo4Expense(workflowid, fnaWfSetMap);
+                otherPara_hs.put(_key001, fnaWfSetMap);
+            }
+
+            //读取费用报销流程、预算变更流程、费用分摊流程，第1个明细表中的数据库中的记录
+            if (isEnableFnaWfE8 || isEnableFnaChangeWf || isEnableFnaShareWf) {
+                String _key002 = "_isEnableFnaWfHm_FnaCommon.qryFnaExpenseRequestRecord_workflowid=" + workflowid + "__requestId=" + requestid;
+                if (!otherPara_hs.containsKey(_key002)) {
+                    HashMap<String, HashMap<String, String>> reqDataMap = FnaCommon.qryFnaExpenseRequestRecord(requestid, formid, fnaWfSetMap,
+                            isEnableFnaWfE8, isEnableFnaChangeWf, isEnableFnaShareWf);
+                    otherPara_hs.put(_key002, reqDataMap);
+                }
+            }
+
+            //读取费用报销流程，写入费用表的数据库中的记录
+            if (isEnableFnaWfE8) {
+                String _key002 = "_isEnableFnaWfHm_FnaCommon.qryFnaExpenseInfoAllRowRecordHm_workflowid=" + workflowid + "__requestId=" + requestid;
+                if (!otherPara_hs.containsKey(_key002)) {
+                    HashMap<String, HashMap<String, String>> reqFnaExpenseDataMap = FnaCommon.qryFnaExpenseInfoAllRowRecordHm(requestid);
+                    otherPara_hs.put(_key002, reqFnaExpenseDataMap);
+                }
+            }
+
+            //读取费用报销流程、还款流程，第2个明细表中的数据库中的记录
+            if ((isEnableFnaWfE8 && enableRepayment) || isEnableFnaRepaymentWf) {
+                String _key002 = "_isEnableFnaWfHm_FnaCommon.qryFnaRepaymentRequestRecord_workflowid=" + workflowid + "__requestId=" + requestid;
+                if (!otherPara_hs.containsKey(_key002)) {
+                    HashMap<String, HashMap<String, String>> reqRepaymentDataMap = FnaCommon.qryFnaRepaymentRequestRecord(requestid, formid, fnaWfSetMap);
+                    otherPara_hs.put(_key002, reqRepaymentDataMap);
+                }
+            }
+
+            //读取费用报销流程，第4个明细表中的数据库中的记录
+            if ((isEnableFnaWfE8 && enableReverseAdvance)) {
+                String _key002 = "_isEnableFnaWfHm_FnaCommon.qryFnaReverseAdvanceRequestRecord_workflowid=" + workflowid + "__requestId=" + requestid;
+                if (!otherPara_hs.containsKey(_key002)) {
+                    HashMap<String, HashMap<String, String>> reqRepaymentDataMap = FnaCommon.qryFnaReverseAdvanceRequestRecord(requestid, formid, fnaWfSetMap);
+                    otherPara_hs.put(_key002, reqRepaymentDataMap);
+                }
+            }
+        }
+    }
+
+    /**
+     * 获取新建流程流程，流程表单对应费用承担主体类型字段的默认值（节点前附加操作/选择框默认值）
+     *
+     * @param workflowid
+     * @param ortType_fieldid 流程表单对应费用承担主体类型字段的字段id
+     * @return
+     */
+    public static int getOrtTypeFieldidDefaultSelectValue(int workflowid, int ortType_fieldid) {
+        int organizationtype = -1;
+        RecordSet rs_fna = new RecordSet();
+
+        if (organizationtype < 0) {
+            String sql2 = "select a.customervalue from workflow_addinoperate a " +
+                    " where a.fieldop1id = 0 and a.fieldop2id = 0 and a.operation = 0 " +
+                    " and a.workflowid = " + workflowid + " and a.fieldid = " + ortType_fieldid + " ";
+            //_bb.writeLog("sql2 01="+sql2);
+            rs_fna.executeSql(sql2);
+            if (rs_fna.next()) {
+                organizationtype = rs_fna.getInt("customervalue");
+            }
+        }
+        if (organizationtype < 0) {
+            String sql2 = "select a.* from workflow_SelectItem a " +
+                    " where a.cancel = 0 and a.isdefault = 'y' and a.fieldid = " + ortType_fieldid + " " +
+                    " order by a.selectvalue asc";
+            rs_fna.executeSql(sql2);
+            if (rs_fna.next()) {
+                organizationtype = rs_fna.getInt("selectvalue");
+            }
+        }
+
+        return organizationtype;
+    }
+
+    /**
+     * 获得GUID，数据库方式生成
+     *
+     * @param dBType 数据库类型，目前只支持oracle和sqlServer
+     * @return 32位长度，无符号-，其中英文字符随机大小写
+     */
+    public static String getPrimaryKeyGuid1SqlStr(String dBType) {
+        String guid1SQlStr = "replace(newid(),'-','')";
+        if ("oracle".equalsIgnoreCase(dBType)) {
+            guid1SQlStr = "SYS_GUID()";
+        } else if ("mysql".equalsIgnoreCase(dBType)) {
+            guid1SQlStr = "replace(uuid(),'-','')";
+        } else if ("dm".equalsIgnoreCase(dBType)) {
+            guid1SQlStr = "replace(SYS_GUID(),'0x','')";
+        }
+        return guid1SQlStr;
+    }
+
+
+    /**
+     * 获取自定义费控流程流程的字段对应关系Map对象
+     *
+     * @param workflowid
+     * @param dataMap    自定义费控流程流程的字段对应关系Map对象
+     * @return
+     */
+    public static String getFnaWfFieldInfo4Expense(int workflowid, Map<String, String> dataMap) {
+        String fnaWfType = "";
+        String sql = "";
+        RecordSet rs = new RecordSet();
+
+        //启用多明细表报销
+        int fnaWfTypeMultiReim = 0;
+        sql = "select * from fnaFeeWfInfo where workflowid = " + workflowid;
+        rs.executeSql(sql);
+        if (rs.next()) {
+            fnaWfTypeMultiReim = rs.getInt("fnaWfTypeMultiReim");
+            fnaWfType = Util.null2String(rs.getString("fnaWfType"));
+        }
+        //启用多明细表报销,开关开启:当前流程的任意明细表都 【 可以用于也仅可以用于 】 费用报销;不再支持"还款,预付款冲销"功能;
+        if (fnaWfTypeMultiReim == 1) {
+            return fnaWfType;
+        }
+
+        //从缓存中加载-自定义费控流程流程的字段对应关系Map对象
+
+        //考虑到集群环境,屏蔽从缓存加载字段对应信息
+        if (false) {//FnaWfSetCache.loadFnaWfFieldSetMap(workflowid, dataMap)
+            fnaWfType = dataMap.get("fnaWfType");
+        } else {
+            sql = "select a.fieldType,a.fieldId,a.dtlNumber,b.fieldname,c.fnaWfType,d.formid, b.fieldhtmltype, b.type, b.detailtable, " +
+                    " a.isWfFieldLinkage, a.automaticTake, a.controlBorrowingWf, a.controlflowSubmission " +
+                    " from fnaFeeWfInfoField a " +
+                    " join workflow_billfield b on a.fieldId=b.id " +
+                    " join fnaFeeWfInfo c on a.mainId = c.id " +
+                    " join workflow_base d on a.workflowid = d.id " +
+                    " where a.workflowid = ?";
+            rs.executeQuery(sql, workflowid);
+            while (rs.next()) {
+                String fieldType = Util.null2String(rs.getString("fieldType"));
+                String fieldId = Util.null2String(rs.getString("fieldId"));
+                String dtlNumber = Util.null2String(rs.getString("dtlNumber"));
+                String fieldName = Util.null2String(rs.getString("fieldname"));
+                fnaWfType = Util.null2String(rs.getString("fnaWfType"));
+                String formid = Util.getIntValue(rs.getString("formid"), 0) + "";
+                String fieldhtmltype = Util.null2String(rs.getString("fieldhtmltype"));
+                String type = Util.null2String(rs.getString("type"));
+                String _detailtable = Util.null2String(rs.getString("detailtable"));
+                int is_detailtable = "".equals(_detailtable) ? 0 : 1;
+                int isWfFieldLinkage = Util.getIntValue(rs.getString("isWfFieldLinkage"), 0);
+                int automaticTake = Util.getIntValue(rs.getString("automaticTake"), 0);
+                String controlBorrowingWf = Util.null2String(rs.getString("controlBorrowingWf")).trim();
+                int controlflowSubmission = Util.getIntValue(rs.getString("controlflowSubmission"), 1);
+
+                dataMap.put("formid", formid);
+                dataMap.put("fnaWfType", fnaWfType);
+
+                if ("fnaFeeWf".equals(fnaWfType)) {//报销流程
+                    String fieldIdSubject_isDtl = "1";
+                    String fieldIdOrgType_isDtl = "1";
+                    String fieldIdOrgId_isDtl = "1";
+                    String fieldIdOccurdate_isDtl = "1";
+
+                    if (Util.getIntValue(dtlNumber) == 0) {
+                        if (Util.getIntValue(fieldType) == 1) {
+                            dataMap.put("main_fieldIdSqr_fieldId", fieldId);
+                            dataMap.put("main_fieldIdSqr_fieldName", fieldName);
+                            dataMap.put(fieldId, "main_fieldIdSqr_fieldId");
+                            dataMap.put("main_fieldIdSqr_fieldhtmltype", fieldhtmltype);
+                            dataMap.put("main_fieldIdSqr_type", type);
+                            dataMap.put("main_fieldIdSqr_controlBorrowingWf", controlBorrowingWf);//还款流程中通过申请人字段控制可选择的借款流程
+                        } else if (Util.getIntValue(fieldType) == 2) {
+                            dataMap.put("main_fieldIdFysqlc_fieldId", fieldId);
+                            dataMap.put("main_fieldIdFysqlc_fieldName", fieldName);
+                            dataMap.put(fieldId, "main_fieldIdFysqlc_fieldId");
+                            dataMap.put("main_fieldIdFysqlc_fieldhtmltype", fieldhtmltype);
+                            dataMap.put("main_fieldIdFysqlc_type", type);
+                            if (Util.getIntValue(fieldId) > 0) {
+                                dataMap.put("haveApplicationBudget", "true");
+                            } else {
+                                dataMap.put("haveApplicationBudget", "false");
+                            }
+                            dataMap.put("main_fieldIdFysqlc_isWfFieldLinkage", String.valueOf(isWfFieldLinkage));
+                            dataMap.put("main_fieldIdFysqlc_controlflowSubmission", String.valueOf(controlflowSubmission));
+                        } else if (Util.getIntValue(fieldType) == 3) {
+                            dataMap.put("main_fieldIdSfbxwc_fieldId", fieldId);
+                            dataMap.put("main_fieldIdSfbxwc_fieldName", fieldName);
+                            dataMap.put(fieldId, "main_fieldIdSfbxwc_fieldId");
+                            dataMap.put("main_fieldIdSfbxwc_fieldhtmltype", fieldhtmltype);
+                            dataMap.put("main_fieldIdSfbxwc_type", type);
+                        } else if (Util.getIntValue(fieldType) == 4) {
+                            dataMap.put("main_fieldIdYfkZfHj_fieldId", fieldId);
+                            dataMap.put("main_fieldIdYfkZfHj_fieldName", fieldName);
+                            dataMap.put(fieldId, "main_fieldIdYfkZfHj_fieldId");
+                            dataMap.put("main_fieldIdYfkZfHj_fieldhtmltype", fieldhtmltype);
+                            dataMap.put("main_fieldIdYfkZfHj_type", type);
+                        } else if (Util.getIntValue(fieldType) == 5) {
+                            dataMap.put("main_fieldIdSfysn_fieldId", fieldId);
+                            dataMap.put("main_fieldIdSfysn_fieldName", fieldName);
+                            dataMap.put(fieldId, "main_fieldIdSfysn_fieldId");
+                            dataMap.put("main_fieldIdSfysn_fieldhtmltype", fieldhtmltype);
+                            dataMap.put("main_fieldIdSfysn_type", type);
+                        }
+                    } else if (Util.getIntValue(dtlNumber) == 1) {
+                        if (Util.getIntValue(fieldType) == 1) {
+                            dataMap.put("fieldIdSubject_fieldId", fieldId);
+                            dataMap.put("fieldIdSubject_fieldName", fieldName);
+                            dataMap.put(fieldId, "fieldIdSubject_fieldId");
+                            dataMap.put("fieldIdSubject_fieldhtmltype", fieldhtmltype);
+                            dataMap.put("fieldIdSubject_type", type);
+                            fieldIdSubject_isDtl = "" + is_detailtable;
+                            dataMap.put("fieldIdSubject_fieldId_isDtl", fieldIdSubject_isDtl);
+                        } else if (Util.getIntValue(fieldType) == 2) {
+                            dataMap.put("fieldIdOrgType_fieldId", fieldId);
+                            dataMap.put("fieldIdOrgType_fieldName", fieldName);
+                            dataMap.put(fieldId, "fieldIdOrgType_fieldId");
+                            dataMap.put("fieldIdOrgType_fieldhtmltype", fieldhtmltype);
+                            dataMap.put("fieldIdOrgType_type", type);
+                            fieldIdOrgType_isDtl = "" + is_detailtable;
+                            dataMap.put("fieldIdOrgType_fieldId_isDtl", fieldIdOrgType_isDtl);
+                            dataMap.put("fieldIdOrgType_defaultSelectValue", FnaCommon.getOrtTypeFieldidDefaultSelectValue(workflowid, Util.getIntValue(fieldId)) + "");
+                        } else if (Util.getIntValue(fieldType) == 3) {
+                            dataMap.put("fieldIdOrgId_fieldId", fieldId);
+                            dataMap.put("fieldIdOrgId_fieldName", fieldName);
+                            dataMap.put(fieldId, "fieldIdOrgId_fieldId");
+                            dataMap.put("fieldIdOrgId_fieldhtmltype", fieldhtmltype);
+                            dataMap.put("fieldIdOrgId_type", type);
+                            fieldIdOrgId_isDtl = "" + is_detailtable;
+                            dataMap.put("fieldIdOrgId_fieldId_isDtl", fieldIdOrgId_isDtl);
+                            dataMap.put("fieldIdOrgId_automaticTake", String.valueOf(automaticTake));
+                        } else if (Util.getIntValue(fieldType) == 4) {
+                            dataMap.put("fieldIdOccurdate_fieldId", fieldId);
+                            dataMap.put("fieldIdOccurdate_fieldName", fieldName);
+                            dataMap.put(fieldId, "fieldIdOccurdate_fieldId");
+                            dataMap.put("fieldIdOccurdate_fieldhtmltype", fieldhtmltype);
+                            dataMap.put("fieldIdOccurdate_type", type);
+                            fieldIdOccurdate_isDtl = "" + is_detailtable;
+                            dataMap.put("fieldIdOccurdate_fieldId_isDtl", fieldIdOccurdate_isDtl);
+                        } else if (Util.getIntValue(fieldType) == 5) {
+                            dataMap.put("fieldIdAmount_fieldId", fieldId);
+                            dataMap.put("fieldIdAmount_fieldName", fieldName);
+                            dataMap.put(fieldId, "fieldIdAmount_fieldId");
+                            dataMap.put("fieldIdAmount_fieldhtmltype", fieldhtmltype);
+                            dataMap.put("fieldIdAmount_type", type);
+                            dataMap.put("fieldIdAmount_fieldId_isDtl", "" + is_detailtable);
+                        } else if (Util.getIntValue(fieldType) == 6) {
+                            dataMap.put("fieldIdHrmInfo_fieldId", fieldId);
+                            dataMap.put("fieldIdHrmInfo_fieldName", fieldName);
+                            dataMap.put(fieldId, "fieldIdHrmInfo_fieldId");
+                            dataMap.put("fieldIdHrmInfo_fieldhtmltype", fieldhtmltype);
+                            dataMap.put("fieldIdHrmInfo_type", type);
+                            dataMap.put("fieldIdHrmInfo_fieldId_isDtl", "" + is_detailtable);
+                        } else if (Util.getIntValue(fieldType) == 7) {
+                            dataMap.put("fieldIdDepInfo_fieldId", fieldId);
+                            dataMap.put("fieldIdDepInfo_fieldName", fieldName);
+                            dataMap.put(fieldId, "fieldIdDepInfo_fieldId");
+                            dataMap.put("fieldIdDepInfo_fieldhtmltype", fieldhtmltype);
+                            dataMap.put("fieldIdDepInfo_type", type);
+                            dataMap.put("fieldIdDepInfo_fieldId_isDtl", "" + is_detailtable);
+                        } else if (Util.getIntValue(fieldType) == 8) {
+                            dataMap.put("fieldIdSubInfo_fieldId", fieldId);
+                            dataMap.put("fieldIdSubInfo_fieldName", fieldName);
+                            dataMap.put(fieldId, "fieldIdSubInfo_fieldId");
+                            dataMap.put("fieldIdSubInfo_fieldhtmltype", fieldhtmltype);
+                            dataMap.put("fieldIdSubInfo_type", type);
+                            dataMap.put("fieldIdSubInfo_fieldId_isDtl", "" + is_detailtable);
+                        } else if (Util.getIntValue(fieldType) == 9) {
+                            dataMap.put("fieldIdFccInfo_fieldId", fieldId);
+                            dataMap.put("fieldIdFccInfo_fieldName", fieldName);
+                            dataMap.put(fieldId, "fieldIdFccInfo_fieldId");
+                            dataMap.put("fieldIdFccInfo_fieldhtmltype", fieldhtmltype);
+                            dataMap.put("fieldIdFccInfo_type", type);
+                            dataMap.put("fieldIdFccInfo_fieldId_isDtl", "" + is_detailtable);
+                        } else if (Util.getIntValue(fieldType) == 1000) {
+                            dataMap.put("fieldIdReqId_fieldId", fieldId);
+                            dataMap.put("fieldIdReqId_fieldName", fieldName);
+                            dataMap.put(fieldId, "fieldIdReqId_fieldId");
+                            dataMap.put("fieldIdReqId_fieldhtmltype", fieldhtmltype);
+                            dataMap.put("fieldIdReqId_type", type);
+                            dataMap.put("fieldIdReqId_fieldId_isDtl", "" + is_detailtable);
+                        } else if (Util.getIntValue(fieldType) == 1010) {
+                            dataMap.put("fieldIdReqDtId_fieldId", fieldId);
+                            dataMap.put("fieldIdReqDtId_fieldName", fieldName);
+                            dataMap.put(fieldId, "fieldIdReqDtId_fieldId");
+                            dataMap.put("fieldIdReqDtId_fieldhtmltype", fieldhtmltype);
+                            dataMap.put("fieldIdReqDtId_type", type);
+                            dataMap.put("fieldIdReqDtId_fieldId_isDtl", "" + is_detailtable);
+                        }
+                    } else if (Util.getIntValue(dtlNumber) == 2) {
+                        if (Util.getIntValue(fieldType) == 1) {
+                            dataMap.put("dt2_fieldIdJklc_fieldId", fieldId);
+                            dataMap.put("dt2_fieldIdJklc_fieldName", fieldName);
+                            dataMap.put(fieldId, "dt2_fieldIdJklc_fieldId");
+                            dataMap.put("dt2_fieldIdJklc_fieldhtmltype", fieldhtmltype);
+                            dataMap.put("dt2_fieldIdJklc_type", type);
+                        } else if (Util.getIntValue(fieldType) == 2) {
+                            dataMap.put("dt2_fieldIdJkdh_fieldId", fieldId);
+                            dataMap.put("dt2_fieldIdJkdh_fieldName", fieldName);
+                            dataMap.put(fieldId, "dt2_fieldIdJkdh_fieldId");
+                            dataMap.put("dt2_fieldIdJkdh_fieldhtmltype", fieldhtmltype);
+                            dataMap.put("dt2_fieldIdJkdh_type", type);
+                        } else if (Util.getIntValue(fieldType) == 3) {
+                            dataMap.put("dt2_fieldIdDnxh_fieldId", fieldId);
+                            dataMap.put("dt2_fieldIdDnxh_fieldName", fieldName);
+                            dataMap.put(fieldId, "dt2_fieldIdDnxh_fieldId");
+                            dataMap.put("dt2_fieldIdDnxh_fieldhtmltype", fieldhtmltype);
+                            dataMap.put("dt2_fieldIdDnxh_type", type);
+                        } else if (Util.getIntValue(fieldType) == 4) {
+                            dataMap.put("dt2_fieldIdJkje_fieldId", fieldId);
+                            dataMap.put("dt2_fieldIdJkje_fieldName", fieldName);
+                            dataMap.put(fieldId, "dt2_fieldIdJkje_fieldId");
+                            dataMap.put("dt2_fieldIdJkje_fieldhtmltype", fieldhtmltype);
+                            dataMap.put("dt2_fieldIdJkje_type", type);
+                        } else if (Util.getIntValue(fieldType) == 5) {
+                            dataMap.put("dt2_fieldIdYhje_fieldId", fieldId);
+                            dataMap.put("dt2_fieldIdYhje_fieldName", fieldName);
+                            dataMap.put(fieldId, "dt2_fieldIdYhje_fieldId");
+                            dataMap.put("dt2_fieldIdYhje_fieldhtmltype", fieldhtmltype);
+                            dataMap.put("dt2_fieldIdYhje_type", type);
+                        } else if (Util.getIntValue(fieldType) == 6) {
+                            dataMap.put("dt2_fieldIdSpzje_fieldId", fieldId);
+                            dataMap.put("dt2_fieldIdSpzje_fieldName", fieldName);
+                            dataMap.put(fieldId, "dt2_fieldIdSpzje_fieldId");
+                            dataMap.put("dt2_fieldIdSpzje_fieldhtmltype", fieldhtmltype);
+                            dataMap.put("dt2_fieldIdSpzje_type", type);
+                        } else if (Util.getIntValue(fieldType) == 7) {
+                            dataMap.put("dt2_fieldIdWhje_fieldId", fieldId);
+                            dataMap.put("dt2_fieldIdWhje_fieldName", fieldName);
+                            dataMap.put(fieldId, "dt2_fieldIdWhje_fieldId");
+                            dataMap.put("dt2_fieldIdWhje_fieldhtmltype", fieldhtmltype);
+                            dataMap.put("dt2_fieldIdWhje_type", type);
+                        } else if (Util.getIntValue(fieldType) == 8) {
+                            dataMap.put("dt2_fieldIdCxje_fieldId", fieldId);
+                            dataMap.put("dt2_fieldIdCxje_fieldName", fieldName);
+                            dataMap.put(fieldId, "dt2_fieldIdCxje_fieldId");
+                            dataMap.put("dt2_fieldIdCxje_fieldhtmltype", fieldhtmltype);
+                            dataMap.put("dt2_fieldIdCxje_type", type);
+                        }
+                    } else if (Util.getIntValue(dtlNumber) == 3) {
+                        if (Util.getIntValue(fieldType) == 1) {
+                            dataMap.put("dt3_fieldIdSkfs_fieldId", fieldId);
+                            dataMap.put("dt3_fieldIdSkfs_fieldName", fieldName);
+                            dataMap.put(fieldId, "dt3_fieldIdSkfs_fieldId");
+                            dataMap.put("dt3_fieldIdSkfs_fieldhtmltype", fieldhtmltype);
+                            dataMap.put("dt3_fieldIdSkfs_type", type);
+                        } else if (Util.getIntValue(fieldType) == 2) {
+                            dataMap.put("dt3_fieldIdSkje_fieldId", fieldId);
+                            dataMap.put("dt3_fieldIdSkje_fieldName", fieldName);
+                            dataMap.put(fieldId, "dt3_fieldIdSkje_fieldId");
+                            dataMap.put("dt3_fieldIdSkje_fieldhtmltype", fieldhtmltype);
+                            dataMap.put("dt3_fieldIdSkje_type", type);
+                        } else if (Util.getIntValue(fieldType) == 3) {
+                            dataMap.put("dt3_fieldIdKhyh_fieldId", fieldId);
+                            dataMap.put("dt3_fieldIdKhyh_fieldName", fieldName);
+                            dataMap.put(fieldId, "dt3_fieldIdKhyh_fieldId");
+                            dataMap.put("dt3_fieldIdKhyh_fieldhtmltype", fieldhtmltype);
+                            dataMap.put("dt3_fieldIdKhyh_type", type);
+                        } else if (Util.getIntValue(fieldType) == 4) {
+                            dataMap.put("dt3_fieldIdHuming_fieldId", fieldId);
+                            dataMap.put("dt3_fieldIdHuming_fieldName", fieldName);
+                            dataMap.put(fieldId, "dt3_fieldIdHuming_fieldId");
+                            dataMap.put("dt3_fieldIdHuming_fieldhtmltype", fieldhtmltype);
+                            dataMap.put("dt3_fieldIdHuming_type", type);
+                        } else if (Util.getIntValue(fieldType) == 5) {
+                            dataMap.put("dt3_fieldIdSkzh_fieldId", fieldId);
+                            dataMap.put("dt3_fieldIdSkzh_fieldName", fieldName);
+                            dataMap.put(fieldId, "dt3_fieldIdSkzh_fieldId");
+                            dataMap.put("dt3_fieldIdSkzh_fieldhtmltype", fieldhtmltype);
+                            dataMap.put("dt3_fieldIdSkzh_type", type);
+                        }
+                    } else if (Util.getIntValue(dtlNumber) == 4) {
+                        if (Util.getIntValue(fieldType) == 1) {
+                            dataMap.put("dt4_fieldIdYfklc_fieldId", fieldId);
+                            dataMap.put("dt4_fieldIdYfklc_fieldName", fieldName);
+                            dataMap.put(fieldId, "dt4_fieldIdYfklc_fieldId");
+                            dataMap.put("dt4_fieldIdYfklc_fieldhtmltype", fieldhtmltype);
+                            dataMap.put("dt4_fieldIdYfklc_type", type);
+                        } else if (Util.getIntValue(fieldType) == 2) {
+                            dataMap.put("dt4_fieldIdYfkdh_fieldId", fieldId);
+                            dataMap.put("dt4_fieldIdYfkdh_fieldName", fieldName);
+                            dataMap.put(fieldId, "dt4_fieldIdYfkdh_fieldId");
+                            dataMap.put("dt4_fieldIdYfkdh_fieldhtmltype", fieldhtmltype);
+                            dataMap.put("dt4_fieldIdYfkdh_type", type);
+                        } else if (Util.getIntValue(fieldType) == 3) {
+                            dataMap.put("dt4_fieldIdDnxh_fieldId", fieldId);
+                            dataMap.put("dt4_fieldIdDnxh_fieldName", fieldName);
+                            dataMap.put(fieldId, "dt4_fieldIdDnxh_fieldId");
+                            dataMap.put("dt4_fieldIdDnxh_fieldhtmltype", fieldhtmltype);
+                            dataMap.put("dt4_fieldIdDnxh_type", type);
+                        } else if (Util.getIntValue(fieldType) == 4) {
+                            dataMap.put("dt4_fieldIdYfkje_fieldId", fieldId);
+                            dataMap.put("dt4_fieldIdYfkje_fieldName", fieldName);
+                            dataMap.put(fieldId, "dt4_fieldIdYfkje_fieldId");
+                            dataMap.put("dt4_fieldIdYfkje_fieldhtmltype", fieldhtmltype);
+                            dataMap.put("dt4_fieldIdYfkje_type", type);
+                        } else if (Util.getIntValue(fieldType) == 5) {
+                            dataMap.put("dt4_fieldIdYhje_fieldId", fieldId);
+                            dataMap.put("dt4_fieldIdYhje_fieldName", fieldName);
+                            dataMap.put(fieldId, "dt4_fieldIdYhje_fieldId");
+                            dataMap.put("dt4_fieldIdYhje_fieldhtmltype", fieldhtmltype);
+                            dataMap.put("dt4_fieldIdYhje_type", type);
+                        } else if (Util.getIntValue(fieldType) == 6) {
+                            dataMap.put("dt4_fieldIdSpzje_fieldId", fieldId);
+                            dataMap.put("dt4_fieldIdSpzje_fieldName", fieldName);
+                            dataMap.put(fieldId, "dt4_fieldIdSpzje_fieldId");
+                            dataMap.put("dt4_fieldIdSpzje_fieldhtmltype", fieldhtmltype);
+                            dataMap.put("dt4_fieldIdSpzje_type", type);
+                        } else if (Util.getIntValue(fieldType) == 7) {
+                            dataMap.put("dt4_fieldIdWhje_fieldId", fieldId);
+                            dataMap.put("dt4_fieldIdWhje_fieldName", fieldName);
+                            dataMap.put(fieldId, "dt4_fieldIdWhje_fieldId");
+                            dataMap.put("dt4_fieldIdWhje_fieldhtmltype", fieldhtmltype);
+                            dataMap.put("dt4_fieldIdWhje_type", type);
+                        } else if (Util.getIntValue(fieldType) == 8) {
+                            dataMap.put("dt4_fieldIdCxje_fieldId", fieldId);
+                            dataMap.put("dt4_fieldIdCxje_fieldName", fieldName);
+                            dataMap.put(fieldId, "dt4_fieldIdCxje_fieldId");
+                            dataMap.put("dt4_fieldIdCxje_fieldhtmltype", fieldhtmltype);
+                            dataMap.put("dt4_fieldIdCxje_type", type);
+                        }
+                    }
+
+                    boolean dt1_haveIsDtlField = ("1".equals(fieldIdSubject_isDtl) || "1".equals(fieldIdOrgType_isDtl) || "1".equals(fieldIdOrgId_isDtl) || "1".equals(fieldIdOccurdate_isDtl));
+                    dataMap.put("dt1_haveIsDtlField", dt1_haveIsDtlField ? "true" : "false");
+
+                } else if ("borrow".equals(fnaWfType)) {//借款流程
+                    if (Util.getIntValue(dtlNumber) == 0) {
+                        if (Util.getIntValue(fieldType) == 1) {
+                            dataMap.put("main_fieldIdSqr_fieldId", fieldId);//1：申请人；
+                            dataMap.put("main_fieldIdSqr_fieldName", fieldName);
+                            dataMap.put(fieldId, "main_fieldIdSqr_fieldId");
+                            dataMap.put("main_fieldIdSqr_fieldhtmltype", fieldhtmltype);
+                            dataMap.put("main_fieldIdSqr_type", type);
+                        }
+                    } else if (Util.getIntValue(dtlNumber) == 1) {
+                        if (Util.getIntValue(fieldType) == 1) {
+                            dataMap.put("dt1_fieldIdJklx_fieldId", fieldId);//1：借款类型；
+                            dataMap.put("dt1_fieldIdJklx_fieldName", fieldName);
+                            dataMap.put(fieldId, "dt1_fieldIdJklx_fieldId");
+                            dataMap.put("dt1_fieldIdJklx_fieldhtmltype", fieldhtmltype);
+                            dataMap.put("dt1_fieldIdJklx_type", type);
+                        } else if (Util.getIntValue(fieldType) == 2) {
+                            dataMap.put("dt1_fieldIdJkje_fieldId", fieldId);//2：借款金额；
+                            dataMap.put("dt1_fieldIdJkje_fieldName", fieldName);
+                            dataMap.put(fieldId, "dt1_fieldIdJkje_fieldId");
+                            dataMap.put("dt1_fieldIdJkje_fieldhtmltype", fieldhtmltype);
+                            dataMap.put("dt1_fieldIdJkje_type", type);
+                        } else if (Util.getIntValue(fieldType) == 3) {
+                            dataMap.put("dt1_fieldIdJkmx_fieldId", fieldId);//3：调整明细；
+                            dataMap.put("dt1_fieldIdJkmx_fieldName", fieldName);
+                            dataMap.put(fieldId, "dt1_fieldIdJkmx_fieldId");
+                            dataMap.put("dt1_fieldIdJkmx_fieldhtmltype", fieldhtmltype);
+                            dataMap.put("dt1_fieldIdJkmx_type", type);
+                        } else if (Util.getIntValue(fieldType) == 4) {
+                            dataMap.put("dt1_fieldIdJksm_fieldId", fieldId);//4：借款说明；
+                            dataMap.put("dt1_fieldIdJksm_fieldName", fieldName);
+                            dataMap.put(fieldId, "dt1_fieldIdJksm_fieldId");
+                            dataMap.put("dt1_fieldIdJksm_fieldhtmltype", fieldhtmltype);
+                            dataMap.put("dt1_fieldIdJksm_type", type);
+                        } else if (Util.getIntValue(fieldType) == 5) {
+                            dataMap.put("dt1_fieldIdXghklc_fieldId", fieldId);//5：相关还款流程；
+                            dataMap.put("dt1_fieldIdXghklc_fieldName", fieldName);
+                            dataMap.put(fieldId, "dt1_fieldIdXghklc_fieldId");
+                            dataMap.put("dt1_fieldIdXghklc_fieldhtmltype", fieldhtmltype);
+                            dataMap.put("dt1_fieldIdXghklc_type", type);
+                        }
+                    } else if (Util.getIntValue(dtlNumber) == 2) {
+                        if (Util.getIntValue(fieldType) == 1) {
+                            dataMap.put("dt2_fieldIdSkfs_fieldId", fieldId);//1：收款方式；
+                            dataMap.put("dt2_fieldIdSkfs_fieldName", fieldName);
+                            dataMap.put(fieldId, "dt2_fieldIdSkfs_fieldId");
+                            dataMap.put("dt2_fieldIdSkfs_fieldhtmltype", fieldhtmltype);
+                            dataMap.put("dt2_fieldIdSkfs_type", type);
+                        } else if (Util.getIntValue(fieldType) == 2) {
+                            dataMap.put("dt2_fieldIdSkje_fieldId", fieldId);//2：收款金额；
+                            dataMap.put("dt2_fieldIdSkje_fieldName", fieldName);
+                            dataMap.put(fieldId, "dt2_fieldIdSkje_fieldId");
+                            dataMap.put("dt2_fieldIdSkje_fieldhtmltype", fieldhtmltype);
+                            dataMap.put("dt2_fieldIdSkje_type", type);
+                        } else if (Util.getIntValue(fieldType) == 3) {
+                            dataMap.put("dt2_fieldIdKhyh_fieldId", fieldId);//3：开户银行；
+                            dataMap.put("dt2_fieldIdKhyh_fieldName", fieldName);
+                            dataMap.put(fieldId, "dt2_fieldIdKhyh_fieldId");
+                            dataMap.put("dt2_fieldIdKhyh_fieldhtmltype", fieldhtmltype);
+                            dataMap.put("dt2_fieldIdKhyh_type", type);
+                        } else if (Util.getIntValue(fieldType) == 4) {
+                            dataMap.put("dt2_fieldIdHuming_fieldId", fieldId);//4：户名；
+                            dataMap.put("dt2_fieldIdHuming_fieldName", fieldName);
+                            dataMap.put(fieldId, "dt2_fieldIdHuming_fieldId");
+                            dataMap.put("dt2_fieldIdHuming_fieldhtmltype", fieldhtmltype);
+                            dataMap.put("dt2_fieldIdHuming_type", type);
+                        } else if (Util.getIntValue(fieldType) == 5) {
+                            dataMap.put("dt2_fieldIdSkzh_fieldId", fieldId);//5：收款账号；
+                            dataMap.put("dt2_fieldIdSkzh_fieldName", fieldName);
+                            dataMap.put(fieldId, "dt2_fieldIdSkzh_fieldId");
+                            dataMap.put("dt2_fieldIdSkzh_fieldhtmltype", fieldhtmltype);
+                            dataMap.put("dt2_fieldIdSkzh_type", type);
+                        }
+                    }
+
+                } else if ("repayment".equals(fnaWfType)) {//还款流程
+                    if (Util.getIntValue(dtlNumber) == 0) {
+                        if (Util.getIntValue(fieldType) == 1) {
+                            dataMap.put("main_fieldIdSqr_fieldId", fieldId);//1：申请人；
+                            dataMap.put("main_fieldIdSqr_fieldName", fieldName);
+                            dataMap.put(fieldId, "main_fieldIdSqr_fieldId");
+                            dataMap.put("main_fieldIdSqr_fieldhtmltype", fieldhtmltype);
+                            dataMap.put("main_fieldIdSqr_type", type);
+                            dataMap.put("main_fieldIdSqr_controlBorrowingWf", controlBorrowingWf);//还款流程中通过申请人字段控制可选择的借款流程
+                        }
+                    } else if (Util.getIntValue(dtlNumber) == 1) {
+                        if (Util.getIntValue(fieldType) == 1) {
+                            dataMap.put("dt1_fieldIdHklx_fieldId", fieldId);//1：还款类型；
+                            dataMap.put("dt1_fieldIdHklx_fieldName", fieldName);
+                            dataMap.put(fieldId, "dt1_fieldIdHklx_fieldId");
+                            dataMap.put("dt1_fieldIdHklx_fieldhtmltype", fieldhtmltype);
+                            dataMap.put("dt1_fieldIdHklx_type", type);
+                        } else if (Util.getIntValue(fieldType) == 2) {
+                            dataMap.put("dt1_fieldIdHkje_fieldId", fieldId);//2：还款金额；
+                            dataMap.put("dt1_fieldIdHkje_fieldName", fieldName);
+                            dataMap.put(fieldId, "dt1_fieldIdHkje_fieldId");
+                            dataMap.put("dt1_fieldIdHkje_fieldhtmltype", fieldhtmltype);
+                            dataMap.put("dt1_fieldIdHkje_type", type);
+                        } else if (Util.getIntValue(fieldType) == 3) {
+                            dataMap.put("dt1_fieldIdTzmx_fieldId", fieldId);//3：调整明细；
+                            dataMap.put("dt1_fieldIdTzmx_fieldName", fieldName);
+                            dataMap.put(fieldId, "dt1_fieldIdTzmx_fieldId");
+                            dataMap.put("dt1_fieldIdTzmx_fieldhtmltype", fieldhtmltype);
+                            dataMap.put("dt1_fieldIdTzmx_type", type);
+                        }
+                    } else if (Util.getIntValue(dtlNumber) == 2) {
+                        if (Util.getIntValue(fieldType) == 1) {
+                            dataMap.put("dt2_fieldIdJklc_fieldId", fieldId);//1：借款类型；
+                            dataMap.put("dt2_fieldIdJklc_fieldName", fieldName);
+                            dataMap.put(fieldId, "dt2_fieldIdJklc_fieldId");
+                            dataMap.put("dt2_fieldIdJklc_fieldhtmltype", fieldhtmltype);
+                            dataMap.put("dt2_fieldIdJklc_type", type);
+                        } else if (Util.getIntValue(fieldType) == 2) {
+                            dataMap.put("dt2_fieldIdJkdh_fieldId", fieldId);//2：借款单号；
+                            dataMap.put("dt2_fieldIdJkdh_fieldName", fieldName);
+                            dataMap.put(fieldId, "dt2_fieldIdJkdh_fieldId");
+                            dataMap.put("dt2_fieldIdJkdh_fieldhtmltype", fieldhtmltype);
+                            dataMap.put("dt2_fieldIdJkdh_type", type);
+                        } else if (Util.getIntValue(fieldType) == 3) {
+                            dataMap.put("dt2_fieldIdDnxh_fieldId", fieldId);//3：单内序号；
+                            dataMap.put("dt2_fieldIdDnxh_fieldName", fieldName);
+                            dataMap.put(fieldId, "dt2_fieldIdDnxh_fieldId");
+                            dataMap.put("dt2_fieldIdDnxh_fieldhtmltype", fieldhtmltype);
+                            dataMap.put("dt2_fieldIdDnxh_type", type);
+                        } else if (Util.getIntValue(fieldType) == 4) {
+                            dataMap.put("dt2_fieldIdJkje_fieldId", fieldId);//4：借款金额；
+                            dataMap.put("dt2_fieldIdJkje_fieldName", fieldName);
+                            dataMap.put(fieldId, "dt2_fieldIdJkje_fieldId");
+                            dataMap.put("dt2_fieldIdJkje_fieldhtmltype", fieldhtmltype);
+                            dataMap.put("dt2_fieldIdJkje_type", type);
+                        } else if (Util.getIntValue(fieldType) == 5) {
+                            dataMap.put("dt2_fieldIdYhje_fieldId", fieldId);//5：已还借款金额；
+                            dataMap.put("dt2_fieldIdYhje_fieldName", fieldName);
+                            dataMap.put(fieldId, "dt2_fieldIdYhje_fieldId");
+                            dataMap.put("dt2_fieldIdYhje_fieldhtmltype", fieldhtmltype);
+                            dataMap.put("dt2_fieldIdYhje_type", type);
+                        } else if (Util.getIntValue(fieldType) == 6) {
+                            dataMap.put("dt2_fieldIdSpzje_fieldId", fieldId);//6：审批中还款金额；
+                            dataMap.put("dt2_fieldIdSpzje_fieldName", fieldName);
+                            dataMap.put(fieldId, "dt2_fieldIdSpzje_fieldId");
+                            dataMap.put("dt2_fieldIdSpzje_fieldhtmltype", fieldhtmltype);
+                            dataMap.put("dt2_fieldIdSpzje_type", type);
+                        } else if (Util.getIntValue(fieldType) == 7) {
+                            dataMap.put("dt2_fieldIdWhje_fieldId", fieldId);//7：未还借款金额；
+                            dataMap.put("dt2_fieldIdWhje_fieldName", fieldName);
+                            dataMap.put(fieldId, "dt2_fieldIdWhje_fieldId");
+                            dataMap.put("dt2_fieldIdWhje_fieldhtmltype", fieldhtmltype);
+                            dataMap.put("dt2_fieldIdWhje_type", type);
+                        } else if (Util.getIntValue(fieldType) == 8) {
+                            dataMap.put("dt2_fieldIdCxje_fieldId", fieldId);//8：冲销借款金额；
+                            dataMap.put("dt2_fieldIdCxje_fieldName", fieldName);
+                            dataMap.put(fieldId, "dt2_fieldIdCxje_fieldId");
+                            dataMap.put("dt2_fieldIdCxje_fieldhtmltype", fieldhtmltype);
+                            dataMap.put("dt2_fieldIdCxje_type", type);
+                        }
+                    }
+
+                } else if ("change".equals(fnaWfType)) {//预算变更
+                    String fieldIdSubject_isDtl = "1";
+                    String fieldIdOrgType_isDtl = "1";
+                    String fieldIdOrgId_isDtl = "1";
+                    String fieldIdOccurdate_isDtl = "1";
+
+                    String fieldIdSubject2_isDtl = "1";
+                    String fieldIdOrgType2_isDtl = "1";
+                    String fieldIdOrgId2_isDtl = "1";
+                    String fieldIdOccurdate2_isDtl = "1";
+
+                    if (Util.getIntValue(dtlNumber) == 1) {
+                        if (Util.getIntValue(fieldType) == 1) {
+                            dataMap.put("fieldIdSubject_fieldId", fieldId);
+                            dataMap.put("fieldIdSubject_fieldName", fieldName);
+                            dataMap.put(fieldId, "fieldIdSubject_fieldId");
+                            dataMap.put("fieldIdSubject_fieldhtmltype", fieldhtmltype);
+                            dataMap.put("fieldIdSubject_type", type);
+                            fieldIdSubject_isDtl = "" + is_detailtable;
+                            dataMap.put("fieldIdSubject_fieldId_isDtl", fieldIdSubject_isDtl);
+                        } else if (Util.getIntValue(fieldType) == 2) {
+                            dataMap.put("fieldIdOrgType_fieldId", fieldId);
+                            dataMap.put("fieldIdOrgType_fieldName", fieldName);
+                            dataMap.put(fieldId, "fieldIdOrgType_fieldId");
+                            dataMap.put("fieldIdOrgType_fieldhtmltype", fieldhtmltype);
+                            dataMap.put("fieldIdOrgType_type", type);
+                            fieldIdOrgType_isDtl = "" + is_detailtable;
+                            dataMap.put("fieldIdOrgType_fieldId_isDtl", fieldIdOrgType_isDtl);
+                            dataMap.put("fieldIdOrgType_defaultSelectValue", FnaCommon.getOrtTypeFieldidDefaultSelectValue(workflowid, Util.getIntValue(fieldId)) + "");
+                        } else if (Util.getIntValue(fieldType) == 3) {
+                            dataMap.put("fieldIdOrgId_fieldId", fieldId);
+                            dataMap.put("fieldIdOrgId_fieldName", fieldName);
+                            dataMap.put(fieldId, "fieldIdOrgId_fieldId");
+                            dataMap.put("fieldIdOrgId_fieldhtmltype", fieldhtmltype);
+                            dataMap.put("fieldIdOrgId_type", type);
+                            dataMap.put("fieldIdOrgId_automaticTake", String.valueOf(automaticTake));
+                            fieldIdOrgId_isDtl = "" + is_detailtable;
+                            dataMap.put("fieldIdOrgId_fieldId_isDtl", fieldIdOrgId_isDtl);
+                        } else if (Util.getIntValue(fieldType) == 4) {
+                            dataMap.put("fieldIdOccurdate_fieldId", fieldId);
+                            dataMap.put("fieldIdOccurdate_fieldName", fieldName);
+                            dataMap.put(fieldId, "fieldIdOccurdate_fieldId");
+                            dataMap.put("fieldIdOccurdate_fieldhtmltype", fieldhtmltype);
+                            dataMap.put("fieldIdOccurdate_type", type);
+                            fieldIdOccurdate_isDtl = "" + is_detailtable;
+                            dataMap.put("fieldIdOccurdate_fieldId_isDtl", fieldIdOccurdate_isDtl);
+                        } else if (Util.getIntValue(fieldType) == 5) {
+                            dataMap.put("fieldIdAmount_fieldId", fieldId);
+                            dataMap.put("fieldIdAmount_fieldName", fieldName);
+                            dataMap.put(fieldId, "fieldIdAmount_fieldId");
+                            dataMap.put("fieldIdAmount_fieldhtmltype", fieldhtmltype);
+                            dataMap.put("fieldIdAmount_type", type);
+                            dataMap.put("fieldIdAmount_fieldId_isDtl", "" + is_detailtable);
+                        } else if (Util.getIntValue(fieldType) == 6) {
+                            dataMap.put("fieldIdHrmInfo_fieldId", fieldId);
+                            dataMap.put("fieldIdHrmInfo_fieldName", fieldName);
+                            dataMap.put(fieldId, "fieldIdHrmInfo_fieldId");
+                            dataMap.put("fieldIdHrmInfo_fieldhtmltype", fieldhtmltype);
+                            dataMap.put("fieldIdHrmInfo_type", type);
+                            dataMap.put("fieldIdHrmInfo_fieldId_isDtl", "" + is_detailtable);
+                        } else if (Util.getIntValue(fieldType) == 7) {
+                            dataMap.put("fieldIdDepInfo_fieldId", fieldId);
+                            dataMap.put("fieldIdDepInfo_fieldName", fieldName);
+                            dataMap.put(fieldId, "fieldIdDepInfo_fieldId");
+                            dataMap.put("fieldIdDepInfo_fieldhtmltype", fieldhtmltype);
+                            dataMap.put("fieldIdDepInfo_type", type);
+                            dataMap.put("fieldIdDepInfo_fieldId_isDtl", "" + is_detailtable);
+                        } else if (Util.getIntValue(fieldType) == 8) {
+                            dataMap.put("fieldIdSubInfo_fieldId", fieldId);
+                            dataMap.put("fieldIdSubInfo_fieldName", fieldName);
+                            dataMap.put(fieldId, "fieldIdSubInfo_fieldId");
+                            dataMap.put("fieldIdSubInfo_fieldhtmltype", fieldhtmltype);
+                            dataMap.put("fieldIdSubInfo_type", type);
+                            dataMap.put("fieldIdSubInfo_fieldId_isDtl", "" + is_detailtable);
+                        } else if (Util.getIntValue(fieldType) == 9) {
+                            dataMap.put("fieldIdFccInfo_fieldId", fieldId);
+                            dataMap.put("fieldIdFccInfo_fieldName", fieldName);
+                            dataMap.put(fieldId, "fieldIdFccInfo_fieldId");
+                            dataMap.put("fieldIdFccInfo_fieldhtmltype", fieldhtmltype);
+                            dataMap.put("fieldIdFccInfo_type", type);
+                            dataMap.put("fieldIdFccInfo_fieldId_isDtl", "" + is_detailtable);
+                        }
+
+                        if (Util.getIntValue(fieldType) == 10) {
+                            dataMap.put("fieldIdSubject2_fieldId", fieldId);
+                            dataMap.put("fieldIdSubject2_fieldName", fieldName);
+                            dataMap.put(fieldId, "fieldIdSubject2_fieldId");
+                            dataMap.put("fieldIdSubject2_fieldhtmltype", fieldhtmltype);
+                            dataMap.put("fieldIdSubject2_type", type);
+                            fieldIdSubject2_isDtl = "" + is_detailtable;
+                            dataMap.put("fieldIdSubject2_fieldId_isDtl", fieldIdSubject2_isDtl);
+                        } else if (Util.getIntValue(fieldType) == 11) {
+                            dataMap.put("fieldIdOrgType2_fieldId", fieldId);
+                            dataMap.put("fieldIdOrgType2_fieldName", fieldName);
+                            dataMap.put(fieldId, "fieldIdOrgType2_fieldId");
+                            dataMap.put("fieldIdOrgType2_fieldhtmltype", fieldhtmltype);
+                            dataMap.put("fieldIdOrgType2_type", type);
+                            fieldIdOrgType2_isDtl = "" + is_detailtable;
+                            dataMap.put("fieldIdOrgType2_fieldId_isDtl", fieldIdOrgType2_isDtl);
+                            dataMap.put("fieldIdOrgType2_defaultSelectValue", FnaCommon.getOrtTypeFieldidDefaultSelectValue(workflowid, Util.getIntValue(fieldId)) + "");
+                        } else if (Util.getIntValue(fieldType) == 12) {
+                            dataMap.put("fieldIdOrgId2_fieldId", fieldId);
+                            dataMap.put("fieldIdOrgId2_fieldName", fieldName);
+                            dataMap.put(fieldId, "fieldIdOrgId2_fieldId");
+                            dataMap.put("fieldIdOrgId2_fieldhtmltype", fieldhtmltype);
+                            dataMap.put("fieldIdOrgId2_type", type);
+                            dataMap.put("fieldIdOrgId2_automaticTake", String.valueOf(automaticTake));
+                            fieldIdOrgId2_isDtl = "" + is_detailtable;
+                            dataMap.put("fieldIdOrgId2_fieldId_isDtl", fieldIdOrgId2_isDtl);
+                        } else if (Util.getIntValue(fieldType) == 13) {
+                            dataMap.put("fieldIdOccurdate2_fieldId", fieldId);
+                            dataMap.put("fieldIdOccurdate2_fieldName", fieldName);
+                            dataMap.put(fieldId, "fieldIdOccurdate2_fieldId");
+                            dataMap.put("fieldIdOccurdate2_fieldhtmltype", fieldhtmltype);
+                            dataMap.put("fieldIdOccurdate2_type", type);
+                            fieldIdOccurdate2_isDtl = "" + is_detailtable;
+                            dataMap.put("fieldIdOccurdate2_fieldId_isDtl", fieldIdOccurdate2_isDtl);
+                        } else if (Util.getIntValue(fieldType) == 14) {
+                            dataMap.put("fieldIdHrmInfo2_fieldId", fieldId);
+                            dataMap.put("fieldIdHrmInfo2_fieldName", fieldName);
+                            dataMap.put(fieldId, "fieldIdHrmInfo2_fieldId");
+                            dataMap.put("fieldIdHrmInfo2_fieldhtmltype", fieldhtmltype);
+                            dataMap.put("fieldIdHrmInfo2_type", type);
+                            dataMap.put("fieldIdHrmInfo2_fieldId_isDtl", "" + is_detailtable);
+                        } else if (Util.getIntValue(fieldType) == 15) {
+                            dataMap.put("fieldIdDepInfo2_fieldId", fieldId);
+                            dataMap.put("fieldIdDepInfo2_fieldName", fieldName);
+                            dataMap.put(fieldId, "fieldIdDepInfo2_fieldId");
+                            dataMap.put("fieldIdDepInfo2_fieldhtmltype", fieldhtmltype);
+                            dataMap.put("fieldIdDepInfo2_type", type);
+                            dataMap.put("fieldIdDepInfo2_fieldId_isDtl", "" + is_detailtable);
+                        } else if (Util.getIntValue(fieldType) == 16) {
+                            dataMap.put("fieldIdSubInfo2_fieldId", fieldId);
+                            dataMap.put("fieldIdSubInfo2_fieldName", fieldName);
+                            dataMap.put(fieldId, "fieldIdSubInfo2_fieldId");
+                            dataMap.put("fieldIdSubInfo2_fieldhtmltype", fieldhtmltype);
+                            dataMap.put("fieldIdSubInfo2_type", type);
+                            dataMap.put("fieldIdSubInfo2_fieldId_isDtl", "" + is_detailtable);
+                        } else if (Util.getIntValue(fieldType) == 17) {
+                            dataMap.put("fieldIdFccInfo2_fieldId", fieldId);
+                            dataMap.put("fieldIdFccInfo2_fieldName", fieldName);
+                            dataMap.put(fieldId, "fieldIdFccInfo2_fieldId");
+                            dataMap.put("fieldIdFccInfo2_fieldhtmltype", fieldhtmltype);
+                            dataMap.put("fieldIdFccInfo2_type", type);
+                            dataMap.put("fieldIdFccInfo2_fieldId_isDtl", "" + is_detailtable);
+                        }
+                    }
+
+                    boolean dt1_haveIsDtlField = ("1".equals(fieldIdSubject_isDtl) || "1".equals(fieldIdOrgType_isDtl) || "1".equals(fieldIdOrgId_isDtl) || "1".equals(fieldIdOccurdate_isDtl));
+                    dataMap.put("dt1_haveIsDtlField", dt1_haveIsDtlField ? "true" : "false");
+
+                    boolean dt1_haveIsDtlField2 = ("1".equals(fieldIdSubject2_isDtl) || "1".equals(fieldIdOrgType2_isDtl) || "1".equals(fieldIdOrgId2_isDtl) || "1".equals(fieldIdOccurdate2_isDtl));
+                    dataMap.put("dt1_haveIsDtlField2", dt1_haveIsDtlField2 ? "true" : "false");
+
+                } else if ("share".equals(fnaWfType)) {//费用分摊
+                    String fieldIdSubject_isDtl = "1";
+                    String fieldIdOrgType_isDtl = "1";
+                    String fieldIdOrgId_isDtl = "1";
+                    String fieldIdOccurdate_isDtl = "1";
+
+                    String fieldIdSubject2_isDtl = "1";
+                    String fieldIdOrgType2_isDtl = "1";
+                    String fieldIdOrgId2_isDtl = "1";
+                    String fieldIdOccurdate2_isDtl = "1";
+
+                    if (Util.getIntValue(dtlNumber) == 1) {
+                        if (Util.getIntValue(fieldType) == 1) {
+                            dataMap.put("fieldIdSubject_fieldId", fieldId);
+                            dataMap.put("fieldIdSubject_fieldName", fieldName);
+                            dataMap.put(fieldId, "fieldIdSubject_fieldId");
+                            dataMap.put("fieldIdSubject_fieldhtmltype", fieldhtmltype);
+                            dataMap.put("fieldIdSubject_type", type);
+                            fieldIdSubject_isDtl = "" + is_detailtable;
+                            dataMap.put("fieldIdSubject_fieldId_isDtl", fieldIdSubject_isDtl);
+                        } else if (Util.getIntValue(fieldType) == 2) {
+                            dataMap.put("fieldIdOrgType_fieldId", fieldId);
+                            dataMap.put("fieldIdOrgType_fieldName", fieldName);
+                            dataMap.put(fieldId, "fieldIdOrgType_fieldId");
+                            dataMap.put("fieldIdOrgType_fieldhtmltype", fieldhtmltype);
+                            dataMap.put("fieldIdOrgType_type", type);
+                            fieldIdOrgType_isDtl = "" + is_detailtable;
+                            dataMap.put("fieldIdOrgType_fieldId_isDtl", fieldIdOrgType_isDtl);
+                            dataMap.put("fieldIdOrgType_defaultSelectValue", FnaCommon.getOrtTypeFieldidDefaultSelectValue(workflowid, Util.getIntValue(fieldId)) + "");
+                        } else if (Util.getIntValue(fieldType) == 3) {
+                            dataMap.put("fieldIdOrgId_fieldId", fieldId);
+                            dataMap.put("fieldIdOrgId_fieldName", fieldName);
+                            dataMap.put(fieldId, "fieldIdOrgId_fieldId");
+                            dataMap.put("fieldIdOrgId_fieldhtmltype", fieldhtmltype);
+                            dataMap.put("fieldIdOrgId_type", type);
+                            dataMap.put("fieldIdOrgId_automaticTake", String.valueOf(automaticTake));
+                            fieldIdOrgId_isDtl = "" + is_detailtable;
+                            dataMap.put("fieldIdOrgId_fieldId_isDtl", fieldIdOrgId_isDtl);
+                        } else if (Util.getIntValue(fieldType) == 4) {
+                            dataMap.put("fieldIdOccurdate_fieldId", fieldId);
+                            dataMap.put("fieldIdOccurdate_fieldName", fieldName);
+                            dataMap.put(fieldId, "fieldIdOccurdate_fieldId");
+                            dataMap.put("fieldIdOccurdate_fieldhtmltype", fieldhtmltype);
+                            dataMap.put("fieldIdOccurdate_type", type);
+                            fieldIdOccurdate_isDtl = "" + is_detailtable;
+                            dataMap.put("fieldIdOccurdate_fieldId_isDtl", fieldIdOccurdate_isDtl);
+                        } else if (Util.getIntValue(fieldType) == 5) {
+                            dataMap.put("fieldIdAmount_fieldId", fieldId);
+                            dataMap.put("fieldIdAmount_fieldName", fieldName);
+                            dataMap.put(fieldId, "fieldIdAmount_fieldId");
+                            dataMap.put("fieldIdAmount_fieldhtmltype", fieldhtmltype);
+                            dataMap.put("fieldIdAmount_type", type);
+                            dataMap.put("fieldIdAmount_fieldId_isDtl", "" + is_detailtable);
+                        } else if (Util.getIntValue(fieldType) == 6) {
+                            dataMap.put("fieldIdHrmInfo_fieldId", fieldId);
+                            dataMap.put("fieldIdHrmInfo_fieldName", fieldName);
+                            dataMap.put(fieldId, "fieldIdHrmInfo_fieldId");
+                            dataMap.put("fieldIdHrmInfo_fieldhtmltype", fieldhtmltype);
+                            dataMap.put("fieldIdHrmInfo_type", type);
+                            dataMap.put("fieldIdHrmInfo_fieldId_isDtl", "" + is_detailtable);
+                        } else if (Util.getIntValue(fieldType) == 7) {
+                            dataMap.put("fieldIdDepInfo_fieldId", fieldId);
+                            dataMap.put("fieldIdDepInfo_fieldName", fieldName);
+                            dataMap.put(fieldId, "fieldIdDepInfo_fieldId");
+                            dataMap.put("fieldIdDepInfo_fieldhtmltype", fieldhtmltype);
+                            dataMap.put("fieldIdDepInfo_type", type);
+                            dataMap.put("fieldIdDepInfo_fieldId_isDtl", "" + is_detailtable);
+                        } else if (Util.getIntValue(fieldType) == 8) {
+                            dataMap.put("fieldIdSubInfo_fieldId", fieldId);
+                            dataMap.put("fieldIdSubInfo_fieldName", fieldName);
+                            dataMap.put(fieldId, "fieldIdSubInfo_fieldId");
+                            dataMap.put("fieldIdSubInfo_fieldhtmltype", fieldhtmltype);
+                            dataMap.put("fieldIdSubInfo_type", type);
+                            dataMap.put("fieldIdSubInfo_fieldId_isDtl", "" + is_detailtable);
+                        } else if (Util.getIntValue(fieldType) == 9) {
+                            dataMap.put("fieldIdFccInfo_fieldId", fieldId);
+                            dataMap.put("fieldIdFccInfo_fieldName", fieldName);
+                            dataMap.put(fieldId, "fieldIdFccInfo_fieldId");
+                            dataMap.put("fieldIdFccInfo_fieldhtmltype", fieldhtmltype);
+                            dataMap.put("fieldIdFccInfo_type", type);
+                            dataMap.put("fieldIdFccInfo_fieldId_isDtl", "" + is_detailtable);
+                        }
+
+                        if (Util.getIntValue(fieldType) == 10) {
+                            dataMap.put("fieldIdSubject2_fieldId", fieldId);
+                            dataMap.put("fieldIdSubject2_fieldName", fieldName);
+                            dataMap.put(fieldId, "fieldIdSubject2_fieldId");
+                            dataMap.put("fieldIdSubject2_fieldhtmltype", fieldhtmltype);
+                            dataMap.put("fieldIdSubject2_type", type);
+                            fieldIdSubject2_isDtl = "" + is_detailtable;
+                            dataMap.put("fieldIdSubject2_fieldId_isDtl", fieldIdSubject2_isDtl);
+                        } else if (Util.getIntValue(fieldType) == 11) {
+                            dataMap.put("fieldIdOrgType2_fieldId", fieldId);
+                            dataMap.put("fieldIdOrgType2_fieldName", fieldName);
+                            dataMap.put(fieldId, "fieldIdOrgType2_fieldId");
+                            dataMap.put("fieldIdOrgType2_fieldhtmltype", fieldhtmltype);
+                            dataMap.put("fieldIdOrgType2_type", type);
+                            fieldIdOrgType2_isDtl = "" + is_detailtable;
+                            dataMap.put("fieldIdOrgType2_fieldId_isDtl", fieldIdOrgType2_isDtl);
+                            dataMap.put("fieldIdOrgType2_defaultSelectValue", FnaCommon.getOrtTypeFieldidDefaultSelectValue(workflowid, Util.getIntValue(fieldId)) + "");
+                        } else if (Util.getIntValue(fieldType) == 12) {
+                            dataMap.put("fieldIdOrgId2_fieldId", fieldId);
+                            dataMap.put("fieldIdOrgId2_fieldName", fieldName);
+                            dataMap.put(fieldId, "fieldIdOrgId2_fieldId");
+                            dataMap.put("fieldIdOrgId2_fieldhtmltype", fieldhtmltype);
+                            dataMap.put("fieldIdOrgId2_type", type);
+                            dataMap.put("fieldIdOrgId2_automaticTake", String.valueOf(automaticTake));
+                            fieldIdOrgId2_isDtl = "" + is_detailtable;
+                            dataMap.put("fieldIdOrgId2_fieldId_isDtl", fieldIdOrgId2_isDtl);
+                        } else if (Util.getIntValue(fieldType) == 13) {
+                            dataMap.put("fieldIdOccurdate2_fieldId", fieldId);
+                            dataMap.put("fieldIdOccurdate2_fieldName", fieldName);
+                            dataMap.put(fieldId, "fieldIdOccurdate2_fieldId");
+                            dataMap.put("fieldIdOccurdate2_fieldhtmltype", fieldhtmltype);
+                            dataMap.put("fieldIdOccurdate2_type", type);
+                            fieldIdOccurdate2_isDtl = "" + is_detailtable;
+                            dataMap.put("fieldIdOccurdate2_fieldId_isDtl", fieldIdOccurdate2_isDtl);
+                        } else if (Util.getIntValue(fieldType) == 14) {
+                            dataMap.put("fieldIdHrmInfo2_fieldId", fieldId);
+                            dataMap.put("fieldIdHrmInfo2_fieldName", fieldName);
+                            dataMap.put(fieldId, "fieldIdHrmInfo2_fieldId");
+                            dataMap.put("fieldIdHrmInfo2_fieldhtmltype", fieldhtmltype);
+                            dataMap.put("fieldIdHrmInfo2_type", type);
+                            dataMap.put("fieldIdHrmInfo2_fieldId_isDtl", "" + is_detailtable);
+                        } else if (Util.getIntValue(fieldType) == 15) {
+                            dataMap.put("fieldIdDepInfo2_fieldId", fieldId);
+                            dataMap.put("fieldIdDepInfo2_fieldName", fieldName);
+                            dataMap.put(fieldId, "fieldIdDepInfo2_fieldId");
+                            dataMap.put("fieldIdDepInfo2_fieldhtmltype", fieldhtmltype);
+                            dataMap.put("fieldIdDepInfo2_type", type);
+                            dataMap.put("fieldIdDepInfo2_fieldId_isDtl", "" + is_detailtable);
+                        } else if (Util.getIntValue(fieldType) == 16) {
+                            dataMap.put("fieldIdSubInfo2_fieldId", fieldId);
+                            dataMap.put("fieldIdSubInfo2_fieldName", fieldName);
+                            dataMap.put(fieldId, "fieldIdSubInfo2_fieldId");
+                            dataMap.put("fieldIdSubInfo2_fieldhtmltype", fieldhtmltype);
+                            dataMap.put("fieldIdSubInfo2_type", type);
+                            dataMap.put("fieldIdSubInfo2_fieldId_isDtl", "" + is_detailtable);
+                        } else if (Util.getIntValue(fieldType) == 17) {
+                            dataMap.put("fieldIdFccInfo2_fieldId", fieldId);
+                            dataMap.put("fieldIdFccInfo2_fieldName", fieldName);
+                            dataMap.put(fieldId, "fieldIdFccInfo2_fieldId");
+                            dataMap.put("fieldIdFccInfo2_fieldhtmltype", fieldhtmltype);
+                            dataMap.put("fieldIdFccInfo2_type", type);
+                            dataMap.put("fieldIdFccInfo2_fieldId_isDtl", "" + is_detailtable);
+                        }
+                    }
+
+                    boolean dt1_haveIsDtlField = ("1".equals(fieldIdSubject_isDtl) || "1".equals(fieldIdOrgType_isDtl) || "1".equals(fieldIdOrgId_isDtl) || "1".equals(fieldIdOccurdate_isDtl));
+                    dataMap.put("dt1_haveIsDtlField", dt1_haveIsDtlField ? "true" : "false");
+
+                    boolean dt1_haveIsDtlField2 = ("1".equals(fieldIdSubject2_isDtl) || "1".equals(fieldIdOrgType2_isDtl) || "1".equals(fieldIdOrgId2_isDtl) || "1".equals(fieldIdOccurdate2_isDtl));
+                    dataMap.put("dt1_haveIsDtlField2", dt1_haveIsDtlField2 ? "true" : "false");
+
+                } else if ("advance".equals(fnaWfType)) {//预付款流程
+                    if (Util.getIntValue(dtlNumber) == 1) {
+                        if (Util.getIntValue(fieldType) == 1) {
+                            dataMap.put("dt1_fieldIdYfkje_fieldId", fieldId);//1：借款金额；
+                            dataMap.put("dt1_fieldIdYfkje_fieldName", fieldName);
+                            dataMap.put(fieldId, "dt1_fieldIdYfkje_fieldId");
+                            dataMap.put("dt1_fieldIdYfkje_fieldhtmltype", fieldhtmltype);
+                            dataMap.put("dt1_fieldIdYfkje_type", type);
+                        } else if (Util.getIntValue(fieldType) == 2) {
+                            dataMap.put("dt1_fieldIdYfkmx_fieldId", fieldId);//2：调整明细；
+                            dataMap.put("dt1_fieldIdYfkmx_fieldName", fieldName);
+                            dataMap.put(fieldId, "dt1_fieldIdYfkmx_fieldId");
+                            dataMap.put("dt1_fieldIdYfkmx_fieldhtmltype", fieldhtmltype);
+                            dataMap.put("dt1_fieldIdYfkmx_type", type);
+                        }
+                    }
+
+                }
+            }
+
+            try {
+                //更新缓存
+                FnaWfSetCache.putFnaWfFieldSetMap(workflowid, fnaWfType, dataMap);
+            } catch (Exception e) {
+                new BaseBean().writeLog(e);
+            }
+        }
+
+        return fnaWfType;
+    }
+
+    /**
+     * 返回指定人员 、日期范围内，未还借款金额
+     *
+     * @param userId
+     * @param startDate
+     * @param endDate
+     * @return
+     */
+    public static double getPersonalLoanAmount(int userId, String startDate, String endDate) {
+        double personalLoanAmount = 0.00;
+        RecordSet rs = new RecordSet();
+        String sql = "select SUM(fbi.amountBorrow * fbi.borrowDirection) sum_amountBorrow \n" +
+                " from FnaBorrowInfo fbi \n" +
+                " where 1=1 \n";
+        if (!"".equals(startDate)) {
+            sql += " and fbi.createDate >= '" + StringEscapeUtils.escapeSql(startDate) + "' \n";
+        }
+        if (!"".equals(endDate)) {
+            sql += " and fbi.createDate <= '" + StringEscapeUtils.escapeSql(endDate) + "' \n";
+        }
+        sql += " and fbi.applicantid = " + userId;
+        rs.executeSql(sql);
+        if (rs.next()) {
+            personalLoanAmount = Util.getDoubleValue(rs.getString("sum_amountBorrow"), 0.00);
+        }
+        return personalLoanAmount;
+    }
+
+    /**
+     * 流程表单上填写的费用日期
+     */
+    public final static String BudgetAutoMoveAfterOccurDate1 = "" + weaver.systeminfo.SystemEnv.getHtmlLabelName(10003241, weaver.general.ThreadVarLanguage.getLang()) + "";
+    /**
+     * 流程费用表中保存的费用日期
+     */
+    public final static String BudgetAutoMoveAfterOccurDate3 = "" + weaver.systeminfo.SystemEnv.getHtmlLabelName(10003242, weaver.general.ThreadVarLanguage.getLang()) + "";
+    /**
+     * 流程费用表中保存的结转前的费用日期
+     */
+    public final static String BudgetAutoMoveAfterOccurDate4 = "" + weaver.systeminfo.SystemEnv.getHtmlLabelName(10003243, weaver.general.ThreadVarLanguage.getLang()) + "";
+    /**
+     * 流程费用表记录是否发生过结转；1：结转过；其他：没有结转过；
+     */
+    public final static String IsBudgetAutoMove = "" + weaver.systeminfo.SystemEnv.getHtmlLabelName(10003244, weaver.general.ThreadVarLanguage.getLang()) + "1：" + weaver.systeminfo.SystemEnv.getHtmlLabelName(10003245, weaver.general.ThreadVarLanguage.getLang()) + "";
+
+    /**
+     * 获取报销流程相应费用明细费用日期相关信息<br>
+     * BudgetAutoMoveAfterOccurDate1 = "流程表单上填写的费用日期";<br>
+     * BudgetAutoMoveAfterOccurDate3 = "流程费用表中保存的费用日期";<br>
+     * BudgetAutoMoveAfterOccurDate4 = "流程费用表中保存的结转前的费用日期";<br>
+     * IsBudgetAutoMove = "流程费用表记录是否发生过结转；1：结转过；其他：没有结转过；";
+     *
+     * @param occurdate              流程表单填写的费用日期
+     * @param dtl_id                 流程费用明细数据库PkId
+     * @param requestid              流程requestid
+     * @param fnaExpenseInfoRecordHm
+     * @return
+     */
+    public static HashMap<String, String> getBudgetAutoMoveAfterOccurDate(String occurdate, int dtl_id, int requestid,
+                                                                          HashMap<String, String> fnaExpenseInfoRecordHm) {
+        return getBudgetAutoMoveAfterOccurDate(occurdate, "", dtl_id, requestid, fnaExpenseInfoRecordHm);
+    }
+
+    /**
+     * 获取报销流程相应费用明细费用日期相关信息<br>
+     * BudgetAutoMoveAfterOccurDate1 = "流程表单上填写的费用日期";<br>
+     * BudgetAutoMoveAfterOccurDate3 = "流程费用表中保存的费用日期";<br>
+     * BudgetAutoMoveAfterOccurDate4 = "流程费用表中保存的结转前的费用日期";<br>
+     * IsBudgetAutoMove = "流程费用表记录是否发生过结转；1：结转过；其他：没有结转过；";
+     *
+     * @param occurdate              流程表单填写的费用日期
+     * @param detailtable            流程费用明细表名。与参数dtl_id一并传入。
+     * @param dtl_id                 流程费用明细数据库PkId
+     * @param requestid              流程requestid
+     * @param fnaExpenseInfoRecordHm
+     * @return
+     */
+    public static HashMap<String, String> getBudgetAutoMoveAfterOccurDate(String occurdate, String detailtable, int dtl_id, int requestid,
+                                                                          HashMap<String, String> fnaExpenseInfoRecordHm) {
+        HashMap<String, String> retHm = new HashMap<String, String>();
+        retHm.put(FnaCommon.BudgetAutoMoveAfterOccurDate1, occurdate);
+        retHm.put(FnaCommon.BudgetAutoMoveAfterOccurDate3, "");
+        retHm.put(FnaCommon.BudgetAutoMoveAfterOccurDate4, "");
+        retHm.put(FnaCommon.IsBudgetAutoMove, "0");
+
+        if (dtl_id != 0 && requestid > 0) {
+            if (fnaExpenseInfoRecordHm != null && fnaExpenseInfoRecordHm.containsKey("occurdate")) {
+                String _occurdate = Util.null2String(fnaExpenseInfoRecordHm.get("occurdate")).trim();
+                String _occurdateOld = Util.null2String(fnaExpenseInfoRecordHm.get("occurdateOld")).trim();
+                String _isBudgetAutoMove = Util.getIntValue(fnaExpenseInfoRecordHm.get("isBudgetAutoMove"), 0) + "";
+                retHm.put(FnaCommon.BudgetAutoMoveAfterOccurDate3, _occurdate);
+                retHm.put(FnaCommon.BudgetAutoMoveAfterOccurDate4, _occurdateOld);
+                retHm.put(FnaCommon.IsBudgetAutoMove, _isBudgetAutoMove);
+
+            } else {
+                RecordSet rs = new RecordSet();
+
+                boolean isFound = false;
+                //定位 数据库表名, 日期范围可能跨年
+                List<String> list_out_FnaExpenseInfo = new ArrayList<String>();
+                FnaSplitTableByYearComInfo.getFnaTableNameList(FnaTableNameEnum.FnaExpenseInfo, "1000-01-01", "9999-12-31", list_out_FnaExpenseInfo);
+                //定位 数据库表名, 日期范围可能跨年
+                for (int aaaaaaaa = 0; aaaaaaaa < list_out_FnaExpenseInfo.size(); aaaaaaaa++) {
+                    String tableName_FnaExpenseInfo = list_out_FnaExpenseInfo.get(aaaaaaaa);
+
+                    String sql = "";
+                    if (dtl_id > 0) {//不含有明细 == -987654321
+                        if (detailtable == null || "".equals(detailtable)) {
+                            sql = "select a.occurdate, a.occurdateOld, a.isBudgetAutoMove \n" +
+                                    " from " + tableName_FnaExpenseInfo + " a \n" +
+                                    " where a.sourceRequestidDtlId = " + dtl_id +
+                                    " and a.sourceRequestid = a.requestid and a.requestid = " + requestid;
+                        } else {
+                            //E9 先回归的拆表，再回归的多明细报销
+                            try {
+                                boolean query_changeAmt_flag = rs.executeQuery(" select detailtable from " + tableName_FnaExpenseInfo + " where 1=2 ");
+                                if (!query_changeAmt_flag) {
+                                    if ("oracle".equalsIgnoreCase(rs.getDBType())) {
+                                        rs.execute(" alter table " + tableName_FnaExpenseInfo + " add detailtable VARCHAR2(200) ");
+                                    } else if ("mysql".equalsIgnoreCase(rs.getDBType())) {
+                                        rs.execute(" alter table " + tableName_FnaExpenseInfo + " add detailtable VARCHAR(200) ");
+                                    } else {
+                                        rs.execute(" alter table " + tableName_FnaExpenseInfo + " add detailtable VARCHAR(200) ");
+                                    }
+                                }
+                            } catch (Exception ex1) {
+                            }
+
+                            sql = "select a.occurdate, a.occurdateOld, a.isBudgetAutoMove \n" +
+                                    " from " + tableName_FnaExpenseInfo + " a \n" +
+                                    " where a.detailtable = '" + StringEscapeUtils.escapeSql(detailtable) + "' and a.sourceRequestidDtlId = " + dtl_id +
+                                    " and a.sourceRequestid = a.requestid and a.requestid = " + requestid;
+                        }
+                    } else {
+                        sql = "select a.occurdate, a.occurdateOld, a.isBudgetAutoMove \n" +
+                                " from " + tableName_FnaExpenseInfo + " a \n" +
+                                " where a.sourceRequestid = a.requestid and a.requestid = " + requestid;
+                    }
+                    rs.executeSql(sql);
+                    if (rs.next()) {
+                        isFound = true; //找到日期了，就跳出循环，不需要再查询后面的表了
+                        String _occurdate = Util.null2String(rs.getString("occurdate")).trim();
+                        String _occurdateOld = Util.null2String(rs.getString("occurdateOld")).trim();
+                        String _isBudgetAutoMove = Util.getIntValue(rs.getString("isBudgetAutoMove"), 0) + "";
+                        retHm.put(FnaCommon.BudgetAutoMoveAfterOccurDate3, _occurdate);
+                        retHm.put(FnaCommon.BudgetAutoMoveAfterOccurDate4, _occurdateOld);
+                        retHm.put(FnaCommon.IsBudgetAutoMove, _isBudgetAutoMove);
+                    }
+
+                    if (isFound) {
+                        break;
+                    }
+                }//for end
+            }
+        }
+        return retHm;
+    }
+
+    /**
+     * 检查指定用户对指定预算单位是否有编辑权限
+     *
+     * @param organizationtype
+     * @param organizationid
+     * @param userId
+     * @return
+     * @throws Exception
+     */
+    public static boolean checkPermissionsFnaBudgetForEdit(String organizationtype, String organizationid, int userId) throws Exception {
+        boolean fnaBudgetViewFlag = false;
+        if ("0".equals(organizationtype)) {
+            if (FnaBudgetLeftRuleSet.isAllowCmpEdit(userId)) {
+                fnaBudgetViewFlag = true;
+            }
+        } else if ("1".equals(organizationtype)) {
+            List<String> allowOrgIdEdit_list = new ArrayList<String>();
+            boolean allowOrgIdEdit = FnaBudgetLeftRuleSet.getAllowSubCmpIdEdit(userId, allowOrgIdEdit_list);
+            if (allowOrgIdEdit || allowOrgIdEdit_list.contains(organizationid)) {
+                fnaBudgetViewFlag = true;
+            }
+        } else if ("2".equals(organizationtype)) {
+            List<String> allowOrgIdEdit_list = new ArrayList<String>();
+            boolean allowOrgIdEdit = FnaBudgetLeftRuleSet.getAllowDepIdEdit(userId, allowOrgIdEdit_list);
+            if (allowOrgIdEdit || allowOrgIdEdit_list.contains(organizationid)) {
+                fnaBudgetViewFlag = true;
+            }
+        } else if ("3".equals(organizationtype)) {
+            List<String> grList = new ArrayList<String>();
+            grList.add(organizationid);
+            List<String> allowOrgIdEdit_list = new ArrayList<String>();
+            boolean allowOrgIdEdit = FnaBudgetLeftRuleSet.getAllowHrmIdEdit(userId, null, null, grList, allowOrgIdEdit_list);
+            if (allowOrgIdEdit || allowOrgIdEdit_list.contains(organizationid)) {
+                fnaBudgetViewFlag = true;
+            }
+        } else if ((FnaCostCenter.ORGANIZATION_TYPE + "").equals(organizationtype)) {
+            List<String> allowOrgIdEdit_list = new ArrayList<String>();
+            boolean allowOrgIdEdit = FnaBudgetLeftRuleSet.getAllowFccIdEdit(userId, allowOrgIdEdit_list);
+            if (allowOrgIdEdit || allowOrgIdEdit_list.contains(organizationid)) {
+                fnaBudgetViewFlag = true;
+            }
+        }
+        return fnaBudgetViewFlag;
+    }
+
+    /**
+     * 检查指定用户对指定预算单位是否有编辑权限
+     *
+     * @param organizationtype
+     * @param organizationid
+     * @param userId
+     * @return
+     * @throws Exception
+     */
+    public static boolean checkPermissionsFnaBudgetForView(String organizationtype, String organizationid, int userId) throws Exception {
+        boolean fnaBudgetViewFlag = false;
+        if ("0".equals(organizationtype)) {
+            if (FnaBudgetLeftRuleSet.isAllowCmp(userId)) {
+                fnaBudgetViewFlag = true;
+            }
+        } else if ("1".equals(organizationtype)) {
+            List<String> allowOrgIdEdit_list = new ArrayList<String>();
+            boolean allowOrgIdEdit = FnaBudgetLeftRuleSet.getAllowSubCmpId(userId, allowOrgIdEdit_list);
+            if (allowOrgIdEdit || allowOrgIdEdit_list.contains(organizationid)) {
+                fnaBudgetViewFlag = true;
+            }
+        } else if ("2".equals(organizationtype)) {
+            List<String> allowOrgIdEdit_list = new ArrayList<String>();
+            boolean allowOrgIdEdit = FnaBudgetLeftRuleSet.getAllowDepId(userId, allowOrgIdEdit_list);
+            if (allowOrgIdEdit || allowOrgIdEdit_list.contains(organizationid)) {
+                fnaBudgetViewFlag = true;
+            }
+        } else if ("3".equals(organizationtype)) {
+            List<String> grList = new ArrayList<String>();
+            grList.add(organizationid);
+            List<String> allowOrgIdEdit_list = new ArrayList<String>();
+            boolean allowOrgIdEdit = FnaBudgetLeftRuleSet.getAllowHrmId(userId, null, null, grList, allowOrgIdEdit_list);
+            if (allowOrgIdEdit || allowOrgIdEdit_list.contains(organizationid)) {
+                fnaBudgetViewFlag = true;
+            }
+        } else if ((FnaCostCenter.ORGANIZATION_TYPE + "").equals(organizationtype)) {
+            List<String> allowOrgIdEdit_list = new ArrayList<String>();
+            boolean allowOrgIdEdit = FnaBudgetLeftRuleSet.getAllowFccId(userId, allowOrgIdEdit_list);
+            if (allowOrgIdEdit || allowOrgIdEdit_list.contains(organizationid)) {
+                fnaBudgetViewFlag = true;
+            }
+        }
+        return fnaBudgetViewFlag;
+    }
+
+    /**
+     * 检查字符串长度是否没有超过指定长度（字符串转换编码默认按UTF-8进行转换，一个双字节字符对应长度3）
+     *
+     * @param str       被检查的字符串
+     * @param maxLength 指定最大长度
+     * @return
+     * @throws UnsupportedEncodingException
+     */
+    public static boolean checkStringLength(String str, int maxLength) throws UnsupportedEncodingException {
+        return checkStringLength(str, maxLength, "UTF-8");
+    }
+
+    /**
+     * 检查字符串长度是否没有超过指定长度
+     *
+     * @param str         被检查的字符串
+     * @param maxLength   指定最大长度
+     * @param charsetName 字符串转换编码
+     * @return
+     * @throws UnsupportedEncodingException
+     */
+    public static boolean checkStringLength(String str, int maxLength, String charsetName) throws UnsupportedEncodingException {
+        if (str == null || "".equals(str)) {
+            return true;
+        } else {
+            return str.getBytes(charsetName).length < maxLength;
+        }
+    }
+
+    /**
+     * 更新oracle数据库clob类型字段值、更新sqlserver数据库text类型字段值的方法
+     *
+     * @param tableName      表名
+     * @param clobFieldName  clob、text类型字段数据库字段名
+     * @param colbFieldValue clob、text字段值
+     * @param keyFieldName   记录主键字段数据库字段名
+     * @param keyFieldValue  记录主键字段值
+     * @param keyFieldDbType 记录主键字段数据库字段类型：int、string
+     * @return
+     * @throws Exception
+     */
+    public static boolean updateDbClobOrTextFieldValue(String tableName,
+                                                       String clobFieldName, String colbFieldValue,
+                                                       String keyFieldName, String keyFieldValue, String keyFieldDbType) throws Exception {
+        //new BaseBean().writeLog("updateDbClobOrTextFieldValue colbFieldValue>>>"+colbFieldValue+";;;keyFieldValue>>>"+keyFieldValue);
+
+        if ("int".equals(keyFieldDbType) || "string".equals(keyFieldDbType)) {
+        } else {
+            new Exception("FnaCommon.updateDbClobTextFieldValue：keyFieldDbType 记录主键字段数据库字段类型：int、string，该参数值不正确！");
+        }
+
+        RecordSet rs = new RecordSet();
+        if ("oracle".equals(rs.getDBType()) && Util.null2String(rs.getOrgindbtype()).equals("oracle")) {
+            boolean flag = false;
+            boolean flag_exec_updateSql = false;
+            ConnStatement statement = null;
+            try {
+                statement = new ConnStatement();
+
+                String sql = "update " + tableName + " " +
+                        " set " + clobFieldName + " = empty_clob() " +
+                        " where " + keyFieldName + " = ?";
+                //new BaseBean().writeLog(sql);
+                statement.setStatementSql(sql);
+                if ("int".equals(keyFieldDbType)) {
+                    statement.setInt(1, Util.getIntValue(keyFieldValue, -1));
+                } else {
+                    statement.setString(1, keyFieldValue);
+                }
+                statement.executeUpdate();
+
+                sql = "select " + clobFieldName + " from " + tableName + " where " + keyFieldName + " = ";
+                if ("int".equals(keyFieldDbType)) {
+                    sql += Util.getIntValue(keyFieldValue, -1);
+                } else {
+                    sql += "'" + StringEscapeUtils.escapeSql(keyFieldValue) + "'";
+                }
+                //new BaseBean().writeLog(sql);
+                statement.setStatementSql(sql, false);
+                statement.executeQuery();
+                if (statement.next()) {
+                    // String(this.doccontent.getBytes("ISO8859_1"),
+                    // "UTF-8")) ;
+                    char[] _writeCharArray = Util.null2String(colbFieldValue).toCharArray();
+                    CLOB theclob = statement.getClob(1);
+                    if (theclob != null) {
+                        Writer _write = theclob.getCharacterOutputStream();
+                        if (_write != null) {
+                            try {
+                                _write.write(_writeCharArray);
+                            } finally {
+                                try {
+                                    if (_write != null) {
+                                        _write.flush();
+                                    }
+                                } catch (Exception ex01) {
+                                }
+                                try {
+                                    if (_write != null) {
+                                        _write.close();
+                                    }
+                                } catch (Exception ex01) {
+                                }
+                            }
+
+                            flag = true;
+                        } else {
+                            flag_exec_updateSql = true;
+                        }
+                    } else {
+                        flag_exec_updateSql = true;
+                    }
+                }
+
+            } finally {
+                try {
+                    if (statement != null) {
+                        statement.close();
+                    }
+                } catch (Exception ex) {
+                    new BaseBean().writeLog("fna_FnaCommon_Exception:" + ex);
+                }
+            }
+
+            if (flag_exec_updateSql) {
+                String sql = "update " + tableName + " " +
+                        " set " + clobFieldName + " = ? " +
+                        " where " + keyFieldName + " = ?";
+                return rs.executeUpdate(sql, Util.null2String(colbFieldValue), keyFieldValue + "");
+            }
+
+            return flag;
+
+        } else {
+			/*String sql = "update "+tableName+" " +
+				" set "+clobFieldName+" = ? " +
+				" where "+keyFieldName+" = ?";
+			return rs.executeUpdate(sql, Util.null2String(colbFieldValue), keyFieldValue+"");*/
+
+            ConnStatement connStatement = new ConnStatement();
+            try {
+                String sql = "update " + tableName + " " +
+                        " set " + clobFieldName + " = ? " +
+                        " where " + keyFieldName + " = ?";
+                connStatement.setStatementSql(sql);
+                connStatement.setString(1, Util.null2String(colbFieldValue));
+                connStatement.setString(2, keyFieldValue);
+                connStatement.executeUpdate();
+                return true;
+            } catch (Exception e) {
+                new BaseBean().writeLog("fna_FnaCommon_Exception:" + e.getMessage());
+                return false;
+            } finally {
+                connStatement.close();
+            }
+
+        }
+    }
+
+    /**
+     * 深复制List
+     *
+     * @param list1
+     * @return
+     */
+    public static List<String[]> copyList_stringArray(List<String[]> list1) {
+        List<String[]> list2 = new ArrayList<String[]>();
+        if (list1 != null) {
+            int list1Len = list1.size();
+            for (int i = 0; i < list1Len; i++) {
+                String[] arr1 = list1.get(i);
+                if (arr1 != null) {
+                    int arr1Len = arr1.length;
+                    String[] arr2 = new String[arr1Len];
+                    for (int j = 0; j < arr1Len; j++) {
+                        arr2[j] = arr1[j];
+                    }
+                    list2.add(arr2);
+                } else {
+                    list2.add(null);
+                }
+            }
+        } else {
+            return null;
+        }
+        return list2;
+    }
+
+    /**
+     * 深复制List
+     *
+     * @param list1
+     * @return
+     */
+    public static List<String> copyList_string(List<String> list1) {
+        List<String> list2 = new ArrayList<String>();
+        if (list1 != null) {
+            int list1Len = list1.size();
+            for (int i = 0; i < list1Len; i++) {
+                list2.add(list1.get(i));
+            }
+        } else {
+            return null;
+        }
+        return list2;
+    }
+
+    /**
+     * 复制List
+     *
+     * @param list1 源list，待复制的
+     * @param list2 被复制的，复制前会调用clear函数，清除原有数据。
+     */
+    public void copyList_string(List<String> list1, List<String> list2) {
+        //List<String> list2 = new ArrayList<String>();
+        if (list1 != null && list2 != null) {
+            list2.clear();
+            int list1Len = list1.size();
+            for (int i = 0; i < list1Len; i++) {
+                list2.add(list1.get(i));
+            }
+        }
+    }
+
+    /**
+     * 获得GUID
+     *
+     * @return 32位长度，无符号-，其中英文字符随机大小写
+     */
+    public static String getPrimaryKeyGuid1() {
+        int max = 10;
+        int min = 1;
+        Random random = new Random();
+
+        String uuid1 = UUID.randomUUID().toString().replaceAll("-", "");
+
+        StringBuffer guid1 = new StringBuffer();
+        String[] uuid1Array = uuid1.split("");
+        for (int i = 0; i < uuid1Array.length; i++) {
+            int s = random.nextInt(max) % (max - min + 1) + min;
+            if (s < 6) {
+                guid1.append(uuid1Array[i]);
+            } else {
+                guid1.append(uuid1Array[i].toUpperCase());
+            }
+        }
+
+        return Util.null2String(guid1.toString()).trim();
+    }
+
+    /**
+     * 报销费用类型（科目）、成本中心浏览框支持流程浏览数据定义
+     *
+     * @param params    参数键值对
+     * @param operation add/del
+     * @return
+     */
+    public boolean saveOrUpdateWfBrowdef(Map params, String operation) {
+        try {
+            String workflowid = Util.null2String(params.get("workflowId"));
+            String fieldId = Util.null2String(params.get("fieldId"));
+            String viewType = Util.null2String(params.get("viewType"));
+            String fieldType = Util.null2String(params.get("fieldType"));
+            String title = Util.null2String(params.get("title"));
+            String feetypeRange = Util.null2String(params.get("feetypeRange"));
+            String fccId = Util.null2String(params.get("fccId"));
+
+            String param = !feetypeRange.equals("") ? feetypeRange : fccId;
+
+			/*new BaseBean().writeLog("workflowid:"+workflowid);
+			new BaseBean().writeLog("fieldId:"+fieldId);
+			new BaseBean().writeLog("viewType:"+viewType);
+			new BaseBean().writeLog("fieldType:"+fieldType);
+			new BaseBean().writeLog("title:"+ new String(title.getBytes("ISO-8859-1"),"utf-8"));
+			new BaseBean().writeLog("feetypeRange:"+feetypeRange);
+			new BaseBean().writeLog("fccId:"+fccId);*/
+
+            if (operation.equals("del")) {
+                removeWfBrowdef(workflowid, fieldId, fieldType);
+            } else if (operation.equals("add")) {
+                removeWfBrowdef(workflowid, fieldId, fieldType);
+                initNewWfBrowdef(workflowid, fieldId, viewType, fieldType, title, param);
+            }
+            BudgetfeeTypeComInfo budgetfeeTypeComInfo = new BudgetfeeTypeComInfo();
+            budgetfeeTypeComInfo.removeBudgetfeeTypeCache();
+            return true;
+        } catch (Exception e) {
+            new BaseBean().writeLog(e);
+            return false;
+        }
+    }
+
+    /**
+     * 删除 流程浏览数据定义
+     *
+     * @param workflowid 流程id
+     * @param fieldId    字段id
+     * @param fieldType  浏览按钮类型
+     */
+    private void removeWfBrowdef(String workflowid, String fieldId, String fieldType) throws Exception {
+        String sql = "";
+        RecordSet rs = new RecordSet();
+        RecordSet rs2 = new RecordSet();
+
+        //删除历史数据
+        sql = "select id from FnaFeetypeWfbrowdef " +
+                "  where workflowid=" + workflowid +
+                "  and  fieldId=" + fieldId +
+                "  and  fieldType=" + fieldType;
+        rs.executeSql(sql);
+        if (rs.next()) {
+            String tempid = Util.null2String(rs.getString("id"));
+
+            sql = "delete from FnaFeetypeWfbrowdef where id=" + tempid;
+            rs2.executeSql(sql);
+            sql = "delete from FnaFeetypeWfbrowdef_dt1 where mainid=" + tempid;
+            rs2.executeSql(sql);
+        }
+    }
+
+    /**
+     * 流程浏览数据定义
+     *
+     * @param workflowid 流程id
+     * @param fieldId    字段id
+     * @param viewType
+     * @param fieldType  浏览按钮类型
+     * @param title      标题
+     * @param param      参数键值对
+     */
+    private void initNewWfBrowdef(String workflowid, String fieldId, String viewType, String fieldType, String title, String param) throws Exception {
+        String sql = "";
+        RecordSet rs = new RecordSet();
+
+        sql = "insert into FnaFeetypeWfbrowdef (workflowid,fieldId,viewType,fieldType,title) " +
+                "	values " +
+                "  (" + workflowid + "," + fieldId + "," + viewType + "," + fieldType + ",'" + title + "')";
+        rs.executeSql(sql);
+
+
+        //插入新数据
+        String id = "";
+        sql = "select max(id) maxid from FnaFeetypeWfbrowdef";
+        rs.executeSql(sql);
+        if (rs.next()) {
+            id = Util.null2String(rs.getString("maxid"));
+        }
+
+        if (!param.equals("") && !id.equals("")) {
+            for (String refid : param.split(",")) {
+                sql = "insert into FnaFeetypeWfbrowdef_dt1 (mainid,refid)" +
+                        "	values " +
+                        "  (" + id + "," + refid + ")";
+                rs.executeSql(sql);
+            }
+        }
+    }
+
+    /**
+     * 返回：路径设置》浏览按钮定义：中定义的可见科目
+     *
+     * @param workflowid
+     * @param fieldId
+     * @param fieldType  浏览按钮类型
+     * @return
+     */
+    public List getWfBrowdefList(String workflowid, String fieldId, String fieldType) {
+        try {
+            String sql = "";
+            RecordSet rs = new RecordSet();
+            List returnList = new ArrayList();
+
+            sql = "select * from FnaFeetypeWfbrowdef_dt1 where mainid = " +
+                    "(" +
+                    "	select id from FnaFeetypeWfbrowdef " +
+                    "  	where workflowid=" + Util.getIntValue(workflowid) +
+                    "  	and  fieldId=" + Util.getIntValue(fieldId) +
+                    "  	and  fieldType=" + Util.getIntValue(fieldType) +
+                    ") " +
+                    "order by id ";
+            rs.executeSql(sql);
+            while (rs.next()) {
+                returnList.add(Util.null2String(rs.getString("refId")));
+            }
+            return returnList;
+        } catch (Exception e) {
+            new BaseBean().writeLog(e);
+            return null;
+        }
+    }
+
+    /**
+     * Rsa加密支持中文和长字符（不推荐长字符加密/解密会很慢）；与doFnaDecrypt配套使用
+     *
+     * @param str 需要进行加密的明文
+     * @return 加密后的字符串密文
+     */
+    public String doFnaEncrypt(String str) {
+        return this.doFnaEncrypt(str, Des.KEY1, Des.KEY2, Des.KEY3);
+    }
+
+    /**
+     * Rsa加密支持中文和长字符（不推荐长字符加密/解密会很慢）；与doFnaDecrypt配套使用
+     *
+     * @param str  需要进行加密的明文
+     * @param key1 Des.KEY1
+     * @param key2 Des.KEY2
+     * @param key3 Des.KEY3
+     * @return 加密后的字符串密文
+     */
+    public String doFnaEncrypt(String str, String key1, String key2, String key3) {
+        Des desObj = new Des();
+        String pwd_des = desObj.strEnc(str, key1, key2, key3);
+
+        int len = pwd_des.length();
+        StringBuffer tmp_pwd_des = new StringBuffer();
+        while (len > 100) {
+            String _s = pwd_des.substring(0, 100);
+            tmp_pwd_des.append(RSAUtils.encryptString(_s)).append(" ");
+            pwd_des = pwd_des.substring(100);
+            len = pwd_des.length();
+        }
+        if (len > 0) {
+            tmp_pwd_des.append(RSAUtils.encryptString(pwd_des)).append(" ");
+        }
+
+        return tmp_pwd_des.toString();
+    }
+
+
+    /**
+     * Rsa解密支持中文和长字符（不推荐长字符加密/解密会很慢）；与doFnaEncrypt配套使用
+     *
+     * @param str
+     * @return 解密后的字符串明文
+     */
+    public String doFnaDecrypt(String str) {
+        return this.doFnaDecrypt(str, Des.KEY1, Des.KEY2, Des.KEY3);
+    }
+
+    /**
+     * Rsa解密支持中文和长字符（不推荐长字符加密/解密会很慢）；与doFnaEncrypt配套使用
+     *
+     * @param str  加密后的字符串密文
+     * @param key1 Des.KEY1
+     * @param key2 Des.KEY2
+     * @param key3 Des.KEY3
+     * @return 解密后的字符串明文
+     */
+    public String doFnaDecrypt(String str, String key1, String key2, String key3) {
+        StringBuffer descrypedStr = new StringBuffer("");
+        String[] encrypedStrArray = str.trim().split(" ");
+        int encrypedStrArrayLen = encrypedStrArray.length;
+
+        for (int i = 0; i < encrypedStrArrayLen; i++) {
+            String _str = Util.null2String(encrypedStrArray[i]).trim();
+            String _descrypedStr = "";
+            if (!"".equals(_str)) {
+                _descrypedStr = RSAUtils.decryptString(_str);
+            }
+            descrypedStr.append(_descrypedStr);
+        }
+
+        Des desObj = new Des();
+        return desObj.strDec(descrypedStr.toString(), key1, key2, key3);
+    }
+
+    /**
+     * Rsa解密支持中文和长字符（不推荐长字符加密/解密会很慢）；
+     *
+     * @param str
+     * @return 解密后的字符串明文
+     */
+    public String doFnaDecrypt1(String str) {
+        return this.doFnaDecrypt1(str, Des.KEY1, Des.KEY2, Des.KEY3);
+    }
+
+    /**
+     * Rsa解密支持中文和长字符（不推荐长字符加密/解密会很慢）；配合js加密使用：/fna/js/e8Common_wev8.js中的函数doFnaEncryptRsa1()
+     *
+     * @param str  /fna/js/e8Common_wev8.js中的函数doFnaEncryptRsa1() 加密后的字符串密文
+     * @param key1 Des.KEY1
+     * @param key2 Des.KEY2
+     * @param key3 Des.KEY3
+     * @return 解密后的字符串明文
+     */
+    public String doFnaDecrypt1(String str, String key1, String key2, String key3) {
+        StringBuffer descrypedStr = new StringBuffer("");
+        String[] encrypedStrArray = str.trim().split(" ");
+        int encrypedStrArrayLen = encrypedStrArray.length;
+
+        for (int i = 0; i < encrypedStrArrayLen; i++) {
+            String _str = Util.null2String(encrypedStrArray[i]).trim();
+            String _descrypedStr = "";
+            if (!"".equals(_str)) {
+                _descrypedStr = RSAUtils.decryptStringByJs(_str);
+            }
+            descrypedStr.append(_descrypedStr);
+        }
+
+        Des desObj = new Des();
+        return desObj.strDec(descrypedStr.toString(), key1, key2, key3);
+    }
+
+
+    /**
+     * 将Object对象序列化成字符串
+     *
+     * @param obj
+     * @return
+     * @throws Exception
+     */
+    public String serialDoc2Str(Object obj) throws Exception {
+        ByteArrayOutputStream byteArrayOutputStream = null;
+        ObjectOutputStream objectOutputStream = null;
+        try {
+            byteArrayOutputStream = new ByteArrayOutputStream();
+            objectOutputStream = new ObjectOutputStream(byteArrayOutputStream);
+            objectOutputStream.writeObject(obj);
+            String serStr = byteArrayOutputStream.toString("ISO-8859-1");
+            serStr = java.net.URLEncoder.encode(serStr, "UTF-8");
+            return serStr;
+        } finally {
+            try {
+                if (objectOutputStream != null) {
+                    IOUtils.closeQuietly(objectOutputStream);
+                }
+            } catch (Exception ex) {
+            }
+            try {
+                if (byteArrayOutputStream != null) {
+                    IOUtils.closeQuietly(byteArrayOutputStream);
+                }
+            } catch (Exception ex) {
+            }
+        }
+    }
+
+    /**
+     * 将字符串序列化成Object对象
+     *
+     * @param serStr
+     * @return
+     * @throws Exception
+     */
+    public Object serialStr2Doc(String serStr) throws Exception {
+        ByteArrayInputStream byteArrayInputStream = null;
+        ObjectInputStream objectInputStream = null;
+        try {
+            String redStr = java.net.URLDecoder.decode(serStr, "UTF-8");
+            byteArrayInputStream = new ByteArrayInputStream(redStr.getBytes("ISO-8859-1"));
+            //objectInputStream = new ObjectInputStream(byteArrayInputStream);
+            objectInputStream = SecurityMethodUtil.getSafeObjectInputStream(byteArrayInputStream);
+            return (Object) objectInputStream.readObject();
+        } finally {
+            try {
+                if (objectInputStream != null) {
+                    IOUtils.closeQuietly(objectInputStream);
+                }
+            } catch (Exception ex) {
+            }
+            try {
+                if (byteArrayInputStream != null) {
+                    IOUtils.closeQuietly(byteArrayInputStream);
+                }
+            } catch (Exception ex) {
+            }
+        }
+    }
+
+    /**
+     * 释放 系统表单：预算审批流转单 对应的预算审批中版本（从审批中修改为草稿版本，修改成草稿版本前会删除当前的草稿版本）
+     *
+     * @param requestid
+     */
+    public void releaseBillFnaBudget(int requestid) {
+        RecordSet rs_1 = new RecordSet();
+        RecordSet rs_2 = new RecordSet();
+        RecordSet rs_3 = new RecordSet();
+        List<String> budgetid_list = new ArrayList<String>();
+
+        String sql = "select fnayear,budgetdetail " +
+                " from bill_FnaBudget " +
+                " where budgetdetail is not null " +
+                " and requestid = " + requestid + " " +
+                " order by id desc";
+        rs_1.executeSql(sql);
+        while (rs_1.next()) {
+            int fnayear = Util.getIntValue(rs_1.getString("fnayear"));//年份
+            int budgetid = Util.getIntValue(rs_1.getString("budgetdetail"));
+
+            //TODO 定位 数据库表名
+            String tableName_FnaBudgetInfo = FnaSplitTableByYearComInfo.getFnaTableNameByYear(FnaTableNameEnum.FnaBudgetInfo, fnayear);
+
+            if (budgetid > 0 && !budgetid_list.contains(String.valueOf(tableName_FnaBudgetInfo + "_" + budgetid))) {
+                budgetid_list.add(String.valueOf(tableName_FnaBudgetInfo + "_" + budgetid));//每张表的ID都是自增长的,所以需要拼接表名区分ID来源
+
+                String sql0 = "select organizationtype, budgetorganizationid, budgetperiods, status " +
+                        " from " + tableName_FnaBudgetInfo + " " +
+                        " where id=" + budgetid;
+                rs_2.executeSql(sql0);
+                if (rs_2.next()) {
+                    int _organizationtype = rs_2.getInt("organizationtype");
+                    int _budgetorganizationid = rs_2.getInt("budgetorganizationid");
+                    int _budgetperiods = rs_2.getInt("budgetperiods");
+                    int _status = rs_2.getInt("status");
+
+                    if (_status == 3) {//只有当当前预算信息版本还是审批中的时候才需要进行后续操作
+                        if (_organizationtype > 0 && _budgetorganizationid > 0 && _budgetperiods > 0) {
+                            BudgetHandler.deleteFnaBudgetInfoAndFnaBudgetInfoDetail(_organizationtype, _budgetorganizationid, _budgetperiods, 0);
+
+                            String sql1 = "update " + tableName_FnaBudgetInfo + " set status = 0, revision = 0 where id=" + budgetid;
+                            rs_3.executeSql(sql1);
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * 生效 系统表单：预算审批流转单 对应的预算审批中版本（从审批中修改为生效版本）
+     *
+     * @param requestid
+     * @throws Exception
+     */
+    public void effectBillFnaBudget(int requestid) throws Exception {
+        RecordSet rs_1 = new RecordSet();
+        //update to new revision
+        String sql = "select a.id, a.fnayear, a.budgetdetail, b.creater\n" +
+                " from bill_FnaBudget a\n" +
+                " join workflow_requestbase b on a.requestid = b.requestid\n" +
+                " where a.budgetdetail is not null\n" +
+                " and a.requestid = ? \n" +
+                " order by a.id desc";
+        rs_1.executeQuery(sql, requestid);
+        if (rs_1.next()) {
+            int fnayear = Util.getIntValue(rs_1.getString("fnayear"));//年份
+            int budgetid = Util.getIntValue(rs_1.getString("budgetdetail"));
+            int creater = Util.getIntValue(rs_1.getString("creater"));
+
+            if (budgetid > 0) {
+                RecordSet rs = new RecordSet();
+
+                //TODO 定位 数据库表名
+                String tableName_FnaBudgetInfo = FnaSplitTableByYearComInfo.getFnaTableNameByYear(FnaTableNameEnum.FnaBudgetInfo, fnayear);
+
+                User user = new UserManager().getUserByUserIdAndLoginType(creater, "1");
+
+                String currentdate = TimeUtil.getCurrentDateString();
+                String inusefnabudgetinfoid = "";
+                String orgId = "0";
+                String orgType = "0";
+                int budgetperiods = 0;
+
+                sql = "select budgetorganizationid, organizationtype, budgetperiods, revision, status \n" +
+                        " from " + tableName_FnaBudgetInfo + " a\n" +
+                        " where id = ? \n";
+                rs.executeQuery(sql, budgetid);
+                if (rs.next()) {
+                    orgId = Util.null2String(rs.getString("budgetorganizationid")).trim();
+                    orgType = Util.null2String(rs.getString("organizationtype")).trim();
+                    budgetperiods = Util.getIntValue(rs.getString("budgetperiods"), 0);
+                    int revision = Util.getIntValue(rs.getString("revision"), 0);
+                    int _status = rs.getInt("status");
+
+                    if (_status == 3) {//只有当当前预算信息版本还是审批中的时候才需要进行后续操作
+                        if (revision > 0) {
+                            sql = "select max(revision) max_revision \n" +
+                                    " from " + tableName_FnaBudgetInfo + " a\n" +
+                                    " where a.status in (1,2) \n" +
+                                    " and a.revision < ?\n" +
+                                    " and a.organizationtype = ?\n" +
+                                    " and a.budgetperiods = ?" +
+                                    " and a.budgetorganizationid = ?\n";
+                            rs.executeQuery(sql, revision, orgType, budgetperiods, orgId);
+                            if (rs.next()) {
+                                revision = Util.getIntValue(rs.getString("max_revision"), 0);
+
+                                if (revision > 0) {
+                                    sql = "select a.id \n" +
+                                            " from " + tableName_FnaBudgetInfo + " a\n" +
+                                            " where a.status in (1,2) \n" +
+                                            " and a.revision = ?\n" +
+                                            " and a.organizationtype = ?\n" +
+                                            " and a.budgetperiods = ?\n" +
+                                            " and a.budgetorganizationid = ?";
+                                    rs.executeQuery(sql, revision, orgType, budgetperiods, orgId);
+                                    if (rs.next()) {
+                                        inusefnabudgetinfoid = Util.null2String(rs.getString("id")).trim();
+                                    }
+                                }
+                            }
+                        }
+
+                        BudgetApproveWFHandler handler = new BudgetApproveWFHandler();
+                        handler.changeBudgetRevison(budgetid, 1, budgetperiods);
+
+                        BudgetHandler.fnaBudgetInfoReverseInput(1, budgetid + "", inusefnabudgetinfoid, orgId, orgType, budgetperiods, currentdate, user);
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * 特殊处理(费用流程，在强制归档时，同时，已经配置生效、释放冻结预算)<br>
+     * 145257 解决借款流程强制归档触发action逻辑错误的问题<br>
+     * 1、强制删除、强制收回（收回至）创建节点、强制归档（选择成归档时释放预算）<br>
+     * 系统表单、e7方式配置的费用流程、e8方式配置的费用流程（借款、还款、报销）：释放借款、释放预算<br>
+     * 2、强制归档（选择成归档时生效预算）<br>
+     * 1）系统表单、e7方式配置的费用流程：生效审批中的费用，如果流程没有审批中费用，则不产生已发送费用<br>
+     * 2）e8方式配置的费用流程（借款、还款、报销）：<br>
+     * 借款：流程节点中有配置过action.FnaBorrowEffectNew，则会产生借款（重新生成数据）<br>
+     * 还款：流程节点中有配置过action.fnaBorrowReverseNew，则会产生还款（重新生成数据）<br>
+     * 报销：<br>
+     * 流程节点中有配置过action.fnaBorrowReverseNew，则会产生还款（重新生成数据）<br>
+     * 流程节点中有配置过action.WorkflowFnaInWorkflowNew，则会产生审批中预算（重新生成数据）<br>
+     * 流程节点中有配置过action.WorkflowFnaEffectNew，则会产生已发送预算（生效审批中数据）<br>
+     * 流程节点中有配置过action.FnaChangeEffectNew，则会生效变更<br>
+     * 流程节点中有配置过action.FnaShareEffectNew，则会生效分摊<br>
+     * 系统表单：预算审批流转单 生效释放操作
+     *
+     * @param requestid        流程requestid
+     * @param wfForceOverLogic 该参数的业务逻辑只有当流程处于归档节点才生效； 0：走删除逻辑；1：走生效逻辑；
+     * @param forceDelete      true：无视流程所处节点，无视流程是否已经被删除，强制走删除逻辑（无视参数：wfForceOverLogic）；
+     */
+    public void doWfForceOver(int requestid, int wfForceOverLogic, boolean forceDelete) {
+//		new BaseBean().writeLog("doWfForceOver requestid="+requestid+";wfForceOverLogic="+wfForceOverLogic+";forceDelete="+forceDelete+";");
+        RecordSet rs_1 = new RecordSet();
+
+        int currentnodetype = -1;
+        if (forceDelete) {
+        } else {
+            String fnasql = "select currentnodetype from workflow_requestbase where requestid = " + requestid;
+            rs_1.executeSql(fnasql);
+            if (rs_1.next()) {
+                currentnodetype = rs_1.getInt("currentnodetype");
+            }
+        }
+
+        //流程退回创建节点或者删除流程
+        if (currentnodetype == 0 || (forceDelete && wfForceOverLogic == 0)) {
+            try {
+                //初始化发票状态
+                FnaInvoiceCommon fnaInvoiceCommon = new FnaInvoiceCommon();
+                fnaInvoiceCommon.doWfForceOver(requestid);
+            } catch (Exception ex1) {
+            }
+        }
+
+        if (currentnodetype == 3 || (forceDelete && wfForceOverLogic == 0)) {
+            if (wfForceOverLogic == 0) {
+                try {
+                    //多维度上报，将当前审批流程中关联的C节点的状态修改成【草稿】,更新填报主表中的审批流程requestid为0
+                    TemplateFillReportBizNew ReportBiz = new TemplateFillReportBizNew();
+                    ReportBiz.updateStatusAndRequestid(requestid);
+                } catch (Exception ex1) {
+                }
+                try {
+                    FnaAdvanceAmountControl fnaAdvanceAmountControl = new FnaAdvanceAmountControl();
+                    fnaAdvanceAmountControl.delFnaAdvanceInfoHaveLog(requestid);
+                } catch (Exception ex1) {
+                }
+                try {
+                    FnaBorrowAmountControl fnaBorrowAmountControl = new FnaBorrowAmountControl();
+                    fnaBorrowAmountControl.delFnaBorrowInfoHaveLog(requestid);
+                } catch (Exception ex1) {
+                }
+                try {
+                    FnaAmountControl fnaAmountControl = new FnaAmountControl();
+                    fnaAmountControl.delFnaExpenseInfo(requestid);
+                } catch (Exception ex1) {
+                }
+                try {
+                    FnaChangeAmountControl control = new FnaChangeAmountControl();
+                    control.delFnaExpenseInfo(requestid);
+                } catch (Exception ex1) {
+                }
+                try {
+                    FnaShareAmountControl control = new FnaShareAmountControl();
+                    control.delFnaExpenseInfo(requestid);
+                } catch (Exception ex1) {
+                }
+                try {
+                    this.releaseBillFnaBudget(requestid);
+                } catch (Exception ex1) {
+                }
+
+                try {
+                    //释放(全面预算)
+                    FnaReleaseBudget fnaReleaseBudget = new FnaReleaseBudget();
+                    fnaReleaseBudget.releaseBudget(requestid);
+                } catch (Exception ex1) {
+                }
+                try {
+                    //还原预算填报的变更流程数据
+                    new BaseBean().writeLog("doWfForceOver1111111111111111111111111111111111111111111111");
+                    FnaReimbursementUtils fnaReimbursementUtils = new FnaReimbursementUtils();
+                    fnaReimbursementUtils.delOldRequestEffectChangData(requestid);
+                } catch (Exception ex1) {
+                }
+            } else if (wfForceOverLogic == 1) {
+                String fnaWfType = "";
+                boolean fnaWfTypeEnable = false;
+                rs_1.executeSql("select b.fnaWfType, b.enable " +
+                        " from workflow_requestbase a " +
+                        " join fnaFeeWfInfo b on a.workflowid = b.workflowid " +
+                        " where a.requestid = " + requestid);
+                if (rs_1.next()) {
+                    fnaWfType = Util.null2String(rs_1.getString("fnaWfType")).trim();
+                    fnaWfTypeEnable = (rs_1.getInt("enable") == 1);
+                }
+
+                int formid = 0;
+                int _workflowid = 0;
+                rs_1.executeSql("select a.workflowid, b.formid " +
+                        " from workflow_requestbase a " +
+                        " join workflow_base b on a.workflowid = b.id " +
+                        " where a.requestid = " + requestid);
+                if (rs_1.next()) {
+                    _workflowid = rs_1.getInt("workflowid");
+                    formid = rs_1.getInt("formid");
+                }
+
+                if (!"".equals(fnaWfType)) {//是e8后台配置的某一类费用流程
+                    if (fnaWfTypeEnable) {//启用了的费用流程
+                        if ("advance".equals(fnaWfType)) {//是e8后台配置的预付款流程
+                            RequestService requestService = new RequestService();
+
+                            //扣除-节点前附加操作
+                            String deductAdvanceNode1Ids = FnaWfSet.getActionSet4Wf(_workflowid, "deductAdvanceNode1Ids");
+                            //扣除-节点后附加操作
+                            String deductAdvanceNode2Ids = FnaWfSet.getActionSet4Wf(_workflowid, "deductAdvanceNode2Ids");
+                            //扣除-出口附加操作
+                            String deductAdvanceNode3Ids = FnaWfSet.getActionSet4Wf(_workflowid, "deductAdvanceNode3Ids");
+                            //配置了生成借款的action（FnaAdvanceEffectNew）
+                            if (!"".equals(deductAdvanceNode1Ids) || !"".equals(deductAdvanceNode2Ids) || !"".equals(deductAdvanceNode3Ids)) {
+                                RequestInfo requestInfo = requestService.getRequest(requestid);
+                                requestInfo.getRequestManager().setSrc("submit");
+                                requestInfo.getRequestManager().setFormid(formid);
+                                FnaAdvanceEffectNew fnaAdvanceEffectNew = new FnaAdvanceEffectNew();
+                                fnaAdvanceEffectNew.execute(requestInfo);
+                            }
+
+                        } else if ("borrow".equals(fnaWfType)) {//是e8后台配置的借款流程
+                            RequestService requestService = new RequestService();
+
+                            //扣除-节点前附加操作
+                            String deductBorrowNode1Ids = FnaWfSet.getActionSet4Wf(_workflowid, "deductBorrowNode1Ids");
+                            //扣除-节点后附加操作
+                            String deductBorrowNode2Ids = FnaWfSet.getActionSet4Wf(_workflowid, "deductBorrowNode2Ids");
+                            //扣除-出口附加操作
+                            String deductBorrowNode3Ids = FnaWfSet.getActionSet4Wf(_workflowid, "deductBorrowNode3Ids");
+                            //配置了生成借款的action（FnaBorrowEffectNew）
+                            if (!"".equals(deductBorrowNode1Ids) || !"".equals(deductBorrowNode2Ids) || !"".equals(deductBorrowNode3Ids)) {
+                                RequestInfo requestInfo = requestService.getRequest(requestid);
+                                requestInfo.getRequestManager().setSrc("submit");
+                                requestInfo.getRequestManager().setFormid(formid);
+                                FnaBorrowEffectNew fnaBorrowEffectNew = new FnaBorrowEffectNew();
+                                fnaBorrowEffectNew.execute(requestInfo);
+                            }
+
+                        } else if ("repayment".equals(fnaWfType)) {//是e8后台配置的还款流程
+                            RequestService requestService = new RequestService();
+
+                            //冲销借款-节点前附加操作
+                            String repaymentBorrowNode1Ids = FnaWfSet.getActionSet4Wf(_workflowid, "repaymentBorrowNode1Ids");
+                            //冲销借款-节点后附加操作
+                            String repaymentBorrowNode2Ids = FnaWfSet.getActionSet4Wf(_workflowid, "repaymentBorrowNode2Ids");
+                            //冲销借款-出口附加操作
+                            String repaymentBorrowNode3Ids = FnaWfSet.getActionSet4Wf(_workflowid, "repaymentBorrowNode3Ids");
+                            //配置了冲销借款的action（FnaBorrowReverseNew）
+                            if (!"".equals(repaymentBorrowNode1Ids) || !"".equals(repaymentBorrowNode2Ids) || !"".equals(repaymentBorrowNode3Ids)) {
+                                RequestInfo requestInfo = requestService.getRequest(requestid);
+                                requestInfo.getRequestManager().setSrc("submit");
+                                requestInfo.getRequestManager().setFormid(formid);
+                                FnaBorrowReverseNew fnaBorrowReverseNew = new FnaBorrowReverseNew();
+                                fnaBorrowReverseNew.execute(requestInfo);
+                            }
+
+                        } else if ("fnaFeeWf".equals(fnaWfType)) {//是e8后台配置的报销流程
+                            RequestService requestService = new RequestService();
+
+                            //冲销借款-节点前附加操作
+                            String repaymentBorrowNode1Ids = FnaWfSet.getActionSet4Wf(_workflowid, "repaymentBorrowNode1Ids");
+                            //冲销借款-节点后附加操作
+                            String repaymentBorrowNode2Ids = FnaWfSet.getActionSet4Wf(_workflowid, "repaymentBorrowNode2Ids");
+                            //冲销借款-出口附加操作
+                            String repaymentBorrowNode3Ids = FnaWfSet.getActionSet4Wf(_workflowid, "repaymentBorrowNode3Ids");
+                            //配置了冲销借款的action（fnaBorrowReverseNew）
+                            if (!"".equals(repaymentBorrowNode1Ids) || !"".equals(repaymentBorrowNode2Ids) || !"".equals(repaymentBorrowNode3Ids)) {
+                                RequestInfo requestInfo = requestService.getRequest(requestid);
+                                requestInfo.getRequestManager().setSrc("submit");
+                                requestInfo.getRequestManager().setFormid(formid);
+                                FnaBorrowReverseNew fnaBorrowReverseNew = new FnaBorrowReverseNew();
+                                fnaBorrowReverseNew.execute(requestInfo);
+                            }
+
+                            //冻结-节点前附加操作
+                            String frozeNode1Ids = FnaWfSet.getActionSet4Wf(_workflowid, "frozeNode1Ids");
+                            //冻结-节点后附加操作
+                            String frozeNode2Ids = FnaWfSet.getActionSet4Wf(_workflowid, "frozeNode2Ids");
+                            //冻结-出口附加操作
+                            String frozeNode3Ids = FnaWfSet.getActionSet4Wf(_workflowid, "frozeNode3Ids");
+
+                            //配置了冻结预算的action（workflowFnaInWorkflowNew）
+                            if ((!"".equals(frozeNode1Ids) || !"".equals(frozeNode2Ids) || !"".equals(frozeNode3Ids))) {
+                                RequestInfo requestInfo = requestService.getRequest(requestid);
+                                requestInfo.getRequestManager().setSrc("submit");
+                                requestInfo.getRequestManager().setFormid(formid);
+                                WorkflowFnaInWorkflowNew workflowFnaInWorkflowNew = new WorkflowFnaInWorkflowNew();
+                                workflowFnaInWorkflowNew.execute(requestInfo);
+                            }
+
+                            //扣除-节点前附加操作
+                            String deductNode1Ids = FnaWfSet.getActionSet4Wf(_workflowid, "deductNode1Ids");
+                            //扣除-节点后附加操作
+                            String deductNode2Ids = FnaWfSet.getActionSet4Wf(_workflowid, "deductNode2Ids");
+                            //扣除-出口附加操作
+                            String deductNode3Ids = FnaWfSet.getActionSet4Wf(_workflowid, "deductNode3Ids");
+
+                            //配置了扣除预算的action（WorkflowFnaEffectNew）
+                            if (!"".equals(deductNode1Ids) || !"".equals(deductNode2Ids) || !"".equals(deductNode3Ids)) {
+                                RequestInfo requestInfo = requestService.getRequest(requestid);
+                                requestInfo.getRequestManager().setSrc("submit");
+                                requestInfo.getRequestManager().setFormid(formid);
+                                WorkflowFnaEffectNew workflowFnaEffectNew = new WorkflowFnaEffectNew();
+                                workflowFnaEffectNew.execute(requestInfo);
+                            }
+
+
+                            //扣除-节点前附加操作
+                            String repaymentAdvanceNode1Ids = FnaWfSet.getActionSet4Wf(_workflowid, "repaymentAdvanceNode1Ids");
+                            //扣除-节点后附加操作
+                            String repaymentAdvanceNode2Ids = FnaWfSet.getActionSet4Wf(_workflowid, "repaymentAdvanceNode2Ids");
+                            //扣除-出口附加操作
+                            String repaymentAdvanceNode3Ids = FnaWfSet.getActionSet4Wf(_workflowid, "repaymentAdvanceNode3Ids");
+
+                            //配置了冲销预付款的action（FnaAdvanceReverseNew）
+                            if (!"".equals(repaymentAdvanceNode1Ids) || !"".equals(repaymentAdvanceNode2Ids) || !"".equals(repaymentAdvanceNode3Ids)) {
+                                RequestInfo requestInfo = requestService.getRequest(requestid);
+                                requestInfo.getRequestManager().setSrc("submit");
+                                requestInfo.getRequestManager().setFormid(formid);
+                                FnaAdvanceReverseNew fnaAdvanceReverseNew = new FnaAdvanceReverseNew();
+                                fnaAdvanceReverseNew.execute(requestInfo);
+                            }
+
+                        } else if ("change".equals(fnaWfType)) {//是e8后台配置的预算变更流程
+                            RequestService requestService = new RequestService();
+
+                            String effectChangeNode1Ids = FnaWfSet.getActionSet4Wf(_workflowid, "effectChangeNode1Ids");
+                            String effectChangeNode2Ids = FnaWfSet.getActionSet4Wf(_workflowid, "effectChangeNode2Ids");
+                            String effectChangeNode3Ids = FnaWfSet.getActionSet4Wf(_workflowid, "effectChangeNode3Ids");
+                            if (!"".equals(effectChangeNode1Ids) || !"".equals(effectChangeNode2Ids) || !"".equals(effectChangeNode3Ids)) {
+                                RequestInfo requestInfo = requestService.getRequest(requestid);
+                                requestInfo.getRequestManager().setSrc("submit");
+                                requestInfo.getRequestManager().setFormid(formid);
+                                FnaChangeEffectNew fnaChangeEffectNew = new FnaChangeEffectNew();
+                                fnaChangeEffectNew.execute(requestInfo);
+                            }
+
+                        } else if ("share".equals(fnaWfType)) {//是e8后台配置的费用分摊流程
+                            RequestService requestService = new RequestService();
+
+                            String effectShareNode1Ids = FnaWfSet.getActionSet4Wf(_workflowid, "effectShareNode1Ids");
+                            String effectShareNode2Ids = FnaWfSet.getActionSet4Wf(_workflowid, "effectShareNode2Ids");
+                            String effectShareNode3Ids = FnaWfSet.getActionSet4Wf(_workflowid, "effectShareNode3Ids");
+                            if (!"".equals(effectShareNode1Ids) || !"".equals(effectShareNode2Ids) || !"".equals(effectShareNode3Ids)) {
+                                RequestInfo requestInfo = requestService.getRequest(requestid);
+                                requestInfo.getRequestManager().setSrc("submit");
+                                requestInfo.getRequestManager().setFormid(formid);
+                                FnaShareEffectNew fnaShareEffectNew = new FnaShareEffectNew();
+                                fnaShareEffectNew.execute(requestInfo);
+                            }
+
+                        }
+                    }
+                } else {//其他不是e8后台配置的费用流程统一处理，只将当前流程插入费用表的费用数据置为已发送状态，如果当前流程没有往费用表写如果费用数据，则什么都不做
+
+                    //定位 数据库表名, 日期范围可能跨年
+                    List<String> list_out_FnaExpenseInfo = new ArrayList<String>();
+                    FnaSplitTableByYearComInfo.getFnaTableNameList(FnaTableNameEnum.FnaExpenseInfo, "1000-01-01", "9999-12-31", list_out_FnaExpenseInfo);
+                    //定位 数据库表名, 日期范围可能跨年
+                    for (int aaaaaaaa = 0; aaaaaaaa < list_out_FnaExpenseInfo.size(); aaaaaaaa++) {
+                        String tableName_FnaExpenseInfo = list_out_FnaExpenseInfo.get(aaaaaaaa);
+
+                        rs_1.executeSql("update " + tableName_FnaExpenseInfo + " set status=1 where requestid=" + requestid);
+                    }//for end
+                }
+
+                try {
+                    this.effectBillFnaBudget(requestid);
+                } catch (Exception ex1) {
+                }
+
+                //生效(全面预算)
+                try {
+                    String frozeNode1Ids = FnaWorkflowUtil.getActionSet4MulWf(_workflowid, "mulFrozeNode1Ids");
+                    String frozeNode2Ids = FnaWorkflowUtil.getActionSet4MulWf(_workflowid, "mulFrozeNode2Ids");
+                    String frozeNode3Ids = FnaWorkflowUtil.getActionSet4MulWf(_workflowid, "mulFrozeNode3Ids");
+
+                    String deductNode1Ids = FnaWorkflowUtil.getActionSet4MulWf(_workflowid, "mulDeductNode1Ids");
+                    String deductNode2Ids = FnaWorkflowUtil.getActionSet4MulWf(_workflowid, "mulDeductNode2Ids");
+                    String deductNode3Ids = FnaWorkflowUtil.getActionSet4MulWf(_workflowid, "mulDeductNode3Ids");
+
+
+                    boolean hasFroze = (!"".equals(frozeNode1Ids) || !"".equals(frozeNode2Ids) || !"".equals(frozeNode3Ids));
+                    boolean hasDeduct = (!"".equals(deductNode1Ids) || !"".equals(deductNode2Ids) || !"".equals(deductNode3Ids));
+
+                    if (hasFroze || hasDeduct) {
+                        FnaFreezeBudget fnaFreezeBudget = new FnaFreezeBudget();
+                        if (hasDeduct) {
+                            fnaFreezeBudget.setDeductAction(Boolean.TRUE);
+                        }
+
+                        RequestService requestService = new RequestService();
+                        RequestInfo requestInfo = requestService.getRequest(requestid);
+                        requestInfo.getRequestManager().setWorkflowid(_workflowid);
+                        requestInfo.getRequestManager().setFormid(formid);
+                        requestInfo.getRequestManager().setSrc("submit");
+                        User user = new User(1);
+                        user.setLanguage(7);
+                        requestInfo.getRequestManager().setUser(user);
+                        fnaFreezeBudget.execute(requestInfo);
+                    }
+                } catch (Exception ex1) {
+                }
+            }
+        }
+    }
+
+    /**
+     * 获得有权限查看的流程的过滤条件的sql
+     *
+     * @param user
+     * @param tableAliasNameForRequestId
+     * @param tableAliasNameForWorkflowId
+     * @return
+     */
+    public static String getCanQueryRequestSqlCondition(User user,
+                                                        String tableAliasNameForRequestId, String tableAliasNameForWorkflowId) {
+        int userID = user.getUID();
+        String usertype = "0";
+
+        if (user.getLogintype().equals("2")) {
+            usertype = "1";
+        }
+
+        return getCanQueryRequestSqlCondition(userID, usertype, tableAliasNameForRequestId, tableAliasNameForWorkflowId);
+    }
+
+    /**
+     * 获得有权限查看的流程的过滤条件的sql
+     *
+     * @param userID
+     * @param usertype
+     * @param tableAliasNameForRequestId
+     * @param tableAliasNameForWorkflowId
+     * @return
+     */
+    public static String getCanQueryRequestSqlCondition(int userID, String usertype,
+                                                        String tableAliasNameForRequestId, String tableAliasNameForWorkflowId) {
+        StringBuffer sqlwhere = new StringBuffer();
+        sqlwhere.append(" and exists (select 1 from workflow_currentoperator b,workflow_base c where b.requestid = " + tableAliasNameForRequestId + ".requestid ");
+        sqlwhere.append(" and b.userid in (" + userID);
+        sqlwhere.append(" )and b.usertype=" + usertype
+                + " and " + tableAliasNameForWorkflowId + ".workflowid = c.id"
+                + " and c.isvalid in (1,3) and (c.istemplate is null or c.istemplate<>'1'))");
+        sqlwhere.append(" ");
+        return sqlwhere.toString();
+    }
+
+    /**
+     * 获取生成选择借款流程借款明细的按钮
+     *
+     * @param jklc            无用
+     * @param spanValue       默认显示内容
+     * @param fieldid         字段id
+     * @param derecorderindex 明细行行号
+     * @param finCss          显示内容css样式
+     * @param ismand          是否可编辑：1是；其他否；
+     * @return
+     */
+    public static String getBtnRequestDtlBrowser(int jklc, String spanValue, int fieldid,
+                                                 String derecorderindex, String finCss, int ismand) {
+        if (ismand == 1 && Util.getIntValue(spanValue) <= 0) {
+            spanValue = "<img src='/images/BacoError_wev8.gif' align='absMiddle' />";
+        }
+        String spanStr = "<span id='field" + fieldid + "_" + derecorderindex + "span' style='" + finCss + "'>" + spanValue + "</span>";
+        String inputStr = spanStr + "<div class='e8_innerShow e8_innerShow_button' " +
+                " style='max-height:2200px;'>" +
+                "<span class='e8_spanFloat'>" +
+                "<span class='e8_browserSpan'>" +
+                "<button class='e8_browflow' type='button' " +
+                " id='field" + fieldid + "_" + derecorderindex + "_browserbtnfna' " +
+                " onclick='onShowBrowser_fnaBorrowRequestDtl(this);'></button>" +
+                "</span>" +
+                "</span>" +
+                "</div>";
+        return inputStr;
+    }
+
+    /**
+     * 获取生成选择预付款流程预付款明细的按钮
+     *
+     * @param jklc            无用
+     * @param spanValue       默认显示内容
+     * @param fieldid         字段id
+     * @param derecorderindex 明细行行号
+     * @param finCss          显示内容css样式
+     * @param ismand          是否可编辑：1是；其他否；
+     * @return
+     */
+    public static String getBtnAdvanceRequestDtlBrowser(int jklc, String spanValue, int fieldid,
+                                                        String derecorderindex, String finCss, int ismand) {
+        if (ismand == 1 && Util.getIntValue(spanValue) <= 0) {
+            spanValue = "<img src='/images/BacoError_wev8.gif' align='absMiddle' />";
+        }
+        String spanStr = "<span id='field" + fieldid + "_" + derecorderindex + "span' style='" + finCss + "'>" + spanValue + "</span>";
+        String inputStr = spanStr + "<div class='e8_innerShow e8_innerShow_button' " +
+                " style='max-height:2200px;'>" +
+                "<span class='e8_spanFloat'>" +
+                "<span class='e8_browserSpan'>" +
+                "<button class='e8_browflow' type='button' " +
+                " id='field" + fieldid + "_" + derecorderindex + "_browserbtnfna' " +
+                " onclick='onShowBrowser_fnaAdvanceRequestDtl(this);'></button>" +
+                "</span>" +
+                "</span>" +
+                "</div>";
+        return inputStr;
+    }
+
+    /**
+     * 获取生成查看借还款金额修改历史的按钮
+     *
+     * @param fieldid         字段id
+     * @param derecorderindex 明细行行号
+     * @param languageId      当前登录用户所用语言标识
+     * @param detailRecordId  字段所在明细表序号
+     * @return
+     */
+    public static String getBtnTzmx(int fieldid, String derecorderindex, int languageId, int detailRecordId) {
+        String inputStr = "<input id='btnTzmx_field" + fieldid + "_" + derecorderindex + "' type='button' " +
+                " value='" + SystemEnv.getHtmlLabelName(83211, languageId) + "' " +//查看金额修改历史
+                " onclick='showAmountOfHistory_onclick(this);' " +
+                " _detailRecordId='" + detailRecordId + "' " +
+                " class='e8_btn_top' style='margin-left:5px;' />";
+        return inputStr;
+    }
+
+    /**
+     * 获取生成查看预付款金额修改历史的按钮
+     *
+     * @param fieldid         字段id
+     * @param derecorderindex 明细行行号
+     * @param languageId      当前登录用户所用语言标识
+     * @param detailRecordId  字段所在明细表序号
+     * @return
+     */
+    public static String getBtnTzmxAdvance(int fieldid, String derecorderindex, int languageId, int detailRecordId) {
+        String inputStr = "<input id='btnTzmx_field" + fieldid + "_" + derecorderindex + "' type='button' " +
+                " value='" + SystemEnv.getHtmlLabelName(83211, languageId) + "' " +//查看金额修改历史
+                " onclick='showAmountOfHistory_onclick(this);' " +
+                " _detailRecordId='" + detailRecordId + "' " +
+                " class='e8_btn_top' style='margin-left:5px;' />";
+        return inputStr;
+    }
+
+    /**
+     * 获取生成查询相关还款流程的按钮
+     *
+     * @param fieldid         字段id
+     * @param derecorderindex 明细行行号
+     * @param languageId      当前登录用户所用语言标识
+     * @param detailRecordId  字段所在明细表序号
+     * @return
+     */
+    public static String getBtnXghklc(int fieldid, String derecorderindex, int languageId, int detailRecordId) {
+        String inputStr = "<input id='btnXghklc_field" + fieldid + "_" + derecorderindex + "' type='button' " +
+                " value='" + SystemEnv.getHtmlLabelName(367, languageId) + "' " +//查看
+                " onclick='showRelatedProcess_onclick(this);' " +
+                " _detailRecordId='" + detailRecordId + "' " +
+                " class='e8_btn_top' style='margin-left:5px;' />";
+        return inputStr;
+    }
+
+    /**
+     * 检查指定流程指定字段是否是指定类型的预算类流程字段
+     *
+     * @param workflowid 流程wfid
+     * @param fieldId    字段id
+     * @param fieldType  字段类型
+     * @param dtlNumber  明细表序号
+     * @param fnaWfType  预算类流程类型
+     * @return
+     */
+    public static boolean checkFnaWfFieldFnaType(int workflowid, int fieldId, int fieldType, int dtlNumber, String fnaWfType) {
+        RecordSet rs_fna = new RecordSet();
+
+        String sql = "select count(*) cnt from fnaFeeWfInfoField a join fnaFeeWfInfo b on b.id = a.MAINID \n" +
+                " where a.DTLNUMBER = " + dtlNumber + " and a.fieldType = " + fieldType + " and a.fieldId = " + fieldId + " " +
+                " and b.FNAWFTYPE = '" + StringEscapeUtils.escapeSql(fnaWfType) + "' and a.workflowid = " + workflowid;
+        rs_fna.executeSql(sql);
+        if (rs_fna.next() && rs_fna.getInt("cnt") > 0) {
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * 获取相关还款流程配置信息
+     *
+     * @param _workflowid
+     * @return 是否是借款费控流程：key：isEnableFnaRepaymentWf；value：true、false；<br>
+     * 流程表单id：key：formId；value：表单id；<br>
+     * 流程是否新表单：key：isbill；value：0、1；
+     */
+    public static HashMap<String, String> getIsEnableFnaRepaymentWfHm(int _workflowid) {
+        BaseBean _bb = new BaseBean();
+        RecordSet rs_fna = new RecordSet();
+
+        HashMap<String, String> retHm = new HashMap<String, String>();
+
+        //是否是系统表单的费控流程
+        int _formId = 0;
+        int _isbill = -1;
+        String sqlFna1 = "select a.formid, a.isbill from workflow_base a where a.id = " + _workflowid;
+        rs_fna.executeSql(sqlFna1);
+        if (rs_fna.next()) {
+            _formId = Util.getIntValue(rs_fna.getString("formid"), 0);
+            _isbill = Util.getIntValue(rs_fna.getString("isbill"), 0);
+        }
+        retHm.put("formId", _formId + "");
+        retHm.put("isbill", _isbill + "");
+
+        //是否是启用的Ecology8还款费控流程
+        retHm.put("isEnableFnaRepaymentWf", "false");
+        String sqlFnaWfSet = "select a.enable from fnaFeeWfInfo a where a.fnaWfType = 'repayment' and a.workflowid = " + _workflowid;
+        rs_fna.executeSql(sqlFnaWfSet);
+        if (rs_fna.next()) {
+            if (rs_fna.getInt("enable") == 1) {
+                retHm.put("isEnableFnaRepaymentWf", "true");
+            }
+        }
+
+        return retHm;
+    }
+
+    /**
+     * 获取相关借款流程配置信息
+     *
+     * @param _workflowid
+     * @return 是否是借款费控流程：key：isEnableFnaBorrowWf；value：true、false；<br>
+     * 流程表单id：key：formId；value：表单id；<br>
+     * 流程是否新表单：key：isbill；value：0、1；
+     */
+    public static HashMap<String, String> getIsEnableFnaBorrowWfHm(int _workflowid) {
+        BaseBean _bb = new BaseBean();
+        RecordSet rs_fna = new RecordSet();
+
+        HashMap<String, String> retHm = new HashMap<String, String>();
+
+        //是否是系统表单的费控流程
+        int _formId = 0;
+        int _isbill = -1;
+        String sqlFna1 = "select a.formid, a.isbill from workflow_base a where a.id = " + _workflowid;
+        rs_fna.executeSql(sqlFna1);
+        if (rs_fna.next()) {
+            _formId = Util.getIntValue(rs_fna.getString("formid"), 0);
+            _isbill = Util.getIntValue(rs_fna.getString("isbill"), 0);
+        }
+        retHm.put("formId", _formId + "");
+        retHm.put("isbill", _isbill + "");
+
+        //是否是启用的Ecology8借款费控流程
+        retHm.put("isEnableFnaBorrowWf", "false");
+        String sqlFnaWfSet = "select a.enable from fnaFeeWfInfo a where a.fnaWfType = 'borrow' and a.workflowid = " + _workflowid;
+        rs_fna.executeSql(sqlFnaWfSet);
+        if (rs_fna.next()) {
+            if (rs_fna.getInt("enable") == 1) {
+                retHm.put("isEnableFnaBorrowWf", "true");
+            }
+        }
+
+        return retHm;
+    }
+
+    /**
+     * 拆封in中的值的长度，防止超过999调后sql执行报错
+     *
+     * @param condStr     完整的值
+     * @param splitNumber 拆分长度
+     * @param chr1        ,号
+     * @param df          如果值是字符串则传入null
+     * @return
+     */
+    public static List splitToListForSqlCond(String condStr, int splitNumber, String chr1, DecimalFormat df) {
+        List condList = new ArrayList();
+
+        String[] _reqIdArray = condStr.split(",");
+        int _reqIdArrayLen = _reqIdArray.length;
+        int _reqIdArrayIndex = 0;
+        while (_reqIdArrayIndex < _reqIdArrayLen) {
+            StringBuffer _reqIdArrayCond = new StringBuffer("");
+            for (int i = 0; i < splitNumber; i++) {
+                if (_reqIdArrayIndex == _reqIdArrayLen) {
+                    break;
+                }
+                if (_reqIdArrayCond.length() > 0) {
+                    _reqIdArrayCond.append(chr1);
+                }
+                String _key = _reqIdArray[_reqIdArrayIndex];
+                if (df == null) {
+                    _reqIdArrayCond.append("'" + StringEscapeUtils.escapeSql(_key) + "'");
+                } else {
+                    _reqIdArrayCond.append(df.format(Util.getDoubleValue(_key, 0)));
+                }
+                _reqIdArrayIndex++;
+            }
+
+            condList.add(_reqIdArrayCond.toString());
+        }
+
+        return condList;
+    }
+
+    /**
+     * 获取报销单位浏览按钮类型，依据报销类型
+     *
+     * @param fieldid        字段id
+     * @param oldBtnType     转义前对应的承担主体流程表单字段的字段的浏览按钮类型
+     * @param detailRecordId 明细表数据库记录id值
+     * @param requestId      流程reqid
+     * @param fnaWfSetMap    预算流程字段对应关系hm对象
+     * @param reqDataMap     流程数据hm对象
+     * @param languageId     当前登录人员语言标识
+     * @param otherPara_hs   调用该函数的流程方法内有一个同名变量
+     * @param otherReturnVal 返回值hm对象
+     * @return 转义后对应的承担主体流程表单字段的字段的浏览按钮类型
+     */
+    public static int getOrgBtnTypeByFnaFieldType(int fieldid, int oldBtnType, int detailRecordId, int requestId,
+                                                  Map<String, String> fnaWfSetMap, HashMap<String, HashMap<String, String>> reqDataMap,
+                                                  int languageId,
+                                                  Hashtable otherPara_hs, HashMap<String, String> otherReturnVal) {
+        return FnaCommon.getOrgBtnTypeByFnaFieldType(fieldid, oldBtnType, detailRecordId + "", requestId,
+                fnaWfSetMap, reqDataMap,
+                languageId,
+                otherPara_hs, otherReturnVal);
+    }
+
+    /**
+     * 依据承担主体类型获取承担主体名称
+     *
+     * @param oldOrgName     转义前的承担主体名称
+     * @param _detailFieldId 字段id
+     * @param requestid      流程reqid
+     * @param rowIdx         明细行行号
+     * @param fnaWfType      财务类流程类型标识
+     * @param fnaWfSetMap    预算流程字段对应关系hm对象
+     * @param reqDataMap     流程数据hm对象
+     * @param otherPara_hs   调用该函数的流程方法内有一个同名变量
+     * @param language       当前登录人员语言标识
+     * @param rci            人员缓存类对象
+     * @param dci            部门缓存类对象
+     * @param scci           分部缓存类对象
+     * @param fccListHm      成本中心缓存对象
+     * @return 转义后的承担主体名称
+     */
+    public static String getOrgNameByOrgType(String oldOrgName, int _detailFieldId, int requestid, int rowIdx,
+                                             String fnaWfType, HashMap<String, String> fnaWfSetMap, HashMap<String, HashMap<String, String>> reqDataMap, Hashtable otherPara_hs,
+                                             int language, ResourceComInfo rci, DepartmentComInfo dci, SubCompanyComInfo scci, HashMap<String, HashMap<String, String>> fccListHm) {
+        if ("fnaFeeWf".equals(fnaWfType) || "change".equals(fnaWfType) || "share".equals(fnaWfType)) {//报销流程；预算变更；费用分摊；
+            if ("fieldIdOrgId_fieldId".equals(fnaWfSetMap.get(_detailFieldId + "")) || "fieldIdOrgId2_fieldId".equals(fnaWfSetMap.get(_detailFieldId + ""))) {
+                FnaSystemSetComInfo fnaSystemSetComInfo = new FnaSystemSetComInfo();
+                int wfDtlImpRole4Fcc = Util.getIntValue(fnaSystemSetComInfo.get_wfDtlImpRole4Fcc(), 0);//成本中心字段流程明细导入规则
+
+                int oldBtnType = Util.getIntValue(fnaWfSetMap.get("fieldIdOrgId_type"));
+                String detailRecordKey = "key_idx>>" + rowIdx;
+                HashMap<String, String> otherReturnVal = new HashMap<String, String>();
+                int newBtnType = FnaCommon.getOrgBtnTypeByFnaFieldType(_detailFieldId, oldBtnType, detailRecordKey, requestid,
+                        fnaWfSetMap, reqDataMap,
+                        language,
+                        otherPara_hs, otherReturnVal);
+                HashMap<String, String> reqOneRowDataMap = reqDataMap.get(detailRecordKey);
+                int _organizationid_value = 0;
+                if (reqOneRowDataMap != null) {
+                    if ("fieldIdOrgId_fieldId".equals(fnaWfSetMap.get(_detailFieldId + ""))) {
+                        _organizationid_value = Util.getIntValue(reqOneRowDataMap.get("organizationid"), -1);
+                    } else if ("fieldIdOrgId2_fieldId".equals(fnaWfSetMap.get(_detailFieldId + ""))) {
+                        _organizationid_value = Util.getIntValue(reqOneRowDataMap.get("organizationid2"), -1);
+                    }
+                }
+                if (newBtnType != oldBtnType && _organizationid_value > 0) {
+                    String newOrgName = oldOrgName;
+                    if (newBtnType == 1) {//个人
+                        newOrgName = Util.null2String(rci.getLastname(_organizationid_value + ""));
+                    } else if (newBtnType == 4) {//部门
+                        newOrgName = Util.null2String(dci.getDepartmentname(_organizationid_value + ""));
+                    } else if (newBtnType == 164) {//分部
+                        newOrgName = Util.null2String(scci.getSubCompanyname(_organizationid_value + ""));
+                    } else if (newBtnType == 251) {//成本中心
+                        HashMap<String, String> fccHm = fccListHm.get(_organizationid_value + "");
+                        if (fccHm != null) {
+                            if (wfDtlImpRole4Fcc == 1) {
+                                newOrgName = Util.null2String(fccHm.get("code")).trim();
+                            } else if (wfDtlImpRole4Fcc == 2) {        //成本中心全路径名称
+                                newOrgName = RequestDetailImportUtil.getCostCenterFullName(_organizationid_value + "");
+                            } else {
+                                newOrgName = Util.null2String(fccHm.get("name")).trim();
+                            }
+                        } else {
+                            newOrgName = "";
+                        }
+                    }
+                    oldOrgName = newOrgName;
+                }
+            }
+        }
+        return oldOrgName;
+    }
+
+    /**
+     * 依据流程选择框的名称，获取选择框的值，并依据选择框的值，返回对应的承担主体浏览按钮的类型
+     *
+     * @param oldBtnType        转义前对应的承担主体流程表单字段的字段的浏览按钮类型
+     * @param orgIdFieldId      承担主体浏览按钮的fieldid
+     * @param orgTypeFieldId    承担主体类型按钮的fieldid
+     * @param orgTypeSelectName 承担主体类型选择框选择的名称
+     * @param requestid         流程reqid
+     * @param language          当前登录人员语言标识
+     * @param fnaWfSetMap       预算流程字段对应关系hm对象
+     * @param reqDataMap        流程数据hm对象
+     * @param otherPara_hs      调用该函数的流程方法内有一个同名变量
+     * @return 转义后对应的承担主体流程表单字段的字段的浏览按钮类型
+     */
+    public static int getOrgSelectValueByOrgTypeSelectName(int oldBtnType, int orgIdFieldId, int orgTypeFieldId, String orgTypeSelectName,
+                                                           int requestid, int language,
+                                                           HashMap<String, String> fnaWfSetMap, HashMap<String, HashMap<String, String>> reqDataMap, Hashtable otherPara_hs) {
+        RecordSet rs_fna = new RecordSet();
+
+        String languageIdStr = "";
+        if (language > 9) {
+            languageIdStr = language + "";
+        } else {
+            languageIdStr = language + " ";
+        }
+
+        int newBtnType = oldBtnType;
+        int selectvalue = -1;
+        String _sql = "select a.selectvalue  \n" +
+                " from workflow_SelectItem a \n" +
+                " where 1=1 and (a.cancel is null or a.cancel = 0) " +
+                " and (a.selectname like '%`~`" + languageIdStr + StringEscapeUtils.escapeSql(orgTypeSelectName) + "`~`%' or a.selectname = '" + StringEscapeUtils.escapeSql(orgTypeSelectName) + "') \n" +
+                " and a.fieldid = " + orgTypeFieldId +
+                " order by a.listorder asc";
+        rs_fna.executeSql(_sql);
+        if (rs_fna.next()) {
+            selectvalue = rs_fna.getInt("selectvalue");
+        }
+        if (selectvalue == 0) {
+            newBtnType = 1;
+        } else if (selectvalue == 1) {
+            newBtnType = 4;
+        } else if (selectvalue == 2) {
+            newBtnType = 164;
+        } else if (selectvalue == 3) {
+            newBtnType = 251;
+        } else {
+            int detailRecordId = 0;
+            HashMap<String, String> otherReturnVal = new HashMap<String, String>();
+            newBtnType = FnaCommon.getOrgBtnTypeByFnaFieldType(orgIdFieldId, oldBtnType, detailRecordId, requestid,
+                    fnaWfSetMap, reqDataMap,
+                    language,
+                    otherPara_hs, otherReturnVal);
+        }
+        return newBtnType;
+    }
+
+    /**
+     * 获取报销单位浏览按钮类型，依据报销类型
+     *
+     * @param fieldid
+     * @param oldBtnType
+     * @param detailRecordKey
+     * @param requestId
+     * @param fnaWfSetMap
+     * @param reqDataMap
+     * @param languageId
+     * @param otherPara_hs
+     * @param otherReturnVal
+     * @return
+     */
+    public static int getOrgBtnTypeByFnaFieldType(int fieldid, int oldBtnType, String detailRecordKey, int requestId,
+                                                  Map<String, String> fnaWfSetMap, HashMap<String, HashMap<String, String>> reqDataMap,
+                                                  int languageId,
+                                                  Hashtable otherPara_hs, HashMap<String, String> otherReturnVal) {
+        BaseBean _bb = new BaseBean();
+        RecordSet rs_fna = new RecordSet();
+        detailRecordKey = Util.null2String(detailRecordKey).trim();
+
+//		_bb.writeLog("getOrgBtnTypeByFnaFieldType");
+
+        WFLayoutToHtml wfLayoutToHtml = new WFLayoutToHtml();
+
+        int fieldid_tmp = Util.getIntValue((String) otherPara_hs.get("fieldid_tmp"));
+        int fieldhtmltype_tmp = Util.getIntValue((String) otherPara_hs.get("fieldhtmltype_tmp"));
+        int type_tmp = Util.getIntValue((String) otherPara_hs.get("type_tmp"));
+
+        Hashtable inoperatefield_hs = (Hashtable) otherPara_hs.get("inoperatefield_hs");
+        if (inoperatefield_hs == null) {
+            inoperatefield_hs = new Hashtable();
+        }
+        Hashtable fieldvalue_hs = (Hashtable) otherPara_hs.get("fieldvalue_hs");
+        if (fieldvalue_hs == null) {
+            fieldvalue_hs = new Hashtable();
+        }
+        Map fieldMap = (Map) otherPara_hs.get("fieldMap");
+        if (fieldMap == null) {
+            fieldMap = new HashMap();
+        }
+
+        ResourceComInfo resourceComInfo = (ResourceComInfo) otherPara_hs.get("resourceComInfo");
+        if (resourceComInfo == null) {
+            try {
+                resourceComInfo = new ResourceComInfo();
+            } catch (Exception e) {
+                _bb.writeLog(e);
+            }
+        }
+
+        String prjid = Util.null2String((String) otherPara_hs.get("prjid")).trim();
+        String docid = Util.null2String((String) otherPara_hs.get("docid")).trim();
+        String dt_beagenter = Util.null2String((String) otherPara_hs.get("dt_beagenter")).trim();
+        String hrmid = Util.null2String((String) otherPara_hs.get("hrmid")).trim();
+        int body_isagent = Util.getIntValue((String) otherPara_hs.get("body_isagent"));
+        int agenttype = Util.getIntValue((String) otherPara_hs.get("agenttype"));
+
+        String crmid = Util.null2String((String) otherPara_hs.get("crmid")).trim();
+        String reqid = Util.null2String((String) otherPara_hs.get("reqid")).trim();
+
+        int organizationtype = -1;
+
+        boolean _isDbDataFlag = false;
+
+        HashMap<String, String> reqOneRowDataMap = null;
+//		new BaseBean().writeLog("reqDataMap="+reqDataMap+";requestId="+requestId+";");
+        if (reqDataMap != null && requestId > 0) {
+            String fieldIdSubject_isDtl = Util.null2String(fnaWfSetMap.get("fieldIdSubject_fieldId_isDtl"));
+            String fieldIdOrgType_isDtl = Util.null2String(fnaWfSetMap.get("fieldIdOrgType_fieldId_isDtl"));
+            String fieldIdOrgId_isDtl = Util.null2String(fnaWfSetMap.get("fieldIdOrgId_fieldId_isDtl"));
+            String fieldIdOccurdate_isDtl = Util.null2String(fnaWfSetMap.get("fieldIdOccurdate_fieldId_isDtl"));
+
+            //报销明细中是否包含了明细表字段
+            boolean dt1_haveIsDtlField = ("1".equals(fieldIdSubject_isDtl) || "1".equals(fieldIdOrgType_isDtl) || "1".equals(fieldIdOrgId_isDtl) || "1".equals(fieldIdOccurdate_isDtl));
+//			new BaseBean().writeLog("fieldIdSubject_isDtl="+fieldIdSubject_isDtl+";");
+//			new BaseBean().writeLog("fieldIdOrgType_isDtl="+fieldIdOrgType_isDtl+";");
+//			new BaseBean().writeLog("***************fieldIdOrgId_isDtl="+fieldIdOrgId_isDtl+";");
+//			new BaseBean().writeLog("fieldIdOccurdate_isDtl="+fieldIdOccurdate_isDtl+";");
+//			new BaseBean().writeLog("***************dt1_haveIsDtlField="+dt1_haveIsDtlField+";");
+
+            if (!"1".equals(fieldIdOrgId_isDtl) && dt1_haveIsDtlField) {//承担主体是主表，但是，有其他字段是明细表时，随便取reqDataMap中的一个值中即可
+//				new BaseBean().writeLog("reqDataMap="+reqDataMap+";");
+                Iterator iter = reqDataMap.entrySet().iterator();
+//				new BaseBean().writeLog("iter="+iter+";");
+                if (iter.hasNext()) {
+                    Map.Entry entry = (Map.Entry) iter.next();
+//					new BaseBean().writeLog("entry="+entry+";");
+                    reqOneRowDataMap = (HashMap<String, String>) entry.getValue();
+//					new BaseBean().writeLog("1 reqOneRowDataMap="+reqOneRowDataMap+";");
+                }
+            } else if ((!"".equals(detailRecordKey) && detailRecordKey.startsWith("key_idx>>")) || Util.getIntValue(detailRecordKey) > 0) {//先检查是否是来自明细，如果是来自明细则使用明细id获取数据
+                reqOneRowDataMap = reqDataMap.get(detailRecordKey + "");
+            } else if (requestId > 0) {//如果不是来自明细则使用主表requestid来获取数据
+                reqOneRowDataMap = reqDataMap.get(requestId + "");
+            }
+        }
+//		new BaseBean().writeLog("f reqOneRowDataMap="+reqOneRowDataMap+";");
+
+        if (reqOneRowDataMap == null) {//数据库里面没有记录
+//			fnaWfSetMap
+//			requestId
+//			detailRecordKey
+
+            String formid = Util.null2String(fnaWfSetMap.get("formid"));
+            int formidABS = Math.abs(Util.getIntValue(formid, 0));
+            if (formidABS > 0) {
+                String fieldIdOrgType_fieldName = "";
+                String fieldIdOrgType_fieldId_isDtl = "";
+
+                if ("fieldIdOrgId_fieldId".equals(fnaWfSetMap.get(fieldid + ""))) {
+                    fieldIdOrgType_fieldName = Util.null2String(fnaWfSetMap.get("fieldIdOrgType_fieldName")).trim();
+                    fieldIdOrgType_fieldId_isDtl = Util.null2String(fnaWfSetMap.get("fieldIdOrgType_fieldId_isDtl")).trim();
+                } else if ("fieldIdOrgId2_fieldId".equals(fnaWfSetMap.get(fieldid + ""))) {
+                    fieldIdOrgType_fieldName = Util.null2String(fnaWfSetMap.get("fieldIdOrgType2_fieldName")).trim();
+                    fieldIdOrgType_fieldId_isDtl = Util.null2String(fnaWfSetMap.get("fieldIdOrgType2_fieldId_isDtl")).trim();
+                }
+
+                if (!"".equals(fieldIdOrgType_fieldName)) {
+                    StringBuffer sqlQry = new StringBuffer();
+                    sqlQry.append("select t.").append(fieldIdOrgType_fieldName).append(" orgType ");
+
+                    sqlQry.append(" from ");
+                    if (!"1".equals(fieldIdOrgType_fieldId_isDtl)) {
+                        sqlQry.append(" formtable_main_").append(formidABS).append(" t ");
+                    } else {
+                        sqlQry.append(" formtable_main_").append(formidABS).append(" main ");
+                        sqlQry.append(" join ").append("formtable_main_").append(formidABS).append("_dt1 t on main.id = t.mainid ");
+                    }
+
+                    sqlQry.append(" where 1=1 ");
+
+                    if (!"1".equals(fieldIdOrgType_fieldId_isDtl)) {
+                    } else {
+                        sqlQry.append(" and t.id=? ");
+                    }
+
+                    sqlQry.append(" and ");
+                    if (!"1".equals(fieldIdOrgType_fieldId_isDtl)) {
+                        sqlQry.append("t.");
+                    } else {
+                        sqlQry.append("main.");
+                    }
+                    sqlQry.append("requestid=? ");
+
+                    RecordSet rs_sqlQry = new RecordSet();
+                    if (!"1".equals(fieldIdOrgType_fieldId_isDtl)) {
+                        rs_sqlQry.executeQuery(sqlQry.toString(), requestId);
+                    } else {
+                        rs_sqlQry.executeQuery(sqlQry.toString(), detailRecordKey, requestId);
+                    }
+                    if (rs_sqlQry.next()) {
+                        String _orgTypeValue = Util.null2String(rs_sqlQry.getString("orgType")).trim();
+
+                        reqOneRowDataMap = new HashMap<String, String>();
+                        if ("fieldIdOrgId_fieldId".equals(fnaWfSetMap.get(fieldid + ""))) {
+                            reqOneRowDataMap.put("organizationtype", _orgTypeValue);
+                        } else if ("fieldIdOrgId2_fieldId".equals(fnaWfSetMap.get(fieldid + ""))) {
+                            reqOneRowDataMap.put("organizationtype2", _orgTypeValue);
+                        }
+                    }
+
+                }
+            }
+        }
+//		new BaseBean().writeLog("f1 reqOneRowDataMap="+reqOneRowDataMap+";");
+
+        if (reqOneRowDataMap != null) {//数据库里面有记录，表示是历史行
+            organizationtype = -1;
+            if ("fieldIdOrgId_fieldId".equals(fnaWfSetMap.get(fieldid + ""))) {
+                organizationtype = Util.getIntValue(reqOneRowDataMap.get("organizationtype"), -1);
+            } else if ("fieldIdOrgId2_fieldId".equals(fnaWfSetMap.get(fieldid + ""))) {
+                organizationtype = Util.getIntValue(reqOneRowDataMap.get("organizationtype2"), -1);
+            }
+            _isDbDataFlag = true;
+//			_bb.writeLog("1 organizationtype="+organizationtype);
+
+        } else {//数据库中无纪律，表示是新增行
+            int ortType_fieldid_tmp = 0;
+            int ortType_fieldhtmltype_tmp = 0;
+            int ortType_type_tmp = 0;
+            if ("fieldIdOrgId_fieldId".equals(fnaWfSetMap.get(fieldid + ""))) {
+                ortType_fieldid_tmp = Util.getIntValue(fnaWfSetMap.get("fieldIdOrgType_fieldId"));
+                ortType_fieldhtmltype_tmp = Util.getIntValue(fnaWfSetMap.get("fieldIdOrgType_fieldhtmltype"));
+                ortType_type_tmp = Util.getIntValue(fnaWfSetMap.get("fieldIdOrgType_type"));
+            } else if ("fieldIdOrgId2_fieldId".equals(fnaWfSetMap.get(fieldid + ""))) {
+                ortType_fieldid_tmp = Util.getIntValue(fnaWfSetMap.get("fieldIdOrgType2_fieldId"));
+                ortType_fieldhtmltype_tmp = Util.getIntValue(fnaWfSetMap.get("fieldIdOrgType2_fieldhtmltype"));
+                ortType_type_tmp = Util.getIntValue(fnaWfSetMap.get("fieldIdOrgType2_type"));
+            }
+
+//			_bb.writeLog("ortType_fieldid_tmp="+ortType_fieldid_tmp+";ortType_fieldhtmltype_tmp="+ortType_fieldhtmltype_tmp+";ortType_type_tmp="+ortType_type_tmp);
+
+            String fieldvalue_tmp = wfLayoutToHtml.getFieldValueTmp(ortType_fieldid_tmp, ortType_fieldhtmltype_tmp, ortType_type_tmp,
+                    inoperatefield_hs, fieldvalue_hs, fieldMap,
+                    resourceComInfo,
+                    prjid, docid, dt_beagenter, hrmid, body_isagent, agenttype,
+                    crmid, reqid);
+            organizationtype = Util.getIntValue(fieldvalue_tmp);
+            if (organizationtype < 0) {
+                if ("fieldIdOrgId_fieldId".equals(fnaWfSetMap.get(fieldid + ""))) {
+                    organizationtype = Util.getIntValue(fnaWfSetMap.get("fieldIdOrgType_defaultSelectValue"));
+                    ;
+                } else if ("fieldIdOrgId2_fieldId".equals(fnaWfSetMap.get(fieldid + ""))) {
+                    organizationtype = Util.getIntValue(fnaWfSetMap.get("fieldIdOrgType2_defaultSelectValue"));
+                }
+            }
+//			_bb.writeLog("2 organizationtype="+organizationtype+";fieldvalue_tmp="+fieldvalue_tmp);
+        }
+
+        if ("fieldIdOrgId_fieldId".equals(fnaWfSetMap.get(fieldid + "")) || "fieldIdOrgId2_fieldId".equals(fnaWfSetMap.get(fieldid + ""))) {
+            int btnType = oldBtnType;
+            if (organizationtype == 0) {//个人
+                btnType = 1;
+            } else if (organizationtype == 1) {//部门
+                btnType = 4;
+            } else if (organizationtype == 2) {//分部
+                btnType = 164;
+            } else if (organizationtype == 3) {//成本中心
+                btnType = 251;
+            }
+//			_bb.writeLog("btnType="+btnType+";_oldBtnType="+oldBtnType);
+
+            String fieldvalue_tmp = "";
+            if (!_isDbDataFlag && btnType != oldBtnType) {
+                fieldvalue_tmp = wfLayoutToHtml.getFieldValueTmp(fieldid, 3, btnType,
+                        inoperatefield_hs, fieldvalue_hs, fieldMap,
+                        resourceComInfo,
+                        prjid, docid, dt_beagenter, hrmid, body_isagent, agenttype,
+                        crmid, reqid);
+                if (Util.getIntValue(fieldvalue_tmp) == 0) {
+                    fieldvalue_tmp = "";
+                }
+                otherReturnVal.put("newOrgIdDefValue", fieldvalue_tmp);
+//				_bb.writeLog("newOrgIdDefValue="+fieldvalue_tmp);
+            }
+
+            if (!_isDbDataFlag && btnType == 251 && "".equals(fieldvalue_tmp)) {//成本中心
+                String fieldIdOrgId_automaticTake = Util.null2String(fnaWfSetMap.get("fieldIdOrgId_automaticTake"));
+                if ("1".equals(fieldIdOrgId_automaticTake)) {
+                    String _fnaFccId_fieldvalue_tmp_key = "fieldIdOrgId_automaticTake_hrmid=" + hrmid + "_isDbDataFlagEqualsFalse_btnType251_fnaFccId_fieldvalue_tmp_key";
+                    if (otherPara_hs.containsKey(_fnaFccId_fieldvalue_tmp_key)) {
+                        fieldvalue_tmp = Util.null2String((String) otherPara_hs.get(_fnaFccId_fieldvalue_tmp_key)).trim();
+                    } else {
+                        HashMap<String, String> dataMapHrm = new HashMap<String, String>();
+                        FnaCommon.getHrmResourceInfo(dataMapHrm, Util.getIntValue(hrmid));
+                        String _fnaFccId = Util.null2String(dataMapHrm.get("fccId"));
+                        fieldvalue_tmp = _fnaFccId;
+                        if (Util.getIntValue(fieldvalue_tmp) == 0) {
+                            fieldvalue_tmp = "";
+                        }
+                        otherPara_hs.put(_fnaFccId_fieldvalue_tmp_key, fieldvalue_tmp);
+                    }
+                    otherReturnVal.put("newOrgIdDefValue", fieldvalue_tmp);
+                }
+            }
+
+//			_bb.writeLog("btnType="+btnType);
+            return btnType;
+        }
+
+//		_bb.writeLog("_oldBtnType="+oldBtnType);
+        return oldBtnType;
+    }
+
+    /**
+     * 获取预算信息字段显示内容
+     *
+     * @param fieldid
+     * @param detailRecordId
+     * @param fieldvalue_old
+     * @param _requestId
+     * @param _detailNumber
+     * @param fnaWfSetMap
+     * @param reqDataMap
+     * @param fnaExpenseInfoAllRowRecordHm
+     * @param languageId
+     * @param otherPara_hs
+     * @return
+     */
+    public String getRemainByFnaFieldType(int fieldid, int detailRecordId, String fieldvalue_old,
+                                          int _requestId, int _detailNumber,
+                                          Map<String, String> fnaWfSetMap, HashMap<String, HashMap<String, String>> reqDataMap, HashMap<String, HashMap<String, String>> fnaExpenseInfoAllRowRecordHm, int languageId,
+                                          Hashtable otherPara_hs) {
+        if (_requestId > 0) {
+            RecordSet rs2 = new RecordSet();
+            //启用多明细表报销
+            int fnaWfTypeMultiReim = 0;
+            rs2.executeQuery("select a.* from fnaFeeWfInfo a join workflow_requestbase b on a.workflowid = b.workflowid where b.requestid = " + _requestId);
+            if (rs2.next()) {
+                fnaWfTypeMultiReim = rs2.getInt("fnaWfTypeMultiReim");
+            }
+            //启用多明细表报销,开关开启:当前流程的任意明细表都 【 可以用于也仅可以用于 】 费用报销;不再支持"还款,预付款冲销"功能;
+            if (fnaWfTypeMultiReim == 1) {
+                return "";
+            }
+        }
+        BaseBean _bb = new BaseBean();
+        //_bb.writeLog("getRemainByFnaFieldType");
+
+        String _hrmremain_fieldName = Util.null2String(fnaWfSetMap.get("fieldIdHrmInfo_fieldName")).trim();
+        String _deptremain_fieldName = Util.null2String(fnaWfSetMap.get("fieldIdDepInfo_fieldName")).trim();
+        String _subcomremain_fieldName = Util.null2String(fnaWfSetMap.get("fieldIdSubInfo_fieldName")).trim();
+        String _Fcc_fieldName = Util.null2String(fnaWfSetMap.get("fieldIdFccInfo_fieldName")).trim();
+
+        String _hrmremain_fieldName2 = Util.null2String(fnaWfSetMap.get("fieldIdHrmInfo2_fieldName")).trim();
+        String _deptremain_fieldName2 = Util.null2String(fnaWfSetMap.get("fieldIdDepInfo2_fieldName")).trim();
+        String _subcomremain_fieldName2 = Util.null2String(fnaWfSetMap.get("fieldIdSubInfo2_fieldName")).trim();
+        String _Fcc_fieldName2 = Util.null2String(fnaWfSetMap.get("fieldIdFccInfo2_fieldName")).trim();
+
+        int subject = -1;
+        int organizationtype = -1;
+        int organizationid = -1;
+        String budgetperiod = "";
+        String _fnaWfFieldFnaType_typeFlag = "";
+        String[] _dt1_remain_array = new String[]{"", "", "", ""};
+
+        HashMap<String, String> reqOneRowDataMap = null;
+        if (reqDataMap != null) {
+            if (detailRecordId > 0) {//先检查是否是来自明细，如果是来自明细则使用明细id获取数据
+                reqOneRowDataMap = reqDataMap.get(detailRecordId + "");
+            } else if (_requestId > 0) {//如果不是来自明细则使用主表requestid来获取数据
+                reqOneRowDataMap = reqDataMap.get(_requestId + "");
+            }
+        }
+        if ("fieldIdHrmInfo_fieldId".equals(fnaWfSetMap.get(fieldid + ""))
+                || "fieldIdDepInfo_fieldId".equals(fnaWfSetMap.get(fieldid + ""))
+                || "fieldIdSubInfo_fieldId".equals(fnaWfSetMap.get(fieldid + ""))
+                || "fieldIdFccInfo_fieldId".equals(fnaWfSetMap.get(fieldid + ""))) {
+            if (reqOneRowDataMap != null) {
+                subject = Util.getIntValue(reqOneRowDataMap.get("subject"), -1);
+                organizationtype = Util.getIntValue(reqOneRowDataMap.get("organizationtype"), -1);
+                organizationid = Util.getIntValue(reqOneRowDataMap.get("organizationid"), -1);
+                budgetperiod = Util.null2String(reqOneRowDataMap.get("budgetperiod")).trim();
+            }
+            _fnaWfFieldFnaType_typeFlag = "6_7_8_9";
+            _dt1_remain_array = new String[]{_hrmremain_fieldName, _deptremain_fieldName, _subcomremain_fieldName, _Fcc_fieldName};
+
+        } else if ("fieldIdHrmInfo2_fieldId".equals(fnaWfSetMap.get(fieldid + ""))
+                || "fieldIdDepInfo2_fieldId".equals(fnaWfSetMap.get(fieldid + ""))
+                || "fieldIdSubInfo2_fieldId".equals(fnaWfSetMap.get(fieldid + ""))
+                || "fieldIdFccInfo2_fieldId".equals(fnaWfSetMap.get(fieldid + ""))) {
+            if (reqOneRowDataMap != null) {
+                subject = Util.getIntValue(reqOneRowDataMap.get("subject2"), -1);
+                organizationtype = Util.getIntValue(reqOneRowDataMap.get("organizationtype2"), -1);
+                organizationid = Util.getIntValue(reqOneRowDataMap.get("organizationid2"), -1);
+                budgetperiod = Util.null2String(reqOneRowDataMap.get("budgetperiod2")).trim();
+            }
+            _fnaWfFieldFnaType_typeFlag = "14_15_16_17";
+            _dt1_remain_array = new String[]{_hrmremain_fieldName2, _deptremain_fieldName2, _subcomremain_fieldName2, _Fcc_fieldName2};
+
+        }
+
+        BudgetHandler budgetHandler = new BudgetHandler();
+
+        int orgtype = -1;
+        if (organizationtype == 0) {//个人
+            orgtype = 3;
+        } else if (organizationtype == 1) {//部门
+            orgtype = 2;
+        } else if (organizationtype == 2) {//分部
+            orgtype = 1;
+        } else if (organizationtype == 3) {//成本中心
+            orgtype = FnaCostCenter.ORGANIZATION_TYPE;
+        }
+
+        if (organizationtype >= 0 && organizationtype <= 3) {
+            if ("fieldIdHrmInfo_fieldId".equals(fnaWfSetMap.get(fieldid + ""))
+                    || "fieldIdDepInfo_fieldId".equals(fnaWfSetMap.get(fieldid + ""))
+                    || "fieldIdSubInfo_fieldId".equals(fnaWfSetMap.get(fieldid + ""))
+                    || "fieldIdFccInfo_fieldId".equals(fnaWfSetMap.get(fieldid + ""))
+                    || "fieldIdHrmInfo2_fieldId".equals(fnaWfSetMap.get(fieldid + ""))
+                    || "fieldIdDepInfo2_fieldId".equals(fnaWfSetMap.get(fieldid + ""))
+                    || "fieldIdSubInfo2_fieldId".equals(fnaWfSetMap.get(fieldid + ""))
+                    || "fieldIdFccInfo2_fieldId".equals(fnaWfSetMap.get(fieldid + ""))) {
+                String infos = " , , | , , , | , , ,  | , , , | , , , | , , , | , , , | , , , | , , , ";
+                if (!"".equals(budgetperiod) && orgtype != -1 && organizationid > 0 && subject > 0) {
+                    String key01 = "FnaCommon_getRemainByFnaFieldType_" + _fnaWfFieldFnaType_typeFlag + "_requestId=" + _requestId + "detailRecordId=" + detailRecordId + "_detailNumber=" + _detailNumber;
+                    if (otherPara_hs.containsKey(key01)) {
+                        infos = (String) otherPara_hs.get(key01);
+                    } else {
+                        HashMap<String, String> fnaExpenseInfoRecordHm = fnaExpenseInfoAllRowRecordHm.get(detailRecordId + "");
+                        infos = Util.null2String(budgetHandler.getBudgetKPI4DWR(budgetperiod, orgtype, organizationid, subject, true, true, detailRecordId, _requestId, fnaExpenseInfoRecordHm)).trim();
+                        otherPara_hs.put(key01, infos);
+                    }
+                }
+                String[] fnainfos = infos.split("\\|");
+
+                String budgetAutoMoveInfo = "";
+                if (fnainfos.length >= 5) {
+                    budgetAutoMoveInfo = fnainfos[4];
+                    if (!"".equals(budgetAutoMoveInfo)) {
+                        String regex = "^[, ]+$";
+                        Pattern pattern = Pattern.compile(regex);
+                        Matcher match = pattern.matcher(budgetAutoMoveInfo);
+                        if (match.matches()) {//判断是否只包含了逗号和空格，如果是则不处理
+                            budgetAutoMoveInfo = "";
+                        } else {
+                            budgetAutoMoveInfo = SystemEnv.getHtmlLabelName(126630, languageId) + ":" + budgetAutoMoveInfo;
+                        }
+                    }
+                }
+
+
+                String _dt1_remain_only = "";
+                if (getFnaNotEmptyCount(_dt1_remain_array) == 1) {
+                    _dt1_remain_only = getFnaOnlyNotEmptyValue(_dt1_remain_array);
+                }
+
+                String[] values = new String[]{"", "", "", "", "", "", "", "", "", "", "", "", "", "", "", ""};
+
+                int fnainfosLen = fnainfos.length;
+                if (("fieldIdHrmInfo_fieldId".equals(fnaWfSetMap.get(fieldid + "")) || "fieldIdHrmInfo2_fieldId".equals(fnaWfSetMap.get(fieldid + ""))) && fnainfosLen >= 1) {
+                    String _dt1_remain = _dt1_remain_array[0];
+                    if ((!_dt1_remain_only.equals("") && _dt1_remain_only.equals(_dt1_remain)) || (getFnaSameValueCount(_dt1_remain_array, _dt1_remain) > 1)) {
+                        values = fnainfos[organizationtype].split(",");
+                    } else {
+                        values = fnainfos[0].split(",");
+                    }
+
+                } else if (("fieldIdDepInfo_fieldId".equals(fnaWfSetMap.get(fieldid + "")) || "fieldIdDepInfo2_fieldId".equals(fnaWfSetMap.get(fieldid + ""))) && fnainfosLen >= 2) {
+                    String _dt1_remain = _dt1_remain_array[1];
+                    if ((!_dt1_remain_only.equals("") && _dt1_remain_only.equals(_dt1_remain)) || (getFnaSameValueCount(_dt1_remain_array, _dt1_remain) > 1)) {
+                        values = fnainfos[organizationtype].split(",");
+                    } else {
+                        values = fnainfos[1].split(",");
+                    }
+
+                } else if (("fieldIdSubInfo_fieldId".equals(fnaWfSetMap.get(fieldid + "")) || "fieldIdSubInfo2_fieldId".equals(fnaWfSetMap.get(fieldid + ""))) && fnainfosLen >= 3) {
+                    String _dt1_remain = _dt1_remain_array[2];
+                    if ((!_dt1_remain_only.equals("") && _dt1_remain_only.equals(_dt1_remain)) || (getFnaSameValueCount(_dt1_remain_array, _dt1_remain) > 1)) {
+                        values = fnainfos[organizationtype].split(",");
+                    } else {
+                        values = fnainfos[2].split(",");
+                    }
+
+                } else if (("fieldIdFccInfo_fieldId".equals(fnaWfSetMap.get(fieldid + "")) || "fieldIdFccInfo2_fieldId".equals(fnaWfSetMap.get(fieldid + ""))) && fnainfosLen >= 4) {
+                    String _dt1_remain = _dt1_remain_array[3];
+                    if ((!_dt1_remain_only.equals("") && _dt1_remain_only.equals(_dt1_remain)) || (getFnaSameValueCount(_dt1_remain_array, _dt1_remain) > 1)) {
+                        values = fnainfos[organizationtype].split(",");
+                    } else {
+                        values = fnainfos[3].split(",");
+                    }
+
+                }
+
+
+                String values0 = "";
+                String values1 = "";
+                String values2 = "";
+                int valuesLen = values.length;
+                if (valuesLen >= 1) {
+                    values0 = values[0];
+                }
+                if (valuesLen >= 2) {
+                    values1 = values[1];
+                }
+                if (valuesLen >= 3) {
+                    values2 = values[2];
+                }
+
+                String tempmsg = SystemEnv.getHtmlLabelName(18768, languageId) + ":" + values0 + "<br>" +
+                        "<font color=red>" + SystemEnv.getHtmlLabelName(18503, languageId) + ":" + values1 + "</font><br>" +
+                        "<font color=green>" + SystemEnv.getHtmlLabelName(18769, languageId) + ":" + values2 + "</font>";
+                if (!"".equals(budgetAutoMoveInfo)) {
+                    tempmsg += "<br>" + budgetAutoMoveInfo;
+                }
+
+                //_bb.writeLog("tempmsg="+tempmsg);
+                return tempmsg;
+            }
+        }
+        return fieldvalue_old;
+    }
+
+    /**
+     * 获取素组中有相同值的个数
+     *
+     * @param checkValArray
+     * @param compareValue
+     * @return
+     */
+    public int getFnaSameValueCount(String[] checkValArray, String compareValue) {
+        int _count = 0;
+        if (checkValArray != null) {
+            for (int i = 0; i < checkValArray.length; i++) {
+                String _val = checkValArray[i];
+                if (_val.equals(compareValue)) {
+                    _count++;
+                }
+            }
+        }
+        return _count;
+    }
+
+    /**
+     * 获取素组中非相同空项的值（取第一个）
+     *
+     * @param checkValArray
+     * @return
+     */
+    public String getFnaOnlyNotEmptyValue(String[] checkValArray) {
+        String _value = "";
+        if (this.getFnaNotEmptyCount(checkValArray) == 1) {
+            if (checkValArray != null) {
+                for (int i = 0; i < checkValArray.length; i++) {
+                    String _val = checkValArray[i];
+                    if (_val != null && _val.equals("")) {
+                        _value = _val;
+                        break;
+                    }
+                }
+            }
+        }
+        return _value;
+    }
+
+    /**
+     * 获取素组中非相同空值数量
+     *
+     * @param checkValArray
+     * @return
+     */
+    public int getFnaNotEmptyCount(String[] checkValArray) {
+        int _count = 0;
+        if (checkValArray != null) {
+            for (int i = 0; i < checkValArray.length; i++) {
+                String _val = checkValArray[i];
+                if (_val != null && _val.equals("")) {
+                    _count++;
+                }
+            }
+        }
+        return _count;
+    }
+
+    /**
+     * 依据流程类型获取查询费控相关字段的sql
+     *
+     * @param _requestId           流程requestid
+     * @param _formId              流程表单id
+     * @param dataMap              预算类流程字段对应关系hm
+     * @param _isEnableFnaWfE8     是否是启用的Ecology8费控流程
+     * @param _isEnableFnaChangeWf 是否是启用的Ecology8预算变更流程
+     * @param _isEnableFnaShareWf  是否是启用的Ecology8预算分摊流程
+     * @return SQL
+     */
+    public static String getSqlByFnaFieldType(int _requestId, int _formId, Map<String, String> dataMap,
+                                              boolean _isEnableFnaWfE8, boolean _isEnableFnaChangeWf, boolean _isEnableFnaShareWf) {
+//		_bb.writeLog("_formId="+_formId+";_isbill="+_isbill+";_isEnableFnaWfE7="+_isEnableFnaWfE7+";_isEnableFnaWfE8="+_isEnableFnaWfE8);
+
+        StringBuffer sql = new StringBuffer("");
+        if (_isEnableFnaWfE8 || _isEnableFnaChangeWf || _isEnableFnaShareWf) {//自定义新表单
+            int _formIdABS = Math.abs(_formId);
+
+            String fieldIdSubject_isDtl = "1";
+            String fieldIdOrgType_isDtl = "1";
+            String fieldIdOrgId_isDtl = "1";
+            String fieldIdOccurdate_isDtl = "1";
+
+            String fieldIdSubject2_isDtl = "1";
+            String fieldIdOrgType2_isDtl = "1";
+            String fieldIdOrgId2_isDtl = "1";
+            String fieldIdOccurdate2_isDtl = "1";
+
+            String _subject_fieldName = "";
+            String _organizationtype_fieldName = "";
+            String _organizationid_fieldName = "";
+            String _budgetperiod_fieldName = "";
+
+            String _subject_fieldName2 = "";
+            String _organizationtype_fieldName2 = "";
+            String _organizationid_fieldName2 = "";
+            String _budgetperiod_fieldName2 = "";
+
+            String fieldIdAmount_isDtl = "1";
+            String _amount_fieldName = "";
+
+            if (_isEnableFnaWfE8) {
+                _subject_fieldName = Util.null2String(dataMap.get("fieldIdSubject_fieldName"));
+                _organizationtype_fieldName = Util.null2String(dataMap.get("fieldIdOrgType_fieldName"));
+                _organizationid_fieldName = Util.null2String(dataMap.get("fieldIdOrgId_fieldName"));
+                _budgetperiod_fieldName = Util.null2String(dataMap.get("fieldIdOccurdate_fieldName"));
+
+                fieldIdSubject_isDtl = Util.null2String(dataMap.get("fieldIdSubject_fieldId_isDtl"));
+                fieldIdOrgType_isDtl = Util.null2String(dataMap.get("fieldIdOrgType_fieldId_isDtl"));
+                fieldIdOrgId_isDtl = Util.null2String(dataMap.get("fieldIdOrgId_fieldId_isDtl"));
+                fieldIdOccurdate_isDtl = Util.null2String(dataMap.get("fieldIdOccurdate_fieldId_isDtl"));
+
+                _amount_fieldName = Util.null2String(dataMap.get("fieldIdAmount_fieldName"));
+                fieldIdAmount_isDtl = Util.null2String(dataMap.get("fieldIdAmount_fieldId_isDtl"));
+
+            } else if (_isEnableFnaChangeWf) {
+                _subject_fieldName = Util.null2String(dataMap.get("fieldIdSubject_fieldName"));
+                _organizationtype_fieldName = Util.null2String(dataMap.get("fieldIdOrgType_fieldName"));
+                _organizationid_fieldName = Util.null2String(dataMap.get("fieldIdOrgId_fieldName"));
+                _budgetperiod_fieldName = Util.null2String(dataMap.get("fieldIdOccurdate_fieldName"));
+
+                _subject_fieldName2 = Util.null2String(dataMap.get("fieldIdSubject2_fieldName"));
+                _organizationtype_fieldName2 = Util.null2String(dataMap.get("fieldIdOrgType2_fieldName"));
+                _organizationid_fieldName2 = Util.null2String(dataMap.get("fieldIdOrgId2_fieldName"));
+                _budgetperiod_fieldName2 = Util.null2String(dataMap.get("fieldIdOccurdate2_fieldName"));
+
+                fieldIdSubject_isDtl = Util.null2String(dataMap.get("fieldIdSubject_fieldId_isDtl"));
+                fieldIdOrgType_isDtl = Util.null2String(dataMap.get("fieldIdOrgType_fieldId_isDtl"));
+                fieldIdOrgId_isDtl = Util.null2String(dataMap.get("fieldIdOrgId_fieldId_isDtl"));
+                fieldIdOccurdate_isDtl = Util.null2String(dataMap.get("fieldIdOccurdate_fieldId_isDtl"));
+
+                fieldIdSubject2_isDtl = Util.null2String(dataMap.get("fieldIdSubject2_fieldId_isDtl"));
+                fieldIdOrgType2_isDtl = Util.null2String(dataMap.get("fieldIdOrgType2_fieldId_isDtl"));
+                fieldIdOrgId2_isDtl = Util.null2String(dataMap.get("fieldIdOrgId2_fieldId_isDtl"));
+                fieldIdOccurdate2_isDtl = Util.null2String(dataMap.get("fieldIdOccurdate2_fieldId_isDtl"));
+
+                _amount_fieldName = Util.null2String(dataMap.get("fieldIdAmount_fieldName"));
+                fieldIdAmount_isDtl = Util.null2String(dataMap.get("fieldIdAmount_fieldId_isDtl"));
+
+            } else if (_isEnableFnaShareWf) {
+                _subject_fieldName = Util.null2String(dataMap.get("fieldIdSubject_fieldName"));
+                _organizationtype_fieldName = Util.null2String(dataMap.get("fieldIdOrgType_fieldName"));
+                _organizationid_fieldName = Util.null2String(dataMap.get("fieldIdOrgId_fieldName"));
+                _budgetperiod_fieldName = Util.null2String(dataMap.get("fieldIdOccurdate_fieldName"));
+
+                _subject_fieldName2 = Util.null2String(dataMap.get("fieldIdSubject2_fieldName"));
+                _organizationtype_fieldName2 = Util.null2String(dataMap.get("fieldIdOrgType2_fieldName"));
+                _organizationid_fieldName2 = Util.null2String(dataMap.get("fieldIdOrgId2_fieldName"));
+                _budgetperiod_fieldName2 = Util.null2String(dataMap.get("fieldIdOccurdate2_fieldName"));
+
+                fieldIdSubject_isDtl = Util.null2String(dataMap.get("fieldIdSubject_fieldId_isDtl"));
+                fieldIdOrgType_isDtl = Util.null2String(dataMap.get("fieldIdOrgType_fieldId_isDtl"));
+                fieldIdOrgId_isDtl = Util.null2String(dataMap.get("fieldIdOrgId_fieldId_isDtl"));
+                fieldIdOccurdate_isDtl = Util.null2String(dataMap.get("fieldIdOccurdate_fieldId_isDtl"));
+
+                fieldIdSubject2_isDtl = Util.null2String(dataMap.get("fieldIdSubject2_fieldId_isDtl"));
+                fieldIdOrgType2_isDtl = Util.null2String(dataMap.get("fieldIdOrgType2_fieldId_isDtl"));
+                fieldIdOrgId2_isDtl = Util.null2String(dataMap.get("fieldIdOrgId2_fieldId_isDtl"));
+                fieldIdOccurdate2_isDtl = Util.null2String(dataMap.get("fieldIdOccurdate2_fieldId_isDtl"));
+
+                _amount_fieldName = Util.null2String(dataMap.get("fieldIdAmount_fieldName"));
+                fieldIdAmount_isDtl = Util.null2String(dataMap.get("fieldIdAmount_fieldId_isDtl"));
+
+            }
+
+            if ("".equals(_subject_fieldName2)) {
+                _subject_fieldName2 = _subject_fieldName;
+                fieldIdSubject2_isDtl = fieldIdSubject_isDtl;
+            }
+            if ("".equals(_organizationtype_fieldName2)) {
+                _organizationtype_fieldName2 = _organizationtype_fieldName;
+                fieldIdOrgType2_isDtl = fieldIdOrgType_isDtl;
+            }
+            if ("".equals(_organizationid_fieldName2)) {
+                _organizationid_fieldName2 = _organizationid_fieldName;
+                fieldIdOrgId2_isDtl = fieldIdOrgId_isDtl;
+            }
+            if ("".equals(_budgetperiod_fieldName2)) {
+                _budgetperiod_fieldName2 = _budgetperiod_fieldName;
+                fieldIdOccurdate2_isDtl = fieldIdOccurdate_isDtl;
+            }
+
+
+            //报销明细中是否包含了明细表字段
+            boolean dt1_haveIsDtlField = ("1".equals(fieldIdSubject_isDtl) || "1".equals(fieldIdOrgType_isDtl) || "1".equals(fieldIdOrgId_isDtl) || "1".equals(fieldIdOccurdate_isDtl));
+            boolean dt1_haveIsDtlField2 = ("1".equals(fieldIdSubject2_isDtl) || "1".equals(fieldIdOrgType2_isDtl) || "1".equals(fieldIdOrgId2_isDtl) || "1".equals(fieldIdOccurdate2_isDtl));
+
+
+            sql.append("select ");
+
+            if ("1".equals(fieldIdAmount_isDtl)) {
+                sql.append(" b.");
+            } else {
+                sql.append(" a.");
+            }
+            sql.append(_amount_fieldName + " applyamount, \n");
+
+            if ("1".equals(fieldIdOrgType_isDtl)) {
+                sql.append(" b.");
+            } else {
+                sql.append(" a.");
+            }
+            sql.append(_organizationtype_fieldName + " organizationtype, \n");
+
+            if ("1".equals(fieldIdOrgId_isDtl)) {
+                sql.append(" b.");
+            } else {
+                sql.append(" a.");
+            }
+            sql.append(_organizationid_fieldName + " organizationid, \n");
+
+            if ("1".equals(fieldIdSubject_isDtl)) {
+                sql.append(" b.");
+            } else {
+                sql.append(" a.");
+            }
+            sql.append(_subject_fieldName + " subject, \n");
+
+            if ("1".equals(fieldIdOccurdate_isDtl)) {
+                sql.append(" b.");
+            } else {
+                sql.append(" a.");
+            }
+            sql.append(_budgetperiod_fieldName + " budgetperiod, \n");
+
+
+            if ("1".equals(fieldIdOrgType2_isDtl)) {
+                sql.append(" b.");
+            } else {
+                sql.append(" a.");
+            }
+            sql.append(_organizationtype_fieldName2 + " organizationtype2, \n");
+
+            if ("1".equals(fieldIdOrgId2_isDtl)) {
+                sql.append(" b.");
+            } else {
+                sql.append(" a.");
+            }
+            sql.append(_organizationid_fieldName2 + " organizationid2, \n");
+
+            if ("1".equals(fieldIdSubject2_isDtl)) {
+                sql.append(" b.");
+            } else {
+                sql.append(" a.");
+            }
+            sql.append(_subject_fieldName2 + " subject2, \n");
+
+            if ("1".equals(fieldIdOccurdate2_isDtl)) {
+                sql.append(" b.");
+            } else {
+                sql.append(" a.");
+            }
+            sql.append(_budgetperiod_fieldName2 + " budgetperiod2, \n");
+
+            if (dt1_haveIsDtlField || dt1_haveIsDtlField2) {
+                sql.append(" b.id, b.id dtlId, a.requestid ");
+            } else {
+                sql.append(" a.requestid ");
+            }
+
+
+            sql.append(" from formtable_main_" + _formIdABS + " a \n");
+            if (dt1_haveIsDtlField || dt1_haveIsDtlField2) {
+                sql.append(" join formtable_main_" + _formIdABS + "_dt1 b on a.id = b.mainid \n");
+            }
+            sql.append(" where a.requestid = " + _requestId);
+
+            sql.append(" order by ");
+            if (_isEnableFnaChangeWf) {
+                if ("1".equals(fieldIdAmount_isDtl)) {
+                    sql.append(" b.");
+                } else {
+                    sql.append(" a.");
+                }
+                sql.append(_amount_fieldName + " asc,");
+            }
+            sql.append(" a.id asc");
+            if (dt1_haveIsDtlField || dt1_haveIsDtlField2) {
+                sql.append(", b.id asc");
+            }
+        }
+
+        return sql.toString();
+    }
+
+    /**
+     * 依据getSqlByFnaFieldType方法返回sql，获取当前requestid对应的所有预算相关业务逻辑数据
+     *
+     * @param _requestId           流程requestid
+     * @param _formId              流程表单id
+     * @param dataMap              预算类流程字段对应关系hm
+     * @param _isEnableFnaWfE8     是否是启用的Ecology8费控流程
+     * @param _isEnableFnaChangeWf 是否是启用的Ecology8预算变更流程
+     * @param _isEnableFnaShareWf  是否是启用的Ecology8预算分摊流程
+     * @return
+     */
+    public static HashMap<String, HashMap<String, String>> qryFnaExpenseRequestRecord(int _requestId, int _formId, Map<String, String> dataMap,
+                                                                                      boolean _isEnableFnaWfE8, boolean _isEnableFnaChangeWf, boolean _isEnableFnaShareWf) {
+        RecordSet rs_fna = new RecordSet();
+
+        HashMap<String, HashMap<String, String>> retHm = new HashMap<String, HashMap<String, String>>();
+
+        int _idx = 0;
+        String sql = FnaCommon.getSqlByFnaFieldType(_requestId, _formId, dataMap,
+                _isEnableFnaWfE8, _isEnableFnaChangeWf, _isEnableFnaShareWf);
+        if (!"".equals(sql)) {
+            rs_fna.executeSql(sql);
+            while (rs_fna.next()) {
+                HashMap<String, String> hm = new HashMap<String, String>();
+                String keyId = Util.null2String(rs_fna.getString("id")).trim();
+                if ("".equals(keyId)) {
+                    keyId = Util.null2String(rs_fna.getString("requestid")).trim();
+                }
+
+                hm.put("organizationtype", Util.null2String(rs_fna.getString("organizationtype")).trim());
+                hm.put("organizationid", Util.null2String(rs_fna.getString("organizationid")).trim());
+                hm.put("subject", Util.null2String(rs_fna.getString("subject")).trim());
+                hm.put("budgetperiod", Util.null2String(rs_fna.getString("budgetperiod")).trim());
+
+                hm.put("organizationtype2", Util.null2String(rs_fna.getString("organizationtype2")).trim());
+                hm.put("organizationid2", Util.null2String(rs_fna.getString("organizationid2")).trim());
+                hm.put("subject2", Util.null2String(rs_fna.getString("subject2")).trim());
+                hm.put("budgetperiod2", Util.null2String(rs_fna.getString("budgetperiod2")).trim());
+
+                retHm.put(keyId, hm);
+                retHm.put("key_idx>>" + _idx, hm);
+
+                _idx++;
+            }
+        }
+
+        return retHm;
+    }
+
+    /**
+     * 获取指定流程写入费用表的所有数据
+     *
+     * @param _requestId 流程requestid
+     * @return HashMap<sourceRequestidDtlId, HashMap < 费用表列明, 值>>
+     */
+    public static HashMap<String, HashMap<String, String>> qryFnaExpenseInfoAllRowRecordHm(int _requestId) {
+        RecordSet rs_fna = new RecordSet();
+
+        HashMap<String, HashMap<String, String>> retHm = new HashMap<String, HashMap<String, String>>();
+
+        //定位 数据库表名, 日期范围可能跨年
+        List<String> list_out_FnaExpenseInfo = new ArrayList<String>();
+        FnaSplitTableByYearComInfo.getFnaTableNameList(FnaTableNameEnum.FnaExpenseInfo, "1000-01-01", "9999-12-31", list_out_FnaExpenseInfo);
+        for (int aaaaaaaa = 0; aaaaaaaa < list_out_FnaExpenseInfo.size(); aaaaaaaa++) {
+            String tableName_FnaExpenseInfo = list_out_FnaExpenseInfo.get(aaaaaaaa);
+
+            String sql = "select a.id, a.organizationid, a.organizationtype, a.occurdate, a.subject, a.amount, a.occurdateOld, \n" +
+                    "	a.status, a.guid, \n" +
+                    "	a.requestid, a.requestidDtlId, a.sourceRequestid, a.sourceRequestidDtlId, a.sourceDtlNumber, \n" +
+                    "	a.budgetperiods, a.budgetperiodslist, a.isBudgetAutoMoveByMinusAmt, a.isBudgetAutoMove \n" +
+                    " from " + tableName_FnaExpenseInfo + " a where a.requestid = " + _requestId;
+            rs_fna.executeSql(sql);
+            while (rs_fna.next()) {
+                HashMap<String, String> hm = new HashMap<String, String>();
+                String keyId = Util.null2String(rs_fna.getString("sourceRequestidDtlId")).trim();//这个作为key是唯一的,不需要考虑多张数据表的情况
+                if (!"".equals(keyId)) {
+                    hm.put("id", Util.null2String(rs_fna.getString("id")).trim());
+                    hm.put("organizationid", Util.null2String(rs_fna.getString("organizationid")).trim());
+                    hm.put("organizationtype", Util.null2String(rs_fna.getString("organizationtype")).trim());
+                    hm.put("occurdate", Util.null2String(rs_fna.getString("occurdate")).trim());
+                    hm.put("subject", Util.null2String(rs_fna.getString("subject")).trim());
+                    hm.put("amount", Util.null2String(rs_fna.getString("amount")).trim());
+                    hm.put("occurdateOld", Util.null2String(rs_fna.getString("occurdateOld")).trim());
+
+                    hm.put("status", Util.null2String(rs_fna.getString("status")).trim());
+                    hm.put("guid", Util.null2String(rs_fna.getString("guid")).trim());
+
+                    hm.put("requestid", Util.null2String(rs_fna.getString("requestid")).trim());
+                    hm.put("requestidDtlId", Util.null2String(rs_fna.getString("requestidDtlId")).trim());
+                    hm.put("sourceRequestid", Util.null2String(rs_fna.getString("sourceRequestid")).trim());
+                    hm.put("sourceRequestidDtlId", Util.null2String(rs_fna.getString("sourceRequestidDtlId")).trim());
+                    hm.put("sourceDtlNumber", Util.null2String(rs_fna.getString("sourceDtlNumber")).trim());
+
+                    hm.put("budgetperiods", Util.null2String(rs_fna.getString("budgetperiods")).trim());
+                    hm.put("budgetperiodslist", Util.null2String(rs_fna.getString("budgetperiodslist")).trim());
+                    hm.put("isBudgetAutoMoveByMinusAmt", Util.null2String(rs_fna.getString("isBudgetAutoMoveByMinusAmt")).trim());
+                    hm.put("isBudgetAutoMove", Util.null2String(rs_fna.getString("isBudgetAutoMove")).trim());
+
+                    retHm.put(keyId, hm);
+                }
+            }
+        }//for end
+
+        return retHm;
+    }
+
+    /**
+     * 获取指定流程的冲销/还款数据
+     *
+     * @param requestid 流程requestid
+     * @param _formId   流程表单id
+     * @param dataMap   预算类流程字段对应关系hm
+     * @return
+     */
+    public static HashMap<String, HashMap<String, String>> qryFnaRepaymentRequestRecord(int requestid, int _formId, Map<String, String> dataMap) {
+        RecordSet rs_fna = new RecordSet();
+
+        HashMap<String, HashMap<String, String>> retHm = new HashMap<String, HashMap<String, String>>();
+
+        String dt2_fieldIdJklc_fieldName = Util.null2String(dataMap.get("dt2_fieldIdJklc_fieldName"));
+        String dt2_fieldIdDnxh_fieldName = Util.null2String(dataMap.get("dt2_fieldIdDnxh_fieldName"));
+        String dt2_fieldIdJkje_fieldName = Util.null2String(dataMap.get("dt2_fieldIdJkje_fieldName"));
+        String dt2_fieldIdYhje_fieldName = Util.null2String(dataMap.get("dt2_fieldIdYhje_fieldName"));
+        String dt2_fieldIdSpzje_fieldName = Util.null2String(dataMap.get("dt2_fieldIdSpzje_fieldName"));
+        String dt2_fieldIdWhje_fieldName = Util.null2String(dataMap.get("dt2_fieldIdWhje_fieldName"));
+
+        StringBuffer borrowRequestIds = new StringBuffer();
+
+        int formidAbs = Math.abs(_formId);
+        HashMap<String, HashMap<String, String>> jklcsHm = new HashMap<String, HashMap<String, String>>();
+
+        StringBuffer sql = new StringBuffer();
+        sql.append("select dt.id dtlId ");
+        if (!"".equals(dt2_fieldIdJklc_fieldName)) {
+            sql.append(", dt." + dt2_fieldIdJklc_fieldName + " jklc ");
+        }
+        if (!"".equals(dt2_fieldIdDnxh_fieldName)) {
+            sql.append(", dt." + dt2_fieldIdDnxh_fieldName + " dnxh ");
+        }
+        if (!"".equals(dt2_fieldIdJkje_fieldName)) {
+            sql.append(", dt." + dt2_fieldIdJkje_fieldName + " jkje ");
+        }
+        if (!"".equals(dt2_fieldIdYhje_fieldName)) {
+            sql.append(", dt." + dt2_fieldIdYhje_fieldName + " yhje ");
+        }
+        if (!"".equals(dt2_fieldIdSpzje_fieldName)) {
+            sql.append(", dt." + dt2_fieldIdSpzje_fieldName + " spzje ");
+        }
+        if (!"".equals(dt2_fieldIdWhje_fieldName)) {
+            sql.append(", dt." + dt2_fieldIdWhje_fieldName + " whje ");
+        }
+        sql.append(" from formtable_main_" + formidAbs + "_dt2 dt ");
+        sql.append(" join formtable_main_" + formidAbs + " main on main.id=dt.mainid ");
+        sql.append(" where main.requestId=" + requestid);
+        rs_fna.executeSql(sql.toString());
+        while (rs_fna.next()) {
+            HashMap<String, String> hm = new HashMap<String, String>();
+            String keyId = Util.null2String(rs_fna.getString("dtlId")).trim();
+
+            String jklc = Util.null2String(rs_fna.getString("jklc")).trim();
+            String dnxh = Util.null2String(rs_fna.getString("dnxh")).trim();
+            String jkje = Util.null2String(rs_fna.getString("jkje")).trim();
+            String yhje = Util.null2String(rs_fna.getString("yhje")).trim();
+            String spzje = Util.null2String(rs_fna.getString("spzje")).trim();
+            String whje = Util.null2String(rs_fna.getString("whje")).trim();
+
+            String dnxhShowName = "";
+
+            int i_jklc = Util.getIntValue(jklc);
+            int i_dnxh = Util.getIntValue(dnxh);
+
+            if (i_jklc > 0 && i_dnxh > 0) {
+                if (!jklcsHm.containsKey(jklc)) {
+                    FnaCommon.getRequestBorrowDnxhShowName(i_jklc, i_dnxh, jklcsHm);
+                }
+                HashMap<String, String> _jklcDtlIdxHm = jklcsHm.get(jklc);
+                if (_jklcDtlIdxHm != null) {
+                    dnxhShowName = Util.null2String(_jklcDtlIdxHm.get(dnxh)).trim();
+                }
+            }
+
+            if ("".equals(dnxhShowName)) {
+                dnxhShowName = dnxh;
+            }
+
+            hm.put("jklc", jklc);
+            hm.put("dnxh", dnxh);
+            hm.put("dnxhShowName", dnxhShowName);
+            hm.put("jkje", jkje);
+            hm.put("yhje", yhje);
+            hm.put("spzje", spzje);
+            hm.put("whje", whje);
+
+            retHm.put(keyId, hm);
+
+            if (i_jklc > 0) {
+                if (borrowRequestIds.length() > 0) {
+                    borrowRequestIds.append(",");
+                }
+                borrowRequestIds.append(i_jklc);
+            }
+        }
+
+        if (borrowRequestIds.length() > 0) {
+            String sql1 = "select SUM(CASE WHEN (a.recordType='borrow') THEN a.amountBorrow ELSE 0.0 END) jkje, \n" +
+                    "	SUM(CASE WHEN (a.recordType='reverse') THEN a.amountBorrow ELSE 0.0 END) yhje, \n" +
+                    "	SUM(CASE WHEN (a.recordType='freezeBorrow') THEN a.amountBorrow ELSE 0.0 END) spzje, \n" +
+                    "	SUM(CASE WHEN (a.recordType='borrow') THEN a.amountBorrow ELSE (a.amountBorrow * -1) END) whje, \n" +
+                    "	a.borrowRequestId, a.borrowRequestIdDtlId \n" +
+                    " from FnaBorrowInfo a \n" +
+                    " where a.borrowRequestId in (" + borrowRequestIds.toString() + ") \n" +
+                    " group by a.borrowRequestId, a.borrowRequestIdDtlId";
+            rs_fna.executeSql(sql1);
+            while (rs_fna.next()) {
+                HashMap<String, String> hm = new HashMap<String, String>();
+                String keyId = Util.null2String("borrowRequestIdInfo_" + rs_fna.getString("borrowRequestId")).trim() + "_" + Util.null2String(rs_fna.getString("borrowRequestIdDtlId")).trim();
+
+                String jkje = Util.null2String(rs_fna.getString("jkje")).trim();
+                String yhje = Util.null2String(rs_fna.getString("yhje")).trim();
+                String spzje = Util.null2String(rs_fna.getString("spzje")).trim();
+                String whje = Util.null2String(rs_fna.getString("whje")).trim();
+
+                hm.put("jkje", jkje);
+                hm.put("yhje", yhje);
+                hm.put("spzje", spzje);
+                hm.put("whje", whje);
+
+                retHm.put(keyId, hm);
+            }
+        }
+
+        return retHm;
+    }
+
+    /**
+     * 获取指定流程的预付款相关数据
+     *
+     * @param requestid 流程requestid
+     * @param _formId   流程表单id
+     * @param dataMap   预算类流程字段对应关系hm
+     * @return
+     */
+    public static HashMap<String, HashMap<String, String>> qryFnaReverseAdvanceRequestRecord(int requestid, int _formId, Map<String, String> dataMap) {
+        RecordSet rs_fna = new RecordSet();
+
+        HashMap<String, HashMap<String, String>> retHm = new HashMap<String, HashMap<String, String>>();
+
+        String dt4_fieldIdYfklc_fieldName = Util.null2String(dataMap.get("dt4_fieldIdYfklc_fieldName"));
+        String dt4_fieldIdDnxh_fieldName = Util.null2String(dataMap.get("dt4_fieldIdDnxh_fieldName"));
+        String dt4_fieldIdYfkje_fieldName = Util.null2String(dataMap.get("dt4_fieldIdYfkje_fieldName"));
+        String dt4_fieldIdYhje_fieldName = Util.null2String(dataMap.get("dt4_fieldIdYhje_fieldName"));
+        String dt4_fieldIdSpzje_fieldName = Util.null2String(dataMap.get("dt4_fieldIdSpzje_fieldName"));
+        String dt4_fieldIdWhje_fieldName = Util.null2String(dataMap.get("dt4_fieldIdWhje_fieldName"));
+
+        StringBuffer advanceRequestIds = new StringBuffer();
+
+        int formidAbs = Math.abs(_formId);
+        HashMap<String, HashMap<String, String>> YfklcsHm = new HashMap<String, HashMap<String, String>>();
+
+        StringBuffer sql = new StringBuffer();
+        sql.append("select dt.id dtlId ");
+        if (!"".equals(dt4_fieldIdYfklc_fieldName)) {
+            sql.append(", dt." + dt4_fieldIdYfklc_fieldName + " Yfklc ");
+        }
+        if (!"".equals(dt4_fieldIdDnxh_fieldName)) {
+            sql.append(", dt." + dt4_fieldIdDnxh_fieldName + " dnxh ");
+        }
+        if (!"".equals(dt4_fieldIdYfkje_fieldName)) {
+            sql.append(", dt." + dt4_fieldIdYfkje_fieldName + " Yfkje ");
+        }
+        if (!"".equals(dt4_fieldIdYhje_fieldName)) {
+            sql.append(", dt." + dt4_fieldIdYhje_fieldName + " yhje ");
+        }
+        if (!"".equals(dt4_fieldIdSpzje_fieldName)) {
+            sql.append(", dt." + dt4_fieldIdSpzje_fieldName + " spzje ");
+        }
+        if (!"".equals(dt4_fieldIdWhje_fieldName)) {
+            sql.append(", dt." + dt4_fieldIdWhje_fieldName + " whje ");
+        }
+        sql.append(" from formtable_main_" + formidAbs + "_dt4 dt ");
+        sql.append(" join formtable_main_" + formidAbs + " main on main.id=dt.mainid ");
+        sql.append(" where main.requestId=" + requestid);
+        rs_fna.executeSql(sql.toString());
+        while (rs_fna.next()) {
+            HashMap<String, String> hm = new HashMap<String, String>();
+            String keyId = Util.null2String(rs_fna.getString("dtlId")).trim();
+
+            String Yfklc = Util.null2String(rs_fna.getString("Yfklc")).trim();
+            String dnxh = Util.null2String(rs_fna.getString("dnxh")).trim();
+            String Yfkje = Util.null2String(rs_fna.getString("Yfkje")).trim();
+            String yhje = Util.null2String(rs_fna.getString("yhje")).trim();
+            String spzje = Util.null2String(rs_fna.getString("spzje")).trim();
+            String whje = Util.null2String(rs_fna.getString("whje")).trim();
+
+            String dnxhShowName = "";
+
+            int i_Yfklc = Util.getIntValue(Yfklc);
+            int i_dnxh = Util.getIntValue(dnxh);
+
+            if (i_Yfklc > 0 && i_dnxh > 0) {
+                if (!YfklcsHm.containsKey(Yfklc)) {
+                    FnaCommon.getRequestAdvanceDnxhShowName(i_Yfklc, i_dnxh, YfklcsHm);
+                }
+                HashMap<String, String> _YfklcDtlIdxHm = YfklcsHm.get(Yfklc);
+                if (_YfklcDtlIdxHm != null) {
+                    dnxhShowName = Util.null2String(_YfklcDtlIdxHm.get(dnxh)).trim();
+                }
+            }
+
+            if ("".equals(dnxhShowName)) {
+                dnxhShowName = dnxh;
+            }
+
+            hm.put("Yfklc", Yfklc);
+            hm.put("dnxh", dnxh);
+            hm.put("dnxhShowName", dnxhShowName);
+            hm.put("Yfkje", Yfkje);
+            hm.put("yhje", yhje);
+            hm.put("spzje", spzje);
+            hm.put("whje", whje);
+
+            retHm.put(keyId, hm);
+
+            if (i_Yfklc > 0) {
+                if (advanceRequestIds.length() > 0) {
+                    advanceRequestIds.append(",");
+                }
+                advanceRequestIds.append(i_Yfklc);
+            }
+        }
+
+        if (advanceRequestIds.length() > 0) {
+            String sql1 = "select SUM(CASE WHEN (a.recordType='advance') THEN a.amountAdvance ELSE 0.0 END) Yfkje, \n" +
+                    "	SUM(CASE WHEN (a.recordType='reverse') THEN a.amountAdvance ELSE 0.0 END) yhje, \n" +
+                    "	SUM(CASE WHEN (a.recordType='freezeAdvance') THEN a.amountAdvance ELSE 0.0 END) spzje, \n" +
+                    "	SUM(CASE WHEN (a.recordType='advance') THEN a.amountAdvance ELSE (a.amountAdvance * -1." +
+                    ") END) whje, \n" +
+                    "	a.advanceRequestId, a.advanceRequestIdDtlId \n" +
+                    " from FnaAdvanceInfo a \n" +
+                    " where a.advanceRequestId in (" + advanceRequestIds.toString() + ") \n" +
+                    " group by a.advanceRequestId, a.advanceRequestIdDtlId";
+            rs_fna.executeSql(sql1);
+            while (rs_fna.next()) {
+                HashMap<String, String> hm = new HashMap<String, String>();
+                String keyId = Util.null2String("advanceRequestIdInfo_" + rs_fna.getString("advanceRequestId")).trim() + "_" + Util.null2String(rs_fna.getString("advanceRequestIdDtlId")).trim();
+
+                String Yfkje = Util.null2String(rs_fna.getString("Yfkje")).trim();
+                String yhje = Util.null2String(rs_fna.getString("yhje")).trim();
+                String spzje = Util.null2String(rs_fna.getString("spzje")).trim();
+                String whje = Util.null2String(rs_fna.getString("whje")).trim();
+
+                hm.put("Yfkje", Yfkje);
+                hm.put("yhje", yhje);
+                hm.put("spzje", spzje);
+                hm.put("whje", whje);
+
+                retHm.put(keyId, hm);
+            }
+        }
+
+        return retHm;
+    }
+
+    /**
+     * 获取单内序号对应显示名称
+     *
+     * @param jklc 流程reqid
+     * @param dhxh 单内序号
+     * @return 单内序号对应显示名称
+     */
+    public static String getRequestAdvanceDnxhShowName(int jklc, int dhxh) {
+        return FnaCommon.getRequestAdvanceDnxhShowName(jklc, dhxh, null);
+    }
+
+    /**
+     * 获取单内序号对应显示名称
+     *
+     * @param jklc    流程reqid
+     * @param dhxh    单内序号
+     * @param jklcsHm 输出参数
+     * @return 单内序号对应显示名称
+     */
+    public static String getRequestAdvanceDnxhShowName(int jklc, int dhxh,
+                                                       HashMap<String, HashMap<String, String>> jklcsHm) {
+        return FnaCommon.getRequestBorrowDnxhShowName(jklc, dhxh, jklcsHm);
+    }
+
+    /**
+     * 获取单内序号对应显示名称
+     *
+     * @param jklc 流程reqid
+     * @param dhxh 单内序号
+     * @return 单内序号对应显示名称
+     */
+    public static String getRequestBorrowDnxhShowName(int jklc, int dhxh) {
+        return FnaCommon.getRequestBorrowDnxhShowName(jklc, dhxh, null);
+    }
+
+    /**
+     * 获取单内序号对应显示名称
+     *
+     * @param jklc    流程reqid
+     * @param dhxh    单内序号
+     * @param jklcsHm 输出参数
+     * @return 单内序号对应显示名称
+     */
+    public static String getRequestBorrowDnxhShowName(int jklc, int dhxh,
+                                                      HashMap<String, HashMap<String, String>> jklcsHm) {
+        RecordSet rs_fna = new RecordSet();
+        String spanValue = "";
+        if (jklc > 0 && dhxh > 0) {
+            boolean _flag1 = false;
+            HashMap<String, String> _jklcDtlIdxHm = null;
+            if (jklcsHm != null) {
+                if (jklcsHm.containsKey(jklc + "")) {
+                    _jklcDtlIdxHm = jklcsHm.get(jklc + "");
+                    _flag1 = true;
+                } else {
+                    _jklcDtlIdxHm = new HashMap<String, String>();
+                    jklcsHm.put(jklc + "", _jklcDtlIdxHm);
+                }
+            }
+
+            if (_flag1) {
+                _flag1 = _jklcDtlIdxHm != null;
+            }
+
+            if (_flag1) {
+                spanValue = Util.null2String(_jklcDtlIdxHm.get(dhxh + "")).trim();
+            } else {
+                String sql = "select b.formid  \n" +
+                        " from workflow_requestbase a \n" +
+                        " join workflow_base b on a.workflowid = b.id \n" +
+                        " where a.requestid = " + jklc;
+                rs_fna.executeSql(sql);
+                if (rs_fna.next()) {
+                    int jklcFormid = Util.getIntValue(rs_fna.getString("formid"));
+                    int jklcFormidAbs = Math.abs(jklcFormid);
+
+                    int dtlIdx = 0;
+                    sql = "select dt.id dtlId " +
+                            " from formtable_main_" + jklcFormidAbs + "_dt1 dt " +
+                            " join formtable_main_" + jklcFormidAbs + " main on main.id=dt.mainid " +
+                            " where main.requestId=" + jklc + " " +
+                            " order by dt.id asc";
+                    rs_fna.executeSql(sql);
+                    while (rs_fna.next()) {
+                        dtlIdx++;
+                        int dtlId = rs_fna.getInt("dtlId");
+                        if (_jklcDtlIdxHm != null) {
+                            _jklcDtlIdxHm.put(dtlId + "", dtlIdx + "");
+                            jklcsHm.put(jklc + "", _jklcDtlIdxHm);
+                        }
+                        if (dtlId == dhxh) {
+                            spanValue = dtlIdx + "";
+                        }
+                    }
+                }
+            }
+        }
+        return spanValue;
+    }
+
+    /**
+     * 生成定义成了报销流程的流程表单的数据的查询sql, 适用于明细表1报销的情况
+     *
+     * @param requestid                          流程reqid
+     * @param formidAbs                          流程表单id绝对值
+     * @param dt1_haveIsDtlField                 字段中是否包含了至少一个明细表字段
+     * @param fieldIdOrgType_isDtl               承担主体类型是否是明细表字段
+     * @param fieldNameOrgType                   承担主体类型字段名
+     * @param fieldIdOrgId_isDtl                 承担主体是否是明细表字段
+     * @param fieldNameOrgId                     承担主体字段名
+     * @param fieldIdSubject_isDtl               科目是否是明细表字段
+     * @param fieldNameSubject                   科目字段名
+     * @param fieldIdOccurdate_isDtl             费用日期是否是明细表字段
+     * @param fieldNameOccurdate                 费用日期字段名
+     * @param fieldIdAmount_isDtl                报销金额是否是明细表字段
+     * @param fieldNameAmount                    报销金额字段名
+     * @param fieldNameRequestidApplication      相关费用预申请流程是否是明细表字段
+     * @param fieldNameCloseRequestidApplication 相关费用预申请流程字段名
+     * @param isDebug                            是否打印调试日期
+     * @param isNewWf
+     * @param fieldIdReqId_isDtl
+     * @param fieldNameReqId
+     * @param fieldIdReqDtId_isDtl
+     * @param fieldNameReqDtId
+     * @return SQL
+     */
+    public static String getFnaWf8Sql(int requestid, int formidAbs, boolean dt1_haveIsDtlField,
+                                      String fieldIdOrgType_isDtl, String fieldNameOrgType,
+                                      String fieldIdOrgId_isDtl, String fieldNameOrgId,
+                                      String fieldIdSubject_isDtl, String fieldNameSubject,
+                                      String fieldIdOccurdate_isDtl, String fieldNameOccurdate,
+                                      String fieldIdAmount_isDtl, String fieldNameAmount,
+                                      String fieldNameRequestidApplication, String fieldNameCloseRequestidApplication,
+                                      boolean isDebug, boolean isNewWf,
+                                      String fieldIdReqId_isDtl, String fieldNameReqId,
+                                      String fieldIdReqDtId_isDtl, String fieldNameReqDtId) {
+
+        StringBuffer querySql = new StringBuffer("select ");
+
+        if ("1".equals(fieldIdOrgType_isDtl)) {
+            querySql.append(" dt.");
+        } else {
+            querySql.append(" main.");
+        }
+        querySql.append(fieldNameOrgType + " organizationtype, ");
+
+        if ("1".equals(fieldIdOrgId_isDtl)) {
+            querySql.append(" dt.");
+        } else {
+            querySql.append(" main.");
+        }
+        querySql.append(fieldNameOrgId + " organizationid, ");
+
+        if ("1".equals(fieldIdSubject_isDtl)) {
+            querySql.append(" dt.");
+        } else {
+            querySql.append(" main.");
+        }
+        querySql.append(fieldNameSubject + " subject, ");
+
+        if ("1".equals(fieldIdOccurdate_isDtl)) {
+            querySql.append(" dt.");
+        } else {
+            querySql.append(" main.");
+        }
+        querySql.append(fieldNameOccurdate + " budgetperiod, ");
+
+        if ("1".equals(fieldIdAmount_isDtl)) {
+            querySql.append(" dt.");
+        } else {
+            querySql.append(" main.");
+        }
+        querySql.append(fieldNameAmount + " applyamount, ");
+
+        if (isNewWf) {
+            if ("1".equals(fieldIdReqId_isDtl)) {
+                querySql.append(" dt.");
+            } else {
+                querySql.append(" main.");
+            }
+            querySql.append(fieldNameReqId + " ReqId, ");
+
+            if ("1".equals(fieldIdReqDtId_isDtl)) {
+                querySql.append(" dt.");
+            } else {
+                querySql.append(" main.");
+            }
+            querySql.append(fieldNameReqDtId + " ReqDtId, ");
+        }
+
+        if (!"".equals(fieldNameRequestidApplication)) {
+            querySql.append(" main." + fieldNameRequestidApplication + " fysqlc, ");
+        }
+
+        if (!"".equals(fieldNameCloseRequestidApplication)) {
+            querySql.append(" main." + fieldNameCloseRequestidApplication + " sfbxwc, ");
+        }
+
+        if (dt1_haveIsDtlField) {
+            querySql.append(" dt.id dtlId ");
+        } else {
+            querySql.append(" -987654321 dtlId ");
+        }
+
+        querySql.append(" from formtable_main_" + formidAbs + " main ");
+        if (dt1_haveIsDtlField) {
+            querySql.append(" join formtable_main_" + formidAbs + "_dt1 dt on main.id=dt.mainid ");
+        }
+        querySql.append(" where main.requestId=" + requestid);
+        if (dt1_haveIsDtlField) {
+            querySql.append(" order by dt.id asc ");
+        }
+        if (isDebug) {
+            new BaseBean().writeLog("FnaCommon -> getFnaWf8Sql -> querySql=" + querySql.toString());
+        }
+
+        return querySql.toString();
+    }
+
+
+    /**
+     * 生成定义成了报销流程的流程表单的数据的查询sql, 适用于明细表1报销的情况
+     *
+     * @param requestid                          流程reqid
+     * @param formidAbs                          流程表单id绝对值
+     * @param dt1_haveIsDtlField                 字段中是否包含了至少一个明细表字段
+     * @param fieldIdOrgType_isDtl               承担主体类型是否是明细表字段
+     * @param fieldNameOrgType                   承担主体类型字段名
+     * @param fieldIdOrgId_isDtl                 承担主体是否是明细表字段
+     * @param fieldNameOrgId                     承担主体字段名
+     * @param fieldIdSubject_isDtl               科目是否是明细表字段
+     * @param fieldNameSubject                   科目字段名
+     * @param fieldIdOccurdate_isDtl             费用日期是否是明细表字段
+     * @param fieldNameOccurdate                 费用日期字段名
+     * @param fieldIdAmount_isDtl                报销金额是否是明细表字段
+     * @param fieldNameAmount                    报销金额字段名
+     * @param fieldNameRequestidApplication      相关费用预申请流程是否是明细表字段
+     * @param fieldNameCloseRequestidApplication 相关费用预申请流程字段名
+     * @param isDebug                            是否打印调试日期
+     * @return SQL
+     */
+    public static String getFnaWf8Sql(int requestid, int formidAbs, boolean dt1_haveIsDtlField,
+                                      String fieldIdOrgType_isDtl, String fieldNameOrgType,
+                                      String fieldIdOrgId_isDtl, String fieldNameOrgId,
+                                      String fieldIdSubject_isDtl, String fieldNameSubject,
+                                      String fieldIdOccurdate_isDtl, String fieldNameOccurdate,
+                                      String fieldIdAmount_isDtl, String fieldNameAmount,
+                                      String fieldNameRequestidApplication, String fieldNameCloseRequestidApplication,
+                                      boolean isDebug) {
+
+
+        return FnaCommon.getFnaWf8Sql(requestid, formidAbs, dt1_haveIsDtlField,
+                fieldIdOrgType_isDtl, fieldNameOrgType,
+                fieldIdOrgId_isDtl, fieldNameOrgId,
+                fieldIdSubject_isDtl, fieldNameSubject,
+                fieldIdOccurdate_isDtl, fieldNameOccurdate,
+                fieldIdAmount_isDtl, fieldNameAmount,
+                fieldNameRequestidApplication, fieldNameCloseRequestidApplication,
+                isDebug, false,
+                null, null,
+                null, null);
+    }
+
+
+    /**
+     * 生成定义成了报销流程的流程表单的数据的查询sql, 适用于多明细表报销的情况
+     *
+     * @param requestid 流程reqid
+     * @param formidAbs 流程表单id绝对值
+     * @param isDebug   是否打印调试日期
+     * @return SQL
+     */
+    public static String getFnaWf8MultiSql(int requestid, int formidAbs, boolean isDebug) {
+        StringBuffer querySql = new StringBuffer();
+        boolean dt1_haveIsDtlField = true;
+
+        RecordSet rs = new RecordSet();
+        rs.executeQuery("select a.workflowid from workflow_requestbase a where a.requestid = ?", requestid);
+        if (rs.next()) {
+            int workflowid = rs.getInt("workflowid");
+
+            FnaWfMultiSet fnaWfMultiSet = new FnaWfMultiSet(workflowid, 0, 0);
+            HashMap<String, FnaWfMultiSetFieldInfo> fieldInfoHm = fnaWfMultiSet.getFieldInfoHm();
+            List<String> detailTableList = fnaWfMultiSet.getDetailTableList();
+            int detailTableList_len = detailTableList.size();
+
+            new BaseBean().writeLog("detailTableList_len:" + detailTableList_len);
+
+            for (int i = 0; i < detailTableList_len; i++) {
+                String detailTable = detailTableList.get(i);
+                FnaWfMultiSetFieldInfo fnaWfMultiSetFieldInfo = fieldInfoHm.get(detailTable);
+
+                if (i > 0) {
+                    querySql.append("\r\n UNION ALL \r\n");
+                }
+
+                querySql.append(" select ");
+
+                String zd_orgtype = "";
+                if (fnaWfMultiSetFieldInfo.getFkCdztlx_dtlNum() > 0) {
+                    //querySql.append(" dt.");
+                    zd_orgtype = "dt." + fnaWfMultiSetFieldInfo.getFkCdztlx_fieldName();
+                } else {
+                    //querySql.append(" main.");
+                    zd_orgtype = "main." + fnaWfMultiSetFieldInfo.getFkCdztlx_fieldName();
+                }
+                //querySql.append(fnaWfMultiSetFieldInfo.getFkCdztlx_fieldName()+" organizationtype, ");
+                querySql.append(zd_orgtype + " organizationtype, ");
+
+                //拼接 承担主体ID 的 case when 语句 start
+                String orgid_Case_When = " (CASE ";
+                //承担主体 - 人员 - 字段英文名称
+                String zd_orgid = fnaWfMultiSetFieldInfo.getFkBxgr_fieldName();
+                if (fnaWfMultiSetFieldInfo.getFkBxgr_dtlNum() > 0 && zd_orgid != null && !"".equals(zd_orgid)) {
+                    orgid_Case_When += (" WHEN " + zd_orgtype + " = 0 THEN dt." + zd_orgid);
+                } else if (zd_orgid != null && !"".equals(zd_orgid)) {
+                    orgid_Case_When += (" WHEN " + zd_orgtype + " = 0 THEN main." + zd_orgid);
+                }
+                //承担主体 - 部门 - 字段英文名称
+                zd_orgid = fnaWfMultiSetFieldInfo.getFkBxbm_fieldName();
+                if (fnaWfMultiSetFieldInfo.getFkBxbm_dtlNum() > 0 && zd_orgid != null && !"".equals(zd_orgid)) {
+                    orgid_Case_When += (" WHEN " + zd_orgtype + " = 1 THEN dt." + zd_orgid);
+                } else if (zd_orgid != null && !"".equals(zd_orgid)) {
+                    orgid_Case_When += (" WHEN " + zd_orgtype + " = 1 THEN main." + zd_orgid);
+                }
+                //承担主体 - 分部 - 字段英文名称
+                zd_orgid = fnaWfMultiSetFieldInfo.getFkBxfb_fieldName();
+                if (fnaWfMultiSetFieldInfo.getFkBxfb_dtlNum() > 0 && zd_orgid != null && !"".equals(zd_orgid)) {
+                    orgid_Case_When += (" WHEN " + zd_orgtype + " = 2 THEN dt." + zd_orgid);
+                } else if (zd_orgid != null && !"".equals(zd_orgid)) {
+                    orgid_Case_When += (" WHEN " + zd_orgtype + " = 2 THEN main." + zd_orgid);
+                }
+                //承担主体 - 成本中心 - 字段英文名称
+                zd_orgid = fnaWfMultiSetFieldInfo.getFkBxcbzx_fieldName();
+                if (fnaWfMultiSetFieldInfo.getFkBxcbzx_dtlNum() > 0 && zd_orgid != null && !"".equals(zd_orgid)) {
+                    orgid_Case_When += (" WHEN " + zd_orgtype + " = 3 THEN dt." + zd_orgid);
+                } else if (zd_orgid != null && !"".equals(zd_orgid)) {
+                    orgid_Case_When += (" WHEN " + zd_orgtype + " = 3 THEN main." + zd_orgid);
+                }
+                orgid_Case_When += " ELSE -1 END) ";
+                querySql.append(orgid_Case_When + " organizationid, ");
+                //拼接 承担主体ID 的 case when 语句 end
+
+                if (fnaWfMultiSetFieldInfo.getFkBxkm_dtlNum() > 0) {
+                    querySql.append(" dt.");
+                } else {
+                    querySql.append(" main.");
+                }
+                querySql.append(fnaWfMultiSetFieldInfo.getFkBxkm_fieldName() + " subject, ");
+
+                if (fnaWfMultiSetFieldInfo.getFkFyrq_dtlNum() > 0) {
+                    querySql.append(" dt.");
+                } else {
+                    querySql.append(" main.");
+                }
+                querySql.append(fnaWfMultiSetFieldInfo.getFkFyrq_fieldName() + " budgetperiod, ");
+
+                if (fnaWfMultiSetFieldInfo.getFkBxje_dtlNum() > 0) {
+                    querySql.append(" dt.");
+                } else {
+                    querySql.append(" main.");
+                }
+                querySql.append(fnaWfMultiSetFieldInfo.getFkBxje_fieldName() + " applyamount, ");
+
+//				if(!"".equals(fieldNameRequestidApplication)){
+//					querySql.append(" main."+fieldNameRequestidApplication+" fysqlc, ");
+//				}
+//
+//				if(!"".equals(fieldNameCloseRequestidApplication)){
+//					querySql.append(" main."+fieldNameCloseRequestidApplication+" sfbxwc, ");
+//				}
+
+                if (dt1_haveIsDtlField) {
+                    querySql.append(" dt.id dtlId, '" + StringEscapeUtils.escapeSql(detailTable) + "' detailtable ");
+                } else {
+                    querySql.append(" -987654321 dtlId, '' detailtable ");
+                }
+
+                querySql.append(" from formtable_main_" + formidAbs + " main ");
+                if (dt1_haveIsDtlField) {
+                    querySql.append(" join " + detailTable + " dt on main.id=dt.mainid ");
+                }
+                querySql.append(" where main.requestId=" + requestid + " ");
+            }
+        }
+        if (true) {
+            new BaseBean().writeLog(querySql.toString());
+        }
+
+        return querySql.toString();
+    }
+
+    /**
+     * 获取流程相关费控信息
+     *
+     * @param _workflowid
+     * @return 是否是系统表单的费控流程：key：isEnableFnaWfSysWf；value：true、false；<br>
+     * 是否是启用的Ecology7费控流程：key：isEnableFnaWfE7；value：true、false；<br>
+     * 是否是启用的Ecology8费控流程：key：isEnableFnaWfE8；value：true、false；<br>
+     * 流程表单id：key：formId；value：表单id；<br>
+     * 流程是否新表单：key：isbill；value：0、1；
+     */
+    public static HashMap<String, String> getIsEnableFnaWfHm(int _workflowid) {
+        BaseBean _bb = new BaseBean();
+        RecordSet rs_fna = new RecordSet();
+
+        HashMap<String, String> retHm = new HashMap<String, String>();
+
+        //是否是系统表单的费控流程
+        retHm.put("isEnableFnaWfSysWf", "false");
+        int _formId = 0;
+        int _isbill = -1;
+        String sqlFna1 = "select a.formid, a.isbill from workflow_base a where a.id = " + _workflowid;
+        rs_fna.executeSql(sqlFna1);
+        if (rs_fna.next()) {
+            _formId = Util.getIntValue(rs_fna.getString("formid"), 0);
+            _isbill = Util.getIntValue(rs_fna.getString("isbill"), 0);
+        }
+        retHm.put("formId", _formId + "");
+        retHm.put("isbill", _isbill + "");
+        //系统表单：报销申请单、付款申请单，也是显示显示预算信息的，需要特殊处理
+        if ((_formId == 158 || _formId == 156) && _isbill == 1) {
+            retHm.put("isEnableFnaWfSysWf", "true");
+        }
+
+        //是否是启用的Ecology7费控流程
+        retHm.put("isEnableFnaWfE7", "false");
+        //ecology7中配置的自定义表单费控流程的workflowId，多个id之间使用英文半角,号分隔
+        String ecology7_FnaWfIds = "";
+        try {
+            ecology7_FnaWfIds = Util.null2String(new String(Util.null2String(_bb.getPropValue("Ecology7_FnaWf", "ecology7_FnaWfIds")).getBytes("ISO-8859-1"), "gbk")).trim();
+        } catch (Exception e) {
+        }
+        if (!"".equals(ecology7_FnaWfIds) && _workflowid > 0 && ("," + ecology7_FnaWfIds + ",").indexOf("," + _workflowid + ",") >= 0) {
+            retHm.put("isEnableFnaWfE7", "true");
+        }
+
+        //是否是启用的Ecology8费控流程
+        retHm.put("isEnableFnaWfE8", "false");
+        //是否是启用的Ecology8借款费控流程
+        retHm.put("isEnableFnaBorrowWf", "false");
+        //是否是启用的Ecology8还款费控流程
+        retHm.put("isEnableFnaRepaymentWf", "false");
+        //是否是启用的Ecology8预算变更流程
+        retHm.put("isEnableFnaChangeWf", "false");
+        //是否是启用的Ecology8预算分摊流程
+        retHm.put("isEnableFnaShareWf", "false");
+        //费用报销流程是否启用了还款明细
+        retHm.put("enableRepayment", "false");
+        //费用报销流程是否启用了预付款冲销明细
+        retHm.put("enableReverseAdvance", "false");
+        //是否是启用的Ecology8预付款费控流程
+        retHm.put("isEnableFnaAdvanceWf", "false");
+
+        String sqlFnaWfSet = "select a.* from fnaFeeWfInfo a where a.workflowid = " + _workflowid;
+        rs_fna.executeSql(sqlFnaWfSet);
+        if (rs_fna.next()) {
+            if (rs_fna.getInt("enable") == 1) {
+                String fnaWfType = Util.null2String(rs_fna.getString("fnaWfType"));
+                if ("fnaFeeWf".equals(fnaWfType)) {
+                    retHm.put("isEnableFnaWfE8", "true");
+                    int fnaWfTypeColl = rs_fna.getInt("fnaWfTypeColl");
+                    int fnaWfTypeReverse = rs_fna.getInt("fnaWfTypeReverse");
+                    boolean enableRepayment = (fnaWfTypeReverse > 0 && fnaWfTypeColl > 0);
+                    if (enableRepayment) {
+                        retHm.put("enableRepayment", "true");
+                    }
+                    boolean enableReverseAdvance = rs_fna.getInt("fnaWfTypeReverseAdvance") == 1;
+                    if (enableReverseAdvance) {
+                        retHm.put("enableReverseAdvance", "true");
+                    }
+                } else if ("borrow".equals(fnaWfType)) {
+                    retHm.put("isEnableFnaBorrowWf", "true");
+                } else if ("repayment".equals(fnaWfType)) {
+                    retHm.put("isEnableFnaRepaymentWf", "true");
+                } else if ("change".equals(fnaWfType)) {
+                    retHm.put("isEnableFnaChangeWf", "true");
+                } else if ("share".equals(fnaWfType)) {
+                    retHm.put("isEnableFnaShareWf", "true");
+                } else if ("advance".equals(fnaWfType)) {
+                    retHm.put("isEnableFnaAdvanceWf", "true");
+                }
+            }
+        }
+
+        return retHm;
+    }
+
+    /**
+     * 从session中获取预算编制编辑页面，编辑单尚未保存到数据库中的新预算额度
+     *
+     * @param session
+     * @param guid1             编辑页面guid1
+     * @param tabFeeperiod      预算周期：月度：M；季度：Q；半年度：H；年度：Y；
+     * @param subject           三级科目id
+     * @param budgetperiodslist 预算周期期间数：月度：(1~12)；季度：(1~4)；半年度：(1~2)；年度：(1)；
+     * @param currentAmt        从数据库中获取的当前预算金额，如果session中不存在则返回该金额
+     * @return
+     */
+    public static double getBudgetEditNewAmtByGuid(HttpSession session, String guid1, String tabFeeperiod, int subject, int budgetperiodslist, double currentAmt) {
+        List mbudgetvalues = (List) session.getAttribute("FnaBudgetEditSaveFnaAjax.jsp_mbudgetvalues_" + guid1);
+        List msubject3names = (List) session.getAttribute("FnaBudgetEditSaveFnaAjax.jsp_msubject3names_" + guid1);
+        List qbudgetvalues = (List) session.getAttribute("FnaBudgetEditSaveFnaAjax.jsp_qbudgetvalues_" + guid1);
+        List qsubject3names = (List) session.getAttribute("FnaBudgetEditSaveFnaAjax.jsp_qsubject3names_" + guid1);
+        List hbudgetvalues = (List) session.getAttribute("FnaBudgetEditSaveFnaAjax.jsp_hbudgetvalues_" + guid1);
+        List hsubject3names = (List) session.getAttribute("FnaBudgetEditSaveFnaAjax.jsp_hsubject3names_" + guid1);
+        List ybudgetvalues = (List) session.getAttribute("FnaBudgetEditSaveFnaAjax.jsp_ybudgetvalues_" + guid1);
+        List ysubject3names = (List) session.getAttribute("FnaBudgetEditSaveFnaAjax.jsp_ysubject3names_" + guid1);
+        List budgetValues = (List) session.getAttribute("FnaBudgetEditSaveFnaAjax.jsp_budgetValues_" + guid1);
+        List subjectNames = (List) session.getAttribute("FnaBudgetEditSaveFnaAjax.jsp_subjectNames_" + guid1);
+
+        if (mbudgetvalues == null) {
+            mbudgetvalues = new ArrayList();
+            msubject3names = new ArrayList();
+        }
+        if (qbudgetvalues == null) {
+            qbudgetvalues = new ArrayList();
+            qsubject3names = new ArrayList();
+        }
+        if (hbudgetvalues == null) {
+            hbudgetvalues = new ArrayList();
+            hsubject3names = new ArrayList();
+        }
+        if (ybudgetvalues == null) {
+            ybudgetvalues = new ArrayList();
+            ysubject3names = new ArrayList();
+        }
+        if (budgetValues == null) {
+            budgetValues = new ArrayList();
+            subjectNames = new ArrayList();
+        }
+
+        return FnaCommon.getBudgetEditNewAmt(tabFeeperiod, subject, budgetperiodslist, currentAmt,
+                mbudgetvalues, msubject3names, qbudgetvalues, qsubject3names, hbudgetvalues, hsubject3names, ybudgetvalues, ysubject3names,
+                budgetValues, subjectNames);
+    }
+
+    /**
+     * 从session中获取和List中获取，预算编制编辑页面，编辑单尚未保存到数据库中的新预算额度
+     *
+     * @param tabFeeperiod      预算周期：月度：M；季度：Q；半年度：H；年度：Y；
+     * @param subject           科目id
+     * @param budgetperiodslist 预算周期期间数：月度：(1~12)；季度：(1~4)；半年度：(1~2)；年度：(1)；
+     * @param currentAmt        从数据库中获取的当前预算金额，如果session中不存在则返回该金额
+     * @param mbudgetvalues
+     * @param msubject3names
+     * @param qbudgetvalues
+     * @param qsubject3names
+     * @param hbudgetvalues
+     * @param hsubject3names
+     * @param ybudgetvalues
+     * @param ysubject3names
+     * @param budgetValues
+     * @param subjectNames
+     * @return
+     */
+    public static double getBudgetEditNewAmt(String tabFeeperiod, int subject, int budgetperiodslist, double currentAmt,
+                                             List mbudgetvalues, List msubject3names,
+                                             List qbudgetvalues, List qsubject3names,
+                                             List hbudgetvalues, List hsubject3names,
+                                             List ybudgetvalues, List ysubject3names,
+                                             List budgetValues, List subjectNames) {
+        DecimalFormat df = new DecimalFormat("####################################################0.00");
+
+        double _ysze = currentAmt;
+        String _yszeStr = df.format(_ysze);
+
+        if ("M".equals(tabFeeperiod)) {
+            int _idx = msubject3names.indexOf(subject + "");
+            if (_idx >= 0) {
+                try {
+                    String[] _valArray = (String[]) mbudgetvalues.get(_idx);
+                    _yszeStr = Util.null2String(_valArray[budgetperiodslist - 1]).trim();
+                    _ysze = Util.getDoubleValue(_yszeStr, 0.00);
+                } catch (Exception ex1) {
+                    new BaseBean().writeLog(ex1);
+                }
+            }
+
+        } else if ("Q".equals(tabFeeperiod)) {
+            int _idx = qsubject3names.indexOf(subject + "");
+            if (_idx >= 0) {
+                try {
+                    String[] _valArray = (String[]) qbudgetvalues.get(_idx);
+                    _yszeStr = Util.null2String(_valArray[budgetperiodslist - 1]).trim();
+                    _ysze = Util.getDoubleValue(_yszeStr, 0.00);
+                } catch (Exception ex1) {
+                    new BaseBean().writeLog(ex1);
+                }
+            }
+
+        } else if ("H".equals(tabFeeperiod)) {
+            int _idx = hsubject3names.indexOf(subject + "");
+            if (_idx >= 0) {
+                try {
+                    String[] _valArray = (String[]) hbudgetvalues.get(_idx);
+                    _yszeStr = Util.null2String(_valArray[budgetperiodslist - 1]).trim();
+                    _ysze = Util.getDoubleValue(_yszeStr, 0.00);
+                } catch (Exception ex1) {
+                    new BaseBean().writeLog(ex1);
+                }
+            }
+
+        } else if ("Y".equals(tabFeeperiod)) {
+            int _idx = ysubject3names.indexOf(subject + "");
+            if (_idx >= 0) {
+                try {
+                    String[] _valArray = (String[]) ybudgetvalues.get(_idx);
+                    _yszeStr = Util.null2String(_valArray[budgetperiodslist - 1]).trim();
+                    _ysze = Util.getDoubleValue(_yszeStr, 0.00);
+                } catch (Exception ex1) {
+                    new BaseBean().writeLog(ex1);
+                }
+            }
+
+        }
+
+        int _idx = subjectNames.indexOf(subject + "");
+        if (_idx >= 0) {
+            try {
+                String[] _valArray = (String[]) budgetValues.get(_idx);
+                _yszeStr = Util.null2String(_valArray[budgetperiodslist - 1]).trim();
+                _ysze = Util.getDoubleValue(_yszeStr, 0.00);
+            } catch (Exception ex1) {
+                new BaseBean().writeLog(ex1);
+            }
+        }
+
+        return Util.getDoubleValue(df.format(_ysze));
+    }
+
+    /**
+     * 获得并保存预算编制界面分页每页行数
+     *
+     * @param pageSize
+     * @param defPageSize
+     * @param userId
+     * @return
+     */
+    public static int getAndSaveFnaBudgetInfoPageSize(int pageSize, int defPageSize, int userId) {
+        RecordSet rs = new RecordSet();
+        if (pageSize <= 0) {
+            pageSize = defPageSize;
+            rs.executeQuery("select pageSize from FnaBudgetInfoPageSize where userId=?", userId);
+            if (rs.next()) {
+                pageSize = Util.getIntValue(rs.getString("pageSize"), 50);
+            }
+        }
+        if (pageSize <= 0) {
+            pageSize = defPageSize;
+        }
+        rs.executeQuery("select * from FnaBudgetInfoPageSize where userId=?", userId);
+        if (rs.next()) {
+            String _id = rs.getString("id");
+            int _pageSize = rs.getInt("pageSize");
+            if (pageSize != _pageSize) {
+                rs.executeUpdate("update FnaBudgetInfoPageSize set pageSize = ? where id = ?", pageSize, _id);
+            }
+        } else {
+            rs.executeUpdate("delete from FnaBudgetInfoPageSize where userId=?", userId);
+            rs.executeUpdate("insert into FnaBudgetInfoPageSize (userId, pageSize) values (?, ?)", userId, pageSize);
+        }
+
+        return pageSize;
+    }
+
+    /**
+     * 转义 & " ' < > 空格 这些html特殊字符<br>
+     * str始终先进行trim后再进行转义处理
+     *
+     * @param str
+     * @return
+     */
+    public static String escapeHtmlTrim(String str) {
+        return FnaCommon.escapeHtml(Util.null2String(str).trim());
+    }
+
+    /**
+     * 转义 & " ' < > 空格 这些html特殊字符<br>
+     * str=null，直接返回空字符串
+     *
+     * @param str
+     * @return
+     */
+    public static String escapeHtmlNull(String str) {
+        if (str == null) {
+            return "";
+        } else {
+            return FnaCommon.escapeHtml(str);
+        }
+    }
+
+    /**
+     * 转义 & " ' < > 空格 这些html特殊字符
+     *
+     * @param str
+     * @return
+     */
+    public static String escapeHtml(String str) {
+        if (str == null || "".equals(str)) {
+            return str;
+        }
+        return str
+                .replaceAll("\\&", "&amp;")
+                .replaceAll("\"", "&quot;")
+                .replaceAll("\'", "&apos;")
+                .replaceAll("\\<", "&lt;")
+                .replaceAll("\\>", "&gt;")
+                ;
+    }
+
+    /**
+     * 转义 & " ' < > 这些xml特殊字符
+     *
+     * @param str
+     * @return
+     */
+    public static String escapeXml(String str) {
+        if (str == null || "".equals(str)) {
+            return str;
+        }
+        return str
+                .replaceAll("\\&", "&amp;")
+                .replaceAll("\"", "&quot;")
+                .replaceAll("\'", "&apos;")
+                .replaceAll("\\<", "&lt;")
+                .replaceAll("\\>", "&gt;")
+                ;
+    }
+
+
+    /**
+     * 将url参数值中的被转义的编码解码成实际的值
+     *
+     * @param str
+     * @return
+     */
+    public static String decodeURL(String str) {
+        if (str == null || "".equals(str)) {
+            return str;
+        }
+        return str
+                .replaceAll("%20", " ")
+                .replaceAll("%22", "\"")
+                .replaceAll("%23", "#")
+                .replaceAll("%28", "(")
+                .replaceAll("%29", ")")
+                .replaceAll("%2B", "+")
+                .replaceAll("%2C", ",")
+                .replaceAll("%2F", "/")
+                .replaceAll("%3A", ":")
+                .replaceAll("%3B", ";")
+                .replaceAll("%3C", "<")
+                .replaceAll("%3D", "=")
+                .replaceAll("%3E", ">")
+                .replaceAll("%3F", "?")
+                .replaceAll("%4o", "@")
+                .replaceAll("%5C", "\\\\")
+                .replaceAll("%7C", "|")
+                .replaceAll("%26", "&")
+                .replaceAll("%25", "%")
+                ;
+    }
+
+    /**
+     * 给url参数值转义成url中可以传送的编码
+     *
+     * @param str
+     * @return
+     */
+    public static String encodeURL(String str) {
+        if (str == null || "".equals(str)) {
+            return str;
+        }
+        return str
+                .replaceAll("\\%", "%25")
+                .replaceAll("\\&", "%26")
+                .replaceAll(" ", "%20")
+                .replaceAll("\"", "%22")
+                .replaceAll("\\#", "%23")
+                .replaceAll("\\(", "%28")
+                .replaceAll("\\)", "%29")
+                .replaceAll("\\+", "%2B")
+                .replaceAll("\\,", "%2C")
+                .replaceAll("\\/", "%2F")
+                .replaceAll("\\:", "%3A")
+                .replaceAll("\\;", "%3B")
+                .replaceAll("\\<", "%3C")
+                .replaceAll("\\=", "%3D")
+                .replaceAll("\\>", "%3E")
+                .replaceAll("\\?", "%3F")
+                .replaceAll("\\@", "%4o")
+                .replaceAll("\\\\", "%5C")
+                .replaceAll("\\|", "%7C")
+                ;
+    }
+
+    /**
+     * 系统表单
+     * 获得相应具体某个流程流转中某个字段是否可编辑状态（只要有任意一个节点是可编辑状态即返回true）
+     *
+     * @param fieldName
+     * @param requestId
+     * @param currentNodeId
+     * @param detailtable
+     * @return
+     */
+    public static boolean isEditFieldByReqId(String fieldName, int requestId, int currentNodeId, String detailtable) {
+
+        boolean isEdit = FnaCommon.isEditField(fieldName, currentNodeId, detailtable);
+        if (isEdit) {
+            return true;
+        }
+
+        if (requestId > 0) {
+            RecordSet rs = new RecordSet();
+            //签字类型：0：批准;1：保存;2：提交;3：退回;4：重新打开;5：删除;6：激活;7：转发;9：批注;e：强制归档;t：抄送;s：督办;i：??;
+            rs.executeSql("select DISTINCT nodeid from workflow_requestLog where logtype in ('0','2') and requestid = " + requestId);
+            while (rs.next()) {
+                int nodeid = rs.getInt("nodeid");
+                isEdit = FnaCommon.isEditField(fieldName, nodeid, detailtable);
+                if (isEdit) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
+    /**
+     * 系统表单
+     * 获得相应节点中某个字段是否是可编辑状态
+     *
+     * @param fieldName   字段名称
+     * @param nodeid      节点id
+     * @param detailtable
+     * @return
+     */
+    public static boolean isEditField(String fieldName, int nodeid, String detailtable) {
+        List<HashMap<String, String>> fieldList = FnaCommon.getWfFieldFormInfoByNodeId(nodeid);
+        return FnaCommon.isEditField(fieldName, fieldList, detailtable);
+    }
+
+    /**
+     * 系统表单
+     * 获得相应节点字段list中某个字段是否是可编辑状态
+     *
+     * @param fieldName   字段名称
+     * @param fieldList   节点字段list
+     * @param detailtable 明细表表名
+     * @return
+     */
+    public static boolean isEditField(String fieldName, List<HashMap<String, String>> fieldList, String detailtable) {
+        int fieldListLen = fieldList.size();
+        for (int i = 0; i < fieldListLen; i++) {
+            HashMap<String, String> fieldHm = (HashMap<String, String>) fieldList.get(i);
+
+            String _isedit = Util.null2String(fieldHm.get("isedit"));
+            String _fieldname = Util.null2String(fieldHm.get("fieldname"));
+            String _detailtable = Util.null2String(fieldHm.get("detailtable"));
+
+            if (_fieldname.equalsIgnoreCase(fieldName) && _detailtable.equalsIgnoreCase(detailtable)) {
+                if ("1".equalsIgnoreCase(_isedit)) {
+                    return true;
+                }
+                return false;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * 系统表单
+     * 获得对应流程节点，所有表单字段查看编辑状态:
+     * fieldid;isview;isedit;ismandatory;orderid;dsporder;fieldname;detailtable;
+     *
+     * @param nodeid 节点id
+     * @return List<HashMap < String, String>> 节点字段list
+     */
+    public static List<HashMap<String, String>> getWfFieldFormInfoByNodeId(int nodeid) {
+        RecordSet rs = new RecordSet();
+        RecordSet rs1 = new RecordSet();
+
+        List<HashMap<String, String>> fieldList = new ArrayList<HashMap<String, String>>();
+
+        rs.executeProc("workflow_FieldForm_Select", nodeid + "");
+        while (rs.next()) {
+            String fieldid = Util.null2String(rs.getString("fieldid")).trim();
+            String isview = Util.null2String(rs.getString("isview")).trim();
+            String isedit = Util.null2String(rs.getString("isedit")).trim();
+            String ismandatory = Util.null2String(rs.getString("ismandatory")).trim();
+            String orderid = Util.null2String(rs.getString("orderid")).trim();
+            String dsporder = Util.null2String(rs.getString("dsporder")).trim();
+
+            String fieldname = "";
+            String detailtable = "";
+            String sql1 = "SELECT fieldname, detailtable FROM workflow_billfield where id = " + fieldid;
+            rs1.executeSql(sql1);
+            if (rs1.next()) {
+                fieldname = Util.null2String(rs1.getString("fieldname")).trim();
+                detailtable = Util.null2String(rs1.getString("detailtable")).trim();
+            }
+
+            HashMap<String, String> fieldHm = new HashMap<String, String>();
+
+            fieldHm.put("fieldid", fieldid);
+            fieldHm.put("isview", isview);
+            fieldHm.put("isedit", isedit);
+            fieldHm.put("ismandatory", ismandatory);
+            fieldHm.put("orderid", orderid);
+            fieldHm.put("dsporder", dsporder);
+            fieldHm.put("fieldname", fieldname);
+            fieldHm.put("detailtable", detailtable);
+
+            fieldList.add(fieldHm);
+        }
+
+        return fieldList;
+    }
+
+    /**
+     * 保存系统日志
+     * 关于系统日志属性改造的说明
+     *
+     * @param relatedId        处理记录id
+     * @param relatedName      处理记录名称
+     * @param operateType      SptmForCowork.getTypeName
+     * @param operateDesc      操作的类型
+     * @param operateItem
+     * @param operateUserid    操作用户id
+     * @param clientAddress    客户端ip地址
+     * @param operatesmalltype 系统维护类型（默认值）：SysMaintenanceLog.OPERATE_0；系统操作类型： SysMaintenanceLog.OPERATE_1；
+     */
+    public void saveSysLogInfo(int relatedId, String relatedName,
+                               String operateType, String operateDesc, String operateItem,
+                               int operateUserid, String clientAddress, int operatesmalltype) {
+        try {
+            SysMaintenanceLog log = new SysMaintenanceLog();
+            log.resetParameter();
+            log.setRelatedId(relatedId);
+            log.setRelatedName(relatedName);
+            log.setOperateType(operateType);
+            log.setOperateDesc(operateDesc);
+            log.setOperateItem(operateItem);
+            log.setOperateUserid(operateUserid);
+            log.setClientAddress(clientAddress);
+            log.setOperatesmalltype(operatesmalltype);
+            log.setSysLogInfo();
+        } catch (Exception e) {
+            new BaseBean().writeLog(e);
+        }
+    }
+
+    /**
+     * 流程存为新版时：处理财务模块相关多版本支持代码
+     *
+     * @param oldWfId 原流程(版本)
+     * @param newWfId 新流程(版本)
+     */
+    public static void fnaSaveAsVersion(int oldWfId, int newWfId) throws Exception {
+        fnaSaveAsVersion(oldWfId, newWfId, "", null);
+    }
+
+    /**
+     * 流程存为新版时：处理财务模块相关多版本支持代码
+     *
+     * @param oldWfId 原流程(版本)
+     * @param newWfId 新流程(版本)
+     */
+    public static void fnaSaveAsVersion(int oldWfId, int newWfId, String ip, User user) throws Exception {
+        if (oldWfId <= 0 || newWfId <= 0) {
+            return;
+        }
+
+        RecordSet rs1 = new RecordSet();
+        RecordSet rs2 = new RecordSet();
+
+        WorkflowVersion wfVer = new WorkflowVersion();
+
+        String sql1 = "";
+
+        if (true) {
+            sql1 = "select * from wf_fna_initWfInfo where workflowId = " + oldWfId;
+            rs1.executeSql(sql1);
+            if (rs1.next()) {
+                int _formid = rs1.getInt("formId");
+                int _fnaWfType1 = rs1.getInt("fnaWfType1");
+                int _fnaWfType2 = rs1.getInt("fnaWfType2");
+                FnaWfInitE8.save_wf_fna_initWfInfo(newWfId, _formid, _fnaWfType1, _fnaWfType2);
+            }
+        }
+
+        if (true) {//处理：路径设置》高级设置》浏览数据定义：
+            sql1 = "select count(*) cnt from FnaFeetypeWfbrowdef where workflowid = " + newWfId;
+            rs1.executeSql(sql1);
+            if (!rs1.next() || rs1.getInt("cnt") <= 0) {
+                sql1 = "select * from FnaFeetypeWfbrowdef where workflowid = " + oldWfId;
+                rs1.executeSql(sql1);
+                while (rs1.next()) {
+                    int oldMainid = (rs1.getInt("id"));
+                    int fieldid = (rs1.getInt("fieldid"));
+                    int viewtype = (rs1.getInt("viewtype"));
+                    int fieldtype = (rs1.getInt("fieldtype"));
+                    String title = (rs1.getString("title"));
+
+                    String sql2 = "";
+                    sql2 = "insert into FnaFeetypeWfbrowdef(workflowid,fieldId,viewType,fieldType,title)\n" +
+                            " values " +
+                            " (" + newWfId + "," + fieldid + "," + viewtype + "," + fieldtype + ",'" + StringEscapeUtils.escapeSql(title) + "')";
+                    rs2.executeSql(sql2);
+
+                    sql2 = "select max(id) maxid from FnaFeetypeWfbrowdef where fieldId = " + fieldid + " and workflowid = " + newWfId;
+                    rs2.executeSql(sql2);
+                    if (rs2.next()) {
+                        int newMainid = rs2.getInt("maxid");
+
+                        sql2 = "insert into Fnafeetypewfbrowdef_Dt1 (mainid,refid)" +
+                                " select " + newMainid + ",refid from Fnafeetypewfbrowdef_Dt1 b where b.mainid =" + oldMainid;
+                        rs2.executeSql(sql2);
+                    }
+                }
+            }
+        }
+
+        sql1 = "select count(*) cnt from fnafeewfinfo where workflowid = " + oldWfId;
+        rs1.executeSql(sql1);
+        if (rs1.next() && rs1.getInt("cnt") > 0) {
+        } else {
+            sql1 = "select a.activeVersionID from workflow_base a where id = " + oldWfId;
+            rs1.executeSql(sql1);
+            if (rs1.next()) {
+                int activeVersionID = rs1.getInt("activeVersionID");
+                if (activeVersionID > 0) {
+                    sql1 = "select a.id, a.workflowname, a.version, a.activeVersionID from workflow_base a \n" +
+                            " where a.activeVersionID = " + activeVersionID + " \n" +
+                            " order by case when (a.version is null or a.version = '') then 1 else a.version end DESC";
+                    rs1.executeSql(sql1);
+                    while (rs1.next()) {
+                        int wf_id = rs1.getInt("id");
+                        String sql2 = "select count(*) cnt from fnafeewfinfo where workflowid = " + wf_id;
+                        rs2.executeSql(sql2);
+                        if (rs2.next() && rs2.getInt("cnt") > 0) {
+                            oldWfId = wf_id;
+                            break;
+                        }
+                    }
+                }
+            }
+        }
+
+        if (true) {//费用流程凭证集成配置
+            RecordSet rs3 = new RecordSet();
+            String dbtype = rs2.getDBType();
+            if (dbtype.equals("oracle") && rs2.getOrgindbtype().equals("dm")) dbtype = "dm";
+            String guid1SQlStr = FnaCommon.getPrimaryKeyGuid1SqlStr(dbtype);
+
+            sql1 = "select count(*) cnt from fnaVoucherXml where workflowid = " + newWfId;
+            rs1.executeSql(sql1);
+            if (!rs1.next() || rs1.getInt("cnt") <= 0) {
+                sql1 = "select id, xmlname, xmlmemo, xmlversion, xmlencoding, " +//1
+                        "	workflowid, typename, datasourceid, interfacesaddress, profession " +//2
+                        " from fnavoucherxml " +
+                        " where workflowid = " + oldWfId;
+                rs1.executeSql(sql1);
+                while (rs1.next()) {
+                    //1
+                    int oldFnaVoucherXmlId = rs1.getInt("id");
+                    String xmlname = Util.null2String(rs1.getString("xmlname")).trim();
+                    String xmlmemo = Util.null2String(rs1.getString("xmlmemo")).trim();
+                    String xmlversion = Util.null2String(rs1.getString("xmlversion")).trim();
+                    String xmlencoding = Util.null2String(rs1.getString("xmlencoding")).trim();
+                    //2
+//					int workflowid = rs1.getInt("workflowid");
+                    String typename = Util.null2String(rs1.getString("typename")).trim();
+                    String datasourceid = Util.null2String(rs1.getString("datasourceid")).trim();
+                    String interfacesaddress = Util.null2String(rs1.getString("interfacesaddress")).trim();
+                    int profession = rs1.getInt("profession");
+
+                    String sql2 = "";
+                    sql2 = "insert into fnavoucherxml\n" +
+                            "  (xmlname, xmlmemo, xmlversion, xmlencoding, " +//1
+                            "	workflowid, typename, datasourceid, interfacesaddress, profession)\n" +//2
+                            " values\n" +
+                            "  ('" + StringEscapeUtils.escapeSql(xmlname) + "', '" + StringEscapeUtils.escapeSql(xmlmemo) + "', '" + StringEscapeUtils.escapeSql(xmlversion) + "', '" + StringEscapeUtils.escapeSql(xmlencoding) + "', " +//1
+                            "	" + newWfId + ", '" + StringEscapeUtils.escapeSql(typename) + "', '" + StringEscapeUtils.escapeSql(datasourceid) + "', '" + StringEscapeUtils.escapeSql(interfacesaddress) + "', " + profession + ")";//2
+                    rs2.executeSql(sql2);
+
+                    sql2 = "select max(id) maxid from fnavoucherxml where workflowid = " + newWfId;
+                    rs2.executeSql(sql2);
+                    if (rs2.next()) {
+                        int newFnaVoucherXmlId = rs2.getInt("maxid");
+
+                        if ("mysql".equalsIgnoreCase(dbtype)) {
+                        	//TODO 经过排查客户问题，发现针对mysql数据库,函数 replace(uuid(),'-','') 会出现UUID重复的情况，导致SQL执行失败，报主键重复
+    						//修改为 批量插入
+    						List<String> paraList = new ArrayList<String>();
+    						sql2 = " select fieldname, fieldvaluetype1, fieldvaluetype2, " +//1
+    							"	fielddbtbname, detailtable, fielddbname, fielddbtype, datasourceid, " +//2
+    							"	fieldvalue "+//3
+    							" from fnafinancesetting " +
+    							" where fnaVoucherXmlId = "+oldFnaVoucherXmlId;
+    						while(rs3.next()){
+    							String fieldname = Util.null2String(rs3.getString("fieldname"));
+    							String fieldvaluetype1 = Util.null2String(rs3.getString("fieldvaluetype1"));
+    							String fieldvaluetype2 = Util.null2String(rs3.getString("fieldvaluetype2"));
+    							String fielddbtbname = Util.null2String(rs3.getString("fielddbtbname"));
+    							String detailtable = Util.null2String(rs3.getString("detailtable"));
+    							String fielddbname = Util.null2String(rs3.getString("fielddbname"));
+    							String fielddbtype = Util.null2String(rs3.getString("fielddbtype"));
+    							String datasourceids = Util.null2String(rs3.getString("datasourceid"));
+    							String fieldvalue = Util.null2String(rs3.getString("fieldvalue"));
+    							
+    							String guid1 = FnaCommon.getPrimaryKeyGuid1();
+    						    paraList.add("" + 
+guid1 + Util.getSeparator() + newFnaVoucherXmlId + Util.getSeparator() + fieldname + Util.getSeparator() + fieldvaluetype1 + Util.getSeparator() + fieldvaluetype2 //1 
++ Util.getSeparator() + fielddbtbname + Util.getSeparator() + detailtable +  Util.getSeparator() + fielddbname + Util.getSeparator() + fielddbtype + Util.getSeparator() + datasourceids //2
++ Util.getSeparator() + fieldvalue //3
+    );
+    						} //while end
+    						BatchRecordSet brs = new BatchRecordSet();
+    						brs.executeSqlBatch( "insert into fnafinancesetting \n" +
+    							"  (guid1, fnavoucherxmlid, fieldname, fieldvaluetype1, fieldvaluetype2, " +//1
+    							"	fielddbtbname, detailtable, fielddbname, fielddbtype, datasourceid, " +//2
+    							"	fieldvalue)\n" + //3
+    							" values(?,?,?,?,?,?,?,?,?,?,?)", paraList);
+    						
+                        }else{
+                            sql2 = "insert into fnafinancesetting\n" +
+                                    "  (guid1, fnavoucherxmlid, fieldname, fieldvaluetype1, fieldvaluetype2, " +//1
+                                    "	fielddbtbname, detailtable, fielddbname, fielddbtype, datasourceid, " +//2
+                                    "	fieldvalue)\n" + //3
+                                    " select " + guid1SQlStr + ", " + newFnaVoucherXmlId + ", fieldname, fieldvaluetype1, fieldvaluetype2, " +//1
+                                    "	fielddbtbname, detailtable, fielddbname, fielddbtype, datasourceid, " +//2
+                                    "	fieldvalue " +//3
+                                    " from fnafinancesetting " +
+                                    " where fnaVoucherXmlId = " + oldFnaVoucherXmlId;
+                            rs2.executeSql(sql2);
+                        }
+                        
+                        
+                        sql2 = "insert into fnavoucherxmlcontent\n" +
+                                "  (fnavoucherxmlid, contenttype, contentparentid, contentname, contentvaluetype, " +//1
+                                "	contentmemo, orderid, isnullnotprint, contentvalue, parameter, " +//2
+                                "	isnullnotprintnode, oldId)\n" + //3
+                                " select " + newFnaVoucherXmlId + ", contenttype, contentparentid, contentname, contentvaluetype, " +//1
+                                "	contentmemo, orderid, isnullnotprint, contentvalue, parameter, " +//2
+                                "	isnullnotprintnode, id " +//3
+                                " from fnavoucherxmlcontent " +
+                                " where fnavoucherxmlid = " + oldFnaVoucherXmlId;
+                        rs2.executeSql(sql2);
+
+                        List<String> newFnavoucherxmlcontentid_list = new ArrayList<String>();
+                        List<String> oldContentparentid_list = new ArrayList<String>();
+                        HashMap<String, String> fnavoucherxmlcontentid_hm = new HashMap<String, String>();
+                        sql2 = "select * from fnavoucherxmlcontent where fnavoucherxmlid = " + newFnaVoucherXmlId;
+                        rs2.executeSql(sql2);
+                        while (rs2.next()) {
+                            int newFnavoucherxmlcontentid = Util.getIntValue(rs2.getString("id"), 0);
+                            int oldFnavoucherxmlcontentid = Util.getIntValue(rs2.getString("oldId"), 0);
+                            int oldContentparentid = Util.getIntValue(rs2.getString("contentparentid"), 0);
+
+                            newFnavoucherxmlcontentid_list.add(newFnavoucherxmlcontentid + "");
+                            oldContentparentid_list.add(oldContentparentid + "");
+                            fnavoucherxmlcontentid_hm.put(oldFnavoucherxmlcontentid + "", newFnavoucherxmlcontentid + "");
+                        }
+                        int newFnavoucherxmlcontentid_listLen = newFnavoucherxmlcontentid_list.size();
+                        for (int i = 0; i < newFnavoucherxmlcontentid_listLen; i++) {
+                            int newFnavoucherxmlcontentid = Util.getIntValue(newFnavoucherxmlcontentid_list.get(i), 0);
+                            int oldContentparentid = Util.getIntValue(oldContentparentid_list.get(i), 0);
+
+                            int newContentparentid = Util.getIntValue(fnavoucherxmlcontentid_hm.get(oldContentparentid + ""), 0);
+
+                            String sql3 = "update fnavoucherxmlcontent " +
+                                    " set contentparentid = " + newContentparentid + " " +
+                                    " where id = " + newFnavoucherxmlcontentid;
+                            rs3.executeSql(sql3);
+                        }
+
+                        sql2 = "insert into fnavoucherxmlcontentdset\n" +
+                                "  (fnavoucherxmlid, fnavoucherxmlcontentid, dsetalias, inittiming, fnadatasetid, " +//1
+                                "	dsetmemo, orderid, parameter)\n" + //2
+                                " select " + newFnaVoucherXmlId + ", fnavoucherxmlcontentid, dsetalias, inittiming, fnadatasetid, " +//1
+                                "	dsetmemo, orderid, parameter " +//2
+                                " from fnavoucherxmlcontentdset " +
+                                " where fnavoucherxmlid = " + oldFnaVoucherXmlId;
+                        rs2.executeSql(sql2);
+
+                        sql2 = "select * from fnavoucherxmlcontentdset where fnavoucherxmlid = " + newFnaVoucherXmlId;
+                        rs2.executeSql(sql2);
+                        while (rs2.next()) {
+                            int newFnavoucherxmlcontentdsetid = Util.getIntValue(rs2.getString("id"), 0);
+                            int oldFnavoucherxmlcontentid = Util.getIntValue(rs2.getString("fnavoucherxmlcontentid"), 0);
+
+                            int newFnavoucherxmlcontentid = Util.getIntValue(fnavoucherxmlcontentid_hm.get(oldFnavoucherxmlcontentid + ""), 0);
+
+                            String sql3 = "update fnavoucherxmlcontentdset " +
+                                    " set contentparentid = " + newFnavoucherxmlcontentid + " " +
+                                    " where id = " + newFnavoucherxmlcontentdsetid;
+                            rs3.executeSql(sql3);
+                        }
+
+
+                    }
+                }
+            }
+        }
+
+        if (true) {//处理：费控流程定义
+//			10	fnaFeeWfInfo	费控流程定义表
+//			11	fnaFeeWfInfoField	费控流程字段对应关系定义表
+//			12	fnaFeeWfInfoLogic	费控流程提交校验定义表
+//			Fnafeewfinfologicreverse
+//			fnaFeeWfInfoLogicAdvanceR
+//			fnafeewfinfonodectrl
+//			fnaControlScheme_FeeWfInfo
+
+            RecordSet rs3 = new RecordSet();
+            RecordSet rs4 = new RecordSet();
+
+            sql1 = "select count(*) cnt from fnafeewfinfo where workflowid = " + newWfId;
+            rs1.executeSql(sql1);
+            if (!rs1.next() || rs1.getInt("cnt") <= 0) {
+                boolean need_removeCache_fnaFeeWfInfoComInfo = false;
+                sql1 = "select * " +//3
+                        " from fnafeewfinfo " +
+                        " where workflowid = " + oldWfId;
+                rs1.executeSql(sql1);
+                while (rs1.next()) {
+                    need_removeCache_fnaFeeWfInfoComInfo = true;
+                    //1
+                    int oldMainid = rs1.getInt("id");
+                    //				int workflowid = rs1.getInt("workflowid");
+                    int enable = rs1.getInt("enable");
+                    String lastmodifieddate = Util.null2String(rs1.getString("lastmodifieddate")).trim();
+                    String templatefile = Util.null2String(rs1.getString("templatefile")).trim();
+                    //2
+                    String templatefilemobile = Util.null2String(rs1.getString("templatefilemobile")).trim();
+                    String fnawftype = Util.null2String(rs1.getString("fnawftype")).trim();
+                    int fnawftypeborrow = rs1.getInt("fnawftypeborrow");
+                    int fnawftypecoll = rs1.getInt("fnawftypecoll");
+                    int fnawftypereverse = rs1.getInt("fnawftypereverse");
+                    //3
+                    int fnawftypereim = rs1.getInt("fnawftypereim");
+                    String overstandardtips = Util.null2String(rs1.getString("overstandardtips")).trim();
+                    int isallnodescontrol = rs1.getInt("isallnodescontrol");
+                    int fnaWfTypeReverseAdvance = Util.getIntValue(rs1.getString("fnaWfTypeReverseAdvance"), 0);
+                    int budgetCanBeNegative = Util.getIntValue(rs1.getString("budgetCanBeNegative"), 0);
+
+                    //多明细 start
+                    int fnaWfTypeMultiReim = Util.getIntValue(rs1.getString("fnaWfTypeMultiReim"), 0);//启用多明细表报销
+                    //启用多明细表报销,开关开启:当前流程的任意明细表都 【 可以用于也仅可以用于 】 费用报销;不再支持"还款,预付款冲销"功能;
+                    if (fnaWfTypeMultiReim == 1) {
+                        fnawftypecoll = 0;//启用还款业务逻辑
+                        fnawftypereverse = 0;//启用冲销业务逻辑
+                        fnaWfTypeReverseAdvance = 0;//启用预申请业务逻辑
+                        sql1 = " insert into fnaFeeWfInfoMultiField(workflowId,dtlIdx,fieldName,fieldFnaType, fieldMemo) "
+                                + " select " + newWfId + ",dtlIdx,fieldName,fieldFnaType, fieldMemo from fnaFeeWfInfoMultiField where workflowId = " + oldWfId;
+                        rs2.executeSql(sql1);
+                    }
+                    //多明细 end
+
+                    //承担主体无预算自动向上查询 总开关; 0=默认=关闭; 1=开启
+                    int noBudgetQueryUp = Util.getIntValue(rs1.getString("noBudgetQueryUp"), 0);
+                    //承担主体无预算时自动向上查询 分部; 0=默认=关闭; 1=开启=逐级查询上级分部
+                    int noBudgetQueryUp1 = Util.getIntValue(rs1.getString("noBudgetQueryUp1"), 0);
+                    //承担主体无预算时自动向上查询 部门; 0=默认=关闭; 1=开启=逐级查询上级部门; 2=开启=逐级查询上级部门及分部
+                    int noBudgetQueryUp2 = Util.getIntValue(rs1.getString("noBudgetQueryUp2"), 0);
+                    //承担主体无预算时自动向上查询 人员; 0=默认=关闭; 1=开启=逐级查询上级部门; 2=开启=逐级查询上级部门及分部
+                    int noBudgetQueryUp3 = Util.getIntValue(rs1.getString("noBudgetQueryUp3"), 0);
+
+                    String sql2 = "";
+                    sql2 = "insert into fnafeewfinfo\n" +
+                            "  (workflowid, enable, lastmodifieddate, templatefile, " +//1
+                            "	templatefilemobile, fnawftype, fnawftypeborrow, fnawftypecoll, fnawftypereverse, " +//2
+                            "	fnawftypereim, overstandardtips, isallnodescontrol, fnaWfTypeReverseAdvance, "
+                            + " budgetCanBeNegative, "
+                            + " noBudgetQueryUp, "
+                            + " noBudgetQueryUp1, "
+                            + " noBudgetQueryUp2, "
+                            + " noBudgetQueryUp3, "
+                            + " fnaWfTypeMultiReim)\n" + //3
+                            " values\n" +
+                            "  (" + newWfId + ", " + enable + ", '" + StringEscapeUtils.escapeSql(lastmodifieddate) + "', '" + StringEscapeUtils.escapeSql(templatefile) + "', " +//1
+                            "	'" + StringEscapeUtils.escapeSql(templatefilemobile) + "', '" + StringEscapeUtils.escapeSql(fnawftype) + "', " + fnawftypeborrow + ", " + fnawftypecoll + ", " + fnawftypereverse + ", " +//2
+                            "	" + fnawftypereim + ", '" + StringEscapeUtils.escapeSql(overstandardtips) + "', " + isallnodescontrol + ", " + fnaWfTypeReverseAdvance + ", "
+                            + budgetCanBeNegative + ", "
+                            + noBudgetQueryUp + ", "
+                            + noBudgetQueryUp1 + ", "
+                            + noBudgetQueryUp2 + ", "
+                            + noBudgetQueryUp3 + ", "
+                            + fnaWfTypeMultiReim + ")";//3
+                    rs2.executeSql(sql2);
+
+                    sql2 = "select max(id) maxid from fnafeewfinfo where workflowid = " + newWfId;
+                    rs2.executeSql(sql2);
+                    if (rs2.next()) {
+                        int newMainid = rs2.getInt("maxid");
+
+                        String sql3 = "select fnaControlSchemeId from fnaControlScheme_FeeWfInfo where fnaFeeWfInfoId = " + oldMainid;
+                        rs3.executeSql(sql3);
+                        while (rs3.next()) {
+                            int fnaControlSchemeId = rs3.getInt("fnaControlSchemeId");
+
+                            String sql4 = "insert into fnaControlScheme_FeeWfInfo (fnaControlSchemeId, fnaFeeWfInfoId) values (" + fnaControlSchemeId + ", " + newMainid + ")";
+                            rs4.executeSql(sql4);
+                        }
+
+                        sql2 = "insert into fnafeewfinfofield\n" +
+                                "  (mainid, workflowid, formid, fieldtype, fieldid, " +//1
+                                "	isdtl, showalltype, dtlnumber, fieldvalue, fieldvaltype, " +//2
+                                "	fcsguid1, fieldvaluewfsys, tabindex, " +//3
+                                "   isWfFieldLinkage, controlflowSubmission, automaticTake, controlBorrowingWf) \n" + //4
+                                " select " + newMainid + ", " + newWfId + ", formid, fieldtype, fieldid, " +//1
+                                "	isdtl, showalltype, dtlnumber, fieldvalue, fieldvaltype, " +//2
+                                "	fcsguid1, fieldvaluewfsys, tabindex, " +//3
+                                "   isWfFieldLinkage, controlflowSubmission, automaticTake, controlBorrowingWf " +//4
+                                " from fnafeewfinfofield " +
+                                " where workflowid = " + oldWfId + " " +
+                                " and mainid = " + oldMainid;
+                        rs2.executeSql(sql2);
+
+                        sql2 = "insert into fnafeewfinfologic\n" +
+                                "  (mainid, kmidscondition, kmids, orgtype, orgidscondition, " +//1
+                                "	orgids, intensity, promptsc, prompttc, prompten, " +//2
+                                "	totalamtverification, isapplicationbudgetwf)\n" + //3
+                                " select " + newMainid + ", kmidscondition, kmids, orgtype, orgidscondition, " +//1
+                                "	orgids, intensity, promptsc, prompttc, prompten, " +//2
+                                "	totalamtverification, isapplicationbudgetwf " +//3
+                                " from fnafeewfinfologic " +
+                                " where mainid = " + oldMainid;
+                        rs2.executeSql(sql2);
+
+                        sql2 = "insert into fnafeewfinfologicreverse\n" +
+                                "  (mainid, rule1, rule1intensity, rule2, rule2intensity, " +//1
+                                "	rule3, rule3intensity, rule4, rule4intensity, rule5, " +//2
+                                "	rule5intensity, promptsc, prompttc, prompten, promptsc2, " +//3
+                                "	prompttc2, prompten2, promptsc3, prompttc3, prompten3, " +//4
+                                "	promptsc4, prompttc4, prompten4, promptsc5, prompttc5, " +//5
+                                "	prompten5)\n" + //6
+                                " select " + newMainid + ", rule1, rule1intensity, rule2, rule2intensity, " +//1
+                                "	rule3, rule3intensity, rule4, rule4intensity, rule5, " +//2
+                                "	rule5intensity, promptsc, prompttc, prompten, promptsc2, " +//3
+                                "	prompttc2, prompten2, promptsc3, prompttc3, prompten3, " +//4
+                                "	promptsc4, prompttc4, prompten4, promptsc5, prompttc5, " +//5
+                                "	prompten5 " +//6
+                                " from fnafeewfinfologicreverse " +
+                                " where mainid = " + oldMainid;
+                        rs2.executeSql(sql2);
+
+                        sql2 = "insert into fnaFeeWfInfoLogicAdvanceR\n" +
+                                "  (mainid, rule1, rule1intensity, rule2, rule2intensity, " +//1
+                                "	rule3, rule3intensity, rule4, rule4intensity, rule5, " +//2
+                                "	rule5intensity, promptsc, prompttc, prompten, promptsc2, " +//3
+                                "	prompttc2, prompten2, promptsc3, prompttc3, prompten3, " +//4
+                                "	promptsc4, prompttc4, prompten4, promptsc5, prompttc5, " +//5
+                                "	prompten5)\n" + //6
+                                " select " + newMainid + ", rule1, rule1intensity, rule2, rule2intensity, " +//1
+                                "	rule3, rule3intensity, rule4, rule4intensity, rule5, " +//2
+                                "	rule5intensity, promptsc, prompttc, prompten, promptsc2, " +//3
+                                "	prompttc2, prompten2, promptsc3, prompttc3, prompten3, " +//4
+                                "	promptsc4, prompttc4, prompten4, promptsc5, prompttc5, " +//5
+                                "	prompten5 " +//6
+                                " from fnaFeeWfInfoLogicAdvanceR " +
+                                " where mainid = " + oldMainid;
+                        rs2.executeSql(sql2);
+
+
+                        rs2.executeUpdate("delete from fnaFeeWfInfoMultiField where workflowId=?", newWfId);
+                        sql2 = "insert into fnaFeeWfInfoMultiField\n" +
+                                "  (workflowId, dtlIdx, fieldName, fieldFnaType, fieldMemo)\n" + //1
+                                " select " + newWfId + ", dtlIdx, fieldName, fieldFnaType, fieldMemo " +//1
+                                " from fnaFeeWfInfoMultiField " +
+                                " where workflowId = " + oldWfId;
+                        rs2.executeUpdate(sql2);
+
+                        sql2 = "select nodeid, checkway " +
+                                " from fnafeewfinfonodectrl " +
+                                " where mainid = " + oldMainid;
+                        rs2.executeSql(sql2);
+                        while (rs2.next()) {
+                            int nodeid_old = Util.getIntValue(rs2.getString("nodeid"), 0);
+                            String checkway = Util.null2String(rs2.getString("checkway")).trim();
+
+                            int nodeid_new = wfVer.getNodeidByWfidAndOldnodeid(newWfId, nodeid_old);
+                            if (nodeid_new > 0) {
+                                sql3 = "insert into fnafeewfinfonodectrl\n" +
+                                        " (mainid, nodeid, checkway)\n" +
+                                        " values " +
+                                        " (" + newMainid + ", " + nodeid_new + ", '" + StringEscapeUtils.escapeSql(checkway) + "') ";
+                                rs3.executeSql(sql3);
+                            }
+                        }
+
+
+                        //移除指定workflowId缓存中的-自定义费控流程流程的字段对应关系Map对象
+                        FnaWfSetCache.removeFnaWfFieldSetMap(newWfId);
+                        //通过读取配置信息更新缓存
+                        FnaCommon.getFnaWfFieldInfo4Expense(newWfId, new HashMap<String, String>());
+                    }
+                }
+                if (need_removeCache_fnaFeeWfInfoComInfo) {
+                    new FnaFeeWfInfoComInfo().removeCache();
+                }
+            }
+        }
+
+        //发票去重设置生成新版本
+        if (true) {
+            //1.fnaInvoiceWfInfo
+            //2.fnaInvoiceFeeWfInfoLogic
+            //3.fnaInvoiceWfInfoField
+
+            sql1 = "select count(*) cnt from fnaInvoiceWfInfo where workflowid = " + newWfId;
+            rs1.executeSql(sql1);
+            if (!rs1.next() || rs1.getInt("cnt") <= 0) {
+                sql1 = "select * " +//3
+                        " from fnaInvoiceWfInfo " +
+                        " where workflowid = " + oldWfId;
+                rs1.executeSql(sql1);
+                while (rs1.next()) {
+                    int oldMainid = rs1.getInt("id");
+                    int enable = rs1.getInt("enable");
+                    String lastmodifieddate = Util.null2String(rs1.getString("lastmodifieddate")).trim();
+                    //fnaInvoiceWfInfo
+                    String sql2 = "insert into fnaInvoiceWfInfo (workflowid,enable,lastmodifieddate) values (" + newWfId + "," + enable + ",'" + StringEscapeUtils.escapeSql(lastmodifieddate) + "')";
+                    rs2.executeSql(sql2);
+
+                    sql2 = "select max(id) maxid from fnaInvoiceWfInfo where workflowid = " + newWfId;
+                    rs2.executeSql(sql2);
+                    if (rs2.next()) {
+                        int newMainid = rs2.getInt("maxid");
+                        //fnaInvoiceWfInfoField
+                        sql2 = "insert into fnaInvoiceWfInfoField\n" +
+                                "  (mainid, workflowid, formid, fieldid, " +//1
+                                "	fieldname, tabindex, " +//2
+                                "   dtlnumber, isdtl) \n" + //3
+                                " select " + newMainid + ", " + newWfId + ", formid, fieldid, " +//1
+                                "	fieldname, tabindex, " +//2
+                                "	dtlnumber, isdtl " +//3
+                                " from fnaInvoiceWfInfoField " +
+                                " where workflowid = " + oldWfId + " " +
+                                " and mainid = " + oldMainid;
+                        rs2.executeSql(sql2);
+                    }
+                }
+            }
+        }
+
+        //微报账记一笔  可发起的报销流程
+        if (true) {
+
+            if (true) {//1可发起的报销流程赋值
+                String workflowIds = "";
+                rs1.executeQuery("select workflowIds from fnaInvoiceEnterWay");
+                if (rs1.next()) {
+                    workflowIds = Util.null2String(rs1.getString("workflowIds"));
+                }
+                String[] workflowIdsSplit = workflowIds.split(",");
+                StringBuffer workflowIdBuffer = new StringBuffer();
+                for (int i = 0; i < workflowIdsSplit.length; i++) {
+                    String workFlowId = workflowIdsSplit[i];
+                    if (oldWfId == Util.getIntValue(workFlowId, 0)) {
+                        workFlowId = workFlowId + "," + newWfId;
+                    }
+                    if (workflowIdBuffer.length() != 0) {
+                        workflowIdBuffer.append(",");
+                    }
+                    workflowIdBuffer.append(workFlowId);
+                }
+                if (!workflowIds.equals(workflowIdBuffer.toString())) {
+                    rs1.executeUpdate("update fnaInvoiceEnterWay set workflowIds=?", workflowIdBuffer.toString());
+                }
+            }
+            if (true) {//2每个记一笔费用类型中
+                rs1.executeQuery("select id,workflowIds from fnaTakeOneNote");
+                while (rs1.next()) {
+                    String id = Util.null2String(rs1.getString("id"));
+                    String workflowIds = Util.null2String(rs1.getString("workflowIds"));
+                    String[] workflowIdsSplit = workflowIds.split(",");
+                    StringBuilder workflowIdBuffer = new StringBuilder();
+                    for (String s : workflowIdsSplit) {
+                        String workFlowId = s;
+                        if (oldWfId == Util.getIntValue(workFlowId, 0)) {
+                            workFlowId = workFlowId + "," + newWfId;
+                        }
+                        if (workflowIdBuffer.length() != 0) {
+                            workflowIdBuffer.append(",");
+                        }
+                        workflowIdBuffer.append(workFlowId);
+                    }
+                    if (!workflowIds.equals(workflowIdBuffer.toString())) {
+                        rs2.executeUpdate("update fnaTakeOneNote set workflowIds=? where id=?", workflowIdBuffer.toString(), id);
+                    }
+                }
+            }
+            if (true) {//3每个记一笔费用类型中的字段对应
+                String sql = "insert into fnaTakeNoteWfField(mainId,workflowId,formId,fieldId,fieldDbName,dtlNumber,isDtl)" +
+                        " select mainId," + newWfId + ",formId,fieldId,fieldDbName,dtlNumber,isDtl from fnaTakeNoteWfField where workflowId=?";
+                rs1.executeUpdate(sql, oldWfId);
+            }
+        }
+
+
+        {
+            RecordSet mainIdRs = new RecordSet();
+            RecordSet mainTableRs = new RecordSet();
+            RecordSet dtlTableRs = new RecordSet();
+            RecordSet accountIdRs = new RecordSet();
+            String newSubjectMainId = "";
+            String newPeriodMainId = "";
+            String newBearerMainId = "";
+
+            String oldSubjectMainId = "";
+            String oldBearerMainId = "";
+            String oldPeriodMainId = "";
+            List<String> subjectAccountList = new ArrayList<>();
+            List<String> periodAccountList = new ArrayList<>();
+            List<String> bearerAccountList = new ArrayList<>();
+            // 开始复制主表
+            String subjectConfigInsertSql =
+                    " insert into FnaMultiAccountSubject (workflowId,fieldId,accountId,onlyEnd,isFilter,choice) " +
+                            " select " + newWfId + " ,fieldId,accountId,onlyEnd,isFilter,choice from FnaMultiAccountSubject where workflowId = ? ";
+
+            String periodConfigInsertSql =
+                    " insert into FnaMultiPeriodFilter (workflowId,fieldId,accountId,onlyEnd,isFilter,choice) " +
+                            " select " + newWfId + " ,fieldId,accountId,onlyEnd,isFilter,choice  from FnaMultiPeriodFilter where workflowId = ? ";
+            String bearerConfigInsertSql =
+                    " insert into FnaMultiBearerFilter (workflowId,fieldId,accountId,onlyEnd,isFilter,choice) " +
+                            " select " + newWfId + " ,fieldId,accountId,onlyEnd,isFilter,choice  from FnaMultiBearerFilter where workflowId = ? ";
+            mainTableRs.executeUpdate(subjectConfigInsertSql, oldWfId);
+            mainTableRs.executeUpdate(periodConfigInsertSql, oldWfId);
+            mainTableRs.executeUpdate(bearerConfigInsertSql, oldWfId);
+
+            // 根据旧的 wfID 找到对应的 accountId  [账套可能是多个]
+            String subjectAccountSql = " select accountId , fieldId from FnaMultiAccountSubject where workflowId = ? ";
+            String periodAccountSql  = " select accountId , fieldId from FnaMultiPeriodFilter where workflowId = ? ";
+            String bearerAccountSql  = " select accountId , fieldId from FnaMultiBearerFilter where workflowId = ? ";
+            accountIdRs.executeQuery(subjectAccountSql, oldWfId);
+            while (accountIdRs.next()) {
+                subjectAccountList.add(Util.null2String(accountIdRs.getString("accountId")) + "_" +Util.null2String(accountIdRs.getString("fieldId")));
+            }
+            accountIdRs.executeQuery(periodAccountSql, oldWfId);
+            while (accountIdRs.next()) {
+                periodAccountList.add(Util.null2String(accountIdRs.getString("accountId")) + "_" +Util.null2String(accountIdRs.getString("fieldId")));
+
+            }
+            accountIdRs.executeQuery(bearerAccountSql, oldWfId);
+            while (accountIdRs.next()) {
+                bearerAccountList.add(Util.null2String(accountIdRs.getString("accountId")) + "_" +Util.null2String(accountIdRs.getString("fieldId")));
+            }
+
+            // 根据旧的的 wfID 和 accountId / fieldId 找到旧的 MainId
+            // 根据旧的 mainId 找到所对应的数据
+            // 把数据复制到新的 mainId
+            // 更新 FnaMultiAccountSubjectDetail 明细表
+            String subjectConfigSelectSql = " select id from FnaMultiAccountSubject where workflowId = ? and accountId = ? and fieldId = ?";
+            for (String subjectAccountArray : subjectAccountList) {
+                String[] split = subjectAccountArray.split("_");
+                mainIdRs.executeQuery(subjectConfigSelectSql, newWfId, split[0],split[1]);
+                if (mainIdRs.next()) {
+                    newSubjectMainId = Util.null2String(mainIdRs.getString("id"));
+                }
+                mainIdRs.executeQuery(subjectConfigSelectSql, oldWfId, split[0],split[1]);
+                if (mainIdRs.next()) {
+                    oldSubjectMainId = Util.null2String(mainIdRs.getString("id"));
+                }
+                String subjectConfigDtlInsertSql =
+                        " insert into FnaMultiAccountSubjectDetail ( mainId , subjectId , subjectCode ) " +
+                                " select " + newSubjectMainId + " , subjectId , subjectCode from FnaMultiAccountSubjectDetail where mainId = ? ";
+                dtlTableRs.executeUpdate(subjectConfigDtlInsertSql, oldSubjectMainId );
+            }
+
+            // 更新 FnaMultiPeriodFilterDtl 明细表
+            String periodConfigSelectSql = " select id from FnaMultiPeriodFilter where workflowId = ? and accountId = ? and fieldId = ?";
+            for (String periodAccountArray : periodAccountList) {
+                String[] split = periodAccountArray.split("_");
+                mainIdRs.executeQuery(periodConfigSelectSql, newWfId,  split[0],split[1]);
+                if (mainIdRs.next()) {
+                    newPeriodMainId = Util.null2String(mainIdRs.getString("id"));
+                }
+
+                mainIdRs.executeQuery(periodConfigSelectSql, oldWfId,  split[0],split[1]);
+                if (mainIdRs.next()) {
+                    oldPeriodMainId = Util.null2String(mainIdRs.getString("id"));
+                }
+                String periodConfigDtlInsertSql =
+                        " insert into FnaMultiPeriodFilterDtl ( mainId , periodId , periodCode ) " +
+                                " select " + newPeriodMainId + " , periodId , periodCode from FnaMultiPeriodFilterDtl  where  mainId = ? ";
+                dtlTableRs.executeUpdate(periodConfigDtlInsertSql, oldPeriodMainId);
+            }
+
+            // 更新 FnaMultiBearerFilterDetail 明细表
+            String bearerConfigSelectSql = " select id from FnaMultiBearerFilter where workflowId = ? and accountId = ? and fieldId = ? ";
+            for (String bearerAccountArray : bearerAccountList) {
+                String[] split = bearerAccountArray.split("_");
+                mainIdRs.executeQuery(bearerConfigSelectSql, newWfId,  split[0],split[1]);
+                if (mainIdRs.next()) {
+                    newBearerMainId = Util.null2String(mainIdRs.getString("id"));
+                }
+
+                mainIdRs.executeQuery(bearerConfigSelectSql, oldWfId,  split[0],split[1]);
+                if (mainIdRs.next()) {
+                    oldBearerMainId = Util.null2String(mainIdRs.getString("id"));
+                }
+
+                String bearerConfigDtlInsertSql =
+                        " insert into FnaMultiBearerFilterDetail ( mainId , bearerIds , bearerCode ) " +
+                                " select " + newBearerMainId + " , bearerIds , bearerCode from FnaMultiBearerFilterDetail where mainId = ? ";
+                dtlTableRs.executeUpdate(bearerConfigDtlInsertSql, oldBearerMainId);
+            }
+        }
+        FnaWorkflowSetUtils.createNewWorkflowVersion(oldWfId, newWfId, ip, user);
+    }
+
+
+    /**
+     * 左侧填充字符串
+     */
+    public final static int LEFT = 0;
+
+    /**
+     * 右侧填充字符串
+     */
+    public final static int RIGHT = 1;
+
+    /**
+     * 填充字符串
+     *
+     * @param srcStr
+     * @param fillChar
+     * @param length
+     * @param leftOrRight 填充左侧：DooGlobalBase.LEFT；填充右侧：DooGlobalBase.RIGHT
+     * @return
+     */
+    public static String fillStr(final String srcStr, final char fillChar, final int length, final int leftOrRight) {
+        final StringBuilder formatStr = new StringBuilder("");
+        for (int i = srcStr.getBytes().length; i < length; i++) {
+            formatStr.append(fillChar);
+        }
+        if (leftOrRight == FnaCommon.LEFT) {
+            return formatStr.toString() + srcStr;
+        } else if (leftOrRight == FnaCommon.RIGHT) {
+            return srcStr + formatStr.toString();
+        }
+        return "";
+    }
+
+    /**
+     * 将dataArray中的数据，按900个一组（每一项之间使用英文半角逗号分隔）set到return的List中去
+     *
+     * @param dataArray
+     * @return
+     */
+    public static List<String> initData1(String[] dataArray) {
+        List<String> dataList = Arrays.asList(dataArray);
+        return FnaCommon.initData1(dataList);
+    }
+
+    /**
+     * 将dataList中的数据，按900个一组（每一项之间使用英文半角逗号分隔）set到return的List中去
+     *
+     * @param dataList
+     * @return
+     */
+    public static List<String> initData1(List<String> dataList) {
+        List<String> distinct_list = new ArrayList<String>();
+        ArrayList<String> list = new ArrayList<String>();
+        int dataListLen = dataList.size();
+        int sqlCond_Index = 0;
+        while (sqlCond_Index < dataListLen) {
+            StringBuffer sqlCond_ids = new StringBuffer("");
+            for (int i = 0; i < 900; i++) {
+                if (sqlCond_Index == dataListLen) {
+                    break;
+                }
+                String key1 = dataList.get(sqlCond_Index);
+                if (!"".equals(key1) && !distinct_list.contains(key1)) {
+                    distinct_list.add(key1);
+                    if (sqlCond_ids.length() > 0) {
+                        sqlCond_ids.append(",");
+                    }
+                    sqlCond_ids.append(key1);
+                }
+                sqlCond_Index++;
+            }
+            if (sqlCond_ids.length() > 0) {
+                list.add(sqlCond_ids.toString());
+            }
+        }
+        return list;
+    }
+
+    /**
+     * 获取传入人员id（userid）的相关信息（传入人员、所属部门、所属分部，关联的第一个成本中心的id和名称）
+     *
+     * @param dataMapHrm lastname;deptId;deptName;subcomId;subcomName;fccId;fccName;
+     * @param userid     人员id
+     */
+    public static void getHrmResourceInfo(HashMap<String, String> dataMapHrm, int userid) {
+
+        FnaSystemSetComInfo fnaSystemSetComInfo = new FnaSystemSetComInfo();
+        String fccFilterRule = Util.null2String(fnaSystemSetComInfo.get_fccFilterRule(), "");//成本中心按关联对象过滤
+        boolean isFilter = false;//是否需要考虑规则
+        //判断 成本中心按关联对象过滤 的已配置的规则
+        int count = FnaCostCenter.fccFilterRuleChoice.length;
+        boolean[] aaaa = new boolean[count];
+        for (int i = 1; i <= count; i++) {
+            if (("," + fccFilterRule + ",").indexOf(("," + i + ",")) > -1) {
+                aaaa[i - 1] = true;
+                isFilter = true;
+            } else {
+                aaaa[i - 1] = false;
+            }
+        }
+        boolean openSub = (count >= 1 ? aaaa[0] : false);
+        boolean openDept = (count >= 2 ? aaaa[1] : false);
+        boolean openHrm = (count >= 3 ? aaaa[2] : false);
+
+        ResourceComInfo rci = null;
+        try {
+            rci = new ResourceComInfo();
+        } catch (Exception ex) {
+        }
+        DepartmentComInfo dci = new DepartmentComInfo();
+        SubCompanyComInfo scci = new SubCompanyComInfo();
+
+        String _userid = String.valueOf(userid);
+
+        String lastname = "";
+        String deptId = "";
+        String deptName = "";
+        String subcomId = "";
+        String subcomName = "";
+        String fccId = "";
+        String fccName = "";
+
+        if ("1".equals(fnaSystemSetComInfo.get_fnaBudgetOAOrg())) {
+            lastname = rci.getLastname(_userid);
+            deptId = rci.getDepartmentID(_userid);
+            deptName = dci.getDepartmentname(deptId);
+            subcomId = rci.getSubCompanyID(_userid);
+            subcomName = scci.getSubCompanyname(subcomId);
+        }
+
+        if ("1".equals(fnaSystemSetComInfo.get_fnaBudgetCostCenter())) {
+            RecordSet rs = new RecordSet();
+            String sql02 = "select a.id fccId, a.name fccName, b.type " +
+                    " from FnaCostCenter a " +
+                    " join FnaCostCenterDtl b on a.id = b.fccId " +
+                    " where (a.Archive is null or a.Archive = 0) and ((b.objId=? and b.type=1) or (b.objId=? and b.type=2) or (b.objId=? and b.type=3)) " +
+                    " order by b.type desc, a.code, a.name, a.id";
+            rs.executeQuery(sql02, Util.getIntValue(subcomId), Util.getIntValue(deptId), userid);
+            while (rs.next()) {
+                int type = Util.getIntValue(rs.getString("type"));
+                if (type == 3 && (!isFilter || (isFilter && openHrm))) {//通过人员关联关系带出成本中心
+                    fccId = Util.null2String(rs.getString("fccId"));
+                    fccName = Util.null2String(rs.getString("fccName"));
+                    break;
+                } else if (type == 2 && (!isFilter || (isFilter && openDept))) {//通过人员所属部门关联关系带出成本中心
+                    fccId = Util.null2String(rs.getString("fccId"));
+                    fccName = Util.null2String(rs.getString("fccName"));
+                    break;
+                } else if (type == 1 && (!isFilter || (isFilter && openSub))) {//通过人员所属分部关联关系带出成本中心
+                    fccId = Util.null2String(rs.getString("fccId"));
+                    fccName = Util.null2String(rs.getString("fccName"));
+                    break;
+                }
+            }
+        }
+
+        dataMapHrm.put("lastname", lastname);
+        dataMapHrm.put("deptId", deptId);
+        dataMapHrm.put("deptName", deptName);
+        dataMapHrm.put("subcomId", subcomId);
+        dataMapHrm.put("subcomName", subcomName);
+        dataMapHrm.put("fccId", fccId);
+        dataMapHrm.put("fccName", fccName);
+    }
+
+    /**
+     * 判断当前 流程 是否需要进行费控校验
+     *
+     * @param workflowid               流程ID
+     * @param requestid                请求ID
+     * @param dataMap                  流程字段对应信息,可以传 null
+     * @param isprint                  是否打印日志
+     * @param isDB                     <li>true=校验数据库的值, 此时 _value_main_fieldIdSfysn 可以是任意值;
+     *                                 <li>false=校验页面上的值,此时 _value_main_fieldIdSfysn 应该取值于页面;
+     * @param _value_main_fieldIdSfysn 真值
+     * @return boolean true=需要费控校验; false=不需要费控校验
+     */
+    @Deprecated
+    public static boolean isNeedControl(
+            int workflowid,
+            int requestid,
+            Map<String, String> dataMap,
+            boolean isprint,
+            boolean isDB,
+            int _value_main_fieldIdSfysn) {
+
+        boolean isControl = true;//默认需要费控
+
+        int condition = FnaCommon.isNeedControl_New(workflowid, requestid, dataMap, isprint, isDB, _value_main_fieldIdSfysn);
+
+        if (condition == 0 || condition == 2) {//0=预算外;2=预算内,且不做任何校验;
+            isControl = false;
+        } else if (condition == 1) {//1=预算内,且按照标准的费控逻辑进行判断;
+            isControl = true;
+        }
+        return isControl;
+    }
+
+    /**
+     * 判断当前 流程 所属的费控情况是什么
+     *
+     * @param workflowid               流程ID
+     * @param requestid                请求ID
+     * @param dataMap                  流程字段对应信息,可以传 null
+     * @param isprint                  是否打印日志
+     * @param isDB                     <li>true=校验数据库的值, 此时 _value_main_fieldIdSfysn 可以是任意值;
+     *                                 <li>false=校验页面上的值,此时 _value_main_fieldIdSfysn 应该取值于页面;
+     * @param _value_main_fieldIdSfysn 真值
+     * @return int 情况含义:
+     * <li>0=预算外;
+     * <li>1=预算内,且按照标准的费控逻辑进行判断;
+     * <li>2=预算内,且不做任何校验;
+     */
+    public static int isNeedControl_New(
+            int workflowid,
+            int requestid,
+            Map<String, String> dataMap,
+            boolean isprint,
+            boolean isDB,
+            int _value_main_fieldIdSfysn) {
+
+        int isControl = 1;//默认需要费控
+        RecordSet rs = new RecordSet();
+        boolean result = false;//sql 语句执行是否成功
+        String sql = "";
+        int formid = -100;
+        BaseBean bb = new BaseBean();
+
+        if (!isDB && _value_main_fieldIdSfysn < 0) {//校验页面上的值 且 页面没有选择值
+            isControl = 1;
+            return isControl;
+        }
+
+
+        if (dataMap == null) {
+            dataMap = new HashMap<String, String>();
+            FnaCommon.getFnaWfFieldInfo4Expense(workflowid, dataMap);
+        }
+
+        if (requestid <= 0) {//是新建的流程
+            isDB = false;
+        }
+
+        try {
+            //(1)下拉框字段filedName
+            String filedname = Util.null2s(dataMap.get("main_fieldIdSfysn_fieldName"), "");
+            if ("".equals(filedname)) {
+                isControl = 1;//流程没有费控配置信息,则默认需要费控
+                return isControl;
+            } else {
+                //(2)需要费控 的真值
+                List<String> selectvalueList = new ArrayList<String>();
+                selectvalueList.add("");//不填默认也是需要费控
+                selectvalueList.add("-100");//不填默认也是需要费控
+                selectvalueList.add("1");// 1=是=预算内
+
+                //(3)判断当前流程是否需要费控
+                if (isDB) {//是数据库的值,则校验数据库的
+                    String formValue = "";//字段在表单中的值
+                    //(3-1)获取流程表单中的下拉框字段的值
+                    sql = "select * from workflow_base where id = " + workflowid;
+                    result = rs.executeQuery(sql);
+                    if (!result) {
+                        isControl = 1;
+                        return isControl;
+                    } else {
+                        if (rs.next()) {
+                            formid = Math.abs(Util.getIntValue(rs.getString("formid")));
+                        }
+                    }
+
+                    String maintable = "formtable_main_" + formid;//当前流程主表英文名称
+
+                    sql = " select a." + filedname + " as filedValue from " + maintable + " a where a.requestid=" + requestid;
+                    if (isprint) {
+                        bb.writeLog("FnaCommon.java 4700 sql=" + sql);
+                    }
+                    result = rs.executeQuery(sql);
+                    if (!result) {
+                        isControl = 1;
+                        return isControl;
+                    } else {
+                        if (rs.next()) {
+                            formValue = Util.null2String(rs.getString("filedValue"), "").trim();
+                        }
+                    }
+                    //(3-1)判断表单中的值 是否 是需要费控的值, 是则需要费控;否则不需要费控
+                    if (selectvalueList.contains(formValue)) {
+                        isControl = 1;
+                    } else {
+                        int ssss = Util.getIntValue(formValue, 1);
+                        if (0 <= ssss && ssss <= 2) {
+                            isControl = ssss;
+                        } else {
+                            isControl = 1;
+                        }
+                    }
+                } else {//是页面上的值,则校验页面的
+                    //(3-2)判断表单中的值 是否 是需要费控的值, 是则需要费控;否则不需要费控
+                    if (selectvalueList.contains(String.valueOf(_value_main_fieldIdSfysn))) {
+                        isControl = 1;
+                    } else {
+                        int ssss = _value_main_fieldIdSfysn;
+                        if (0 <= ssss && ssss <= 2) {
+                            isControl = ssss;
+                        } else {
+                            isControl = 1;
+                        }
+                    }
+                }
+            }
+        } catch (Exception e) {
+            return isControl;
+        }
+        return isControl;
+    }
+
+    /**
+     * 校验承担主体ID是否存在
+     *
+     * @param rs2
+     * @param organizationtype
+     * @param organizationid
+     */
+    public static String checkCdzt(RecordSet rs2, int organizationtype, int organizationid) {
+        String result = "";
+        //802939 承担主体会消失,需要校验是否存在
+        String sql = "";
+        String orgTypeName = "";
+        if (organizationtype == 1) {
+            sql = " select a.id, a.subcompanyname name from HrmSubCompany a where a.id = ? ";
+            orgTypeName = SystemEnv.getHtmlLabelName(141, 7);
+        } else if (organizationtype == 2) {
+            sql = " select a.id, a.departmentname name from HrmDepartment a where a.id = ? ";
+            orgTypeName = SystemEnv.getHtmlLabelName(124, 7);
+        } else if (organizationtype == 3) {
+            sql = " select a.id, a.lastname name from HrmResource a where a.id = ? ";
+            orgTypeName = SystemEnv.getHtmlLabelName(6087, 7);
+        } else if (organizationtype == FnaCostCenter.ORGANIZATION_TYPE) {
+            sql = " select a.id, a.name name from FnaCostCenter a where a.id = ? ";
+            orgTypeName = SystemEnv.getHtmlLabelName(515, 7);
+        }
+        rs2.executeQuery(sql, organizationid);
+        if (rs2.next()) {
+        } else {
+            result = "" + weaver.systeminfo.SystemEnv.getHtmlLabelName(10003246, weaver.general.ThreadVarLanguage.getLang()) + "" + orgTypeName + "ID : " + organizationid + " " + weaver.systeminfo.SystemEnv.getHtmlLabelName(24233, weaver.general.ThreadVarLanguage.getLang()) + "OA" + weaver.systeminfo.SystemEnv.getHtmlLabelName(10003247, weaver.general.ThreadVarLanguage.getLang()) + "";
+        }
+
+        return result;
+    }
+}
diff --git a/src/main/youhong_ai_old_src/weaver/fna/invoice/common/FnaInvoiceCommon.java b/src/main/youhong_ai_old_src/weaver/fna/invoice/common/FnaInvoiceCommon.java
new file mode 100644
index 0000000..65d2300
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/fna/invoice/common/FnaInvoiceCommon.java
@@ -0,0 +1,2523 @@
+/*
+ *
+ Copyright (c) 2001-2016 泛微软件.
+ * 泛微协同商务系统,版权所有.
+ * 
+ */
+package weaver.fna.invoice.common;
+
+import java.io.*;
+import java.security.MessageDigest;
+import java.text.DecimalFormat;
+import java.text.SimpleDateFormat;
+import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.jsp.JspWriter;
+
+
+import com.api.doc.detail.service.DocSaveService;
+import com.engine.fna.util.FnaTakeOneNoteCostTypeUtil;
+import com.engine.personalIncomeTax.biz.RecordsBiz;
+import org.apache.commons.lang.StringEscapeUtils;
+import org.apache.http.HttpResponse;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.DefaultHttpClient;
+import org.apache.http.util.EntityUtils;
+
+import com.cloudstore.dev.api.util.APPManager;
+
+//import b.a.a.ac.r;
+
+import org.apache.commons.codec.binary.Base64;
+
+import net.coobird.thumbnailator.Thumbnails;
+import net.sf.json.JSONArray;
+import net.sf.json.JSONObject;
+import weaver.conn.BatchRecordSet;
+import weaver.conn.RecordSet;
+import weaver.file.ImageFileManager;
+import weaver.fna.e9.po.base.FnaInvoiceLedger;
+import weaver.fna.general.FnaCommon;
+import weaver.fna.general.FnaLogSqlUtil;
+import weaver.fna.invoice.entity.FnaInvoiceInterface;
+import weaver.fna.invoice.entity.FnaInvoiceLedgerDetail;
+import weaver.fna.invoice.interfaces.baiwang.FnaBaiwangOpenApi;
+import weaver.fna.invoice.sdk.SdkInvoiceUtil;
+import weaver.fna.invoice.utils.*;
+import weaver.general.BaseBean;
+import weaver.general.ThreadVarLanguage;
+import weaver.general.Util;
+import weaver.hrm.User;
+import weaver.hrm.company.DepartmentComInfo;
+import weaver.hrm.company.SubCompanyComInfo;
+import weaver.hrm.resource.ResourceBelongtoComInfo;
+import weaver.hrm.resource.ResourceComInfo;
+import weaver.sm.SM4Utils;
+import weaver.systeminfo.SystemEnv;
+
+
+/**
+ * 发票公共处理类
+ *
+ */
+@SuppressWarnings({ "rawtypes", "deprecation" })
+public final class FnaInvoiceCommon extends BaseBean{
+
+	//ea92aec4-45f2-4ef9-9fd6-b25000481ba4,password
+	public static final String MDE_CODE = "WEAVER_39CE313C5FAAC649EF10269F69C06B3D";
+
+	//56f3236a-a9c6-40b5-84e6-56749fba3012,client_secret
+	public static final String MDE_CODE_CLIENT_SECRET = "WEAVER_FFC947EA939B3C5F74A53C8F0D9F99F5";
+
+	//978c7c07-24f0-4a65-97aa-50f9d4f88ace,sqm
+	public static final String MDE_CODE_SQM = "WEAVER_D8165D1FBC808F0DFE4016073A3A2A80";
+
+	//de9a995f-79c5-43dc-b353-4a3f3f82ff6b,SM4加密密钥
+	public static  String SM4 = "";
+    static {
+		getSM();
+	}
+	public static void  getSM(){
+		//初始化前fnaEncryptInfo表中无数据，考虑老数据问题，如果fnainvoiceinterface表中有数据，使用老的加密方式，否则随机生成一个
+		RecordSet rs = new RecordSet();
+		SM4="";
+		int sign=0;
+		rs.executeQuery("select smkey,sign from fnaEncryptInfo");
+		if(rs.next()){
+			SM4 = Util.null2String(rs.getString("smkey"));
+			sign = Util.getIntValue(rs.getString("sign"),0);
+		}
+		if(sign!=1){
+			int cnt=0;
+			rs.executeQuery("select count(id) cnt from fnainvoiceinterface");
+			if(rs.next()){
+				cnt = Util.getIntValue(rs.getString("cnt"),0);
+			}
+			if(cnt<=0) {
+				SM4 = FnaCommon.getPrimaryKeyGuid1();
+				rs.executeUpdate("update fnaEncryptInfo set smkey=?,sign=?",SM4,"1");
+			}
+
+		}
+	}
+
+
+	/** 金额格式化对象；保留两位小数*/
+	DecimalFormat df = new DecimalFormat("####################################################0.00");
+
+	/**来自微信*/
+	public static final int INVOICESOURCE_WECHAT = 1;
+
+	/**来自国信*/
+	public static final int INVOICESOURCE_GUOXIN = 2;
+
+	/**来自台帐*/
+	public static final int INVOICESOURCE_TAIZHANG = 3;
+
+	/**来自百望*/
+	public static final int INVOICESOURCE_BAIWANG = 4;
+
+	/**来自发票识别*/
+	public static final int INVOICESOURCE_OCR = 5;
+
+	/**来自发票识别*/
+	public static final int INVOICESOURCE_EMAIL = 6;
+
+	/**初始状态*/
+	public static final int INIT_STATUS = 0;
+
+	/**冻结状态*/
+	public static final int LOCK_STATUS = 1;
+
+	/**核销状态*/
+	public static final int CLOSURE_STATUS = 2;
+
+	/** 批量更新发票状态*/
+	private String UPDATEINVOICESTATUS_URL = "https://qyapi.weixin.qq.com/cgi-bin/card/invoice/reimburse/updatestatusbatch?access_token=";
+
+	/** 批量查询电子发票*/
+	private String GETINVOICEINFOBATCH_URL = "https://qyapi.weixin.qq.com/cgi-bin/card/invoice/reimburse/getinvoiceinfobatch?access_token=";
+
+	/** corpId 企业号ID*/
+	private String corpId = "";
+
+	/** 最大上传大小 2.5 * 1024 * 1024 */
+	public static final double MAX_BYTES = 2.5 * 1000 * 1000;
+	/** 最大上传大小 2.5 * 1024 * 1024 */
+	public static final double MAX_BYTES_RQ = 8.0 * 1000 * 1000;
+	/**压缩图片质量递减间隔*/
+	private static final double DIMINISHING_INTERVAL = 0.5d;
+
+
+
+
+	/**
+	 * 错误信息
+	 */
+	private final static ConcurrentHashMap<String, String> CONCURRENT_HASH_MAP = new ConcurrentHashMap<String, String>();
+
+	static{
+		CONCURRENT_HASH_MAP.put("72015", ""+ SystemEnv.getHtmlLabelName(10003250,weaver.general.ThreadVarLanguage.getLang())+"");
+		CONCURRENT_HASH_MAP.put("72017", ""+ SystemEnv.getHtmlLabelName(10003251,weaver.general.ThreadVarLanguage.getLang())+"");
+		CONCURRENT_HASH_MAP.put("72023", ""+ SystemEnv.getHtmlLabelName(10003252,weaver.general.ThreadVarLanguage.getLang())+"/"+ SystemEnv.getHtmlLabelName(10003253,weaver.general.ThreadVarLanguage.getLang())+"/App"+ SystemEnv.getHtmlLabelName(10003254,weaver.general.ThreadVarLanguage.getLang())+"");
+		CONCURRENT_HASH_MAP.put("72024", ""+ SystemEnv.getHtmlLabelName(10003255,weaver.general.ThreadVarLanguage.getLang())+"");
+		CONCURRENT_HASH_MAP.put("72025", "wx_invoice_token "+ SystemEnv.getHtmlLabelName(2245,weaver.general.ThreadVarLanguage.getLang())+"");
+		CONCURRENT_HASH_MAP.put("72028", ""+ SystemEnv.getHtmlLabelName(10003256,weaver.general.ThreadVarLanguage.getLang())+"");
+		CONCURRENT_HASH_MAP.put("72029", ""+ SystemEnv.getHtmlLabelName(10003257,weaver.general.ThreadVarLanguage.getLang())+"");
+		CONCURRENT_HASH_MAP.put("72030", "mchid "+ SystemEnv.getHtmlLabelName(2245,weaver.general.ThreadVarLanguage.getLang())+"");
+		CONCURRENT_HASH_MAP.put("72031", ""+ SystemEnv.getHtmlLabelName(10003258,weaver.general.ThreadVarLanguage.getLang())+"");
+		CONCURRENT_HASH_MAP.put("72035", ""+ SystemEnv.getHtmlLabelName(10003259,weaver.general.ThreadVarLanguage.getLang())+"order_id"+ SystemEnv.getHtmlLabelName(10003260,weaver.general.ThreadVarLanguage.getLang())+"order_id"+ SystemEnv.getHtmlLabelName(10003261,weaver.general.ThreadVarLanguage.getLang())+"");
+		CONCURRENT_HASH_MAP.put("72036", ""+ SystemEnv.getHtmlLabelName(10003262,weaver.general.ThreadVarLanguage.getLang())+"");
+		CONCURRENT_HASH_MAP.put("72038", ""+ SystemEnv.getHtmlLabelName(10003263,weaver.general.ThreadVarLanguage.getLang())+" appid 、"+ SystemEnv.getHtmlLabelName(10003264,weaver.general.ThreadVarLanguage.getLang())+" appid 、"+ SystemEnv.getHtmlLabelName(26738,weaver.general.ThreadVarLanguage.getLang())+" order_id "+ SystemEnv.getHtmlLabelName(386675,weaver.general.ThreadVarLanguage.getLang())+"");
+		CONCURRENT_HASH_MAP.put("72039", ""+ SystemEnv.getHtmlLabelName(10003265,weaver.general.ThreadVarLanguage.getLang())+"");
+		CONCURRENT_HASH_MAP.put("72040", "Pdf "+ SystemEnv.getHtmlLabelName(10003266,weaver.general.ThreadVarLanguage.getLang())+" pdf");
+		CONCURRENT_HASH_MAP.put("72042", ""+ SystemEnv.getHtmlLabelName(10003267,weaver.general.ThreadVarLanguage.getLang())+"");
+		CONCURRENT_HASH_MAP.put("72043", ""+ SystemEnv.getHtmlLabelName(10003268,weaver.general.ThreadVarLanguage.getLang())+"");
+		CONCURRENT_HASH_MAP.put("72044", ""+ SystemEnv.getHtmlLabelName(10003269,weaver.general.ThreadVarLanguage.getLang())+"");
+		CONCURRENT_HASH_MAP.put("40078", "card_id"+ SystemEnv.getHtmlLabelName(10003270,weaver.general.ThreadVarLanguage.getLang())+" "+ SystemEnv.getHtmlLabelName(10003271,weaver.general.ThreadVarLanguage.getLang())+" "+ SystemEnv.getHtmlLabelName(10003272,weaver.general.ThreadVarLanguage.getLang())+"card_id"+ SystemEnv.getHtmlLabelName(10003273,weaver.general.ThreadVarLanguage.getLang())+"");
+	}
+
+	/**
+	 * 构造方法
+	 */
+	public FnaInvoiceCommon(){
+		corpId = getPropValue("wechatElecInvoice_e9", "corpId").trim();
+	}
+
+	/**
+	 * 发票代码校验
+	 * @param invoiceCode
+	 * @throws Exception
+	 */
+	public void checkInvoicecodeIflegal(String invoiceCode,int invoiceTypeSrc) throws Exception{
+		int invoiceType = 0;
+		if(invoiceCode.length() == 10){
+			String eight = String.valueOf(invoiceCode.charAt(7));
+			if("1".equals(eight) || "2".equals(eight) || "5".equals(eight) || "7".equals(eight)){
+				invoiceType = 1;
+			}else if("3".equals(eight) || "6".equals(eight)){
+				invoiceType = 2;
+			}
+		}else if(invoiceCode.length() == 12){
+			String first = String.valueOf(invoiceCode.charAt(0));
+			String elevenTwelve = String.valueOf(invoiceCode.charAt(10)) + String.valueOf(invoiceCode.charAt(11));
+			if("0".equals(first) && ("04".equals(elevenTwelve) || "05".equals(elevenTwelve) || "06".equals(elevenTwelve) || "07".equals(elevenTwelve)
+					|| "11".equals(elevenTwelve) || "12".equals(elevenTwelve))){
+				invoiceType = 2;
+			}
+		}
+		//没有发票类型
+		if(invoiceType == 0){
+			throw new Exception("请输入正确的发票代码！");
+		}
+		//发票代码与发票类型不匹配
+		if((invoiceTypeSrc == 1 && invoiceType == 1) || (invoiceTypeSrc == 2 && invoiceType == 2)){
+			throw new Exception("请输入正确的发票代码！！");
+		}
+	}
+
+	/**
+	 * 新建或更新发票
+	 * @param request
+	 * @param response
+	 * @param out
+	 * @param user
+	 */
+	public void saveInvoice(HttpServletRequest request, HttpServletResponse response, JspWriter out, User user) throws Exception{
+		String entryTime = Util.date(2);//录入时间
+		int userid = user.getUID();
+		int language = user.getLanguage();
+		StringBuffer errorMsg = new StringBuffer();
+		RecordSet rs = new RecordSet();
+		BatchRecordSet brs = new BatchRecordSet();
+		int currentid = Util.getIntValue(request.getParameter("id"),0);
+		String billingDate = Util.null2String(request.getParameter("billingDate"));
+		String invoiceCode = Util.null2String(request.getParameter("invoiceCode"));
+		String invoiceNumber = Util.null2String(request.getParameter("invoiceNumber"));
+		int invoiceType = Util.getIntValue(request.getParameter("invoiceType"));
+		String checkCode = Util.null2String(request.getParameter("checkCode"));
+		String seller = Util.null2String(request.getParameter("seller"));
+		String purchaser = Util.null2String(request.getParameter("purchaser"));
+		String purchaserTaxNo=Util.null2String(request.getParameter("purchaserTaxNo"));
+		String salesTaxNo=Util.null2String(request.getParameter("salesTaxNo"));
+		int indexnum = Util.getIntValue(request.getParameter("linkage_indexnum"));
+		double priceWithoutTax = Util.getDoubleValue(request.getParameter("priceWithoutTax"),0.00);
+		double tax = Util.getDoubleValue(request.getParameter("tax"),0.00);
+		double taxIncludedPrice = Util.getDoubleValue(request.getParameter("taxIncludedPrice"),0.00);
+		try {
+			//校验invoiceCode发票代码
+			Pattern pattern = Pattern.compile("[0-9]*");
+			Matcher isNum = pattern.matcher(invoiceCode);
+			if(!isNum.matches()){
+				throw new Exception(SystemEnv.getHtmlLabelName(10000026, Util.getIntValue(language)));//XXX数据不正确
+			}
+			//存在10位和12位两种情况
+			if(invoiceCode.length() != 10 && invoiceCode.length() != 12){
+				throw new Exception(SystemEnv.getHtmlLabelName(10000026, Util.getIntValue(language))+"！");//XXX数据不正确
+			}
+			/**
+			if(invoiceType == 1){//增值税普通发票
+				//当位数为12位时，不需要判断，当位数为10位时需判断
+				if(invoiceCode.length() == 10 && !invoiceCode.substring(invoiceCode.length()-2, invoiceCode.length()-1).equals("2")){
+					throw new Exception(SystemEnv.getHtmlLabelName(10000026,weaver.general.Util.getIntValue(language))+"！！！");//XXX数据不正确
+				}
+			}else if(invoiceType == 2){//增值税专用发票
+				if(invoiceCode.length() == 10 && !invoiceCode.substring(invoiceCode.length()-2, invoiceCode.length()-1).equals("3")){
+					throw new Exception(SystemEnv.getHtmlLabelName(10000026,weaver.general.Util.getIntValue(language))+"！！！");//XXX数据不正确
+				}
+				if(invoiceCode.length() == 12){
+					throw new Exception(SystemEnv.getHtmlLabelName(10000026,weaver.general.Util.getIntValue(language))+"！！！");//XXX数据不正确
+				}
+			}
+			*/
+			checkInvoicecodeIflegal(invoiceCode,invoiceType);
+			//校验invoiceNumber发票号码
+			isNum = pattern.matcher(invoiceNumber);
+			if(!isNum.matches()){
+				throw new Exception(SystemEnv.getHtmlLabelName(10000027, Util.getIntValue(language)));//XXX数据不正确
+			}
+			if(invoiceNumber.length() != 8){
+				throw new Exception(SystemEnv.getHtmlLabelName(10000027, Util.getIntValue(language))+"！！");//XXX数据不正确
+			}
+			String sql = "select * from FnaInvoiceLedger  where invoiceNumber = '"+invoiceNumber+"'";
+			boolean flag = rs.execute(sql);
+			if(!flag)throw new Exception(SystemEnv.getHtmlLabelName(10000018, Util.getIntValue(language)));//数据库错误！请联系管理员！
+			int id = 0;
+			String invoiceNo = "";
+			if(rs.next()){
+				id = Util.getIntValue(rs.getString("id"));
+				invoiceNo = Util.null2String(rs.getString("invoiceNumber"));
+			}
+			if(id != 0 && currentid != id && invoiceNumber.equals(invoiceNo)){
+				throw new Exception(SystemEnv.getHtmlLabelName(10000028, Util.getIntValue(language)).replace("#replaceString#", "【"+invoiceCode+"】【"+invoiceNumber+"】"));//XXX已存在！
+			}
+			//校验invoiceType发票类型
+			if(invoiceType != 1 && invoiceType != 2 && invoiceType != 15 && invoiceType != 16 && invoiceType != 20){
+				throw new Exception(SystemEnv.getHtmlLabelName(10000031, Util.getIntValue(language)));
+			}
+			//校验checkCode校验码
+			if(invoiceType == 1){//普通发票校验，专用发票没有校验码
+				if(checkCode == null){
+					throw new Exception(SystemEnv.getHtmlLabelName(10000142,language));//XXX不能为空！
+				}
+				pattern = Pattern.compile("^[0-9]{20}$");
+				Matcher matcher = pattern.matcher(checkCode.trim());
+				if(!matcher.matches()){
+					throw new Exception(SystemEnv.getHtmlLabelName(10000143,language));//XXX必须为长度是20的数字！
+				}
+			}
+			//校验明细信息
+			for(int i = 0;i<indexnum;i++){
+				String _invoiceServiceYype = Util.null2String(request.getParameter("invoiceServiceYype_"+i));
+				double _taxRate = Util.getDoubleValue(request.getParameter("taxRate_"+i),0.00);
+				if("".equals(_invoiceServiceYype)){
+					continue;
+				}
+				//判断税额是否是金额税率的乘积
+				//金额税额都有可能为负数
+//				if(_priceWithoutTax <= 0)throw new Exception(SystemEnv.getHtmlLabelNames("131493,130802",language)+"！");
+				if(_taxRate < 0)throw new Exception(SystemEnv.getHtmlLabelName(10000037, Util.getIntValue(language))+"！");
+//				if(_tax < 0)throw new Exception(SystemEnv.getHtmlLabelNames("131495,130802",language)+"！");
+				//计算可能存在偏差，暂时不需要校验，待发票验证时校验
+//				double tax1 = Util.getDoubleValue((_priceWithoutTax * (_taxRate / 100.0)+"").substring(0, ((_priceWithoutTax * (_taxRate / 100.0)+"").indexOf(".")+3)));
+//				if(_tax != tax1)
+//				throw new Exception(SystemEnv.getHtmlLabelNames("131517",language)+"！");
+
+			}
+			//保存发票主表信息
+			if(currentid > 0){//更新发票
+				String update = "update FnaInvoiceLedger set billingDate='"+StringEscapeUtils.escapeSql(billingDate)+"',"+
+						" invoiceCode='"+StringEscapeUtils.escapeSql(invoiceCode)+"',"+
+						" invoiceNumber='"+StringEscapeUtils.escapeSql(invoiceNumber)+"',"+
+						" invoiceType='"+invoiceType+"',"+
+						" checkCode='"+StringEscapeUtils.escapeSql(checkCode)+"',"+
+						" seller='"+StringEscapeUtils.escapeSql(seller)+"',"+
+						" purchaser='"+StringEscapeUtils.escapeSql(purchaser)+"',"+
+						" purchaserTaxNo='"+StringEscapeUtils.escapeSql(purchaserTaxNo)+"',"+
+						" salesTaxNo='"+StringEscapeUtils.escapeSql(salesTaxNo)+"',"+
+						" priceWithoutTax = "+df.format(priceWithoutTax)+","+
+						" tax = "+df.format(tax)+","+
+						" taxIncludedPrice = "+df.format(taxIncludedPrice)+" "+
+						" where id = "+currentid;
+				rs.execute(update);
+			}else{
+				String insert = "insert into FnaInvoiceLedger(billingDate,invoiceCode,invoiceNumber,invoiceType,checkCode,seller,purchaser,purchaserTaxNo,salesTaxNo,priceWithoutTax,tax,taxIncludedPrice,authenticity"+
+						",userid_new,invoiceSource_new,status,entryTime) values ("+
+						"'"+StringEscapeUtils.escapeSql(billingDate)+"',"+
+						"'"+StringEscapeUtils.escapeSql(invoiceCode)+"',"+
+						"'"+StringEscapeUtils.escapeSql(invoiceNumber)+"',"+
+						""+invoiceType+","+
+						"'"+StringEscapeUtils.escapeSql(checkCode)+"',"+
+						"'"+StringEscapeUtils.escapeSql(seller)+"',"+
+						"'"+StringEscapeUtils.escapeSql(purchaser)+"',"+
+						"'"+StringEscapeUtils.escapeSql(purchaserTaxNo)+"',"+
+						"'"+StringEscapeUtils.escapeSql(salesTaxNo)+"',"+
+						""+df.format(priceWithoutTax)+","+
+						""+df.format(tax)+","+
+						""+df.format(taxIncludedPrice)+","+
+						""+0+","+
+						""+userid+","+
+						""+INVOICESOURCE_TAIZHANG+","+
+						""+INIT_STATUS+","+
+						"'"+entryTime+"'"+
+						")";
+				rs.execute(insert);
+				sql = "select max(id) maxid from FnaInvoiceLedger";
+				rs.execute(sql);
+				int maxid = 0;
+				if(rs.next()){
+					maxid = Util.getIntValue(rs.getString("maxid"));
+				}
+				currentid = maxid;
+			}
+
+			String delete = "delete from FnaInvoiceLedgerDetail where mainid = "+currentid;
+			rs.execute(delete);
+			List<String> insertList = new ArrayList<String>();
+			for(int i = 0;i<indexnum;i++){
+				String _invoiceServiceYype = Util.null2String(request.getParameter("invoiceServiceYype_"+i));
+				double _priceWithoutTax = Util.getDoubleValue(request.getParameter("priceWithoutTax_"+i),0.00);
+				double _taxRate = Util.getDoubleValue(request.getParameter("taxRate_"+i),0.00);
+				double _tax = Util.getDoubleValue(request.getParameter("tax_"+i),0.00);
+				if("".equals(_invoiceServiceYype)){
+					continue;
+				}
+				//保存发票明细
+				if(currentid > 0){//更新发票
+					insertList.add(currentid+"" + Util.getSeparator() + StringEscapeUtils.escapeSql(_invoiceServiceYype)+"" + Util.getSeparator()
+							+df.format(_priceWithoutTax)+ Util.getSeparator()+df.format(_taxRate)+ Util.getSeparator()+df.format(_tax));
+				}
+			}
+			brs.executeSqlBatch("insert into FnaInvoiceLedgerDetail(mainid,invoiceServiceYype,priceWithoutTax,taxRate,tax) VALUES (?,?,?,?,?)", insertList);
+		} catch (Exception e) {
+			errorMsg.append(e.getMessage());
+		}
+		JSONObject jsonObject = new JSONObject();
+		if(errorMsg.length() > 0){
+			jsonObject.put("code", false);
+			jsonObject.put("msg", errorMsg.toString());
+		}else{
+			jsonObject.put("flag", true);
+		}
+		out.print(jsonObject.toString());
+		response.flushBuffer();
+	}
+
+	/**
+	 * 判断当前发票是否可以被批量验票
+	 * @param id
+	 * @return
+	 */
+	public String getInvoice_checkboxpopedom(String id){
+		RecordSet rs = new RecordSet();
+		String sql = "select requestid,checkStatus,invoiceType from FnaInvoiceLedger where id = "+id;
+		rs.execute(sql);
+		String requestid = "";
+		int checkStatus = 0;
+		int invoiceType = 0;
+		while(rs.next()){
+			requestid = Util.null2String(rs.getString("requestid"));
+			checkStatus = Util.getIntValue(rs.getString("checkStatus"));
+			invoiceType = Util.getIntValue(rs.getString("invoiceType"));
+		}
+		if(!"".equals(requestid) || checkStatus == 1 || (invoiceType != 1 && invoiceType != 2 && invoiceType != 15 && invoiceType != 20 && invoiceType != 16))return "false";
+		return "true";
+	}
+
+	/**
+     * 判断当前的企业名称和企业纳税人识别号是否为接口所有，如果是则不可以被删除，如果是发票所有，则可以删除
+     * @param type
+     * @return
+     */
+	public String getCompanyAndTaxpayerNumber_checkboxpopedom(String type){
+		if("1".equals(type)){
+			return "false";
+		}else{
+			return "true";
+		}
+	}
+
+	/**
+	 * 判断当前发票是否可以被删除或者验票
+	 * @param id 删除、编辑、查看、打印
+	 * @return
+	 */
+	public List<String> getInvoice_popedom(String id,String otherParams){
+		String[] otherParamArray = otherParams.split("\\+");
+		String ifExistsInterface = otherParamArray[0];
+		int userid = Util.getIntValue(otherParamArray[1], 0);
+		String canEditAll = otherParamArray[2];
+
+		//获取requestId
+		int requestid = getRequestIdByInvoice(id);
+
+		RecordSet rs = new RecordSet();
+		List<String> resultList = new ArrayList<String>();
+		rs.executeQuery("select checkStatus,invoiceType from FnaInvoiceLedger where id=?",id);
+		int checkStatus = 0;
+		int invoiceType = 0;
+		while(rs.next()){
+			checkStatus = Util.getIntValue(rs.getString("checkStatus"),0);
+			invoiceType =  Util.getIntValue(rs.getString("invoiceType"),0);
+		}
+		if(requestid>0){
+			resultList.add("false");
+			resultList.add("false");
+			resultList.add("true");
+		}else if(checkStatus == 1){
+			resultList.add("true");
+			resultList.add("false");
+			resultList.add("true");
+		}else{
+			resultList.add("true");
+			resultList.add("true");
+			resultList.add("false");
+		}
+		if((invoiceType==1 || invoiceType==2  || invoiceType==15 || invoiceType==20) && checkStatus == 1){
+			resultList.add("true");
+		}else{
+			resultList.add("false");
+		}
+		resultList.add("true");
+		resultList.add("true");
+
+
+		//判断某个人是否仅仅只是个共享人
+		if (userid != 1 && !Boolean.parseBoolean(canEditAll)) {      //能查看所有他就不仅仅是个共享人
+			boolean isOnlySharer = InvoiceSharerUtil.checkInvoiceShare(id, userid);
+			if (isOnlySharer) {
+				//依据上面的权限为主，如果上面权限可查看，则再加上当前限制（只有，查看，打印，导出，对应下标：2,3,4）
+				for (int i = 0; i < resultList.size(); i++) {
+					String isShow = resultList.get(i);
+					if ("true".equals(isShow)) {
+						if (i != 2 && i != 3 && i != 4) {
+							resultList.set(i, "false");
+						}
+					}
+				}
+			}
+		}
+
+		return resultList;
+	}
+
+	/**
+	 * 获取发票requestid
+	 * @param invoiceId
+	 * @return
+	 */
+	public static int getRequestIdByInvoice(String invoiceId){
+		RecordSet rs = new RecordSet();
+		int requestid=0;
+		rs.executeQuery("select requestid from FnaInvoiceLedger where id=?",invoiceId);
+		if(rs.next()){
+			requestid =Util.getIntValue(rs.getString("requestid"),0);
+		}
+		if(requestid<=0){
+			rs.executeQuery("select requestid from fnaInvoiceReimbursement where mainid=?",invoiceId);
+			if(rs.next()){
+				requestid =Util.getIntValue(rs.getString("requestid"),0);
+			}
+		}
+		return requestid;
+	}
+
+
+	/**
+	 * 发票是否可以删除
+	 * @param invoiceIds
+	 * @return
+	 */
+	public static String canDeleteInvoice(boolean canEditAll,User user,String invoiceIds){
+		String msg  = "";
+		try{
+			RecordSet rsQuery = FnaInvoiceCommon.executeInSql("select count(id) cnt from fnaInvoiceLedger where requestId>0 and id in(占位符标识)", invoiceIds, "executeQuery");
+			if (rsQuery.next()){
+				int cnt = Util.getIntValue(rsQuery.getString("cnt"));
+				if(cnt>0) {
+					throw new Exception(SystemEnv.getHtmlLabelName(529701,user.getLanguage()));
+				}
+			}
+
+			RecordSet rs2Query = FnaInvoiceCommon.executeInSql("select count(id) cnt from fnaInvoiceReimbursement where requestId>0  and mainid in(占位符标识)", invoiceIds, "executeQuery");
+			if (rs2Query.next()){
+				int cnt = Util.getIntValue(rs2Query.getString("cnt"));
+				if(cnt>0) {
+					throw new Exception(SystemEnv.getHtmlLabelName(529701,user.getLanguage()));
+				}
+			}
+
+			if(!canEditAll){
+				RecordSet rs3Query = FnaInvoiceCommon.executeInSql("select userId_new from fnaInvoiceLedger where  id in(占位符标识)", invoiceIds, "executeQuery");
+				while (rs3Query.next()){
+					int userId_new = Util.getIntValue(rs3Query.getString("userId_new"));
+					if(userId_new!=user.getUID()) {
+						throw new Exception(SystemEnv.getHtmlLabelName(2012,user.getLanguage()));
+					}
+				}
+			}
+		}catch (Exception e){
+			msg = e.getMessage();
+		}
+		return msg;
+	}
+
+	/**
+	 * 如果当前企业名称和纳税人识别号属于查验接口，则不可以编辑和删除
+	 * @param id
+	 * @param type
+	 * @return
+	 */
+    public List<String> getCompanyAndTaxpayerNumber_popedom(String id,String type){
+        List<String> resultList = new ArrayList<String>();
+        if("1".equals(type)){
+            resultList.add("false");
+            resultList.add("false");
+            resultList.add("true");
+        }else{
+            resultList.add("true");
+            resultList.add("true");
+            resultList.add("true");
+        }
+        return resultList;
+    }
+	/**
+	 * 判断当前记录是否生效或关闭
+	 * @param id
+	 * @param para
+	 * @return
+	 */
+	public List<String> getInterface_popedom(String id,String para){
+		RecordSet rs = new RecordSet();
+		List<String> resultList = new ArrayList<String>();
+		String sql = "select status,interfaceType from fnainvoiceinterface where id = "+id;
+		rs.execute(sql);
+		int status = 0;
+		int interfaceType=-1;
+		if(rs.next()){
+			status = Util.getIntValue(rs.getString("status"),0);
+			interfaceType = Util.getIntValue(rs.getString("interfaceType"),0);
+		}
+		resultList.add("true");
+		if(interfaceType==2){
+			resultList.add("false");
+		}else{
+			resultList.add("true");
+		}
+
+		resultList.add("false");
+		resultList.add("false");
+
+		if(interfaceType==1){
+			resultList.add("true");
+		}else{
+			resultList.add("false");
+		}
+		return resultList;
+	}
+
+	/**
+	 * 判断当前记录是否生效或关闭
+	 * @param id
+	 * @param para
+	 * @return
+	 */
+	public String getInterface_checkboxpopedom(String id){
+		RecordSet rs = new RecordSet();
+		List<String> resultList = new ArrayList<String>();
+		rs.executeQuery("select interfaceType from fnainvoiceinterface where id =?",id);
+		int interfaceType=-1;
+		if(rs.next()){
+			interfaceType = Util.getIntValue(rs.getString("interfaceType"),0);
+		}
+		if(interfaceType==2){
+			return "false";
+		}else{
+			return "true";
+		}
+
+	}
+
+	/**
+	 * 判断已处理，未处理
+	 * @param id
+	 * @param para
+	 * @return
+	 */
+	public List<String> getHandleStatus_popedom(String id,String para){
+		RecordSet rs = new RecordSet();
+		List<String> resultList = new ArrayList<String>();
+		String sql = "select handleStatus from FnaInvoiceCheckFailLog where id = "+id;
+		rs.execute(sql);
+		int handleStatus = 0;
+		if(rs.next()){
+			handleStatus = Util.getIntValue(rs.getString("handleStatus"),0);
+		}
+		if(handleStatus == 0){
+			resultList.add("true");
+			resultList.add("false");
+		}else{
+			resultList.add("false");
+			resultList.add("true");
+		}
+		return resultList;
+	}
+
+	/**
+	 * 赋值发票信息（包括主表，明细表）
+	 * @param checkIds
+	 * @return
+	 */
+	public void getFnaInvoiceLedgerList(String checkIds,FnaAbstractInterface fnaAbstractInterface){
+		RecordSet rs = new RecordSet();
+		RecordSet rs2 = new RecordSet();
+		ArrayList<FnaInvoiceLedger> arrayList = new ArrayList<FnaInvoiceLedger>();
+		Map<String, List<FnaInvoiceLedgerDetail>> detailMap = new HashMap<String, List<FnaInvoiceLedgerDetail>>();
+		rs.execute("select * from FnaInvoiceLedger where id in ( "+checkIds+" 0 )");
+		while(rs.next()){
+			//查询发票主表信息
+			String invoiceNumber= Util.null2String(rs.getString("InvoiceNumber"));
+			int id = Util.getIntValue(rs.getString("id"));
+			FnaInvoiceLedger fnaInvoiceLedger = new FnaInvoiceLedger();
+			fnaInvoiceLedger.setId(id);
+			fnaInvoiceLedger.setBillingDate(Util.null2String(rs.getString("BillingDate")));
+			fnaInvoiceLedger.setInvoiceCode(Util.null2String(rs.getString("InvoiceCode")));
+			fnaInvoiceLedger.setInvoiceNumber(invoiceNumber);
+			fnaInvoiceLedger.setInvoiceType(Util.getIntValue(rs.getString("InvoiceType")));
+			fnaInvoiceLedger.setSeller(Util.null2String(rs.getString("Seller")));
+			fnaInvoiceLedger.setPurchaser(Util.null2String(rs.getString("Purchaser")));
+			fnaInvoiceLedger.setInvoiceServiceYype(Util.null2String(rs.getString("InvoiceServiceYype")));
+			fnaInvoiceLedger.setPriceWithoutTax(Util.getDoubleValue(rs.getString("PriceWithoutTax")));
+			fnaInvoiceLedger.setTaxRate(Util.getDoubleValue(rs.getString("TaxRate")));
+			fnaInvoiceLedger.setTax(Util.getDoubleValue(rs.getString("Tax")));
+			fnaInvoiceLedger.setTaxIncludedPrice(Util.getDoubleValue(rs.getString("TaxIncludedPrice")));
+			fnaInvoiceLedger.setAuthenticity(Util.getIntValue(rs.getString("Authenticity")));
+			fnaInvoiceLedger.setCheckStatus(Util.getIntValue(rs.getString("checkStatus")));
+			fnaInvoiceLedger.setCheckCode(Util.null2String(rs.getString("CheckCode")));
+			arrayList.add(fnaInvoiceLedger);
+			//查询明细表信息
+			rs2.execute("select * from FnaInvoiceLedgerDetail where mainid = "+id);
+			List<FnaInvoiceLedgerDetail> detailList = new ArrayList<FnaInvoiceLedgerDetail>();
+			while(rs2.next()){
+				FnaInvoiceLedgerDetail fnaInvoiceLedgerDetail = new FnaInvoiceLedgerDetail();
+				fnaInvoiceLedgerDetail.setInvoiceServiceYype(Util.null2String(rs2.getString("invoiceServiceYype")));
+				fnaInvoiceLedgerDetail.setPriceWithoutTax(Util.getDoubleValue(rs2.getString("priceWithoutTax")));
+				fnaInvoiceLedgerDetail.setTaxRate(Util.getDoubleValue(rs2.getString("taxRate")));
+				fnaInvoiceLedgerDetail.setTax(Util.getDoubleValue(rs2.getString("tax")));
+				detailList.add(fnaInvoiceLedgerDetail);
+			}
+			detailMap.put(invoiceNumber, detailList);
+		}
+		fnaAbstractInterface.setArrayList(arrayList);
+		fnaAbstractInterface.setDetailMap(detailMap);
+	}
+
+
+
+
+	/**
+	 * 流程强制收回，退回，删除等操作时，修改发票状态为未冻结状态
+	 * @param requestid
+	 */
+	public void doWfForceOver(int requestid) {
+		doWfForceOver(requestid,"",new User(1));
+	}
+		/**
+		 * 流程强制收回，退回，删除等操作时，修改发票状态为未冻结状态
+		 * @param requestid
+		 */
+	public void doWfForceOver(int requestid,String ipAdress,User user){
+        //初始化发票状态
+		RecordSet rs = new RecordSet();
+		Map<String,List<String>> mapCloud = new HashMap<String,List<String>>();//其中key为userid_new， value为的List
+		Map<String,String> mapCloudOA = new HashMap<String,String>();//其中key为invoiceId， value为的cloudId
+		//添加日志
+		FnaLogSqlUtil fnaLogSqlUtil = new FnaLogSqlUtil();
+		Map<String, Map<String, String>> labelIdMaps = new HashMap<String, Map<String, String>>();
+		Map<String, Map<String, String>> beforeMaps = new HashMap<String, Map<String, String>>();
+
+
+		StringBuffer sqlBuffer = new StringBuffer();
+		rs.executeQuery("select * from fnainvoiceledger where requestid =?",requestid);
+		while(rs.next()){
+			String invoiceId = Util.null2String(rs.getString("id"));
+			String cloudId = Util.null2String(rs.getString("cloudId"));
+			String userid_new = Util.null2String(rs.getString("userId_new"));
+
+			if(mapCloud.containsKey(userid_new)){
+				List<String> cloudIdList = mapCloud.get(userid_new);
+				if(!cloudIdList.contains(cloudId)){
+					cloudIdList.add(cloudId);
+					mapCloud.put(userid_new,cloudIdList);
+				}
+			}else{
+				List<String> cloudIdList = new ArrayList<>();
+				cloudIdList.add(cloudId);
+				mapCloud.put(userid_new,cloudIdList);
+			}
+			mapCloudOA.put(invoiceId,cloudId);
+			//添加至日志map
+			fnaLogSqlUtil.getActionInvoiceLogInfo(invoiceId,labelIdMaps,beforeMaps);
+			if(sqlBuffer.length() > 0){
+				sqlBuffer.append(",");
+			}
+			sqlBuffer.append(invoiceId);
+		}
+		int workflowlogic = ReimbursementUtil.getWorkflowlogic();
+        StringBuffer invoiceIdBuffer = new StringBuffer();
+        if(workflowlogic==3) {
+            rs.executeQuery("select b.id,b.cloudId,b.userId_new from FnaInvoiceReimbursement a join fnainvoiceledger b on a.mainid=b.id where a.requestid = ?",requestid);
+            while (rs.next()){
+                String invoiceId = Util.null2String(rs.getString("id"));
+                String cloudId = Util.null2String(rs.getString("cloudId"));
+                String userid_new = Util.null2String(rs.getString("userId_new"));
+
+                if(mapCloud.containsKey(userid_new)){
+                    List<String> cloudIdList = mapCloud.get(userid_new);
+                    if(!cloudIdList.contains(cloudId)){
+                        cloudIdList.add(cloudId);
+                        mapCloud.put(userid_new,cloudIdList);
+                    }
+                }else{
+                    List<String> cloudIdList = new ArrayList<>();
+                    cloudIdList.add(cloudId);
+                    mapCloud.put(userid_new,cloudIdList);
+                }
+                mapCloudOA.put(invoiceId,cloudId);
+                fnaLogSqlUtil.getActionInvoiceLogInfo(invoiceId,labelIdMaps,beforeMaps);
+                if(invoiceIdBuffer.length()==0){
+                    invoiceIdBuffer.append(invoiceId);
+                }else{
+                    invoiceIdBuffer.append(",").append(invoiceId);
+                }
+            }
+        }
+
+		//发票云报销修改发票云数据
+		RecordSet rs5= new RecordSet();
+		for(Map.Entry<String,List<String>> entry : mapCloud.entrySet()){
+			String userid_new = entry.getKey();
+			List<String> cloudIdList = entry.getValue();//发票id
+			int userid_newInt = Util.getIntValue(Util.null2String(userid_new),0);
+			JSONObject interfaceInfo = InvoiceCloudUtil.getInterfaceInfo(new User(userid_newInt), false, false, true);
+			JSONObject cloudInfo = interfaceInfo.getJSONObject("cloud");
+			boolean existEffectCloud = cloudInfo.getBoolean("existEffectCloud");
+			if(existEffectCloud){
+				String cid = Util.null2String(cloudInfo.getString("cid"));
+				String userName = Util.null2String(cloudInfo.getString("userName"));
+				String password = Util.null2String(cloudInfo.getString("password"));
+				String aesKey = Util.null2String(cloudInfo.getString("aesKey"));
+				String reimburseUrl = Util.null2String(cloudInfo.getString("reimburseUrl"));
+
+
+				JSONObject bodyJson = new JSONObject();
+				bodyJson.put("cid",cid);
+				bodyJson.put("userId",user.getUID());
+				bodyJson.put("flag","2");
+				JSONArray fnaInvoiceReimburseInfoJa = new JSONArray();
+				if(workflowlogic==3){
+					rs5.executeQuery("select * from FnaInvoiceReimbursement where requestid=?",requestid);
+					while (rs5.next()){
+						String cloudId = mapCloudOA.get(Util.null2String(rs5.getString("mainid")));
+						if(cloudIdList.contains(cloudId)) {
+							JSONObject fnaInvoiceReimburseInfoJo = new JSONObject();
+							fnaInvoiceReimburseInfoJo.put("dataid", requestid);
+							fnaInvoiceReimburseInfoJo.put("amount", "");
+							fnaInvoiceReimburseInfoJo.put("uid", "");
+							fnaInvoiceReimburseInfoJo.put("date", "");
+							fnaInvoiceReimburseInfoJo.put("name", "");
+							fnaInvoiceReimburseInfoJo.put("fid", cloudId);
+							fnaInvoiceReimburseInfoJo.put("cid", cid);
+							fnaInvoiceReimburseInfoJa.add(fnaInvoiceReimburseInfoJo);
+						}
+					}
+				}else{
+					rs5.executeQuery("select * from fnaInvoiceLedger where requestid=?",requestid);
+					while (rs5.next()){
+						String cloudId = Util.null2String(rs5.getString("cloudId"));
+						if(cloudIdList.contains(cloudId)) {
+							JSONObject fnaInvoiceReimburseInfoJo = new JSONObject();
+							fnaInvoiceReimburseInfoJo.put("dataid", requestid);
+							fnaInvoiceReimburseInfoJo.put("amount", "");
+							fnaInvoiceReimburseInfoJo.put("uid", "");
+							fnaInvoiceReimburseInfoJo.put("date", "");
+							fnaInvoiceReimburseInfoJo.put("name", "");
+							fnaInvoiceReimburseInfoJo.put("fid", cloudId);
+							fnaInvoiceReimburseInfoJo.put("cid", cid);
+							fnaInvoiceReimburseInfoJa.add(fnaInvoiceReimburseInfoJo);
+						}
+					}
+				}
+				bodyJson.put("infos",fnaInvoiceReimburseInfoJa);
+				bodyJson.put("sreim","0");
+				try {
+					JSONObject reimburseJson = InvoiceCloudUtil.reimburseInvoice(reimburseUrl, aesKey, bodyJson, userName, password, "解锁报销修改数据");
+					if(!reimburseJson.getBoolean("flag")){
+						throw new Exception(reimburseJson.getString("msg"));
+					}
+				}catch (Exception e){
+					new BaseBean().writeLog("解锁报销修改数据错误："+e.getMessage());
+				}
+			}
+		}
+
+
+		if(sqlBuffer.length()>0){
+			String updateInvoceStatus = "update fnainvoiceledger set status = "+FnaInvoiceCommon.INIT_STATUS+",reimbursementDate=NULL,requestid=NULL,reimbursePerson=NULL "+
+					" where id in ("+sqlBuffer.toString()+")";
+			rs.executeUpdate(updateInvoceStatus);
+		}
+		//去重校验控制逻辑
+		if(workflowlogic==3) {
+			if(invoiceIdBuffer.length()>0){
+				FnaInvoiceCommon.executeInSql("update fnainvoiceledger set status = "+FnaInvoiceCommon.INIT_STATUS+",reimbursementDate=NULL,requestid=NULL,reimbursePerson=NULL " +
+								" where id in(占位符标识)",invoiceIdBuffer.toString(),"executeUpdate");
+			}
+			rs.executeUpdate("delete from FnaInvoiceReimbursement where requestid = ?", requestid);
+		}
+
+
+		//更新日志信息
+		for (Map.Entry<String, Map<String, String>> entry : labelIdMaps.entrySet()) {
+			String invoiceId = entry.getKey();
+			Map<String, String> labelIdMap = entry.getValue();
+			Map<String, String> beforeMap = beforeMaps.get(invoiceId);
+            //插入日志2
+			Map<String, String> afterMap =fnaLogSqlUtil.getInvoiceMap(invoiceId,labelIdMap);
+			fnaLogSqlUtil.invoiceLedgerAddlog(user,ipAdress,"2",invoiceId,"4",
+					beforeMap,afterMap,labelIdMap);
+		}
+
+
+
+
+	}
+
+	/**
+	 * 获取发票信息入口
+	 * @param jsonObject
+	 * @param userid
+	 * @return
+	 */
+	public String getInfoEntrance(JSONObject jsonObject,int userid){
+		String entryTime = Util.date(2);//录入时间
+		DecimalFormat df = new DecimalFormat("#######################0.00");
+		RecordSet rs = new RecordSet();
+		try{
+			JSONArray jsonArray = jsonObject.getJSONArray("info");
+			writeLog("jsonArray:", jsonArray);
+			Iterator iterator = jsonArray.iterator();
+			StringBuffer param = new StringBuffer();
+			param.append("{\"item_list\": [");
+			int count = 0;
+			HashMap<String, String> cardMap = new HashMap<String, String>();
+			while(iterator.hasNext()){
+				JSONObject json = (JSONObject)iterator.next();
+				String card_id = json.getString("card_id");
+				String encrypt_code = json.getString("encrypt_code");
+				//判断此card_id是否已经在表中存在,已经同步过的不需要同步
+				if(judgeCardId(card_id,encrypt_code,rs)){
+					continue;
+				}
+				if(count > 0){
+					param.append(",");
+				}
+				cardMap.put(card_id+"_index"+count, encrypt_code);
+				param.append("{\"card_id\":\""+card_id+"\",").append("\"encrypt_code\":\""+encrypt_code+"\"}");
+				count ++;
+			}
+			param.append("]}");
+			String token = getAccessToken();
+			if("".equals(token)){
+				return ""+ SystemEnv.getHtmlLabelName(10003158,weaver.general.ThreadVarLanguage.getLang())+"token"+ SystemEnv.getHtmlLabelName(498,weaver.general.ThreadVarLanguage.getLang())+"!";
+			}
+			writeLog("token:", token);
+			writeLog("param:", param);
+			JSONObject invoiceInfoJson = getElecInvoiceInfoBatch(param.toString(), token);
+			writeLog("invoiceInfoJson:", invoiceInfoJson);
+			String errorMsg = Util.null2String(invoiceInfoJson.get("errorMsg"));
+			//判断调用方法时是否存在错误
+			if(!"".equals(errorMsg)){
+				return invoiceInfoJson.getString("errorMsg");
+			}
+			//判断返回结果是否错误
+			String errcode = invoiceInfoJson.getString("errcode");
+			if(!"0".equals(errcode)){
+				String errmsg = invoiceInfoJson.getString("errmsg");
+				return CONCURRENT_HASH_MAP.containsKey(errcode) ? CONCURRENT_HASH_MAP.get(errcode):errmsg;
+			}
+			JSONArray jsonArrayItem_list = invoiceInfoJson.getJSONArray("item_list");
+			Iterator iteratorItem_list = jsonArrayItem_list.iterator();
+			count = 0;
+			while(iteratorItem_list.hasNext()){
+				JSONObject json = (JSONObject)iteratorItem_list.next();
+				String card_id = json.getString("card_id");
+				String openid = json.getString("openid");
+				String encrypt_code = cardMap.get(card_id+"_index"+count);
+				String seller = json.getString("payee");//销售方
+				JSONObject user_info = json.getJSONObject("user_info");
+				String billingDate = new SimpleDateFormat("yyyy-MM-dd").format(new Date(user_info.getLong("billing_time")*1000));//开票日期
+				String invoiceNumber = user_info.getString("billing_code");//发票号码
+				String invoiceCode = user_info.getString("billing_no");//发票代码
+				String purchaser = user_info.getString("title");//购买方
+				String checkcode = user_info.getString("check_code");//校验码
+
+				//这两个字段不一定在json中存在
+				String priceWithoutTax = "0.00";//金额（不含税价）
+				if(user_info.containsKey("fee_without_tax")){
+					priceWithoutTax = df.format(Double.parseDouble(user_info.getString("fee_without_tax"))/100);
+				}
+				String tax = "0.00";//税额（税价）
+				if(user_info.containsKey("tax")){
+					tax = df.format(Double.parseDouble(user_info.getString("tax"))/100);
+				}
+
+				String taxIncludedPrice = df.format(Double.parseDouble(user_info.getString("fee"))/100);//价税合计
+
+				String taxRate = "0.00";//税率
+				if(!"0.00".equals(priceWithoutTax)){
+					taxRate = getRoundNumber((Double.parseDouble(tax) / Double.parseDouble(priceWithoutTax)) * 100);
+				}
+
+				@SuppressWarnings("unused")
+				String pdf_url = user_info.getString("pdf_url");//这张发票对应的PDF_URL
+
+//				new BaseBean().writeLog("pdf_url:", pdf_url);
+
+				/**
+				 * INVOICE_REIMBURSE_INIT 发票初始状态，未锁定，可提交报销
+				 * INVOICE_REIMBURSE_LOCK 发票已锁定，无法重复提交报销
+				 * INVOICE_REIMBURSE_CLOSURE 发票已核销，从用户卡包中移除
+				 */
+				String reimburse_status = user_info.getString("reimburse_status");//发票报销状态
+
+				//只有未冻结的发票才能被选到，默认为0
+				int status = INIT_STATUS;
+
+				String invoiceServiceYype = "";//货物或应税服务类型
+				JSONArray infoArray = user_info.getJSONArray("info");
+				for(int arr=0;arr<infoArray.size();arr++){
+					if(infoArray.getJSONObject(arr).containsKey("name")){
+						invoiceServiceYype = infoArray.getJSONObject(arr).getString("name");
+					}else{
+						invoiceServiceYype = ""+ SystemEnv.getHtmlLabelName(10003274,weaver.general.ThreadVarLanguage.getLang())+"";
+					}
+				}
+
+				int invoiceType = 15;
+
+				//invoiceSource发票来源 1.微信同步 2.国信扫描
+
+				//判断此发票是否已经通过国信扫描插入了发票表中,为插入则通过微信插入数据
+				//微信返回信息不完整，不导入明细信息
+				//默认有效未查验
+				if(!this.ifExist(invoiceNumber,invoiceCode, rs)){
+					String insertInvoice = " insert into fnaInvoiceLedger "+ //1
+							" (billingDate,invoiceCode,invoiceNumber,"+//2
+							" invoiceType,seller,purchaser,"+//3
+							" invoiceServiceYype,priceWithoutTax,taxRate,tax,taxIncludedPrice,authenticity,checkStatus,checkcode,userId_new,"+//4
+							" card_id_new,encrypt_code_new,status,invoiceSource_new,"+//5
+							" openid_new,wechatstatus,entryTime)"+//6
+							" VALUES ('"+StringEscapeUtils.escapeSql(billingDate)+"','"+StringEscapeUtils.escapeSql(invoiceCode)+"','"+StringEscapeUtils.escapeSql(invoiceNumber)+"',"+//1
+							" "+invoiceType+",'"+StringEscapeUtils.escapeSql(seller)+"','"+StringEscapeUtils.escapeSql(purchaser)+"',"+//2
+							" '"+StringEscapeUtils.escapeSql(invoiceServiceYype)+"',"+priceWithoutTax+","+taxRate+","+tax+","+taxIncludedPrice+",1,2,'"+StringEscapeUtils.escapeSql(checkcode)+"',"+userid+","+//3
+							" '"+StringEscapeUtils.escapeSql(card_id)+"','"+StringEscapeUtils.escapeSql(encrypt_code)+"','"+status+"',"+INVOICESOURCE_WECHAT+//4
+							",'"+StringEscapeUtils.escapeSql(openid)+"','"+StringEscapeUtils.escapeSql(reimburse_status)+"','"+entryTime+"'"+//5
+							" )";//6
+					rs.execute(insertInvoice);
+
+
+					//插入日志
+					FnaLogSqlUtil fnaLogSqlUtil  = new FnaLogSqlUtil();
+					Map<String, String> labelIdMap = new HashMap<String, String>();
+					Map<String, String> beforeMap = new HashMap<String, String>();
+					int invoiceId = InvoiceUtil.getInvoiceId(invoiceNumber,invoiceCode);
+					Map<String, String> afterMap =fnaLogSqlUtil.getInvoiceMap(String.valueOf(invoiceId),labelIdMap);
+					fnaLogSqlUtil.invoiceLedgerAddlog(new User(userid),"","0",String.valueOf(invoiceId),"0",
+							beforeMap,afterMap,labelIdMap);
+				}
+				count++;
+			}
+
+		}catch(Exception e){
+			return e.getMessage();
+		}
+		return "";
+	}
+
+	/**
+	 * 更新发票状态
+	 * @param invoiceAmtMap
+	 * @param requestid
+	 * @param userid 流程创建人
+	 * @param doubleCheckInvoiceList
+	 * @param type
+	 * @param user  当前人员
+	 * @param ipAdress
+	 * @throws Exception
+	 */
+	public void changeStatusEntrance(Map<String,Double> invoiceAmtMap,String requestid,int userid,ArrayList<String> doubleCheckInvoiceList,String type,User user,String ipAdress) throws Exception{
+		RecordSet rs = new RecordSet();
+		try {
+
+
+			for(Map.Entry<String, Double> entry : invoiceAmtMap.entrySet()) {
+				String invoiceId = entry.getKey();
+
+				double canReimbursementAmt = ReimbursementUtil.getCanReimbursementAmt(invoiceId);
+				//选择了一张发票的情况下
+				if(doubleCheckInvoiceList.contains(invoiceId)){
+					double reimbursementAmt = entry.getValue();
+					String updateInvoceStatus = "";
+					if(reimbursementAmt < canReimbursementAmt) {
+						updateInvoceStatus = "update fnainvoiceledger set status = "+FnaInvoiceCommon.INIT_STATUS+",reimbursementDate=NULL,requestid=NULL,reimbursePerson=NULL "+
+								" where id = ? ";
+					}else if(reimbursementAmt == canReimbursementAmt){
+						if("lock".equals(type)){
+							updateInvoceStatus = "update fnainvoiceledger set status = "+FnaInvoiceCommon.LOCK_STATUS+",reimbursementDate=NULL,requestid=NULL,reimbursePerson=NULL "+
+									" where id = ? ";
+						}else{
+							updateInvoceStatus = "update fnainvoiceledger set status = "+FnaInvoiceCommon.CLOSURE_STATUS+",reimbursementDate=NULL,requestid=NULL,reimbursePerson=NULL "+
+									" where id = ? ";
+						}
+					}
+					rs.executeUpdate(updateInvoceStatus,invoiceId);
+					rs.executeUpdate("insert into FnaInvoiceReimbursement(mainid,requestid,reimbursementAmt,reimbursementDate,userid) values (?,?,?,?,?)",
+							invoiceId,requestid,reimbursementAmt,new SimpleDateFormat("yyyy-MM-dd").format(new Date()),userid);
+				}else{//选择多张发票的情况下，全额报销
+					String updateInvoceStatus = "";
+					if("lock".equals(type)){
+						updateInvoceStatus = "update fnainvoiceledger set status = "+FnaInvoiceCommon.LOCK_STATUS+",reimbursementDate=NULL,requestid=NULL,reimbursePerson=NULL "+
+								" where id = ? ";
+					}else{
+						updateInvoceStatus = "update fnainvoiceledger set status = "+FnaInvoiceCommon.CLOSURE_STATUS+",reimbursementDate=NULL,requestid=NULL,reimbursePerson=NULL "+
+								" where id = ? ";
+					}
+					rs.executeUpdate(updateInvoceStatus,invoiceId);
+					rs.executeUpdate("insert into FnaInvoiceReimbursement(mainid,requestid,reimbursementAmt,reimbursementDate,userid) values (?,?,?,?,?)",
+							invoiceId,requestid,canReimbursementAmt,new SimpleDateFormat("yyyy-MM-dd").format(new Date()),userid);
+				}
+			}
+
+
+		} catch (Exception e) {
+			throw new Exception(e.getMessage());
+		}
+	}
+
+	/**
+	 * 获取验票接口
+	 * @param user
+	 * @throws Exception
+	 */
+	/*public FnaAbstractInterface getInterface(User user) throws Exception{
+		int baiwangtype = Util.getIntValue(getPropValue("baiwang", "type"),0);
+		FnaInvoiceCommon.getinterface();
+		String Type = FnaInvoiceInterface.getInstance().getType();
+		FnaAbstractInterface fnaAbstractInterface = null;
+		if("1".equals(Type)){//国信接口
+			fnaAbstractInterface = new FnaBaiwangOpenApi(user);
+		}else if("2".equals(Type)){//百望接口
+			if(baiwangtype == 0){
+				fnaAbstractInterface = new FnaBaiwangOpenApi(user);
+			}else {
+				fnaAbstractInterface = new FnaBaiwangOpenApi(user);
+			}
+		}else{
+			throw new Exception(SystemEnv.getHtmlLabelName(520790,user.getLanguage()));//后台【预算】-【发票管理】-【发票接口配置】未配置生效的增值税发票查验接口！
+		}
+		fnaAbstractInterface.setUser(user);
+		return fnaAbstractInterface;
+	}*/
+
+	/**
+	 * 获取验票接口
+	 * @param user
+	 * @throws Exception
+	 */
+	public FnaAbstractInterface getInterface(User user) throws Exception{
+		FnaAbstractInterface fnaAbstractInterface = new FnaBaiwangOpenApi(user);
+		fnaAbstractInterface.setUser(user);
+		return fnaAbstractInterface;
+	}
+
+
+	/**
+	 * 获取发票参数
+	 * @param invoiceId
+	 * @param rs
+	 * @return
+	 */
+	public String[] getInvoiceInfoParam(String invoiceId,RecordSet rs){
+		String[] params = new String[4];
+		String sql = "select invoiceSource_new,card_id_new,encrypt_code_new,openid_new from FnaInvoiceLedger where id="+invoiceId;
+		rs.execute(sql);
+		String invoiceSource = "";
+		String card_id = "";
+		String encrypt_code = "";
+		String openid_new = "";
+		while(rs.next()){
+			invoiceSource = Util.null2String(rs.getString("invoiceSource_new"));
+			card_id = Util.null2String(rs.getString("card_id_new"));
+			encrypt_code = Util.null2String(rs.getString("encrypt_code_new"));
+			openid_new = Util.null2String(rs.getString("openid_new"));
+		}
+		params[0] = invoiceSource;
+		params[1] = card_id;
+		params[2] = encrypt_code;
+		params[3] = openid_new;
+		return params;
+	}
+
+	/**
+	 * 查询电子发票信息
+	 * @param param
+	 * @return
+	 */
+	public JSONObject getElecInvoiceInfoBatch(String param,String token){
+		String httpUrl = GETINVOICEINFOBATCH_URL + token;
+		return httpRequest(httpUrl,param);
+	}
+
+	/**
+	 * 更新发票状态
+	 * @param param
+	 * @param token
+	 * @return
+	 */
+	public JSONObject updateElecInvoiceStatus(String param,String token){
+		String httpUrl = UPDATEINVOICESTATUS_URL + token;
+		return httpRequest(httpUrl,param);
+	}
+
+	/**
+	 * 调用微信接口通用方法
+	 * @param requestUrl
+	 * @param param
+	 * @return
+	 */
+	@SuppressWarnings(value={"resource"})
+	public JSONObject httpRequest(String requestUrl,String param){
+		JSONObject jsonObject = new JSONObject();
+		HttpClient httpClient = new DefaultHttpClient();
+	    HttpPost post = new HttpPost(requestUrl);
+	    try {
+	    	if(param != null){
+		    	StringEntity postingString = new StringEntity(param);
+			    post.setEntity(postingString);
+			    post.setHeader("Content-type", "application/json");
+	    	}
+		    HttpResponse response = httpClient.execute(post);
+		    String content = EntityUtils.toString(response.getEntity());
+		    jsonObject = JSONObject.fromObject(content);
+		} catch (Exception e) {
+			jsonObject.put("errorMsg", e.getMessage());
+		}
+	    return jsonObject;
+	}
+
+	/**
+	 * 四舍五入
+	 * @param number
+	 * @return
+	 */
+	public String getRoundNumber(double number){
+		DecimalFormat df = new DecimalFormat("################################0.00");
+		if(number == 0){
+			return "0.00";
+		}
+		return df.format(((double)Math.round(number)));
+	}
+
+	/**
+	 * 获取token
+	 * @return
+	 */
+	public String getAccessToken() throws Exception{
+		Map<String,String> params = new HashMap<String, String>();
+		params.put("corpId", corpId);
+		String appStr = APPManager.getThirdAccessToken(params);
+		new BaseBean().writeLog("appStr:", appStr);
+		JSONObject jsonObject = JSONObject.fromObject(appStr);
+		String errcode = Util.null2String(jsonObject.get("errcode"));
+		String access_token = "";
+		if("0".equals(errcode)){
+			access_token = jsonObject.getString("accessToken");
+		}else{
+			throw new Exception(jsonObject.getString("errmsg"));
+		}
+		new BaseBean().writeLog("access_token:", access_token);
+		return access_token;
+	}
+
+	/**
+	 * 删除电子发票
+	 * @param card_id
+	 * @param rs
+	 */
+	public void deleteCardId(String card_id,RecordSet rs){
+		String sql = "delete from FnaInvoiceLedger where card_id='"+StringEscapeUtils.escapeSql(card_id)+"'";
+		rs.execute(sql);
+	}
+
+	/**
+	 * 判断card_id是否存在
+	 * @param card_id
+	 * @param encrypt_code
+	 * @param rs
+	 * @return
+	 */
+	public boolean judgeCardId(String card_id,String encrypt_code,RecordSet rs){
+		String sql = "select 1 from fnaInvoiceLedger where card_id_new = '"+StringEscapeUtils.escapeSql(card_id)+"' and encrypt_code_new = '"+StringEscapeUtils.escapeSql(encrypt_code)+"' ";
+		rs.execute(sql);
+		if(rs.next()){
+			return true;
+		}
+		return false;
+	}
+
+
+	/**
+	 * 判断扫描的发票是否在表中已经存在（发票号码），之前很多方法不用了，为保证不报错，选择重载
+	 * @param invoiceNumber
+	 * @param rs
+	 * @return
+	 */
+	public boolean ifExist(String invoiceNumber,RecordSet rs){
+		String sql = "select 1 from fnaInvoiceLedger where invoiceNumber = '"+StringEscapeUtils.escapeSql(invoiceNumber)+"'";
+		rs.execute(sql);
+		if(rs.next()){
+			return true;
+		}
+		return false;
+	}
+
+
+	/**
+	 * 判断扫描的发票是否在表中已经存在（发票代码和发票号码）
+	 * @param invoiceNumber
+	 * @param rs
+	 * @return
+	 */
+	public boolean ifExist(String invoiceNumber,String invoiceCode, RecordSet rs){
+		String sql = "select 1 from fnaInvoiceLedger where invoiceNumber = ? and invoiceCode = ? ";
+		rs.executeQuery(sql, invoiceNumber,invoiceCode);
+		if(rs.next()){
+			return true;
+		}
+		return false;
+	}
+
+	/**
+	 * 判断扫描的发票是否在表中已经存在（发票代码和发票号码）,并且发票为有效已查验、有效未查验
+	 * @param invoiceNumber
+	 * @param rs
+	 * @return
+	 */
+	public boolean ifExistAuthenticity(String invoiceNumber,String invoiceCode, RecordSet rs){
+		String sql = "select 1 from fnaInvoiceLedger where invoiceNumber = ? and invoiceCode = ?  and (checkStatus =1 or checkStatus=2) ";
+		rs.executeQuery(sql, invoiceNumber,invoiceCode);
+		if(rs.next()){
+			return true;
+		}
+		return false;
+	}
+
+	/**
+	 * 判断扫描的发票是否在表中已经存在（发票代码和发票号码）,并且发票为有效已查验
+	 * @param invoiceNumber
+	 * @param rs
+	 * @return
+	 */
+	public boolean ifExistAuthenticity2(String invoiceNumber,String invoiceCode, RecordSet rs){
+		String sql = "select 1 from fnaInvoiceLedger where invoiceNumber = ? and invoiceCode = ?  and checkStatus =1";
+		rs.executeQuery(sql, invoiceNumber,invoiceCode);
+		if(rs.next()){
+			return true;
+		}
+		return false;
+	}
+
+
+	/**
+	 * 获取配置的自动验票地址
+	 * @return
+	 */
+	public static void getinterface(){
+		RecordSet rs = new RecordSet();
+		rs.execute("select * from fnainvoiceinterface where (type = 1 or (type = 2 and interfaceType = 1)) and status = 1");
+		if(rs.next()){
+			String type = Util.null2String(rs.getString("type"));
+			String interfaceurl = Util.null2String(rs.getString("interfaceurl"));
+			String userName = Util.null2String(rs.getString("userName"));
+			String password = Util.null2String(rs.getString("password"));
+			FnaInvoiceInterface.getInstance().setType(type);
+			FnaInvoiceInterface.getInstance().setInterfaceurl(interfaceurl);
+			FnaInvoiceInterface.getInstance().setUserName(userName);
+			FnaInvoiceInterface.getInstance().setPassword(password);
+		}else{
+			FnaInvoiceInterface.getInstance().setType("");
+			FnaInvoiceInterface.getInstance().setInterfaceurl("");
+			FnaInvoiceInterface.getInstance().setUserName("");
+			FnaInvoiceInterface.getInstance().setPassword("");
+		}
+	}
+
+	/**
+	 * 压缩上传的图片,图片的大小大于2.5M时，进行图片压缩
+	 * @param imageBytes
+	 * @return
+	 */
+	public byte[] compressImage(byte[] imageBytes){
+		ByteArrayInputStream byteArrayInputStream = null;
+		ByteArrayOutputStream byteArrayOutputStream = null;
+		try {
+			double quality = 1d;
+			while(quality >= 0){
+				byteArrayInputStream = new ByteArrayInputStream(imageBytes);
+				byteArrayOutputStream = new ByteArrayOutputStream();
+				//压缩图片
+				Thumbnails.of(byteArrayInputStream).scale(1).outputQuality(quality).toOutputStream(byteArrayOutputStream);
+				if(byteArrayOutputStream.toByteArray().length <= MAX_BYTES){
+					break;
+				}
+				//压缩之后图片还是大于2.5M，继续压缩
+				quality = quality - DIMINISHING_INTERVAL;
+			}
+			writeLog("压缩质量：",quality);
+		} catch (Exception e) {
+			writeLog("压缩出现错误：", e.getMessage());
+		} finally {
+			try {
+				if(byteArrayInputStream!=null) byteArrayInputStream.close();
+				if(byteArrayOutputStream!=null) byteArrayOutputStream.close();
+			} catch (Exception e) {
+				writeLog("出现错误：", e.getMessage());
+			}
+		}
+		return byteArrayOutputStream.toByteArray();
+	}
+
+	/**
+	 * 获取发票图片
+	 * @param imageID
+	 * @param canEditAll
+	 * @param userid
+	 * @return
+	 */
+	public String getImageBase64(int imageID,boolean canEditAll,int userid){
+		if(imageID>0){
+			RecordSet rs = new RecordSet();
+			rs.executeQuery("select id from FnaInvoiceLedger where imageID = ?", imageID);
+			int invoiceId = 0;
+			if(rs.next()){
+				invoiceId = Util.getIntValue(rs.getString("id"));
+			}
+			if(getInvoicePermission(invoiceId, canEditAll, userid)){
+				return changeFileTobase64(ImageFileManager.getInputStreamById(imageID));
+			}
+		}
+		return "-1";
+	}
+
+	/**
+	 * 查看发票权限
+	 * @param invoiceId
+	 * @param canEditAll
+	 * @param userid
+	 * @return
+	 */
+	public boolean getInvoicePermission(int invoiceId,boolean canEditAll,int userid){
+		boolean canView = false;
+		if(invoiceId>0){
+			canView = canEditAll;
+			if(!canView){
+				RecordSet rs = new RecordSet();
+				rs.executeQuery("select 1 from fnaInvoiceLedger where (userid_new = ? or id in ( select invoiceId from fnaInvoiceSharer where sharer = ? )) and id = ?", userid, userid, invoiceId);
+				if(rs.next()){
+					canView = true;
+				}else{
+					String sql=" select count(*) cnt " +
+							" from workflow_currentoperator a " +
+							" join FnaInvoiceLedger b on a.requestid = b.requestid " +
+							"  where b.id =? and a.userid in(";
+
+					//通过userid查询该userid关联的所有主从账号id
+					List<String> sqlList = new ArrayList<String>();
+					sqlList.add(String.valueOf(invoiceId));
+					List<String> useridList = getAllUserid(String.valueOf(userid));
+					for(int i=0;i<useridList.size();i++){
+						if(i==0){
+							sql = sql +"?";
+						}else{
+							sql = sql +",?";
+						}
+						sqlList.add(useridList.get(i));
+					}
+					sql = sql+")";
+
+					rs.executeQuery(sql,sqlList);
+					if(rs.next() && rs.getInt("cnt") > 0){
+						canView = true;
+					}
+					if(!canView){
+						//去重校验控制逻辑
+						int workflowlogic = ReimbursementUtil.getWorkflowlogic();
+						if(workflowlogic==3) {
+							sql=" select count(*) cnt "+
+									" from workflow_currentoperator a "+
+									" join FnaInvoiceReimbursement b on a.requestid = b.requestid "+
+									" where b.mainid = ? and a.userid in(";
+							//通过userid查询该userid关联的所有主从账号id
+							sqlList.clear();
+							sqlList.add(String.valueOf(invoiceId));
+							for(int i=0;i<useridList.size();i++){
+								if(i==0){
+									sql = sql +"?";
+								}else{
+									sql = sql +",?";
+								}
+								sqlList.add(useridList.get(i));
+							}
+							sql = sql+")";
+							rs.executeQuery(sql,sqlList);
+							if(rs.next() && rs.getInt("cnt") > 0){
+								canView = true;
+							}
+						}
+					}
+				}
+			}
+		}
+		return canView;
+	}
+
+
+	/**
+	 * 通过一个账号获取管理的所有的主从账号
+	 * @param userid
+	 * @return
+	 */
+	public List<String> getAllUserid(String userid){
+		List<String> list = new ArrayList<String>();
+		try{
+			ResourceComInfo resourceComInfo = new ResourceComInfo();
+			ResourceBelongtoComInfo resourceBelongtoComInfo = new ResourceBelongtoComInfo();
+			String accountType = resourceComInfo.getAccountType(userid);
+			if("0".equals(accountType) || "".equals(accountType)){//主账号
+				List<User> userList = resourceBelongtoComInfo.getBelongtousers(userid);//获取所有次账号
+				for(int i=0;i<userList.size();i++){
+					User user = userList.get(i);
+					list.add(String.valueOf(user.getUID()));
+				}
+			}
+			if(!list.contains(userid)){
+				list.add(userid);
+			}
+		}catch (Exception e){
+			list.add(userid);
+		}
+		return list;
+	}
+	/**
+	 * 获取发票图片
+	 * @param inputStream
+	 * @return
+	 */
+	private String changeFileTobase64(InputStream inputStream){
+		ByteArrayOutputStream outStream = new ByteArrayOutputStream();
+		byte[] fileByte=null;
+		String base64String = "";
+
+		try {
+			if(null==inputStream){
+				return base64String;
+			}
+			byte[] buffer = new byte[1024*1000];
+			int len = -1;
+			while((len=inputStream.read(buffer))!=-1){
+				outStream.write(buffer,0,len);
+			}
+			fileByte = outStream.toByteArray();
+			inputStream.read(fileByte);
+			inputStream.close();
+		} catch (Exception e) {
+			new BaseBean().writeLog("changeFileTobase64_Exception:"+e.getMessage());
+		}
+		if(null!=fileByte){
+			base64String = Base64.encodeBase64String(fileByte);
+		}
+		return base64String;
+	}
+
+	/**
+	 * 调用接口保存
+	 * @param interfaceType
+	 * @param infObject
+	 * @param user
+	 * @param ocrtype
+	 */
+	public static void addFnainvoiceLog(String interfaceType,byte[] bytes,String invoiceNumber,String invoiceCode,String billingDate,String checkCode,String priceWithoutTax,
+										JSONObject infObject,User user,String ocrtype,String appKey){
+		RecordSet rs = new RecordSet();
+		String posttime = Util.date(2);
+		String status = infObject.getString("status");
+		if("OCR".equals(ocrtype)){
+			interfaceType = ""+ SystemEnv.getHtmlLabelName(521512,weaver.general.ThreadVarLanguage.getLang())+"";
+			status = "0".equals(status)?"成功":"失败";
+		}else{
+			interfaceType = ""+ SystemEnv.getHtmlLabelName(384751,weaver.general.ThreadVarLanguage.getLang())+"";
+			status = "1".equals(status)?"成功":"失败";
+		}
+		int userid = user.getUID();
+		String errMsg = "";
+		if(infObject.containsKey("errMsg")){
+			errMsg = infObject.getString("errMsg");
+		}
+		String uuid = FnaCommon.getPrimaryKeyGuid1();
+		rs.executeUpdate("insert into fnainvoiceLog(interfaceType,posttime,userid,status,msg,ocrtype,accountNumber," +
+				"invoiceNumber,invoiceCode,billingDate,checkCode,priceWithoutTax,uuid" +
+				") values(?,?,?,?,?,?,?,?,?,?,?,?,?)",interfaceType,posttime,userid,status,errMsg,ocrtype,appKey,invoiceNumber,invoiceCode,billingDate,checkCode,priceWithoutTax,uuid);
+
+		String base64String="";
+
+		if(bytes!=null){//插入ocr bytes数组
+			base64String = Base64.encodeBase64String(bytes);
+		}
+
+		try {
+			FnaCommon.updateDbClobOrTextFieldValue("fnainvoiceLog", "base64String", base64String, "uuid", uuid, "string");
+			FnaCommon.updateDbClobOrTextFieldValue("fnainvoiceLog", "interfaceResult", infObject.toString(), "uuid", uuid, "string");
+		}catch (Exception e){new BaseBean().writeLog("插入fnainvoiceLog表sql异常");}
+		//插入接口返回内容
+
+	}
+
+
+	/**
+	 * 获取MD5
+	 * @param s
+	 * @return
+	 */
+	public static String MD5(String s) {
+		char hexDigits[]={'0','1','2','3','4','5','6','7','8','9','A','B','C','D','E','F'};
+		try {
+			byte[] btInput = s.getBytes();
+			// 获得MD5摘要算法的 MessageDigest 对象
+			MessageDigest mdInst = MessageDigest.getInstance("MD5");
+			// 使用指定的字节更新摘要
+			mdInst.update(btInput);
+			// 获得密文
+			byte[] md = mdInst.digest();
+			// 把密文转换成十六进制的字符串形式
+			int j = md.length;
+			char str[] = new char[j * 2];
+			int k = 0;
+			for (int i = 0; i < j; i++) {
+				byte byte0 = md[i];
+				str[k++] = hexDigits[byte0 >>> 4 & 0xf];
+				str[k++] = hexDigits[byte0 & 0xf];
+			}
+			return new String(str);
+		} catch (Exception e) {
+			e.printStackTrace();
+			return null;
+		}
+	}
+
+	/**
+	 * 补全校验码
+	 * @param checkCode
+	 * @return
+	 */
+	@Deprecated
+	public String addCheckCode(String checkCode){
+		int length = checkCode.length();
+		int add = 20 - length;
+		StringBuffer addbuffer = new StringBuffer();
+		for(int i = 0;i<add;i++){
+			addbuffer.append("0");
+		}
+		return addbuffer.append(checkCode).toString();
+	}
+
+	/**
+	 * 保存OCR图片
+	 * @param imagedata
+	 * @return
+	 * @throws Exception
+	 */
+	/*public static int saveImage(byte[] imagedata) throws Exception{
+		ImageFileManager imageFileManager=new ImageFileManager();
+		String imagefileName = new SimpleDateFormat("yyyyMMdd").format(new Date())+"-"+FnaCommon.getPrimaryKeyGuid1()+".jpg";
+
+		imageFileManager.setImagFileName(imagefileName);
+		imageFileManager.setData(imagedata);
+		int imageFileId=imageFileManager.saveImageFile();
+		return imageFileId;
+	}*/
+
+
+	/**
+	 * 保存OCR图片
+	 * @param imagedata
+	 * @return
+	 * @throws Exception
+	 */
+	public static int saveImage(byte[] imagedata,User user) throws Exception {
+		return saveImage(imagedata,user,"jpg");
+	}
+		/**
+		 * 保存OCR图片
+		 * @param imagedata
+		 * @return
+		 * @throws Exception
+		 */
+	public static int saveImage(byte[] imagedata,User user,String ext) throws Exception{
+		synchronized (FnaInvoiceCommon.class) {
+			ImageFileManager imageFileManager = new ImageFileManager();
+			String imagefileName = new SimpleDateFormat("yyyyMMdd").format(new Date()) + "-" + FnaCommon.getPrimaryKeyGuid1() + "." + ext;
+
+			imageFileManager.setImagFileName(imagefileName);
+			imageFileManager.setData(imagedata);
+			int imageFileId = imageFileManager.saveImageFile();
+
+			//获取imageCataLog
+			int imageCatalog = 0;
+			JSONObject interfaceInfo = InvoiceCloudUtil.getInterfaceInfo(user, true, false, true);
+			JSONObject cloudInfo = interfaceInfo.getJSONObject("cloud");
+			JSONObject ocrInfo = interfaceInfo.getJSONObject("ocr");
+			boolean existEffectCloud = cloudInfo.getBoolean("existEffectCloud");
+			boolean existEffectOcr = ocrInfo.getBoolean("existEffectOcr");
+			if (existEffectCloud) {
+				imageCatalog = cloudInfo.getInt("imageCatalog");
+			} else if (existEffectOcr) {
+				imageCatalog = ocrInfo.getInt("imageCatalog");
+			}
+
+			DocSaveService docSaveService = new DocSaveService();
+			int imageDocId = docSaveService.accForDoc(imageCatalog, imageFileId, user);
+
+
+			RecordSet rs = new RecordSet();
+			String enterTime = Util.date(2);//录入时间
+			rs.executeUpdate("insert into fnaInvoiceImageHistory(imageId,imageDocId,enterTime) values(?,?,?)", imageFileId, imageDocId, enterTime);
+			return imageFileId;
+		}
+
+	}
+
+
+
+	/**
+	 * 获取操作人
+	 * @param userid
+	 * @param para
+	 * @return
+	 * @throws Exception
+	 */
+	public String getHrmresourceName(String userid,String para) throws Exception{
+		return new ResourceComInfo().getLastname(userid);
+	}
+
+	/**
+	 * 获取处理情况
+	 * @param handleStatus
+	 * @param para
+	 * @return
+	 */
+	public String getHandleStatus(String handleStatus,String para){
+		if("0".equals(handleStatus)){
+			return ""+ SystemEnv.getHtmlLabelName(15746,weaver.general.ThreadVarLanguage.getLang())+"";
+		}
+		return ""+ SystemEnv.getHtmlLabelName(1454,weaver.general.ThreadVarLanguage.getLang())+"";
+	}
+
+	/**
+	 * 加密
+	 * @param encryptStr
+	 * @return
+	 */
+	public static String fnaEncrypt(String encryptStr){
+		SM4Utils sm4Utils = new SM4Utils();
+		return sm4Utils.encrypt(encryptStr, SM4);
+	}
+
+	/**
+	 * 解密
+	 * @param decryptStr
+	 * @return
+	 */
+	public static String fnaDecrypt(String decryptStr){
+		SM4Utils sm4Utils = new SM4Utils();
+		return sm4Utils.decrypt(decryptStr, SM4);
+	}
+	static final char hexDigits[] = {
+			'0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
+			'A', 'B', 'C', 'D', 'E', 'F'
+	};
+
+	/**
+	 * 过去刚刚插入的发票的id
+	 * @return
+	 */
+	public int getInvoiceMaxId(){
+		//获取发票id
+		int id=0;
+		RecordSet rs=new RecordSet();
+		rs.execute("select max(id) invoiceid from fnaInvoiceLedger");
+		if(rs.next()){
+			id = Util.getIntValue(rs.getString("invoiceid"));
+		}
+		return id;
+	}
+
+	/**
+	 * 已经存在的发票获取发票id，先判断发票是否为当前人员的
+	 * @param number 发票号码
+	 * @param userid 当前用户的id
+	 * @return
+	 * @throws Exception
+	 */
+	public int getInvoiceId(String number,int userid)throws Exception{
+		int id=0;
+		RecordSet rs=new RecordSet();
+		rs.execute("select id from fnaInvoiceLedger where invoiceNumber = '"+number+"' and userid_new = "+userid);
+		if(rs.getCounts() == 0){
+			throw new Exception("当前发票已经被其他人使用,请勿重复使用！");
+		}
+		if(rs.next()){
+			id = Util.getIntValue(rs.getString("id"));
+		}
+		return id;
+	}
+
+
+	/**
+	 * 判断在FnaCompanyAndTaxpayerNumber表中是否存在type为0的记录，即是否有纳税人识别号维护的记录，接口除外
+	 * @return  true 当前系统纳税人识别号需要校验
+	 */
+	public static boolean isExistInvoiceTaxpayerNumber(){
+		RecordSet rs=new RecordSet();
+		int count=0;
+		rs.executeQuery("select count(id)cnt from FnaCompanyAndTaxpayerNumber where type=0");
+		if(rs.next()){
+			count= Util.getIntValue(rs.getString("cnt"));
+		}
+		if(count==0){
+			return false;
+		}else{
+			return true;
+		}
+	}
+
+
+	/**
+	 * 通过数据库中invoiceSource_new的值，返回发票来源中文名称
+	 * @param invoiceSource_new
+	 * @return
+	 */
+	public String getInvoiceSourceNewName(String invoiceSource_new,String language){
+
+		String value="";
+		if("1".equals(invoiceSource_new)){//来自微信同步
+			value=SystemEnv.getHtmlLabelName(504356,Util.getIntValue(language));
+		}else if("3".equals(invoiceSource_new)){//发票台账增加
+			value=SystemEnv.getHtmlLabelName(504354,Util.getIntValue(language));
+		}else if("4".equals(invoiceSource_new)){//来自接口验票
+			value=SystemEnv.getHtmlLabelName(504355,Util.getIntValue(language));
+		}else if("5".equals(invoiceSource_new)){//来自OCR识别
+			value=SystemEnv.getHtmlLabelName(509429,Util.getIntValue(language));
+		}else if("6".equals(invoiceSource_new)){//来自邮件识别
+			value=SystemEnv.getHtmlLabelName(515488,Util.getIntValue(language));
+		//以下方式来自发票云新增
+		}else if("7".equals(invoiceSource_new)){//微信
+			value=SystemEnv.getHtmlLabelName(524456,Util.getIntValue(language));
+		}else if("8".equals(invoiceSource_new)){//支付宝
+			value=SystemEnv.getHtmlLabelName(533074,Util.getIntValue(language));
+		}else if("9".equals(invoiceSource_new)){//邮箱
+			value=SystemEnv.getHtmlLabelName(518661,Util.getIntValue(language));
+		}else if("10".equals(invoiceSource_new)){//拍照
+			value=SystemEnv.getHtmlLabelName(128156,Util.getIntValue(language));
+		}else if("11".equals(invoiceSource_new)){//扫码
+			value=SystemEnv.getHtmlLabelName(533075,Util.getIntValue(language));
+		}else if("12".equals(invoiceSource_new)){//手动录入
+			value=SystemEnv.getHtmlLabelName(519651,Util.getIntValue(language));
+		}else if("13".equals(invoiceSource_new)){//扫码（废弃） 已废弃
+			value=SystemEnv.getHtmlLabelName(533076,Util.getIntValue(language));
+		}else if("14".equals(invoiceSource_new)){//查验录入
+			value=SystemEnv.getHtmlLabelName(533077,Util.getIntValue(language));
+		}else if("15".equals(invoiceSource_new)){//企业微信  显示微信
+			value=SystemEnv.getHtmlLabelName(524456,Util.getIntValue(language));
+		}else if("16".equals(invoiceSource_new)){//公众号    显示微信
+			value=SystemEnv.getHtmlLabelName(524456,Util.getIntValue(language));
+		}else if("17".equals(invoiceSource_new)){//接口录入
+			value=SystemEnv.getHtmlLabelName(533079,Util.getIntValue(language));
+		}else if("18".equals(invoiceSource_new)){//文件录入
+			value=SystemEnv.getHtmlLabelName(533080,Util.getIntValue(language));
+		}else if("19".equals(invoiceSource_new)){//excel导入
+			value=SystemEnv.getHtmlLabelName(533081,Util.getIntValue(language));
+		}else if("20".equals(invoiceSource_new)){//短信录入
+			value=SystemEnv.getHtmlLabelName(533082,Util.getIntValue(language));
+		}
+
+		return value;
+	}
+
+
+	/**
+	 * 获取发票的查验状态
+	 * @param checkStatus  0未查验、1有效已查验、2有效未查验、3无效
+	 * @return
+	 */
+	public String getInvoiceCheckStatus(String checkStatus,String language){
+
+		String value = "";
+		if("0".equals(checkStatus)){
+			value=SystemEnv.getHtmlLabelName(509610,Util.getIntValue(language));
+		}else if("1".equals(checkStatus)){
+			value=SystemEnv.getHtmlLabelName(509611,Util.getIntValue(language));
+		}else if("2".equals(checkStatus)){
+			value=SystemEnv.getHtmlLabelName(509612,Util.getIntValue(language));
+		}else if("3".equals(checkStatus)){
+			value=SystemEnv.getHtmlLabelName(2245,Util.getIntValue(language));
+		}
+		return value;
+	}
+
+    public String getUpdateOperateInfo (String updateOperate,String language){
+		String value = "";
+		if("1".equals(updateOperate)){
+			value=SystemEnv.getHtmlLabelName(126151,Util.getIntValue(language));
+		}else{
+			value=SystemEnv.getHtmlLabelName(126152,Util.getIntValue(language));
+		}
+		return value;
+	}
+
+	/**
+	 * 保存失败记录
+	 * @param userid
+	 * @param invoiceType
+	 * @param failMsg
+	 */
+	public static void saveFailLog(int userid,int interfaceType,String failMsg){
+		String currentdate = Util.date(2);
+		String checkdate = currentdate.substring(0, 10);
+		String checktime = currentdate.substring(11);
+		RecordSet rs = new RecordSet();
+		String interfaceTypeDesc = "";
+		if(interfaceType==0){
+			interfaceTypeDesc = ""+ SystemEnv.getHtmlLabelName(388612,weaver.general.ThreadVarLanguage.getLang())+"";
+		}else{
+			interfaceTypeDesc = ""+ SystemEnv.getHtmlLabelName(10003277,weaver.general.ThreadVarLanguage.getLang())+"";
+		}
+		rs.executeUpdate("insert into FnaInvoiceCheckFailLog(checkdate,checktime,userid,interfaceType,failMsg,handleStatus) values (?,?,?,?,?,?)",
+				checkdate,checktime,userid,interfaceTypeDesc,failMsg,0);
+	}
+
+	/**
+	 * 判断当前纳税人识别号是否维护
+	 * @param companyName
+	 * @param taxpayerNumber
+	 * @return
+	 */
+	public static boolean protectInvoiceTaxpayerNumber(String companyName,String taxpayerNumber){
+
+		boolean protect = false;
+		RecordSet rs=new RecordSet();
+		int cnt=getProtectInvoiceTaxpayerNumber();
+		if(cnt==0){
+			protect = true;
+		}else{
+			rs.executeQuery("select id  from FnaCompanyAndTaxpayerNumber where companyName=? and taxpayerNumber=? and type = 0", companyName, taxpayerNumber);
+			if (rs.next()) {
+				protect = true;
+			}
+		}
+		return protect;
+	}
+
+	/**
+	 * 纳税人识别维护中type=0的数量
+	 * @return
+	 */
+
+	public static  int getProtectInvoiceTaxpayerNumber(){
+		RecordSet rs=new RecordSet();
+		int cnt =0;
+		rs.executeQuery("select count(id) cnt  from FnaCompanyAndTaxpayerNumber where type=0");
+		if(rs.next()){
+			cnt = Util.getIntValue(rs.getString("cnt"));
+		}
+		return cnt;
+	}
+
+
+	/**
+	 * 连号发票控制
+	 * @param invoiceIds
+	 * @param user
+	 * @return
+	 */
+	public JSONObject serialInvoiceControl(String invoiceIds,User user){
+		JSONObject serialInvoiceJson = new JSONObject();
+        RecordSet rs = new RecordSet();
+        try {
+
+			int vatCtrl = 1;//增值税发票是否开启不允许连号报销控制
+			int otherCtrl = 1;//其他发票是否开启不允许连号报销控制
+			String invoiceTypes = "3,5,6,7,8,9,10,11,12,13,14,17,18,19,22,23";//其他发票的类型
+			rs.executeQuery("select * from fnaSerialInvoiceCtrl");
+			if (rs.next()) {
+				vatCtrl = Util.getIntValue(rs.getString("vatCtrl"),1);
+				otherCtrl = Util.getIntValue(rs.getString("otherCtrl"),1);
+				invoiceTypes = Util.null2String(rs.getString("invoiceTypes"));
+			}
+			List<String> invoiceTypeList = Arrays.asList(invoiceTypes.split(","));
+
+			boolean vatExistInWhiltList = false;//增值税连号发票控制当前用户是否已维护于白名单
+			boolean otherExistInWhiltList = false;//其他连号发票控制当前用户是否已维护于白名单
+			if (vatCtrl==1) {
+				vatExistInWhiltList = this.existInWhiltList(user, 1);
+			}
+			if (otherCtrl==1) {
+				otherExistInWhiltList = this.existInWhiltList(user, 2);
+			}
+
+			//查询出所有例外的发票
+			List<String> exceptInvoiceList = new ArrayList<String>();
+			rs.executeQuery("select invoiceId from fnaExceptInvoice");
+			while (rs.next()){
+				exceptInvoiceList.add(Util.null2String(rs.getString("invoiceId")));
+			}
+			//查询出需要校验是否连号的发票信息发票号码+发票代码，用
+
+			List<FnaInvoiceLedger> invoiceLedgerList = new ArrayList<FnaInvoiceLedger>();
+			if(vatCtrl==1 || otherCtrl==1) {
+				rs.executeQuery("select id,invoiceNumber,invoiceCode,invoiceType from fnaInvoiceLedger where id in(" + StringEscapeUtils.escapeSql(invoiceIds) + ")");
+				while (rs.next()) {
+					String id = Util.null2String(rs.getString("id"));
+					String invoiceNumber = Util.null2String(rs.getString("invoiceNumber"));
+					String invoiceCode = Util.null2String(rs.getString("invoiceCode"));
+					int invoiceType = Util.getIntValue(rs.getString("invoiceType"));
+					//如果开启了增值税发票连号控制，并且当前发票是增值税发票
+                    if(vatCtrl==1 && (invoiceType==1 || invoiceType==2 || invoiceType==15 || invoiceType==16 || invoiceType==20 || invoiceType==21)){
+						//如果当前人员不在把增值税发票连号控制白名单内,并且当前发票不在例外列表中
+						if(!vatExistInWhiltList && !exceptInvoiceList.contains(id)){
+							FnaInvoiceLedger fnaInvoiceLedger = new FnaInvoiceLedger();
+							fnaInvoiceLedger.setInvoiceNumber(invoiceNumber);
+							fnaInvoiceLedger.setInvoiceCode(invoiceCode);
+							fnaInvoiceLedger.setInvoiceType(invoiceType);
+							invoiceLedgerList.add(fnaInvoiceLedger);
+						}
+					}
+					//如果开启了其他类型发票连号控制，并且当前发票是非增值税发票
+					if(otherCtrl==1 && invoiceType!=1 && invoiceType!=2 && invoiceType!=15 && invoiceType!=16 && invoiceType!=20 && invoiceType!=11){
+
+						if(invoiceTypeList.contains(String.valueOf(invoiceType))){
+							//如果当前人员不在把增值税发票连号控制白名单内,并且当前发票不在例外列表中
+							if(!otherExistInWhiltList && !exceptInvoiceList.contains(id)){
+								FnaInvoiceLedger fnaInvoiceLedger = new FnaInvoiceLedger();
+								fnaInvoiceLedger.setInvoiceNumber(invoiceNumber);
+								fnaInvoiceLedger.setInvoiceCode(invoiceCode);
+								fnaInvoiceLedger.setInvoiceType(invoiceType);
+								invoiceLedgerList.add(fnaInvoiceLedger);
+							}
+						}
+					}
+
+				}
+			}
+			StringBuffer serialInvoice = new StringBuffer();
+            for(FnaInvoiceLedger fnaInvoiceLedger :invoiceLedgerList){
+                 String invoiceNumber = fnaInvoiceLedger.getInvoiceNumber();
+                 String invoiceCode = fnaInvoiceLedger.getInvoiceCode();
+                 int invoiceType = fnaInvoiceLedger.getInvoiceType();
+                 //可以用来判断发票是否连号的发票号码一定是数字
+				 int number = 0;
+				 try{
+					 number = Integer.valueOf(invoiceNumber);
+				 }catch (Exception e){
+					 continue;
+				 }
+				 int beforeNumber = number - 1;
+				 int afterNumber = number + 1;
+				 rs.executeQuery("select id from fnaInvoiceLedger where invoiceType=? and invoiceCode=? and (invoiceNumber=? or invoiceNumber=?)",
+						 invoiceType, invoiceCode, beforeNumber, afterNumber);
+				 if (rs.next()) {
+					 if (serialInvoice.length() == 0) {
+						 serialInvoice.append(invoiceNumber);
+					 } else {
+						 serialInvoice.append(" ").append(invoiceNumber);
+					 }
+				 }
+
+
+			}
+			if(serialInvoice.length()>0){
+				serialInvoiceJson.put("status",false);
+				serialInvoiceJson.put("msg",SystemEnv.getHtmlLabelName(516385,user.getLanguage()).replace("aaaaaaaa",serialInvoice.toString()));
+			}else{
+				serialInvoiceJson.put("status",true);
+			}
+		}catch( Exception e){
+			serialInvoiceJson.put("status",false);
+			serialInvoiceJson.put("msg",e.getMessage());
+		}
+		return serialInvoiceJson;
+	}
+
+
+	/**
+	 * 判断用户是否已经在白名单中维护了
+	 * @param user
+	 * @param serialInvoiceType   连号发票类型  1增值税  2其他
+	 * @return
+	 */
+	public boolean existInWhiltList(User user,int serialInvoiceType) throws Exception {
+           RecordSet rs = new RecordSet();
+		   RecordSet rs2 = new RecordSet();
+		   ResourceComInfo resourceComInfo = new ResourceComInfo();
+		   DepartmentComInfo departmentComInfo = new DepartmentComInfo();
+		   SubCompanyComInfo subCompanyComInfo = new SubCompanyComInfo();
+           boolean exist = false;
+           int seclevel=Util.getIntValue(user.getSeclevel());
+		   String userId = String.valueOf(user.getUID());
+		   String  userDepartment = String.valueOf(user.getUserDepartment());
+		   String userSubCompany1 = String.valueOf(user.getUserSubCompany1());
+           rs.executeQuery("select * from fnaInvoiceWhiteList where serialInvoiceType=?",serialInvoiceType);
+           while (rs.next()){
+           	   int orgType = Util.getIntValue(rs.getString("orgType"),0);//组织结构类型  1人力资源，2部门，3分部,4角色，5岗位，6所有人
+			   String orgIds = Util.null2String(rs.getString("orgIds"));//组织结构ID
+			   List<String> orgIdsList = Arrays.asList(orgIds.split(","));
+			   int startSecurityLevel = Util.getIntValue(rs.getString("startSecurityLevel"),0);//开始安全级别  针对于部门、分部、角色、所有人
+			   int endSecurityLevel = Util.getIntValue(rs.getString("endSecurityLevel"),0);//结束安全级别  针对于部门、分部、角色、所有人 默认值100
+			   //String includeSubordinates = Util.null2String(rs.getString("includeSubordinates"));//是否包含下级，针对于部门和分部  1包含，0不含包
+			   //String roleLevel = Util.null2String(rs.getString("roleLevel"));//角色级别    1部门，2分部，3总部
+			   //String jobLevel = Util.null2String(rs.getString("jobLevel"));//岗位级别   1总部，2指定分部，3指定部门
+			   //String jobDesignOrgIds = Util.null2String(rs.getString("jobDesignOrgIds"));//岗位指定的分部或者部门
+               if(orgType==1){//人力资源
+                    if(orgIdsList.contains(userId)){
+						exist = true;
+						break;
+					}
+			   }else if(orgType==2){//部门
+				   if(orgIdsList.contains(userDepartment) && seclevel>=startSecurityLevel && seclevel<=endSecurityLevel){
+					   exist = true;
+					   break;
+				   }
+			   }else if(orgType==3){//分部
+				   if(orgIdsList.contains(userSubCompany1) && seclevel>=startSecurityLevel && seclevel<=endSecurityLevel){
+					   exist = true;
+					   break;
+				   }
+			   }else if(orgType==6){//所有人
+                    if(seclevel>=startSecurityLevel && seclevel<=endSecurityLevel){
+						exist = true;
+						break;
+					}
+			   }
+		   }
+		   return exist;
+	}
+
+	/**
+	 * 流程上传识别发票图片
+	 * @param fileids 文件fileid集合
+	 * @throws Exception
+	 */
+	public static byte[] invoiceIdentifyFormWorkflow(String imagefileid) throws Exception{
+		RecordSet rs = new RecordSet();
+		//发票ids
+		InputStream inputStream = ImageFileManager.getInputStreamById(Util.getIntValue(imagefileid));
+		FnaInvoiceCommon fnaInvoiceCommon = new FnaInvoiceCommon();
+	    String fileData = fnaInvoiceCommon.changeFileTobase64(inputStream);
+	    if(fileData.contains("data:image/jpeg;base64,")){//为图片
+	        fileData = fileData.replaceFirst("data:image/jpeg;base64,", "");
+	    }else if(fileData.contains("data:image/png;base64,")){//为png
+	        fileData = fileData.replaceFirst("data:image/png;base64,", "");
+	    }else if(fileData.contains("data:image/gif;base64,")){//为gif
+	        fileData = fileData.replaceFirst("data:image/gif;base64,", "");
+	    }else if(fileData.contains("data:application/pdf;base64,")){//为pdf
+	        fileData = fileData.replaceFirst("data:application/pdf;base64,", "");
+	    }
+	    byte[] imageBytes = ImageUtil.transformImage(fileData);
+		return imageBytes;
+	}
+
+
+	/**
+	 *
+	 * @Title: getInvoiceIdByCheck
+	 * @Description: 验票
+	 * @param: @param invoiceInfo
+	 * @param: @param user
+	 * @param: @return
+	 * @param: @throws Exception
+	 * @return: String
+	 * @throws
+	 */
+	public static JSONObject getInvoiceIdByCheck(JSONObject invoiceInfo,User user,String ipAdress) throws Exception{
+		String invoiceId = "";
+		String invoiceNumber = "";
+		JSONObject returnObj = new JSONObject();
+		try{
+			RecordSet rs = new RecordSet();
+			if(invoiceInfo.containsKey("invoiceId")){
+				invoiceId = invoiceInfo.getString("invoiceId");
+			}
+			boolean isauthenticity = false;
+
+			String invoiceCode = "";
+			String priceWithoutTax = "";
+			String checkcode = "";
+			String billingDate = "";
+			int userid_new = 0;
+			String invoicestatus = "";
+			String invoiceType = invoiceInfo.getString("invoiceType");
+			if(!"".equals(invoiceId)){
+				String authenticity = "";
+
+				String sql = "select id,billingDate,taxIncludedPrice,invoiceType,checkCode,invoiceCode,userid_new,authenticity,invoiceNumber,status from fnaInvoiceLedger where id = ? ";
+		        rs.executeQuery(sql, invoiceId);
+		        if(rs.next()){
+		            billingDate = Util.null2String(rs.getString("billingDate"));
+		            priceWithoutTax = Util.null2String(rs.getString("taxIncludedPrice"));
+		            checkcode = Util.null2String(rs.getString("checkCode"));
+		            userid_new = Util.getIntValue(rs.getString("userid_new"));
+		            authenticity = Util.null2String(rs.getString("authenticity"));
+		            invoiceNumber = Util.null2String(rs.getString("invoiceNumber"));
+		            invoiceCode = Util.null2String(rs.getString("invoiceCode"));
+		            invoicestatus = Util.null2String(rs.getString("status"));
+		        }
+		        if("1".equals(authenticity)){
+		        	isauthenticity = true;
+		        }
+			}else{
+
+				JSONObject inv = invoiceInfo.getJSONObject("invoiceInfo");
+
+
+				if(inv.containsKey("pretax_amount")){
+					priceWithoutTax =inv.getString("pretax_amount");
+				}
+				if(inv.containsKey("code")){
+					invoiceCode =inv.getString("code");
+				}
+				if(inv.containsKey("number")){
+					invoiceNumber =inv.getString("number");
+				}
+
+				checkcode ="";
+				if((!"10100".equals(invoiceType))&&inv.containsKey("check_code")){
+					checkcode = inv.getString("check_code");
+				}
+				String[] invoiceData = getInvoiceData(invoiceNumber,invoiceCode);
+
+				isauthenticity = "1".equals(invoiceData[7]);
+				userid_new = Util.getIntValue(invoiceData[6]);
+				invoiceId = invoiceData[3];
+				billingDate = invoiceData[0];
+				invoicestatus = invoiceData[8];
+			}
+			if("1".equals(invoicestatus)){
+				throw new Exception(SystemEnv.getHtmlLabelName(383091,user.getLanguage())+"！");
+			}
+			if("2".equals(invoicestatus)){
+				throw new Exception(SystemEnv.getHtmlLabelName(383092,user.getLanguage())+"！");
+			}
+
+			//判断此张发票是否为真
+			if(isauthenticity){ //为真，判断此张发票是否可以被当前用户使用
+				if(user.getUID() != userid_new && !InvoiceSharerUtil.isSharerWithoutEidtAll(invoiceId, user)){
+					throw new Exception(SystemEnv.getHtmlLabelName(517367,user.getLanguage())+"！");//已被其他用户使用
+				}
+				returnObj.put("flag", "true");
+				returnObj.put("invoiceId", invoiceId);
+				returnObj.put("invoiceNumber", invoiceNumber);
+				return returnObj;
+			}else{ //不为真需要查验
+				/** 金额格式化对象；保留两位小数*/
+				DecimalFormat df = new DecimalFormat("####################################################0.00");
+				FnaInvoiceCommon fnaInvoiceCommon = new FnaInvoiceCommon();
+				FnaAbstractInterface fnaAbstractInterface = fnaInvoiceCommon.getInterface(user);
+				String result = "";
+				if("2".equals(invoiceType)){
+					result = "01,01,"+invoiceCode+","+invoiceNumber+","+priceWithoutTax+","+billingDate.replace("-", "")+","+fnaInvoiceCommon.addCheckCode(checkcode)+",1111,";
+				}else{
+					result = "01,04,"+invoiceCode+","+invoiceNumber+","+priceWithoutTax+","+billingDate.replace("-", "")+","+fnaInvoiceCommon.addCheckCode(checkcode)+",1111,";
+				}
+				JSONObject resultJson = fnaAbstractInterface.scanQRCodeCheck("0", result,null);
+
+
+				int status = resultJson.getInt("status");
+				if(status!=0){//验票成功
+					String invoiceNumberTrue = resultJson.getString("_invoiceNumber");
+					String invoiceCodeTrue = resultJson.getString("_invoicecode");
+					String billingDateTrue = resultJson.getString("_billingDate");
+					String priceWithoutTaxTrue = resultJson.getString("_priceWithoutTax");
+					String taxTrue = resultJson.getString("_tax");
+					String taxIncludedPriceTrue = resultJson.getString("_taxIncludedPrice");
+					String purchaserTrue = resultJson.getString("_purchaser");//1
+					String sellerTrue = resultJson.getString("_seller");
+					String salesTaxNoTrue = resultJson.getString("_salesTaxNo");
+					String purchaserTaxNoTrue = resultJson.getString("_purchaserTaxNo");//2
+					String taxRateTrue =resultJson.getString("_taxRate");
+
+					boolean protectInvoiceTaxpayerNumber = FnaInvoiceCommon.protectInvoiceTaxpayerNumber(purchaserTrue,purchaserTaxNoTrue);
+					
+					String updateSql = "update FnaInvoiceLedger set   ";
+					
+					if(!protectInvoiceTaxpayerNumber){
+						/*json.put("flag", false);
+						json.put("msg", SystemEnv.getHtmlLabelName(390260,user.getLanguage()));
+						return json;*/
+						updateSql += " authenticity = 0,checkStatus = 3 ";
+					}else {
+						updateSql += " authenticity = 1,checkStatus = 1 ";
+					}
+					
+					
+					if(!"".equals(billingDateTrue)){
+						updateSql += " ,billingDate = '"+StringEscapeUtils.escapeSql(billingDateTrue)+"' ";
+					}
+					if(!"".equals(priceWithoutTaxTrue)){
+						updateSql += " ,priceWithoutTax = "+df.format(Util.getDoubleValue(priceWithoutTaxTrue,0.00));
+					}
+					if(!"".equals(taxTrue)){
+						updateSql += " ,tax = "+df.format(Util.getDoubleValue(taxTrue,0.00));
+					}
+					if(!"".equals(taxIncludedPriceTrue)){
+						updateSql += " ,taxIncludedPrice = "+df.format(Util.getDoubleValue(taxIncludedPriceTrue,0.00));
+					}
+					if(!"".equals(purchaserTrue)){
+						updateSql += " ,purchaser = '"+StringEscapeUtils.escapeSql(purchaserTrue)+"' ";
+					}
+					if(!"".equals(sellerTrue)){
+						updateSql += " ,seller = '"+StringEscapeUtils.escapeSql(sellerTrue)+"' ";
+					}
+					if(!"".equals(purchaserTaxNoTrue)){
+						updateSql += " ,purchaserTaxNo = '"+StringEscapeUtils.escapeSql(purchaserTaxNoTrue)+"' ";
+					}
+					if(!"".equals(salesTaxNoTrue)){
+						updateSql += " ,salesTaxNo = '"+StringEscapeUtils.escapeSql(salesTaxNoTrue)+"' ";
+					}
+					if(!"".equals(taxRateTrue)){
+						updateSql += " ,taxRate = "+df.format(Util.getDoubleValue(taxRateTrue,0.00));
+					}
+					if(!"".equals(invoiceNumberTrue)){
+						updateSql += " ,invoiceNumber = '"+StringEscapeUtils.escapeSql(invoiceNumberTrue)+"' ";
+					}
+					if(!"".equals(invoiceCodeTrue)){
+						updateSql += " ,invoiceCode = '"+StringEscapeUtils.escapeSql(invoiceCodeTrue)+"' ";
+					}
+					updateSql += " where id = ? ";
+
+
+					//添加日志
+					//插入日志1
+					FnaLogSqlUtil fnaLogSqlUtil = new FnaLogSqlUtil();
+					Map<String, String> labelIdMap = new HashMap<String, String>();
+					Map<String, String> beforeMap = fnaLogSqlUtil.getInvoiceMap(invoiceId,labelIdMap);
+
+					rs.executeUpdate(updateSql,Util.getIntValue(invoiceId,0));
+					if("10100".equals(invoiceType)||"10101".equals(invoiceType) || "10102".equals(invoiceType) || "10103".equals(invoiceType)){//增值税发票
+						String remark = resultJson.getString("_remark");
+						String sellerAddress = resultJson.getString("_sellerAddress");
+						String purchaserAddress = resultJson.getString("_purchaserAddress");
+						String salesBank = resultJson.getString("_salesBank");
+						String purchaserBank = resultJson.getString("_purchaserBank");
+						//保存FnaInvoiceLedgerDtl表信息
+						InvoiceUtil.updateInsertFnaInvoiceLedgerDtl(1,Util.getIntValue(invoiceId,0),remark,"",sellerAddress,purchaserAddress,salesBank,purchaserBank);
+						saveInvoiceLedgerDetail(resultJson.getJSONArray("detaildata"),invoiceNumberTrue,invoiceCodeTrue,user);
+					}
+
+					//插入日志2
+					Map<String, String> afterMap =fnaLogSqlUtil.getInvoiceMap(invoiceId,labelIdMap);
+					fnaLogSqlUtil.invoiceLedgerAddlog(user,ipAdress,"2",invoiceId,"1",
+							beforeMap,afterMap,labelIdMap);
+
+					if(!protectInvoiceTaxpayerNumber){
+						throw new Exception(SystemEnv.getHtmlLabelName(390260,user.getLanguage()));
+					}
+				}else{
+					String msg = SystemEnv.getHtmlLabelName(509478,user.getLanguage());
+					if(resultJson.containsKey("errMsg")){
+						msg = Util.null2String(resultJson.getString("errMsg"));
+					}
+					throw new Exception(msg);//查验失败
+				}
+
+			}
+			returnObj.put("flag", "true");
+			returnObj.put("invoiceId", invoiceId);
+			returnObj.put("invoiceNumber", invoiceNumber);
+
+		}catch(Exception e){
+
+			returnObj.put("flag", "false");
+			String msString = e.getMessage();
+			new BaseBean().writeLog("msString:"+msString);
+			if("".equals(msString)){
+				msString = SystemEnv.getHtmlLabelName(509478,user.getLanguage());
+			}
+			new BaseBean().writeLog("msString:"+msString);
+			returnObj.put("msg", SystemEnv.getHtmlLabelName(132211,user.getLanguage())+invoiceNumber+msString);//发票
+		}
+
+		return returnObj;
+	}
+
+	/**
+	 *
+	 * @Title: saveInvoiceLedgerDetail
+	 * @Description: 保存发票明细
+	 * @param: @param detailArray
+	 * @param: @param invoiceNumber
+	 * @param: @param invoiceCode
+	 * @param: @throws Exception
+	 * @return: void
+	 * @throws
+	 */
+	public static void saveInvoiceLedgerDetail( JSONArray detailArray,String invoiceNumber,String invoiceCode,User user) throws Exception {
+		BatchRecordSet brs = new BatchRecordSet();
+		/** 金额格式化对象；保留两位小数*/
+		DecimalFormat df = new DecimalFormat("####################################################0.00");
+		RecordSet rs =new RecordSet();
+		//查询出发票台账主表的id
+		int mainid =0;
+		rs.executeQuery("select id from fnaInvoiceLedger where invoiceNumber = ? and invoiceCode = ?",invoiceNumber,invoiceCode);
+		if(rs.next()){
+			mainid = Util.getIntValue(rs.getString("id"));
+		}
+		if(mainid==0){
+			throw new Exception(SystemEnv.getHtmlLabelName(517370,user.getLanguage())+"!");//发票主表信息不存在
+		}
+        rs.executeUpdate("delete from FnaInvoiceLedgerDetail where mainid=?",mainid);
+		//writeLog("-----detailArray-----detailArray-----"+detailArray);
+		List<String> insertList = new ArrayList<String>();
+		for(int i = 0;i<detailArray.size();i++){
+			FnaInvoiceLedgerDetail fnaInvoiceLedgerDetail = new FnaInvoiceLedgerDetail();
+			JSONObject detail = detailArray.getJSONObject(i);
+			//数量，单价，货物或应税服务类型，金额，	税率，税额
+			int unitNumber = Util.getIntValue(detail.containsKey("Quantity")?detail.getString("Quantity"):"0",1);//数量
+			String originalUnitPrice =detail.containsKey("UnitPrice")?detail.getString("UnitPrice"):"0";
+			double unitPrice = Util.getDoubleValue(originalUnitPrice,0.00);//单价
+			String invoiceServiceYype = detail.containsKey("CommodityName")?detail.getString("CommodityName"):detail.getString("GoodsName");//货物或应税服务类型
+			double priceWithoutTax = Util.getDoubleValue(detail.containsKey("Amount")?detail.getString("Amount"):detail.getString("TotalAmount"),0.00);//金额
+			double taxRate = Util.getDoubleValue(detail.getString("TaxRate").toString(),0.00) * 100;//税率
+			double tax = Util.getDoubleValue(detail.getString("Tax"),0.00);//税额
+
+			insertList.add(mainid +"" + Util.getSeparator() + unitNumber+"" + Util.getSeparator() + df.format(unitPrice) + Util.getSeparator()+StringEscapeUtils.escapeSql(originalUnitPrice)+Util.getSeparator()
+					+StringEscapeUtils.escapeSql(invoiceServiceYype)+ Util.getSeparator()+df.format(priceWithoutTax)+ Util.getSeparator()+df.format(taxRate)
+					+ Util.getSeparator()+df.format(tax));
+		}
+		brs.executeSqlBatch("insert into FnaInvoiceLedgerDetail(mainid,unitNumber,unitPrice,originalUnitPrice,invoiceServiceYype,priceWithoutTax,taxRate,tax) VALUES (?,?,?,?,?,?,?,?)", insertList);
+
+	}
+
+
+	/**
+	 *
+	 * @Title: getInvoiceData
+	 * @Description: 获取发票信息
+	 * @param: @param invoiceNumber
+	 * @param: @param invoiceCode
+	 * @param: @return
+	 * @return: String[]
+	 * @throws
+	 */
+    public static String[] getInvoiceData(String invoiceNumber,String invoiceCode){
+        RecordSet rs = new RecordSet();
+        String[] data = new String[9];
+        String sql = "select id,billingDate,taxIncludedPrice,invoiceType,checkCode,invoiceCode,userid_new,authenticity,status from fnaInvoiceLedger where invoiceNumber = ? and invoiceCode = ? ";
+        rs.executeQuery(sql, invoiceNumber, invoiceCode);
+        String id = "0";
+        String billingDate = "";
+        String taxIncludedPrice = "";
+        String invoiceType = "";
+        String checkCode = "";
+        String userid_new = "";
+        String authenticity = "";
+        String status = "";
+
+        if(rs.next()){
+            id = Util.null2String(rs.getString("id"));
+            billingDate = Util.null2String(rs.getString("billingDate"));
+            taxIncludedPrice = Util.null2String(rs.getString("taxIncludedPrice"));
+            invoiceType = Util.null2String(rs.getString("invoiceType"));
+            checkCode = Util.null2String(rs.getString("checkCode"));
+            userid_new = Util.null2String(rs.getString("userid_new"));
+            authenticity = Util.null2String(rs.getString("authenticity"));
+            status = Util.null2String(rs.getString("status"));
+        }
+        data[0] = billingDate;
+        data[1] = taxIncludedPrice;
+        data[2] = invoiceType;
+        data[3] = id;
+        data[4] = checkCode;
+        data[5] = invoiceCode;
+        data[6] = userid_new;
+        data[7] = authenticity;
+        data[8] = status;
+        return data;
+    }
+
+
+
+		/**
+		 * 处理in造成的sql拼接问题
+		 * @param sql  例如   select * from fnaInvoiceledger where id in(占位符标识)
+		 * @param ids  用英文逗号隔开
+		 * @param type 类型   executeQuery   or executeUpdate
+		 */
+		public static RecordSet executeInSql(String sql,String ids,String type){
+			RecordSet rs =new RecordSet();
+			String[] ids_split = ids.split(",");
+			StringBuffer idsBuffer = new StringBuffer();
+			List<String> idsList = new ArrayList<>();
+			for(int i=0;i<ids_split.length;i++){
+				if(idsBuffer.length()==0){
+					idsBuffer.append("?");
+				}else{
+					idsBuffer.append(",").append("?");
+				}
+				idsList.add(ids_split[i]);
+			}
+			if(idsBuffer.length()>0) {
+
+				sql = sql.replace("占位符标识", idsBuffer.toString());
+				if("executeQuery".equals(type)){
+					rs.executeQuery(sql,idsList);
+				}else if("executeUpdate".equals(type)){
+					rs.executeUpdate(sql,idsList);
+				}
+			}
+			return rs;
+		}
+
+
+	/**
+	 * 通过日期获取时间戳 精确到秒
+	 * @param date yyyy-MM-dd
+	 * @return
+	 */
+	public static String getTimestamp(String date){
+		String timestamp = "";
+		try {
+			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+			Date d = sdf.parse(date);
+			timestamp = Util.null2String(d.getTime()/1000);
+		}catch (Exception e){}
+		return timestamp;
+	}
+
+}
diff --git a/src/main/youhong_ai_old_src/weaver/fna/invoice/utils/HttpUtil.java b/src/main/youhong_ai_old_src/weaver/fna/invoice/utils/HttpUtil.java
new file mode 100644
index 0000000..2fbc442
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/fna/invoice/utils/HttpUtil.java
@@ -0,0 +1,536 @@
+/*
+ *
+ * Copyright (c) 2001-2018 泛微软件.
+ * 泛微协同商务系统,版权所有.
+ * 
+ */
+package weaver.fna.invoice.utils;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.io.UnsupportedEncodingException;
+import java.net.HttpURLConnection;
+import java.net.MalformedURLException;
+import java.net.Proxy;
+import java.net.URL;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.apache.commons.codec.binary.Base64;
+import org.apache.commons.io.Charsets;
+import org.apache.http.HttpEntity;
+import org.apache.http.HttpResponse;
+import org.apache.http.HttpStatus;
+import org.apache.http.NameValuePair;
+import org.apache.http.ParseException;
+import org.apache.http.client.ClientProtocolException;
+import org.apache.http.client.config.RequestConfig;
+import org.apache.http.client.entity.UrlEncodedFormEntity;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.client.methods.HttpUriRequest;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.message.BasicNameValuePair;
+import org.apache.http.util.EntityUtils;
+import org.dom4j.Document;
+import org.dom4j.DocumentHelper;
+import org.dom4j.Element;
+
+import net.sf.json.JSONObject;
+import sun.misc.BASE64Encoder;
+import weaver.conn.RecordSet;
+import weaver.fna.invoice.Constants;
+import weaver.fna.invoice.common.FnaInvoiceCommon;
+import weaver.general.BaseBean;
+import weaver.general.Util;
+import weaver.hrm.User;
+import weaver.systeminfo.SystemEnv;
+
+/**
+ * @author zhangwj
+ * @Jan 23, 2019
+ */
+@SuppressWarnings("unchecked")
+public class HttpUtil {
+
+
+	/**
+	 * post
+	 * @param url
+	 * @param params
+	 * @return
+	 */
+	public static Map<String,Object> post(String url, Map<String, String> params) {
+		CloseableHttpClient cilent = HttpClients.createDefault();
+		Map<String,Object> reponseMap = new HashMap<String,Object>();
+		try {
+			HttpPost post = postForm(url, params);
+			reponseMap = invoke(cilent, post);		
+		} catch (Exception e) {
+			e.printStackTrace();
+		}finally{
+			try {
+				cilent.close();
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
+		}
+		return reponseMap;
+	}
+	
+	/**
+	 * invoke
+	 * @param httpclient
+	 * @param httpost
+	 * @return
+	 */
+	private static Map<String,Object> invoke(CloseableHttpClient httpclient,
+			HttpUriRequest httpost) {
+
+		Map<String,Object> returnMap = new HashMap<String,Object>();
+		HttpResponse response = sendRequest(httpclient, httpost);
+		String body = paseResponse(response);
+		// 请求返回结果状态
+		returnMap.put("statusCode", response.getStatusLine().getStatusCode()); 
+		returnMap.put("response", body);
+		return returnMap;
+	}
+	
+	/**
+	 * sendRequest
+	 * @param httpclient
+	 * @param httpost
+	 * @return
+	 */
+	private static HttpResponse sendRequest(CloseableHttpClient httpclient,
+			HttpUriRequest httpost) {
+
+		HttpResponse response = null;
+		try {
+			response = httpclient.execute(httpost);
+		} catch (ClientProtocolException e) {
+			e.printStackTrace();
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+		return response;
+	}
+
+	/**
+	 * paseResponse
+	 * @param response
+	 * @return
+	 */
+	private static String paseResponse(HttpResponse response) {
+
+		HttpEntity entity = response.getEntity();
+
+		String body = null;
+		try {
+			body = EntityUtils.toString(entity, "UTF-8");
+		} catch (ParseException e) {
+			e.printStackTrace();
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+		return body;
+	}
+	
+	/**
+	 * 获取  HttpPost 对象
+	 * @param url
+	 * @param params
+	 * @return
+	 */
+	private static HttpPost postForm(String url, Map<String, String> params) {
+
+		HttpPost httpost = new HttpPost(url);
+		RequestConfig requestConfig = RequestConfig.custom()
+				.setConnectTimeout(120000).setConnectionRequestTimeout(120000)
+				.setSocketTimeout(120000).build();
+		httpost.setConfig(requestConfig);
+
+		if(params!=null){
+			List<NameValuePair> nvps = new ArrayList<NameValuePair>();
+			Set<String> keySet = params.keySet();
+			for (String key : keySet) {
+				nvps.add(new BasicNameValuePair(key, params.get(key)));
+			}
+			httpost.setEntity(new UrlEncodedFormEntity(nvps, Charsets.UTF_8));
+		}
+		return httpost;
+	}
+	
+	/**
+	 * Base64 加密
+	 * @param str
+	 * @return
+	 */
+    public static String getBase64(String str) {  
+        byte[] b = null;  
+        String s = "";  
+        try {  
+            b = str.getBytes("UTF-8");  
+        } catch (UnsupportedEncodingException e) {  
+            e.printStackTrace();  
+        }  
+        if (b != null) {  
+            s = new BASE64Encoder().encode(b);  
+        }  
+        return s;  
+    }  
+    
+    
+    public static JSONObject postImage(byte[] bytes,User user){
+		new BaseBean().writeLog("开始调用发票识别接口...");
+		RecordSet rs = new RecordSet();
+		JSONObject jsonObject = new JSONObject();
+		HttpURLConnection connection = null;
+		OutputStream outputStream = null;
+
+
+		boolean existEffectOcr=false;
+		boolean existEffectCloud=false;
+		int imageCatalog = 0;
+		//ocr
+		String interfaceurl = "";
+		String appKey = "";
+		String secret = "";
+		//Cloud
+		String cid = "";
+		String ocrUrl = "";
+		String uploadFileUrl = "";
+		String tokenUrl = "";
+		String userName = "";
+		String password = "";
+		try {
+			JSONObject interfaceInfo = InvoiceCloudUtil.getInterfaceInfo(user, true, false, true);
+			JSONObject cloudInfo = interfaceInfo.getJSONObject("cloud");
+			JSONObject ocrInfo = interfaceInfo.getJSONObject("ocr");
+			existEffectCloud = cloudInfo.getBoolean("existEffectCloud");
+			existEffectOcr = ocrInfo.getBoolean("existEffectOcr");
+			if(existEffectCloud){
+				imageCatalog = cloudInfo.getInt("imageCatalog");
+				 cid = cloudInfo.getString("cid");
+				 ocrUrl = cloudInfo.getString("ocrUrl");
+				 tokenUrl = cloudInfo.getString("tokenUrl");
+				 uploadFileUrl = cloudInfo.getString("uploadFileUrl");
+				 userName = cloudInfo.getString("userName");
+				 password = cloudInfo.getString("password");
+			}else if(existEffectOcr){
+				imageCatalog = ocrInfo.getInt("imageCatalog");
+				interfaceurl = ocrInfo.getString("interfaceurl");
+				appKey = ocrInfo.getString("appKey");
+				secret = ocrInfo.getString("secret");
+			}
+			if(!existEffectCloud && !existEffectOcr){
+				throw new Exception(SystemEnv.getHtmlLabelName(520791, user.getLanguage()));//后台【预算】-【发票管理】-【发票接口配置】未配置生效的票据接口！
+			}
+			if(imageCatalog==0){
+				throw new Exception("发票识别接口未配置发票图片目录");
+			}
+
+			if(existEffectCloud){
+				JSONObject resultJsonObj = InvoiceCloudUtil.invoiceOCR(bytes, cid, ocrUrl,tokenUrl,uploadFileUrl, user, userName, password);
+				jsonObject.put("status", resultJsonObj.get("status"));
+				jsonObject.put("returnInfo", resultJsonObj.getJSONObject("returnInfo"));
+			}else{
+				jsonObject = invoiceOCR(appKey,secret,interfaceurl,bytes,connection,outputStream);
+			}
+		} catch (Exception e) {
+			jsonObject.put("status", Constants.ERROR_CODE);
+			jsonObject.put("errMsg", e.getMessage());
+		}finally {
+			if(connection!=null){
+				connection.disconnect();
+			}
+		}
+		FnaInvoiceCommon.addFnainvoiceLog("1",bytes,"","","","","",
+				jsonObject, user, "OCR",appKey);
+		new BaseBean().writeLog("结束调用发票识别接口...");
+		new BaseBean().writeLog("jsonObject:"+jsonObject.toString());
+		return jsonObject;
+	}
+
+
+	private static JSONObject invoiceOCR(String appKey,String secret,String interfaceurl,byte[] bytes,
+										 HttpURLConnection connection,OutputStream outputStream) throws Exception {
+		JSONObject resultJsonObj = new JSONObject();
+		Map<String, Object> params = new LinkedHashMap<String, Object>();
+		String timestamp = System.currentTimeMillis() / 1000 +"";
+
+		String type="0";
+		String token=getEncode(appKey+"+"+timestamp+"+"+FnaInvoiceCommon.fnaDecrypt(secret));
+		//key
+		params.put("app_key", appKey);
+		//token
+		params.put("token", token.toLowerCase());
+		//当前时间戳
+		params.put("timestamp", timestamp);
+		//识别类型
+		params.put("type", type);
+		new BaseBean().writeLog("-----------------param-------------------"+params);
+		URL url = new URL(interfaceurl);
+		//判断是是否配置代理
+		if(ProxyUtil.ifExistsProxy()){
+			connection = (HttpURLConnection) url.openConnection(ProxyUtil.getProxy());
+			Map<String,String> propertyMap = ProxyUtil.getProxyProperty();
+			String proxyUser = propertyMap.getOrDefault("proxyUser", "");//用户名
+			String proxyPwd = propertyMap.getOrDefault("proxyPwd", "");//密码
+			if(!"".equals(proxyUser)&&!"".equals(proxyPwd)){
+				String headerkey = "Proxy-Authorization";
+				String headerValue = "Basic "+Base64.encodeBase64String((proxyUser+":"+proxyPwd).getBytes());//帐号密码用:隔开，base64加密方式
+				connection.setRequestProperty(headerkey, headerValue);
+			}
+		}else{
+			connection = (HttpURLConnection) url.openConnection();
+		}
+		connection.setRequestProperty("Content-Type", "multipart/form-data; boundary=----request");
+		connection.setDoOutput(true);
+		connection.setDoInput(true);
+		connection.setRequestProperty("Accept-Language", "zh-CN,zh;q=0.8");
+		connection.setRequestProperty("Accept", "*/*");
+		connection.setRequestProperty("Range", "bytes="+"");
+		connection.setConnectTimeout(60000);
+		connection.setReadTimeout(60000);
+		connection.setRequestMethod("POST");
+		StringBuffer buffer = new StringBuffer();
+		for(Map.Entry<String, Object> entry:params.entrySet()){
+			buffer.append("------request\r\n");
+			buffer.append("Content-Disposition: form-data; name=\"");
+			buffer.append(entry.getKey());
+			buffer.append("\"\r\n\r\n");
+			buffer.append(entry.getValue());
+			buffer.append("\r\n");
+		}
+		outputStream = connection.getOutputStream();
+		outputStream.write(buffer.toString().getBytes());
+		outputStream.write(("------request\r\n").getBytes());
+		outputStream.write(("Content-Disposition: form-data; name=\"image_file\";filename=\"发票1.jpg\"\r\n").getBytes());
+		outputStream.write(("Content-Type: image/jpeg").getBytes());
+		outputStream.write(("\"\r\n\r\n").getBytes());
+		outputStream.write(bytes);
+		outputStream.write(("\r\n").getBytes());
+		outputStream.write(("------request--\r\n").getBytes());
+		outputStream.flush();
+		outputStream.close();
+		StringBuffer returnInfo = new StringBuffer();
+		int resultCode = connection.getResponseCode();
+		if(HttpURLConnection.HTTP_OK==resultCode){
+			BufferedReader reader = new BufferedReader(new InputStreamReader(connection.getInputStream(),"utf-8"));
+			String line;
+			while ((line = reader.readLine()) != null){
+				returnInfo.append(line.trim());
+			}
+			reader.close();
+			connection.disconnect();
+			resultJsonObj.put("status", Constants.SUCCESS_CODE);
+			resultJsonObj.put("returnInfo", JSONObject.fromObject(returnInfo.toString()));
+		}else{
+			throw new Exception("error responsecode :"+resultCode);
+		}
+		return resultJsonObj;
+	}
+    /**
+     * 
+     * @Title: checkshibie   
+     * @Description: 校验识别接口的配置
+     * @param: @param user
+     * @param: @return      
+     * @return: boolean      
+     * @throws
+     */
+    public static boolean checkIdentify(User user){
+    	boolean existEffectOcr=false;
+    	RecordSet rs = new RecordSet();
+		//如果有生效的未开启分部的ocr，直接使用
+		rs.executeQuery("select * from fnainvoiceinterface where interfaceType=0 and status=1 and subIdStatus=0 ");
+		if(rs.next()){
+			existEffectOcr = true;
+		}
+		if(!existEffectOcr){
+			//查询当前人员所在分部的发票云接口
+			rs.executeQuery("select * from fnainvoiceinterface where interfaceType=0 and status=1 and subIdStatus=1 ");
+			while (rs.next()){
+				String subIds = Util.null2String(rs.getString("subIds"));
+				String[] subIds_split = subIds.split(",");
+				for(int i=0;i<subIds_split.length;i++){
+					if(subIds_split[i].equals(user.getUserSubCompany1())){
+						existEffectOcr = true;
+						break;
+					}
+				}
+				if(existEffectOcr){
+					break;
+				}
+			}
+		}
+		return existEffectOcr;
+    }
+    
+    /**
+	 * 获取token
+	 * @return
+	 */
+	public static JSONObject getToken(String client_secret,String client_id,String tokenURL) throws Exception{
+		JSONObject jsonObject = new JSONObject();
+		String content = "";
+		String token = "";
+		JSONObject tokenJson = new JSONObject();
+		tokenJson.put("client_secret", client_secret);
+		tokenJson.put("client_id", client_id);
+		String url = tokenURL+"&client_id="+client_id+"&client_secret="+client_secret;
+        CloseableHttpClient httpclient = HttpClients.createDefault();  
+        //请求报文
+        StringEntity s = new StringEntity(tokenJson.toString(), "UTF-8");
+        s.setContentEncoding("UTF-8");
+        s.setContentType("application/json");//发送json数据需要设置contentType
+        
+        // 构造消息头
+        HttpPost post = new HttpPost(url);
+		RequestConfig requestConfig = RequestConfig.custom()
+		.setConnectTimeout(120000).setConnectionRequestTimeout(120000)
+		.setSocketTimeout(120000).build();
+		
+		post.setConfig(requestConfig);// 设置超时时间
+        post.setHeader("Accept-Charset", "UTF-8");
+        post.setHeader("Charset", "UTF-8");
+        
+        post.setEntity(s); 
+        
+        HttpResponse res = httpclient.execute(post);
+        if(res.getStatusLine().getStatusCode() == HttpStatus.SC_OK){
+        	content = EntityUtils.toString(res.getEntity());// 返回json格式
+        }else {
+			throw new Exception("获取token失败！");
+        }
+		String REPLYCODE = "0";
+		String REPLYMSG = "";
+	    Document document = DocumentHelper.parseText(content);
+		Element rootElement = document.getRootElement();
+		List<Element> rootlist = rootElement.elements();
+		for(int i = 0;i<rootlist.size();i++){
+			Element element = rootlist.get(i);
+			if("HEAD".equals(element.getName())){
+				Element SERVICE = (Element) element.elements().get(0);
+				List<Element> replayList = SERVICE.elements();
+				for(int j = 0;j<replayList.size();j++){
+					String tag = replayList.get(j).getName();
+					if("REPLYCODE".equalsIgnoreCase(tag)){
+						REPLYCODE = replayList.get(j).getText();
+					}
+					if("REPLYMSG".equalsIgnoreCase(tag)){
+						REPLYMSG = replayList.get(j).getText();
+					}
+				}
+ 			}
+			if("BODY".equals(element.getName())){
+				List<Element> replayList = element.elements();
+				for(int j = 0;j<replayList.size();j++){
+					String tag = replayList.get(j).getName();
+					if("access_token".equalsIgnoreCase(tag)){
+						token = replayList.get(j).getText();
+					}
+				}
+			}
+		}
+		if(!"0".equals(REPLYCODE)) {
+			throw new Exception(REPLYMSG);
+		}
+		if("".equals(token)) {
+			throw new Exception("获取token失败！");
+		}
+		jsonObject.put("status", "0");
+		jsonObject.put("token", token);
+	    return jsonObject;
+	}
+    
+	/**
+	 * 获取openid
+	 * @param token
+	 * @return
+	 */
+	public static JSONObject getOpenID(String token,String openIdURL,String client_id) throws Exception{
+		JSONObject jsonObject = new JSONObject();
+		CloseableHttpClient httpClient = HttpClients.createDefault();
+	    HttpGet get = new HttpGet(openIdURL+"&client_id="+client_id+"&access_token="+token);
+	    String content = "";
+	    String openId = "";
+	    HttpResponse response = httpClient.execute(get);  
+	    content = EntityUtils.toString(response.getEntity());
+		String REPLYCODE = "0";
+		String REPLYMSG = "";
+	    Document document = DocumentHelper.parseText(content);
+		Element rootElement = document.getRootElement();
+		List<Element> rootlist = rootElement.elements();
+		for(int i = 0;i<rootlist.size();i++){
+			Element element = rootlist.get(i);
+			if("HEAD".equals(element.getName())){
+				Element SERVICE = (Element) element.elements().get(0);
+				List<Element> replayList = SERVICE.elements();
+				for(int j = 0;j<replayList.size();j++){
+					String tag = replayList.get(j).getName();
+					if("REPLYCODE".equalsIgnoreCase(tag)){
+						REPLYCODE = replayList.get(j).getText();
+					}
+					if("REPLYMSG".equalsIgnoreCase(tag)){
+						REPLYMSG = replayList.get(j).getText();
+					}
+				}
+ 			}
+			if("BODY".equals(element.getName())){
+				List<Element> replayList = element.elements();
+				for(int j = 0;j<replayList.size();j++){
+					String tag = replayList.get(j).getName();
+					if("openID".equalsIgnoreCase(tag)){
+						openId = replayList.get(j).getText();
+					}
+				}
+			}
+		}
+		if(!"0".equals(REPLYCODE)) {
+			throw new Exception(REPLYMSG);
+		}
+		if("".equals(openId)) {
+			throw new Exception("获取openId失败！");
+		}
+		jsonObject.put("status", "0");
+		jsonObject.put("openId", openId);
+	    return jsonObject;
+	}
+    
+    static final char HEXDIGITS[] = {
+			'0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
+			'A', 'B', 'C', 'D', 'E', 'F'
+	};
+	private static String getEncode(String key) throws NoSuchAlgorithmException {
+		MessageDigest messageDigest = MessageDigest.getInstance("MD5");
+		try {
+			messageDigest.update(key.getBytes("UTF-8"));
+		} catch (UnsupportedEncodingException e) {
+			messageDigest.update(key.getBytes());
+		}
+		byte digest[] = messageDigest.digest();
+		int j = digest.length;
+		char str[] = new char[j * 2];
+		int k = 0;
+		for(int i = 0; i < j; i++)
+		{
+			byte byte0 = digest[i];
+			str[k++] = HEXDIGITS[byte0 >>> 4 & 0xf];
+			str[k++] = HEXDIGITS[byte0 & 0xf];
+		}
+		return new String(str);
+	}
+
+}
diff --git a/src/main/youhong_ai_old_src/weaver/fna/invoice/utils/ImageUtil.java b/src/main/youhong_ai_old_src/weaver/fna/invoice/utils/ImageUtil.java
new file mode 100644
index 0000000..d5610dd
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/fna/invoice/utils/ImageUtil.java
@@ -0,0 +1,196 @@
+/*
+ *
+ * Copyright (c) 2001-2018 泛微软件.
+ * 泛微协同商务系统,版权所有.
+ * 
+ */
+package weaver.fna.invoice.utils;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+
+import com.weaver.general.Util;
+import net.coobird.thumbnailator.Thumbnails;
+import weaver.fna.invoice.Constants;
+import weaver.fna.invoice.common.FnaInvoiceCommon;
+import weaver.general.BaseBean;
+
+import org.apache.commons.codec.binary.Base64;
+import weaver.hrm.User;
+
+/**
+ * @author zhangwj
+ * @Jan 23, 2019
+ */
+public class ImageUtil {
+	
+	/**
+	 * 图片转换
+	 * @param fileData
+	 * @return
+	 * @throws Exception
+	 */
+	public static byte[] transformImage(String fileData) throws Exception{
+		imageCheck(fileData);
+		BaseBean bb = new BaseBean();
+		byte[] imageByte = Base64.decodeBase64(fileData);
+		long fileLen = imageByte.length;
+		//大于2.5M,进行压缩
+		if (fileLen > Constants.MAX_BYTES) {
+			bb.writeLog("图片当前大小" + fileLen + ",需要压缩...");
+			imageByte = compressImage(imageByte);
+		}else{
+			bb.writeLog("图片当前大小" + fileLen + ",不需要压缩...");
+		}
+		if (imageByte.length == 0) {
+			throw new Exception("图片出现问题，请联系系统管理员!");
+		}
+		/*ByteArrayInputStream byteArrayInputStream = null;
+		ByteArrayOutputStream byteArrayOutputStream = null;
+		try {
+			byteArrayInputStream = new ByteArrayInputStream(imageByte);
+			byteArrayOutputStream = new ByteArrayOutputStream();
+			Thumbnails.of(byteArrayInputStream).useExifOrientation(false).scale(1).outputQuality(1d).toOutputStream(byteArrayOutputStream);
+			String base64 = readImageBase64(byteArrayOutputStream);
+			imageByte = Base64.decodeBase64(base64.replace("data:image/jpeg;base64,", ""));
+		} catch (Exception e) {
+		}finally{
+			try {
+				if(byteArrayOutputStream!=null){
+					byteArrayOutputStream.close();
+				}
+			} catch (Exception e0) {}
+			try {
+				if(byteArrayInputStream!=null){
+					byteArrayInputStream.close();
+				}
+			} catch (Exception e0) {}
+		}*/
+		return imageByte;
+	}
+	
+	private static void imageCheck(String fileData) throws Exception{
+		if ("".equals(fileData)) {
+			throw new Exception("请选择正确的图片文件!");
+		}
+	}
+	
+	/**
+	 * 图片压缩
+	 * @param imageBytes
+	 * @return
+	 */
+	private static byte[] compressImage(byte[] imageBytes){
+		ByteArrayInputStream byteArrayInputStream = new ByteArrayInputStream(imageBytes);
+		ByteArrayOutputStream byteArrayOutputStream = null;
+		BaseBean bb = new BaseBean();
+		try {
+			int count = 5;
+			double quality = 1d;
+			while(quality > 0){
+				quality = quality - 0.2d;
+				byteArrayInputStream = new ByteArrayInputStream(imageBytes);
+				byteArrayOutputStream = new ByteArrayOutputStream();
+				//压缩图片
+				Thumbnails.of(byteArrayInputStream).scale(quality).outputQuality(quality).toOutputStream(byteArrayOutputStream);
+				if(byteArrayOutputStream.toByteArray().length <= Constants.MAX_BYTES){
+					break;
+				}
+				count--;
+				if(count == 0) {
+					break;
+				}
+			}
+			bb.writeLog("压缩质量：",quality);
+		} catch (Exception e) {
+			new BaseBean().writeLog("压缩出现错误：", e.getMessage());
+		} finally {
+			try {
+				if(byteArrayOutputStream!=null) {
+					byteArrayOutputStream.close();
+				}
+			} catch (Exception e) {
+				bb.writeLog("出现错误：", e.getMessage());
+			}
+			try {
+				if(byteArrayInputStream!=null) {
+					byteArrayInputStream.close();
+				}
+			} catch (Exception e) {
+				bb.writeLog("出现错误：", e.getMessage());
+			}
+		}
+		return byteArrayOutputStream.toByteArray();
+	}
+	
+	/**
+	 * 图片截取
+	 * @param x
+	 * @param y
+	 * @param w
+	 * @param h
+	 * @param imageBytes
+	 * @return
+	 * @throws Exception
+	 */
+	public static String cutImg(int x,int y,int w,int h,byte[] imageBytes,String orientation) throws Exception {
+		ByteArrayInputStream byteArrayInputStream = null;
+		ByteArrayOutputStream byteArrayOutputStream = null;
+		try {
+			byteArrayOutputStream = new ByteArrayOutputStream();
+			byteArrayInputStream = new ByteArrayInputStream(imageBytes);
+			Thumbnails.of(byteArrayInputStream).sourceRegion(x, y, w, h).size(w, h).rotate(Util.getDoubleValue(orientation,0.00)).toOutputStream(byteArrayOutputStream);
+		} catch (Exception e) {
+			throw e;
+		} finally {
+			try {
+				if(byteArrayOutputStream!=null) {
+					byteArrayOutputStream.close();
+				}
+			} catch (Exception e) {
+			}
+			try {
+				if(byteArrayInputStream!=null) {
+					byteArrayInputStream.close();
+				}
+			} catch (Exception e) {
+			}
+		}
+		String base64 = readImageBase64(byteArrayOutputStream);
+		return base64;
+    }
+	
+	/**
+	 * 图片存储
+	 * @param base64
+	 * @return
+	 * @throws Exception
+	 */
+	public static int saveImage(String base64, User user) throws Exception{
+		base64 = base64.replaceFirst("data:image/jpeg;base64,", "");
+		byte[] imageByte = Base64.decodeBase64(base64);
+		int imageid = FnaInvoiceCommon.saveImage(imageByte,user);
+		return imageid;
+	}
+	
+	/**
+	 * 获取图片base64
+	 * @param byteArrayOutputStream
+	 * @return
+	 * @throws Exception
+	 */
+	private static String readImageBase64(ByteArrayOutputStream byteArrayOutputStream) throws Exception{
+		String base64 = "";
+		try{
+			base64 = "data:image/jpeg;base64,"+Base64.encodeBase64String(byteArrayOutputStream.toByteArray());
+		}finally{
+			try {
+				if(byteArrayOutputStream!=null) {
+					byteArrayOutputStream.close();
+				}
+			} catch (Exception e) {
+			}
+		}
+		return base64;
+	}
+}
diff --git a/src/main/youhong_ai_old_src/weaver/fna/invoice/utils/InvoiceCloudUtil.java b/src/main/youhong_ai_old_src/weaver/fna/invoice/utils/InvoiceCloudUtil.java
new file mode 100644
index 0000000..7c3fb84
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/fna/invoice/utils/InvoiceCloudUtil.java
@@ -0,0 +1,2455 @@
+package weaver.fna.invoice.utils;
+
+
+import com.engine.personalIncomeTax.biz.RecordsBiz;
+import net.sf.json.JSONArray;
+import net.sf.json.JSONObject;
+import org.apache.commons.httpclient.HttpClient;
+import org.apache.commons.httpclient.HttpStatus;
+import org.apache.commons.httpclient.NTCredentials;
+import org.apache.commons.httpclient.methods.PostMethod;
+import org.apache.commons.httpclient.methods.multipart.FilePart;
+import org.apache.commons.httpclient.methods.multipart.MultipartRequestEntity;
+import org.apache.commons.httpclient.methods.multipart.Part;
+import org.apache.commons.lang.StringEscapeUtils;
+import org.apache.http.HttpEntity;
+import org.apache.http.HttpHost;
+import org.apache.http.HttpResponse;
+import org.apache.http.auth.AuthScope;
+import org.apache.http.auth.UsernamePasswordCredentials;
+import org.apache.http.client.config.RequestConfig;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.conn.params.ConnRouteParams;
+import org.apache.http.entity.ContentType;
+import org.apache.http.entity.StringEntity;
+
+import org.apache.http.impl.client.DefaultHttpClient;
+import org.apache.http.util.EntityUtils;
+import weaver.conn.RecordSet;
+import weaver.fna.general.FnaCommon;
+import weaver.fna.general.FnaLogSqlUtil;
+import weaver.fna.invoice.Constants;
+import weaver.fna.invoice.common.FnaAbstractInterface;
+import weaver.fna.invoice.common.FnaInvoiceCommon;
+import weaver.fna.invoice.sdk.SdkInvoiceUtil;
+import weaver.general.BaseBean;
+import weaver.general.GCONST;
+import weaver.general.MD5;
+import weaver.general.Util;
+import weaver.hrm.HrmUserVarify;
+import weaver.hrm.User;
+import weaver.systeminfo.SystemEnv;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.*;
+import java.math.BigInteger;
+import java.net.Proxy;
+import java.net.URLEncoder;
+import java.nio.charset.Charset;
+import java.security.MessageDigest;
+import java.text.DecimalFormat;
+import java.text.SimpleDateFormat;
+import java.util.*;
+/**
+ * @Author: lb2018
+ * @Description:发票云工具类
+ * @Date: 2020/6/9 10:45
+ */
+public class InvoiceCloudUtil {
+
+
+    /**
+     * 判断是否有生效的ocr接口、查验接口、发票云接口，并返回相关接口信息
+     * @param user
+     * @param queryOcr
+     * @param queryCheck
+     * @param queryCloud
+     * @return
+     */
+    public static JSONObject getInterfaceInfo(User user,boolean queryOcr,boolean queryCheck,boolean queryCloud){
+        JSONObject resultJson = new JSONObject();
+        RecordSet rs = new RecordSet();
+        if(queryOcr){
+            boolean existEffectOcr=false;
+            int imageCatalog = 0;
+            String interfaceurl = "";
+            String appKey = "";
+            String secret = "";
+            //如果有生效的未开启分部的ocr，直接使用
+            rs.executeQuery("select * from fnainvoiceinterface where interfaceType=0 and status=1 and subIdStatus=0 ");
+            if(rs.next()){
+                imageCatalog = Util.getIntValue(rs.getString("imageCatalog"),0);
+                interfaceurl = Util.null2String(rs.getString("interfaceurl"));
+                appKey = Util.null2String(rs.getString("username"));
+                secret = Util.null2String(rs.getString("password"));
+                existEffectOcr = true;
+            }
+            if(!existEffectOcr){
+                //查询当前人员所在分部的ocr接口
+                rs.executeQuery("select * from fnainvoiceinterface where interfaceType=0 and status=1 and subIdStatus=1 ");
+                while (rs.next()){
+                    String subIds = Util.null2String(rs.getString("subIds"));
+                    String[] subIds_split = subIds.split(",");
+                    for(int i=0;i<subIds_split.length;i++){
+                        if(subIds_split[i].equals(String.valueOf(user.getUserSubCompany1()))){
+                            imageCatalog = Util.getIntValue(rs.getString("imageCatalog"),0);
+                            interfaceurl = Util.null2String(rs.getString("interfaceurl"));
+                            appKey = Util.null2String(rs.getString("username"));
+                            secret = Util.null2String(rs.getString("password"));
+                            existEffectOcr = true;
+                            break;
+                        }
+                    }
+                    if(existEffectOcr){
+                        break;
+                    }
+                }
+            }
+            JSONObject ocrJson = new JSONObject();
+            ocrJson.put("existEffectOcr",existEffectOcr);
+            ocrJson.put("imageCatalog",imageCatalog);
+            ocrJson.put("interfaceurl",interfaceurl);
+            ocrJson.put("appKey",appKey);
+            ocrJson.put("secret",secret);
+            resultJson.put("ocr",ocrJson);
+        }
+
+
+        if(queryCheck){
+            String tokenURL = "";
+            String openIdURL = "";
+            String verifyURL = "";
+            String client_id = "";
+            String client_secret = "";
+            String Client = "";
+            String GTAXID = "";
+            //如果有生效的未开启分部的查验接口，直接使用
+            boolean existEffectCheck=false;
+
+
+            rs.executeQuery("select * from fnainvoiceinterface where interfaceType=1 and status=1 and subIdStatus=0 ");
+            if(rs.next()){
+                tokenURL = Util.null2String(rs.getString("tokenURL"));
+                openIdURL = Util.null2String(rs.getString("openIdURL"));
+                verifyURL = Util.null2String(rs.getString("interfaceurl"));
+                client_id = Util.null2String(rs.getString("client_id"));
+                client_secret = FnaInvoiceCommon.fnaDecrypt(Util.null2String(rs.getString("client_secret")));
+                Client = Util.null2String(rs.getString("Client"));
+                GTAXID = Util.null2String(rs.getString("GTAXID"));
+                existEffectCheck = true;
+            }
+            if(!existEffectCheck){
+                //查询当前人员所在分部的查验接口
+                rs.executeQuery("select * from fnainvoiceinterface where interfaceType=1 and status=1 and subIdStatus=1 ");
+                while (rs.next()){
+                    String subIds = Util.null2String(rs.getString("subIds"));
+                    String[] subIds_split = subIds.split(",");
+                    for(int i=0;i<subIds_split.length;i++){
+                        if(subIds_split[i].equals(String.valueOf(user.getUserSubCompany1()))){
+                            tokenURL = Util.null2String(rs.getString("tokenURL"));
+                            openIdURL = Util.null2String(rs.getString("openIdURL"));
+                            verifyURL = Util.null2String(rs.getString("interfaceurl"));
+                            client_id = Util.null2String(rs.getString("client_id"));
+                            client_secret = FnaInvoiceCommon.fnaDecrypt(Util.null2String(rs.getString("client_secret")));
+                            Client = Util.null2String(rs.getString("Client"));
+                            GTAXID = Util.null2String(rs.getString("GTAXID"));
+                            existEffectCheck = true;
+                            break;
+                        }
+                    }
+                    if(existEffectCheck){
+                        break;
+                    }
+                }
+            }
+
+            JSONObject checkJson = new JSONObject();
+            checkJson.put("existEffectCheck",existEffectCheck);
+            checkJson.put("tokenURL",tokenURL);
+            checkJson.put("openIdURL",openIdURL);
+            checkJson.put("verifyURL",verifyURL);
+            checkJson.put("client_id",client_id);
+            checkJson.put("client_secret",client_secret);
+            checkJson.put("Client",Client);
+            checkJson.put("GTAXID",GTAXID);
+            resultJson.put("check",checkJson);
+        }
+
+
+        if(queryCloud){
+            boolean existEffectCloud=false;//是否存在生效的发票云接口
+            String userName="";
+            String password="";
+            String cid="";
+            String jsUrl="";
+            String javaUrl="";
+            String webUrl = "";
+            int imageCatalog = 0;
+            String aesKey="";
+            //如果有生效的未开启分部的发票云接口，直接使用
+            rs.executeQuery("select * from fnainvoiceinterface where interfaceType=2 and status=1 and subIdStatus=0 ");
+            if(rs.next()){
+                cid = Util.null2String(rs.getString("cid"));
+                userName = Util.null2String(rs.getString("userName"));
+                password = FnaInvoiceCommon.fnaDecrypt(Util.null2String(rs.getString("password")));
+                jsUrl = Util.null2String(rs.getString("jsUrl"));
+                javaUrl = Util.null2String(rs.getString("javaUrl"));
+                webUrl = Util.null2String(rs.getString("webUrl"));
+                imageCatalog = Util.getIntValue(rs.getString("imageCatalog"),0);
+                aesKey = Util.null2String(rs.getString("aesKey"));
+                existEffectCloud = true;
+            }
+
+            if(!existEffectCloud){
+                //查询当前人员所在分部的发票云接口
+                rs.executeQuery("select * from fnainvoiceinterface where interfaceType=2 and status=1 and subIdStatus=1 ");
+                while (rs.next()){
+                    String subIds = Util.null2String(rs.getString("subIds"));
+                    String[] subIds_split = subIds.split(",");
+                    for(int i=0;i<subIds_split.length;i++){
+                        if(subIds_split[i].equals(String.valueOf(user.getUserSubCompany1()))){
+                            cid = Util.null2String(rs.getString("cid"));
+                            userName = Util.null2String(rs.getString("userName"));
+                            password = FnaInvoiceCommon.fnaDecrypt(Util.null2String(rs.getString("password")));
+                            jsUrl = Util.null2String(rs.getString("jsUrl"));
+                            javaUrl = Util.null2String(rs.getString("javaUrl"));
+                            webUrl = Util.null2String(rs.getString("webUrl"));
+                            imageCatalog = Util.getIntValue(rs.getString("imageCatalog"),0);
+                            aesKey = Util.null2String(rs.getString("aesKey"));
+                            existEffectCloud = true;
+                            break;
+                        }
+                    }
+                    if(existEffectCloud){
+                        break;
+                    }
+                }
+            }
+
+            JSONObject cloudJson = new JSONObject();
+            cloudJson.put("existEffectCloud",existEffectCloud);
+            cloudJson.put("userName",userName);
+            cloudJson.put("password",password);
+            cloudJson.put("cid",cid);
+            cloudJson.put("imageCatalog",imageCatalog);
+            cloudJson.put("jsUrl",jsUrl);
+            cloudJson.put("webUrl",webUrl);
+            JSONObject invoiceCloudUrl = getInvoiceCloudUrl();
+            cloudJson.put("createCorpUrl",javaUrl+"/"+getString(invoiceCloudUrl,"createCorpUrl"));
+            cloudJson.put("createAppUrl",javaUrl+"/"+getString(invoiceCloudUrl,"createAppUrl"));
+            cloudJson.put("tokenUrl",javaUrl+"/"+getString(invoiceCloudUrl,"tokenUrl"));
+            cloudJson.put("synInvoiceUrl",javaUrl+"/"+getString(invoiceCloudUrl,"synInvoiceUrl"));
+            cloudJson.put("synBillingInfoUrl",javaUrl+"/"+getString(invoiceCloudUrl,"synBillingInfoUrl"));
+            cloudJson.put("synDocUrl",javaUrl+"/"+getString(invoiceCloudUrl,"synDocUrl"));
+            cloudJson.put("checkUrl",javaUrl+"/"+getString(invoiceCloudUrl,"checkUrl"));
+            cloudJson.put("ocrUrl",javaUrl+"/"+getString(invoiceCloudUrl,"ocrUrl"));
+            cloudJson.put("uploadFileUrl",javaUrl+"/"+getString(invoiceCloudUrl,"uploadFileUrl"));
+            cloudJson.put("invoiceUsedNumberInfo",javaUrl+"/"+getString(invoiceCloudUrl,"invoiceUsedNumberInfo"));
+            cloudJson.put("createAesKey",javaUrl+"/"+getString(invoiceCloudUrl,"createAesKey"));
+            cloudJson.put("reimburseUrl",javaUrl+"/"+getString(invoiceCloudUrl,"reimburseUrl"));
+            cloudJson.put("updateAppInfoUrl",javaUrl+"/"+getString(invoiceCloudUrl,"updateAppInfoUrl"));
+            cloudJson.put("localCheckUrl",javaUrl+"/"+getString(invoiceCloudUrl,"localCheckUrl"));
+            if("".equals(aesKey) && existEffectCloud){
+                if("".equals(aesKey)){
+                    JSONObject aesKeyJson = createAesKey(cloudJson.getString("createAesKey"), password, userName);
+                    if(!aesKeyJson.getBoolean("flag")){
+                        new BaseBean().writeLog("createAesKey失败"+aesKeyJson.getString("msg"));
+                    }else{
+                        JSONObject jsonData = aesKeyJson.getJSONObject("data");
+                        aesKey = jsonData.getString("aesSecret");
+                    }
+                    rs.executeUpdate("update fnainvoiceinterface set aesKey=? where cid=?",aesKey,cid);
+                }
+            }
+            cloudJson.put("aesKey",aesKey);
+            resultJson.put("cloud",cloudJson);
+
+        }
+
+        return resultJson;
+    }
+
+
+    /**
+     * 获取发票云接口域名后的地址后缀
+     * @return
+     */
+    public static JSONObject getInvoiceCloudUrl(){
+        RecordSet rs = new RecordSet();
+        JSONObject jsonObject = new JSONObject();
+        rs.executeQuery("select * from fnaInvoiceCloudUrl");
+        while (rs.next()){
+            String urlAddress = Util.null2String(rs.getString("urlAddress"));
+            String sign = Util.null2String(rs.getString("sign"));
+            jsonObject.put(sign,urlAddress);
+        }
+        return jsonObject;
+    }
+
+    /**
+     * 获取发票相关权限，转为二进制
+     * @param user
+     * @return
+     */
+    public static int getInvoicePermissions(User user){
+        int role=0;
+        //微报账，发票接口接口配置，接口使用次数查询（包括接口使用查询和票据识别查询）,票据流程，发票去重校验设置，
+        //邮件识别发票配置,票据项对应科目设置，连号发票报销控制,票据识别失败记录查询,
+        //发票台账，企业台账,服务商设置，查验设置
+        /*String permissionArray[]={"fnaMicroReport:setting","FnaInvoiceInterface:Set","FnaInvoiceUsedtimes:Query","FnaInvoiceReset:Permissions","FnainvoiceCheckControlLogic:Set",
+        "FnaEmailInvoice:setting","FnaInvoiceSubject:Check","FnaSerialInvoiceControl:Set","FnaInvoiceFail:Check",
+        "FnaInvoiceLedger:settings","FnaInvoiceLedger:settingsAll","fnaServiceprovider:Set","fnaInvoiceCheck:Set","fnaMicroReport:setting"};*/
+
+        //使用权限：企业台账,我的票夹,接口使用次数查询,接口失败记录查询,
+        // 识别查验记录查询,开票信息,发票云服务商设置,发票云查验设置,发票录入设置
+        //预留权限 ：发票统计,报销设置
+        //我的邮箱,勾选抵扣
+        String permissionArray[]={"FnaInvoiceLedger:settingsAll","FnaInvoiceLedger:settings","FnaInvoiceUsedtimes:Query","FnaInvoiceFail:Check",
+        "FnaInvoiceOcrCheck:Set","fnaMicroReport:setting","fnaServiceprovider:Set","fnaInvoiceCheck:Set","fnaMicroReport:setting",
+        "fnaEmail:setting","fnaCheckDeduction:setting"};
+        for(int i=0;i<permissionArray.length;i++){
+            boolean permission =  HrmUserVarify.checkUserRight(permissionArray[i], user);
+            if(permission){
+                role = role+(int)Math.pow(2, i);
+            }
+        }
+        return role;
+    }
+    /**
+     * 获取发票云token，并回写至生效的发票云接口
+     * @return
+     */
+    public static JSONObject getCloudToken(User user,String cid,String password,String userName,String tokenurl){
+        JSONObject jsonObject  = new JSONObject();
+        try{
+            RecordSet rs = new RecordSet();
+
+
+
+            //首先从表fnaInvoiceCloudToken中查询token,如果超过12小时，重新获取
+            rs.executeQuery("select * from fnaInvoiceCloudToken where userId=?",user.getUID());
+            if(rs.next()){
+                String token = Util.null2String(rs.getString("token"));
+                long currentTimeMillis = Long.valueOf(Util.null2String(rs.getString("currentTimeMillis")));
+                long time = System.currentTimeMillis();
+                if((time-currentTimeMillis)<1800000){//接口规定大于12小时 43200000,重新获取，  这块规定10小时重新获取，36000000，  30分钟获取一次1800000
+                    jsonObject.put("flag",true);
+                    jsonObject.put("token",token);
+                    return jsonObject;
+                }
+            }
+
+            //获取权限：
+            int role = getInvoicePermissions(user);
+            JSONObject param = new JSONObject();
+            param.put("cid",cid);
+            param.put("userId",user.getUID());
+            param.put("name",user.getLastname());
+            param.put("mobile",user.getMobile());
+            param.put("role",role);
+            String content = invoiceCloudEncode(param.toString(), password);
+            Map<String, String> map = new HashMap<String, String>();
+            map.put("appkey", userName);
+
+            //插入日志表fnaInvoiceCloudLog
+            String uuid = FnaCommon.getPrimaryKeyGuid1();
+            rs.executeUpdate("insert into fnaInvoiceCloudLog(uuid,enterTime,requestType,description,interfaceurl,userName,password) values(?,?,?,?,?,?,?)",
+                    uuid,Util.date(2),"OA发送请求","获取token",tokenurl,userName,password);
+            FnaCommon.updateDbClobOrTextFieldValue("fnaInvoiceCloudLog", "param", param.toString(), "uuid", uuid, "string");
+            FnaCommon.updateDbClobOrTextFieldValue("fnaInvoiceCloudLog", "md5Content",content, "uuid", uuid, "string");
+
+            String token = postToUrl(tokenurl, content, map, "",uuid);
+
+            //将token存入表中
+            boolean existHistory=false;
+            rs.executeQuery("select * from fnaInvoiceCloudToken where userId=?",user.getUID());
+            if(rs.next()){
+                existHistory = true;
+            }
+
+            String time = Util.null2String(System.currentTimeMillis());
+            String updateTime = Util.date(2);
+            if(existHistory){//update
+                rs.executeUpdate("update fnaInvoiceCloudToken set cid=?,token=?,updateTime=?,currentTimeMillis=? where userId=?",
+                        cid,token,updateTime,time,user.getUID());
+            }else{//insert
+                rs.executeUpdate("insert into fnaInvoiceCloudToken(cid,token,updateTime,currentTimeMillis,userId) values(?,?,?,?,?)",
+                        cid,token,updateTime,time,user.getUID());
+            }
+            jsonObject.put("flag",true);
+            jsonObject.put("token",token);
+        }catch (Exception e){
+            jsonObject.put("flag",false);
+            jsonObject.put("msg",e.getMessage());
+        }
+        return jsonObject;
+    }
+
+    /**
+     * 获取cid
+     * @return
+     */
+    public static JSONObject getCloudCid(String interfaceurl,String account,String corpName,String userName,String password){
+        JSONObject jsonObject = new JSONObject();
+        try{
+            JSONObject param = new JSONObject();
+            param.put("account",account);
+            param.put("corpName",corpName);
+            String content = invoiceCloudEncode(param.toString(), password);
+            Map<String, String> map = new HashMap<String, String>();
+            map.put("appkey", userName);
+
+            //插入日志表fnaInvoiceCloudLog
+            RecordSet rs = new RecordSet();
+            String uuid = FnaCommon.getPrimaryKeyGuid1();
+            rs.executeUpdate("insert into fnaInvoiceCloudLog(uuid,enterTime,requestType,description,interfaceurl,userName,password) values(?,?,?,?,?,?,?)",
+                    uuid,Util.date(2),"OA发送请求","获取CID",interfaceurl,userName,password);
+            FnaCommon.updateDbClobOrTextFieldValue("fnaInvoiceCloudLog", "param", param.toString(), "uuid", uuid, "string");
+            FnaCommon.updateDbClobOrTextFieldValue("fnaInvoiceCloudLog", "md5Content",content, "uuid", uuid, "string");
+
+            String cid = postToUrl(interfaceurl, content, map, "",uuid);
+            jsonObject.put("flag",true);
+            jsonObject.put("cid",cid);
+        }catch (Exception e){
+            jsonObject.put("flag",false);
+            jsonObject.put("msg",e.getMessage());
+        }
+        return jsonObject;
+    }
+
+    /**
+     * 更新应用数据
+     * @return
+     */
+    public static JSONObject updateAppInfo(String updateAppInfoUrl,String account,String oaUrl,String userName,String password){
+        JSONObject jsonObject = new JSONObject();
+        try{
+            JSONObject param = new JSONObject();
+            param.put("appName",account);
+            param.put("thirdAddr",oaUrl);
+            String content = invoiceCloudEncode(param.toString(), password);
+            Map<String, String> map = new HashMap<String, String>();
+            map.put("appkey", userName);
+
+            //插入日志表fnaInvoiceCloudLog
+            RecordSet rs = new RecordSet();
+            String uuid = FnaCommon.getPrimaryKeyGuid1();
+            rs.executeUpdate("insert into fnaInvoiceCloudLog(uuid,enterTime,requestType,description,interfaceurl,userName,password) values(?,?,?,?,?,?,?)",
+                    uuid,Util.date(2),"OA发送请求","更新应用数据",updateAppInfoUrl,userName,password);
+            FnaCommon.updateDbClobOrTextFieldValue("fnaInvoiceCloudLog", "param", param.toString(), "uuid", uuid, "string");
+            FnaCommon.updateDbClobOrTextFieldValue("fnaInvoiceCloudLog", "md5Content",content, "uuid", uuid, "string");
+
+            postToUrl(updateAppInfoUrl, content, map, "",uuid);
+            jsonObject.put("flag",true);
+        }catch (Exception e){
+            jsonObject.put("flag",false);
+            jsonObject.put("msg",e.getMessage());
+        }
+        return jsonObject;
+    }
+
+    /**
+     * 创建应用，获取AppId 和 secret
+     * @param interfaceurl
+     * @param appName
+     * @return
+     */
+    public static JSONObject CreateApp(String interfaceurl,String appName,String thirdAppId,String thirdAddr){
+        JSONObject jsonObject = new JSONObject();
+        try{
+            JSONObject param = new JSONObject();
+            param.put("appName",appName);
+            param.put("appType",2);
+            param.put("thirdAppId",thirdAppId);
+            param.put("thirdAddr",thirdAddr);
+            //插入日志表fnaInvoiceCloudLog
+            RecordSet rs = new RecordSet();
+            String uuid = FnaCommon.getPrimaryKeyGuid1();
+            rs.executeUpdate("insert into fnaInvoiceCloudLog(uuid,enterTime,requestType,description,interfaceurl) values(?,?,?,?,?)",
+                    uuid,Util.date(2),"OA发送请求","创建应用",interfaceurl);
+            FnaCommon.updateDbClobOrTextFieldValue("fnaInvoiceCloudLog", "param", param.toString(), "uuid", uuid, "string");
+            String data = postToUrl(interfaceurl, param.toString(), null, "",uuid);
+            jsonObject.put("flag",true);
+            jsonObject.put("data",data);
+        }catch (Exception e){
+            jsonObject.put("flag",false);
+            jsonObject.put("msg",e.getMessage());
+        }
+        return jsonObject;
+    }
+
+    /**
+     * 同步开票信息、同步发票信息
+     * @param interfaceurl
+     * @param param
+     * @param userName
+     * @param password
+     * @return
+     */
+    public static JSONObject synBillingInfo(String interfaceurl,JSONObject param,String userName,String password){
+        JSONObject jsonObject = new JSONObject();
+        try{
+            String content = invoiceCloudEncode(param.toString(), password);
+            Map<String, String> map = new HashMap<String, String>();
+            map.put("appkey", userName);
+
+            //插入日志表fnaInvoiceCloudLog
+            RecordSet rs = new RecordSet();
+            String uuid = FnaCommon.getPrimaryKeyGuid1();
+            rs.executeUpdate("insert into fnaInvoiceCloudLog(uuid,enterTime,requestType,description,interfaceurl,userName,password) values(?,?,?,?,?,?,?)",
+                    uuid,Util.date(2),"OA发送请求","实时同步开票、发票信息",interfaceurl,userName,password);
+            FnaCommon.updateDbClobOrTextFieldValue("fnaInvoiceCloudLog", "param", param.toString(), "uuid", uuid, "string");
+            FnaCommon.updateDbClobOrTextFieldValue("fnaInvoiceCloudLog", "md5Content",content, "uuid", uuid, "string");
+
+            String data = postToUrl(interfaceurl, content, map, "",uuid);
+            jsonObject.put("flag",true);
+            jsonObject.put("data",data);
+        }catch (Exception e){
+            jsonObject.put("flag",false);
+            jsonObject.put("msg",e.getMessage());
+        }
+        return jsonObject;
+    }
+
+    /**
+     * 推送目录id
+     * @param synDocUrl
+     * @param cid
+     * @param secid
+     * @param userName
+     * @param password
+     * @return
+     */
+    public static JSONObject pushSecid(String synDocUrl,String cid,String secid,String userName,String password,int userId){
+        JSONObject jsonObject = new JSONObject();
+        try{
+            JSONObject param = new JSONObject();
+            param.put("cid",cid);
+            param.put("secid",secid);
+            param.put("userId",userId);
+            String content = invoiceCloudEncode(param.toString(), password);
+            Map<String, String> map = new HashMap<String, String>();
+            map.put("appkey", userName);
+
+            //插入日志表fnaInvoiceCloudLog
+            RecordSet rs = new RecordSet();
+            String uuid = FnaCommon.getPrimaryKeyGuid1();
+            rs.executeUpdate("insert into fnaInvoiceCloudLog(uuid,enterTime,requestType,description,interfaceurl,userName,password) values(?,?,?,?,?,?,?)",
+                    uuid,Util.date(2),"OA发送请求","同步目录",synDocUrl,userName,password);
+            FnaCommon.updateDbClobOrTextFieldValue("fnaInvoiceCloudLog", "param", param.toString(), "uuid", uuid, "string");
+            FnaCommon.updateDbClobOrTextFieldValue("fnaInvoiceCloudLog", "md5Content",content, "uuid", uuid, "string");
+
+            postToUrl(synDocUrl, content, map, "",uuid);
+            jsonObject.put("flag",true);
+        }catch (Exception e){
+            jsonObject.put("flag",false);
+            jsonObject.put("msg",e.getMessage());
+        }
+        return jsonObject;
+    }
+
+
+    /**
+     * 获取json中的值
+     * @param json
+     * @param key
+     * @return
+     */
+    public static String getString(JSONObject json, String  key){
+        if(json.containsKey(key)){
+            return json.getString(key);
+        }else{
+            return "";
+        }
+    }
+
+
+    public static String postToUrl(String url, String content,Map<String, String> headers,String xmlEncoding,String uuid,String aesKey) throws Exception {
+        return postToUrl(url,content,headers,xmlEncoding,uuid,"",null,aesKey);
+    }
+    public static String postToUrl(String url, String content,Map<String, String> headers,String xmlEncoding,String uuid) throws Exception {
+        return postToUrl(url,content,headers,xmlEncoding,uuid,"",null,"");
+    }
+    /**
+     *
+     * @param url
+     * @param content
+     * @param headers
+     * @param xmlEncoding
+     * @return
+     * @throws IOException
+     */
+    public static String postToUrl(String url, String content,Map<String, String> headers,String xmlEncoding,String uuid,String from,User user,String aesKey) throws Exception {
+        String errorMsg="";
+
+        String data="";
+        if("".equals(xmlEncoding)){
+            xmlEncoding = "UTF-8";
+        }
+        DefaultHttpClient httpclient = null;
+        HttpPost httpPost = null;
+        try {
+            httpclient = new DefaultHttpClient();
+            if(ProxyUtil.ifExistsProxy()){
+                Map<String, String> proxyProperty = ProxyUtil.getProxyProperty();
+                String proxyUrl = proxyProperty.getOrDefault("proxyUrl","");
+                int proxyPort = Util.getIntValue(proxyProperty.getOrDefault("proxyPort",""),8080);
+                String proxyUser = proxyProperty.getOrDefault("proxyUser","");
+                String proxyPwd = proxyProperty.getOrDefault("proxyPwd","");
+
+                if(!"".equals(proxyUser)&&!"".equals(proxyPwd)) {
+                    httpclient.getCredentialsProvider().setCredentials(
+                            new AuthScope(proxyUrl, proxyPort),
+                            new UsernamePasswordCredentials(proxyUser, proxyPwd)
+                    );
+                }
+                HttpHost proxy = new HttpHost(proxyUrl,proxyPort);
+                httpclient.getParams().setParameter(ConnRouteParams.DEFAULT_PROXY,proxy);
+            }
+
+            httpPost = new HttpPost(url);
+            JSONObject response = null;
+            StringEntity s = new StringEntity(content, Charset.forName("UTF-8"));
+            httpPost.addHeader("Content-type", "application/json; charset=utf-8");
+            httpPost.addHeader("Accept", "application/json");
+
+            //设置超时时间
+            RequestConfig config = RequestConfig.custom().setConnectTimeout(130000) //连接超时时间
+                        .setConnectionRequestTimeout(130000)
+                        .setSocketTimeout(130000) //数据传输的超时时间
+                        .setStaleConnectionCheckEnabled(true) //提交请求前测试连接是否可用
+                        .build();
+
+
+
+            httpPost.setConfig(config);
+            httpPost.setEntity(s);
+
+            if (null != headers) {
+                for (Map.Entry<String, String> entry : headers.entrySet()) {
+                    httpPost.addHeader(entry.getKey(), entry.getValue());
+                }
+            }
+            HttpResponse res = httpclient.execute(httpPost);
+            if (res.getStatusLine().getStatusCode() == HttpStatus.SC_OK) {
+                HttpEntity entity = res.getEntity();
+                String result = Util.null2String(EntityUtils.toString(res.getEntity()));
+                FnaCommon.updateDbClobOrTextFieldValue("fnaInvoiceCloudLog", "returnResult", result, "uuid", uuid, "string");
+                if ("".equals(result)) {
+                    throw new Exception("发票云接口返回空！");
+                }
+                try {
+                    response = JSONObject.fromObject(result);
+                } catch (Exception e) {
+                    throw new Exception("发票云接口返参数json格式化异常！");
+                }
+                JSONObject actionMsg = response.getJSONObject("actionMsg");
+                String code = actionMsg.getString("code");
+                if ("0".equals(code)) {//创建成功
+                    if (response.containsKey("data")) {
+                        data = response.getString("data");
+
+                        //新接口，需要解密
+                        if (!"".equals(aesKey) && !"".equals(data)) {
+                            data = InvoiceCloudAESUtil.decrypt(aesKey, data);
+                            response.put("data", data);
+                            FnaCommon.updateDbClobOrTextFieldValue("fnaInvoiceCloudLog", "returnResult", response.toString(), "uuid", uuid, "string");
+                        }
+                    }
+                } else {
+                    errorMsg = actionMsg.getString("message");
+                    if ("check".equals(from)) {
+                        new BaseBean().writeLog("checkException", errorMsg);
+                        FnaInvoiceCommon.saveFailLog(user.getUID(), 1, errorMsg);
+                    }
+                    throw new Exception(errorMsg);
+                }
+            } else {
+                FnaCommon.updateDbClobOrTextFieldValue("fnaInvoiceCloudLog", "returnResult", "请求失败HttpStatus=" + res.getStatusLine().getStatusCode(), "uuid", uuid, "string");
+                throw new Exception("请求失败！");
+            }
+        }catch (Exception e){
+            errorMsg = e.getMessage();
+        }finally {
+            if(httpclient!=null){
+                httpclient.close();
+            }
+        }
+        if(!"".equals(errorMsg)){
+            throw new Exception(errorMsg);
+        }
+        return data;
+    }
+
+    /**
+     * 发票云加密
+     * @param content
+     * @param secret
+     * @return
+     */
+    public static  String invoiceCloudEncode(String content,String secret){
+        long time = System.currentTimeMillis();
+        content = content+"&time="+time;
+        String md5Content = Md5Encode(content + "&secret=" + secret);
+        content = content+"&md5="+md5Content;
+        return content;
+    }
+
+    /**
+     * 发票云加密
+     * @param content
+     * @param secret
+     * @return
+     */
+    public static  String invoiceCloudEncode(String content,String secret,long time){
+        content = content+"&time="+time;
+        String md5Content = Md5Encode(content + "&secret=" + secret);
+        return md5Content;
+    }
+
+    /**
+     * md5加密
+     * @param content
+     * @return
+     */
+    public static String Md5Encode(String content){
+        char hexDigits[] = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F' };
+        try {
+            byte[] btInput = content.getBytes("UTF-8");
+            // 获得MD5摘要算法的 MessageDigest 对象
+            MessageDigest mdInst = MessageDigest.getInstance("MD5");
+            // 使用指定的字节更新摘要
+            mdInst.update(btInput);
+            // 获得密文
+            byte[] md = mdInst.digest();
+            // 把密文转换成十六进制的字符串形式
+            int j = md.length;
+            char str[] = new char[j * 2];
+            int k = 0;
+            for (int i = 0; i < j; i++) {
+                byte byte0 = md[i];
+                str[k++] = hexDigits[byte0 >>> 4 & 0xf];
+                str[k++] = hexDigits[byte0 & 0xf];
+            }
+            return new String(str);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+
+    /**
+     * 根据sql获取发票信息
+     * @return
+     */
+    public static JSONArray getInvoiceInfos(String sql,int start_pos,int page_size){
+        DecimalFormat df = new DecimalFormat("#############################0.00");
+        JSONArray invoiceArray = new JSONArray();
+        RecordSet rs = new RecordSet();
+        RecordSet rs2 = new RecordSet();
+        RecordSet rs3 = new RecordSet();
+        RecordSet rs4 = new RecordSet();
+        String fnainvoiceledger[] = {"id","billingDate","invoiceCode","invoiceNumber","invoiceType","seller","purchaser","invoiceServiceYype",
+                "priceWithoutTax","taxRate","tax","taxIncludedPrice","authenticity","reimbursementDate","reimbursePerson","requestId","userid_new",
+                "invoiceSource_new","checkcode","status","card_id_new","encrypt_code_new","openid_new","wechatstatus","imageID","purchaserTaxNo","salesTaxNo",
+                "entryTime","company_seal","form_type","form_name","kind","category","imageDocId","checkStatus","updateOperate","cloudId","codeConfirm","numberConfirm","requestName",
+                "receiptor","reviewer","issuer","province","city","travel_tax"};
+        String fnainvoiceledgerdetail[]={"invoiceserviceyype","specification","unit","unitNumber2","originalUnitPrice","priceWithoutTax","taxRate","tax","startDate","endDate","numberPlate","type"};
+        String fnaInvoiceLedgerDtl[]={"remark","checkCodeSix","sellerAddress","purchaserAddress","salesBank","purchaserBank"};
+        String trainInvoice[]={"time","name","station_geton","station_getoff","train_number","seat"};
+        String taxiInvoice[]={"time_geton","time_getoff","mileage","place"};
+        String machineInvoice[]={"time","category","seller_tax_id","buyer_tax_id"};
+        String tollInvoice[]={"time","entrance","export"};
+        String carInvoice[]={"time","station_geton","station_getoff","name"};
+        String second_carInvoice[]={"seller_id","buyer_id","company_name","company_tax_id","license_plate","registration_number","car_code","car_model"};
+        String motor_VehicleInvoice[]={"machine_code","machine_number","pretax_amount","seller_tax_id","buyer_id","tax_authorities","tax_authorities_code",
+        "car_code","car_engine_code","car_model","certificate_number"};
+        String airInvoice[]={"user_name","user_id","agentcode","issue_by","fare","fuel_surcharge","caac_development_fund","insurance"};
+        String airDtlInvoice[]={"from_city","to_city","flight_number","airdate","airtime","seat","carrier"};
+        String smallInvoice[]={"storename","time","tips","currency_code","type","discount"};
+
+        String fnaDidiInvoice[]={"startDate","endDate","phone"};
+        String fnaDidiDtlInvoice[]={"carType","time_geton","city","station_geton","station_getoff","mileage","total"};
+        String fnaBoatInvoice[]={"time","station_geton","station_getoff","name","currency_code"};
+
+        //报销状况
+        String fnaInvoiceReimbursement[]={"requestid","reimbursementAmt","userid","reimbursementDate","requestName"};
+
+        int start=0;
+        rs.executeQuery(sql);
+        while (rs.next()){
+            if(start>=start_pos && page_size>0 ) {
+                JSONObject fnainvoiceledgerJo = new JSONObject();
+                int id = Util.getIntValue(rs.getString("id"), 0);
+                int invoiceType = Util.getIntValue(rs.getString("invoiceType"), 0);
+                int requestId = Util.getIntValue(rs.getString("requestId"), 0);
+                for (int i = 0; i < fnainvoiceledger.length; i++) {
+                    String key = fnainvoiceledger[i];
+                    if("requestName".equals(key)){
+                        String requestName="";
+                        if(requestId>0){
+                            rs2.executeQuery("select  requestName from workflow_requestBase where requestId=?",requestId);
+                            if(rs2.next()){
+                                requestName = Util.null2String(rs2.getString("requestName"));
+                            }
+                        }
+                        fnainvoiceledgerJo.put("requestName",requestName);
+                    }else{
+                        fnainvoiceledgerJo.put(key, Util.null2String(rs.getString(key)));
+                    }
+
+                }
+
+                JSONArray fnainvoiceledgerdetailJa = new JSONArray();
+                rs2.executeQuery("select * from fnainvoiceledgerdetail where mainid=?", id);
+                while (rs2.next()) {
+                    JSONObject fnainvoiceledgerdetailJo = new JSONObject();
+                    for (int i = 0; i < fnainvoiceledgerdetail.length; i++) {
+                        String key = fnainvoiceledgerdetail[i];
+                        fnainvoiceledgerdetailJo.put(key, Util.null2String(rs2.getString(key)));
+                    }
+                    fnainvoiceledgerdetailJa.add(fnainvoiceledgerdetailJo);
+                }
+                fnainvoiceledgerJo.put("fnainvoiceledgerdetail", fnainvoiceledgerdetailJa);
+                if (invoiceType == 1 || invoiceType == 2 || invoiceType == 15 || invoiceType == 16 || invoiceType == 12
+                        || invoiceType == 3 || invoiceType == 17 || invoiceType == 19 || invoiceType == 20 || invoiceType == 21) {
+                    rs3.executeQuery("select * from FnaInvoiceLedgerDtl where mainid=?", id);
+                    if (rs3.next()) {
+                        JSONObject FnaInvoiceLedgerDtlJo = new JSONObject();
+                        for (int i = 0; i < fnaInvoiceLedgerDtl.length; i++) {
+                            String key = fnaInvoiceLedgerDtl[i];
+                            FnaInvoiceLedgerDtlJo.put(key, Util.null2String(rs3.getString(key)));
+                        }
+                        fnainvoiceledgerJo.put("fnaInvoiceLedgerDtl", FnaInvoiceLedgerDtlJo);
+                    }
+                }
+                if (invoiceType == 8) {//火车票
+                    rs3.executeQuery("select * from trainInvoice where mainid=?", id);
+                    if (rs3.next()) {
+                        JSONObject trainInvoiceJo = new JSONObject();
+                        for (int i = 0; i < trainInvoice.length; i++) {
+                            String key = trainInvoice[i];
+                            trainInvoiceJo.put(key, Util.null2String(rs3.getString(key)));
+                        }
+                        fnainvoiceledgerJo.put("trainInvoice", trainInvoiceJo);
+                    }
+                } else if (invoiceType == 7) {//出租车发票
+                    rs3.executeQuery("select * from taxiInvoice where mainid=?", id);
+                    if (rs3.next()) {
+                        JSONObject taxiInvoiceJo = new JSONObject();
+                        for (int i = 0; i < taxiInvoice.length; i++) {
+                            String key = taxiInvoice[i];
+                            taxiInvoiceJo.put(key, Util.null2String(rs3.getString(key)));
+                        }
+                        fnainvoiceledgerJo.put("taxiInvoice", taxiInvoiceJo);
+                    }
+                } else if (invoiceType == 3) {//通用机打发票
+                    rs3.executeQuery("select * from machineInvoice where mainid=?", id);
+                    if (rs3.next()) {
+                        JSONObject machineInvoiceJo = new JSONObject();
+                        for (int i = 0; i < machineInvoice.length; i++) {
+                            String key = machineInvoice[i];
+                            machineInvoiceJo.put(key, Util.null2String(rs3.getString(key)));
+                        }
+                        fnainvoiceledgerJo.put("machineInvoice", machineInvoiceJo);
+                    }
+                } else if (invoiceType == 9) {//过路费发票表
+                    rs3.executeQuery("select * from tollInvoice where mainid=?", id);
+                    if (rs3.next()) {
+                        JSONObject tollInvoiceJo = new JSONObject();
+                        for (int i = 0; i < tollInvoice.length; i++) {
+                            String key = tollInvoice[i];
+                            tollInvoiceJo.put(key, Util.null2String(rs3.getString(key)));
+                        }
+                        fnainvoiceledgerJo.put("tollInvoice", tollInvoiceJo);
+                    }
+                } else if (invoiceType == 10) {//客运汽车发票
+                    rs3.executeQuery("select * from carInvoice where mainid=?", id);
+                    if (rs3.next()) {
+                        JSONObject carInvoiceJo = new JSONObject();
+                        for (int i = 0; i < carInvoice.length; i++) {
+                            String key = carInvoice[i];
+                            carInvoiceJo.put(key, Util.null2String(rs3.getString(key)));
+                        }
+                        fnainvoiceledgerJo.put("carInvoice", carInvoiceJo);
+                    }
+                } else if (invoiceType == 11) {//二手车销售统一发票表
+                    rs3.executeQuery("select * from second_carInvoice where mainid=?", id);
+                    if (rs3.next()) {
+                        JSONObject second_carInvoiceJo = new JSONObject();
+                        for (int i = 0; i < second_carInvoice.length; i++) {
+                            String key = second_carInvoice[i];
+                            second_carInvoiceJo.put(key, Util.null2String(rs3.getString(key)));
+                        }
+                        fnainvoiceledgerJo.put("second_carInvoice", second_carInvoiceJo);
+                    }
+                } else if (invoiceType == 12) {//机动车销售统一发票
+                    rs3.executeQuery("select * from motor_VehicleInvoice where mainid=?", id);
+                    if (rs3.next()) {
+                        JSONObject motor_VehicleInvoiceJo = new JSONObject();
+                        for (int i = 0; i < motor_VehicleInvoice.length; i++) {
+                            String key = motor_VehicleInvoice[i];
+                            motor_VehicleInvoiceJo.put(key, Util.null2String(rs3.getString(key)));
+                        }
+                        fnainvoiceledgerJo.put("motor_VehicleInvoice", motor_VehicleInvoiceJo);
+                    }
+                } else if (invoiceType == 14) {//航空运输电子客票行程单
+                    rs3.executeQuery("select * from airInvoice where mainid=?", id);
+                    if (rs3.next()) {
+                        JSONObject airInvoiceJo = new JSONObject();
+                        for (int i = 0; i < airInvoice.length; i++) {
+                            String key = airInvoice[i];
+                            airInvoiceJo.put(key, Util.null2String(rs3.getString(key)));
+                        }
+                        fnainvoiceledgerJo.put("airInvoice", airInvoiceJo);
+                    }
+
+                    rs3.executeQuery("select * from airDtlInvoice where mainid=?", id);
+                    JSONArray airDtlInvoiceJa = new JSONArray();
+                    while (rs3.next()) {
+                        JSONObject airDtlInvoiceJo = new JSONObject();
+                        for (int i = 0; i < airDtlInvoice.length; i++) {
+                            String key = airDtlInvoice[i];
+                            airDtlInvoiceJo.put(key, Util.null2String(rs3.getString(key)));
+                        }
+                        airDtlInvoiceJa.add(airDtlInvoiceJo);
+                    }
+                    fnainvoiceledgerJo.put("airDtlInvoice", airDtlInvoiceJa);
+                } else if (invoiceType == 13) {//国际小票
+                    rs3.executeQuery("select * from smallInvoice where mainid=?", id);
+                    if (rs3.next()) {
+                        JSONObject smallInvoiceJo = new JSONObject();
+                        for (int i = 0; i < smallInvoice.length; i++) {
+                            String key = smallInvoice[i];
+                            smallInvoiceJo.put(key, Util.null2String(rs3.getString(key)));
+                        }
+                        fnainvoiceledgerJo.put("smallInvoice", smallInvoiceJo);
+                    }
+                } else if (invoiceType == 22) {//滴滴出行行程单
+                    rs3.executeQuery("select * from fnaDidiInvoice where mainid=?", id);
+                    if (rs3.next()) {
+                        JSONObject fnaDidiInvoiceJo = new JSONObject();
+                        for (int i = 0; i < fnaDidiInvoice.length; i++) {
+                            String key = fnaDidiInvoice[i];
+                            fnaDidiInvoiceJo.put(key, Util.null2String(rs3.getString(key)));
+                        }
+                        fnainvoiceledgerJo.put("fnaDidiInvoice", fnaDidiInvoice);
+                    }
+
+                    rs3.executeQuery("select * from fnaDidiDtlInvoice where mainid=?", id);
+                    JSONArray fnaDidiDtlInvoiceJa = new JSONArray();
+                    while (rs3.next()) {
+                        JSONObject fnaDidiDtlInvoiceJo = new JSONObject();
+                        for (int i = 0; i < fnaDidiDtlInvoice.length; i++) {
+                            String key = fnaDidiDtlInvoice[i];
+                            fnaDidiDtlInvoiceJo.put(key, Util.null2String(rs3.getString(key)));
+                        }
+                        fnaDidiDtlInvoiceJa.add(fnaDidiDtlInvoiceJo);
+                    }
+                    fnainvoiceledgerJo.put("fnaDidiDtlInvoice", fnaDidiDtlInvoiceJa);
+                } else if (invoiceType == 23) {//船票
+                    rs3.executeQuery("select * from fnaBoatInvoice where mainid=?", id);
+                    if (rs3.next()) {
+                        JSONObject fnaBoatInvoiceJo = new JSONObject();
+                        for (int i = 0; i < fnaBoatInvoice.length; i++) {
+                            String key = fnaBoatInvoice[i];
+                            fnaBoatInvoiceJo.put(key, Util.null2String(rs3.getString(key)));
+                        }
+                        fnainvoiceledgerJo.put("fnaBoatInvoice", fnaBoatInvoiceJo);
+                    }
+                }
+
+                JSONArray fnaInvoiceReimbursementJa = new JSONArray();
+                rs3.executeQuery("select * from fnaInvoiceReimbursement where mainid=?", id);
+                while (rs3.next()) {
+                    int requestid3 = Util.getIntValue(rs3.getString("requestId"),0);
+                    JSONObject fnaInvoiceReimbursementJo = new JSONObject();
+                    for (int i = 0; i < fnaInvoiceReimbursement.length; i++) {
+                        String key = fnaInvoiceReimbursement[i];
+                        if("requestName".equals(key)){
+                            String requestName="";
+                            if(requestid3>0){
+                                rs4.executeQuery("select  requestName from workflow_requestBase where requestId=?",requestid3);
+                                if(rs4.next()){
+                                    requestName = Util.null2String(rs4.getString("requestName"));
+                                }
+                            }
+                            fnaInvoiceReimbursementJo.put("requestName",requestName);
+                        }else{
+                            fnaInvoiceReimbursementJo.put(key, Util.null2String(rs3.getString(key)));
+                        }
+
+                    }
+                    fnaInvoiceReimbursementJa.add(fnaInvoiceReimbursementJo);
+                }
+                fnainvoiceledgerJo.put("fnaInvoiceReimbursement", fnaInvoiceReimbursementJa);
+                invoiceArray.add(fnainvoiceledgerJo);
+                page_size--;
+            }
+            start++;
+
+        }
+        return invoiceArray;
+    }
+
+    /**
+     * 实时同步更新发票信息
+     * @param infoJson
+     * @return cloudId和id
+     */
+    public static JSONObject updateInvoiceInfo(JSONObject infoJson,String ipAdress) throws Exception {
+        JSONObject jsonObject = new JSONObject();
+
+        String fnainvoiceledger[] = {"billingDate","invoiceCode","invoiceNumber","invoiceType","seller","purchaser","invoiceServiceYype",
+                "priceWithoutTax","taxRate","tax","taxIncludedPrice","authenticity","userid_new",//"reimbursementDate","reimbursePerson","requestId" 报销信息无需从发票云获取
+                "invoiceSource_new","checkcode","status","card_id_new","encrypt_code_new","openid_new","wechatstatus","imageID","purchaserTaxNo","salesTaxNo",
+                "entryTime","company_seal","form_type","form_name","kind","category","imageDocId","checkStatus","updateOperate","cloudId","codeConfirm","numberConfirm",
+                "receiptor","reviewer","issuer","province","city","travel_tax"};
+        String fnainvoiceledgerdetail[]={"invoiceserviceyype","specification","unit","unitNumber2","originalUnitPrice","priceWithoutTax","taxRate","tax","startDate","endDate","numberPlate","type"};
+        String fnaInvoiceLedgerDtl[]={"remark","checkCodeSix","sellerAddress","purchaserAddress","salesBank","purchaserBank"};
+        String trainInvoice[]={"time","name","station_geton","station_getoff","train_number","seat"};
+        String taxiInvoice[]={"time_geton","time_getoff","mileage","place"};
+        String machineInvoice[]={"time","category","seller_tax_id","buyer_tax_id"};
+        String tollInvoice[]={"time","entrance","export"};
+        String carInvoice[]={"time","station_geton","station_getoff","name"};
+        String second_carInvoice[]={"seller_id","buyer_id","company_name","company_tax_id","license_plate","registration_number","car_code","car_model"};
+        String motor_VehicleInvoice[]={"machine_code","machine_number","pretax_amount","seller_tax_id","buyer_id","tax_authorities","tax_authorities_code",
+                "car_code","car_engine_code","car_model","certificate_number"};
+        String airInvoice[]={"user_name","user_id","agentcode","issue_by","fare","fuel_surcharge","caac_development_fund","insurance"};
+        String airDtlInvoice[]={"from_city","to_city","flight_number","airdate","airtime","seat","carrier"};
+        String smallInvoice[]={"storename","time","tips","currency_code","type","discount"};
+
+        String fnaDidiInvoice[]={"startDate","endDate","phone"};
+        String fnaDidiDtlInvoice[]={"carType","time_geton","city","station_geton","station_getoff","mileage","total"};
+        String fnaBoatInvoice[]={"time","station_geton","station_getoff","name","currency_code"};
+
+        String formatDoubleColumn="priceWithoutTax,taxRate,tax,taxIncludedPrice,mileage,pretax_amount,travel_tax,total";//需要格式化金额的列，用逗号隔开
+        List<String> formatDoubleList = Arrays.asList(formatDoubleColumn.split(","));
+
+        String formatIntColumn="invoiceType,authenticity,reimbursePerson,requestId,userid_new,invoiceSource_new," +
+                "status,imageID,company_seal,imageDocId,checkStatus,updateOperate";
+        List<String> formatIntList = Arrays.asList(formatIntColumn.split(","));
+
+        int id = Util.getIntValue(infoJson.getString("id"),0);
+
+
+        String cloudId= Util.null2String(infoJson.getString("cloudId"));
+        int invoiceType = Util.getIntValue(infoJson.getString("invoiceType"),0);
+        int userid_new = Util.getIntValue(infoJson.getString("userid_new"),0);
+        String invoiceNumber= Util.null2String(infoJson.getString("invoiceNumber"));
+        String invoiceCode= Util.null2String(infoJson.getString("invoiceCode"));
+        RecordSet rs = new RecordSet();
+        List<String>valueList =new ArrayList<String>();
+
+        //脏数据优化
+        if(id==0){
+            rs.executeQuery("select id from fnainvoiceLedger where invoicenumber=? and invoiceCode=?",invoiceNumber,invoiceCode);
+            if(rs.next()){
+                id = Util.getIntValue(rs.getString("id"),0);
+            }
+        }else{
+            //判断该id在台账中是否存在
+            int cnt = 0;
+            rs.executeQuery("select count(id) cnt from fnainvoiceLedger where id=?",id);
+            if(rs.next()){
+                cnt= Util.getIntValue(rs.getString("cnt"),0);
+            }
+            if(cnt==0){
+                id=0;
+            }
+        }
+        synchronized(InvoiceCloudUtil.class) {
+            //插入日志1
+            FnaLogSqlUtil fnaLogSqlUtil = new FnaLogSqlUtil();
+            Map<String, String> labelIdMap = new HashMap<String, String>();
+            Map<String, String> beforeMap = new HashMap<String, String>();
+            String opType="0";
+            if(id>0){
+                opType="2";
+                beforeMap = fnaLogSqlUtil.getInvoiceMap(String.valueOf(id),labelIdMap);
+            }
+
+            //修改主表数据 fnainvoiceledger
+            String sql = getsqlByColumn(id, fnainvoiceledger, infoJson, valueList, formatDoubleList,formatIntList,"fnainvoiceledger");
+            rs.executeUpdate(sql,valueList);
+            if(id<=0){
+                rs.executeQuery("select id from fnainvoiceledger where cloudId=?",cloudId);
+                if(rs.next()){
+                    id = Util.getIntValue(rs.getString("id"));
+                }
+            }
+
+
+            //修改明细表数据 fnainvoiceledgerdetail
+            rs.executeUpdate("delete from fnainvoiceledgerdetail where mainid=?", id);
+            if (infoJson.containsKey("fnainvoiceledgerdetail")) {
+                String fnainvoiceledgerdetailStr = infoJson.getString("fnainvoiceledgerdetail");
+                if (fnainvoiceledgerdetailStr != null && !"".equals(fnainvoiceledgerdetailStr)) {
+                    JSONArray infoJsonArray = infoJson.getJSONArray("fnainvoiceledgerdetail");
+                    for (int i = 0; i < infoJsonArray.size(); i++) {
+                        JSONObject infoJsonDtl = infoJsonArray.getJSONObject(i);
+                        if (infoJsonDtl != null && infoJsonDtl.size() > 0) {
+                            sql = getsqlByColumn(id, fnainvoiceledgerdetail, infoJsonDtl, valueList, formatDoubleList, formatIntList, "fnainvoiceledgerdetail");
+                            rs.executeUpdate(sql, valueList);
+                        }
+                    }
+                }
+
+            }
+
+            if (invoiceType == 1 || invoiceType == 2 || invoiceType == 15 || invoiceType == 16 || invoiceType == 12
+                    || invoiceType == 3 || invoiceType == 17 || invoiceType == 19 || invoiceType == 20 || invoiceType == 21) {
+                //修改明细表数据 fnaInvoiceLedgerDtl
+                rs.executeUpdate("delete from fnaInvoiceLedgerDtl where mainid=?", id);
+                if (infoJson.containsKey("fnaInvoiceLedgerDtl")) {
+                    JSONObject infoJsonDtl = infoJson.getJSONObject("fnaInvoiceLedgerDtl");
+                    if (infoJsonDtl != null && infoJsonDtl.size() > 0) {
+                        sql = getsqlByColumn(id, fnaInvoiceLedgerDtl, infoJsonDtl, valueList, formatDoubleList, formatIntList, "fnaInvoiceLedgerDtl");
+                        rs.executeUpdate(sql, valueList);
+                    }
+                }
+            }
+            if (invoiceType == 8) {//火车票
+                //修改明细表数据 trainInvoice
+                rs.executeUpdate("delete from trainInvoice where mainid=?", id);
+                if (infoJson.containsKey("trainInvoice")) {
+                    JSONObject infoJsonDtl = infoJson.getJSONObject("trainInvoice");
+                    if (infoJsonDtl != null && infoJsonDtl.size() > 0) {
+                        sql = getsqlByColumn(id, trainInvoice, infoJsonDtl, valueList, formatDoubleList, formatIntList, "trainInvoice");
+                        rs.executeUpdate(sql, valueList);
+                    }
+                }
+            } else if (invoiceType == 7) {//出租车发票
+                //修改明细表数据 taxiInvoice
+                rs.executeUpdate("delete from taxiInvoice where mainid=?", id);
+                if (infoJson.containsKey("taxiInvoice")) {
+                    JSONObject infoJsonDtl = infoJson.getJSONObject("taxiInvoice");
+                    if (infoJsonDtl != null && infoJsonDtl.size() > 0) {
+                        sql = getsqlByColumn(id, taxiInvoice, infoJsonDtl, valueList, formatDoubleList, formatIntList, "taxiInvoice");
+                        rs.executeUpdate(sql, valueList);
+                    }
+                }
+            } else if (invoiceType == 3) {//通用机打发票
+                //修改明细表数据 machineInvoice
+                rs.executeUpdate("delete from machineInvoice where mainid=?", id);
+                if (infoJson.containsKey("machineInvoice")) {
+                    JSONObject infoJsonDtl = infoJson.getJSONObject("machineInvoice");
+                    if (infoJsonDtl != null && infoJsonDtl.size() > 0) {
+                        sql = getsqlByColumn(id, machineInvoice, infoJsonDtl, valueList, formatDoubleList, formatIntList, "machineInvoice");
+                        rs.executeUpdate(sql, valueList);
+                    }
+                }
+            } else if (invoiceType == 9) {//过路费发票表
+                //修改明细表数据 tollInvoice
+                rs.executeUpdate("delete from tollInvoice where mainid=?", id);
+                if (infoJson.containsKey("tollInvoice")) {
+                    JSONObject infoJsonDtl = infoJson.getJSONObject("tollInvoice");
+                    if (infoJsonDtl != null && infoJsonDtl.size() > 0) {
+                        sql = getsqlByColumn(id, tollInvoice, infoJsonDtl, valueList, formatDoubleList, formatIntList, "tollInvoice");
+                        rs.executeUpdate(sql, valueList);
+                    }
+                }
+            } else if (invoiceType == 10) {//客运汽车发票
+                //修改明细表数据 carInvoice
+                rs.executeUpdate("delete from carInvoice where mainid=?", id);
+                if (infoJson.containsKey("carInvoice")) {
+                    JSONObject infoJsonDtl = infoJson.getJSONObject("carInvoice");
+                    if (infoJsonDtl != null && infoJsonDtl.size() > 0) {
+                        sql = getsqlByColumn(id, carInvoice, infoJsonDtl, valueList, formatDoubleList, formatIntList, "carInvoice");
+                        rs.executeUpdate(sql, valueList);
+                    }
+                }
+            } else if (invoiceType == 11) {//二手车销售统一发票表
+                //修改明细表数据 second_carInvoice
+                rs.executeUpdate("delete from second_carInvoice where mainid=?", id);
+                if (infoJson.containsKey("second_carInvoice")) {
+                    JSONObject infoJsonDtl = infoJson.getJSONObject("second_carInvoice");
+                    if (infoJsonDtl != null && infoJsonDtl.size() > 0) {
+                        sql = getsqlByColumn(id, second_carInvoice, infoJsonDtl, valueList, formatDoubleList, formatIntList, "second_carInvoice");
+                        rs.executeUpdate(sql, valueList);
+                    }
+                }
+            } else if (invoiceType == 12) {//机动车销售统一发票
+                //修改明细表数据 motor_VehicleInvoice
+                rs.executeUpdate("delete from motor_VehicleInvoice where mainid=?", id);
+                if (infoJson.containsKey("motor_VehicleInvoice")) {
+                    JSONObject infoJsonDtl = infoJson.getJSONObject("motor_VehicleInvoice");
+                    if (infoJsonDtl != null && infoJsonDtl.size() > 0) {
+                        sql = getsqlByColumn(id, motor_VehicleInvoice, infoJsonDtl, valueList, formatDoubleList, formatIntList, "motor_VehicleInvoice");
+                        rs.executeUpdate(sql, valueList);
+                    }
+                }
+            } else if (invoiceType == 14) {//航空运输电子客票行程单
+                //修改明细表数据 airInvoice
+                rs.executeUpdate("delete from airInvoice where mainid=?", id);
+                if (infoJson.containsKey("airInvoice")) {
+                    JSONObject infoJsonDtl = infoJson.getJSONObject("airInvoice");
+                    if (infoJsonDtl != null && infoJsonDtl.size() > 0) {
+                        sql = getsqlByColumn(id, airInvoice, infoJsonDtl, valueList, formatDoubleList, formatIntList, "airInvoice");
+                        rs.executeUpdate(sql, valueList);
+                    }
+                }
+                rs.executeUpdate("delete from airDtlInvoice where mainid=?", id);
+                if (infoJson.containsKey("airDtlInvoice")) {
+                    String airDtlInvoiceStr = infoJson.getString("airDtlInvoice");
+                    if (airDtlInvoiceStr != null && !"".equals(airDtlInvoiceStr)) {
+                        JSONArray infoJsonArray = infoJson.getJSONArray("airDtlInvoice");
+                        for (int i = 0; i < infoJsonArray.size(); i++) {
+                            JSONObject infoJsonDtl = infoJsonArray.getJSONObject(i);
+                            if (infoJsonDtl != null && infoJsonDtl.size() > 0) {
+                                sql = getsqlByColumn(id, airDtlInvoice, infoJsonDtl, valueList, formatDoubleList, formatIntList, "airDtlInvoice");
+                                rs.executeUpdate(sql, valueList);
+                            }
+                        }
+                    }
+                }
+            } else if (invoiceType == 13) {//国际小票
+                //修改明细表数据 smallInvoice
+                rs.executeUpdate("delete from smallInvoice where mainid=?", id);
+                if (infoJson.containsKey("smallInvoice")) {
+                    JSONObject infoJsonDtl = infoJson.getJSONObject("smallInvoice");
+                    if (infoJsonDtl != null && infoJsonDtl.size() > 0) {
+                        sql = getsqlByColumn(id, smallInvoice, infoJsonDtl, valueList, formatDoubleList, formatIntList, "smallInvoice");
+                        rs.executeUpdate(sql, valueList);
+                    }
+                }
+            } else if (invoiceType == 22) {//船票
+                //修改明细表数据 fnaBoatInvoice
+                rs.executeUpdate("delete from fnaBoatInvoice where mainid=?", id);
+                if (infoJson.containsKey("fnaBoatInvoice")) {
+                    JSONObject infoJsonDtl = infoJson.getJSONObject("fnaBoatInvoice");
+                    if (infoJsonDtl != null && infoJsonDtl.size() > 0) {
+                        sql = getsqlByColumn(id, fnaBoatInvoice, infoJsonDtl, valueList, formatDoubleList, formatIntList, "fnaBoatInvoice");
+                        rs.executeUpdate(sql, valueList);
+                    }
+                }
+            } else if (invoiceType == 23) {//滴滴出行行程单
+                //修改明细表数据 fnaDidiInvoice
+                rs.executeUpdate("delete from fnaDidiInvoice where mainid=?", id);
+                if (infoJson.containsKey("fnaDidiInvoice")) {
+                    JSONObject infoJsonDtl = infoJson.getJSONObject("fnaDidiInvoice");
+                    if (infoJsonDtl != null && infoJsonDtl.size() > 0) {
+                        sql = getsqlByColumn(id, fnaDidiInvoice, infoJsonDtl, valueList, formatDoubleList, formatIntList, "fnaDidiInvoice");
+                        rs.executeUpdate(sql, valueList);
+                    }
+                }
+                rs.executeUpdate("delete from fnaDidiDtlInvoice where mainid=?", id);
+                if (infoJson.containsKey("fnaDidiDtlInvoice")) {
+                    String fnaDidiDtlInvoiceStr = infoJson.getString("fnaDidiDtlInvoice");
+                    if (fnaDidiDtlInvoiceStr != null && !"".equals(fnaDidiDtlInvoiceStr)) {
+                        JSONArray infoJsonArray = infoJson.getJSONArray("fnaDidiDtlInvoice");
+                        for (int i = 0; i < infoJsonArray.size(); i++) {
+                            JSONObject infoJsonDtl = infoJsonArray.getJSONObject(i);
+                            if (infoJsonDtl != null && infoJsonDtl.size() > 0) {
+                                sql = getsqlByColumn(id, fnaDidiDtlInvoice, infoJsonDtl, valueList, formatDoubleList, formatIntList, "fnaDidiDtlInvoice");
+                                rs.executeUpdate(sql, valueList);
+                            }
+                        }
+                    }
+
+                }
+            }
+
+
+            //插入日志2
+            Map<String, String> afterMap = fnaLogSqlUtil.getInvoiceMap(String.valueOf(id), labelIdMap);
+            fnaLogSqlUtil.invoiceLedgerAddlog(new User(1), ipAdress, opType, String.valueOf(id), "2",
+                    beforeMap, afterMap, labelIdMap);
+        }
+        jsonObject.put("id",String.valueOf(id));
+        jsonObject.put("cloudId",cloudId);
+        return jsonObject;
+    }
+
+    /**
+     * 通过数据库字段获取sql
+     * @return
+     */
+    public static String getsqlByColumn(int id,String tableNameArray[] ,JSONObject infoJson,List<String>valueList,
+                                        List<String> formatDoubleList,List<String> formatIntList,String tableName){
+        DecimalFormat df = new DecimalFormat("###############################0.00");
+        StringBuffer sql=new StringBuffer();
+        StringBuffer sqlPlaceHolder=new StringBuffer();
+        valueList.clear();
+        if(id<=0 || !"fnainvoiceledger".equals(tableName)){
+            sql.append("insert into ").append(tableName).append("(");
+            sqlPlaceHolder.append(" values(");
+            if(!"fnainvoiceledger".equals(tableName)){//明细表，插入mainid
+                sql.append("mainid,");
+                sqlPlaceHolder.append("?,");
+                valueList.add(String.valueOf(id));
+            }
+            for(int i=0;i<tableNameArray.length;i++){
+                String column=tableNameArray[i];
+                sql.append(column);
+                sqlPlaceHolder.append("?");
+                if(i!=(tableNameArray.length-1)){
+                    sql.append(",");
+                    sqlPlaceHolder.append(",");
+                }else{
+                    sql.append(")");
+                    sqlPlaceHolder.append(")");
+                }
+                if(formatDoubleList.contains(column)) {
+                    valueList.add(df.format(Util.getDoubleValue(getString(infoJson,column), 0.00)));
+                }else if(formatIntList.contains(column)){
+                    valueList.add(Util.null2String(Util.getIntValue(getString(infoJson,column),0)));
+                }else{
+                    valueList.add(getString(infoJson,column));
+                }
+            }
+        }else{
+            sql.append("update ").append(tableName).append(" set ");
+            for(int i=0;i<tableNameArray.length;i++){
+                String column=tableNameArray[i];
+                sql.append(" ").append(column).append("=?");
+                if(i!=(tableNameArray.length-1)){
+                    sql.append(",");
+                }
+                if(formatDoubleList.contains(column)){
+                    valueList.add(df.format(Util.getDoubleValue(getString(infoJson,column),0.00)));
+                }else if(formatIntList.contains(column)){
+                    valueList.add(Util.null2String(Util.getIntValue(getString(infoJson,column),0)));
+                }else{
+                    valueList.add(getString(infoJson,column));
+                }
+            }
+            sql.append(" where id=?");
+            valueList.add(String.valueOf(id));
+            }
+        return sql.toString()+sqlPlaceHolder.toString();
+    }
+
+
+
+
+    /**
+     * TODO 把字节数组保存为一个文件
+     *
+     * @param imageBytes
+     * @param filePath
+     * @return
+     */
+    public static File getFileFromBytes(byte[] imageBytes, String filePath) {
+        BufferedOutputStream stream = null;
+        File file = null;
+        try {
+            file = new File(filePath);
+            file.mkdirs();
+            if (file.exists()) {
+                file.delete();
+                file.createNewFile();
+            } else {
+                file.createNewFile();
+            }
+            FileOutputStream fstream = new FileOutputStream(file);
+            stream = new BufferedOutputStream(fstream);
+            stream.write(imageBytes);
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            if (stream != null) {
+                try {
+                    stream.close();
+                } catch (IOException e1) {
+                    e1.printStackTrace();
+                }
+            }
+        }
+        return file;
+    }
+
+    public static String getImageId(byte[] imageBytes, String cid, String tokenUrl,String uploadUrl,User user, String userName, String password) throws Exception {
+
+        //获取token
+        JSONObject tokenJson = getCloudToken(user,cid,password,userName,tokenUrl);
+        String token = "";
+        if(tokenJson.getBoolean("flag")){
+            token = tokenJson.getString("token");
+        }else{
+            throw new Exception(tokenJson.getString("msg"));
+        }
+        uploadUrl = uploadUrl+"?token="+token;
+        String imageId = "";
+
+        //获取图片路径
+        String filePath = GCONST.getRootPath() +
+                "WEB-INF" + File.separatorChar +
+                "fna" + File.separatorChar +
+                "fpyOCRImageTemp" + File.separatorChar +
+                FnaCommon.getPrimaryKeyGuid1();
+        File imageFile = getFileFromBytes(imageBytes, filePath);
+
+
+        try {
+            //插入日志表fnaInvoiceCloudLog
+            RecordSet rs = new RecordSet();
+            String uuid = FnaCommon.getPrimaryKeyGuid1();
+            rs.executeUpdate("insert into fnaInvoiceCloudLog(uuid,enterTime,requestType,description,interfaceurl,userName,password) values(?,?,?,?,?,?,?)",
+                    uuid, Util.date(2), "OA发送请求", "发票识别-发票云-上传文件", uploadUrl, userName, password);
+            FnaCommon.updateDbClobOrTextFieldValue("fnaInvoiceCloudLog", "param", "", "uuid", uuid, "string");
+            FnaCommon.updateDbClobOrTextFieldValue("fnaInvoiceCloudLog", "md5Content", "", "uuid", uuid, "string");
+
+            JSONObject data = uploadPicture(imageFile, uploadUrl);
+            FnaCommon.updateDbClobOrTextFieldValue("fnaInvoiceCloudLog", "returnResult", data.toString(), "uuid", uuid, "string");
+            new BaseBean().writeLog("--------fnaLog--------发票云-文件上传返回data：" + data);
+            if(data.getString("status").equals("0")){
+                JSONObject json = data.getJSONObject("returnInfo");
+                JSONObject actionMsgJson = json.getJSONObject("actionMsg");
+                if (!"0".equals(actionMsgJson.getString("code"))) {
+                    throw new Exception(actionMsgJson.getString("message"));
+                }
+
+                JSONObject dataJson = json.getJSONObject("data");
+                imageId = Util.null2String(dataJson.getString("id"));
+            }
+
+        } finally {
+            //识别完成，删掉临时图片文件
+            File tempImagefile = new File(filePath);
+            if (tempImagefile.exists()) {
+                tempImagefile.delete();
+            }
+        }
+
+        return imageId;
+    }
+
+    /**
+     * 发票云OCR
+     *
+     * @param cid
+     * @param checkUrl
+     * @param user
+     * @return
+     */
+    public static JSONObject invoiceOCR(byte[] imageBytes, String cid, String ocrUrl,String tokenUrl,String uploadUrl, User user, String userName, String password) throws Exception {
+        DecimalFormat df = new DecimalFormat("############################0.00");
+        JSONObject resultJsonObj = new JSONObject();
+
+        //1.先上传图片获取图片id
+        String imageId = getImageId(imageBytes,cid,tokenUrl,uploadUrl,user, userName, password);
+
+        //2.调用发票识别接口
+        //传入的参数
+        JSONObject param = new JSONObject();
+        param.put("cid", cid);
+        param.put("userId", user.getUID());
+        param.put("image_index", imageId);
+        param.put("operate_type", "1");
+        param.put("is_save", "1");
+
+        //通信
+        String content = invoiceCloudEncode(param.toString(), password);
+        Map<String, String> map = new HashMap<String, String>();
+        map.put("appkey", userName);
+
+        //插入日志表fnaInvoiceCloudLog
+        RecordSet rs = new RecordSet();
+        String uuid = FnaCommon.getPrimaryKeyGuid1();
+        rs.executeUpdate("insert into fnaInvoiceCloudLog(uuid,enterTime,requestType,description,interfaceurl,userName,password) values(?,?,?,?,?,?,?)",
+                uuid, Util.date(2), "OA发送请求", "发票识别-发票云", ocrUrl, userName, password);
+        FnaCommon.updateDbClobOrTextFieldValue("fnaInvoiceCloudLog", "param", param.toString(), "uuid", uuid, "string");
+        FnaCommon.updateDbClobOrTextFieldValue("fnaInvoiceCloudLog", "md5Content", content, "uuid", uuid, "string");
+
+        String data = postToUrl(ocrUrl, content, map, "", uuid, "check", user,"");
+        new BaseBean().writeLog("--------fnaLog--------发票云返回data：" + data);
+        JSONObject dataJson = JSONObject.fromObject(data);
+
+        //解析报文开始
+        JSONObject dataJsonObj = new JSONObject();       //封装的接口返回标准信息
+        JSONArray identify_results = new JSONArray();       //识别结果数据
+
+        JSONArray infoArrayJson = dataJson.getJSONArray("infos");
+        int infoArrayJson_len = infoArrayJson.size();
+        for (int i = 0; i < infoArrayJson_len; i++) {
+            JSONObject infoArrayJsonElt = infoArrayJson.getJSONObject(i);
+
+            String ret = infoArrayJsonElt.getString("ret");
+            if ("0".equals(ret)) {
+                //获取发票云相关信息对象
+                JSONObject infoJson = infoArrayJsonElt.getJSONObject("info");
+                JSONObject modify_infoJson = infoJson.getJSONObject("modify_info");
+                JSONObject comm_infoJson = infoJson.getJSONObject("comm_info");
+                JSONObject proJson = comm_infoJson.getJSONObject("pro");
+                JSONObject priceJson = comm_infoJson.getJSONObject("price");
+                JSONObject buyerJson = comm_infoJson.getJSONObject("buyer");
+                JSONObject payerJson = comm_infoJson.getJSONObject("payer");
+
+                //不常用信息
+                String ext = infoJson.getString("ext");
+                JSONObject extJson = JSONObject.fromObject(ext);
+
+
+                //转化为标准的结构
+                JSONObject identifyObj = new JSONObject();
+                JSONObject detailsObj = new JSONObject();
+                String type = proJson.getString("type");
+
+                String standardType =Constants.STANDARDTYPE.get(type);
+                if ("".equals(standardType)) {
+                    //识别失败
+                    resultJsonObj.put("result", 0);
+                    resultJsonObj.put("message", "发票识别失败！");
+                    return resultJsonObj;
+                }
+                identifyObj.put("type", standardType);
+                identifyObj.put("orientation", "");
+                identifyObj.put("region", infoJson.getString("region"));
+                if ("1".equals(type) || "2".equals(type) || "3".equals(type) || "4".equals(type) || "5".equals(type) || "22".equals(type) || "28".equals(type) ) {     //增值税
+                //if ("1".equals(type) || "2".equals(type) || "3".equals(type) || "5".equals(type)) {     //增值税
+
+                    detailsObj.put("code", getString(infoJson, "code"));
+                    detailsObj.put("number", getString(infoJson, "number"));
+                    detailsObj.put("date", getString(proJson, "date"));
+                    detailsObj.put("pretax_amount", getString(priceJson, "amount"));
+                    detailsObj.put("total", getString(priceJson, "total"));
+                    detailsObj.put("tax", getString(extJson, "ttax"));
+                    detailsObj.put("check_code", getString(proJson, "chcode"));
+                    detailsObj.put("seller", getString(payerJson, "company"));
+                    detailsObj.put("seller_tax_id", getString(payerJson, "tcode"));
+                    detailsObj.put("buyer", getString(buyerJson, "company"));
+                    detailsObj.put("buyer_tax_id", getString(buyerJson, "tcode"));
+                    detailsObj.put("company_seal", getString(extJson, "corp_seal"));
+                    detailsObj.put("form_type", getString(extJson, "form_type"));
+                    detailsObj.put("form_name", getString(extJson, "form_name"));
+                    detailsObj.put("kind", getString(proJson, "kind"));
+                    detailsObj.put("ciphertext", getString(extJson, "ciphertext"));
+                    detailsObj.put("transit_mark", getString(extJson, "transit"));
+                    detailsObj.put("oil_mark", getString(extJson, "oil_mark"));
+                    detailsObj.put("machine_code", getString(extJson, "machine_code"));
+                    detailsObj.put("travel_tax", getString(extJson, "travel_tax"));
+                    detailsObj.put("receiptor", getString(extJson, "receiptor"));
+                    detailsObj.put("reviewer", getString(extJson, "reviewer"));
+                    detailsObj.put("issuer", getString(extJson, "issuer"));
+                    detailsObj.put("province", getString(extJson, "province"));
+                    detailsObj.put("city", getString(extJson, "city"));
+                    detailsObj.put("service_name", getString(extJson, "service_name"));
+                    detailsObj.put("remark", getString(extJson, "comment"));
+
+                    detailsObj.put("code_confirm", getString(extJson, "code_confirm"));
+                    detailsObj.put("number_confirm", getString(extJson, "number_confirm"));
+
+                    String item_names = "";
+                    if(extJson.containsKey("products")) {
+                        JSONArray productsArrayJson = extJson.getJSONArray("products");
+                        for (int j = 0; j < productsArrayJson.size(); j++) {
+                            if (!"".equals(item_names)) {
+                                item_names += ",";
+                            }
+                            item_names += productsArrayJson.getJSONObject(j).get("name");
+                        }
+                    }
+                    detailsObj.put("item_names", item_names);
+                    detailsObj.put("agent_mark", getString(extJson, "agent_mark"));
+                    detailsObj.put("acquisition_mark", getString(extJson, "acquisition"));
+                    detailsObj.put("block_chain", getString(extJson, "block_chain"));
+                    if("22".equals(type)){//区块链发票
+                        detailsObj.put("block_chain", "1");
+                    }
+                    if("5".equals(type)){//通行费
+                        detailsObj.put("transit_mark", "1");
+                    }
+
+                    detailsObj.put("code_confirm", getString(extJson, "code_confirm"));
+                    detailsObj.put("number_confirm", getString(extJson, "number_confirm"));
+
+
+
+
+                    JSONArray items = new JSONArray();//发票明细
+                    if(extJson.containsKey("products")){
+                        JSONArray productsArray = extJson.getJSONArray("products");
+                        for(int j=0;j<productsArray.size();j++){
+                            JSONObject productJson = productsArray.getJSONObject(j);
+                            String CommodityName = getString(productJson,"name");
+
+                            String UnitPrice = getString(productJson,"price");
+                            String Quantity = getString(productJson,"qty");
+                            String specification = getString(productJson,"smodel");
+                            String unit = getString(productJson,"muint");
+                            String Amount = getString(productJson,"amount");
+                            String TaxRate =  String.valueOf(Util.getDoubleValue(getString(productJson,"trate"),0.00)/100);
+                            String Tax = getString(productJson,"tprice");
+
+                            String startDate = getString(productJson,"txrqq");
+                            String endDate = getString(productJson,"txrqz");
+                            String numberPlate = getString(productJson,"txfCph");
+                            String carType = getString(productJson,"txfLx");
+
+                            JSONObject jsonItems = new JSONObject();
+                            jsonItems.put("quantity", Quantity);
+                            jsonItems.put("price", UnitPrice);
+                            jsonItems.put("name", CommodityName);
+                            jsonItems.put("total", Amount);
+                            jsonItems.put("tax_rate", TaxRate);
+                            jsonItems.put("tax", Tax);
+                            jsonItems.put("specification", specification);
+                            jsonItems.put("unit", unit);
+                            jsonItems.put("startDate", startDate);
+                            jsonItems.put("endDate", endDate);
+                            jsonItems.put("numberPlate", numberPlate);
+                            jsonItems.put("type", carType);
+
+                            items.add(jsonItems);
+                        }
+                    }
+                    detailsObj.put("items", items);
+                } else if ("9".equals(type)) {      //出租车
+                    detailsObj.put("code", getString(infoJson, "code"));
+                    detailsObj.put("number", getString(infoJson, "number"));
+                    detailsObj.put("date", getString(proJson, "date"));
+                    detailsObj.put("time_geton", getString(extJson, "time_geton"));
+                    detailsObj.put("time_getoff", getString(extJson, "time_getoff"));
+                    detailsObj.put("mileage", getString(extJson, "mileage"));
+                    detailsObj.put("fare", getString(extJson, "fare"));
+                    detailsObj.put("total", getString(priceJson, "total"));
+                    detailsObj.put("place", getString(extJson, "place"));
+                    detailsObj.put("kind", getString(proJson, "kind"));
+                    detailsObj.put("province", getString(extJson, "province"));
+                    detailsObj.put("city", getString(extJson, "city"));
+                    detailsObj.put("license_plate", getString(extJson, "license_plate"));
+                } else if ("12".equals(type)) {      //火车票
+                    detailsObj.put("number", getString(infoJson, "number"));
+                    detailsObj.put("date", getString(proJson, "date"));
+                    detailsObj.put("time", getString(extJson, "time"));
+                    detailsObj.put("name", getString(extJson, "name"));
+                    detailsObj.put("station_geton", getString(extJson, "station_geton"));
+                    detailsObj.put("station_getoff", getString(extJson, "station_getoff"));
+                    detailsObj.put("train_number", getString(extJson, "train_number"));
+                    detailsObj.put("seat", getString(extJson, "seat"));
+                    detailsObj.put("total", getString(priceJson, "total"));
+                    detailsObj.put("kind", getString(proJson, "kind"));
+                    detailsObj.put("serial_number", getString(extJson, "serial_number"));
+                    detailsObj.put("user_id", getString(extJson, "user_id"));
+                } else if ("10".equals(type)) {      //机打发票
+                    detailsObj.put("code", getString(infoJson, "code"));
+                    detailsObj.put("number", getString(infoJson, "number"));
+                    detailsObj.put("date", getString(proJson, "date"));
+                    detailsObj.put("time", getString(extJson, "time"));
+                    detailsObj.put("check_code", getString(proJson, "chcode"));
+                    detailsObj.put("category", getString(extJson, "category"));
+                    detailsObj.put("total", getString(priceJson, "total"));
+                    detailsObj.put("seller", getString(payerJson, "company"));
+                    detailsObj.put("seller_tax_id", getString(payerJson, "tcode"));
+                    detailsObj.put("buyer", getString(buyerJson, "company"));
+                    detailsObj.put("buyer_tax_id", getString(buyerJson, "tcode"));
+                    detailsObj.put("kind", getString(proJson, "kind"));
+                    detailsObj.put("province", getString(extJson, "province"));
+                    detailsObj.put("city", getString(extJson, "city"));
+                    detailsObj.put("company_seal", getString(extJson, "companySeal"));
+                } else if ("8".equals(type)) {       //定额发票
+                    detailsObj.put("code", getString(infoJson, "code"));
+                    detailsObj.put("number", getString(infoJson, "number"));
+                    detailsObj.put("total", getString(priceJson, "total"));
+                    detailsObj.put("kind", getString(proJson, "kind"));
+                    detailsObj.put("province", getString(extJson, "province"));
+                    detailsObj.put("city", getString(extJson, "city"));
+                    detailsObj.put("company_seal", getString(extJson, "companySeal"));
+                } else if ("13".equals(type)) {       //过路费
+                    detailsObj.put("code", getString(infoJson, "code"));
+                    detailsObj.put("number", getString(infoJson, "number"));
+                    detailsObj.put("date", getString(proJson, "date"));
+                    detailsObj.put("time", getString(extJson, "time"));
+                    detailsObj.put("entrance", getString(extJson, "entrance"));
+                    detailsObj.put("exit", getString(extJson, "exit"));
+                    detailsObj.put("total", getString(priceJson, "total"));
+                    detailsObj.put("kind", getString(proJson, "kind"));
+                    detailsObj.put("highway_flag", getString(extJson, "highway_flag"));
+                } else if ("15".equals(type)) {       //客运汽车
+                    detailsObj.put("code", getString(infoJson, "code"));
+                    detailsObj.put("number", getString(infoJson, "number"));
+                    detailsObj.put("date", getString(proJson, "date"));
+                    detailsObj.put("time", getString(extJson, "time"));
+                    detailsObj.put("station_geton", getString(extJson, "station_geton"));
+                    detailsObj.put("station_getoff", getString(extJson, "station_getoff"));
+                    detailsObj.put("total", getString(priceJson, "total"));
+                    detailsObj.put("name", getString(extJson, "name"));
+                    detailsObj.put("kind", getString(proJson, "kind"));
+                    detailsObj.put("user_id", getString(extJson, "user_id"));
+                } else if ("16".equals(type)) {       //航空运输电子客票行程单
+                    detailsObj.put("user_name", getString(extJson, "user_name"));
+                    detailsObj.put("user_id", getString(extJson, "user_id"));
+                    detailsObj.put("number", getString(infoJson, "number"));
+                    detailsObj.put("check_code", getString(proJson, "chcode"));
+                    detailsObj.put("date", getString(proJson, "date"));
+                    detailsObj.put("agentcode", getString(extJson, "agentcode"));
+                    detailsObj.put("issue_by", getString(extJson, "issue_by"));
+                    detailsObj.put("fare", getString(extJson, "fare"));
+                    detailsObj.put("tax", getString(extJson, "tax"));
+                    detailsObj.put("fuel_surcharge", getString(extJson, "fuel_surcharge"));
+                    detailsObj.put("caac_development_fund", getString(extJson, "caac_development_fund"));
+                    detailsObj.put("insurance", getString(extJson, "insurance"));
+                    detailsObj.put("total", getString(priceJson, "total"));
+                    detailsObj.put("kind", getString(proJson, "kind"));
+                    detailsObj.put("international_flag", getString(extJson, "international_flag"));
+                    detailsObj.put("print_number", getString(extJson, "print_number"));
+
+                    JSONArray flightsArray_ret = new JSONArray();
+                    if(extJson.containsKey("flights")) {
+                        JSONArray flightsJsonArray = extJson.getJSONArray("flights");
+                        for (int j = 0; j < flightsJsonArray.size(); j++) {
+                            JSONObject flightObject = flightsJsonArray.getJSONObject(j);
+
+                            JSONObject flightsOject_ret = new JSONObject();
+                            flightsOject_ret.put("from", getString(flightObject, "from"));
+                            flightsOject_ret.put("to", getString(flightObject, "to"));
+                            flightsOject_ret.put("flight_number", getString(flightObject, "flight_number"));
+                            flightsOject_ret.put("date", getString(flightObject, "date"));
+                            flightsOject_ret.put("time", getString(flightObject, "time"));
+                            flightsOject_ret.put("seat", getString(flightObject, "seat"));
+                            flightsOject_ret.put("carrier", getString(flightObject, "carrier"));
+                            flightsArray_ret.add(flightsOject_ret);
+                        }
+                    }
+                    detailsObj.put("flights", flightsArray_ret);
+                } else if ("7".equals(type)) {       //二手车销售统一发票
+                    detailsObj.put("code", getString(infoJson, "code"));
+                    detailsObj.put("number", getString(infoJson, "number"));
+                    detailsObj.put("date", getString(proJson, "date"));
+                    detailsObj.put("total", getString(priceJson, "total"));
+                    detailsObj.put("seller", getString(payerJson, "company"));
+                    detailsObj.put("seller_tax_id", getString(payerJson, "tcode"));
+                    detailsObj.put("buyer", getString(buyerJson, "company"));
+                    detailsObj.put("buyer_tax_id", getString(buyerJson, "tcode"));
+
+                    JSONObject usedVehicleJson = extJson.getJSONObject("usedVehicle");
+                    detailsObj.put("company_name", getString(usedVehicleJson, "marketCompany"));
+                    detailsObj.put("company_tax_id", getString(usedVehicleJson, "marketTaxCode"));
+                    detailsObj.put("license_plate", getString(usedVehicleJson, "licensePlate"));
+                    detailsObj.put("registration_number", getString(usedVehicleJson, "registrationNumber"));
+                    detailsObj.put("car_code", getString(usedVehicleJson, "vehicleIdentificationCode"));
+                    detailsObj.put("car_model", getString(usedVehicleJson, "brankNumber"));
+                    detailsObj.put("kind", getString(proJson, "kind"));
+                    detailsObj.put("province", getString(extJson, "province"));
+                    detailsObj.put("city", getString(extJson, "city"));
+                } else if ("6".equals(type)) {       //机动车销售统一发票
+                    detailsObj.put("code", getString(infoJson, "code"));
+                    detailsObj.put("number", getString(infoJson, "number"));
+                    detailsObj.put("machine_code", "machine_code");
+                    detailsObj.put("machine_number", "machine_number");
+                    detailsObj.put("date", getString(proJson, "date"));
+                    detailsObj.put("pretax_amount", getString(priceJson, "amount"));
+                    detailsObj.put("total", getString(priceJson, "total"));
+                    detailsObj.put("seller", getString(payerJson, "company"));
+                    detailsObj.put("seller_tax_id", getString(payerJson, "tcode"));
+                    detailsObj.put("buyer", getString(buyerJson, "company"));
+                    detailsObj.put("buyer_tax_id", getString(buyerJson, "tcode"));
+
+                    JSONObject vehicleDetailJson = extJson.getJSONObject("vehicleDetail");
+                    detailsObj.put("tax_authorities", getString(vehicleDetailJson, "taxOfficeName"));
+                    detailsObj.put("tax_authorities_code", getString(vehicleDetailJson, "taxOfficeCode"));
+                    detailsObj.put("car_code", getString(vehicleDetailJson, "vehicleIdentificationCode"));
+                    detailsObj.put("car_engine_code", getString(vehicleDetailJson, "engineCode"));
+                    detailsObj.put("car_model", getString(vehicleDetailJson, "brankNumber"));
+                    detailsObj.put("certificate_number", getString(vehicleDetailJson, "certificateNumber"));
+
+                    detailsObj.put("kind", getString(proJson, "kind"));
+                    detailsObj.put("province", getString(extJson, "province"));
+                    detailsObj.put("city", getString(extJson, "city"));
+                    detailsObj.put("tax", getString(extJson, "ttax"));
+                    detailsObj.put("tax_rate", getString(extJson, "trate"));
+                } else if ("17".equals(type)) {       //小票
+                    detailsObj.put("store_name", getString(extJson, "store_name"));
+                    detailsObj.put("date", getString(proJson, "date"));
+                    detailsObj.put("time", getString(extJson, "time"));
+                    detailsObj.put("subtotal", getString(priceJson, "amount"));
+                    detailsObj.put("tax", getString(extJson, "tax"));
+                    detailsObj.put("discount", getString(extJson, "discount"));
+                    detailsObj.put("tips", getString(extJson, "tips"));
+                    detailsObj.put("total", getString(priceJson, "total"));
+                    detailsObj.put("currency_code", getString(proJson, "ccy"));
+                    detailsObj.put("type", getString(proJson, "kind"));
+                } else if ("18".equals(type)) {       //滴滴出行行程单
+                    detailsObj.put("date", getString(proJson, "date"));
+                    detailsObj.put("date_start", getString(extJson, "date_start"));
+                    detailsObj.put("date_end", getString(extJson, "date_end"));
+                    detailsObj.put("phone", getString(extJson, "phone"));
+                    detailsObj.put("total", getString(priceJson, "total"));
+                    detailsObj.put("kind", getString(proJson, "kind"));
+
+                    JSONArray itemsJson_ret = new JSONArray();
+                    if(extJson.containsKey("items")) {
+                        JSONArray itemsJson = extJson.getJSONArray("items");
+                        for (int j = 0; j < itemsJson.size(); j++) {
+                            JSONObject itemJson = itemsJson.getJSONObject(j);
+
+                            JSONObject itemJson_ret = itemsJson.getJSONObject(j);
+                            itemJson_ret.put("car_type", getString(itemJson, "car_type"));
+                            itemJson_ret.put("time_geton", getString(itemJson, "time_geton"));
+                            itemJson_ret.put("city", getString(itemJson, "city"));
+                            itemJson_ret.put("station_geton", getString(itemJson, "station_geton"));
+                            itemJson_ret.put("station_getoff", getString(itemJson, "station_getoff"));
+                            itemJson_ret.put("mileage", getString(itemJson, "mileage"));
+                            itemJson_ret.put("total", getString(itemJson, "total"));
+                            itemsJson_ret.add(itemJson_ret);
+                        }
+                    }
+                    detailsObj.put("items", itemsJson_ret);
+                } else if ("19".equals(type)) {       //完税证明
+                    detailsObj.put("number", getString(infoJson, "number"));
+                    detailsObj.put("total", getString(priceJson, "total"));
+                    detailsObj.put("buyer", getString(buyerJson, "company"));
+                    detailsObj.put("buyer_tax_id", getString(buyerJson, "tcode"));
+                    detailsObj.put("date", getString(proJson, "date"));
+                } else if ("14".equals(type)) {       //船票
+                    detailsObj.put("code", getString(infoJson, "code"));
+                    detailsObj.put("number", getString(infoJson, "number"));
+                    detailsObj.put("date", getString(proJson, "date"));
+                    detailsObj.put("time", getString(extJson, "time"));
+                    detailsObj.put("station_geton", getString(extJson, "station_geton"));
+                    detailsObj.put("station_getoff", getString(extJson, "station_getoff"));
+                    detailsObj.put("total", getString(priceJson, "total"));
+                    detailsObj.put("name", getString(extJson, "name"));
+                    detailsObj.put("kind", getString(proJson, "kind"));
+                    detailsObj.put("province", getString(extJson, "province"));
+                    detailsObj.put("city", getString(extJson, "city"));
+                    detailsObj.put("currency_code", getString(proJson, "ccy"));
+                } else if ("11".equals(type)) {       //可报销的其他类型发票
+                    detailsObj.put("code", getString(infoJson, "code"));
+                    detailsObj.put("number", getString(infoJson, "number"));
+                    detailsObj.put("total", getString(priceJson, "total"));
+                    detailsObj.put("date", getString(proJson, "date"));
+                    detailsObj.put("kind", getString(proJson, "kind"));
+                }
+                identifyObj.put("details", detailsObj);
+
+                //extra
+                JSONObject extraObj = new JSONObject();
+                extraObj.put("check_code_candidates", "");
+                extraObj.put("check_code_last_six", "");
+                extraObj.put("number_order_error", "");
+                extraObj.put("qrcode", "");
+                extraObj.put("barcode", "");
+                identifyObj.put("extra", extraObj);
+
+                identify_results.add(identifyObj);
+            } else {
+                //识别失败
+                resultJsonObj.put("result", 0);
+                resultJsonObj.put("message", "错误码：ret=" + ret);
+                return resultJsonObj;
+            }
+        }
+
+        //返回数据
+        dataJsonObj.put("result", 1);
+        dataJsonObj.put("message", "");
+        dataJsonObj.put("identify_results", identify_results);
+
+        //extra
+        JSONObject extraObj = new JSONObject();
+        extraObj.put("qrcode", "");
+        extraObj.put("barcode", "");
+        dataJsonObj.put("extra", extraObj);
+
+        //封装的完整标准数据
+        JSONObject packageJsonObj = new JSONObject();
+        packageJsonObj.put("result", 1);
+        packageJsonObj.put("message", "");
+        JSONObject responseJsonObj = new JSONObject();
+        responseJsonObj.put("data", dataJsonObj);
+        packageJsonObj.put("response", responseJsonObj);
+
+        resultJsonObj.put("status", Constants.SUCCESS_CODE);
+        resultJsonObj.put("returnInfo", packageJsonObj);
+        return resultJsonObj;
+    }
+
+
+    /**
+     * 发票云上传附件
+     * @throws Exception
+     */
+    public static JSONObject uploadPicture(File localFile,String url) throws Exception {
+        JSONObject jsonObject=new JSONObject();
+        try{
+            PostMethod filePost = new PostMethod(url);
+
+            FilePart fp = new FilePart("file", localFile);
+            // StringPart:普通的文本参数
+            Part[] parts = {fp};
+            // 对于MIME类型的请求，httpclient建议全用MulitPartRequestEntity进行包装
+            MultipartRequestEntity mre = new MultipartRequestEntity(parts, filePost.getParams());
+            filePost.setRequestEntity(mre);
+            HttpClient client = new HttpClient();
+            int status = client.executeMethod(filePost);
+            if(status==200){
+                String responseBodyAsString = filePost.getResponseBodyAsString();
+                JSONObject returninfo = JSONObject.fromObject(responseBodyAsString);
+
+                jsonObject.put("status", "0");
+                jsonObject.put("returnInfo", returninfo);
+            }else{
+                throw new Exception("接口地址请求失败！");
+            }
+
+        }catch (Exception e){
+            jsonObject.put("status", "1");
+            jsonObject.put("msg", e.getMessage());
+        }
+
+        return jsonObject;
+    }
+
+
+    /**
+     * 发票云查验
+     * @param invoiceCode
+     * @param invoiceNo
+     * @param price
+     * @param billingDate
+     * @param crcCode
+     * @param cid
+     * @param checkUrl
+     * @param user
+     * @return
+     */
+    public static JSONObject autoCheckInvoice(String invoiceCode, String invoiceNo, String price, String billingDate, String crcCode,
+                                              String cid, String checkUrl,User user,String userName,String password) throws Exception {
+        DecimalFormat df = new DecimalFormat("############################0.00");
+        JSONObject resultObj = new JSONObject();
+        JSONObject param = new JSONObject();
+        param.put("cid",cid);
+        param.put("userId",user.getUID());
+
+        param.put("code",invoiceCode);
+        param.put("number",invoiceNo);
+
+        billingDate = billingDate.replaceAll("-","");
+
+
+        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd");
+        Date date = dateFormat.parse(billingDate);
+        int  time = Math.round(date.getTime()/1000);
+        param.put("date",time);
+        param.put("chcode",crcCode);
+        param.put("amount",price);
+        param.put("total","");//机动车暂不支持
+        param.put("is_save", "1");
+
+        String content = invoiceCloudEncode(param.toString(), password);
+        Map<String, String> map = new HashMap<String, String>();
+        map.put("appkey", userName);
+
+        //插入日志表fnaInvoiceCloudLog
+        RecordSet rs = new RecordSet();
+        String uuid = FnaCommon.getPrimaryKeyGuid1();
+        rs.executeUpdate("insert into fnaInvoiceCloudLog(uuid,enterTime,requestType,description,interfaceurl,userName,password) values(?,?,?,?,?,?,?)",
+                uuid, Util.date(2),"OA发送请求","发票查验",checkUrl,userName,password);
+        FnaCommon.updateDbClobOrTextFieldValue("fnaInvoiceCloudLog", "param", param.toString(), "uuid", uuid, "string");
+        FnaCommon.updateDbClobOrTextFieldValue("fnaInvoiceCloudLog", "md5Content",content, "uuid", uuid, "string");
+
+        String data = postToUrl(checkUrl, content, map, "", uuid,"check",user,"");
+        JSONObject dataJson = JSONObject.fromObject(data);
+
+        //解析报文开始
+        JSONObject infoJson = dataJson.getJSONObject("info");
+        JSONObject comm_infoJson = infoJson.getJSONObject("comm_info");
+        JSONObject proJson = comm_infoJson.getJSONObject("pro");
+        JSONObject priceJson = comm_infoJson.getJSONObject("price");
+        JSONObject buyerJson = comm_infoJson.getJSONObject("buyer");
+        JSONObject payerJson = comm_infoJson.getJSONObject("payer");
+
+        String ext = infoJson.getString("ext");
+        JSONObject extJson = JSONObject.fromObject(ext);
+
+        String status = getString(proJson,"status");//状态
+        if("2".equals(status)){
+            //记录错误信息
+            FnaInvoiceCommon.saveFailLog(user.getUID(), 1, SystemEnv.getHtmlLabelName(509480, user.getLanguage()));
+            throw new Exception(SystemEnv.getHtmlLabelName(509480, user.getLanguage()));
+        }
+
+        String type = getString(proJson,"type");//标题
+
+        String title = getString(proJson,"cname");//标题
+        String _taxIncludedPrice = getString(priceJson,"total");//价税合计
+        String _priceWithoutTax = getString(priceJson,"amount");//不含税金额
+        String _tax = getString(extJson,"ttax");
+        String _invoiceNumber = getString(infoJson,"number");//发票号码
+        String _invoicecode = getString(infoJson,"code");//代码
+        String _checkCode = getString(proJson,"chcode");//校验码
+        String _purchaser = getString(buyerJson,"company");//购买方
+        String _seller = getString(payerJson,"company");//销售方
+        String _purchaserTaxNo = getString(buyerJson,"tcode");//购买方纳税人识别号
+        String _salesTaxNo = getString(payerJson,"tcode");//销售方纳税人识别号
+        String _billingDate = getString(proJson,"date");//开票日期
+        String _remark = getString(extJson,"comment");//备注信息
+        String _sellerAddress = getString(extJson,"pcontact");//销售方电话、地址
+        String _purchaserAddress = getString(extJson,"bcontact");//购买方电话、地址
+        String _salesBank = getString(extJson,"pbank");//销售方开户行及账号
+        String _purchaserBank = getString(extJson,"bbank");//购买方开户行及账号
+        String _taxRate = getString(extJson,"trate");//税率
+        String _invoiceServiceYype = "";//货物或应税服务类型
+        JSONArray items = new JSONArray();//发票明细
+        if(extJson.containsKey("products")){
+            JSONArray productsArray = extJson.getJSONArray("products");
+            for(int i=0;i<productsArray.size();i++){
+                JSONObject productJson = productsArray.getJSONObject(i);
+                String CommodityName = getString(productJson,"name");
+                if("".equals(_invoiceServiceYype)) {
+                    _invoiceServiceYype = CommodityName;
+                }
+                String UnitPrice = getString(productJson,"price");
+                String Quantity = getString(productJson,"qty");
+                String specification = getString(productJson,"smodel");
+                String unit = getString(productJson,"muint");
+                String Amount = getString(productJson,"amount");
+                String TaxRate =  String.valueOf(Util.getDoubleValue(getString(productJson,"trate"),0.00)/100);
+                String Tax = getString(productJson,"tprice");
+
+                String startDate = getString(productJson,"txrqq");
+                String endDate = getString(productJson,"txrqz");
+                String numberPlate = getString(productJson,"txfCph");
+                String carType = getString(productJson,"txfLx");
+
+                JSONObject jsonItems = new JSONObject();
+                jsonItems.put("Quantity", Quantity);
+                jsonItems.put("UnitPrice", UnitPrice);
+                jsonItems.put("CommodityName", CommodityName);
+                jsonItems.put("Amount", Amount);
+                jsonItems.put("TaxRate", TaxRate);
+                jsonItems.put("Tax", Tax);
+                jsonItems.put("specification", specification);
+                jsonItems.put("unit", unit);
+
+                jsonItems.put("startDate", startDate);
+                jsonItems.put("endDate", endDate);
+                jsonItems.put("numberPlate", numberPlate);
+                jsonItems.put("type", carType);
+
+                items.add(jsonItems);
+            }
+        }
+
+
+        //以下代码可能某些客户版本较低，不存在
+        {
+            int id= 0;
+            rs.executeQuery("select id from fnaInvoiceDetailInfo where invoiceNumber=? and invoiceCode=?",_invoiceNumber,_invoicecode);
+            if(rs.next()){
+                id = Util.getIntValue(rs.getString("id"),0);
+            }
+            if(id <=0){
+                rs.executeUpdate("insert into fnaInvoiceDetailInfo (invoiceNumber,invoiceCode) values(?,?)",_invoiceNumber,_invoicecode);
+                rs.executeQuery("select id maxid from fnaInvoiceDetailInfo where invoiceNumber=? and invoiceCode=?",_invoiceNumber,_invoicecode);
+                int maxid = 0;
+                if(rs.next()){
+                    maxid = Util.getIntValue(rs.getString("maxid"));
+                }
+                FnaCommon.updateDbClobOrTextFieldValue("fnaInvoiceDetailInfo", "detailInfo", items.toString(), "id", maxid+"", "int");
+            }else{
+                FnaCommon.updateDbClobOrTextFieldValue("fnaInvoiceDetailInfo", "detailInfo", items.toString(), "id", id+"", "int");
+            }
+            FnaAbstractInterface.saveInvoiceServiceYype(items, "CommodityName");
+        }
+
+        //机动车销售统一发票特殊字段
+        String machine_code=getString(extJson,"machine_code");//机打代码
+        String machine_number=getString(extJson,"machine_number");//机打号码
+        String tax_authorities=getString(extJson,"taxOfficeName");//主管税务机关
+        String tax_authorities_code=getString(extJson,"taxOfficeCode");//主管税务机关代码
+        String car_code=getString(extJson,"vehicleIdentificationCode");//车架号/车辆识别代码
+        String car_engine_code=getString(extJson,"engineCode");//发动机号码
+        String car_model=getString(extJson,"brankNumber");//厂牌型号
+        String certificate_number=getString(extJson,"certificateNumber");//合格证号
+
+
+
+        resultObj.put("title", title);
+        resultObj.put("_taxIncludedPrice", df.format(Util.getDoubleValue(_taxIncludedPrice,0.00)));
+        resultObj.put("_priceWithoutTax", df.format(Util.getDoubleValue(_priceWithoutTax,0.00)));
+        resultObj.put("_tax", df.format(Util.getDoubleValue(_tax,0.00)));
+        resultObj.put("_taxRate", df.format(Util.getDoubleValue(_taxRate,0.00)));
+        resultObj.put("_invoiceNumber", _invoiceNumber);
+        resultObj.put("_invoicecode", _invoicecode);
+        resultObj.put("_purchaser", _purchaser);
+        resultObj.put("_seller", _seller);
+        resultObj.put("_purchaserTaxNo", _purchaserTaxNo);
+        resultObj.put("_salesTaxNo", _salesTaxNo);
+        resultObj.put("_billingDate", _billingDate);
+        resultObj.put("_remark", _remark);
+        resultObj.put("_sellerAddress", _sellerAddress);
+        resultObj.put("_purchaserAddress", _purchaserAddress);
+        resultObj.put("_salesBank", _salesBank);
+        resultObj.put("_purchaserBank", _purchaserBank);
+        resultObj.put("_checkCode", _checkCode);
+        resultObj.put("_invoiceServiceYype", _invoiceServiceYype);
+        resultObj.put("_invoiceType", Constants.CLOUDTOOATYPE.get(type));
+
+        int recoginizeinvoiceType = SdkInvoiceUtil.recoginizeInvoiceType(invoiceCode);
+        resultObj.put("fplx", recoginizeinvoiceType);
+
+        //机动车销售统一发票特殊字段
+        resultObj.put("_machine_code", machine_code);
+        resultObj.put("_machine_number", machine_number);
+        resultObj.put("_tax_authorities", tax_authorities);
+        resultObj.put("_tax_authorities_code", tax_authorities_code);
+        resultObj.put("_car_code", car_code);
+        resultObj.put("_car_engine_code", car_engine_code);
+        resultObj.put("_car_model", car_model);
+        resultObj.put("_certificate_number", certificate_number);
+
+        resultObj.put("detaildata", items);
+        resultObj.put("status", "1");
+        return resultObj;
+    }
+
+
+    /**
+     * 判断是否存在生效的发票云接口-流程组用
+     * @param user
+     * @return
+     */
+    public static boolean isExistInvoiceCloudInterface(User user){
+        JSONObject interfaceInfo = InvoiceCloudUtil.getInterfaceInfo(user, false, false, true);
+        JSONObject cloudInfo = interfaceInfo.getJSONObject("cloud");
+        boolean existEffectCloud = cloudInfo.getBoolean("existEffectCloud");
+        return existEffectCloud;
+    }
+
+    /**
+     * 获取cloudId(发票云id)或者inoviceId(发票台账id)
+     * @param ids
+     * @param method 传cloudId或inoviceId  传cloudId表示要通过inoviceId获取cloudId,  传inoviceId表示要通过cloudId获取inoviceId
+     * @return 返回的ids和传的ids顺序保持一致
+     */
+    public static String getCloudIdOrInoviceId(String ids,String method){
+        StringBuffer idsBuffer = new StringBuffer();
+        RecordSet rs = new RecordSet();
+        String[] idsSplit = ids.split(",");
+        if("cloudId".equals(method)){
+            for(int i=0;i<idsSplit.length;i++){
+                rs.executeQuery("select cloudId from fnaInvoiceLedger where id=?",idsSplit[i]);
+                if(rs.next()){
+                    String cloudId = Util.null2String(rs.getString("cloudId"));
+                    if(idsBuffer.length()==0){
+                        idsBuffer.append(cloudId);
+                    }else{
+                        idsBuffer.append(",").append(cloudId);
+                    }
+                }
+            }
+        }else if("inoviceId".equals(method)){
+            for(int i=0;i<idsSplit.length;i++){
+                rs.executeQuery("select id from fnaInvoiceLedger where cloudId=?",idsSplit[i]);
+                if(rs.next()){
+                    String id = Util.null2String(rs.getString("id"));
+                    if(idsBuffer.length()==0){
+                        idsBuffer.append(id);
+                    }else{
+                        idsBuffer.append(",").append(id);
+                    }
+                }
+            }
+        }
+        return idsBuffer.toString();
+    }
+	
+    /**
+     * @Description: 同步转移归属人/共享人信息到发票云
+     * @param interfaceurl
+     * @param param
+     * @param userName
+     * @param password
+     * @return: net.sf.json.JSONObject
+     * @Author: konghang
+     * @Date: 10:04 2020/10/14
+     */
+    public static JSONObject synOwnerInfo(String interfaceurl, JSONObject param, String userName, String password) {
+        JSONObject jsonObject = new JSONObject();
+        try {
+            String content = invoiceCloudEncode(param.toString(), password);
+            Map<String, String> map = new HashMap<String, String>();
+            map.put("appkey", userName);
+
+            //插入日志表fnaInvoiceCloudLog
+            RecordSet rs = new RecordSet();
+            String uuid = FnaCommon.getPrimaryKeyGuid1();
+            rs.executeUpdate("insert into fnaInvoiceCloudLog(uuid,enterTime,requestType,description,interfaceurl,userName,password) values(?,?,?,?,?,?,?)",
+                    uuid, Util.date(2), "OA发送请求", "同步转移归属人/共享人信息到发票云", interfaceurl, userName, password);
+            FnaCommon.updateDbClobOrTextFieldValue("fnaInvoiceCloudLog", "param", param.toString(), "uuid", uuid, "string");
+            FnaCommon.updateDbClobOrTextFieldValue("fnaInvoiceCloudLog", "md5Content", content, "uuid", uuid, "string");
+
+            String data = postToUrl(interfaceurl, content, map, "", uuid);
+            jsonObject.put("flag", true);
+            jsonObject.put("data", data);
+        } catch (Exception e) {
+            jsonObject.put("flag", false);
+            jsonObject.put("msg", e.getMessage());
+        }
+        return jsonObject;
+    }
+
+    /**
+     * @Description: 同步共享人信息到发票云
+     * @param interfaceurl
+     * @param param
+     * @param userName
+     * @param password
+     * @return: net.sf.json.JSONObject
+     * @Author: konghang
+     * @Date: 10:04 2020/10/14
+     */
+    public static JSONObject sysSharerInfo(String interfaceurl, JSONObject param, String userName, String password) {
+        JSONObject jsonObject = new JSONObject();
+        try {
+            String content = invoiceCloudEncode(param.toString(), password);
+            Map<String, String> map = new HashMap<String, String>();
+            map.put("appkey", userName);
+
+            //插入日志表fnaInvoiceCloudLog
+            RecordSet rs = new RecordSet();
+            String uuid = FnaCommon.getPrimaryKeyGuid1();
+            rs.executeUpdate("insert into fnaInvoiceCloudLog(uuid,enterTime,requestType,description,interfaceurl,userName,password) values(?,?,?,?,?,?,?)",
+                    uuid, Util.date(2), "OA发送请求", "同步共享人信息到发票云", interfaceurl, userName, password);
+            FnaCommon.updateDbClobOrTextFieldValue("fnaInvoiceCloudLog", "param", param.toString(), "uuid", uuid, "string");
+            FnaCommon.updateDbClobOrTextFieldValue("fnaInvoiceCloudLog", "md5Content", content, "uuid", uuid, "string");
+
+            String data = postToUrl(interfaceurl, content, map, "", uuid);
+            jsonObject.put("flag", true);
+            jsonObject.put("data", data);
+        } catch (Exception e) {
+            jsonObject.put("flag", false);
+            jsonObject.put("msg", e.getMessage());
+        }
+        return jsonObject;
+    }
+
+
+    /**
+     * 获取发票使用次数接口
+     * @param cid
+     * @param userId
+     * @return
+     */
+    public static JSONObject getInvoiceUsedNumberInfo(String cid,int userId){
+        JSONObject invoiceCloudUrl = InvoiceCloudUtil.getInvoiceCloudUrl();
+        RecordSet rs = new RecordSet();
+        String userName="";
+        String password="";
+        String javaUrl="";
+        rs.executeQuery("select * from fnaInvoiceInterface where cid=?",cid);
+        if(rs.next()){
+            userName = Util.null2String(rs.getString("userName"));
+            password = FnaInvoiceCommon.fnaDecrypt(Util.null2String(rs.getString("password")));
+            javaUrl = Util.null2String(rs.getString("javaUrl"));
+        }
+        return getInvoiceUsedNumberInfo(javaUrl+"/"+invoiceCloudUrl.getString("invoiceUsedNumberInfo"),cid,userName,password,userId);
+    }
+
+    /**
+     * 获取发票使用次数接口
+     * @param invoiceUsedNumberInfoUrl
+     * @param cid
+     * @param userName
+     * @param password
+     * @param userId
+     * @return
+     */
+    public static JSONObject getInvoiceUsedNumberInfo(String invoiceUsedNumberInfoUrl,String cid,String userName,String password,int userId){
+        JSONObject jsonObject = new JSONObject();
+        try{
+            JSONObject param = new JSONObject();
+            param.put("cid",cid);
+            param.put("userId",userId);
+            String content = invoiceCloudEncode(param.toString(), password);
+            Map<String, String> map = new HashMap<String, String>();
+            map.put("appkey", userName);
+            //插入日志表fnaInvoiceCloudLog
+            RecordSet rs = new RecordSet();
+            String uuid = FnaCommon.getPrimaryKeyGuid1();
+            rs.executeUpdate("insert into fnaInvoiceCloudLog(uuid,enterTime,requestType,description,interfaceurl,userName,password) values(?,?,?,?,?,?,?)",
+                    uuid,Util.date(2),"OA发送请求","获取发票使用次数",invoiceUsedNumberInfoUrl,userName,password);
+            FnaCommon.updateDbClobOrTextFieldValue("fnaInvoiceCloudLog", "param", param.toString(), "uuid", uuid, "string");
+            FnaCommon.updateDbClobOrTextFieldValue("fnaInvoiceCloudLog", "md5Content",content, "uuid", uuid, "string");
+            String data = postToUrl(invoiceUsedNumberInfoUrl, content, map, "",uuid);
+            jsonObject.put("flag",true);
+            jsonObject.put("data",data);
+        }catch (Exception e){
+            jsonObject.put("flag",false);
+            jsonObject.put("msg",e.getMessage());
+        }
+        return jsonObject;
+    }
+
+    /**
+     * 获取AES加密的key
+     * @param invoiceUsedNumberInfoUrl
+     * @param cid
+     * @param userName
+     * @param password
+     * @param userId
+     * @return
+     */
+    public static JSONObject createAesKey(String createAesKeyUrl,String password,String userName){
+        JSONObject jsonObject = new JSONObject();
+        try{
+
+            String content = invoiceCloudEncode("", password);
+            Map<String, String> map = new HashMap<String, String>();
+            map.put("appkey", userName);
+            //插入日志表fnaInvoiceCloudLog
+            RecordSet rs = new RecordSet();
+            String uuid = FnaCommon.getPrimaryKeyGuid1();
+            rs.executeUpdate("insert into fnaInvoiceCloudLog(uuid,enterTime,requestType,description,interfaceurl,userName,password) values(?,?,?,?,?,?,?)",
+                    uuid,Util.date(2),"OA发送请求","获取AES加密的key",createAesKeyUrl,userName,password);
+            FnaCommon.updateDbClobOrTextFieldValue("fnaInvoiceCloudLog", "md5Content",content, "uuid", uuid, "string");
+            String data = postToUrl(createAesKeyUrl, content, map, "",uuid);
+            jsonObject.put("flag",true);
+            jsonObject.put("data",data);
+        }catch (Exception e){
+            jsonObject.put("flag",false);
+            jsonObject.put("msg",e.getMessage());
+        }
+        return jsonObject;
+    }
+
+    /**
+     * 报销校验
+     * @param reimburseUrl
+     * @param aesKey
+     * @param bodyJson
+     * @param userName
+     * @param password
+     * @param description
+     * @return
+     */
+    public static JSONObject reimburseInvoice(String reimburseUrl,String aesKey ,JSONObject bodyJson ,String userName,String password,String description){
+        JSONObject jsonObject = new JSONObject();
+        try{
+            String bodyStr = InvoiceCloudAESUtil.encrypt(aesKey,bodyJson.toString());
+            String content = invoiceCloudEncode(bodyStr.toString(), password);
+            Map<String, String> map = new HashMap<String, String>();
+            map.put("appkey", userName);
+
+            //插入日志表fnaInvoiceCloudLog
+            RecordSet rs = new RecordSet();
+            String uuid = FnaCommon.getPrimaryKeyGuid1();
+            rs.executeUpdate("insert into fnaInvoiceCloudLog(uuid,enterTime,requestType,description,interfaceurl,userName,password) values(?,?,?,?,?,?,?)",
+                    uuid,Util.date(2),"OA发送请求",description,reimburseUrl,userName,password);
+            FnaCommon.updateDbClobOrTextFieldValue("fnaInvoiceCloudLog", "param", bodyJson.toString(), "uuid", uuid, "string");
+            FnaCommon.updateDbClobOrTextFieldValue("fnaInvoiceCloudLog", "md5Content",content, "uuid", uuid, "string");
+
+            String data = postToUrl(reimburseUrl, content, map, "",uuid,aesKey);
+
+            jsonObject.put("flag",true);
+            jsonObject.put("data",data);
+        }catch (Exception e){
+            jsonObject.put("flag",false);
+            jsonObject.put("msg",e.getMessage());
+        }
+
+        return jsonObject;
+    }
+
+
+    /**
+     * 发票云附件上传
+     * @param imageBytes
+     * @param cid
+     * @param ocrUrl
+     * @param tokenUrl
+     * @param uploadUrl
+     * @param user
+     * @param userName
+     * @param password
+     * @return
+     * @throws Exception
+     */
+    public static JSONArray uploadFileInvoice(byte[] imageBytes, String cid, String ocrUrl,String localCheckUrl,String tokenUrl,String uploadUrl, User user, String userName, String password) throws Exception {
+        JSONArray  uoloadFileArray = new JSONArray();
+
+        //1.先上传图片获取图片id
+        String imageId = getImageId(imageBytes,cid,tokenUrl,uploadUrl,user, userName, password);
+        //2.识别
+        JSONObject param = new JSONObject();
+        param.put("cid", cid);
+        param.put("userId", user.getUID());
+        param.put("image_index", imageId);
+        param.put("operate_type", "0");
+        param.put("is_save", "0");
+        String content = invoiceCloudEncode(param.toString(), password);
+        Map<String, String> map = new HashMap<String, String>();
+        map.put("appkey", userName);
+        //插入日志表fnaInvoiceCloudLog
+        RecordSet rs = new RecordSet();
+        String uuid = FnaCommon.getPrimaryKeyGuid1();
+        rs.executeUpdate("insert into fnaInvoiceCloudLog(uuid,enterTime,requestType,description,interfaceurl,userName,password) values(?,?,?,?,?,?,?)",
+                uuid, Util.date(2), "OA发送请求", "发票识别新-发票云", ocrUrl, userName, password);
+        FnaCommon.updateDbClobOrTextFieldValue("fnaInvoiceCloudLog", "param", param.toString(), "uuid", uuid, "string");
+        FnaCommon.updateDbClobOrTextFieldValue("fnaInvoiceCloudLog", "md5Content", content, "uuid", uuid, "string");
+        String data = postToUrl(ocrUrl, content, map, "", uuid, "check", user,"");
+        JSONObject dataJson = JSONObject.fromObject(data);
+
+        //插入调用记录日志
+        JSONObject jo = new JSONObject();
+        jo.put("status","0");
+        jo.put("returnInfo", dataJson);
+        FnaInvoiceCommon.addFnainvoiceLog("1",imageBytes,"","","","","",
+                jo, user, "OCR","");
+
+        JSONArray infoArrayJson = dataJson.getJSONArray("infos");
+        String open_valid = Util.null2String(getString(dataJson,"open_valid"));
+        int infoArrayJson_len = infoArrayJson.size();
+        if(infoArrayJson_len==0){
+            FnaInvoiceCommon.saveFailLog(user.getUID(), 0, SystemEnv.getHtmlLabelName(509482, user.getLanguage()));//识别结果为空!
+            throw new Exception(SystemEnv.getHtmlLabelName(	509587,user.getLanguage()));
+        }
+        for (int i = 0; i < infoArrayJson_len; i++) {
+            JSONObject uploadFileJson = new JSONObject();
+            JSONObject infoArrayJsonElt = infoArrayJson.getJSONObject(i);
+            String ret = Util.null2String(getString(infoArrayJsonElt,"ret"));
+            JSONObject infoJson = infoArrayJsonElt.getJSONObject("info");
+            JSONObject comm_info = infoJson.getJSONObject("comm_info");
+            JSONObject pro = comm_info.getJSONObject("pro");
+            String type = Util.null2String(getString(infoJson,"type"));
+            String cloudId = Util.null2String(getString(infoJson,"fid"));
+            String invoiceNumber = Util.null2String(getString(infoJson,"number"));
+            if ("0".equals(ret)) {
+                if("1".equals(open_valid) && ("1".equals(type) || "2".equals(type) || "3".equals(type) || "4".equals(type) || "5".equals(type) || "6".equals(type) || "7".equals(type))){//需要查验
+                    JSONObject param1 = new JSONObject();
+                    param1.put("fid", cloudId);
+                    String content1 = invoiceCloudEncode(param1.toString(), password);
+                    Map<String, String> map1 = new HashMap<String, String>();
+                    map1.put("appkey", userName);
+                    String uuid1 = FnaCommon.getPrimaryKeyGuid1();
+                    rs.executeUpdate("insert into fnaInvoiceCloudLog(uuid,enterTime,requestType,description,interfaceurl,userName,password) values(?,?,?,?,?,?,?)",
+                            uuid1, Util.date(2), "OA发送请求", "发票查验新-发票云", localCheckUrl, userName, password);
+                    FnaCommon.updateDbClobOrTextFieldValue("fnaInvoiceCloudLog", "param", param1.toString(), "uuid", uuid1, "string");
+                    FnaCommon.updateDbClobOrTextFieldValue("fnaInvoiceCloudLog", "md5Content", content1, "uuid", uuid1, "string");
+                    try{
+                        String data1 = postToUrl(localCheckUrl, content1, map1, "", uuid1,"check",user,"");
+                        JSONObject dataJson1 = JSONObject.fromObject(data1);
+                        JSONObject infoJson1 = dataJson1.getJSONObject("info");
+                        JSONObject comm_infoJson = infoJson1.getJSONObject("comm_info");
+                        JSONObject proJson = comm_infoJson.getJSONObject("pro");
+                        String status = getString(proJson,"status");//状态
+                        if("2".equals(status)){
+                            //记录错误信息
+                            FnaInvoiceCommon.saveFailLog(user.getUID(), 1, SystemEnv.getHtmlLabelName(509480, user.getLanguage()));
+                            uploadFileJson.put("msg",invoiceNumber+":"+SystemEnv.getHtmlLabelName(509480, user.getLanguage()));
+                            uploadFileJson.put("flag",false);
+                        }else{
+                            uploadFileJson.put("flag",true);
+                        }
+                    }catch (Exception e){
+                        uploadFileJson.put("flag",false);
+                        uploadFileJson.put("msg",invoiceNumber+":"+e.getMessage());
+                    }
+                }else{
+                    uploadFileJson.put("flag",true);
+                }
+                uploadFileJson.put("cloudId",cloudId);
+            }else{
+                uploadFileJson.put("cloudId",cloudId);
+                uploadFileJson.put("msg",Util.null2String(getString(infoArrayJsonElt,"message")));
+                uploadFileJson.put("flag",true);
+            }
+
+            uoloadFileArray.add(uploadFileJson);
+        }
+        return uoloadFileArray;
+    }
+}
diff --git a/src/main/youhong_ai_old_src/weaver/interfaces/workflow/action/DlWfOutPutFileAction.java b/src/main/youhong_ai_old_src/weaver/interfaces/workflow/action/DlWfOutPutFileAction.java
new file mode 100644
index 0000000..2c0fc03
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/interfaces/workflow/action/DlWfOutPutFileAction.java
@@ -0,0 +1,293 @@
+package weaver.interfaces.workflow.action;
+
+import com.alibaba.fastjson.JSONObject;
+import weaver.conn.RecordSet;
+import weaver.file.ImageFileManager;
+import weaver.general.BaseBean;
+import weaver.general.TimeUtil;
+import weaver.general.Util;
+import weaver.interfaces.workflow.action.dloutputfile.runthread.FTPReadFileThread;
+import weaver.interfaces.workflow.action.dloutputfile.util.FTPUtil;
+import weaver.soa.workflow.request.RequestInfo;
+
+import java.io.*;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 文件名称:DlWfOutPutFileAction.java
+ * <p>
+ * 创建日期:2022-01-19 11:29:49
+ * <p>
+ * 创建人员:Zhangyh
+ * <p>
+ * 功能描述:发补流程的附件生成到对应的项目目录下(北京服务器)
+ */
+
+public class DlWfOutPutFileAction extends BaseBean implements Action {
+
+    private String templatePid = Util.null2String(new BaseBean().getPropValue("workflowDocSeccategory", "templatePid"));
+    private String outPutRootDir = Util.null2String(new BaseBean().getPropValue("workflowDocSeccategory", "outPutRootDir"));
+
+    /**
+     * 从输入流中获取字节数组
+     *
+     * @param inputStream
+     * @return
+     * @throws IOException
+     */
+    public static byte[] readInputStream(InputStream inputStream) throws IOException {
+        byte[] buffer = new byte[1024];
+        int len = 0;
+        ByteArrayOutputStream bos = new ByteArrayOutputStream();
+        while ((len = inputStream.read(buffer)) != -1) {
+            bos.write(buffer, 0, len);
+        }
+        bos.close();
+        return bos.toByteArray();
+    }
+
+    @Override
+    public String execute(RequestInfo requestInfo) {
+
+//        StringBuffer host =
+//                new StringBuffer(requestInfo.getRequestManager().getRequest().getScheme())
+//                .append("://").append(requestInfo.getRequestManager().getRequest().getServerName())
+//                .append(":").append(requestInfo.getRequestManager().getRequest().getServerPort())
+//                .append(requestInfo.getRequestManager().getRequest().getContextPath());
+
+        RecordSet rs = new RecordSet();
+        String workflowid = requestInfo.getWorkflowid();
+        String requestid = requestInfo.getRequestid();
+//        String pass = "0";
+
+        String currentdate = TimeUtil.getCurrentDateString();
+        //初始化数据
+        rs.executeQuery(" select tablename from workflow_bill where id = (select formid from workflow_base where id = ?) ", workflowid);
+        rs.writeLog("workflowid=" + workflowid);
+        if (rs.next()) {
+            String tableName = Util.null2String(rs.getString(1));
+            rs.writeLog("tableName=" + tableName);
+            rs.executeQuery(" select xmsb,dlfj,wdwj from " + tableName + " where requestid = ? ", requestid);
+            rs.next();
+            String xmsb = Util.null2String(rs.getString(1));//发补流程关联项目申请流程的requestid
+            String dlfj = Util.null2String(rs.getString(2));//
+            String wdwj = Util.null2String(rs.getString(3));//
+
+            rs.writeLog("xmsb=" + xmsb + ";dlfj=" + dlfj + ";wdwj=" + wdwj);
+            String categoryname = getXmmc(xmsb);
+            rs.writeLog("categoryname=" + categoryname);
+            List<String> docIdsList = new ArrayList<String>();
+
+//            if(!"".equals(dlfj)){
+//        		if(dlfj.indexOf(",")>0){
+//            		String strDlfj[] = dlfj.split(",");
+//            		for (int i = 0; i < strDlfj.length; i++) {
+//            			docIdsList.add(strDlfj[i]);
+//					}
+//        		} else {
+//        			docIdsList.add(dlfj);
+//        		}
+//        	}
+            if (!"".equals(wdwj)) {
+                docIdsList.add(wdwj);
+            }
+
+            rs.executeQuery(" select tb2.wdfj from " + tableName + " tb1 left join " + tableName + "_dt2 tb2 on tb1.id = tb2.mainid " +
+                    " where tb1.requestid =?", requestid);
+            while (rs.next()) {
+                String detailwdfj = Util.null2String(rs.getString(1));
+                if (!"".equals(detailwdfj)) {
+                    if (detailwdfj.indexOf(",") > 0) {
+                        String strWdfj[] = detailwdfj.split(",");
+                        for (int i = 0; i < strWdfj.length; i++) {
+                            docIdsList.add(strWdfj[i]);
+                        }
+                    } else {
+                        docIdsList.add(detailwdfj);
+                    }
+                }
+            }
+
+            //发补附件的文件夹名
+            String dlPath = "DL" + currentdate;
+            File rootPath = new File(outPutRootDir);
+            String targetPath = rootPath + File.separator + categoryname + File.separator + dlPath;
+
+            for (int i = 0; i < docIdsList.size(); i++) {
+                rs.writeLog("docid=" + docIdsList.get(i));
+                rs.executeQuery(" select tb2.imagefileid from docdetail tb1 inner join docimagefile tb2 on tb1.id = tb2.docid " +
+                        " where tb1.id = ?", docIdsList.get(i));
+                while (rs.next()) {
+
+                    String imagefileid = Util.null2String(rs.getString(1));
+                    rs.writeLog("imagefileid=" + imagefileid);
+                    JSONObject fjInfo = getImageFileInfo(imagefileid);
+                    rs.writeLog("fjInfo=" + fjInfo.toJSONString());
+
+                    String location = fjInfo.getString("locaurl");
+                    String imageFileName = fjInfo.getString("docname");
+
+                    unzipFileToPanfu(imagefileid, targetPath, imageFileName);
+                }
+
+//            if(){
+//            	pass = "1";
+//            } else {
+//            	requestInfo.getRequestManager().setMessagecontent("发补流程相关附件传输北京服务器失败,请联系管理员!");
+//            }
+            }
+            /*
+
+            本地文件扫描接入系统 aiyh
+            DlReadFileThread dlReadFileThread = new DlReadFileThread(requestInfo, xmsb, dlPath, targetPath);
+            dlReadFileThread.setName("scanFiles");
+            dlReadFileThread.start();
+            */
+//             ftp文件下载
+           try {
+               FTPReadFileThread ftpReadFileThread = new FTPReadFileThread(requestInfo,xmsb,dlPath,categoryname);
+               ftpReadFileThread.run();
+           }catch (Exception e){
+               FTPUtil.logger.error("异步运行失败！" + FTPUtil.getErrString(e));
+           }
+        }
+        return Action.SUCCESS;
+    }
+
+    public String getXmmc(String requestid) {
+
+        RecordSet rs = new RecordSet();
+        String xmmc = "";
+        String cpmc = "";
+        String workflowid = "";
+        rs.executeQuery(" select requestname,workflowid from workflow_requestbase where requestid = ? ", requestid);
+        rs.next();
+        xmmc = Util.null2String(rs.getString(1));
+        workflowid = Util.null2String(rs.getString(2));
+        rs.executeQuery(" select tablename from workflow_bill where id = (select formid from workflow_base where id = ?) ", workflowid);
+        if (rs.next()) {
+            String tableName = Util.null2String(rs.getString(1));
+            rs.executeQuery(" select cpmc1 from " + tableName + " where requestid = ? ", requestid);
+            rs.next();
+            cpmc = Util.null2String(rs.getString(1));
+        }
+
+        return xmmc + "-" + cpmc + "(" + requestid + ")";
+    }
+
+    /*
+     * 将发补文件在申报项目中项目
+     * @param location
+     * @param fileName
+     * @return
+     */
+    public void unzipFileToPanfu( String fileid, String target, String imageFileName) {
+        BaseBean log = new BaseBean();
+        try {
+            //if (location != null) {
+
+//				File targetpath = new File(target);
+//
+//				if (!targetpath.exists()) {
+//					targetpath.mkdirs();
+//				}
+
+            //ZipUtils.unZip(location, target);
+
+//            String link = host+"/weaver/weaver.file.FileDownload?fileid="+fileid;
+            new BaseBean().writeLog("imageFileId:" + fileid);
+
+            String message = generateFile(Integer.parseInt(fileid), target, imageFileName);
+
+//				String locafilename =  new File(location).getName();
+//
+//				String filename = new File(locafilename).getName().substring(0, locafilename.lastIndexOf("."));
+//				//目标地址+原来的文件名  用来定位解压后的文件地址
+//				String unzipPath = target + targetpath.separator + filename;
+//				File file = new File(unzipPath);
+//				String renamePath = targetpath + file.separator + imageFileName;
+//				//判断文件是否已经存在
+//				if(!new File(renamePath).exists()){
+//
+//					 flag = file.renameTo(new File(renamePath));
+//				}else{
+//
+//					//如果同名文件已经存在，先删除在重建文件
+//					new File(renamePath).delete();
+//
+//					flag = file.renameTo(new File(renamePath));
+//				}
+
+//			} else {
+//				log.writeLog("发补流程的附件路径为空！");
+//			}
+        } catch (Exception e) {
+            log.writeLog(e.getMessage());
+        }
+    }
+
+    /*
+     * 发补文件对应的realpath
+     * @param location
+     * @param fileName
+     * @return
+     */
+    public JSONObject getImageFileInfo(String imagefileid) {
+        RecordSet rs = new RecordSet();
+        JSONObject imagefileJson = new JSONObject();
+        rs.executeQuery(" select imagefilename,filerealpath from imagefile where imagefileid = ? ", imagefileid);
+        if (rs.next()) {
+
+            String docname = Util.null2String(rs.getString(1));
+            String filerealpath = Util.null2String(rs.getString(2));
+
+            imagefileJson.put("docname", docname);
+            imagefileJson.put("locaurl", filerealpath);
+        }
+
+        return imagefileJson;
+    }
+
+    /**
+     * 生成文件至对应文件夹
+     *
+     * @param imageId
+     * @param dir
+     * @param docName
+     * @return
+     * @throws Exception
+     */
+    public String generateFile(int imageId, String dir, String docName) throws Exception {
+//        URL url = new URL(link);
+//        HttpURLConnection conn = (HttpURLConnection)url.openConnection();
+//        设置超时间
+//        conn.setConnectTimeout(10000);
+        //防止屏蔽程序抓取而返回403错误
+        //conn.setRequestProperty("User-Agent", "Mozilla/4.0 (compatible; MSIE 5.0; Windows NT; DigExt)");
+
+        //得到输入流
+//        InputStream inputStream = conn.getInputStream();
+        InputStream inputStream = ImageFileManager.getInputStreamById(imageId);
+        //获取自己数组
+        byte[] getData = readInputStream(inputStream);
+
+        //文件保存位置
+        File saveDir = new File(dir);
+        if (!saveDir.exists()) {
+            saveDir.mkdir();
+        }
+        File file = new File(saveDir + File.separator + docName);
+        FileOutputStream fos = new FileOutputStream(file);
+        fos.write(getData);
+        if (fos != null) {
+            fos.close();
+        }
+
+        if (inputStream != null) {
+            inputStream.close();
+        }
+
+        return "success";
+    }
+}
\ No newline at end of file
diff --git a/src/main/youhong_ai_old_src/weaver/interfaces/workflow/action/dloutputfile/entity/FileInfo.java b/src/main/youhong_ai_old_src/weaver/interfaces/workflow/action/dloutputfile/entity/FileInfo.java
new file mode 100644
index 0000000..b78c663
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/interfaces/workflow/action/dloutputfile/entity/FileInfo.java
@@ -0,0 +1,57 @@
+package weaver.interfaces.workflow.action.dloutputfile.entity;
+
+import weaver.interfaces.workflow.action.dloutputfile.util.FTPUtil;
+
+import java.io.UnsupportedEncodingException;
+
+/**
+ * <p>file info</p>
+ * <p>create 2022/1/24 0024 15:25</p>
+ *
+ * @author EBU7-dev1-ayh
+ */
+
+
+public class FileInfo {
+    private String fileName;
+    private String filePath;
+    private String fileRemotePath;
+
+    public String getFileRemotePath() {
+        return fileRemotePath;
+    }
+
+    public void setFileRemotePath(String fileRemotePath) {
+        this.fileRemotePath = fileRemotePath;
+    }
+
+    public String getFileName() {
+        return fileName;
+    }
+
+    public void setFileName(String fileName) {
+        this.fileName = fileName;
+    }
+
+    public String getFilePath() {
+        return filePath;
+    }
+
+    public void setFilePath(String filePath) {
+        this.filePath = filePath;
+    }
+
+    @Override
+    public String toString() {
+        try {
+            return "FileInfo{" +
+                    "fileName='" + new String(fileName.getBytes(FTPUtil.serverCharset),FTPUtil.localCharset) + '\'' +
+                    ", filePath='" + filePath + '\'' +
+                    ", fileRemotePath='" + fileRemotePath + '\'' +
+                    '}';
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
+        return "编码转换异常！";
+    }
+}
diff --git a/src/main/youhong_ai_old_src/weaver/interfaces/workflow/action/dloutputfile/runthread/DlReadFileThread.java b/src/main/youhong_ai_old_src/weaver/interfaces/workflow/action/dloutputfile/runthread/DlReadFileThread.java
new file mode 100644
index 0000000..3b2cc18
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/interfaces/workflow/action/dloutputfile/runthread/DlReadFileThread.java
@@ -0,0 +1,68 @@
+package weaver.interfaces.workflow.action.dloutputfile.runthread;
+
+import weaver.hrm.User;
+import weaver.interfaces.workflow.action.dloutputfile.entity.FileInfo;
+import weaver.interfaces.workflow.action.dloutputfile.util.DLFileUtil;
+import weaver.soa.workflow.request.RequestInfo;
+
+import java.util.List;
+
+/**
+ * <p>读取文件到ecology</p>
+ * <p>create 2022/1/24 0024 22:01</p>
+ *
+ * @author EBU7-dev1-ayh
+ */
+
+
+public class DlReadFileThread extends Thread{
+
+    private final RequestInfo requestInfo;
+    private final String requestId;
+    private final String dlPath;
+    private final String targetPath;
+
+    /**
+     * 文件处理耗时，通过线程异步执行，防止卡流程
+     * @param requestInfo 请求信息对象
+     * @param requestId requestId
+     * @param dlPath dl文件夹名称
+     * @param targetPath 目标路径
+     */
+    public DlReadFileThread(RequestInfo requestInfo, String requestId, String dlPath, String targetPath){
+        this.requestInfo = requestInfo;
+        this.requestId = requestId;
+        this.dlPath = dlPath;
+        this.targetPath = targetPath;
+    }
+
+    @Override
+    public void start() {
+
+        User user = requestInfo.getRequestManager().getUser();
+        DLFileUtil dlFileUtil = new DLFileUtil();
+        dlFileUtil.getLogger().info(String.format("requestId:{%s},dlPath:{%s},targetPath:{%s}",requestId,dlPath,targetPath));
+        dlFileUtil.getLogger().info("异步执行文件生成!" + user.toString());
+        String parentCategoryId = dlFileUtil.selectCategoryByNameLike("(" + requestId + ")");
+        dlFileUtil.getLogger().info("查询到的父级目录id：" + parentCategoryId);
+        String categoryId = dlFileUtil.createCategory(user, parentCategoryId, dlPath);
+        dlFileUtil.getLogger().info("生成的目录id：" + categoryId);
+        List<FileInfo> fileInfos = dlFileUtil.scanFilesWithRecursion(targetPath);
+        dlFileUtil.getLogger().info("扫描到的文件信息：" + fileInfos);
+        int n = 10;
+        synchronized (this) {
+            while ((fileInfos = dlFileUtil.createFile(fileInfos, user, ",," + categoryId)).size() > 0) {
+                try {
+                    n--;
+                    this.wait(1000  * 15);
+                    if (n <= 0) {
+                        break;
+                    }
+                } catch (InterruptedException e) {
+                    e.printStackTrace();
+                    dlFileUtil.getLogger().error("睡眠失败",e);
+                }
+            }
+        }
+    }
+}
diff --git a/src/main/youhong_ai_old_src/weaver/interfaces/workflow/action/dloutputfile/runthread/FTPReadFileThread.java b/src/main/youhong_ai_old_src/weaver/interfaces/workflow/action/dloutputfile/runthread/FTPReadFileThread.java
new file mode 100644
index 0000000..ebd85f8
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/interfaces/workflow/action/dloutputfile/runthread/FTPReadFileThread.java
@@ -0,0 +1,104 @@
+package weaver.interfaces.workflow.action.dloutputfile.runthread;
+
+import org.apache.commons.net.ftp.FTPClient;
+import org.h2.util.StringUtils;
+import weaver.hrm.User;
+import weaver.interfaces.workflow.action.dloutputfile.entity.FileInfo;
+import weaver.interfaces.workflow.action.dloutputfile.util.FTPUtil;
+import weaver.soa.workflow.request.RequestInfo;
+
+import java.io.IOException;
+import java.util.List;
+
+/**
+ * <p>读ftp文件线程</p>
+ * <p>create 2022/2/28 0028 11:03</p>
+ *
+ * @author EBU7-dev1-ayh
+ */
+
+
+public class FTPReadFileThread implements Runnable {
+
+    private String requestId;
+    private String dlPath;
+    private User user;
+    private String projectPath;
+
+    public FTPReadFileThread(RequestInfo requestInfo, String requestId, String dlPath, String projectPath) {
+        this.requestId = requestId;
+        this.dlPath = dlPath;
+        this.user = requestInfo.getRequestManager().getUser();
+        this.projectPath = projectPath;
+    }
+
+    public FTPReadFileThread(User user, String requestId, String dlPath, String projectPath) {
+        this.requestId = requestId;
+        this.dlPath = dlPath;
+        this.user = user;
+        this.projectPath = projectPath;
+    }
+
+
+    @Override
+    public void run() {
+        FTPUtil ftpUtil = new FTPUtil();
+        FTPClient ftpClient = new FTPClient();
+        boolean init = ftpUtil.init(ftpClient);
+        ftpUtil.getLogger().info(String.format("requestId:{%s},dlPath:{%s},init:{%s},projectPath:{%s}", requestId, dlPath, init, projectPath));
+        String parentCategoryId = ftpUtil.selectCategoryByNameLike("(" + requestId + ")");
+        ftpUtil.getLogger().info("查询到的父级目录id：" + parentCategoryId);
+        String categoryId = ftpUtil.createCategory(user, parentCategoryId, dlPath);
+        ftpUtil.getLogger().info("生成的目录id：" + categoryId);
+        List<FileInfo> fileInfos = null;
+        try {
+            String ftpWorkingDirectory = ftpClient.printWorkingDirectory();
+            if (ftpWorkingDirectory.endsWith("/")) {
+                ftpWorkingDirectory = ftpWorkingDirectory.substring(0, ftpWorkingDirectory.length() - 1);
+            }
+            ftpUtil.getLogger().info("ftp 根目录：" + ftpWorkingDirectory);
+            if (!StringUtils.isNullOrEmpty(ftpUtil.getTargetPath())) {
+                ftpWorkingDirectory = ftpWorkingDirectory + "/" + ftpUtil.getTargetPath().replaceFirst("/", "");
+            }
+            ftpUtil.getLogger().info("ftp项目根目录：" + ftpWorkingDirectory);
+            if (!StringUtils.isNullOrEmpty(projectPath)) {
+                ftpWorkingDirectory = ftpWorkingDirectory.endsWith("/") ?
+                        ftpWorkingDirectory + projectPath.replaceFirst("/", "") :
+                        ftpWorkingDirectory + "/" + projectPath.replaceFirst("/", "");
+            }
+            ftpUtil.getLogger().info("ftp 项目目录：" + ftpWorkingDirectory);
+            ftpWorkingDirectory = ftpWorkingDirectory.endsWith("/") ? ftpWorkingDirectory + dlPath : ftpWorkingDirectory + "/" + dlPath;
+            ftpUtil.getLogger().info("ftp项目路径和dlpath: " + ftpWorkingDirectory);
+            fileInfos = ftpUtil.scanFilePath(ftpClient, ftpWorkingDirectory);
+        } catch (IOException e) {
+            e.printStackTrace();
+            ftpUtil.getLogger().error("获取ftp路径出错");
+        }
+        ftpUtil.getLogger().info("扫描到的文件信息：" + fileInfos);
+        if (fileInfos == null) {
+            ftpUtil.getLogger().error("获取到的文件信息列表为空！");
+            return;
+        }
+        int n = 10;
+        synchronized (this) {
+            while ((fileInfos = ftpUtil.createFileByFtp(fileInfos, user, ",," + categoryId)).size() > 0) {
+                try {
+                    n--;
+                    this.wait(1000 * 15);
+                    if (n <= 0) {
+                        break;
+                    }
+                } catch (InterruptedException e) {
+                    e.printStackTrace();
+                    ftpUtil.getLogger().error("睡眠失败", e);
+                }
+            }
+            try {
+                ftpUtil.disConnection(ftpClient);
+            } catch (IOException e) {
+                FTPUtil.logger.error("关闭连接失败！");
+                e.printStackTrace();
+            }
+        }
+    }
+}
diff --git a/src/main/youhong_ai_old_src/weaver/interfaces/workflow/action/dloutputfile/util/DLFileUtil.java b/src/main/youhong_ai_old_src/weaver/interfaces/workflow/action/dloutputfile/util/DLFileUtil.java
new file mode 100644
index 0000000..1bb8567
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/interfaces/workflow/action/dloutputfile/util/DLFileUtil.java
@@ -0,0 +1,200 @@
+package weaver.interfaces.workflow.action.dloutputfile.util;
+
+import com.engine.doc.cmd.secCategoryList.DocSecCategoryAddCmd;
+import org.apache.axiom.util.base64.Base64Utils;
+import org.apache.commons.io.IOUtils;
+import org.apache.log4j.Logger;
+import weaver.conn.RecordSet;
+import weaver.hrm.User;
+import weaver.hrm.moduledetach.ManageDetachComInfo;
+import weaver.interfaces.workflow.action.dloutputfile.entity.FileInfo;
+import weaver.soa.workflow.FileProcessor;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.*;
+
+/**
+ * <p>工具类</p>
+ * <p>create 2022/1/24 0024 15:26</p>
+ *
+ * @author EBU7-dev1-ayh
+ */
+
+
+public class DLFileUtil {
+    private volatile Logger log = null;
+
+    public  Logger getLogger() {
+        if (log == null) {
+            synchronized (this) {
+                if (log == null) {
+                    String LOGGER_NAME = "cusAYH";
+                    log = org.apache.log4j.Logger.getLogger(LOGGER_NAME);
+                }
+            }
+        }
+        return log;
+    }
+
+    /**
+     * 扫描文件夹下的文件
+     *
+     * @param folderPath 扫描的文件夹
+     * @return 文件信息列表
+     */
+    public List<FileInfo> scanFilesWithRecursion(java.lang.String folderPath) {
+        List<FileInfo> scanFiles = new ArrayList<>();
+        File directory = new File(folderPath);
+        if (!directory.isDirectory()) {
+            throw new RuntimeException("输入的路径不是一个文件夹！ input path is not a folder!");
+        }
+        if (directory.isDirectory()) {
+            File[] fileList = directory.listFiles();
+            Optional.ofNullable(fileList).map(v -> {
+                for (File file : fileList) {
+                    /*如果当前是文件夹，进入递归扫描文件夹*/
+                    if (file.isDirectory()) {
+                        continue;
+                    }
+                    /*非文件夹*/
+                    else {
+                        FileInfo fileInfo = new FileInfo();
+                        fileInfo.setFileName(file.getName());
+                        fileInfo.setFilePath(file.getAbsolutePath());
+                        scanFiles.add(fileInfo);
+                    }
+                }
+                return v;
+            });
+
+        }
+        return scanFiles;
+    }
+
+    /**
+     * 创建目录
+     * @param user 创建者
+     * @param parentId 父级目录id
+     * @param categoryName 目录名
+     * @return 创建后的目录id
+     */
+    public String createCategory(User user,String parentId,String categoryName){
+        if (Objects.isNull(user)){
+            user = new User(1);
+        }
+        RecordSet rs = new RecordSet();
+        String query = "select id from docseccategory where parentid = ? and categoryname = ?";
+        rs.executeQuery(query,parentId,categoryName);
+        if(rs.next()){
+            return rs.getString("id");
+        }
+        Map<String,Object> createMap = new HashMap<>(4);
+        createMap.put("parentid",parentId);
+        createMap.put("categoryname",categoryName);
+        createMap.put("subcompanyid",String.valueOf(user.getUserSubCompany1()));
+        createMap.put("extendParentAttr","1");
+        getLogger().error(createMap.toString());
+        DocSecCategoryAddCmd docSecCategoryAddcCmd = new DocSecCategoryAddCmd(createMap, user);
+        Map execute = docSecCategoryAddcCmd.execute(null);
+        ManageDetachComInfo manageDetachComInfo = new ManageDetachComInfo();
+        manageDetachComInfo.removeManageDetachCache();
+        getLogger().info(execute.toString());
+        if(Boolean.parseBoolean(String.valueOf(execute.get("api_status")))){
+            return String.valueOf(execute.get("id"));
+        }
+        user = new User(1);
+        docSecCategoryAddcCmd = new DocSecCategoryAddCmd(createMap, user);
+        execute = docSecCategoryAddcCmd.execute(null);
+        manageDetachComInfo = new ManageDetachComInfo();
+        manageDetachComInfo.removeManageDetachCache();
+        getLogger().info(execute.toString());
+        if(Boolean.parseBoolean(String.valueOf(execute.get("api_status")))){
+            return String.valueOf(execute.get("id"));
+        }
+        getLogger().error("创建目录失败；create category err!");
+        return null;
+    }
+
+    /**
+     * 根据name来查询目录id
+     * @param nameLike 需要查询的名字
+     * @return 查询到的目录id
+     */
+    public String selectCategoryByNameLike(String nameLike) {
+        RecordSet rs = new RecordSet();
+        String query = "select id from docseccategory where categoryname like '%" + nameLike + "%'";
+        rs.executeQuery(query);
+        if (rs.next()) {
+            return rs.getString("id");
+        } else {
+            return null;
+        }
+    }
+
+    /**
+     * 查询是否存在文件
+     * @param categoryIds 目录id
+     * @param fileName 文件名
+     * @return 是否存在文件
+     */
+    public boolean existFile(String categoryIds,String fileName){
+        RecordSet rs = new RecordSet();
+        String[] categoryArr = categoryIds.split(",");
+        String categoryId = categoryArr[2];
+        String query = "select dd.id from docimagefile df " +
+                "left join docdetail dd on df.docid = dd.id " +
+                "where dd.seccategory = ? and df.imagefilename = ?";
+        rs.executeQuery(query,categoryId,fileName);
+        if(rs.next()){
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * 创建 系统文件
+     * @param fileInfoList 文件信息列表
+     * @param user 用户
+     * @param docCategorys 文档目录id
+     * @return 创建失败后的系统文件信息
+     */
+    public List<FileInfo> createFile(List<FileInfo> fileInfoList, User user, String docCategorys) {
+        FileProcessor fileProcessor = new FileProcessor();
+        RecordSet rs = new RecordSet();
+        List<FileInfo> errList = new ArrayList<>(fileInfoList.size());
+        for (FileInfo fileInfo : fileInfoList) {
+            if(existFile(docCategorys,fileInfo.getFileName())){
+                continue;
+            }
+            byte[] bytes;
+            try {
+                InputStream inputStream = new FileInputStream(fileInfo.getFilePath());
+                bytes = IOUtils.toByteArray(inputStream);
+                String base64 = Base64Utils.encode(bytes);
+                int docId = fileProcessor.Process("base64:" + base64, docCategorys, user, fileInfo.getFileName());
+                getLogger().info("生成文件Id：" + docId);
+                if (docId <= 0) {
+                    errList.add(fileInfo);
+                }else{
+                    String query = "select imagefileid from docimagefile where docid = ?";
+                    rs.executeQuery(query,docId);
+                    if(rs.next()){
+                        String fileId = rs.getString("imagefileid");
+                        String update = "update imagefile set imagefilename = ? where imagefileid = ?";
+                        rs.executeUpdate(update,fileInfo.getFileName(),fileId);
+                    }
+                }
+            } catch (IOException e) {
+                errList.add(fileInfo);
+                this.getLogger().error(fileInfo,e);
+            }
+        }
+
+        return errList;
+    }
+
+
+}
diff --git a/src/main/youhong_ai_old_src/weaver/interfaces/workflow/action/dloutputfile/util/FTPUtil.java b/src/main/youhong_ai_old_src/weaver/interfaces/workflow/action/dloutputfile/util/FTPUtil.java
new file mode 100644
index 0000000..acc6955
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/interfaces/workflow/action/dloutputfile/util/FTPUtil.java
@@ -0,0 +1,356 @@
+package weaver.interfaces.workflow.action.dloutputfile.util;
+
+import com.engine.doc.cmd.secCategoryList.DocSecCategoryAddCmd;
+import org.apache.axiom.util.base64.Base64Utils;
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.net.ftp.FTPClient;
+import org.apache.commons.net.ftp.FTPFile;
+import org.apache.commons.net.ftp.FTPReply;
+import org.apache.log4j.Logger;
+import weaver.conn.RecordSet;
+import weaver.docs.share.DocShareUtil;
+import weaver.general.BaseBean;
+import weaver.general.Util;
+import weaver.hrm.User;
+import weaver.hrm.moduledetach.ManageDetachComInfo;
+import weaver.interfaces.workflow.action.dloutputfile.entity.FileInfo;
+import weaver.soa.workflow.FileProcessor;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.net.SocketException;
+import java.util.*;
+
+/**
+ * <p>ftp下载文件工具</p>
+ * <p>create 2022/2/24 0024 14:10</p>
+ *
+ * @author EBU7-dev1-ayh
+ */
+
+
+public class FTPUtil {
+    public static final Logger logger = new DLFileUtil().getLogger();
+    private static final int BUFFER_SIZE = 1024 * 1024 * 4;
+    private static final BaseBean baseBean = new BaseBean();
+    private static final String ftpUserName = Util.null2String(baseBean.getPropValue("workflowDocSeccategory", "ftp_user_name"));
+    private static final String ftpPassword = Util.null2String(baseBean.getPropValue("workflowDocSeccategory", "ftp_password"));
+    private static final String ftpHost = Util.null2String(baseBean.getPropValue("workflowDocSeccategory", "ftp_host"));
+    private static final String ftpPort = Util.null2String(baseBean.getPropValue("workflowDocSeccategory", "ftp_port"));
+    private static final String targetPath = Util.null2String(baseBean.getPropValue("workflowDocSeccategory", "ftp_targetPath"));
+    /**
+     * UTF-8字符编码
+     **/
+    private static final String CHARSET_UTF8 = "UTF-8";
+    /**
+     * OPTS UTF8字符串常量
+     **/
+    private static final String OPTS_UTF8 = "OPTS UTF8";
+    /**
+     * 本地字符编码
+     */
+    private static String LOCAL_CHARSET = "GBK";
+    /**
+     * 本地字符编码
+     **/
+    public static String localCharset = "GBK";
+    /**
+     * FTP协议里面，规定文件名编码为iso-8859-1
+     **/
+    public static String serverCharset = "ISO-8859-1";
+    /**
+     * FTPClient对象
+     **/
+    private static FTPClient ftp_client = null;
+
+    /**
+     * 登陆FTP服务器
+     *
+     * @param ftp
+     * @param host     FTPServer IP地址
+     * @param port     FTPServer 端口
+     * @param username FTPServer 登陆用户名
+     * @param password FTPServer 登陆密码
+     * @return 是否登录成功
+     */
+    public static boolean login(FTPClient ftp, String host, int port, String username, String password) {
+        try {
+            ftp.connect(host, port);
+            if (FTPReply.isPositiveCompletion(ftp.getReplyCode())) {
+                if (ftp.login(username, password)) {
+                    ftp.setFileType(FTPClient.BINARY_FILE_TYPE);
+                    ftp.setBufferSize(BUFFER_SIZE);
+                    ftp.enterLocalActiveMode();
+                    return true;
+                }
+            }
+            if (ftp.isConnected()) {
+                ftp.disconnect();
+            }
+        } catch (SocketException e) {
+            logger.error("ftp连接失败，请检查ftp IP地址！ " + ftpHost);
+            return false;
+        } catch (IOException e) {
+            logger.error("ftp登录失败，请检查ftp 端口： " + ftpPort + ", name :" + ftpUserName + "， ftp密码： " + ftpPassword);
+            return false;
+        }
+        return false;
+    }
+
+    /**
+     * FTP服务器路径编码转换
+     *
+     * @param ftpPath FTP服务器路径
+     * @return String
+     */
+    private static String changeEncoding(String ftpPath) {
+        String directory = null;
+        try {
+            if (FTPReply.isPositiveCompletion(ftp_client.sendCommand(OPTS_UTF8, "ON"))) {
+                localCharset = CHARSET_UTF8;
+            }
+            directory = new String(ftpPath.getBytes(localCharset), serverCharset);
+        } catch (Exception e) {
+            logger.error("路径编码转换失败", e);
+        }
+        return directory;
+    }
+
+    /**
+     * 关闭数据链接
+     *
+     * @param ftp
+     * @throws IOException
+     */
+    public void disConnection(FTPClient ftp) throws IOException {
+        if (ftp.isConnected()) {
+            ftp.disconnect();
+        }
+    }
+
+    public Logger getLogger() {
+        return logger;
+    }
+
+    /**
+     * 初始化FtpClient
+     *
+     * @param ftpClient ftp连接对象
+     * @return 是否连接成功
+     */
+    public boolean init(FTPClient ftpClient) {
+        ftp_client = ftpClient;
+        return FTPUtil.login(ftpClient, ftpHost, Integer.parseInt(ftpPort), ftpUserName, ftpPassword);
+    }
+
+    /**
+     * 创建目录
+     *
+     * @param user         创建者
+     * @param parentId     父级目录id
+     * @param categoryName 目录名
+     * @return 创建后的目录id
+     */
+    public String createCategory(User user, String parentId, String categoryName) {
+        if (Objects.isNull(user)) {
+            user = new User(1);
+        }
+        RecordSet rs = new RecordSet();
+        String query = "select id from docseccategory where parentid = ? and categoryname = ?";
+        rs.executeQuery(query, parentId, categoryName);
+        if (rs.next()) {
+            return rs.getString("id");
+        }
+        Map<String, Object> createMap = new HashMap<>(4);
+        createMap.put("parentid", parentId);
+        createMap.put("categoryname", categoryName);
+        createMap.put("subcompanyid", String.valueOf(user.getUserSubCompany1()));
+        createMap.put("extendParentAttr", "1");
+        logger.error(createMap.toString());
+        DocSecCategoryAddCmd docSecCategoryAddcCmd = new DocSecCategoryAddCmd(createMap, user);
+        Map execute = docSecCategoryAddcCmd.execute(null);
+        ManageDetachComInfo manageDetachComInfo = new ManageDetachComInfo();
+        manageDetachComInfo.removeManageDetachCache();
+        logger.info(execute.toString());
+        if (Boolean.parseBoolean(String.valueOf(execute.get("api_status")))) {
+            return String.valueOf(execute.get("id"));
+        }
+        user = new User(1);
+        docSecCategoryAddcCmd = new DocSecCategoryAddCmd(createMap, user);
+        execute = docSecCategoryAddcCmd.execute(null);
+        manageDetachComInfo = new ManageDetachComInfo();
+        manageDetachComInfo.removeManageDetachCache();
+        logger.info(execute.toString());
+        if (Boolean.parseBoolean(String.valueOf(execute.get("api_status")))) {
+            return String.valueOf(execute.get("id"));
+        }
+        logger.error("创建目录失败；create category err!");
+        return null;
+    }
+
+
+    /**
+     * 根据name来查询目录id
+     *
+     * @param nameLike 需要查询的名字
+     * @return 查询到的目录id
+     */
+    public String selectCategoryByNameLike(String nameLike) {
+        RecordSet rs = new RecordSet();
+        String query = "select id from docseccategory where categoryname like '%" + nameLike + "%'";
+        rs.executeQuery(query);
+        if (rs.next()) {
+            return rs.getString("id");
+        } else {
+            return null;
+        }
+    }
+
+
+    /**
+     * 查询是否存在文件
+     *
+     * @param categoryIds 目录id
+     * @param fileName    文件名
+     * @return 是否存在文件
+     */
+    public int existFile(String categoryIds, String fileName) {
+        RecordSet rs = new RecordSet();
+        String[] categoryArr = categoryIds.split(",");
+        String categoryId = categoryArr[2];
+        String query = "select dd.id,df.imagefileid from docimagefile df " +
+                "left join docdetail dd on df.docid = dd.id " +
+                "where dd.seccategory = ? and df.imagefilename = ?";
+        rs.executeQuery(query, categoryId, fileName);
+        if (rs.next()) {
+            return Integer.parseInt(rs.getString("imagefileid"));
+        }
+        return 0;
+    }
+
+
+    /**
+     * 通过ftp下载并生成文件
+     * 2
+     *
+     * @param fileInfoList 文件信息列表
+     * @param user         用户对象
+     * @param docCategorys 文件目录id
+     * @return 未生成或 生成错误的文件信息
+     */
+    public List<FileInfo> createFileByFtp(List<FileInfo> fileInfoList, User user, String docCategorys) {
+        FileProcessor fileProcessor = new FileProcessor();
+        RecordSet rs = new RecordSet();
+        List<FileInfo> errList = new ArrayList<>(fileInfoList.size());
+        for (FileInfo fileInfo : fileInfoList) {
+            try {
+                String fileName = new String(fileInfo.getFileName().getBytes(serverCharset), localCharset);
+                byte[] bytes;
+                boolean b = ftp_client.changeWorkingDirectory(new String(fileInfo.getFileRemotePath().getBytes(localCharset),serverCharset));
+                if (!b) {
+                    logger.error("ftp路径切换失败：" + fileInfo.getFileRemotePath());
+                    errList.add(fileInfo);
+                    continue;
+                }
+//                开启端口来传输文件
+                ftp_client.enterLocalPassiveMode();
+                logger.info("路径："+ ftp_client.printWorkingDirectory() + ", 文件： " + fileName + " , " + fileInfo.getFileName());
+//                获取文件流
+                InputStream inputStream = ftp_client.retrieveFileStream(fileInfo.getFileName());
+                if(inputStream == null){
+                    logger.error("获取文件的输入流为空！" + fileName);
+                    return new ArrayList<>(0);
+                }
+                bytes = IOUtils.toByteArray(inputStream);
+                String base64 = Base64Utils.encode(bytes);
+                int docId = fileProcessor.Process("base64:" + base64, docCategorys, user, fileName);
+                inputStream.close();
+                ftp_client.completePendingCommand();
+                logger.info("生成文件Id：" + docId);
+                if (docId <= 0) {
+                    errList.add(fileInfo);
+                } else {
+                    String query = "select imagefileid from docimagefile where docid = ?";
+                    rs.executeQuery(query, docId);
+                    if (rs.next()) {
+                        String fileId = rs.getString("imagefileid");
+                        int oldFileId = existFile(docCategorys,fileName);
+                        if (oldFileId != 0) {
+                            String update = "update docimagefile set imagefileid = ? where docid = ?";
+                            rs.executeUpdate(update,fileId,oldFileId);
+                            String delete = "delete from docdetail where id = ?";
+                            rs.executeUpdate(delete,docId);
+                        }
+                        String update = "update imagefile set imagefilename = ? where imagefileid = ?";
+                        rs.executeUpdate(update, fileName, fileId);
+                    }
+                }
+            } catch (IOException e) {
+                errList.add(fileInfo);
+                logger.error("生成文件错误，下载文件错误：" + getErrString(e));
+                logger.error(fileInfo, e);
+            }catch (Exception e){
+                logger.error("出现异常，异常失败信息: " + getErrString(e));
+            }
+        }
+        return errList;
+    }
+
+    /**
+     * 扫描ftp文件信息
+     *
+     * @param ftp        ftp连接对象
+     * @param remotePath ftp文件扫描路径
+     * @return 扫描完成后的数据
+     * @throws IOException
+     */
+    public List<FileInfo> scanFilePath(FTPClient ftp, String remotePath) throws IOException {
+        List<FileInfo> list = new ArrayList<>();
+        boolean changeFlag = ftp.changeWorkingDirectory(changeEncoding(remotePath));
+
+        if (changeFlag) {
+//            路径切换成功
+            FTPFile[] ftpFiles = ftp.listFiles();
+            for (FTPFile ftpFile : ftpFiles) {
+                if (ftpFile.isDirectory()) {
+                    List<FileInfo> pathList = scanFilePath(ftp, remotePath + "/" + ftpFile.getName());
+                    list.addAll(pathList);
+                    continue;
+                }
+                if (ftpFile.isFile()) {
+                    FileInfo fileInfo = new FileInfo();
+                    fileInfo.setFileRemotePath(remotePath);
+                    fileInfo.setFileName(ftpFile.getName());
+                    list.add(fileInfo);
+                }
+            }
+        } else {
+            logger.info("路径切换失败: " + changeEncoding(remotePath));
+        }
+        return list;
+    }
+
+    public String getTargetPath() {
+        return targetPath;
+    }
+    /**
+     * 获取完整的错误信息
+     *
+     * @param throwable 异常
+     * @return 完整堆栈信息
+     */
+    public static String getErrString(Throwable throwable) {
+        StringWriter stringWriter = new StringWriter();
+        throwable.printStackTrace(new PrintWriter(stringWriter, true));
+        String errStr = stringWriter.getBuffer().toString();
+        try {
+            stringWriter.close();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return errStr;
+    }
+
+}
diff --git a/src/main/youhong_ai_old_src/weaver/jt/action/ContractCallBackAction.java b/src/main/youhong_ai_old_src/weaver/jt/action/ContractCallBackAction.java
new file mode 100644
index 0000000..fb5c35d
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/jt/action/ContractCallBackAction.java
@@ -0,0 +1,73 @@
+package weaver.jt.action;
+
+import com.alibaba.fastjson.JSON;
+import lombok.Setter;
+import weaver.conn.RecordSet;
+import weaver.general.Util;
+import weaver.interfaces.workflow.action.Action;
+import weaver.jt.cmd.JtContractCmd;
+import weaver.jt.util.JtRequestUtil;
+import weaver.soa.workflow.request.RequestInfo;
+import weaver.xiao.commons.config.entity.RequestMappingConfig;
+import weaver.xiao.commons.config.service.DealWithMapping;
+import weaver.xiao.commons.exception.RequestException;
+import weaver.xiao.commons.utils.LogUtil;
+import weaver.zwl.common.ToolUtil;
+
+import java.util.Map;
+
+
+/**
+ * @author XiaoBokang
+ * @create 2022/7/6 9:08
+ */
+
+@Setter
+public class ContractCallBackAction extends ToolUtil implements Action {
+
+    private final String CLASS_NAME = "ContractCallBackAction";
+    private final DealWithMapping dealWithMapping = new DealWithMapping();
+    private final JtContractCmd jtContractCmd = new JtContractCmd();
+    private final JtRequestUtil jtRequestUtil = new JtRequestUtil();
+
+    /** 合同回调接口唯一标识 */
+    private String contractRequestUniqueCode;
+
+    @Override
+    public String execute(RequestInfo requestInfo) {
+        this.writeDebuggerLog(CLASS_NAME,"--------------"+CLASS_NAME+" Begin-----------------");
+        //获取流程RequestId
+        String requestId = Util.null2String(requestInfo.getRequestid());
+        String tableName = requestInfo.getRequestManager().getBillTableName();//表单名称
+        this.writeDebuggerLog(CLASS_NAME,"[tableName:" + tableName + "],[requestId:"+requestId+"],[contractRequestUniqueCode:"+contractRequestUniqueCode+"]");
+        try {
+            RecordSet workflowMessage = jtContractCmd.getWorkflowMessage(tableName, requestId);
+            if(workflowMessage.next()){
+                dealWithMapping.setMainTable(tableName);
+                RequestMappingConfig requestMappingConfig = dealWithMapping.treeDealWithUniqueCode(contractRequestUniqueCode);
+                Map<String, Object> requestParam = dealWithMapping.getRequestParam(workflowMessage, requestMappingConfig);
+                Map<String, Object> res = jtRequestUtil.contractRenewal(requestMappingConfig.getRequestUrl(), requestParam);
+                this.writeDebuggerLog("合同回调接口调用结果 ==>"+JSON.toJSONString(res));
+                boolean isSuccess = (boolean) res.get("succ");
+                if(!isSuccess){
+                    throw new RequestException("合同回调接口调用失败 ==>"+res.get("msg"));
+                }
+                Map<String,Object> data = (Map<String, Object>) res.get("data");
+                int resultCode = Util.getIntValue(String.valueOf(data.get("RESULTCODE"))) ;
+                String resultMsg = Util.null2String(data.get("RESULTMSG"));
+                if(resultCode != 1){
+                    throw new RequestException("合同回调接口调用失败 ==>"+resultMsg);
+                }
+            }
+        }catch (Exception e){
+            this.writeDebuggerLog("action执行异常：");
+            String exceptionStr = LogUtil.getExceptionStr(e);
+            this.writeDebuggerLog("异常信息："+exceptionStr);
+            requestInfo.getRequestManager().setMessageid("11111C " + requestId + " 22222");
+            requestInfo.getRequestManager().setMessagecontent(e.getMessage());
+            return Action.FAILURE_AND_CONTINUE;
+        }
+        this.writeDebuggerLog(CLASS_NAME,"--------------"+CLASS_NAME+" end-----------------");
+        return Action.SUCCESS;
+    }
+}
diff --git a/src/main/youhong_ai_old_src/weaver/jt/cmd/JtContractCmd.java b/src/main/youhong_ai_old_src/weaver/jt/cmd/JtContractCmd.java
new file mode 100644
index 0000000..7a91d08
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/jt/cmd/JtContractCmd.java
@@ -0,0 +1,46 @@
+package weaver.jt.cmd;
+
+import aiyh.utils.Util;
+import weaver.conn.RecordSet;
+import weaver.zwl.common.ToolUtil;
+
+/**
+ * @author XiaoBokang
+ * @create 2022/6/30 16:30
+ */
+
+public class JtContractCmd extends ToolUtil {
+
+    /**
+     * 查询是否已经存在合同信息
+     * @param tableName 表名
+     * @param uniqueField 唯一值字段
+     * @param uniqueValue 唯一值
+     * @return
+     */
+    public String queryContract(String tableName,String uniqueField,String uniqueValue){
+        String mainId = "";
+        RecordSet recordSet = new RecordSet();
+        String querySql = "select id from "+tableName+" where "+uniqueField+" = ?";
+        recordSet.executeQuery(querySql,uniqueValue);
+        if(recordSet.next()){
+            mainId = Util.null2String(recordSet.getString("id"));
+        }
+        return mainId;
+    }
+
+    /**
+     * 查询流程基本信息
+     * @param tableName 流程主表名
+     * @param requestId 请求id
+     * @return
+     */
+    public RecordSet getWorkflowMessage(String tableName, String requestId) {
+        String querySql = "select * from " + tableName + " where requestId = ?";
+        RecordSet recordSet = new RecordSet();
+        this.writeDebuggerLog("执行查询的sql>>>" + querySql + " requestId>>>" + requestId);
+        recordSet.executeQuery(querySql, requestId);
+        return recordSet;
+    }
+
+}
diff --git a/src/main/youhong_ai_old_src/weaver/jt/entity/ContractEntity.java b/src/main/youhong_ai_old_src/weaver/jt/entity/ContractEntity.java
new file mode 100644
index 0000000..db81247
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/jt/entity/ContractEntity.java
@@ -0,0 +1,76 @@
+package weaver.jt.entity;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import lombok.Data;
+
+/**
+ * 合同信息实体类
+ * @author XiaoBokang
+ * @create 2022/6/30 10:09
+ */
+
+@Data
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class ContractEntity {
+
+    /** 主键id */
+    private Integer id;
+
+    /** 人员隶属全路径 */
+    private String orgPath;
+
+    /** 语言编码 */
+    private String languageCd;
+
+    /** 员工ID */
+    private String employeeCode;
+
+    /** 合同编号 */
+    private String contractCode;
+
+    /** 签订方式 */
+    private String contractSignWay;
+
+    /** 生效日期 */
+    private String contractEffectDate;
+
+    /** 合同状态 */
+    private String contractStatus;
+
+    /** 签订类型 */
+    private String contractSignType;
+
+    /** 合同开始日期 */
+    private String contractBeginDate;
+
+    /** 合同结束日期 */
+    private String contractEndDate;
+
+    /** 合同主体 */
+    private String contractLegalEntity;
+
+    /** 合同类型 */
+    private String countryCode;
+
+    /** 合同子类 */
+    private String contractSubType;
+
+    /** 电子合同链接 */
+    private String electronicContractLink;
+
+    /** 合同工作 国家 */
+    private String contractCountry;
+
+    /** 合同工作 州/省 */
+    private String contractState;
+
+    /** 合同工作 城市 */
+    private String contractCity;
+
+    /** 合同工作 区 */
+    private String contractWorkAddress;
+
+    /** 状态码 */
+    private String status;
+
+}
diff --git a/src/main/youhong_ai_old_src/weaver/jt/entity/ContractResponseVO.java b/src/main/youhong_ai_old_src/weaver/jt/entity/ContractResponseVO.java
new file mode 100644
index 0000000..462da85
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/jt/entity/ContractResponseVO.java
@@ -0,0 +1,30 @@
+package weaver.jt.entity;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import lombok.Data;
+
+/**
+ * @author XiaoBokang
+ * @create 2022/6/30 10:06
+ */
+
+@Data
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class ContractResponseVO {
+
+    /** 状态码 */
+    private Integer code;
+
+    /** 提示信息 */
+    private String msg;
+
+    /** 是否失败 */
+    private Boolean fail;
+
+    /** 是否成功 */
+    private Boolean succ;
+
+    /** 返回具体数据 */
+    private ResponseData data;
+
+}
diff --git a/src/main/youhong_ai_old_src/weaver/jt/entity/ResponseData.java b/src/main/youhong_ai_old_src/weaver/jt/entity/ResponseData.java
new file mode 100644
index 0000000..407699c
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/jt/entity/ResponseData.java
@@ -0,0 +1,30 @@
+package weaver.jt.entity;
+
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author XiaoBokang
+ * @create 2022/6/30 10:08
+ */
+
+@Data
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class ResponseData {
+
+    /** 总页数 */
+    private Integer maxPoint;
+
+    /** 分页大小 */
+    private Integer size;
+
+    /** 是否存在下一页 */
+    private Boolean hasNextPage;
+
+    /** 合同信息数据 */
+    private List<ContractEntity>records;
+
+}
diff --git a/src/main/youhong_ai_old_src/weaver/jt/schedule/SyncContractCronJob.java b/src/main/youhong_ai_old_src/weaver/jt/schedule/SyncContractCronJob.java
new file mode 100644
index 0000000..3698b16
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/jt/schedule/SyncContractCronJob.java
@@ -0,0 +1,68 @@
+package weaver.jt.schedule;
+
+import aiyh.utils.Util;
+import aiyh.utils.apirequest.core.typehandler.apiasync.CustomerValueMapperBean;
+import aiyh.utils.apirequest.service.ApiAsyncService;
+import lombok.Setter;
+import weaver.interfaces.schedule.BaseCronJob;
+import weaver.jt.util.JtRequestUtil;
+import weaver.xiao.commons.utils.LogUtil;
+import weaver.zwl.common.ToolUtil;
+
+
+/**
+ * @author XiaoBokang
+ * @create 2022/6/30 8:22
+ */
+
+public class SyncContractCronJob extends BaseCronJob {
+
+    /** 同步标识 */
+    @Setter
+    private String onlyMark;
+
+    /** 分页大小 */
+    @Setter
+    private String pageSize;
+
+    /** 唯一标识字段名 */
+    @Setter
+    private String uniqueField;
+
+    /** 建模模块id */
+    @Setter
+    private String modeId;
+
+    /** 同步日期 */
+    @Setter
+    private String updateTime;
+
+    /** 时间格式化字符串 */
+    @Setter
+    private String formatString = "yyyy-MM-dd HH:mm:ss";
+
+    private final JtRequestUtil jtRequestUtil = new JtRequestUtil();
+    private final ToolUtil toolUtil = new ToolUtil();
+
+    @Override
+    public void execute() {
+        try {
+            toolUtil.writeDebuggerLog("==================== SyncContractCronJob begin ==================");
+            toolUtil.writeDebuggerLog(" 参数信息:onlyMark ==>"+onlyMark+" pageSize==>"+pageSize+" uniqueField==>"+uniqueField+" updateTime==>"+updateTime);
+            jtRequestUtil.init();
+            jtRequestUtil.setPageSize(Util.getIntValue(pageSize,200));
+            jtRequestUtil.setUniqueField(Util.null2DefaultStr(uniqueField,"htbh"));
+            jtRequestUtil.setUpdateTime(updateTime);
+            jtRequestUtil.setModeId(modeId);
+            jtRequestUtil.setFormatString(formatString);
+            CustomerValueMapperBean.setBean(jtRequestUtil);
+            ApiAsyncService apiAsyncService = new ApiAsyncService(jtRequestUtil);
+            apiAsyncService.asyncByOnlyMark(onlyMark);
+        }catch (Exception e){
+            String exceptionStr = LogUtil.getExceptionStr(e);
+            toolUtil.writeDebuggerLog("同步发生异常==>"+exceptionStr);
+        }
+        toolUtil.writeDebuggerLog("==================== SyncContractCronJob end ==================");
+    }
+
+}
diff --git a/src/main/youhong_ai_old_src/weaver/jt/util/JtRequestUtil.java b/src/main/youhong_ai_old_src/weaver/jt/util/JtRequestUtil.java
new file mode 100644
index 0000000..07a5d78
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/jt/util/JtRequestUtil.java
@@ -0,0 +1,270 @@
+package weaver.jt.util;
+
+import aiyh.utils.Util;
+import aiyh.utils.apirequest.core.typehandler.ApiAsyncCustomerValueHandler;
+import aiyh.utils.apirequest.entity.ApiAsyncMain;
+import aiyh.utils.apirequest.entity.ApiResultInfo;
+import aiyh.utils.apirequest.interceptor.ApiAsyncInterceptor;
+import com.alibaba.fastjson.JSON;
+import lombok.Setter;
+import weaver.conn.RecordSet;
+import weaver.general.TimeUtil;
+import weaver.jt.cmd.JtContractCmd;
+import weaver.xiao.commons.exception.RequestException;
+import weaver.xiao.commons.utils.PropUtil;
+import weaver.xiao.commons.utils.RequestBaseInfo;
+import weaver.xiao.commons.utils.RequestUtil;
+import weaver.xiao.commons.utils.SqlUtil;
+import weaver.zwl.common.ToolUtil;
+
+import java.nio.charset.StandardCharsets;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+/**
+ * @author XiaoBokang
+ * @create 2022/6/30 8:50
+ */
+
+public class JtRequestUtil implements ApiAsyncInterceptor, ApiAsyncCustomerValueHandler {
+
+    /** token字符串 */
+    private String tokenStr;
+
+    /** 获取合同请求地址 */
+    private String getContractUrl;
+
+    /** 插入表名 */
+    private String tableName;
+
+    /** 建模模块id */
+    @Setter
+    private String modeId;
+
+    /** 唯一值字段 */
+    @Setter
+    private String uniqueField;
+
+    /** 分页大小 */
+    @Setter
+    private Integer pageSize;
+
+    /** 同步日期 */
+    @Setter
+    private String updateTime;
+
+    /** 时间格式化字符串 */
+    @Setter
+    private String formatString;
+
+    private Integer point;
+
+    /** 人员白名单 */
+    private final Map<String,Object> personnelWhiteList = new HashMap<>();
+
+    /** 路径过滤 */
+    private final HashSet<String> pathSet = new HashSet<>();
+
+    private final JtContractCmd jtContractCmd = new JtContractCmd();
+    private final SqlUtil sqlUtil = new SqlUtil();
+    private final ToolUtil toolUtil = new ToolUtil();
+
+    /**
+     * 重新获取token
+     */
+    public void reSetToken(){
+        this.getToken();
+    }
+
+    /**
+     * 重新获取token，初始化不触发黑名单，人员白名单
+     */
+    public void init(){
+        this.getToken();
+        this.point = 0;
+        setPathSet();
+        setPersonnelWhiteList();
+    }
+
+    /**
+     * 通过配置文件获取token信息及获取合同的请求地址
+     * @return token字符串
+     */
+    private void getToken(){
+        Map<String, Object> accountMap = PropUtil.getProperties2Map("jt_getToken");
+        assert accountMap != null;
+        String userName = Util.null2String(accountMap.get("userName"));
+        String password = Util.null2String(accountMap.get("password"));
+        String secretKey = Util.null2String(accountMap.get("secretKey"));
+        String systemCode = Util.null2String(accountMap.get("systemCode"));
+        String getTokenUrl = Util.null2String(accountMap.get("getTokenUrl"));
+        String currentDateStr = TimeUtil.getCurrentDateString();
+        currentDateStr = currentDateStr.replace("-","");
+        String encryptionKey = this.string2MD5(userName +":"+ password +":"+ currentDateStr +":"+ secretKey);
+        Map<String,String> header = new HashMap<>();
+        header.put("Content-Type","application/json");
+        Map<String,Object> param = new HashMap<>();
+        param.put("userName",userName);
+        param.put("password",password);
+        param.put("systemCode",systemCode);
+        param.put("encryptionKey",encryptionKey);
+        Map<String,Object> res = RequestUtil.apiRequest(RequestBaseInfo.create(
+                "POST",
+                getTokenUrl,
+                header,
+                param
+        ), Map.class);
+        boolean isSuccess = (boolean) res.get("succ");
+        if(!isSuccess){
+            throw new RequestException("获取token信息失败 ==>"+res.get("msg"));
+        }
+        this.tokenStr = Util.null2String(res.get("data"));
+    }
+
+    public Map<String,Object> contractRenewal(String url,Map<String, Object> requestParam){
+        reSetToken();
+        Map<String,String> heard = new HashMap<>();
+        heard.put("Content-Type","application/json");
+        heard.put("token",tokenStr);
+        Map<String,Object> res = RequestUtil.apiRequest(RequestBaseInfo.create(
+                "POST",
+                url,
+                heard,
+                requestParam
+        ), Map.class);
+        return res;
+    }
+
+    /**
+     * 加密字符串
+     * @param str 待加密字符串
+     * @return 加密字符串
+     */
+    public String string2MD5(String str) {
+        try {
+            MessageDigest md5 = MessageDigest.getInstance("MD5");
+            md5.update(str.getBytes(StandardCharsets.UTF_8));
+            byte[] digest = md5.digest();
+            StringBuilder build = new StringBuilder();
+            for (byte b : digest) {
+                //以16进制形式输出,高位不足补0
+                build.append(String.format("%02X", b));
+            }
+            return build.toString();
+        } catch (NoSuchAlgorithmException var5) {
+            var5.printStackTrace();
+            throw new RuntimeException(var5);
+        }
+    }
+
+    @Override
+    public ApiAsyncMain getFilter(ApiAsyncMain main) {
+        this.tableName = main.getModeTableName();
+        this.getContractUrl = main.getApiUrl();
+        return main;
+    }
+
+    @Override
+    public ApiResultInfo asyncList(ApiAsyncMain main, Map<String, String> headers, int n) {
+        headers.put("token",tokenStr);
+        Map<String,Object> requestParam = new HashMap<>();
+        updateTime = Util.null2String(updateTime);
+        String updateTimeStr = "".equals(updateTime) ? getUpdateTimeStr() : updateTime;
+        requestParam.put("updateTime",updateTimeStr);
+        requestParam.put("point",point);
+        requestParam.put("size",pageSize);
+        Map<String,Object> res = RequestUtil.apiRequest(RequestBaseInfo.create(
+                "POST",
+                getContractUrl,
+                headers,
+                requestParam
+        ), Map.class);
+        boolean isSuccess = (boolean) res.get("succ");
+        if(!isSuccess) {
+            throw new RequestException("获取合同信息失败 ==>"+res.get("msg"));
+        }
+        Map<String,Object> data = (Map<String, Object>) res.get("data");
+        boolean hasNextPage = (boolean) data.get("hasNextPage");
+        point = (int) (Integer) data.get("maxPoint");
+        List<Map<String,Object>> contractList = (List<Map<String, Object>>) data.get("records");
+        ApiResultInfo apiResultInfo = new ApiResultInfo(contractList,hasNextPage);
+        return apiResultInfo;
+    }
+
+    public String getUpdateTimeStr(){
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(new Date());
+        calendar.add(Calendar.DATE,-1);
+        Date time = calendar.getTime();
+        DateFormat dateFormat = new SimpleDateFormat(formatString);
+        return dateFormat.format(time);
+    }
+
+    @Override
+    public void handlerMappingResult(List<Map<String, Object>> mappingResult) {
+        if(!mappingResult.isEmpty()){
+            for (Map<String, Object> map : mappingResult) {
+                String uniqueValue = Util.null2String(map.get(uniqueField));
+                String mainId = jtContractCmd.queryContract(tableName, uniqueField, uniqueValue);
+                if(mainId.equals("")){
+                    int dataId = sqlUtil.insertToModeNoRight(tableName, map, "");
+                    if(dataId > 0){
+                        Util.rebuildModeDataShareByAsync(1, Util.getIntValue(modeId),dataId);
+                    }
+                }else {
+                    Map<String,Object> whereParam = new HashMap<>();
+                    whereParam.put("id",mainId);
+                    sqlUtil.updateMode(tableName,map,whereParam);
+                }
+            }
+        }
+    }
+
+    @Override
+    public Object getValue(Map<String, Object> currentResult, Map<String, Object> allApiResult) {
+        String contractCode = Util.null2String(currentResult.get("contractCode"));
+        String orgPath = Util.null2String(currentResult.get("orgPath"));
+        int index = 0;
+        for (String path : pathSet) {
+            index++;
+            if(orgPath.contains(path)) break;
+        }
+        if(index >= pathSet.size() || personnelWhiteList.containsKey(contractCode)){
+            return 0;
+        }
+        return 1;
+    }
+
+    /**
+     * 初始化合同续签不触发黑名单
+     */
+    public void setPathSet(){
+        RecordSet queryRecordSet = new RecordSet();
+        String querySql = "select id,bcfgjz from uf_HTXQBCFHMD";
+        queryRecordSet.executeQuery(querySql);
+        while (queryRecordSet.next()){
+            String pathItem = Util.null2String(queryRecordSet.getString("bcfgjz"));
+            pathSet.add(pathItem);
+        }
+        toolUtil.writeDebuggerLog("黑名单信息 ==>"+JSON.toJSONString(pathSet));
+    }
+
+    /**
+     * 初始化人员白名单
+     */
+    public void setPersonnelWhiteList(){
+        RecordSet queryRecordSet = new RecordSet();
+        String querySql = "select xm,ygid from uf_HTXQCFRYBMD";
+        queryRecordSet.executeQuery(querySql);
+        while (queryRecordSet.next()){
+            String userId = Util.null2String("xm");
+            String employeeCode = Util.null2String(queryRecordSet.getString("ygid"));
+            personnelWhiteList.put(employeeCode,userId);
+        }
+        toolUtil.writeDebuggerLog("人员白名单信息 ==>"+JSON.toJSONString(personnelWhiteList));
+    }
+
+}
diff --git a/src/main/youhong_ai_old_src/weaver/ofs/webservices/OfsTodoDataWebServiceImpl.java b/src/main/youhong_ai_old_src/weaver/ofs/webservices/OfsTodoDataWebServiceImpl.java
new file mode 100644
index 0000000..3d65441
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/ofs/webservices/OfsTodoDataWebServiceImpl.java
@@ -0,0 +1,470 @@
+/*
+ *
+ * Copyright (c) 2001-2016 泛微软件.
+ * 泛微协同商务系统,版权所有.
+ * 
+ */
+package weaver.ofs.webservices;
+
+import org.apache.commons.lang.StringEscapeUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.codehaus.xfire.MessageContext;
+import org.codehaus.xfire.service.invoker.AbstractInvoker;
+import org.codehaus.xfire.transport.http.XFireServletController;
+import org.codehaus.xfire.util.dom.DOMInHandler;
+import org.dom4j.io.DOMReader;
+import weaver.integration.cache.OfsSettingCacheNew;
+import weaver.integration.logging.Logger;
+import weaver.integration.logging.LoggerFactory;
+import weaver.ofs.manager.IOfsTodoDataManager;
+import weaver.ofs.manager.OfsTodoDataManagerNew;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 
+ * 统一待办webservice接口实现类
+ * @author liurui
+ */
+public class OfsTodoDataWebServiceImpl implements OfsTodoDataWebService {
+
+	private static Logger log = LoggerFactory.getLogger("ofs", OfsTodoDataWebServiceImpl.class.getName());
+	 /**
+     * 统一待办业务处理对象
+     */		
+	private IOfsTodoDataManager ofsTodoDataManager = new OfsTodoDataManagerNew();
+	/**
+	 * 接收待办流程(标准格式)
+	 * @param dataMap
+	 * @return
+	 */
+	public Map<String,String> receiveTodoRequestByMap(Map<String,String> dataMap){
+
+		ofsTodoDataManager.setClientIp(getClientIpXfire());//设置当前IP，为了做IP安全校验
+
+		Map<String,Object> dataMap2 = new HashMap<String, Object>();
+		dataMap2.putAll(dataMap);
+
+		return ofsTodoDataManager.receiveTodoRequestByMap(dataMap2);
+	}
+	
+	/**
+	 * 处理待办流程（变为已办）(标准格式)
+	 * @param dataMap
+	 * @return
+	 */
+	public Map<String,String> processDoneRequestByMap(Map<String,String> dataMap){
+		ofsTodoDataManager.setClientIp(getClientIpXfire());//设置当前IP，为了做IP安全校验
+		Map<String,Object> dataMap2 = new HashMap<String, Object>();
+		dataMap2.putAll(dataMap);
+
+		return ofsTodoDataManager.processDoneRequestByMap(dataMap2);
+	}
+	
+	/**
+	 * 处理办结流程（变为办结）(标准格式)
+	 * @param dataMap
+	 * @return
+	 */
+	public Map<String,String> processOverRequestByMap(Map<String,String> dataMap){
+		ofsTodoDataManager.setClientIp(getClientIpXfire());//设置当前IP，为了做IP安全校验
+		Map<String,Object> dataMap2 = new HashMap<String, Object>();
+		dataMap2.putAll(dataMap);
+
+		return ofsTodoDataManager.processOverRequestByMap(dataMap2);
+	}
+	
+	/**
+	 * 接收异构系统流程(标准格式)
+	 * @param dataMap
+	 * @return
+	 */
+	public Map<String,String> receiveRequestInfoByMap(Map<String,String> dataMap){
+		ofsTodoDataManager.setClientIp(getClientIpXfire());//设置当前IP，为了做IP安全校验
+		Map<String,Object> dataMap2 = new HashMap<String, Object>();
+		dataMap2.putAll(dataMap);
+
+		return ofsTodoDataManager.receiveRequestInfoByMap(dataMap2);
+	}
+	private String getXML(String xmlOld){
+
+		/*MessageContext context = AbstractInvoker.getContext();
+
+		org.w3c.dom.Document localDocument = (org.w3c.dom.Document)context.getInMessage().getProperty("dom.message");*/
+//		2021-09-30 EBU7-dev1 ayh修改（项目经理要求）
+		MessageContext context;
+		org.w3c.dom.Document localDocument;
+		try {
+			context = AbstractInvoker.getContext();
+
+			localDocument = (org.w3c.dom.Document)context.getInMessage().getProperty("dom.message");
+		}catch (Exception e){
+			return  xmlOld;
+		}
+		//		2021-09-30 EBU7-dev1 ayh修改（项目经理要求） end
+		if(localDocument != null){
+			String xml = buildDocment(localDocument).asXML();
+			if(StringUtils.isBlank(xml)){
+				return xmlOld;
+			}
+
+			int start = xml.indexOf("<in0>");
+			int end = xml.indexOf("</in0>");
+
+			if(start<0){
+
+				start = xml.indexOf("<web:in0>");
+				start = start+9;
+			}else{
+				start = start+5;
+			}
+			if(end<0){
+				end = xml.indexOf("</web:in0>");
+			}
+
+			xml = xml.substring(start,end);
+
+			log.info("截取需要的xml："+xml);
+
+			xml = StringEscapeUtils.unescapeHtml(xml);
+
+			log.error("getXML:"+xml);
+
+			return xml;
+		}else{
+			return xmlOld;
+		}
+
+	}
+	private String getJson(String jsonOld){
+
+		/*MessageContext context = AbstractInvoker.getContext();
+
+		org.w3c.dom.Document localDocument = (org.w3c.dom.Document)context.getInMessage().getProperty(DOMInHandler.DOM_MESSAGE);*/
+
+//		2021-09-30 UEB7-dev1 ayh修改（项目经理提的需求）
+		org.w3c.dom.Document localDocument;
+		MessageContext context;
+		try {
+			context = AbstractInvoker.getContext();
+
+			localDocument = (org.w3c.dom.Document)context.getInMessage().getProperty(DOMInHandler.DOM_MESSAGE);
+		}catch(Exception e){
+			return jsonOld;
+		}
+//		2021-09-30 UEB7-dev1 ayh修改 end
+		if(localDocument != null){
+			String xml = buildDocment(localDocument).asXML();
+			if(StringUtils.isBlank(xml)){
+				return jsonOld;
+			}
+
+			int start = xml.indexOf("<in0>");
+			int end = xml.indexOf("</in0>");
+
+			if(start<0){
+
+				start = xml.indexOf("<web:in0>");
+				start = start+9;
+			}else{
+				start = start+5;
+			}
+			if(end<0){
+				end = xml.indexOf("</web:in0>");
+			}
+			String json = xml.substring(start,end);
+
+			log.info("截取需要的json："+json);
+
+			return json;
+		}else{
+			return jsonOld;
+		}
+
+	}
+	/**
+	 * 接收待办流程(json格式)
+	 * @param json
+	 * @return
+	 */
+	public String receiveTodoRequestByJson(String json){
+
+		json = getJson(json);
+		ofsTodoDataManager.setClientIp(getClientIpXfire());//设置当前IP，为了做IP安全校验
+
+
+		return ofsTodoDataManager.receiveTodoRequestByJson(json);
+	}
+	
+	/**
+	 * 处理待办流程（变为已办）(json格式)
+	 * @param json
+	 * @return
+	 */
+	public String processDoneRequestByJson (String json){
+		ofsTodoDataManager.setClientIp(getClientIpXfire());//设置当前IP，为了做IP安全校验
+		json = getJson(json);
+		return ofsTodoDataManager.processDoneRequestByJson(json);
+	}
+	
+	/**
+	 * 处理办结流程（变为办结）(json格式)
+	 * @param json
+	 * @return
+	 */
+	public String processOverRequestByJson (String json){
+		ofsTodoDataManager.setClientIp(getClientIpXfire());//设置当前IP，为了做IP安全校验
+
+		json = getJson(json);
+		return ofsTodoDataManager.processOverRequestByJson(json);
+	}
+	private org.dom4j.Document buildDocment(org.w3c.dom.Document paramDocument)
+	{
+		DOMReader localDOMReader = new DOMReader();
+		return localDOMReader.read(paramDocument);
+	}
+	/**
+	 * 接收异构系统流程(json格式)
+	 * @param json
+	 * @return
+	 */
+	public String receiveRequestInfoByJson (String json){
+		ofsTodoDataManager.setClientIp(getClientIpXfire());//设置当前IP，为了做IP安全校验
+
+
+		json = getJson(json);
+		return ofsTodoDataManager.receiveRequestInfoByJson(json);
+	}
+	
+	/**
+	 * 接收待办流程(xml格式)
+	 * @param xml
+	 * @return
+	 */
+	public String receiveTodoRequestByXml(String xml){
+		ofsTodoDataManager.setClientIp(getClientIpXfire());//设置当前IP，为了做IP安全校验
+
+		xml = getXML(xml);
+		return ofsTodoDataManager.receiveTodoRequestByXml(xml);
+	}
+	
+	/**
+	 * 处理待办流程（变为已办）(xml格式)
+	 * @param xml
+	 * @return
+	 */
+	public String processDoneRequestByXml (String xml){
+		ofsTodoDataManager.setClientIp(getClientIpXfire());//设置当前IP，为了做IP安全校验
+		xml = getXML(xml);
+
+		return ofsTodoDataManager.processDoneRequestByXml(xml);
+	}
+	
+	/**
+	 * 处理办结流程（变为办结）(xml格式)
+	 * @param xml
+	 * @return
+	 */
+	public String processOverRequestByXml (String xml){
+		ofsTodoDataManager.setClientIp(getClientIpXfire());//设置当前IP，为了做IP安全校验
+
+		xml = getXML(xml);
+		return ofsTodoDataManager.processOverRequestByXml(xml);
+	}
+	/**
+	 * 接收异构系统流程(xml格式)
+	 * @param xml
+	 * @return
+	 */
+	public String receiveRequestInfoByXml (String xml){
+		ofsTodoDataManager.setClientIp(getClientIpXfire());//设置当前IP，为了做IP安全校验
+
+		xml = getXML(xml);
+		return ofsTodoDataManager.receiveRequestInfoByXml(xml);
+	}
+	
+	/**
+     * XFIRE获取客户端IP地址
+     * 
+     * @Author MH
+     * @return
+     */
+    private String getClientIpXfire() {
+        String ip = "";
+        try {
+            HttpServletRequest request = XFireServletController.getRequest();
+            ip = getRemoteAddress(request);
+            return ip;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return "";
+        }
+    }
+    
+    /**
+	* 在JSP里，获取客户端的IP地址的方法是：request.getRemoteAddr()，这种方法在大部分情况下都是有效的。
+	* 但是在通过了Apache,Squid等反向代理软件就不能获取到客户端的真实IP地址了
+	* 经过代理以后，由于在客户端和服务之间增加了中间层，因此服务器无法直接拿到客户端的IP，服务器端应用也无法直接通过转发请求的地址返回给客户端。
+	* 但是在转发请求的HTTP头信息中，增加了X－FORWARDED－FOR信息。用以跟踪原有的客户端IP地址和原来客户端请求的服务器地址
+	* 如果通过了多级反向代理的话，X-Forwarded-For的值并不止一个，而是一串IP值,
+	* 取X-Forwarded-For中第一个非unknown的有效IP字符串。
+	* 
+	* @param request
+	* @return
+	*/
+    private String getRemoteAddress(HttpServletRequest request) {  
+        String ip = request.getHeader("x-forwarded-for");  
+        if (ip == null || ip.length() == 0 || ip.equalsIgnoreCase("unknown")) {  
+            ip = request.getHeader("Proxy-Client-IP");  
+        }  
+        if (ip == null || ip.length() == 0 || ip.equalsIgnoreCase("unknown")) {  
+            ip = request.getHeader("WL-Proxy-Client-IP");  
+        }  
+        if (ip == null || ip.length() == 0 || ip.equalsIgnoreCase("unknown")) {  
+            ip = request.getRemoteAddr();  
+        }  
+        if ((ip.indexOf(",") >= 0)){
+			ip = ip.substring(0 , ip.indexOf(","));
+		}
+        return ip;  
+    }
+    
+    /**
+	 * 删除异构系统流程(map格式)
+	 * @param dataMap
+	 * @return
+	 */
+	public Map<String, String> deleteRequestInfoByMap(
+			Map<String, String> dataMap) {
+		// TODO Auto-generated method stub
+		ofsTodoDataManager.setClientIp(getClientIpXfire());//设置当前IP，为了做IP安全校验
+		Map<String,Object> dataMap2 = new HashMap<String, Object>();
+		dataMap2.putAll(dataMap);
+		return ofsTodoDataManager.deleteRequestInfoByMap(dataMap2);
+	}
+
+	 /**
+	 * 删除异构系统用户某条流程(map格式)
+	 * @param dataMap
+	 * @return
+	 */
+	public Map<String, String> deleteUserRequestInfoByMap(
+			Map<String, String> dataMap) {
+		ofsTodoDataManager.setClientIp(getClientIpXfire());//设置当前IP，为了做IP安全校验
+		Map<String,Object> dataMap2 = new HashMap<String, Object>();
+		dataMap2.putAll(dataMap);
+		return ofsTodoDataManager.deleteUserRequestInfoByMap(dataMap2);
+	}
+	 /**
+	 * 删除异构系统流程(Json格式)
+	 * @param json
+	 * @return
+	 */
+	public String deleteRequestInfoByJson(
+			String json) {
+		ofsTodoDataManager.setClientIp(getClientIpXfire());//设置当前IP，为了做IP安全校验
+		json = getJson(json);
+		return ofsTodoDataManager.deleteRequestInfoByJson(json);
+	}
+	
+	 /**
+	 * 删除异构系统流程(xml格式)
+	 * @param xml
+	 * @return
+	 */
+	public String deleteRequestInfoByXML(
+			String xml) {
+		ofsTodoDataManager.setClientIp(getClientIpXfire());//设置当前IP，为了做IP安全校验
+		xml = getXML(xml);
+		return ofsTodoDataManager.deleteRequestInfoByXML(xml);
+	}
+	
+	 /**
+	 * 删除异构系统用户某条流程(json格式)
+	 * @param json
+	 * @return
+	 */
+	public String deleteUserRequestInfoByJson(
+			String json) {
+		ofsTodoDataManager.setClientIp(getClientIpXfire());//设置当前IP，为了做IP安全校验
+		json = getJson(json);
+		return ofsTodoDataManager.deleteUserRequestInfoByJson(json);
+	}
+	 /**
+	 * 删除异构系统用户某条流程(xml格式)
+	 * @param xml
+	 * @return
+	 */
+	public String deleteUserRequestInfoByXML(
+			String xml) {
+		ofsTodoDataManager.setClientIp(getClientIpXfire());//设置当前IP，为了做IP安全校验
+		xml = getXML(xml);
+		return ofsTodoDataManager.deleteUserRequestInfoByXML(xml);
+	}
+
+	/**
+	 * 接收抄送流程(json格式)
+	 * @param json
+	 * @return
+	 */
+	public String receiveCCRequestByJson(String json){
+		ofsTodoDataManager.setClientIp(getClientIpXfire());//设置当前IP，为了做IP安全校验
+		json = getJson(json);
+		return ofsTodoDataManager.receiveCCRequestByJson(json);
+	}
+
+	/**
+	 * 接收抄送流程(json格式)
+	 */
+	public Map<String,String> receiveCCRequestByMap(Map<String,String> dataMap){
+		ofsTodoDataManager.setClientIp(getClientIpXfire());//设置当前IP，为了做IP安全校验
+		Map<String,Object> dataMap2 = new HashMap<String, Object>();
+		dataMap2.putAll(dataMap);
+		return ofsTodoDataManager.receiveCCRequestByMap(dataMap2);
+	}
+
+	/**
+	 * 接收抄送流程(json格式)
+	 * @param xml
+	 * @return
+	 */
+	public String receiveCCRequestByXml(String xml){
+		ofsTodoDataManager.setClientIp(getClientIpXfire());//设置当前IP，为了做IP安全校验
+		xml = getXML(xml);
+		return ofsTodoDataManager.receiveCCRequestByXml(xml);
+	}
+
+	/**
+	 * 接收抄送流程(json格式)
+	 * @param json
+	 * @return
+	 */
+	public String receiveReadRequestByJson(String json){
+		ofsTodoDataManager.setClientIp(getClientIpXfire());
+		json = getJson(json);
+		return ofsTodoDataManager.receiveReadRequestByJson(json);
+	}
+
+	/**
+	 * 接收抄送流程(json格式)
+	 */
+	public Map<String,String> receiveReadRequestByMap(Map<String,String> dataMap){
+		ofsTodoDataManager.setClientIp(getClientIpXfire());
+		Map<String,Object> dataMap2 = new HashMap<String, Object>();
+		dataMap2.putAll(dataMap);
+		return ofsTodoDataManager.receiveReadRequestByMap(dataMap2);
+	}
+
+	/**
+	 * 接收抄送流程(json格式)
+	 * @param xml
+	 * @return
+	 */
+	public String receiveReadRequestByXml(String xml){
+		ofsTodoDataManager.setClientIp(getClientIpXfire());
+		xml = getXML(xml);
+		return ofsTodoDataManager.receiveReadRequestByXml(xml);
+	}
+}
diff --git a/src/main/youhong_ai_old_src/weaver/schedule/aiyh_bao_shan/HolidayMapper.java b/src/main/youhong_ai_old_src/weaver/schedule/aiyh_bao_shan/HolidayMapper.java
new file mode 100644
index 0000000..773b067
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/schedule/aiyh_bao_shan/HolidayMapper.java
@@ -0,0 +1,34 @@
+package weaver.schedule.aiyh_bao_shan;
+
+import aiyh.utils.annotation.recordset.CaseConversion;
+import aiyh.utils.annotation.recordset.ParamMapper;
+import aiyh.utils.annotation.recordset.Select;
+import aiyh.utils.annotation.recordset.SqlMapper;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>数据库操作接口</p>
+ * <p>create 2022/3/1 0001 17:35</p>
+ *
+ * @author EBU7-dev1-ayh
+ */
+
+@SqlMapper
+public interface HolidayMapper {
+
+    /**
+     * 根据更新时间戳和假期类型查询its假期信息
+     * @param holidayAsyncTime 上次假期更新时间戳
+     * @param itsTypesStr its假期类型
+     * @return its假期信息
+     */
+    @Select("select * from its_oa_holiday_view where holiday_type in ($t{itsTypesStr}) " +
+            "and date(updated_at)" +
+            " > date(#{holidayAsyncTime})")
+    @CaseConversion(false)
+    public List<Map<String,Object>> selectItsHoliday(@ParamMapper("holidayAsyncTime") String holidayAsyncTime,
+                                                     @ParamMapper("itsTypesStr") String itsTypesStr);
+
+}
diff --git a/src/main/youhong_ai_old_src/weaver/schedule/aiyh_bao_shan/HolidaySyncBean.java b/src/main/youhong_ai_old_src/weaver/schedule/aiyh_bao_shan/HolidaySyncBean.java
new file mode 100644
index 0000000..fcd43f1
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/schedule/aiyh_bao_shan/HolidaySyncBean.java
@@ -0,0 +1,42 @@
+package weaver.schedule.aiyh_bao_shan;
+
+import lombok.Data;
+
+/**
+ * <p>同步假期数据实体类</p>
+ * <p>create 2022/3/1 0001 14:54</p>
+ *
+ * @author EBU7-dev1-ayh
+ */
+
+@Data
+public class HolidaySyncBean {
+    /**
+     * 人员id
+     */
+    private String resourceId;
+    /**
+     * 假期类型
+     */
+    private String holidayType;
+    /**
+     * 假期年份
+     */
+    private String holidayYear;
+    /**
+     * 假期余额
+     */
+    private String holidayBalance;
+    /**
+     * 假期使用天数
+     */
+    private String holidayUseDay;
+    /**
+     * 假期总天数
+     */
+    private String holidayTotalDay;
+    /**
+     * 时间戳
+     */
+    private String timeStamp;
+}
diff --git a/src/main/youhong_ai_old_src/weaver/schedule/aiyh_bao_shan/HolidaySyncCronJob.java b/src/main/youhong_ai_old_src/weaver/schedule/aiyh_bao_shan/HolidaySyncCronJob.java
new file mode 100644
index 0000000..fc8dc7b
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/schedule/aiyh_bao_shan/HolidaySyncCronJob.java
@@ -0,0 +1,111 @@
+package weaver.schedule.aiyh_bao_shan;
+
+import aiyh.utils.Util;
+import aiyh.utils.sqlUtil.builderSql.impl.BuilderSqlImpl;
+import aiyh.utils.sqlUtil.sqlResult.impl.PrepSqlResultImpl;
+import aiyh.utils.zwl.common.ToolUtil;
+import org.apache.log4j.Logger;
+import org.h2.util.StringUtils;
+import weaver.conn.RecordSet;
+import weaver.interfaces.schedule.BaseCronJob;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>假期同步定时任务</p>
+ * <p>create 2022/3/1 0001 10:47</p>
+ *
+ * @author EBU7-dev1-ayh
+ */
+
+
+public class HolidaySyncCronJob extends BaseCronJob {
+
+    private final Logger logger = Util.getLogger();
+    private final HolidayMapper mapper = Util.getMapper(HolidayMapper.class);
+    private String defaultTime = "2020-12-30 00:00:00";
+
+    @Override
+    public void execute() {
+        RecordSet rs = new RecordSet();
+        Map<String, Object> holidaySyncConfig = Util.readProperties2Map("cronJobConfig", "holidaySync");
+        if (holidaySyncConfig == null) {
+            logger.error("获取holidaySyncConfig配置信息失败！");
+            return;
+        }
+        //
+        //        假期字段映射   its字段  -  oa 字段
+        Map<String, String> itsOaMapper = (Map<String, String>) holidaySyncConfig.get("its_oa_holiday_viw");
+//        假期类型映射
+        Map<String, Object> itsTypeMapper = (Map<String, Object>) holidaySyncConfig.get("its_type");
+        ToolUtil toolUtil = new ToolUtil();
+        String holidayAsyncTime = toolUtil.getSystemParamValue("holidayAsyncTime");
+        if (StringUtils.isNullOrEmpty(holidayAsyncTime)) {
+            String insertSql = "insert into uf_systemconfig (id,name,uuid,paramvalue) values(-999,'假期同步时间','holidayAsyncTime','" + defaultTime + "')";
+            rs.executeUpdate(insertSql);
+            holidayAsyncTime = defaultTime;
+        }
+        List<String> itsTypeList;
+        try {
+            itsTypeList = new ArrayList<>(itsTypeMapper.size());
+        } catch (NullPointerException e) {
+            logger.error("假期类型映射关系数据为空！");
+            throw new RuntimeException("假期类型映射关系为空！ ");
+        }
+        for (Map.Entry<String, Object> typeMapper : itsTypeMapper.entrySet()) {
+            itsTypeList.add(String.valueOf(typeMapper.getKey()));
+        }
+        String itsTypesStr = Util.join(itsTypeList, ",");
+        List<Map<String, Object>> itsHolidayList = mapper.selectItsHoliday(holidayAsyncTime, itsTypesStr);
+        List<Map<String, Object>> sqlMapping = new ArrayList<>(itsHolidayList.size());
+        try {
+            for (Map<String, Object> itsHoliday : itsHolidayList) {
+//            单个假期处理
+                Map<String, Object> sqlData;
+                try {
+                    sqlData = new HashMap<>(itsOaMapper.size());
+                } catch (NullPointerException e) {
+                    logger.error("假期字段映射查询数据为空！");
+                    throw new RuntimeException("假期字段映射查询数据为空！ ");
+                }
+                for (Map.Entry<String, String> itsOa : itsOaMapper.entrySet()) {
+                    sqlData.put(itsOa.getValue(), itsHoliday.get(itsOa.getKey()));
+                }
+                sqlData.put("whereId", itsHoliday.get("resourceid"));
+                String holidayType = String.valueOf(itsHoliday.get("holiday_type"));
+                sqlData.put("whereType", itsTypeMapper.get(holidayType));
+//                所属年份
+                sqlData.put("belongYear", String.valueOf(itsHoliday.get("sent_date")).substring(0, 4));
+                sqlMapping.add(sqlData);
+            }
+        } catch (NullPointerException e) {
+            logger.error("查询itsHolidayList数据失败！");
+            throw new RuntimeException("假期映射关系为空！ ");
+        }
+//        操作数据库更新
+        BuilderSqlImpl sqlBuilder = Util.createSqlBuilder();
+        for (Map<String, Object> mapperMap : sqlMapping) {
+            Map<String, Object> dataMap = new HashMap<>(mapperMap);
+            dataMap.remove("whereId");
+            dataMap.remove("whereType");
+            PrepSqlResultImpl prepSqlResult = sqlBuilder.updateSql("kq_balanceOfLeave", dataMap, Util.createPrepWhereImpl()
+                    .whereAnd("resourceid").whereEqual(mapperMap.get("whereId"))
+                    .whereAnd("leaveRulesId").whereEqual(mapperMap.get("whereType")));
+            rs.executeUpdate(prepSqlResult.getSqlStr(), prepSqlResult.getArgs());
+        }
+//        更新配置表的时间信息
+        String updateTime = "update uf_systemconfig set paramvalue = ? where id = -999";
+        rs.executeUpdate(updateTime, Util.getTime("yyyy-MM-dd HH:mm:ss"));
+    }
+
+    public String getDefaultTime() {
+        return defaultTime;
+    }
+
+    public void setDefaultTime(String defaultTime) {
+        this.defaultTime = defaultTime;
+    }
+}
diff --git a/src/main/youhong_ai_old_src/weaver/schedule/aiyh_pcn/async_dealers/DealersAsyncCronJob.java b/src/main/youhong_ai_old_src/weaver/schedule/aiyh_pcn/async_dealers/DealersAsyncCronJob.java
new file mode 100644
index 0000000..c45c3ce
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/schedule/aiyh_pcn/async_dealers/DealersAsyncCronJob.java
@@ -0,0 +1,171 @@
+package weaver.schedule.aiyh_pcn.async_dealers;
+
+import aiyh.utils.Util;
+import aiyh.utils.apirequest.entity.ApiAsyncMain;
+import aiyh.utils.apirequest.entity.ApiResultInfo;
+import aiyh.utils.apirequest.interceptor.ApiAsyncInterceptor;
+import aiyh.utils.apirequest.service.ApiAsyncService;
+import aiyh.utils.excention.CustomerException;
+import aiyh.utils.httpUtil.ResponeVo;
+import aiyh.utils.httpUtil.util.HttpUtils;
+import com.alibaba.fastjson.JSON;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.weaver.general.TimeUtil;
+import org.h2.util.StringUtils;
+import weaver.formmode.data.ModeDataIdUpdate;
+import weaver.formmode.setup.ModeRightInfo;
+import weaver.interfaces.schedule.BaseCronJob;
+
+import java.io.IOException;
+import java.util.*;
+
+/**
+ * <p></p>
+ * <p>create 2022/3/17 2:34 PM</p>
+ *
+ * @author ayh
+ */
+
+public class DealersAsyncCronJob extends BaseCronJob implements ApiAsyncInterceptor {
+    public static final int SUCCESS_CODE = 200;
+    private final HttpUtils httpUtils = new HttpUtils();
+    private Integer pageSize = 200;
+    private static final ModeRightInfo MODE_RIGHT_INFO = new ModeRightInfo();
+    private String apiKeyField = "id";
+    private String oaKeyField = "out_key";
+    private String modelTableName;
+    private String formModeId;
+    private String onlyMark;
+    private final DealersAsyncCronJobMapping mapping = Util.getMapper(DealersAsyncCronJobMapping.class);
+    private final ModeDataIdUpdate mdu = ModeDataIdUpdate.getInstance();
+
+    @Override
+    public void execute() {
+        try {
+            Util.getLogger().info("同步经销商数据开始！");
+            ApiAsyncService apiAsyncService = new ApiAsyncService(this);
+            apiAsyncService.asyncByOnlyMark(Util.null2DefaultStr(onlyMark,"dealers_async"));
+        }catch (Exception e){
+            Util.getLogger().error("同步经销商数据计划任务出现异常，请检查相关代码逻辑！");
+            e.printStackTrace();
+        }
+    }
+
+    @Override
+    public ApiAsyncMain getFilter(ApiAsyncMain main) {
+        this.modelTableName = main.getModeTableName();
+        if(StringUtils.isNullOrEmpty(formModeId)){
+            String modeId = mapping.selectFormModeIdByTableId(main.getModeTable());
+            formModeId = Util.null2DefaultStr(modeId,"0");
+        }
+        return main;
+    }
+
+    @Override
+    public ApiResultInfo asyncList(ApiAsyncMain main, Map<String, String> headers, int n) {
+        Map<String, Object> param = new HashMap<>(8);
+        param.put("method", "getdealerm2weSmart");
+        Map<String, Object> pageParam = new HashMap<>(8);
+        pageParam.put("page", n);
+        pageParam.put("pageSize", pageSize);
+        param.put("params", pageParam);
+        ResponeVo responeVo = null;
+        try {
+            responeVo = httpUtils.apiPost(main.getApiUrl(), param, headers);
+        } catch (IOException e) {
+            throw new CustomerException(String.format("请求经销商接口失败！请求相关信息：url => {%s},param: {%s},请求头：{%s}",
+                    main.getApiUrl(), JSON.toJSONString(param), JSON.toJSONString(headers)),e);
+        }
+        Map<String, Object> entityMap = null;
+        try {
+            entityMap = responeVo.getEntityMap();
+        } catch (JsonProcessingException e) {
+            throw new CustomerException("JSON 转换错误，无法将返回值转换为Map对象！返回值：" + responeVo.getEntityString(),e);
+        }
+        Object code = entityMap.get("code");
+        if (Objects.isNull(code)) {
+            throw new CustomerException("请求失败！无法获取到返回状态值： " + entityMap);
+        }
+        if (Integer.parseInt(String.valueOf(code)) != SUCCESS_CODE) {
+            throw new CustomerException("请求失败！获取返回信息：" + entityMap);
+        }
+        Map<String, Object> data = (Map<String, Object>) entityMap.get("data");
+        List<Map<String, Object>> list = (List<Map<String, Object>>) data.get("list");
+        int total = Integer.parseInt(String.valueOf(data.get("total")));
+        int page = Integer.parseInt(String.valueOf(data.get("page")));
+        int pageSize = Integer.parseInt(String.valueOf(data.get("pageSize")));
+        boolean hasNext = true;
+        if (list.size() < pageSize || total <= pageSize * page) {
+            hasNext = false;
+        }
+        return new ApiResultInfo(list, hasNext);
+    }
+
+    @Override
+    public void handlerMappingResult(List<Map<String, Object>> mappingResult) {
+        try {
+            List<Integer> ids = new ArrayList<>();
+            for (Map<String, Object> mapMapping : mappingResult) {
+                int dataId;
+                if ((dataId = existData(mapMapping)) == 0) {
+//                插入
+                    dataId = mdu.getModeDataNewId(modelTableName, Util.getIntValue(formModeId, -1), 1, 0, TimeUtil.getCurrentDateString(), TimeUtil.getOnlyCurrentTimeString());
+                }
+                StringBuilder sb = new StringBuilder("update ");
+                sb.append(modelTableName)
+                        .append(" set ");
+                int n = 0;
+                for (Map.Entry<String, Object> entry : mapMapping.entrySet()) {
+                    n++;
+                    sb.append(entry.getKey()).append("=#{").append(entry.getKey()).append("}");
+                    if (n < mapMapping.size()) {
+                        sb.append(",");
+                    }
+                }
+                sb.append(" where id = ").append(dataId);
+                String updateSql = sb.toString();
+                boolean flag = mapping.updateDataInfo(updateSql, mapMapping);
+                if(flag) {
+                    ids.add(dataId);
+                }else{
+//                    删除id数据
+                    Util.getLogger().error("数据添加失败！" + updateSql + " ==> " + mapMapping);
+                }
+            }
+            new RebuildModeDataShareThread(MODE_RIGHT_INFO, ids, Integer.parseInt(formModeId), 1).run();
+        }catch (Exception e){
+            throw new CustomerException("同步数据到数据库中出现错误！",e);
+        }
+    }
+
+    /**
+     * 判断是否存在数据
+     *
+     * @param mapMapping 映射字段
+     * @return 存在的数据id 0表示不存在
+     */
+    private int existData(Map<String, Object> mapMapping) {
+        Integer dataId = mapping.selectExistData(modelTableName, oaKeyField, String.valueOf(mapMapping.get(oaKeyField)));
+        return dataId <= 0 ? 0 : dataId;
+    }
+
+    public void setPageSize(Integer pageSize) {
+        this.pageSize = pageSize;
+    }
+
+    public void setApiKeyField(String apiKeyField) {
+        this.apiKeyField = apiKeyField;
+    }
+
+    public void setOnlyMark(String onlyMark) {
+        this.onlyMark = onlyMark;
+    }
+
+    public void setOaKeyField(String oaKeyField) {
+        this.oaKeyField = oaKeyField;
+    }
+
+    public void setFormModeId(String formModeId) {
+        this.formModeId = formModeId;
+    }
+}
diff --git a/src/main/youhong_ai_old_src/weaver/schedule/aiyh_pcn/async_dealers/DealersAsyncCronJobMapping.java b/src/main/youhong_ai_old_src/weaver/schedule/aiyh_pcn/async_dealers/DealersAsyncCronJobMapping.java
new file mode 100644
index 0000000..741383a
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/schedule/aiyh_pcn/async_dealers/DealersAsyncCronJobMapping.java
@@ -0,0 +1,44 @@
+package weaver.schedule.aiyh_pcn.async_dealers;
+
+import aiyh.utils.annotation.recordset.*;
+
+import java.util.Map;
+
+/**
+ * <p>查询数据库操作</p>
+ * <p>create 2022/3/17 8:57 PM</p>
+ *
+ * @author ayh
+ */
+@SqlMapper
+public interface DealersAsyncCronJobMapping {
+
+    /**
+     * 查询数据是否存在
+     * @param tableName 表名
+     * @param whereField 查询条件字段
+     * @param whereValue 查询条件值
+     * @return 数据id
+     */
+    @Select("select id from $t{tableName} where $t{whereField} = #{whereValue}")
+    public Integer selectExistData(@ParamMapper("tableName") String tableName,
+                                   @ParamMapper("whereField") String whereField,
+                                   @ParamMapper("whereValue") String whereValue);
+
+
+    /**
+     * 更新数据库shave
+     * @param updateSql 自定义sql
+     * @param mapMapping 映射值
+     */
+    @Update(custom = true)
+    boolean updateDataInfo(@SqlString String updateSql, Map<String, Object> mapMapping);
+
+    /**
+     * 查询模块ID
+     * @param modeTable 建模表id
+     * @return 模块id
+     */
+    @Select("select id from modeinfo where formid = #{modeTableId}")
+    String selectFormModeIdByTableId(@ParamMapper("modeTableId") String modeTable);
+}
diff --git a/src/main/youhong_ai_old_src/weaver/schedule/aiyh_pcn/async_dealers/RebuildModeDataShareThread.java b/src/main/youhong_ai_old_src/weaver/schedule/aiyh_pcn/async_dealers/RebuildModeDataShareThread.java
new file mode 100644
index 0000000..5a5805a
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/schedule/aiyh_pcn/async_dealers/RebuildModeDataShareThread.java
@@ -0,0 +1,33 @@
+package weaver.schedule.aiyh_pcn.async_dealers;
+
+import weaver.formmode.setup.ModeRightInfo;
+
+import java.util.List;
+
+/**
+ * <p></p>
+ * <p>create 2022/3/18 12:15 AM</p>
+ *
+ * @author ayh
+ */
+
+public class RebuildModeDataShareThread implements Runnable{
+
+    private final ModeRightInfo modeRightInfo;
+    private final List<Integer> ids;
+    private final int formId;
+    private final int userId;
+
+    public RebuildModeDataShareThread(ModeRightInfo modeRightInfo,List<Integer> ids,int formId,int userId){
+        this.modeRightInfo = modeRightInfo;
+        this.ids = ids;
+        this.formId = formId;
+        this.userId = userId;
+    }
+    @Override
+    public void run() {
+        for (Integer id : ids) {
+            modeRightInfo.rebuildModeDataShareByEdit(userId,formId,id);
+        }
+    }
+}
diff --git a/src/main/youhong_ai_old_src/weaver/workflow/aiyh_saiao/action/UnfrozenAmountAction.java b/src/main/youhong_ai_old_src/weaver/workflow/aiyh_saiao/action/UnfrozenAmountAction.java
new file mode 100644
index 0000000..2230807
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/workflow/aiyh_saiao/action/UnfrozenAmountAction.java
@@ -0,0 +1,158 @@
+package weaver.workflow.aiyh_saiao.action;
+
+import aiyh.utils.Util;
+import aiyh.utils.excention.CustomerException;
+import weaver.interfaces.workflow.action.Action;
+import weaver.soa.workflow.request.RequestInfo;
+import weaver.workflow.aiyh_saiao.mapper.UnfrozenAmountActionMapper;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * <p>金额解除冻结</p>
+ * <p>create 2022/3/29 5:13 PM</p>
+ *
+ * @author ayh
+ */
+
+public class UnfrozenAmountAction implements Action {
+
+    public static final String SUBMIT = "submit";
+    public static final String WITHDRAW = "withdraw";
+    public static final String REJECT = "reject";
+    private final UnfrozenAmountActionMapper mapper = Util.getMapper(UnfrozenAmountActionMapper.class);
+    private String requestId;
+    private String tableName;
+    /**
+     * 合同金额字段
+     */
+    private String contractAmount = "";
+    /**
+     * 信用金额字段
+     */
+    private String creditAmount = "";
+    /**
+     * 合同扣减后字段
+     */
+    private String contractBalance = "";
+    /**
+     * 信用金额扣减后字段
+     */
+    private String creditBalance = "";
+    /**
+     * 信用额度冻结字段
+     */
+    private String frozenCreditAmount = "";
+    /**
+     * 合同金额冻结字段
+     */
+    private String frozenContractAmount = "";
+
+
+    @Override
+    public String execute(RequestInfo requestInfo) {
+        try {
+
+            //当前操作类型 submit:提交/reject:退回
+            String src = requestInfo.getRequestManager().getSrc();
+            if (SUBMIT.equals(src)) {
+                return Action.SUCCESS;
+            }
+//        撤回
+            if (WITHDRAW.equals(src)) {
+                doSomeThing();
+            }
+//        退回
+            if (REJECT.equals(src)) {
+                doSomeThing();
+            }
+            this.requestId = requestInfo.getRequestid();
+            this.tableName = requestInfo.getRequestManager().getBillTableName();
+        }catch (Exception e){
+            e.printStackTrace();
+            requestInfo.getRequestManager().setMessageid(System.currentTimeMillis()+"");
+            requestInfo.getRequestManager().setMessagecontent("回滚冻结金额出错，请联系系统管理员或运维人员！");
+            return Action.FAILURE_AND_CONTINUE;
+        }
+        return Action.SUCCESS;
+    }
+
+    /**
+     * 具体处理业务逻辑
+     */
+    public void doSomeThing() {
+        Map<String, Object> mainData = mapper.selectMainData(this.tableName, this.requestId);
+        /*
+//        合同金额
+        String contractAmount = Util.null2DefaultStr(mainData.get(this.contractAmount), "0");
+//        信用金额
+        String creditAmount = Util.null2DefaultStr(mainData.get(this.creditAmount), "0");
+         */
+//        合同扣减后金额
+        String contractBalance = Util.null2DefaultStr(mainData.get(this.contractBalance), "0");
+//        信用扣减后金额
+        String creditBalance = Util.null2DefaultStr(mainData.get(this.creditBalance), "0");
+//        冻结信用金额
+        String frozenCreditAmount = Util.null2DefaultStr(mainData.get(this.frozenCreditAmount), "0");
+//        冻结合同金额
+        String frozenContractAmount = Util.null2DefaultStr(mainData.get(this.frozenContractAmount), "0");
+//        合同金额冻结金额回滚
+        double contractAmountNum = Double.parseDouble(contractBalance) + Double.parseDouble(frozenContractAmount);
+        double creditAmountNum = Double.parseDouble(creditBalance) + Double.parseDouble(frozenCreditAmount);
+//        更新数据库信息
+        Map<String, Object> map = new HashMap<>(8);
+        map.put(this.contractBalance, contractAmountNum);
+        map.put(this.contractAmount, contractAmountNum);
+        map.put(this.creditAmount, creditAmountNum);
+        map.put(this.creditBalance, creditAmountNum);
+        map.put(this.frozenContractAmount, "0");
+        map.put(this.frozenCreditAmount, "0");
+        String sql = builderUpdateSql(map);
+        map.put("requestId", requestId);
+        boolean flag = mapper.updateDataByRequestId(sql, map);
+        if (!flag) {
+            throw new CustomerException("数据更新失败！" + sql + " ==> " + map);
+        }
+    }
+
+    private String builderUpdateSql(Map<String, Object> map) {
+        StringBuilder sb = new StringBuilder("update ");
+        sb.append(tableName).append(" set ");
+        int n = 0;
+        for (Map.Entry<String, Object> entry : map.entrySet()) {
+            n++;
+            sb.append(entry.getKey()).append(" = #{").append(entry.getKey()).append("}");
+            if (n < map.size()) {
+                sb.append(" ,");
+            }
+        }
+        sb.append(" where requestid = #{requestId}");
+        return sb.toString();
+    }
+
+
+    public void setContractAmount(String contractAmount) {
+        this.contractAmount = contractAmount;
+    }
+
+    public void setCreditAmount(String creditAmount) {
+        this.creditAmount = creditAmount;
+    }
+
+    public void setContractBalance(String contractBalance) {
+        this.contractBalance = contractBalance;
+    }
+
+    public void setCreditBalance(String creditBalance) {
+        this.creditBalance = creditBalance;
+    }
+
+    public void setFrozenCreditAmount(String frozenCreditAmount) {
+        this.frozenCreditAmount = frozenCreditAmount;
+    }
+
+    public void setFrozenContractAmount(String frozenContractAmount) {
+        this.frozenContractAmount = frozenContractAmount;
+    }
+}
diff --git a/src/main/youhong_ai_old_src/weaver/workflow/aiyh_saiao/mapper/UnfrozenAmountActionMapper.java b/src/main/youhong_ai_old_src/weaver/workflow/aiyh_saiao/mapper/UnfrozenAmountActionMapper.java
new file mode 100644
index 0000000..c6fd2f5
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/workflow/aiyh_saiao/mapper/UnfrozenAmountActionMapper.java
@@ -0,0 +1,36 @@
+package weaver.workflow.aiyh_saiao.mapper;
+
+import aiyh.utils.annotation.recordset.*;
+
+import java.util.Map;
+
+/**
+ * <p>金额解除冻结action Mapper接口</p>
+ * <p>create 2022/3/29 7:33 PM</p>
+ *
+ * @author ayh
+ */
+
+@SqlMapper
+public interface UnfrozenAmountActionMapper {
+
+
+    /**
+     * 查询主表数据
+     * @param requestId 请求ID
+     * @param tableName 表名
+     * @return 结果
+     */
+    @Select("select * from $t{tableName} where requestid = #{requestId}")
+    public Map<String, Object> selectMainData(@ParamMapper("requestId") String requestId,
+                                              @ParamMapper("tableName") String tableName);
+
+    /**
+     * 更新流程shave
+     * @param sql 自定义sql
+     * @param data 数据
+     * @return 是否更新成功
+     */
+    @Update(custom = true)
+    boolean updateDataByRequestId(@SqlString String sql, Map<String,Object> data);
+}
diff --git a/src/main/youhong_ai_old_src/weaver/workflow/cms/xiao/action/ContractAction.java b/src/main/youhong_ai_old_src/weaver/workflow/cms/xiao/action/ContractAction.java
new file mode 100644
index 0000000..b547279
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/workflow/cms/xiao/action/ContractAction.java
@@ -0,0 +1,106 @@
+package weaver.workflow.cms.xiao.action;
+
+import aiyh.utils.zwl.common.ToolUtil;
+import com.weaver.general.Util;
+import weaver.conn.RecordSet;
+import weaver.interfaces.workflow.action.Action;
+import weaver.soa.workflow.request.RequestInfo;
+
+import java.math.BigDecimal;
+import java.util.*;
+import java.util.concurrent.atomic.AtomicReference;
+
+/**
+ * @author XiaoBokang
+ * @create 2021/8/26 13:04
+ */
+
+public class ContractAction extends ToolUtil implements Action {
+
+    private final String className = "ContractAction";
+    @Override
+    public String execute(RequestInfo requestInfo) {
+        this.writeDebugLog("-------------------ContractAction Begin------------------------");
+        //获取流程基本信息
+        String workflowId = Util.null2String(requestInfo.getWorkflowid());
+        String requestId = Util.null2String(requestInfo.getRequestid());
+        String tableName = requestInfo.getRequestManager().getBillTableName();
+        this.writeDebuggerLog(this.className, "workflowid:[" + workflowId + "],requestid:[" + requestId + "],tablename:[" + tableName + "]");
+        if ("".equals(tableName)) {
+            tableName = getBillTableNameByWorkflowId(workflowId);
+        }
+
+        //获取流程表单中的数据
+        RecordSet rs = new RecordSet();
+        String select_workflow_main = "select * from " + tableName + " where requestid = ?";
+        rs.executeQuery(select_workflow_main, requestId);
+        this.writeDebuggerLog(this.className,"execute select_workflow_main: "+select_workflow_main);
+        if(rs.next()){
+
+            this.writeDebuggerLog(this.className,"获取到的对应数据");
+            Map<String,Map<Integer, Map<String,Double>>> ruleMap = getRuleMap();
+            this.writeDebugLog(ruleMap);
+            AtomicReference<Double> sumScore = new AtomicReference<>(0.00);
+            //计算风险总值
+            try {
+                ruleMap.forEach((k, v) -> {
+                    int item = Util.getIntValue(rs.getString(k),-1);
+                    if(item!=-1) {
+                        Map<String, Double> rule = v.get(item);
+                        double score = rule.get("score");
+                        double weight = rule.get("weight");
+                        double newScore = score * weight;
+                        sumScore.updateAndGet(v1 -> (double) (v1 + newScore));
+                    }
+                });
+            }catch (NullPointerException e){
+                e.printStackTrace();
+                this.writeDebuggerLog(this.className,"未读取到配置列表中的信息，请检查配置表");
+                this.writeDebugLog(e);
+            }
+
+            double scoreSum = Double.parseDouble(sumScore.toString())/2.85*100;
+            this.writeDebuggerLog(this.className,"合同风险总值："+scoreSum);
+            BigDecimal sumScoreValue = BigDecimal.valueOf(scoreSum);
+            String update_sql = "update "+tableName+" set htfxfzNew = ? where requestid = ?";
+            this.writeDebuggerLog(this.className,update_sql+sumScoreValue+" "+requestId);
+            rs.executeUpdate(update_sql,sumScoreValue,requestId);
+
+        }
+
+        this.writeDebuggerLog(this.className,"-------------------ContractAction End ------------------------");
+        return Action.SUCCESS;
+    }
+
+    /**
+     * 获取配置建模表的信息
+     * 将查询到的数据映射到一个Map集合中
+     * @return
+     */
+    public Map<String,Map<Integer, Map<String,Double>>> getRuleMap(){
+
+        Map<String,Map<Integer, Map<String,Double>>> ruleMap = new HashMap<>();
+        RecordSet recordSet = new RecordSet();
+        String query_rule_sql = "select DISTINCT field from uf_contract_risk ";
+        recordSet.executeQuery(query_rule_sql);
+        while(recordSet.next()){
+            ruleMap.put(recordSet.getString("field"),new HashMap<>());
+        }
+
+        query_rule_sql = "select * from uf_contract_risk ";
+        recordSet.executeQuery(query_rule_sql);
+        while(recordSet.next()){
+            String field = recordSet.getString("field");
+            int item = Util.getIntValue(recordSet.getString("item"));
+            double score = Util.getDoubleValue(recordSet.getString("score"));
+            double weight = Util.getDoubleValue(recordSet.getString("weight"));
+            Map<String,Double> rule = new HashMap<>();
+            rule.put("score",score);
+            rule.put("weight",weight);
+            Map<Integer,Map<String,Double>> scoreMap = ruleMap.get(field);
+            scoreMap.put(item,rule);
+        }
+
+        return ruleMap;
+    }
+}
diff --git a/src/main/youhong_ai_old_src/weaver/workflow/cms/xiao/entity/VendorContent.java b/src/main/youhong_ai_old_src/weaver/workflow/cms/xiao/entity/VendorContent.java
new file mode 100644
index 0000000..3db67c8
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/workflow/cms/xiao/entity/VendorContent.java
@@ -0,0 +1,48 @@
+package weaver.workflow.cms.xiao.entity;
+
+
+import java.util.List;
+
+/**
+ * @author XiaoBokang
+ * @create 2021/10/9 13:52
+ */
+
+public class VendorContent {
+    private Integer totalPage;
+    private Integer page;
+    private List<VendorItem> items;
+
+    @Override
+    public String toString() {
+        return "VendorContent{" +
+                "totalPage=" + totalPage +
+                ", page=" + page +
+                ", items=" + items +
+                '}';
+    }
+
+    public Integer getTotalPage() {
+        return totalPage;
+    }
+
+    public void setTotalPage(Integer totalPage) {
+        this.totalPage = totalPage;
+    }
+
+    public Integer getPage() {
+        return page;
+    }
+
+    public void setPage(Integer page) {
+        this.page = page;
+    }
+
+    public List<VendorItem> getItems() {
+        return items;
+    }
+
+    public void setItems(List<VendorItem> items) {
+        this.items = items;
+    }
+}
diff --git a/src/main/youhong_ai_old_src/weaver/workflow/cms/xiao/entity/VendorItem.java b/src/main/youhong_ai_old_src/weaver/workflow/cms/xiao/entity/VendorItem.java
new file mode 100644
index 0000000..cf013a6
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/workflow/cms/xiao/entity/VendorItem.java
@@ -0,0 +1,297 @@
+package weaver.workflow.cms.xiao.entity;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
+/**
+ * @author XiaoBokang
+ * @create 2021/10/9 14:06
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class VendorItem {
+    private String vendorCode;
+    private String vendorNameCn;
+    private String vendorNameEn;
+    private String vatRegNo;
+    private String addressEn;
+    private String postCode;
+    private String city;
+    private String chineseName;
+    private String englishName;
+    private String telephoneNo;
+    private String email;
+    private String nationalType;
+    private String purchasingGroup;
+    private String contactPerson;
+    private String vendorType;
+    private String renderedService;
+    private String mobileNumber;
+    private String paymentMethod;
+    private String invoiceType;
+    private String taxRate;
+    private String language;
+    private String isRelatedParty;
+    private String whetherTobeDealer;
+    private String businessPartnerCheckNumber;
+    private String organization;
+    private String createBy;
+    private String whetherSupportEchapter;
+    private String fadadaEchapter;
+
+    @Override
+    public String toString() {
+        return "VendorItem{" +
+                "vendorCode='" + vendorCode + '\'' +
+                ", vendorNameCn='" + vendorNameCn + '\'' +
+                ", vendorNameEn='" + vendorNameEn + '\'' +
+                ", vatRegNo='" + vatRegNo + '\'' +
+                ", addressEn='" + addressEn + '\'' +
+                ", postCode='" + postCode + '\'' +
+                ", city='" + city + '\'' +
+                ", chineseName='" + chineseName + '\'' +
+                ", englishName='" + englishName + '\'' +
+                ", telephoneNo='" + telephoneNo + '\'' +
+                ", email='" + email + '\'' +
+                ", nationalType='" + nationalType + '\'' +
+                ", purchasingGroup='" + purchasingGroup + '\'' +
+                ", contactPerson='" + contactPerson + '\'' +
+                ", vendorType='" + vendorType + '\'' +
+                ", renderedService='" + renderedService + '\'' +
+                ", mobileNumber='" + mobileNumber + '\'' +
+                ", paymentMethod='" + paymentMethod + '\'' +
+                ", invoiceType='" + invoiceType + '\'' +
+                ", taxRate='" + taxRate + '\'' +
+                ", language='" + language + '\'' +
+                ", isRelatedParty='" + isRelatedParty + '\'' +
+                ", whetherTobeDealer='" + whetherTobeDealer + '\'' +
+                ", businessPartnerCheckNumber='" + businessPartnerCheckNumber + '\'' +
+                ", organization='" + organization + '\'' +
+                ", createBy='" + createBy + '\'' +
+                ", whetherSupportEchapter='" + whetherSupportEchapter + '\'' +
+                ", fadadaEchapter='" + fadadaEchapter + '\'' +
+                '}';
+    }
+
+    public String getVendorCode() {
+        return vendorCode;
+    }
+
+    public void setVendorCode(String vendorCode) {
+        this.vendorCode = vendorCode;
+    }
+
+    public String getVendorNameCn() {
+        return vendorNameCn;
+    }
+
+    public void setVendorNameCn(String vendorNameCn) {
+        this.vendorNameCn = vendorNameCn;
+    }
+
+    public String getVendorNameEn() {
+        return vendorNameEn;
+    }
+
+    public void setVendorNameEn(String vendorNameEn) {
+        this.vendorNameEn = vendorNameEn;
+    }
+
+    public String getVatRegNo() {
+        return vatRegNo;
+    }
+
+    public void setVatRegNo(String vatRegNo) {
+        this.vatRegNo = vatRegNo;
+    }
+
+    public String getAddressEn() {
+        return addressEn;
+    }
+
+    public void setAddressEn(String addressEn) {
+        this.addressEn = addressEn;
+    }
+
+    public String getPostCode() {
+        return postCode;
+    }
+
+    public void setPostCode(String postCode) {
+        this.postCode = postCode;
+    }
+
+    public String getCity() {
+        return city;
+    }
+
+    public void setCity(String city) {
+        this.city = city;
+    }
+
+    public String getChineseName() {
+        return chineseName;
+    }
+
+    public void setChineseName(String chineseName) {
+        this.chineseName = chineseName;
+    }
+
+    public String getEnglishName() {
+        return englishName;
+    }
+
+    public void setEnglishName(String englishName) {
+        this.englishName = englishName;
+    }
+
+    public String getTelephoneNo() {
+        return telephoneNo;
+    }
+
+    public void setTelephoneNo(String telephoneNo) {
+        this.telephoneNo = telephoneNo;
+    }
+
+    public String getEmail() {
+        return email;
+    }
+
+    public void setEmail(String email) {
+        this.email = email;
+    }
+
+    public String getNationalType() {
+        return nationalType;
+    }
+
+    public void setNationalType(String nationalType) {
+        this.nationalType = nationalType;
+    }
+
+    public String getPurchasingGroup() {
+        return purchasingGroup;
+    }
+
+    public void setPurchasingGroup(String purchasingGroup) {
+        this.purchasingGroup = purchasingGroup;
+    }
+
+    public String getContactPerson() {
+        return contactPerson;
+    }
+
+    public void setContactPerson(String contactPerson) {
+        this.contactPerson = contactPerson;
+    }
+
+    public String getVendorType() {
+        return vendorType;
+    }
+
+    public void setVendorType(String vendorType) {
+        this.vendorType = vendorType;
+    }
+
+    public String getRenderedService() {
+        return renderedService;
+    }
+
+    public void setRenderedService(String renderedService) {
+        this.renderedService = renderedService;
+    }
+
+    public String getMobileNumber() {
+        return mobileNumber;
+    }
+
+    public void setMobileNumber(String mobileNumber) {
+        this.mobileNumber = mobileNumber;
+    }
+
+    public String getPaymentMethod() {
+        return paymentMethod;
+    }
+
+    public void setPaymentMethod(String paymentMethod) {
+        this.paymentMethod = paymentMethod;
+    }
+
+    public String getInvoiceType() {
+        return invoiceType;
+    }
+
+    public void setInvoiceType(String invoiceType) {
+        this.invoiceType = invoiceType;
+    }
+
+    public String getTaxRate() {
+        return taxRate;
+    }
+
+    public void setTaxRate(String taxRate) {
+        this.taxRate = taxRate;
+    }
+
+    public String getLanguage() {
+        return language;
+    }
+
+    public void setLanguage(String language) {
+        this.language = language;
+    }
+
+    public String getIsRelatedParty() {
+        return isRelatedParty;
+    }
+
+    public void setIsRelatedParty(String isRelatedParty) {
+        this.isRelatedParty = isRelatedParty;
+    }
+
+    public String getWhetherTobeDealer() {
+        return whetherTobeDealer;
+    }
+
+    public void setWhetherTobeDealer(String whetherTobeDealer) {
+        this.whetherTobeDealer = whetherTobeDealer;
+    }
+
+    public String getBusinessPartnerCheckNumber() {
+        return businessPartnerCheckNumber;
+    }
+
+    public void setBusinessPartnerCheckNumber(String businessPartnerCheckNumber) {
+        this.businessPartnerCheckNumber = businessPartnerCheckNumber;
+    }
+
+    public String getOrganization() {
+        return organization;
+    }
+
+    public void setOrganization(String organization) {
+        this.organization = organization;
+    }
+
+    public String getCreateBy() {
+        return createBy;
+    }
+
+    public void setCreateBy(String createBy) {
+        this.createBy = createBy;
+    }
+
+    public String getWhetherSupportEchapter() {
+        return whetherSupportEchapter;
+    }
+
+    public void setWhetherSupportEchapter(String whetherSupportEchapter) {
+        this.whetherSupportEchapter = whetherSupportEchapter;
+    }
+
+    public String getFadadaEchapter() {
+        return fadadaEchapter;
+    }
+
+    public void setFadadaEchapter(String fadadaEchapter) {
+        this.fadadaEchapter = fadadaEchapter;
+    }
+}
diff --git a/src/main/youhong_ai_old_src/weaver/workflow/cms/xiao/entity/VendorResult.java b/src/main/youhong_ai_old_src/weaver/workflow/cms/xiao/entity/VendorResult.java
new file mode 100644
index 0000000..b22d2da
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/workflow/cms/xiao/entity/VendorResult.java
@@ -0,0 +1,55 @@
+package weaver.workflow.cms.xiao.entity;
+
+/**
+ * @author XiaoBokang
+ * @create 2021/10/9 12:48
+ */
+
+public class VendorResult {
+    private Boolean code;
+    private String errorMessage;
+    private String traceId;
+    private VendorContent content;
+
+    @Override
+    public String toString() {
+        return "VendorResult{" +
+                "code=" + code +
+                ", errorMessage='" + errorMessage + '\'' +
+                ", traceId='" + traceId + '\'' +
+                ", content=" + content +
+                '}';
+    }
+
+    public Boolean getCode() {
+        return code;
+    }
+
+    public void setCode(Boolean code) {
+        this.code = code;
+    }
+
+    public String getErrorMessage() {
+        return errorMessage;
+    }
+
+    public void setErrorMessage(String errorMessage) {
+        this.errorMessage = errorMessage;
+    }
+
+    public String getTraceId() {
+        return traceId;
+    }
+
+    public void setTraceId(String traceId) {
+        this.traceId = traceId;
+    }
+
+    public VendorContent getContent() {
+        return content;
+    }
+
+    public void setContent(VendorContent content) {
+        this.content = content;
+    }
+}
diff --git a/src/main/youhong_ai_old_src/weaver/workflow/cms/xiao/schedule/RateSchedule.java b/src/main/youhong_ai_old_src/weaver/workflow/cms/xiao/schedule/RateSchedule.java
new file mode 100644
index 0000000..bcc7513
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/workflow/cms/xiao/schedule/RateSchedule.java
@@ -0,0 +1,82 @@
+package weaver.workflow.cms.xiao.schedule;
+
+import aiyh.utils.zwl.common.ToolUtil;
+import com.api.cms.xiao.utils.RequestBaseInfo;
+import com.api.cms.xiao.utils.RequestUtil;
+import com.api.cms.xiao.utils.entity.RateEntity;
+import com.api.cms.xiao.utils.entity.RateRes;
+import com.weaver.general.TimeUtil;
+import com.weaver.general.Util;
+import weaver.conn.RecordSet;
+import weaver.formmode.data.ModeDataIdUpdate;
+import weaver.formmode.setup.ModeRightInfo;
+import weaver.interfaces.schedule.BaseCronJob;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author XiaoBokang
+ * @create 2021/9/2 13:31
+ */
+
+public class RateSchedule extends BaseCronJob {
+
+    private String formModeId;
+
+    private final ToolUtil toolUtil = new ToolUtil();
+    public static final String CLASS_NAME = "RateSchedule";
+
+    @Override
+    public void execute() {
+
+        toolUtil.writeDebuggerLog(CLASS_NAME,"--------------------"+CLASS_NAME+" begin-------------------");
+        toolUtil.writeDebuggerLog(CLASS_NAME,"参数formModeId："+formModeId);
+
+        RecordSet rs = new RecordSet();
+        Map<String,String> headers = new HashMap<>();
+        Map<String,Object> params = new HashMap<>();
+        headers.put("Content-Type","application/json");
+        params.put("LocalCurrency","CNY");
+        headers.put("apiKey",toolUtil.getSystemParamValue("Rate_Key"));
+        RateRes res = RequestUtil.apiRequest(RequestBaseInfo.create(
+                "POST",
+                toolUtil.getSystemParamValue("Rate_Url"),
+                headers
+        ), RateRes.class);
+        toolUtil.writeDebuggerLog(CLASS_NAME,"request success：");
+        toolUtil.writeDebugLog(res);
+        List<RateEntity> rateEntityList = res.getItems();
+        RecordSet recordSet = new RecordSet();
+        for (RateEntity rateEntity : rateEntityList) {
+
+            String querySql = "select * from uf_hl where currency = ?";
+            recordSet.executeQuery(querySql,rateEntity.getCurrency());
+            if(recordSet.next()){
+                String updateSql = "update uf_hl set currency = ?,localcurrency = ?,rate = ?,validdate = ?  where currency = ?";
+                rs.executeUpdate(updateSql,rateEntity.getCurrency(),rateEntity.getLocalCurrency(),rateEntity.getRate(),rateEntity.getValidDate(),rateEntity.getCurrency());
+                continue;
+            }
+            ModeDataIdUpdate mdu = ModeDataIdUpdate.getInstance();
+            int dataid = mdu.getModeDataNewId("uf_hl", Util.getIntValue(formModeId,-1), 1, 0, TimeUtil.getCurrentDateString(), TimeUtil.getOnlyCurrentTimeString());
+            String updateSql = "update uf_hl set currency = ?,localcurrency = ?,rate = ?,validdate = ?  where id = ?";
+            rs.executeUpdate(updateSql,rateEntity.getCurrency(),rateEntity.getLocalCurrency(),rateEntity.getRate(),rateEntity.getValidDate(),dataid);
+            //数据权限重构
+            ModeRightInfo mri = new ModeRightInfo();
+            mri.rebuildModeDataShareByEdit(1,Util.getIntValue(formModeId,-1),dataid);
+
+        }
+
+        toolUtil.writeDebuggerLog(CLASS_NAME,"--------------------"+CLASS_NAME+" over-------------------");
+
+    }
+
+    public String getFormModeId() {
+        return formModeId;
+    }
+
+    public void setFormModeId(String formModeId) {
+        this.formModeId = formModeId;
+    }
+}
diff --git a/src/main/youhong_ai_old_src/weaver/workflow/cms/xiao/schedule/VendorSyncSchedule.java b/src/main/youhong_ai_old_src/weaver/workflow/cms/xiao/schedule/VendorSyncSchedule.java
new file mode 100644
index 0000000..5a61095
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/workflow/cms/xiao/schedule/VendorSyncSchedule.java
@@ -0,0 +1,305 @@
+package weaver.workflow.cms.xiao.schedule;
+
+import aiyh.utils.zwl.common.ToolUtil;
+import com.alibaba.fastjson.JSON;
+import com.weaver.general.TimeUtil;
+import com.weaver.general.Util;
+import weaver.conn.RecordSet;
+import weaver.formmode.data.ModeDataIdUpdate;
+import weaver.formmode.setup.ModeRightInfo;
+import weaver.interfaces.schedule.BaseCronJob;
+import weaver.workflow.cms.xiao.entity.VendorItem;
+import weaver.workflow.cms.xiao.entity.VendorResult;
+import weaver.workflow.cms.xiao.utils.RequestBaseInfo;
+import weaver.workflow.cms.xiao.utils.RequestUtil;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author XiaoBokang
+ * @create 2021/10/9 12:10
+ */
+
+public class VendorSyncSchedule extends BaseCronJob {
+
+
+    private String formModeId;//建模id
+    private String vendorSyncUrl;//请求地址
+    private String vendorSyncKey;//key
+    private String pageSize;
+    private String ToKen;
+
+    private Integer totalPage = 1;
+
+
+    private final ToolUtil toolUtil = new ToolUtil();//工具类用于打印日志及其他操作
+    public static final String CLASS_NAME = "VendorSyncSchedule";
+    private final ModeDataIdUpdate mdu = ModeDataIdUpdate.getInstance();
+    private final ModeRightInfo mri = new ModeRightInfo();
+
+    private final Map<String, String>  subCompanyMap = new HashMap<>();//分部信息，分部全称对应id
+    private final Map<String,String> subCompanyDescMap = new HashMap<>();//分部信息，分部全称对应简称
+    private final Map<String,String> oneVendorMap = new HashMap<>();//各个分部的一次性供应商编码
+//    private final Map<String,String> vendorList = new HashMap<>();//数据库中已存在的供应商列表
+    private final List<Integer> maids = new ArrayList<>();//供应商主键集合
+
+    {
+        oneVendorMap.put("PCN","700000410");
+        oneVendorMap.put("PHK","702000290");
+        oneVendorMap.put("space4.0","700000410");
+        oneVendorMap.put("PSCN","400300000");
+        oneVendorMap.put("PFLCN","400300000");
+        oneVendorMap.put("PDC","700000410");
+        oneVendorMap.put("PMAP","700000410");
+    }
+
+    @Override
+    public void execute() {
+        toolUtil.writeDebuggerLog(CLASS_NAME,"--------------------"+CLASS_NAME+" begin-------------------");
+        toolUtil.writeDebuggerLog(CLASS_NAME,"参数formModeId："+formModeId+" vendorSyncUrl:"+vendorSyncUrl+" vendorSyncKey:"+vendorSyncKey+" pageSize:"+pageSize);
+
+        int pageSizeParam = Util.getIntValue(pageSize,500);
+        Map<String,String> headers = new HashMap<>();
+        Map<String,Object> params = new HashMap<>();
+        params.put("ToKen",ToKen);
+        headers.put("apiKey",vendorSyncKey);
+        int page = 1;
+        boolean flag = true;
+        //做do-while循环发送请求，同步供应商信息
+        try {
+            do {
+                params.put("pageSize", pageSizeParam);
+                params.put("page", page);
+                toolUtil.writeDebuggerLog(String.format("请求同步：url->{%s},参数ToKen->{%s},参数apiKey->{%s},参数pageSize->{%s},参数page->{%s}"
+                        ,vendorSyncUrl,ToKen,vendorSyncKey,pageSizeParam,page));
+                VendorResult res = RequestUtil.apiRequest(RequestBaseInfo.create(
+                        "GET",
+                        vendorSyncUrl,
+                        headers,
+                        params
+                ), VendorResult.class);
+                if (res != null && res.getCode()) {
+                    //初始化只有在请求成功并且只做一次
+                    if (flag) {
+                        totalPage = res.getContent().getTotalPage();
+                        //将数据库已经存在的供应商列表查询出来，将分部信息初始化
+                        flag = false;
+                    }
+                    this.getVendorListBySql();
+                    toolUtil.writeDebuggerLog(CLASS_NAME, "request success：");
+                    toolUtil.writeDebugLog("get totalPages:"+res.getContent().getTotalPage());
+                    //进行具体插入操作
+                    this.insetVendor(res.getContent().getItems());
+                }
+            } while (page++ < totalPage);
+        }catch (Exception e){
+            toolUtil.writeDebuggerLog(CLASS_NAME,"发生异常");
+            toolUtil.writeDebugLog(e);
+        }
+        //在所有信息更新之后，另外开一个线程来进行数据权限重构
+        new Thread(new VendorSyncTheard(1,Util.getIntValue(formModeId,-1),maids,mri)).start();
+        toolUtil.writeDebuggerLog(CLASS_NAME,"--------------------"+CLASS_NAME+" over-------------------");
+    }
+
+    /**
+     * 向建模表插入供应商数据
+     * @param itemList 供应商集合
+     */
+    private void insetVendor(List<VendorItem> itemList){
+        RecordSet rs = new RecordSet();
+        toolUtil.writeDebuggerLog("向建模表添加数据："+JSON.toJSONString(itemList.size()));
+        RecordSet update_recordRes = new RecordSet();
+        //进行批量更新的list
+        List<List> bachList = new ArrayList<>();
+        //进行批量修改的sql语句
+        String updateSql = "update uf_gyszsjb set vendorCode = ?,vendorNameCn = ?,vendorNameEn = ?,vatRegNo = ?" +
+                ",addressEn = ?,nationalType = ?,isRelatedParty = ?,businessPartnerCheckNumber = ?,organization = ?" +
+                ",szfb=?,sfdlgys= ?,ywhbsc = ?,vendorType = ?,fadadaechapter = ? where id = ?";
+        for (VendorItem vendorItem : itemList) {
+            //进行数据更新时的参数集合
+            List<Object> vendorParamList = new ArrayList<>();
+            String query = "select id from uf_gyszsjb where ";
+            StringBuilder stringBuilder = new StringBuilder(query);
+            List<String> args = new ArrayList<>();
+//             = ? and vendorNameCn = ? and vendorNameEn = ? and vatRegNo = ?
+            if(vendorItem.getVendorCode() == null){
+                stringBuilder.append("vendorCode is null ");
+            }else{
+                stringBuilder.append("vendorCode = ? ");
+                args.add(vendorItem.getVendorCode());
+            }
+            /*if(vendorItem.getVendorNameCn() == null){
+                stringBuilder.append(" and vendorNameCn is null ");
+            }else{
+                stringBuilder.append(" and vendorNameCn = ? ");
+                args.add(vendorItem.getVendorNameCn());
+            }
+            if(vendorItem.getVendorNameEn() == null){
+                stringBuilder.append(" and vendorNameEn is null ");
+            }else{
+                stringBuilder.append(" and vendorNameEn = ? ");
+                args.add(vendorItem.getVendorNameEn());
+            }
+            if(vendorItem.getVatRegNo() == null){
+                stringBuilder.append(" and vatRegNo is null ");
+            }else{
+                stringBuilder.append(" and vatRegNo = ? ");
+                args.add(vendorItem.getVatRegNo());
+            }*/
+            if(vendorItem.getOrganization() == null){
+                stringBuilder.append(" and organization is null ");
+            }else{
+                stringBuilder.append(" and organization = ? ");
+                args.add(vendorItem.getOrganization());
+            }
+            rs.executeQuery(stringBuilder.toString(),args);
+            int mainId = -1;
+            if(rs.next()){
+                mainId = rs.getInt("id");
+//                toolUtil.writeDebuggerLog("查询到数据id：" + mainId);
+            }
+//            int mainId = Util.getIntValue(vendorList.get(vendorItem.getVendorCode()+","+vendorItem.getVendorNameCn()+","+vendorItem.getVendorNameEn()+","+vendorItem.getVatRegNo()),-1);
+            //将分部全程转换成简称
+            String companyName = Util.null2String(subCompanyDescMap.get(vendorItem.getOrganization()));
+            //是否大陆供应商
+            int sfdlgys = 1;
+            if("China".equals(vendorItem.getNationalType())){
+                sfdlgys = 0;
+            }
+            //是否为一次性供应商
+            int vendorType = 1;
+            if(oneVendorMap.get(companyName) != null && oneVendorMap.get(companyName).equals(vendorItem.getVendorCode())){
+                vendorType = 0;
+            }
+            //所属分部
+            int szfb = Util.getIntValue(subCompanyMap.get(vendorItem.getOrganization()),-1);
+            //是否业务伙伴审查
+            int ywhbsc = 1;
+            if(vendorItem.getBusinessPartnerCheckNumber() != null && !"".equals(vendorItem.getBusinessPartnerCheckNumber())){
+                ywhbsc = 0;
+            }
+            //判断数据库是否存在此条记录，若存在则进行更新操作
+            if(mainId == -1){
+                mainId =  mdu.getModeDataNewId("uf_gyszsjb", Util.getIntValue(formModeId,-1), 1, 0, TimeUtil.getCurrentDateString(), TimeUtil.getOnlyCurrentTimeString());
+            }
+//            String updateSql = "update uf_gyszsjb set vendorCode = ?,vendorNameCn = ?,vendorNameEn = ?,vatRegNo = ?" +
+//                    ",addressEn = ?,nationalType = ?,isRelatedParty = ?,businessPartnerCheckNumber = ?,organization = ?" +
+//                    ",szfb=?,sfdlgys= ?,ywhbsc = ?,vendorType = ? where id = ?";
+//            long l1 = System.currentTimeMillis();
+//            update_recordRes.executeUpdate(updateSql,
+//                    vendorItem.getVendorCode(),
+//                    vendorItem.getVendorNameCn(),
+//                    vendorItem.getVendorNameEn(),
+//                    vendorItem.getVatRegNo(),
+//                    vendorItem.getAddressEn(),
+//                    vendorItem.getNationalType(),
+//                    vendorItem.getIsRelatedParty(),
+//                    vendorItem.getBusinessPartnerCheckNumber(),
+//                    vendorItem.getOrganization(),
+//                    szfb,
+//                    sfdlgys,
+//                    ywhbsc,
+//                    vendorType,
+//                    mainId
+//            );
+//            long l2 = System.currentTimeMillis();
+//            System.out.println("执行数据更新用时："+(l2-l1));
+//            maids.add(mainId);
+            vendorParamList.add(vendorItem.getVendorCode());
+            vendorParamList.add(vendorItem.getVendorNameCn());
+            vendorParamList.add(vendorItem.getVendorNameEn());
+            vendorParamList.add(vendorItem.getVatRegNo());
+            vendorParamList.add(vendorItem.getAddressEn());
+            vendorParamList.add(vendorItem.getNationalType());
+            vendorParamList.add(vendorItem.getIsRelatedParty());
+            vendorParamList.add(vendorItem.getBusinessPartnerCheckNumber());
+            vendorParamList.add(vendorItem.getOrganization());
+            vendorParamList.add(szfb);
+            vendorParamList.add(sfdlgys);
+            vendorParamList.add(ywhbsc);
+            vendorParamList.add(vendorType);
+            vendorParamList.add(vendorItem.getFadadaEchapter());
+            vendorParamList.add(mainId);
+
+            bachList.add(vendorParamList);
+            maids.add(mainId);
+        }
+        //进行批量操作
+        toolUtil.writeDebuggerLog("执行批量操作："+updateSql);
+        update_recordRes.executeBatchSql(updateSql,bachList);
+    }
+
+    /**
+     * 查询出数据库已经存在的供应商列表
+     * 查询出分部信息
+     */
+    private void getVendorListBySql(){
+        String query_vendor_list = "select id,vendorCode,vendorNameCn,vendorNameEn,vatRegNo from uf_gyszsjb";
+        String query_subCompany_list = "select id,subcompanyname,subcompanydesc from HrmSubCompany";
+        RecordSet recordSet = new RecordSet();
+        RecordSet subCompany_recordset = new RecordSet();
+        toolUtil.writeDebuggerLog("执行查询，供应商列表与分部信息：");
+        recordSet.executeQuery(query_vendor_list);
+        subCompany_recordset.executeQuery(query_subCompany_list);
+//        while (recordSet.next()){
+//            String vendorCode = Util.null2String(recordSet.getString("vendorCode"));
+//            String vendorNameCn = Util.null2String(recordSet.getString("vendorNameCn"));
+//            String vendorNameEn = Util.null2String(recordSet.getString("vendorNameEn"));
+//            String vatRegNo = Util.null2String(recordSet.getString("vatRegNo"));
+//            String mainId = Util.null2String(String.valueOf(recordSet.getString("id")));
+//            vendorList.put(vendorCode+","+vendorNameCn+","+vendorNameEn+","+vatRegNo,mainId);
+//        }
+        while(subCompany_recordset.next()){
+            String subCompanyName = Util.null2String(subCompany_recordset.getString("subcompanyname"));
+            String subCompanyDesc = Util.null2String(subCompany_recordset.getString("subcompanydesc"));
+            String mainId = Util.null2String(String.valueOf(subCompany_recordset.getString("id")));
+            subCompanyDescMap.put(subCompanyDesc,subCompanyName);
+            subCompanyMap.put(subCompanyDesc,mainId);
+        }
+//        toolUtil.writeDebuggerLog("查询成功，数据库原有供应商长度为==>"+vendorList.size());
+        toolUtil.writeDebuggerLog("查询成功：分部简称全程对应信息:"+JSON.toJSONString(subCompanyDescMap)+" \n 分部信息id对应："+JSON.toJSONString(subCompanyMap));
+    }
+
+    public String getFormModeId() {
+        return formModeId;
+    }
+
+    public void setFormModeId(String formModeId) {
+        this.formModeId = formModeId;
+    }
+
+    public String getVendorSyncUrl() {
+        return vendorSyncUrl;
+    }
+
+    public void setVendorSyncUrl(String vendorSyncUrl) {
+        this.vendorSyncUrl = vendorSyncUrl;
+    }
+
+    public String getVendorSyncKey() {
+        return vendorSyncKey;
+    }
+
+    public void setVendorSyncKey(String vendorSyncKey) {
+        this.vendorSyncKey = vendorSyncKey;
+    }
+
+    public String getPageSize() {
+        return pageSize;
+    }
+
+    public void setPageSize(String pageSize) {
+        this.pageSize = pageSize;
+    }
+
+    public String getToKen() {
+        return ToKen;
+    }
+
+    public void setToKen(String toKen) {
+        ToKen = toKen;
+    }
+}
diff --git a/src/main/youhong_ai_old_src/weaver/workflow/cms/xiao/schedule/VendorSyncTheard.java b/src/main/youhong_ai_old_src/weaver/workflow/cms/xiao/schedule/VendorSyncTheard.java
new file mode 100644
index 0000000..bedf1e1
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/workflow/cms/xiao/schedule/VendorSyncTheard.java
@@ -0,0 +1,39 @@
+package weaver.workflow.cms.xiao.schedule;
+
+
+import weaver.formmode.setup.ModeRightInfo;
+import weaver.integration.mail.MailOperation;
+
+import java.util.List;
+
+/**
+ * @author XiaoBokang
+ * @create 2021/10/9 17:46
+ */
+
+public class VendorSyncTheard implements Runnable{
+
+    private Integer userId;
+    private Integer modelId;
+    private ModeRightInfo mri;
+    private List<Integer> mainIds;
+
+    public VendorSyncTheard(int userId, int modelId, List<Integer> mainIds, ModeRightInfo mri){
+        this.userId = userId;
+        this.modelId = modelId;
+        this.mainIds = mainIds;
+        this.mri = mri;
+    }
+
+    @Override
+    public void run() {
+        for (Integer mainId : mainIds) {
+            long l4 = System.currentTimeMillis();
+            mri.rebuildModeDataShareByEdit(userId,modelId,mainId);
+            mri.setNewRight(true);
+            mri.editModeDataShare(userId,modelId,mainId);//新建时添加共享
+            long l5 = System.currentTimeMillis();
+            System.out.println("执行权限耗费时间: " + (l5 - l4));
+        }
+    }
+}
diff --git a/src/main/youhong_ai_old_src/weaver/workflow/cms/xiao/utils/RequestBaseInfo.java b/src/main/youhong_ai_old_src/weaver/workflow/cms/xiao/utils/RequestBaseInfo.java
new file mode 100644
index 0000000..b2a9560
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/workflow/cms/xiao/utils/RequestBaseInfo.java
@@ -0,0 +1,70 @@
+package weaver.workflow.cms.xiao.utils;
+
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @author XiaoBokang
+ * @create 2021/8/23 16:34
+ */
+
+public class RequestBaseInfo{
+
+    private String type;
+    private String url;
+    private Object params;
+    private Map<String,String > headers;
+
+    private static final Map<String,String > HEADER_NORMAL = new HashMap<>();
+    private static final Map<String,Object > PARAMS_NORMAL = new HashMap<>();
+
+    public String getUrl() {
+        return url;
+    }
+
+    public void setUrl(String url) {
+        this.url = url;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public Object getParams() {
+        return params;
+    }
+
+    public void setParams(Object params) {
+        this.params = params;
+    }
+
+    public Map<String, String> getHeaders() {
+        return headers;
+    }
+
+    public void setHeaders(Map<String, String> headers) {
+        this.headers = headers;
+    }
+
+    public static RequestBaseInfo create(String type, String url){
+        return create(type,url,HEADER_NORMAL,PARAMS_NORMAL);
+    }
+
+    public static RequestBaseInfo create(String type, String url, Map<String, String> headers){
+        return create(type,url,headers,PARAMS_NORMAL);
+    }
+
+    public static RequestBaseInfo create(String type, String url, Map<String, String> headers, Object params){
+        RequestBaseInfo requestInfo =  new RequestBaseInfo();
+        requestInfo.setType(type.toUpperCase());
+        requestInfo.setUrl(url);
+        requestInfo.setParams(params);
+        requestInfo.setHeaders(headers);
+        return requestInfo;
+    }
+}
diff --git a/src/main/youhong_ai_old_src/weaver/workflow/cms/xiao/utils/RequestUtil.java b/src/main/youhong_ai_old_src/weaver/workflow/cms/xiao/utils/RequestUtil.java
new file mode 100644
index 0000000..19812ba
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/workflow/cms/xiao/utils/RequestUtil.java
@@ -0,0 +1,93 @@
+package weaver.workflow.cms.xiao.utils;
+
+import com.alibaba.fastjson.JSON;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.http.HttpEntity;
+import org.apache.http.client.methods.*;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.DefaultHttpClient;
+import org.apache.http.util.EntityUtils;
+import weaver.wechat.request.HttpManager;
+
+import java.io.IOException;
+import java.util.Map;
+
+
+/**
+ * @author XiaoBokang
+ * @create 2021/8/9 10:09
+ */
+
+public class RequestUtil {
+
+    public static <T> T apiRequest(RequestBaseInfo requestInfo, Class<T> tClass){
+
+        Map<String,String> headers = requestInfo.getHeaders();
+        T result = null;
+
+        switch(requestInfo.getType()){
+            case "GET" :{
+                String sendUrl = serializableUrl(requestInfo.getUrl(), (Map<String, Object>) requestInfo.getParams());
+                HttpGet httpGet = new HttpGet(sendUrl);
+                headers.forEach(httpGet::setHeader);
+                result = apiSend(httpGet,tClass);
+                }break;
+            case "POST" :{
+                HttpPost httpPost = new HttpPost(requestInfo.getUrl());
+                headers.forEach(httpPost::setHeader);
+                httpPost.setEntity(new StringEntity(JSON.toJSONString(requestInfo.getParams()),"UTF-8"));
+                result = apiSend(httpPost,tClass);}break;
+            case "PUT" :{
+                HttpPut httpPut = new HttpPut(requestInfo.getUrl());
+                headers.forEach(httpPut::setHeader);
+                httpPut.setEntity(new StringEntity(JSON.toJSONString(requestInfo.getParams()),"UTF-8"));
+                result = apiSend(httpPut,tClass);}break;
+        }
+
+        return result;
+    }
+
+    public static <T> T apiSend(
+            HttpUriRequest httpRequest,
+            Class<T> resClass
+    ){
+        DefaultHttpClient httpClient = HttpManager.getHttpClient();
+        CloseableHttpResponse execute = null;
+        T res = null;
+        try {
+            execute = httpClient.execute(httpRequest);
+            if(execute.getStatusLine().getStatusCode() == 200){
+                HttpEntity entity = execute.getEntity();
+                String response= EntityUtils.toString(entity,"utf-8");
+//                ObjectMapper mapper = new ObjectMapper();
+//                CollectionType listType = mapper.getTypeFactory().constructCollectionType(ArrayList.class, Map.class);
+//                List<Map<String,Object>> list = mapper.readValue(response, listType);
+//                result.put("res",list);
+                ObjectMapper objectMapper = new ObjectMapper();
+                res = objectMapper.readValue(response,resClass);
+            }
+        } catch (IOException e) {
+            try {
+                if(execute != null) {
+                    execute.close();
+                }
+            } catch (IOException ioException) {
+                ioException.printStackTrace();
+            }
+            e.printStackTrace();
+        }
+        return res;
+    }
+
+    public static String serializableUrl(String url,Map<String,Object> params){
+        if(params == null || params.isEmpty()){
+            return url;
+        }
+        url += "?";
+        for (Map.Entry entry: params.entrySet()){
+            url += entry.getKey() + "=" + entry.getValue() + "&";
+        }
+        return url.substring(0,url.length()-1);
+    }
+
+}
diff --git a/src/main/youhong_ai_old_src/weaver/workflow/cms/xiao/utils/SqlUtil.java b/src/main/youhong_ai_old_src/weaver/workflow/cms/xiao/utils/SqlUtil.java
new file mode 100644
index 0000000..ca63c32
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/workflow/cms/xiao/utils/SqlUtil.java
@@ -0,0 +1,82 @@
+package weaver.workflow.cms.xiao.utils;
+
+import java.lang.reflect.Field;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author XiaoBokang
+ * @create 2021/8/13 17:43
+ */
+
+public class SqlUtil {
+
+    /**
+     * 构建插入的sql语句
+     * @param tableName
+     * @param param
+     * @param params
+     * @return
+     */
+    public static String buildInsert(String tableName, Map<String ,Object> param,List<Object> params){
+
+        StringBuilder keyBuilder = new StringBuilder();
+        StringBuilder valueBuilder = new StringBuilder();
+
+        keyBuilder.append("insert into ")
+                .append(tableName)
+                .append(" (");
+        valueBuilder.append(" values (");
+        param.forEach((key,value) ->{
+            keyBuilder.append(key);
+            keyBuilder.append(",");
+            valueBuilder.append("?");
+            valueBuilder.append(",");
+            params.add(value);
+        });
+        String keySql = keyBuilder.substring(0,keyBuilder.length()-1);
+        String valueSql = valueBuilder.substring(0,valueBuilder.length()-1);
+
+        return keySql+") "+valueSql+")";
+    }
+
+    public static String buildUpdate(String tableName, Map<String ,Object> param,List<Object> params){
+
+        StringBuilder updateBuilder = new StringBuilder();
+
+        updateBuilder.append("update ")
+                .append(tableName)
+                .append(" set ");
+        param.forEach((k,v)->{
+            updateBuilder.append(k).append(" = ?,");
+            params.add(v);
+
+        });
+        String updateSql = updateBuilder.substring(0,updateBuilder.length()-1)+" ";
+
+        return updateSql;
+    }
+
+    public static String buildUpdate(String tableName, Object obj,List<Object> params){
+
+        StringBuilder updateBuilder = new StringBuilder();
+
+        updateBuilder.append("update ")
+                .append(tableName)
+                .append(" set ");
+        Field[] fields = obj.getClass().getFields();
+        try{
+            for (Field field : fields) {
+                field.setAccessible(true);
+                updateBuilder.append(field.getName()).append(" = ?,");
+                params.add(field.get(obj));
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+        String updateSql = updateBuilder.substring(0,updateBuilder.length()-1)+" ";
+
+        return updateSql;
+    }
+
+}
diff --git a/src/main/youhong_ai_old_src/weaver/workflow/request/RequestNodeFlow.java b/src/main/youhong_ai_old_src/weaver/workflow/request/RequestNodeFlow.java
new file mode 100644
index 0000000..da74757
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/workflow/request/RequestNodeFlow.java
@@ -0,0 +1,7507 @@
+package weaver.workflow.request;
+
+/*
+ * Created on 2006-05-18
+ * Copyright (c) 2001-2006 泛微软件
+ * 泛微协同商务系统，版权所有。
+ *
+ */
+
+import com.alibaba.fastjson.JSON;
+import com.engine.common.service.HrmCommonService;
+import com.engine.common.service.impl.HrmCommonServiceImpl;
+import com.engine.hrm.biz.HrmClassifiedProtectionBiz;
+import com.engine.workflow.biz.RobotNode.RobotNodeBiz;
+import com.engine.workflow.biz.SelectNextFlowBiz;
+import com.engine.workflow.biz.freeNode.FreeNodeBiz;
+import com.engine.workflow.biz.freeNode.RequestFreeNodeFlowBiz;
+import com.engine.workflow.biz.nodeOperator.NodeOperatorConfigBiz;
+import com.engine.workflow.biz.requestForm.RequestSecLevelBiz;
+import com.engine.workflow.biz.workflowCore.WorkflowBaseBiz;
+import com.engine.workflow.constant.ReqFlowFailMsgType;
+import com.engine.workflow.constant.SelectNextFlowMode;
+import com.engine.workflow.constant.node.NodeType;
+import com.engine.workflow.entity.RequestFlowLogEntity;
+import com.engine.workflow.entity.core.NodeInfoEntity;
+import com.engine.workflow.entity.core.RequestFlowInfoEntity;
+import com.engine.workflow.entity.freeNode.FreeNodeEntity;
+import com.engine.workflow.entity.freeNode.FreeNodeGroupEntity;
+import com.engine.workflow.entity.node.OperatorEntity;
+import com.engine.workflow.entity.node.OperatorInfoEntity;
+import com.engine.workflow.entity.requestForm.ReqFlowFailMsgEntity;
+import org.apache.commons.lang.StringUtils;
+import org.apache.log4j.Logger;
+import org.json.JSONException;
+import org.json.JSONObject;
+import weaver.common.StringUtil;
+import weaver.conn.ConnStatement;
+import weaver.conn.RecordSet;
+import weaver.conn.RecordSetTrans;
+import weaver.crm.Maint.CustomerInfoComInfo;
+import weaver.crm.Maint.CustomerStatusComInfo;
+import weaver.crm.Maint.CustomerTypeComInfo;
+import weaver.docs.senddoc.DocReceiveUnitComInfo;
+import weaver.general.BaseBean;
+import weaver.general.StaticObj;
+import weaver.general.TimeUtil;
+import weaver.general.Util;
+import weaver.hrm.User;
+import weaver.hrm.check.JobComInfo;
+import weaver.hrm.company.DepartmentComInfo;
+import weaver.hrm.company.SubCompanyComInfo;
+import weaver.hrm.resource.AllSubordinate;
+import weaver.hrm.resource.ResourceComInfo;
+import weaver.hrm.roles.RolesComInfo;
+import weaver.interfaces.workflow.browser.Browser;
+import weaver.interfaces.workflow.browser.BrowserBean;
+import weaver.matrix.MatrixUtil;
+import weaver.meeting.Maint.MeetingComInfo;
+import weaver.proj.Maint.ProjectInfoComInfo;
+import weaver.system.code.CodeBuild;
+import weaver.systeminfo.SystemEnv;
+import weaver.workflow.form.FormFieldlabelMainManager;
+import weaver.workflow.ruleDesign.RuleBusiness;
+import weaver.workflow.ruleDesign.RuleInterface;
+import weaver.workflow.workflow.*;
+
+import java.util.*;
+
+/**
+ * Description: 取得流程的下一节点及操作者<br>
+ *
+ * @author ben
+ * @version 1.0
+ */
+
+public class RequestNodeFlow extends BaseBean {
+    private static String closeAgentPenetrate = "";//流程代理情况下，是否关闭流程穿透
+    private static String closeAgentPenetrateWorkflowId = "";//流程代理情况下，关闭流程穿透的路径id
+    /**
+     * 操作组ID
+     */
+    int tempGroupId = 0; //xwj for td2104 on 20050802
+    //end
+    // add by liuzy for QC146873,流转异常对象
+    FlowExceptionHandle flowExceptionHandle = new FlowExceptionHandle();
+    private boolean orderflag = false;
+    private ArrayList passNodes = new ArrayList();
+    private int nodeid = -1;
+    private int nextnodeid = -1;
+    private int tempnextnodeid = -1;
+    private int linkid = -1;
+    private String linkname = "";
+    private int nextlinkid = -1;
+    private String nextlinkname = "";
+    private String nodetype = "";
+    private String nextnodetype = "";
+    private int requestid = -1;
+    private int userid = -1;
+    private int usertype = -1;
+    private int languageid = 7;
+    private int creater = -1;
+    private int creatertype = -1;
+    private int workflowid = -1;
+    private int formid = -1;
+    private int isbill = -1;
+    private int billid = -1;
+    private String billtablename = "";
+    private String isintervenor = "";
+    private int isreject = -1;
+    private int isreopen = -1;
+    private boolean hasedititem = false;
+    private Hashtable operatorsht = new Hashtable(); // xwj for td2162 20050623
+    private RecordSet rs;
+    private String sql = "";
+    private String Procpara = "";
+    private char flag = Util.getSeparator();
+    private int hasright;
+    private ArrayList nextnodeids = new ArrayList();
+    private ArrayList nextlinkids = new ArrayList();
+    private ArrayList nextlinknames = new ArrayList();
+    private ArrayList nextnodetypes = new ArrayList();
+    private ArrayList nextnodeattrs = new ArrayList();
+    private ArrayList operatorshts = new ArrayList();
+    private ArrayList occurnodeids = new ArrayList();
+    private ArrayList nextnodepassnums = new ArrayList();
+    private ArrayList linkismustpasss = new ArrayList();
+    private WorkflowOperator wfoper = new WorkflowOperator();
+    private String ismustpasss = "";
+    private String nodeattribute = "0";
+    private String nextnodeattribute = "0";
+    private int passnum = 0;
+    private boolean isGetFlowCodeStr = true;//是否获取流程编号，true:获取  false:不获取   默认为true:获取
+    private String IsFreeNode = "0";
+    private int FreeSigntype = 0;
+    private String Freeoperators = "";
+    private int isFromRequestManager = 0;
+    private int RejectToNodeid = 0;//td30785
+    private int RejectToType = 0;
+    private int SubmitToNodeid = 0;
+    private String newRejectNodeids;
+    private int forceOverNodeId = 0; //强制归档指定的归档节点id
+    private boolean isForceOver = false; //是否是强制归档
+    private String penetrateId = ""; //是否包含穿透的操作//add by liaodong for qc76119,76120,54194,64652 start
+    private String lastNodeId = ""; //最后一个出口 add by liaodong for qc76119,76120,54194,64652 start
+    private boolean isfixbill = false; //是否为固定单据 //add by liaodong for qc48451 in 2013年10月21日 start
+    private RecordSetTrans rst;
+    // add by liaodong for qc86096 in 2013-11-19 start
+    private String currentdate = "";       // 当前日期
+    private String currenttime = "";       // 当前时间
+    private boolean eh_callAgainNextNodes = false;
+    private boolean eh_unAppendNextNodes = false;
+    private Map<String, Object> eh_operatorMap = new HashMap();
+    private boolean isNeedChooseOperator = false;
+    private Map<String, String> eh_original_nodeinfo = new HashMap<String, String>();
+    private ArrayList requestexceptiontypes = new ArrayList();
+    private int requestexceptiontype = 0;
+    private String messageid = "";      //流程消息ID
+    private String messagecontent = ""; //流程消息内容
+    private String cachefieldvalue = "";
+    private User user;
+    private StringBuffer errorInfoMsgBuffer = new StringBuffer();
+    private int index = 0;
+    private ArrayList tempmutinodeids = new ArrayList();
+    private boolean tonextnode = false;   //是否是往下一个节点流转，用于依次逐个处理取用户时使用，为true时，不从workflow_agentpersons取操作者，而按照第一次流转到某一节点时取操作者
+    private boolean hasEflowToAssignNode = false; //是否是异常处理跳转指定节点
+    private int lastFreeNodeId = 0;
+    private ReqFlowFailMsgEntity reqFailMsg;
+    private int isFromSubmitConfirm = 0;//判断是否是流程提交确认调用
+    /**
+     * 操作者中是否包含协办人
+     */
+    private boolean hasCoadjutant = false;
+    private RequestFreeNodeFlowBiz freeNodeFlowBiz;
+    private int assemMsgContentCount = 0;
+
+    //指定流转
+    private boolean isSelectNextFlow;
+    //指定流转模式
+    private SelectNextFlowMode selectNextFlowMode;//指定流转模式
+    //指定流转设置节点
+    private List<Integer> selectNextFlowNodeList = new ArrayList<>();
+
+    //流程图智能预测
+    private boolean autoForecast;
+    //流程预测时，manager字段的信息
+    private Map<String, String> forecastManagerInfo;
+
+    private String clientIp = "";
+
+    //流程流转日志对象
+    private RequestFlowLogEntity requestFlowLogEntity = new RequestFlowLogEntity();
+
+    private static String getLastnameByUserStatus(String operatorid) {
+        ResourceComInfo rci = null;
+        try {
+            rci = new ResourceComInfo();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        if (checkidvalid(operatorid) && Util.getIntValue(rci.getStatus(operatorid), 7) > 3) {
+            String lastname = Util.null2String(getTurnoverHrmname(operatorid, new RecordSet()));
+            if (StringUtil.isNotNull(lastname)) {
+                return lastname;
+            }
+        }
+        return "";
+    }
+
+    /**
+     * 检测ID是否有效即 ID 不为空不为0
+     *
+     * @param id
+     * @return
+     */
+    private static boolean checkidvalid(String id) {
+        return StringUtil.isNotNull(id) && !"0".equals(id) && !"-1".equals(id);
+    }
+
+    /**
+     * 查询不在职员工名称
+     *
+     * @param id
+     * @param rs
+     * @return
+     */
+    private static String getTurnoverHrmname(String id, RecordSet rs) {
+        rs.executeQuery("select lastname,status from hrmresource where id = ?", id);
+        if (rs.next()) {
+            int status = rs.getInt(2);
+            if (status > 3) {
+                return rs.getString(1);
+            }
+        }
+        return "";
+    }
+
+    public RequestFlowLogEntity getRequestFlowLogEntity() {
+        return requestFlowLogEntity;
+    }
+
+    public void setRequestFlowLogEntity(RequestFlowLogEntity requestFlowLogEntity) {
+        this.requestFlowLogEntity = requestFlowLogEntity;
+    }
+
+    /**
+     * 重置参数
+     */
+    public void resetParameter() {
+        this.tempGroupId = 0; //xwj for td2104 on 20050802
+        this.nodeid = -1;
+        this.nextnodeid = -1;
+        this.linkid = -1;
+        this.linkname = "";
+        this.nextlinkid = -1;
+        this.nextlinkname = "";
+        this.nodetype = "";
+        this.nextnodetype = "";
+        this.requestid = -1;
+        this.userid = -1;
+        this.usertype = -1;
+        this.creater = -1;
+        this.creatertype = -1;
+        this.workflowid = -1;
+        this.formid = -1;
+        this.isbill = -1;
+        this.billid = -1;
+        this.billtablename = "";
+        this.isintervenor = "";
+        this.isreject = -1;
+        this.isreopen = -1;
+        this.hasedititem = false;
+        this.operatorsht = new Hashtable();
+        this.sql = "";
+        this.rs = null;
+        this.rst = null;
+        this.nextlinkids = new ArrayList();
+        this.nextlinknames = new ArrayList();
+        this.nextnodeids = new ArrayList();
+        this.nextnodetypes = new ArrayList();
+        this.nextnodeattrs = new ArrayList();
+        this.operatorshts = new ArrayList();
+        this.occurnodeids = new ArrayList();
+        this.nextnodepassnums = new ArrayList();
+        this.linkismustpasss = new ArrayList();
+        this.ismustpasss = "";
+        this.nodeattribute = "0";
+        this.nextnodeattribute = "0";
+        this.passnum = 0;
+        this.isGetFlowCodeStr = true;
+        this.IsFreeNode = "0";
+        this.FreeSigntype = 0;
+        this.Freeoperators = "";
+        this.isFromRequestManager = 0;
+        this.RejectToNodeid = 0;
+        this.RejectToType = 0;
+        this.tempmutinodeids = new ArrayList();
+
+        this.SubmitToNodeid = 0;
+        errorInfoMsgBuffer.setLength(0);
+        index = 0;
+
+        this.tonextnode = false;
+        assemMsgContentCount = 0;
+    }
+
+    public ReqFlowFailMsgEntity getReqFailMsg() {
+        return reqFailMsg;
+    }
+
+    public void setReqFailMsg(ReqFlowFailMsgEntity reqFailMsg) {
+        this.reqFailMsg = reqFailMsg;
+    }
+
+    /**
+     * @return the tonextnode
+     */
+    public boolean isTonextnode() {
+        return tonextnode;
+    }
+
+    /**
+     * @param tonextnode the tonextnode to set
+     */
+    public void setTonextnode(boolean tonextnode) {
+        this.tonextnode = tonextnode;
+    }
+
+    public int getRejectToNodeid() {
+        return this.RejectToNodeid;
+    }
+
+    public void setRejectToNodeid(int RejectToNodeid) {
+        this.RejectToNodeid = RejectToNodeid;
+    }
+
+    public int getRejectToType() {
+        return RejectToType;
+    }
+
+    public void setRejectToType(int rejectToType) {
+        this.RejectToType = rejectToType;
+    }
+
+    public ArrayList getTempmutinodeids() {
+        return tempmutinodeids;
+    }
+
+    public void setTempmutinodeids(ArrayList tempmutinodeids) {
+        this.tempmutinodeids = tempmutinodeids;
+    }
+
+    public int getSubmitToNodeid() {
+        return this.SubmitToNodeid;
+    }
+
+    public void setSubmitToNodeid(int SubmitToNodeid) {
+        this.SubmitToNodeid = SubmitToNodeid;
+    }
+
+    public int getIsFromRequestManager() {
+        return this.isFromRequestManager;
+    }
+
+    public void setIsFromRequestManager(int isFromRequestManager) {
+        this.isFromRequestManager = isFromRequestManager;
+    }
+
+    /**
+     * 设置请求ID
+     *
+     * @param requestid 请求ID
+     */
+    public void setRequestid(int requestid) {
+        this.requestid = requestid;
+    }
+
+    /**
+     * 设置节点ID
+     *
+     * @param nodeid 节点ID
+     */
+    public void setNodeid(int nodeid) {
+        this.nodeid = nodeid;
+    }
+
+    /**
+     * 设置节点类型
+     *
+     * @param nodetype 节点类型（0/1/2/3）
+     */
+    public void setNodetype(String nodetype) {
+        this.nodetype = nodetype;
+    }
+
+    /**
+     * 设置当前用户
+     *
+     * @param userid 当前用户
+     */
+    public void setUserid(int userid) {
+        if (user == null) {
+            user = new User(userid);
+        }
+        this.userid = userid;
+    }
+
+    /**
+     * 设置当前用户类型
+     *
+     * @param usertype 当前用户类型
+     */
+    public void setUsertype(int usertype) {
+        this.usertype = usertype;
+    }
+
+    public void setLanguageid(int languageid) {
+        this.languageid = languageid;
+    }
+
+    /**
+     * 设置流程创建者
+     *
+     * @param creater 流程创建者
+     */
+    public void setCreaterid(int creater) {
+        this.creater = creater;
+    }
+
+    /**
+     * 设置流程创建者类型
+     *
+     * @param creatertype 流程创建者类型（0:内部/1:外部）
+     */
+    public void setCreatertype(int creatertype) {
+        this.creatertype = creatertype;
+    }
+
+    /**
+     * 设置表单或单据id
+     *
+     * @param formid 表单或单据id
+     */
+    public void setFormid(int formid) {
+        this.formid = formid;
+    }
+
+    /**
+     * 设置是否为单据（0/1）
+     *
+     * @param isbill 是否为单据（0:否/1：是）
+     */
+    public void setIsbill(int isbill) {
+        this.isbill = isbill;
+    }
+
+    /**
+     * 如果是单据，设置单据ID
+     *
+     * @param billid 单据ID
+     */
+    public void setBillid(int billid) {
+        this.billid = billid;
+    }
+
+    /**
+     * 如果是单据，设置单据应用的表
+     *
+     * @param billtablename 单据表
+     */
+    public void setBilltablename(String billtablename) {
+        this.billtablename = billtablename;
+    }
+
+    /**
+     * 是否干预
+     *
+     * @param isintervenor 是否干预
+     */
+    public void setIsintervenor(String isintervenor) {
+        this.isintervenor = isintervenor;
+    }
+
+    /**
+     * 设置是否是被退回节点
+     *
+     * @param isreject 是否被退回（0/1）
+     */
+    public void setIsreject(int isreject) {
+        this.isreject = isreject;
+    }
+
+    /**
+     * 设置是否是被重新打开节点
+     *
+     * @param isreopen 是否重新打开（0/1）
+     */
+    public void setIsreopen(int isreopen) {
+        this.isreopen = isreopen;
+    }
+
+    /**
+     * 设置数据连接
+     *
+     * @param rs 数据连接 @see  RecordSet
+     */
+    public void setRecordSet(RecordSet rs) {
+        this.rs = rs;
+    }
+
+    public void setRecordSetTrans(RecordSetTrans rst) {
+        this.rst = rst;
+    }
+
+    /**
+     * 设置下一个节点
+     *
+     * @param nextnodeid 下一个节点
+     */
+    public void setNextnodeid(int nextnodeid) {
+        this.nextnodeid = nextnodeid;
+    }
+
+    /**
+     * 得到下一个节点
+     *
+     * @return 下一个节点
+     */
+    public int getNextNodeid() {
+        return this.nextnodeid;
+    }
+
+    /**
+     * 得到下一个出口
+     *
+     * @return 下一个出口
+     */
+    public int getNextLinkid() {
+        return this.nextlinkid;
+    }
+
+    /**
+     * 得到下一个出口名称
+     *
+     * @return 下一个出口名称
+     */
+    public String getNextLinkname() {
+        return this.nextlinkname;
+    }
+
+    /**
+     * 得到下一个节点类型
+     *
+     * @return 下一个节点类型
+     */
+    public String getNextNodetype() {
+        return this.nextnodetype;
+    }
+
+    /**
+     * 得到流程下一节点的操作者
+     *
+     * @return 下一节点的操作者
+     */
+    public Hashtable getOperators() {
+        return this.operatorsht;
+    }
+
+    public void setOperatorsht(Hashtable operatorsht) {
+        this.operatorsht = operatorsht;
+    }
+
+    public ArrayList getNextnodeids() {
+        return nextnodeids;
+    }
+
+    public ArrayList getNextlinkids() {
+        return nextlinkids;
+    }
+
+    public ArrayList getNextlinknames() {
+        return nextlinknames;
+    }
+
+    public ArrayList getNextnodetypes() {
+        return nextnodetypes;
+    }
+
+    public ArrayList getNextnodeattrs() {
+        return nextnodeattrs;
+    }
+
+    public ArrayList getOperatorshts() {
+        return operatorshts;
+    }
+
+    public ArrayList getOccurnodeids() {
+        return occurnodeids;
+    }
+
+    public ArrayList getNextnodepassnums() {
+        return nextnodepassnums;
+    }
+
+    public ArrayList getLinkismustpasss() {
+        return linkismustpasss;
+    }
+
+    public String getNodeattribute() {
+        return nodeattribute;
+    }
+
+    public void setNodeattribute(String nodeattribute) {
+        this.nodeattribute = nodeattribute;
+    }
+
+    public String getNextnodeattribute() {
+        return nextnodeattribute;
+    }
+
+    public void setNextnodeattribute(String nextnodeattribute) {
+        this.nextnodeattribute = nextnodeattribute;
+    }
+
+    public int getPassnum() {
+        return passnum;
+    }
+
+    public void setPassnum(int passnum) {
+        this.passnum = passnum;
+    }
+
+    public boolean getIsGetFlowCodeStr() {
+        return isGetFlowCodeStr;
+    }
+
+    public void setIsGetFlowCodeStr(boolean isGetFlowCodeStr) {
+        this.isGetFlowCodeStr = isGetFlowCodeStr;
+    }
+
+    public SelectNextFlowMode getSelectNextFlowMode() {
+        return selectNextFlowMode;
+    }
+
+    public void setSelectNextFlowMode(SelectNextFlowMode selectNextFlowMode) {
+        this.selectNextFlowMode = selectNextFlowMode;
+    }
+
+    public List<Integer> getSelectNextFlowNodeList() {
+        return selectNextFlowNodeList;
+    }
+
+    public void setSelectNextFlowNodeList(List<Integer> selectNextFlowNodeList) {
+        this.selectNextFlowNodeList = selectNextFlowNodeList;
+    }
+
+    /**
+     * 获得是否为自由流程节点
+     *
+     * @return
+     */
+    public String getIsFreeNode() {
+        return IsFreeNode;
+    }
+
+    /**
+     * 设置是否为自由流程节点
+     *
+     * @param isFreeNode
+     */
+    public void setIsFreeNode(String isFreeNode) {
+        IsFreeNode = isFreeNode;
+    }
+
+    /**
+     * 获得自由流程会签类型
+     *
+     * @return
+     */
+    public int getFreeSigntype() {
+        return FreeSigntype;
+    }
+
+    /**
+     * 设置自由流程会签类型
+     *
+     * @param freeSigntype
+     */
+    public void setFreeSigntype(int freeSigntype) {
+        FreeSigntype = freeSigntype;
+    }
+
+    /**
+     * 获得自由流程操作者
+     *
+     * @return
+     */
+    public String getFreeoperators() {
+        return Freeoperators;
+    }
+
+    /**
+     * 设置自由流程操作者
+     *
+     * @param freeoperators
+     */
+    public void setFreeoperators(String freeoperators) {
+        Freeoperators = freeoperators;
+    }
+
+    public boolean isHasEflowToAssignNode() {
+        return hasEflowToAssignNode;
+    }
+
+    public void setHasEflowToAssignNode(boolean hasEflowToAssignNode) {
+        this.hasEflowToAssignNode = hasEflowToAssignNode;
+    }
+
+    public int getTempGroupId() {
+        return tempGroupId;
+    }
+
+    public void setTempGroupId(int tempGroupId) {
+        this.tempGroupId = tempGroupId;
+    }
+
+    public void setFreeNodeFlowBiz(RequestFreeNodeFlowBiz freeNodeFlowBiz) {
+        this.freeNodeFlowBiz = freeNodeFlowBiz;
+    }
+
+    public String getNewRejectNodeids() {
+        return newRejectNodeids;
+    }
+
+    public void setNewRejectNodeids(String newRejectNodeids) {
+        this.newRejectNodeids = newRejectNodeids;
+    }
+
+    public Map<String, String> getForecastManagerInfo() {
+        return forecastManagerInfo;
+    }
+
+    public void setForecastManagerInfo(Map<String, String> forecastManagerInfo) {
+        this.forecastManagerInfo = forecastManagerInfo;
+    }
+
+    public String getClientIp() {
+        return clientIp;
+    }
+
+    public void setClientIp(String clientIp) {
+        this.clientIp = clientIp;
+    }
+
+    public void getNextNodes() {
+        initTempGroupId();
+        //处理自由流程节点操作者
+        if (!isSelectNextFlow && !isAutoForecast() && addFreeNodeOperator()) {
+            return;
+        }
+        rs.executeSql("select nodeattribute from workflow_nodebase where id=" + nodeid);
+        if (rs.next()) {
+            nodeattribute = Util.null2String(rs.getString("nodeattribute"));
+        }
+        int nextnodecount = 1;
+        ArrayList mustpassnodeids = new ArrayList();
+        if (nodeattribute.equals("1")) {
+            rs.executeSql("select destnodeid from workflow_NodeLink where wfrequestid is null and (isreject is null or isreject<>'1') and nodeid=" + nodeid + " and workflowid=" + workflowid);
+            nextnodecount = rs.getCounts();
+            mustpassnodeids = new WFLinkInfo().getMustPassStartBrancheNode(workflowid, requestid, nodeid);
+        }
+
+        //指定流转，用户选择节点模式
+        if (isSelectNextFlow && this.selectNextFlowNodeList.size() > 0 && this.SubmitToNodeid <= 0) {
+            nextnodecount = this.selectNextFlowNodeList.size();
+        }
+
+        this.tempmutinodeids.clear();
+        //ActionLog.writeDebuggerLog("this.workflowid=" + workflowid + ",this.requestid=" + requestid + ",this.RejectToType = " + this.RejectToType + " this.RejectToNodeid=" + this.RejectToNodeid);
+
+        //指定节点退回，退回到分叉分叉起始节点，选择的是 重新分叉
+        if (this.RejectToType == 1 && this.RejectToNodeid > 0) {
+            int rejectnodeattribute = 0;//下一节点类型
+            rs.executeSql("select nodeattribute from workflow_nodebase where id=" + this.RejectToNodeid);
+            if (rs.next()) {
+                rejectnodeattribute = Util.getIntValue(rs.getString("nodeattribute"), 0);
+            }
+            if (rejectnodeattribute == 1) {
+                rs.executeSql("select destnodeid from workflow_NodeLink where wfrequestid is null and (isreject is null or isreject<>'1') and nodeid=" + this.RejectToNodeid + " and workflowid=" + workflowid);
+                nextnodecount = rs.getCounts();
+                mustpassnodeids = new WFLinkInfo().getMustPassStartBrancheNode(workflowid, requestid, nodeid);
+            }
+            System.out.println("nextnodecount = " + nextnodecount + " nextnodeid:{" + nextnodeid + "==" + this.RejectToNodeid + "} nextnodeattribute=" + rejectnodeattribute);
+        } else if (this.RejectToType == 2 && this.RejectToNodeid > 0) {
+            int rejectnodeattribute = 0;//下一节点类型
+            rs.executeSql("select nodeattribute from workflow_nodebase where id=" + this.RejectToNodeid);
+            if (rs.next()) {
+                rejectnodeattribute = Util.getIntValue(rs.getString("nodeattribute"), 0);
+            }
+            if (rejectnodeattribute == 3 || rejectnodeattribute == 4 || rejectnodeattribute == 5) {
+                nextnodecount = new WFLinkInfo().getBrancheLastNode(requestid, workflowid, this.RejectToNodeid).size();
+                //mustpassnodeids=new WFLinkInfo().getMustPassStartBrancheNode(workflowid,requestid);
+            }
+        }
+
+        if (isreject == 1 && !FreeNodeBiz.isFreeNode(nodeid)) {
+            int rejectType = 0;//退回类型
+            int rejectToCreateNode = 1;//未设置退回出口时退至创建节
+            rs.executeQuery("select isselectrejectnode, rejectToCreateNode from workflow_flownode where workflowid = ? and nodeid = ?", workflowid, nodeid);
+            if (rs.next()) {//机器人节点不取此配置
+                rejectType = Util.getIntValue(rs.getString("isselectrejectnode"), 0);
+                rejectToCreateNode = Util.getIntValue(rs.getString("rejectToCreateNode"), 1);
+            }
+            if (RobotNodeBiz.isRobotNode(nodetype)) {//机器人节点按出口退回，未设置退回出口时退回失败
+                rejectType = 0;
+                rejectToCreateNode = 0;
+            }
+            //按出口退回，且开启节点未设置退回出口时退至创建节
+            if (rejectType == 0 && rejectToCreateNode == 1 && this.RejectToNodeid <= 0) {
+                RecordSet rsInner = new RecordSet();
+                rs.executeQuery("select 1 from workflow_nodelink where workflowid = ? and nodeid = ? and isreject = '1'", workflowid, nodeid);
+                if (!rs.next()) {//当前节点未设置退回出口，退回到创建节点
+                    rsInner.executeQuery("select nodeid from workflow_flownode where workflowid = ? and nodetype = '0'", workflowid);
+                    if (rsInner.next()) {
+                        this.RejectToNodeid = rsInner.getInt(1);
+                    }
+                }
+            }
+        }
+
+        if (this.SubmitToNodeid > 0 && this.IsTrunkSubmitToBranch(rs, nodeid, SubmitToNodeid)) {
+            String tempsql = "select * from workflow_nodelink where wfrequestid is null and (isreject is null or isreject <> '1') and nodeid=" + nodeid + " and destnodeid=" + SubmitToNodeid + " and workflowid=" + workflowid + " order by linkorder, id";
+            //if(this.IsTrunkSubmitToBranch(rs, nodeid, SubmitToNodeid)){//主干退回到分叉中间节点
+            tempsql = "select l.* from workflow_nodelink l,workflow_nodebase n where (l.isreject is null or l.isreject <> '1') and l.destnodeid in (" + StringUtils.join(new WFLinkInfo().getLastOperateNode(requestid, workflowid, SubmitToNodeid), ",") + ") and l.workflowid=" + workflowid + " and (l.wfrequestid is null or l.wfrequestid='' or l.wfrequestid=' ')  and n.id=l.nodeid and (n.isfreenode is null or n.isfreenode =''  or n.isfreenode =' ') order by linkorder,l.id";
+            //}
+            rs.executeSql(tempsql);
+            nextnodecount = rs.getCounts();
+        }
+
+        //ActionLog.writeDebuggerLog("nextnodecount:[" + nextnodecount + "]");
+        //节点错误消息缓存
+        List<String> cacheBuffers = new ArrayList<String>();
+        errorInfoMsgBuffer.setLength(0);
+        for (int i = 0; i < nextnodecount; i++) {
+            if (nextnodecount > 20) {
+                writeLog("----RequestNodeFlow---line610--requestid:" + requestid + ",userid:" + userid + ",nodeid:" + nodeid + ",nextnodecount:" + nextnodecount);
+            }
+            boolean havenext = getNextNodeOperator();
+            //ActionLog.writeDebuggerLog("havenext:[" + havenext + "]");
+            this.occurnodeids.add("" + nextnodeid);
+            if (eh_unAppendNextNodes) {
+                eh_unAppendNextNodes = false;
+                continue;
+            }
+            if (havenext || (isSelectNextFlow && selectNextFlowMode == SelectNextFlowMode.NODE_AND_OPERATOR)) {
+                if (this.nextnodeids.indexOf("" + nextnodeid) == -1) {
+                    this.nextnodeids.add("" + nextnodeid);
+                    this.nextlinkids.add("" + nextlinkid);
+                    this.nextnodetypes.add(nextnodetype);
+                    this.nextlinknames.add(nextlinkname);
+                    this.operatorshts.add(operatorsht);
+                    this.linkismustpasss.add(ismustpasss);
+                    this.nextnodeattrs.add(nextnodeattribute);
+                    this.nextnodepassnums.add("" + passnum);
+                    this.requestexceptiontypes.add("" + requestexceptiontype);
+                }
+                cacheBuffers.add(0, errorInfoMsgBuffer.toString());
+            } else {
+                int _nextnodeid = nextnodeid;
+                if (this.nextnodeids.indexOf("" + nextnodeid) != -1 && this.nextnodeid != this.tempnextnodeid) {
+                    _nextnodeid = this.tempnextnodeid;
+                }
+                if (mustpassnodeids.indexOf(_nextnodeid + "") != -1 || (isSelectNextFlow && new SelectNextFlowBiz().isInMustPassBranchAllNodeIds(workflowid, requestid, nodeid + "", _nextnodeid))) {
+                    hasmustpassnodeClearMsg(cacheBuffers);
+                    this.nextnodeids.clear();
+                    this.nextlinkids.clear();
+                    this.nextnodetypes.clear();
+                    this.nextlinknames.clear();
+                    this.operatorshts.clear();
+                    this.linkismustpasss.clear();
+                    this.nextnodeattrs.clear();
+                    this.nextnodepassnums.clear();
+                    break;
+                }
+                cacheBuffers.add(0, errorInfoMsgBuffer.toString());
+                errorInfoMsgBuffer.setLength(0);
+            }
+        }
+
+        //根据密级过滤不符合条件的操作者
+        this.operatorshts = deleteOperateBySecLevel2(operatorshts, requestid);
+    }
+
+    private boolean addFreeNodeOperator() {
+        if (freeNodeFlowBiz == null) {
+            freeNodeFlowBiz = new RequestFreeNodeFlowBiz(user, requestid, nodeid);
+        }
+        if (!freeNodeFlowBiz.canFreeFlow(workflowid, SubmitToNodeid)) {
+            return false;
+        }
+        if (isreject == 1) {
+            if (RejectToNodeid > 0 && RejectToType < 3) {
+                return false;
+            }
+        }
+        boolean freeNodeOperator = false;
+        if (freeNodeFlowBiz != null) {
+            FreeNodeGroupEntity rootNodeGroup = freeNodeFlowBiz.getRootNodeGroup();
+            if (rootNodeGroup != null || FreeNodeBiz.isFreeNode(this.SubmitToNodeid)) {
+                List<FreeNodeEntity> freeNodeEntityList = new ArrayList<>();
+                if (1 == isreject) {
+                    if (RejectToType <= 0) {
+                        if ("".equals(Util.null2String(newRejectNodeids).trim()))
+                            newRejectNodeids = RejectToNodeid + "";
+                        freeNodeEntityList.addAll(FreeNodeBiz.getFreeNodeByNodeIds(requestid, newRejectNodeids));
+                    } else if (RejectToType == 3) {
+                        FreeNodeGroupEntity nextGroup = null;
+                        if (!FreeNodeBiz.isFreeNode(RejectToNodeid)) {
+                            nextGroup = freeNodeFlowBiz.getRootNodeGroup();
+                        } else {
+                            FreeNodeEntity nodeEntity = FreeNodeBiz.getCurrentFreeNodeEntity(requestid, RejectToNodeid);
+                            if (nodeEntity != null) {
+                                FreeNodeGroupEntity groupEntity = FreeNodeBiz.getNodeGroupByID(freeNodeFlowBiz.getRootNodeGroup(), nodeEntity.getGroupid());
+                                if (groupEntity != null && groupEntity.isHasNext()) {
+                                    nextGroup = groupEntity.getNext();
+                                }
+                            }
+                        }
+                        if (nextGroup != null && nextGroup.getParallelNodeGroupDatas().size() > 0) {
+                            List<FreeNodeGroupEntity> parallGroups = nextGroup.getParallelNodeGroupDatas();
+                            for (FreeNodeGroupEntity parallGroup : parallGroups) {
+                                freeNodeEntityList.add(parallGroup.getNodeEntity());
+                            }
+                        }
+                    }
+                } else {
+                    //提交至退回节点
+                    if (FreeNodeBiz.isFreeNode(this.SubmitToNodeid)) {
+                        FreeNodeEntity targetNodeEntity = FreeNodeBiz.getCurrentFreeNodeEntity(requestid, this.SubmitToNodeid);
+                        if (targetNodeEntity != null) {
+                            freeNodeEntityList.add(targetNodeEntity);
+                        }
+                        RequestFlowInfoEntity flowInfoEntity = FreeNodeBiz.getLastRejectInfo(requestid, nodeid);
+                        if (flowInfoEntity != null) {
+                            String rejectNodeIds = flowInfoEntity.getRejectnodeids();
+                            if (!"".equals(rejectNodeIds)) {
+                                List<String> rejectNodeIdList = Util.splitString2List(rejectNodeIds, ",");
+                                for (String rejectnodeid : rejectNodeIdList) {
+                                    int __rejectnodeid = Util.getIntValue(rejectnodeid);
+                                    if (FreeNodeBiz.isFreeNode(__rejectnodeid)) {
+                                        FreeNodeEntity nodeEntity = FreeNodeBiz.getCurrentFreeNodeEntity(requestid, __rejectnodeid);
+                                        if (nodeEntity != null) {
+                                            freeNodeEntityList.add(nodeEntity);
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    } else {
+                        freeNodeEntityList.addAll(freeNodeFlowBiz.getNextFreeNodes(requestid, nodeid));
+                    }
+                }
+                if (freeNodeEntityList != null && freeNodeEntityList.size() > 0) {
+                    freeNodeOperator = true;
+                    boolean nextNodeHasOperator = false;
+                    for (FreeNodeEntity nodeEntity : freeNodeEntityList) {
+                        boolean havenext = freeNodeFlowBiz.getNextNodeOperators(nodeEntity, this, requestid);
+                        if (havenext) {
+                            if (this.nextnodeids.indexOf("" + nextnodeid) == -1) {
+                                this.nextnodeids.add("" + nextnodeid);
+                                this.nextlinkids.add("" + nextlinkid);
+                                this.nextnodetypes.add(nextnodetype);
+                                this.nextlinknames.add(nodeEntity.getNodename());
+                                this.operatorshts.add(operatorsht);
+                                this.linkismustpasss.add(ismustpasss);
+                                this.nextnodeattrs.add(nextnodeattribute);
+                                this.nextnodepassnums.add("" + passnum);
+                            }
+                            nextNodeHasOperator = true;
+                        } else {
+                            //节点 ... 未设置节点操作
+                            if (nodeEntity.isMustPass()) errorInfoMsgBuffer.setLength(0);
+                            errorInfoMsgBuffer.append(freeNodeFlowBiz.getFreeNodeMsgContent(nodeEntity, languageid));
+                            //分支必须通过
+                            if (nodeEntity.isMustPass()) {
+                                nextNodeHasOperator = false;
+                                this.nextnodeids.clear();
+                                break;
+                            }
+                        }
+                    }
+                    if (!nextNodeHasOperator) {
+                        JSONObject msgInfo = new JSONObject();
+                        try {
+                            msgInfo.put("details", errorInfoMsgBuffer.toString());
+                        } catch (JSONException e) {
+                            e.printStackTrace();
+                        }
+                        this.setMessagecontent(msgInfo.toString());
+                    }
+                } else {
+                    //未找到下一节点，表示是从自由节点到下一节点则
+                    if (nodeid < 0) {
+                        int freeStartNodeId = rootNodeGroup.getFreeStartNodeid();
+                        String freeEndNodeId = Util.null2String(rootNodeGroup.getFreeEndNodeid());
+
+                        if (!freeEndNodeId.equals(Util.null2String(freeStartNodeId))) {
+                            this.lastFreeNodeId = nodeid;
+                            this.nodeid = freeStartNodeId;
+                        } else {
+                            this.nextnodeid = freeStartNodeId;
+                            rs.executeProc("workflow_NodeType_Select", "" + workflowid + flag + nextnodeid);
+                            if (rs.next()) {
+                                nextnodetype = Util.null2String(rs.getString(1));
+                            }
+                            NodeInfoEntity nodeInfo = WorkflowBaseBiz.getNodeInfo(nextnodeid);
+                            nextnodeattribute = nodeInfo.getNodeAttribute();
+                            nextlinkname = nodeInfo.getNodename();
+                            boolean hasOperator = getNextOperator();
+                            if (hasOperator) {
+                                if (this.nextnodeids.indexOf("" + nextnodeid) == -1) {
+                                    this.nextnodeids.add("" + nextnodeid);
+                                    this.nextlinkids.add("" + nextlinkid);
+                                    this.nextnodetypes.add(nextnodetype);
+                                    this.nextlinknames.add(nextlinkname);
+                                    this.operatorshts.add(operatorsht);
+                                    this.linkismustpasss.add(ismustpasss);
+                                    this.nextnodeattrs.add(nextnodeattribute);
+                                    this.nextnodepassnums.add("" + passnum);
+                                    this.requestexceptiontypes.add("" + requestexceptiontype);
+                                }
+                                freeNodeOperator = true;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        return freeNodeOperator;
+    }
+
+    private void initTempGroupId() {
+        rs.executeSql("select max(groupid) from workflow_currentoperator where requestid=" + this.requestid);
+        if (rs.next()) {
+            tempGroupId = rs.getInt(1);
+        }
+    }
+
+    /**
+     * 取得流程下一节点的操作者
+     *
+     * @return 是否取得成功
+     */
+    public boolean getNextNodeOperator() {
+        //ActionLog.writeDebuggerLog("----------getNextNodeOperator Begin--------------");
+        //ActionLog.writeDebuggerLog("workflowid:[" + workflowid + "],requestid:[" + requestid + "]");
+        passNodes.clear();
+        int flowcount = 0;                         // 是否有跳过节点的操作
+
+		/*  单独处理逐个操作 by ben 2006-04-08
+
+	    boolean isorderbyorder = getCurrentNodeType();     // 当前节点是否是逐个操作节点
+		if (isorderbyorder) {                              // 当前节点为逐个操作节点
+			nextnodeid = nodeid;
+			nextlinkid = 0;
+			nextlinkname = linkname;
+			nextnodetype = nodetype;
+            if(isreject!=1){
+			boolean hasoperator = getNextOperator();      // 获得当前节点的剩余操作人
+			if (hasoperator) return true;                // 如果有剩余操作人，返回，否则，进入下一个节点
+            }
+        }
+        */
+        //自由流程开始节点的处理，下一个节点为自定义节点顺序最小的节点    add by mackjoe at 20080825 TD8897
+
+        sql = "select id,Signtype,operators from workflow_nodebase where IsFreeNode='1' and requestid=" + requestid + " and startnodeid=" + nodeid;
+        if (this.SubmitToNodeid > 0) {
+            sql += " and id=" + this.SubmitToNodeid;
+        }
+        sql += " order by floworder,id";
+        rs.executeSql(sql);
+//        boolean hasData = rs.next();
+//        int tempNextnodeid = rs.getInt("id");
+//        RecordSet rs2 = new RecordSet();
+//        rs2.executeSql("select * from workflow_currentoperator where nodeid='"+tempNextnodeid+"' and requestid="+requestid);
+//        boolean hasData2 = rs2.next();
+        //流程退回的话，不应该走入只有流程设置的路径 isreject = 1 代表流程退回
+        if (rs.next() && isreject != 1) {
+            IsFreeNode = "1";
+            nextnodeid = rs.getInt("id");
+            FreeSigntype = Util.getIntValue(rs.getString("Signtype"), 0);
+            Freeoperators = Util.null2String(rs.getString("operators"));
+            return FreeWorkflowNextoperator();
+        }
+        //自由流程退回
+//        if(isreject==1){
+//            //退回到的结点还是自由流程节点
+//            sql = "select a.id,a.Signtype,a.operators from workflow_nodebase a,workflow_nodebase b where a.id = b.startnodeid and b.IsFreeNode = a.IsFreeNode and b.IsFreeNode='1' and a.requestid = b.requestid and b.requestid = " + requestid + " and b.id = " + nodeid;
+//            rs.executeSql(sql);
+//            //writeLog("判断自由流程 sql:"+sql);
+//            if(rs.next()){
+//                IsFreeNode = "1";
+//                nextnodeid = rs.getInt("id");
+//                FreeSigntype = Util.getIntValue(rs.getString("Signtype"), 0);
+//                Freeoperators = Util.null2String(rs.getString("operators"));
+//                //writeLog("判断自由流程 IsFreeNode:"+IsFreeNode+"	nextnodeid:"+nextnodeid+"	FreeSigntype:"+FreeSigntype+"	Freeoperators:"+Freeoperators);
+//                return FreeWorkflowNextoperator();
+//            }
+//        }
+        WFLinkInfo wfLinkInfo = new WFLinkInfo();
+        ArrayList lastBrancheNodeList = wfLinkInfo.getLastBrancheNodes(this.workflowid, this.requestid);
+        boolean eh_againJudge = false;
+        if (!eh_callAgainNextNodes) requestexceptiontype = 0;
+        int whileCount = 0;
+        while (true) {
+            if (whileCount > 20) {
+                writeLog("----RequestNodeFlow---line727--requestid:" + requestid + ",userid:" + userid + ",nodeid:" + nodeid);
+            }
+            if (whileCount > 100) {
+                writeLog("----RequestNodeFlow---流程设置可能存在死循环，请检查流程设置！--requestid:" + requestid + ",userid:" + userid + ",nodeid:" + nodeid);
+                return false;
+            }
+            whileCount++;
+            String nextNodeId = "";//add by liaodong for qc76119,76120,54194,64652 start
+            String NodeId = "";//add by liaodong for qc76119,76120,54194,64652 start
+            passNodes.add("" + nodeid);
+            boolean hasnextnode = getNextNode();
+            writeLog("---requestid:" + requestid + ",getNextNode() hasnextnode = " + hasnextnode + " nextnodeid=" + nextnodeid);
+            //add by liaodong for qc76119,76120,54194,64652 start
+            nextNodeId = nextnodeid + "";
+            NodeId = nodeid + "";
+            //end
+
+            //ActionLog.writeDebuggerLog("hasnextnode:[" + hasnextnode + "],IsFreeNode:[" + this.IsFreeNode + "]");
+            if (!hasnextnode) {
+                this.SubmitToNodeid = 0;
+                if (flowcount == 0)
+                    return false;
+                else {
+                    //已穿透，到下一节点节点错误，删除最后个穿透节点workflow_currentoperator已办数据
+                    String delPenetrateSql = "delete from workflow_currentoperator where requestid=" + requestid + " and nodeid=" + nodeid + " and userid=" + userid + " and isremark=2 and preisremark=0 and receivedate='" + getCurrentdate() + "' and receivetime='" + getCurrenttime() + "'";
+                    new RecordSet().executeSql(delPenetrateSql);
+                    return true;
+                }
+            }
+            //自由流程中间节点
+            if (this.IsFreeNode.equals("1")) {
+                return FreeWorkflowNextoperator();
+            } else {
+
+                if (!eh_againJudge) {        //保留第一次流转的节点信息，异常处理前节点信息
+                    eh_original_nodeinfo.put("nodeid", "" + nodeid);
+                    eh_original_nodeinfo.put("nextnodeid", "" + nextnodeid);
+                }
+                boolean hasoperator = getNextOperator();
+                //ActionLog.writeDebuggerLog("----requestid:" + requestid + "getNextOperator() hasoperator = " + hasoperator + " nextnodeid=" + nextnodeid);
+                if (!hasoperator) {
+                    if (flowcount == 0) {
+                        try {
+
+                            //指定流转退回和提交至指定节点判定
+                            if ((isreject == 1 || SubmitToNodeid > 0) && SelectNextFlowBiz.buildRejectOperatorMap(eh_operatorMap, requestid, nextnodeid)) {
+                                return getNextOperatorByAssignUser(Util.null2String(eh_operatorMap.get("eh_relationship")), Util.null2String(eh_operatorMap.get("eh_operators")));
+                            }
+
+                            //liuzy 流转异常设置判定
+                            Map<String, String> settingMap = flowExceptionHandle.getExceptionHandleSetting(workflowid, nextnodeid);
+                            if (!"1".equals(Util.null2String(settingMap.get("useExceptionHandle"))))        //未启用异常设置
+                                return false;
+                            int handleway = Util.getIntValue(settingMap.get("exceptionHandleWay"));
+                            /*以下几种情况忽略异常处理设置*/
+                            /*退回,异常前两种方式不处理*/
+                            /*分叉合并点*/
+                            /*分支第一个分叉中间点设置无效*/
+                            /*归档节点 且 设置的跳转下一节点或跳转指定节点*/
+                            /*异常跳转一次后，只针对跳转下一节点选项做递归处理*/
+                            /*分叉起始点找不到操作者，下一节点找分叉中间点时，分叉中间点设置无效*/
+                            /*分叉起始点提交到分叉中间点，分叉中间点设置由用户指定操作者无效*/
+                            JSONObject msgInfo = new JSONObject();
+                            if (isreject == 1 && handleway != 3) {
+                                return false;
+                            }
+
+                            // 提交到退回节点时，不进行流程异常处理
+                            if (SubmitToNodeid > 0) {
+                                //return false;
+                            }
+                            if ("3".equals(nextnodeattribute) || "4".equals(nextnodeattribute) || "5".equals(nextnodeattribute)) {
+                                return false;
+                            }
+                            if ("1".equals(nodeattribute) && "2".equals(nextnodeattribute)) {
+                                return false;
+                            }
+                            if ("3".equals(nextnodetype) && handleway != 3) {
+                                return false;
+                            }
+                            if (eh_againJudge && handleway != 1) {
+                                return false;
+                            }
+                            if (eh_callAgainNextNodes)
+                                return false;
+                            if ("1".equals(nodeattribute) && handleway == 3)
+                                return false;
+
+                            eh_againJudge = true;
+                            requestexceptiontype = handleway;
+                            if (handleway == 1) {//异常处理跳过节点时，记录跳过的节点，插入数据库。 在流程图中显示跳过的节点
+                                String passedNodes = Util.null2String(eh_operatorMap.get("passedNodes"));
+                                if ("".equals(passedNodes)) {
+                                    passedNodes = nextnodeid + "";
+                                } else {
+                                    passedNodes += "," + nextnodeid;
+                                }
+                                eh_operatorMap.put("passedNodes", passedNodes);
+                            }
+                            if (handleway == 1) {        //设置找不到操作者时流转至下一节点
+                                if ("1".equals(nextnodeattribute)) {
+                                    nodeid = nextnodeid;
+                                    eh_callAgainNextNodes = true;    //模拟分叉起始点调用getNextNodes()方法算分叉中间点
+                                    this.isSelectNextFlow = false;
+                                    freeNodeFlowBiz = null;
+                                    getNextNodes();
+                                    eh_unAppendNextNodes = true;    //控制不进行原getNextNodes()方法的后续拼接节点操作
+                                    return false;
+                                } else {
+                                    if (nodeid == nextnodeid) {
+                                        Map<String, Object> messagecontentMap = JSON.parseObject(messagecontent);
+                                        messagecontentMap.put("details", messagecontentMap.get("details") + "<span>" + WorkflowRequestMessage.getBoldInfo(WorkflowRequestMessage.getWorkflowNodename(nextnodeid)) + SystemEnv.getHtmlLabelName(507499, languageid) + "</span><br/>");
+                                        messagecontent = JSON.toJSONString(messagecontentMap);
+                                        errorInfoMsgBuffer.insert(0, "<span>" + WorkflowRequestMessage.getBoldInfo(WorkflowRequestMessage.getWorkflowNodename(nextnodeid)) + SystemEnv.getHtmlLabelName(507499, languageid) + "</span><br/>");
+                                        writeLog("RequestNodeFlow----节点异常处理出现死循环，请检查流程设置是否存在死循环！----requestid:" + requestid + ",userid:" + userid + ",nodeid:" + nodeid);
+                                        return false;
+                                    }
+                                    nodeid = nextnodeid;
+                                    linkid = nextlinkid;
+                                    linkname = nextlinkname;
+                                    nodetype = nextnodetype;
+                                    this.SubmitToNodeid = 0;
+                                    continue;
+                                }
+                            } else if (handleway == 2) {    //设置找不到操作者时跳转至指定节点
+                                int jumpAssignNode = Util.getIntValue(settingMap.get("flowToAssignNode"));
+                                if (jumpAssignNode == -1 || nodeid == jumpAssignNode || nextnodeid == jumpAssignNode)
+                                    return false;
+                                if (flowExceptionHandle.judgeCanFlowAssignNode(workflowid, nodeid, jumpAssignNode)) {
+                                    nextnodeid = jumpAssignNode;
+                                    rs.executeSql("SELECT nb.nodeattribute,fn.nodetype,nb.passnum FROM workflow_nodebase nb,workflow_flownode fn WHERE nb.id = fn.nodeid AND fn.nodeid=" + nextnodeid);
+                                    if (rs.next()) {
+                                        nextlinkid = -1;
+                                        nextlinkname = SystemEnv.getHtmlLabelName(125951, languageid);
+                                        ismustpasss = "0";
+                                        nextnodetype = Util.null2String(rs.getString("nodetype"));
+                                        nextnodeattribute = Util.null2String(rs.getString("nodeattribute"));
+                                        passnum = Util.getIntValue(rs.getString("passnum"));
+                                        boolean hasoperator_next = getNextOperator();
+                                        if (hasoperator_next) {
+                                            setHasEflowToAssignNode(true);
+                                            return true;
+                                        }
+                                    }
+                                }
+                            } else if (handleway == 3) {    //设置由用户指定操作者
+                                this.setMessagecontent("");
+                                String eh_setoperator = Util.null2String(eh_operatorMap.get("eh_setoperator"));
+                                if (isreject == 1) {                //退回时，找节点异常处理时人员,按提交至指定人员处理
+                                    eh_setoperator = "y";
+                                    flowExceptionHandle.buildRejectOperatorMap(eh_operatorMap, requestid, nextnodeid);
+                                }
+                                if ("y".equals(eh_setoperator)) {        //流程提交至选择的人员
+                                    boolean setOperatorFlag = getNextOperatorByAssignUser(Util.null2String(eh_operatorMap.get("eh_relationship")), Util.null2String(eh_operatorMap.get("eh_operators")));
+                                    return setOperatorFlag;
+                                } else if ("n".equals(eh_setoperator)) {
+                                    return false;
+                                } else {
+                                    isNeedChooseOperator = true;
+                                    return false;
+                                }
+                            }
+                        } catch (Exception e) {
+                            writeLog(e);
+                        }
+                        return false;
+                    } else {
+                        //已穿透，到下一节点操作者异常，删除最后个穿透节点workflow_currentoperator已办数据
+                        String delPenetrateSql = "delete from workflow_currentoperator where requestid=" + requestid + " and nodeid=" + nodeid + " and userid=" + userid + " and isremark=2 and preisremark=0 and receivedate='" + getCurrentdate() + "' and receivetime='" + getCurrenttime() + "'";
+                        new RecordSet().executeSql(delPenetrateSql);
+                        nextnodeid = nodeid;
+                        nextlinkid = linkid;
+                        nextlinkname = linkname;
+                        nextnodetype = nodetype;
+                        return true;
+                    }
+                }
+
+                // 增加配置文件：workflowNotPenetrate.properties,
+                // 在此文件中配置的流程ID，或者表单ID，均不会执行穿透操作
+                /*int failedFlag = 0;
+                //是否关闭流程自动流转日志
+                boolean wfAutoFlowLogisclose = Util.getIntValue(this.getPropValue("wfAutoFlowLog", "wfAutoFlowLogisclose")) == 1;
+                try {
+                    //是否关闭了穿透功能
+                    boolean isclose = Util.getIntValue(this.getPropValue("workflowNotPenetrate", "close")) == 1;
+                    //开启自动批准
+                    String isAutoApprove = Util.null2s(new WorkflowAllComInfo().getIsAutoApprove(workflowid + ""), "0");
+                    if(!"0".equals(isAutoApprove)){
+                        return true;
+                    }
+                    if (failedFlag==0 && isclose ) {
+                        return true;     //failedFlag="1";
+                    }
+                    //开启指定流转
+                    boolean selectNextFlow = SelectNextFlowBiz.hasSelectNextFlow(nextnodeid);
+                    if (failedFlag==0 && selectNextFlow) {
+                        failedFlag=2;
+                    }
+                    //不穿透的流程ID
+                    String notPenetratewfids = Util.null2String(this.getPropValue("workflowNotPenetrate", "workflowids"));
+                    //不穿透的系统表单ID
+                    String notPenetratesysformids = Util.null2String(this.getPropValue("workflowNotPenetrate", "sysformids"));
+                    //不穿透的自定义表单ID
+                    String notPenetrateformids = Util.null2String(this.getPropValue("workflowNotPenetrate", "formids"));
+                    //流程代理是否穿透
+//				if ("".equals(closeAgentPenetrate)) {
+                    closeAgentPenetrate = Util.null2String(this.getPropValue("workflowAgentNotPenetrate", "closeAgentPenetrate"));
+                    closeAgentPenetrateWorkflowId = Util.null2String(this.getPropValue("workflowAgentNotPenetrate", "closeAgentPenetrateWorkflowId"));
+                    closeAgentPenetrateWorkflowId = "," + closeAgentPenetrateWorkflowId + ",";
+//				}
+                    //在配置文件中找到对应的ID则不穿透
+                    if (failedFlag==0 && ("," + notPenetratewfids + ",").indexOf("," + workflowid + ",") != -1) {
+                          return true;   //failedFlag="1";
+                    }
+                    //在配置文件中找到对应的系统表单ID则不穿透
+                    if (failedFlag==0 && isbill == 1 && formid > 0 && ("," + notPenetratesysformids + ",").indexOf("," + formid + ",") != -1) {
+                        return true;  //failedFlag="1";
+                    } else if (failedFlag==0 && ((isbill == 1 && formid < 0) || (isbill != 1 && formid > 0))
+                            && ("," + notPenetrateformids + ",").indexOf("," + formid + ",") != -1) {
+                        return true;    //failedFlag="1";
+                    }
+
+                } catch (Exception e) {
+                    //writeLog("unable to get through the configuration.!");
+                    e.printStackTrace();
+                }
+
+                // 如果是退回或者重新打开操作,不作跳过,
+                // 如果是提及操作,下一个节点不是审批节点,不作跳过判定
+                // 如果下一个节点是审批节点并有可以编辑的项目,也不作跳过判定,如果依次逐个递交也不做跳过判定
+                // 如果下一个节点的所有组中,有一个没有包含当前操作者,不作跳过
+                // 分叉起始节点、合并点不作跳过
+                // 分叉合并点前的最后一个分叉中间点，也不跳过
+                boolean isLastBrancheNode = lastBrancheNodeList.contains("" + this.nextnodeid);
+                if (failedFlag==0 && this.SubmitToNodeid > 0) {//提交到退回节点 不进行穿透
+                    failedFlag=3;
+                }
+                //System.out.println("nextnodetype="+nextnodetype+" this.SubmitToNodeid = "+this.SubmitToNodeid);
+                String userIdStr = "-1";//被代理人ID记录
+                if (failedFlag==0 && (isreopen == 1 || isreject == 1))
+                    failedFlag=4;
+                else if (failedFlag==0 && !nextnodetype.equals("1") && this.SubmitToNodeid <= 0) {
+                    if("3".equals(nextnodetype)){
+                        return true;
+                    }else{
+                        failedFlag=5;
+                    }
+                } else if (failedFlag==0 && (nextnodetype.equals("1") || nextnodetype.equals("0")) && hasedititem && this.SubmitToNodeid <= 0) {
+                    failedFlag=6;
+                } else if (failedFlag==0 && orderflag)
+                    failedFlag=7;
+                else if (failedFlag==0 && (nextnodeattribute.equals("1") || nextnodeattribute.equals("3") || nextnodeattribute.equals("4") || nextnodeattribute.equals("5")))
+                    failedFlag=8;
+                else if (failedFlag==0 && isLastBrancheNode == true) {
+                    failedFlag=9;
+                } else if (failedFlag==0 && nodeattribute.equals("1") && nextnodeattribute.equals("2")) {   //如果当前节点是分叉起始节点并且下一个节点是分叉中间节点，不允许穿透
+                    failedFlag=10;
+                }
+                if(failedFlag==0) {
+                    if (flowcount > 0 && nextnodeid == nodeid) {//如果设置了流程出口返回本节点，并且已经穿透了一次，那第2次不再穿透
+                        failedFlag = 11;
+                    } else {
+                        Enumeration operatorgroups = operatorsht.keys();
+                        while (operatorgroups.hasMoreElements()) {
+                            String operatorgroup = (String) operatorgroups.nextElement();
+                            ArrayList operators = (ArrayList) operatorsht.get(operatorgroup);
+                            //operators的内容构成改变为"userid_usertype_groupdetailid"，故修改是否为相同操作者的判断方法
+                            boolean isUserRepeat = false;
+                            for (int i = 0; i < operators.size(); i++) {
+                                String userStr = (String) operators.get(i);
+                                userStr = userStr.substring(0, userStr.lastIndexOf("_"));
+                                userStr = userStr.substring(0, userStr.lastIndexOf("_"));
+                                //add by liao dong for qc56835 in 2013年10月21日 start
+                                userIdStr = userStr.substring(0, userStr.lastIndexOf("_"));
+                                String usertypeStr = userStr.substring(userStr.lastIndexOf("_"));
+
+                                String agentId = getAgentTypeByUserId(userIdStr, workflowid + "");
+                                if ("".equals(agentId)) {
+                                    if (userStr.equals("" + userid + "_" + usertype)) {
+                                        isUserRepeat = true;
+                                        updateAgentManagerByUserId(userIdStr, isbill, formid, requestid);
+                                        break;
+                                    }
+                                } else { //设置了代理a-b-c-d的时候c-b需要穿透
+                                    //查询代理人的usertype
+                                    if ((agentId + usertypeStr).equals("" + userid + "_" + usertype) && !"1".equals(closeAgentPenetrate.trim()) && closeAgentPenetrateWorkflowId.indexOf("," + workflowid + ",") == -1) {
+                                        isUserRepeat = true;
+                                        updateAgentManagerByUserId(userIdStr, isbill, formid, requestid);
+                                        break;
+                                    }
+                                }
+                                //end
+                            }
+                            if (failedFlag==0 && !isUserRepeat) return true;   //failedFlag="12";
+                        }
+                    }
+                }
+                if(wfAutoFlowLogisclose){
+                    if(failedFlag!=0) return true;
+                }else{
+                    if (failedFlag!=0) {
+                        if(workflowid != 1 && currentdate!=null && !"".equals(currentdate) && requestid>0){
+                        List params = WfAutoflowLogUtil.initParams(requestid, 0, this.nodeid, this.nextnodeid, "1", failedFlag, this.userid, currentdate, currenttime);
+                        WfAutoflowLogUtil.putWfautoParamList(params);
+                        }
+                        return true;
+                    }
+                    if (failedFlag==0 && workflowid != 1 && currentdate!=null && !"".equals(currentdate) && requestid>0) {
+                        List params = WfAutoflowLogUtil.initParams(requestid, 1, this.nodeid, this.nextnodeid, "1", failedFlag, this.userid, currentdate, currenttime);
+                        WfAutoflowLogUtil.putWfautoParamList(params);
+                    }
+                }
+                nodeid = nextnodeid;
+                linkid = nextlinkid;
+                linkname = nextlinkname;
+                nodetype = nextnodetype;
+                hasedititem = false;
+                flowcount++;
+                //TD25811 chujun
+                //程序到了这里，已经是满足流程穿透了。在workflow_currentoperator表插入一条记录，为了在流程退回的时候能找到操作者。isremark=2
+                if (this.isFromRequestManager == 1) {//如果是提交确认，进这个方法的入口不是RequestManager，就不做这个操作。
+                    try {
+                        WorkflowComInfo wfComInfo = new WorkflowComInfo();
+                        int workflowtype = Util.getIntValue(wfComInfo.getWorkflowtype("" + workflowid), 0);
+                        String Procpara_tmp = "" + requestid + flag + userid + flag + "0" + flag + workflowid + flag
+                                + workflowtype + flag + usertype + flag + "2" + flag + nodeid + flag + userIdStr
+                                + flag + "2" + flag + -1 + flag + "0";
+                        if (userIdStr.equals("" + userid)) {
+                            Procpara_tmp = "" + requestid + flag + userid + flag + "0" + flag + workflowid + flag
+                                    + workflowtype + flag + usertype + flag + "2" + flag + nodeid + flag + -1
+                                    + flag + "0" + flag + -1 + flag + "0";
+                        }
+                        RecordSet rs_tmp = new RecordSet();
+                        rs_tmp.executeProc("workflow_CurrentOperator_I", Procpara_tmp);
+                        rs_tmp.execute("update workflow_currentoperator set preisremark='0' where userid=" + userid + " and requestid=" + requestid + " and usertype=" + usertype + " and nodeid=" + nodeid + " and islasttimes=1");
+                        // add by liaodong for qc86096 in 2013-11-19 start
+                        rs_tmp.executeSql("update workflow_currentoperator set  receivedate='" + getCurrentdate() + "',receivetime='" + getCurrenttime() + "'  where  userid=" + userid + " and requestid=" + requestid + " and usertype=" + usertype + " and nodeid=" + nodeid + " and islasttimes=1  ");
+                        //end
+                    } catch (Exception e) {
+
+                    }
+                }
+                //add by liaodong for qc76119,76120,54194,64652 start
+                //由于未插入workflow_requestLog插入新的表workflow_penetrateLog中作为穿透表的原因 start
+                if ("".equals(nextNodeId)) {
+                    nextNodeId = nodeid + "";
+                }
+                try {
+                    //取数据库服务器的当前时间 start
+                    if (!isintervenor.equals("1")) {//如果是流程干预，则不往workflow_penetrateLog表中插数据
+                        String penetrateSql = "insert into workflow_penetrateLog(requestid,workflowid,nodeid,operator,operatortype,destnodeid,logtype, linkid)"
+                                + "values ('" + requestid + "','" + workflowid + "','" + NodeId + "','" + userid + "','" + usertype + "','" + nextNodeId + "','2', "+linkid+")";
+                        if ("oracle".equals(rs.getDBType())) {
+                            penetrateSql = "insert into workflow_penetrateLog(id,requestid,workflowid,nodeid,operator,operatortype,destnodeid,logtype, linkid)"
+                                    + "values (workflowpenetratelog_Id.nextval,'" + requestid + "','" + workflowid + "','" + NodeId + "','" + userid + "','" + usertype + "','" + nextNodeId + "','2', "+linkid+")";
+                        }
+                        rs.executeSql(penetrateSql);
+                    }
+
+                    String maxpenetrateIdSql = "select max(id) maxId from  workflow_penetrateLog where requestid= " + requestid + "";
+                    rs.executeSql(maxpenetrateIdSql);
+                    if (rs.next()) {
+                        this.setPenetrateId(this.getPenetrateId() + "," + rs.getString("maxId"));
+                    }
+                    this.setLastNodeId(nextNodeId);
+                } catch (Exception e) {
+                }*/
+                //end
+
+                //ActionLog.writeDebuggerLog("----------getNextNodeOperator END--------------");
+                return true;
+            }
+        }
+    }
+
+    /**
+     * 取得流程下一节点
+     *
+     * @return 是否取得成功
+     */
+    public boolean getNextNode() {
+        if (isreopen == 1) {
+            rs.executeProc("workflow_CreateNode_Select", workflowid + "");
+            if (rs.next()) {
+                nextnodeid = Util.getIntValue(rs.getString(1), 0);
+                nextnodetype = "0";   // 创建节点类型
+                nextlinkid = -1;
+                nextlinkname = "Reopen";
+            } else
+                return false;
+        }    //td30785
+        else if ((isreject == 1 && RejectToNodeid > 0) || (this.SubmitToNodeid > 0 && this.IsTrunkSubmitToBranch(rs, nodeid, SubmitToNodeid))) {    //退回到指定节点 或者提交到指定节点
+            ArrayList whereclauses = new ArrayList();                   //  出口条件
+            ArrayList newrules = new ArrayList();                        // 新规则
+            ArrayList linkids = new ArrayList();                        //  出口id
+            ArrayList linknames = new ArrayList();                      //  出口名称
+            ArrayList nextnodeids = new ArrayList();
+            ArrayList mustpassnodeids = new ArrayList();
+            mustpassnodeids = new WFLinkInfo().getMustPassStartBrancheNode(workflowid, requestid, nodeid);
+            //System.out.println("this.RejectToType = "+this.RejectToType+" RejectToNodeid:"+RejectToNodeid+"");
+            boolean temp_nextnodeid = false;
+            if (isreject == 1) {
+                if (this.RejectToType == 1) {//重新分叉
+                    if (rs.getDBType().equals("mysql")) {
+                        rs.executeSql("select id,linkname,`condition`,newrule,destnodeid from workflow_nodelink where wfrequestid is null and nodeid=" + this.RejectToNodeid + " and workflowid=" + workflowid + " and (isreject is null or isreject<>'1') order by linkorder,id");
+                    } else {
+                        rs.executeSql("select id,linkname,condition,newrule,destnodeid from workflow_nodelink where wfrequestid is null and nodeid=" + this.RejectToNodeid + " and workflowid=" + workflowid + " and (isreject is null or isreject<>'1') order by linkorder,id");
+                    }
+                    //writeLog("select id,linkname,condition,newrule,destnodeid from workflow_nodelink where wfrequestid is null and nodeid="+this.RejectToNodeid+" and workflowid="+workflowid+" and (isreject is null or isreject<>'1') order by linkorder,id");
+                    while (rs.next()) {
+                        whereclauses.add(Util.null2String(rs.getString("condition")));
+                        newrules.add(Util.null2String(rs.getString("newrule")));
+                        linkids.add(Util.null2String(rs.getString("id")));
+                        linknames.add(Util.null2String(rs.getString("linkname")));
+                        nextnodeids.add(Util.null2String(rs.getString("destnodeid")));
+                    }
+                } else if (this.RejectToType == 2) {//取消合并
+                    if (rs.getDBType().equals("mysql")) {
+                        rs.executeSql("select id,linkname,`condition`,newrule,destnodeid from workflow_nodelink where wfrequestid is null and destnodeid in (" + StringUtils.join(new WFLinkInfo().getBrancheLastNode(requestid, workflowid, RejectToNodeid), ",") + ") and workflowid=" + workflowid + " order by linkorder,id");
+                    } else {
+                        rs.executeSql("select id,linkname,condition,newrule,destnodeid from workflow_nodelink where wfrequestid is null and destnodeid in (" + StringUtils.join(new WFLinkInfo().getBrancheLastNode(requestid, workflowid, RejectToNodeid), ",") + ") and workflowid=" + workflowid + " order by linkorder,id");
+                    }
+                    //writeLog("select id,linkname,condition,newrule,destnodeid from workflow_nodelink where wfrequestid is null and destnodeid in ("+StringUtils.join(new WFLinkInfo().getBrancheLastNode(requestid, workflowid, RejectToNodeid),",")+") and workflowid="+workflowid+" order by linkorder,id");
+                    while (rs.next()) {
+                        //whereclauses.add(Util.null2String(rs.getString("condition")));
+                        //newrules.add(Util.null2String(rs.getString("newrule")));
+                        whereclauses.add("");
+                        newrules.add("");
+                        linkids.add(Util.null2String(rs.getString("id")));
+                        linknames.add(Util.null2String(rs.getString("linkname")));
+                        nextnodeids.add(Util.null2String(rs.getString("destnodeid")));
+                    }
+                } else {
+                    nextnodeid = RejectToNodeid;
+				/*
+            	rs.executeSql("select id,linkname,condition,newrule from workflow_nodelink where wfrequestid is null and isreject='1' and nodeid="+nodeid+" and destnodeid="+nextnodeid+" and workflowid="+workflowid+" order by linkorder,id");
+                while(rs.next()){
+    				whereclauses.add(Util.null2String(rs.getString("condition")));
+    				newrules.add(Util.null2String(rs.getString("newrule")));
+    				linkids.add(Util.null2String(rs.getString("id")));
+    				linknames.add(Util.null2String(rs.getString("linkname")));
+    				nextnodeids.add("" + nextnodeid);
+                }
+				*/
+                }
+            } else if (this.SubmitToNodeid > 0) {
+
+                String tempsql = "";//"select * from workflow_nodelink where wfrequestid is null and (isreject is null or isreject <> '1') and nodeid=" + nodeid + " and destnodeid=" + SubmitToNodeid + " and workflowid=" + workflowid + " order by linkorder, id";
+                //if(this.IsTrunkSubmitToBranch(rs, nodeid, SubmitToNodeid)){//主干退回到分叉中间节点
+                tempsql = "select l.* from workflow_nodelink l,workflow_nodebase n where (l.isreject is null or l.isreject <> '1') and l.destnodeid in (" + StringUtils.join(new WFLinkInfo().getLastOperateNode(requestid, workflowid, SubmitToNodeid), ",") + ") and l.workflowid=" + workflowid + " and (l.wfrequestid is null or l.wfrequestid='' or l.wfrequestid=' ')  and n.id=l.nodeid and (n.isfreenode is null or n.isfreenode ='' or n.isfreenode =' ') order by linkorder,l.id";
+                //}
+                rs.executeSql(tempsql);
+                while (rs.next()) {
+                    //whereclauses.add(Util.null2String(rs.getString("condition")));
+                    //newrules.add(Util.null2String(rs.getString("newrule")));
+                    whereclauses.add("");
+                    newrules.add("");
+                    linkids.add(Util.null2String(rs.getString("id")));
+                    linknames.add(Util.null2String(rs.getString("linkname")));
+                    nextnodeids.add(Util.null2String(rs.getString("destnodeid")));
+                }
+            }
+            // System.out.println("linkids.size()="+linkids.size());
+            if (linkids.size() > 0) {
+                int linkindex = 0;
+                for (linkindex = 0; linkindex < linkids.size(); linkindex++) {
+                    nextlinkid = Util.getIntValue((String) linkids.get(linkindex));
+                    nextlinkname = (String) linknames.get(linkindex);
+                    int nextnodeid = Util.getIntValue((String) nextnodeids.get(linkindex), 0);
+                    String whereclause = (String) whereclauses.get(linkindex);
+                    String newrule = (String) newrules.get(linkindex);
+                    this.tempnextnodeid = nextnodeid;
+                    rs.executeProc("workflow_NodeType_Select", "" + workflowid + flag + nextnodeid);
+                    if (rs.next()) {
+                        nextnodetype = Util.null2String(rs.getString(1));
+                    }
+                    if (tempmutinodeids.contains(nextnodeid)) {
+                        continue;
+                    }
+
+                    boolean oldcop = false;
+                    boolean newcop = false;
+                    if (whereclause.trim().equals("") && newrule.trim().equals("")) {
+                        tempmutinodeids.add(nextnodeid);
+                        break;
+                    } else {
+                        //查询规则间的关系
+                        RecordSet rrs = new RecordSet();
+                        int ruleRelationship = 1;
+                        if (!"".equals(nextlinkid)) {
+                            String rulesql = "select ruleRelationship from workflow_nodelink where id = " + linkid;
+                            rrs.executeSql(rulesql);
+                            if (rrs.next()) {
+                                ruleRelationship = Util.getIntValue(Util.null2String(rrs.getString("ruleRelationship")), 1);
+                            }
+                        }
+                        if (!whereclause.trim().equals("")) //兼容老条件
+                        {
+                            if (isbill == 1)
+                                sql = "select count(id) from " + billtablename + " where id=" + billid + " and " + whereclause;
+                            else
+                                sql = "select count(requestid) from workflow_form where requestid=" + requestid + " and " + whereclause;
+                            rs.executeSql(sql);
+
+                            if (rs.next() && rs.getInt(1) > 0) {
+                                oldcop = true;
+                                tempmutinodeids.add(nextnodeid);
+                            }
+                            //规则间关系为或者关系时，如果老的条件已经满足，则不再去计算新规则
+                            if (ruleRelationship == 2 && oldcop) {
+                                tempmutinodeids.add(nextnodeid);
+                                break;
+                            }
+
+                            //规则间关系为并且是， 如果老的条件不满足，则不再去计算新规则，直接计算下一条出口
+                            if (ruleRelationship == 1 && !oldcop) {
+                                tempmutinodeids.add(nextnodeid);
+                                continue;
+                            }
+                        } else {
+                            //规则间关系是“并且”， 且老的规则又不存在时，将老条件结果置为true
+                            if (ruleRelationship == 1) {
+                                tempmutinodeids.add(nextnodeid);
+                                oldcop = true;
+                            }
+                        }
+
+
+                        if (!newrule.trim().equals("")) {
+                            RuleInterface rif = new RuleInterface();
+                            rif.setUserid(this.userid + "");
+                            rif.setAutoForecast(this.autoForecast);
+                            rif.setForecastManagerInfo(this.forecastManagerInfo);
+                            newcop = rif.compareRuleforWF(newrule, requestid + "", nextlinkid + "", RuleInterface.RULESRC_CK);
+                        } else {
+                            if (ruleRelationship == 1) {
+                                newcop = true;
+                            }
+                        }
+                        if (ruleRelationship == 1) {
+                            if (oldcop && newcop) {
+                                tempmutinodeids.add(nextnodeid);
+                                break;
+                            }
+                        } else {
+                            if (oldcop || newcop) {
+                                tempmutinodeids.add(nextnodeid);
+                                break;
+                            }
+                        }
+                    }
+                }
+                try {
+                    nextnodeid = Util.getIntValue((String) nextnodeids.get(linkindex), 0);
+                    this.tempnextnodeid = nextnodeid;
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            } else {
+                nextlinkid = -1;
+                rs.executeSql("select nodename,nodetype from workflow_flownode f,workflow_nodebase n WHERE n.id=f.nodeid and workflowid=" + workflowid + " and nodeid=" + nextnodeid);
+                if (rs.next()) {
+                    nextlinkname = Util.null2String(rs.getString("nodename"));
+                    nextnodetype = Util.null2String(rs.getString("nodetype"));
+                }
+
+            }
+        } else if (isForceOver && forceOverNodeId > 0) {  //强制归档到指定归档节点
+            nextnodeid = forceOverNodeId;
+            rs.executeProc("workflow_NodeType_Select", "" + workflowid + flag + nextnodeid);
+            if (rs.next()) {
+                nextnodetype = Util.null2String(rs.getString(1));
+            }
+
+            ArrayList whereclauses = new ArrayList();                   //  出口条件
+            ArrayList newrules = new ArrayList();                        //	新出口条件
+            ArrayList linkids = new ArrayList();                        //  出口id
+            ArrayList linknames = new ArrayList();                      //  出口名称
+            if (rs.getDBType().equals("mysql")) {
+                rs.executeSql("select id,linkname,`condition`,newrule from workflow_nodelink where wfrequestid is null and (isreject is null or isreject<>'1') and nodeid=" + nodeid + " and destnodeid=" + nextnodeid + " and workflowid=" + workflowid + " order by linkorder, id");
+            } else {
+                rs.executeSql("select id,linkname,condition,newrule from workflow_nodelink where wfrequestid is null and (isreject is null or isreject<>'1') and nodeid=" + nodeid + " and destnodeid=" + nextnodeid + " and workflowid=" + workflowid + " order by linkorder, id");
+            }
+            while (rs.next()) {
+                whereclauses.add(Util.null2String(rs.getString("condition")));
+                newrules.add(Util.null2String(rs.getString("newrule")));
+                linkids.add(Util.null2String(rs.getString("id")));
+                linknames.add(Util.null2String(rs.getString("linkname")));
+            }
+
+            if (linkids.size() > 0) {
+                for (int linkindex = 0; linkindex < linkids.size(); linkindex++) {
+                    nextlinkid = Util.getIntValue((String) linkids.get(linkindex));
+                    nextlinkname = (String) linknames.get(linkindex);
+                    String whereclause = (String) whereclauses.get(linkindex);
+                    String newrule = (String) newrules.get(linkindex);
+                    boolean oldcop = false;
+                    boolean newcop = false;
+                    if (whereclause.trim().equals("") && newrule.trim().equals("")) {
+                        break;
+                    } else {
+
+                        //查询规则间的关系
+                        RecordSet rrs = new RecordSet();
+                        int ruleRelationship = 1;
+                        if (!"".equals(nextlinkid)) {
+                            String rulesql = "select ruleRelationship from workflow_nodelink where id = " + linkid;
+                            rrs.executeSql(rulesql);
+                            if (rrs.next()) {
+                                ruleRelationship = Util.getIntValue(Util.null2String(rrs.getString("ruleRelationship")), 1);
+                            }
+                        }
+
+                        //兼容老条件
+                        if (!whereclause.trim().equals("")) {
+                            if (isbill == 1)
+                                sql = "select count(id) from " + billtablename + " where id=" + billid + " and " + whereclause;
+                            else
+                                sql = "select count(requestid) from workflow_form where requestid=" + requestid + " and " + whereclause;
+                            rs.executeSql(sql);
+
+                            if (rs.next() && rs.getInt(1) > 0) {
+                                oldcop = true;
+                            }
+
+                            //规则间关系为或者关系时，如果老的条件已经满足，则不再去计算新规则
+                            if (ruleRelationship == 2 && oldcop) {
+                                break;
+                            }
+
+                            //规则间关系为并且是， 如果老的条件不满足，则不再去计算新规则，直接计算下一条出口
+                            if (ruleRelationship == 1 && !oldcop) {
+                                continue;
+                            }
+                        } else {
+                            //规则间关系是“并且”， 且老的规则又不存在时，将老条件结果置为true
+                            if (ruleRelationship == 1) {
+                                oldcop = true;
+                            }
+                        }
+
+                        if (!newrule.trim().equals("")) {
+                            RuleInterface rif = new RuleInterface();
+                            rif.setUserid(this.userid + "");
+                            rif.setAutoForecast(this.autoForecast);
+                            rif.setForecastManagerInfo(this.forecastManagerInfo);
+                            newcop = rif.compareRuleforWF(newrule, requestid + "", nextlinkid + "", RuleInterface.RULESRC_CK);
+                        } else {
+                            if (ruleRelationship == 1) {
+                                newcop = true;
+                            }
+                        }
+                        if (ruleRelationship == 1) {
+                            if (oldcop && newcop)
+                                break;
+                        } else {
+                            if (oldcop || newcop)
+                                break;
+                        }
+                    }
+                }
+            } else {
+                nextlinkid = -1;
+                rs.executeSql("select nodename from workflow_nodebase where id=" + nextnodeid);
+                if (rs.next()) {
+                    nextlinkname = Util.null2String(rs.getString("nodename"));
+                }
+            }
+        } else {
+            ArrayList whereclauses = new ArrayList();                   //  出口条件
+            ArrayList newrules = new ArrayList();                        //	新规则
+            ArrayList linkids = new ArrayList();                        //  出口id
+            ArrayList linknames = new ArrayList();                      //  出口名称
+            ArrayList nextnodeids = new ArrayList();                    //  目标节点
+            ArrayList ismustpassss = new ArrayList();                    // 是否必须通过
+            String isBulidCode = null;                    //  是否生成编号
+            ArrayList isBulidCodeList = new ArrayList();                    //  是否生成编号列表
+            ArrayList mustpassnodeids = new ArrayList();
+            ArrayList conditions = new ArrayList();              //出口规则文本
+            mustpassnodeids = new WFLinkInfo().getMustPassStartBrancheNode(workflowid, requestid, nodeid);
+            //System.out.println("mustpassnodeids.size = "+mustpassnodeids.size()+" SubmitToNodeid="+SubmitToNodeid);
+            boolean executesuccess = true;//rs.executeProc("workflow_NodeLink_Select", nodeid + "" + flag + isreject+flag+""+requestid);
+            //按照设置顺序进行排序
+            rs = WFPathUtil.getNodeLinkrs(workflowid, requestid, nodeid, isreject, rs);
+            if (rs.getCounts() == 0 && SubmitToNodeid <= 0 && selectNextFlowNodeList.size() <= 0) {
+                //出口未设置
+                JSONObject msgInfo = null;
+                msgInfo = WorkflowRequestMessage.getBottomInfo(SystemEnv.getHtmlLabelName(126539, languageid), workflowid, WorkflowRequestMessage.WF_LINK_SET);
+                String sql = "select * from workflow_nodelink where workflowid=" + workflowid + " and nodeid=" + nodeid + " and isreject='1' order by linkorder ,id";
+                rs.executeQuery(sql);
+                if (rs.getCounts() > 0) {
+                    msgInfo = WorkflowRequestMessage.getBottomInfo(SystemEnv.getHtmlLabelName(520317, languageid), workflowid, WorkflowRequestMessage.WF_LINK_SET);
+                }
+                this.setMessagecontent(msgInfo.toString());
+                if (reqFailMsg != null) reqFailMsg.setMsgType(ReqFlowFailMsgType.LINK_NOE_SET);
+                return false;
+            }
+            if (SubmitToNodeid <= 0 && selectNextFlowNodeList.size() <= 0) {
+                while (rs.next()) {
+                    if (this.occurnodeids.indexOf(rs.getString("destnodeid")) != -1) continue;
+
+                    int destnodeid = Util.getIntValue(rs.getString("destnodeid"), 0);
+                    RecordSet rs2 = new RecordSet();
+                    RecordSet rs3 = new RecordSet();
+                    rs2.executeSql("select * from workflow_nodebase where requestid='" + requestid + "' and startnodeid=" + nodeid);
+                    int freeNodeid = 0;
+                    boolean hasData = rs2.next();
+                    if (hasData) freeNodeid = Util.getIntValue(rs2.getString("id"), 0);
+                    rs3.executeSql("select * from workflow_currentoperator where nodeid='" + freeNodeid + "' and requestid=" + requestid);
+                    if (hasData && rs3.next() && destnodeid == freeNodeid) {
+                        continue;
+                    }
+                    whereclauses.add(Util.null2String(rs.getString("condition")));
+                    newrules.add(Util.null2String(rs.getString("newrule")));
+                    linkids.add(Util.null2String(rs.getString("id")));
+                    linknames.add(Util.null2String(rs.getString("linkname")));
+                    nextnodeids.add(Util.null2String(rs.getString("destnodeid")));
+                    isBulidCodeList.add(Util.null2String(rs.getString("isBulidCode")));
+                    ismustpassss.add(Util.null2String(rs.getString("ismustpass")));
+                    conditions.add(Util.null2String(rs.getString("newconditioncn")));
+                }
+            } else { // 提交至退回节点
+				/*
+  				rs.executeSql("select * from workflow_nodelink where wfrequestid is null and (isreject is null or isreject <> '1') and nodeid=" + nodeid + " and destnodeid=" + SubmitToNodeid + " and workflowid=" + workflowid + " order by linkorder, id");
+ 				while(rs.next()) {
+ 	                whereclauses.add(Util.null2String(rs.getString("condition")));
+ 	                newrules.add(Util.null2String(rs.getString("newrule")));
+ 					linkids.add(Util.null2String(rs.getString("id")));
+ 					linknames.add(Util.null2String(rs.getString("linkname")));
+ 					nextnodeids.add(Util.null2String(rs.getString("destnodeid")));
+ 					isBulidCodeList.add(Util.null2String(rs.getString("isBulidCode")));
+ 	                ismustpassss.add(Util.null2String(rs.getString("ismustpass")));
+ 				}
+				*/
+                if (linkids.size() == 0 && SubmitToNodeid > 0) {
+                    String SubmitToNodename = "";
+                    rs.executeSql("select nodename from workflow_nodebase where id=" + SubmitToNodeid);
+                    if (rs.next()) {
+                        SubmitToNodename = Util.null2String(rs.getString("nodename"));
+                    }
+                    whereclauses.add("");
+                    newrules.add("");
+                    linkids.add("-1");
+                    linknames.add(SubmitToNodename);
+                    nextnodeids.add("" + SubmitToNodeid);
+                    isBulidCodeList.add("");
+                    ismustpassss.add("");
+                }
+
+                //指定流转的节点
+                if (selectNextFlowNodeList.size() > 0) {
+                    String SubmitToNodename = "";
+                    int selectNodeId = selectNextFlowNodeList.get(0);
+                    rs.executeSql("select nodename from workflow_nodebase where id= " + selectNodeId);
+                    if (rs.next()) {
+                        SubmitToNodename = Util.null2String(rs.getString("nodename"));
+                    }
+                    String selectLinkId = SelectNextFlowBiz.findSelectFlowLinkInfo(requestid, workflowid, nodeid, selectNodeId, user);
+                    String selectLink_whereClause = "";
+                    String selectLink_newrule = "";
+                    String selectLink_linkNames = "";
+                    String selectLink_isBulidCode = "";
+                    String selectLink_isMustPassss = "";
+                    rs.executeQuery("select * from workflow_nodelink where workflowid = ? and id = ? and id <> '-1' ", workflowid, selectLinkId);
+                    if (rs.next()) {
+                        selectLink_whereClause = Util.null2String(rs.getString("condition"));
+                        selectLink_newrule = Util.null2String(rs.getString("newrule"));
+                        selectLink_linkNames = Util.null2String(rs.getString("linkname"));
+                        selectLink_isBulidCode = Util.null2String(rs.getString("isBulidCode"));
+                        selectLink_isMustPassss = Util.null2String(rs.getString("ismustpass"));
+                    }
+                    whereclauses.add(selectLink_whereClause);
+                    newrules.add(selectLink_newrule);
+                    linkids.add(selectLinkId);
+                    linknames.add(SubmitToNodename);
+                    nextnodeids.add("" + selectNextFlowNodeList.get(0));
+                    isBulidCodeList.add(selectLink_isBulidCode);
+                    ismustpassss.add(selectLink_isMustPassss);
+                    selectNextFlowNodeList.remove(0);
+                }
+            }
+            //自由流程退回
+            if (isreject == 1 && this.RejectToType == 0) {
+                //退回到的结点是正常流程节点
+                sql = "select startnodeid from workflow_nodebase where IsFreeNode='1' and requestid = " + requestid + " and id = " + nodeid;
+                rs.executeSql(sql);
+                //writeLog("判断自由流程退回到的结点是正常流程节点 sql:"+sql);
+                if (rs.next()) {
+                    nextnodeid = rs.getInt("startnodeid");
+                    //insert into workflow_nodelink(workflowid,nodeid,isreject,condition,linkname,destnodeid)
+                    //values(41,221,1,'','退回',162)
+                    whereclauses.add("");
+                    newrules.add("");
+                    linkids.add("0");
+                    linknames.add("退回");
+                    nextnodeids.add(String.valueOf(nextnodeid));
+                    isBulidCodeList.add("");
+                    ismustpassss.add("-100");
+                    executesuccess = true;
+                    //writeLog("判断自由流程退回到的结点是正常流程节点 nextnodeid:"+nextnodeid);
+                }
+            }
+
+            if (!executesuccess) return false;
+            int linkindex = 0;
+            boolean temp_nextnodeid = false;
+
+            for (linkindex = 0; linkindex < nextnodeids.size(); linkindex++) {
+
+                //指定流转，不再计算出口条件
+                if (isSelectNextFlow) {
+                    break;
+                }
+
+                String whereclause = (String) whereclauses.get(linkindex);
+                String newrule = (String) newrules.get(linkindex);
+                String linkid = (String) linkids.get(linkindex);
+                int nextnodeid = Util.getIntValue(nextnodeids.get(linkindex).toString(), 0);
+                String linkname = (String) linknames.get(linkindex);
+                String conditioncn = "";
+                if (conditions != null && conditions.size() - 1 >= linkindex) {
+                    conditioncn = (String) conditions.get(linkindex);
+                }
+                //记录出口条件判断日志
+                Map linkRuleLogInfo = new HashMap();
+                linkRuleLogInfo.put("linkid", linkid);
+                linkRuleLogInfo.put("nextnodeid", nextnodeid);
+                linkRuleLogInfo.put("linkname", linkname);
+                linkRuleLogInfo.put("newrule", newrule);
+                linkRuleLogInfo.put("whereclause", whereclause);
+                Map rulesInfo = new HashMap();
+                linkRuleLogInfo.put("rulesInfo", rulesInfo);
+                linkRuleLogInfo.put("conditioncn", conditioncn);
+                requestFlowLogEntity.getLinkLog().put(linkname + "(" + linkid + ")", linkRuleLogInfo);
+
+                this.tempnextnodeid = nextnodeid;
+                //System.out.println("requestid = "+requestid+" nextnodeid="+nextnodeid+" linkname="+linkname+"  newrule="+newrule);
+                boolean oldcop = false;
+                boolean newcop = false;
+                if (whereclause.trim().equals("") && newrule.trim().equals("")) {
+                    break;
+                } else {
+                    //查询规则间的关系
+                    RecordSet rrs = new RecordSet();
+                    int ruleRelationship = 1;
+                    if (!"".equals(nextlinkid)) {
+                        String rulesql = "select ruleRelationship from workflow_nodelink where id = " + linkid;
+                        rrs.executeSql(rulesql);
+                        if (rrs.next()) {
+                            ruleRelationship = Util.getIntValue(Util.null2String(rrs.getString("ruleRelationship")), 1);
+                        }
+                    }
+                    linkRuleLogInfo.put("ruleRelationship", ruleRelationship);
+                    if (!whereclause.trim().equals("")) //兼容老条件
+                    {
+                        if (isbill == 1)
+                            sql = "select count(id) from " + billtablename + " where id=" + billid + " and " + whereclause;
+                        else
+                            sql = "select count(requestid) from workflow_form where requestid=" + requestid + " and " + whereclause;
+                        rs.executeSql(sql);
+
+                        if (rs.next() && rs.getInt(1) > 0) {
+                            oldcop = true;
+                        }
+
+                        //规则间关系为或者关系时，如果老的条件已经满足，则不再去计算新规则
+                        if (ruleRelationship == 2 && oldcop) {
+                            break;
+                        } else {
+                            if (!oldcop) {
+                                nextnodeid = Util.getIntValue((String) nextnodeids.get(linkindex), 0);
+                                if (mustpassnodeids.indexOf("" + nextnodeid) > -1) {
+                                    temp_nextnodeid = true;
+                                    break;
+                                }
+                            }
+                        }
+
+                        //规则间关系为并且是， 如果老的条件不满足，则不再去计算新规则，直接计算下一条出口
+                        if (ruleRelationship == 1 && !oldcop) {
+                            continue;
+                        }
+
+                    } else {
+                        //规则间关系是“并且”， 且老的规则又不存在时，将老条件结果置为true
+                        if (ruleRelationship == 1) {
+                            oldcop = true;
+                        }
+                    }
+
+
+                    if (!newrule.trim().equals("")) {
+                        RuleInterface rif = new RuleInterface();
+                        rif.setUserid(this.userid + "");
+                        rif.setAutoForecast(this.autoForecast);
+                        rif.setForecastManagerInfo(this.forecastManagerInfo);
+                        rif.setRulesInfo(rulesInfo);
+                        newcop = rif.compareRuleforWF(newrule, requestid + "", linkid, RuleInterface.RULESRC_CK);
+                        linkRuleLogInfo.put("result", newcop);
+                    } else {
+                        if (ruleRelationship == 1) {
+                            newcop = true;
+                        }
+                    }
+                    if (ruleRelationship == 1) {
+                        if (oldcop && newcop) {
+                            break;
+                        } else {
+                            nextnodeid = Util.getIntValue((String) nextnodeids.get(linkindex), 0);
+                            if (mustpassnodeids.indexOf("" + nextnodeid) > -1) {
+                                temp_nextnodeid = true;
+                                break;
+                            }
+                        }
+                    } else {
+                        if (oldcop || newcop) {
+                            break;
+                        } else {
+                            nextnodeid = Util.getIntValue((String) nextnodeids.get(linkindex), 0);
+                            if (mustpassnodeids.indexOf("" + nextnodeid) > -1) {
+                                temp_nextnodeid = true;
+                                break;
+                            }
+                        }
+                    }
+                }
+
+            }
+            if (temp_nextnodeid) {
+                if (reqFailMsg != null) reqFailMsg.setMsgType(ReqFlowFailMsgType.LINK_CONDITION_NOT_MET);
+                //条件不满足
+                this.setMessagecontent(WorkflowRequestMessage.linkConditionNSInfo(newrules, nextnodeids, linkids, rs, FreeNodeBiz.isFreeNode(lastFreeNodeId) ? lastFreeNodeId : nodeid, workflowid, languageid, errorInfoMsgBuffer, index, mustpassnodeids));
+                return false;
+            }
+            if (nextnodeids.size() == 0 || linkindex == nextnodeids.size()) {
+                if (reqFailMsg != null) reqFailMsg.setMsgType(ReqFlowFailMsgType.LINK_CONDITION_NOT_MET);
+                this.setMessagecontent(WorkflowRequestMessage.linkConditionNSInfo(newrules, nextnodeids, linkids, rs, FreeNodeBiz.isFreeNode(lastFreeNodeId) ? lastFreeNodeId : nodeid, workflowid, languageid, errorInfoMsgBuffer, index, mustpassnodeids));
+                return false;
+            }
+
+            nextnodeid = Util.getIntValue((String) nextnodeids.get(linkindex), 0);
+            nextlinkid = Util.getIntValue((String) linkids.get(linkindex), 0);
+            nextlinkname = (String) linknames.get(linkindex);
+            isBulidCode = (String) isBulidCodeList.get(linkindex);
+            ismustpasss = (String) ismustpassss.get(linkindex);
+            this.tempnextnodeid = nextnodeid;
+            rs.executeProc("workflow_NodeType_Select", "" + workflowid + flag + nextnodeid);
+            if (rs.next()) {
+                nextnodetype = Util.null2String(rs.getString(1));
+            } else {
+                JSONObject msgInfo = WorkflowRequestMessage.getBottomInfo(SystemEnv.getHtmlLabelName(126539, languageid), workflowid, WorkflowRequestMessage.WF_LINK_SET);
+                this.setMessagecontent(msgInfo.toString());
+                return false;
+            }
+
+            if (isreject != 1) {
+                //rs.executeSql("select count(nodeid) from workflow_nodeform where isedit = '1' and nodeid = " + nextnodeid);
+                WFModeNodeFieldManager wFModeNodeFieldManager = new WFModeNodeFieldManager();
+                boolean isMode = wFModeNodeFieldManager.getIsModeByWorkflowIdAndNodeId(workflowid, nextnodeid);
+                if (isMode) {
+                    rs.executeSql("select count(nodeid) from workflow_modeview where isedit = '1' and nodeid = " + nextnodeid + " and formid=" + formid);
+                } else {
+                    rs.executeSql("select count(nodeid) from workflow_nodeform where isedit = '1' and nodeid = " + nextnodeid + " and fieldid != -3");
+                }
+                if (rs.next()) {
+                    if (Util.getIntValue(rs.getString(1), 0) > 0) hasedititem = true;
+                }
+            }
+            //if("1".equals(isBulidCode)){
+            if ("1".equals(isBulidCode) && this.isGetFlowCodeStr) {
+                //CodeBuild cbuild = new CodeBuild(formid,String.valueOf(isbill));
+                //CodeBuild cbuild = new CodeBuild(formid,String.valueOf(isbill),this.workflowid);
+                CodeBuild cbuild = new CodeBuild(formid, String.valueOf(isbill), this.workflowid, this.creater, this.creatertype);
+                //String  codeFields=cbuild.haveCode();
+                String codeFields = cbuild.haveCode(this.workflowid, formid, String.valueOf(isbill));
+                if (!codeFields.equals("")) {
+                    Map<String, Object> formLogParams = new HashMap<>();
+                    formLogParams.put("user", user);
+                    formLogParams.put("nodeId", nodeid);
+                    formLogParams.put("clientIp", clientIp);
+                    cbuild.getFlowCodeStr(requestid, isbill, formid, this.workflowid, this.creater, this.creatertype, formLogParams);
+                }
+            }
+        }
+
+        rs.executeSql("select nodeattribute,passnum,IsFreeNode,Signtype,operators from workflow_nodebase where id=" + nextnodeid);
+        if (rs.next()) {
+            this.nextnodeattribute = Util.null2String(rs.getString("nodeattribute"));
+            this.passnum = rs.getInt("passnum");
+            this.IsFreeNode = Util.null2String(rs.getString("IsFreeNode"));
+            this.FreeSigntype = Util.getIntValue(rs.getString("Signtype"), 0);
+            this.Freeoperators = Util.null2String(rs.getString("operators"));
+        } else {
+            JSONObject msgInfo = WorkflowRequestMessage.getBottomInfo(SystemEnv.getHtmlLabelName(126540, languageid), workflowid, WorkflowRequestMessage.WF_NODE_SET);
+            errorInfoMsgBuffer.insert(0, "<span>" + WorkflowRequestMessage.getBoldInfo(SystemEnv.getHtmlLabelName(10004310, languageid)) + "</span><br/>"
+                    + "<span>" + SystemEnv.getHtmlLabelName(126551, languageid) + "nextnodeid:" + nextnodeid + "</span>" + "<br/>");
+            try {
+                msgInfo.put("details", errorInfoMsgBuffer.toString());
+            } catch (JSONException e) {
+                e.printStackTrace();
+            }
+            this.setMessagecontent(msgInfo.toString());
+            writeLog("----流转报错----requestId:" + requestid + ",nextnodeid:" + nextnodeid);
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * 取得流程当前节点状态
+     *
+     * @return 当前节点linkname
+     * @throws Exception
+     */
+    public String getLinkName(int nodeid, int billid, int requestid, int isbill, String billtablename) throws Exception {
+        String linkname = "";
+        String linknodeid = "";
+        RecordSet rs1 = new RecordSet();
+        RecordSet rs2 = new RecordSet();
+        RecordSet rs3 = new RecordSet();
+        ConnStatement statement = null;
+        try {
+            statement = new ConnStatement();
+            //rs1.executeSql("select condition,linkname from workflow_nodelink where wfrequestid is null and destnodeid="+nodeid+" and (isreject='' or isreject is null) order by nodepasstime,id");
+            if (rs1.getDBType().equals("mysql")) {
+                statement.setStatementSql("select `condition`,linkname,newrule,nodeid from workflow_nodelink where wfrequestid is null and destnodeid=" + nodeid + " and (isreject='' or isreject is null) order by nodepasstime,id");
+            } else {
+                statement.setStatementSql("select condition,linkname,newrule,nodeid from workflow_nodelink where wfrequestid is null and destnodeid=" + nodeid + " and (isreject='' or isreject is null) order by nodepasstime,id");
+            }
+            statement.executeQuery();
+            while (statement.next()) {
+                String whereclause = "";
+                String newrule = "";
+                String tmpnodeid = "";
+                rs3.executeQuery("select nodeid from workflow_requestflowinfo where requestid = ? and destnodeid = ? order by id desc", requestid, nodeid);
+                if (rs3.next()) {
+                    tmpnodeid = Util.null2String(rs3.getString("nodeid"));
+                }
+                linknodeid = Util.null2String(statement.getString("nodeid"));
+                if (!tmpnodeid.equals(linknodeid)) {
+                    continue;
+                }
+                if (statement.getDBType().equals("oracle") && Util.null2String(statement.getOrgindbtype()).equals("oracle")) {
+                    oracle.sql.CLOB theclob = statement.getClob("condition");
+                    if (theclob != null) {
+                        String readline = "";
+                        StringBuffer clobStrBuff = new StringBuffer("");
+                        java.io.BufferedReader clobin = new java.io.BufferedReader(theclob.getCharacterStream());
+                        while ((readline = clobin.readLine()) != null) clobStrBuff = clobStrBuff.append(readline);
+                        clobin.close();
+                        whereclause = clobStrBuff.toString();
+                    }
+                } else {
+                    whereclause = Util.null2String(statement.getString("condition"));
+                }
+                newrule = Util.null2String(statement.getString("newrule"));
+                boolean oldcop = false;
+                boolean newcop = false;
+                if (whereclause.trim().equals("") && newrule.trim().equals("")) {
+                    linkname = Util.null2String(statement.getString("linkname"));
+                    break;
+                } else {
+                    if (!whereclause.trim().equals("")) {
+                        if (isbill == 1)
+                            sql = "select count(id) from " + billtablename + " where id=" + billid + " and " + whereclause;
+                        else
+                            sql = "select count(requestid) from workflow_form where requestid=" + requestid + " and " + whereclause;
+                        rs2.executeSql(sql);
+
+                        if (rs2.next() && rs2.getInt(1) > 0) {
+                            oldcop = true;
+                        }
+                    } else oldcop = true;
+                    if (!newrule.trim().equals("")) {
+                        RuleInterface rif = new RuleInterface();
+                        rif.setUserid(this.userid + "");
+                        rif.setAutoForecast(this.autoForecast);
+                        rif.setForecastManagerInfo(this.forecastManagerInfo);
+                        newcop = rif.compareRuleforWF(newrule, requestid + "", nodeid + "", RuleInterface.RULESRC_CK);
+                    } else newcop = true;
+                    if (oldcop && newcop) {
+                        linkname = Util.null2String(statement.getString("linkname"));
+                        break;
+                    }
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            if (statement != null)
+                statement.close();
+        }
+        return linkname;
+    }
+
+    /**
+     * 得到依次逐个递交情况，上个操作人操作后的情况
+     *
+     * @return 是否取得成功
+     */
+    public boolean getNextOrderOperator(String groupdetails) {
+        return this.getNextOrderOperator(groupdetails, true);
+    }
+
+    public boolean getNextOrderOperator(String groupdetails, boolean needUpdate) {
+        ArrayList operators = null;
+        Hashtable tempoperatorsht = new Hashtable();
+        String theorderbyordervalue = "";
+        RecordSet rs1 = new RecordSet();
+        RecordSet rs2 = new RecordSet();
+
+        RecordSet rsTemps = new RecordSet();
+        String statustr = "";
+        String thedepartmentid = "0";
+        String thesubcompanyid = "0";
+        String supsubcompanyid = "0";
+        String src = "";
+        if (this.isreject == 1) {
+            src = "reject";
+        } else if (this.isintervenor.equals("1")) {
+            src = "intervenor";
+        }
+
+        String crmmanager = "";
+        if (creatertype == 0) {
+            try {
+                ResourceComInfo rc = new ResourceComInfo();
+                DepartmentComInfo dc = new DepartmentComInfo();
+                SubCompanyComInfo sc = new SubCompanyComInfo();
+
+                if (nodetype.equals("0")) {
+                    thedepartmentid = rc.getDepartmentID("" + creater);
+                } else {
+                    if (null != rst) {
+                        rst.executeSql("select agentorbyagentid from workflow_currentoperator where agenttype='2' and requestid=" + requestid + " and userid=" + creater + " and usertype=" + creatertype + " and nodeid=" + nodeid);
+                        if (rst.next()) {
+                            thedepartmentid = rc.getDepartmentID(rst.getString("agentorbyagentid"));
+                        } else {
+                            thedepartmentid = rc.getDepartmentID("" + creater);
+                        }
+                    } else {
+                        rs.executeSql("select agentorbyagentid from workflow_currentoperator where agenttype='2' and requestid=" + requestid + " and userid=" + creater + " and usertype=" + creatertype + " and nodeid=" + nodeid);
+                        if (rs.next()) {
+                            thedepartmentid = rc.getDepartmentID(rs.getString("agentorbyagentid"));
+                        } else {
+                            thedepartmentid = rc.getDepartmentID("" + creater);
+                        }
+                    }
+
+                }
+                if ("".equals(thedepartmentid)) {
+                    thedepartmentid = "0";
+                }
+                thesubcompanyid = dc.getSubcompanyid1(thedepartmentid);
+                if ("".equals(thesubcompanyid)) {
+                    thesubcompanyid = "0";
+                }
+                supsubcompanyid = sc.getSupsubcomid(thesubcompanyid);
+                if ("".equals(supsubcompanyid)) {
+                    supsubcompanyid = "0";
+                }
+
+            } catch (Exception rcdc) {
+                rcdc.printStackTrace();
+            }
+        } else {
+            try {
+                CustomerInfoComInfo cc = new CustomerInfoComInfo();
+                ResourceComInfo rc = new ResourceComInfo();
+                DepartmentComInfo dc = new DepartmentComInfo();
+                SubCompanyComInfo sc = new SubCompanyComInfo();
+
+                crmmanager = cc.getCustomerInfomanager("" + creater);
+                thedepartmentid = rc.getDepartmentID(crmmanager);
+                if ("".equals(thedepartmentid)) {
+                    thedepartmentid = "0";
+                }
+                thesubcompanyid = dc.getSubcompanyid1(thedepartmentid);
+                if ("".equals(thesubcompanyid)) {
+                    thesubcompanyid = "0";
+                }
+                supsubcompanyid = sc.getSupsubcomid(thesubcompanyid);
+                if ("".equals(supsubcompanyid)) {
+                    supsubcompanyid = "0";
+                }
+
+            } catch (Exception rcdc) {
+                rcdc.printStackTrace();
+            }
+        }
+        if (nextnodetype.equals("3"))
+            statustr = "0,1,2,3,5";//如果是归档节点，操作者包括为离职人员
+        else
+            statustr = "0,1,2,3";
+
+        int groupnum = 0;
+        int groupid = 0;
+        int tempgroupid = 0;
+        String[] groupids = Util.TokenizerString2(groupdetails, ",");
+        for (int m = 0; m < groupids.length; m++) {
+            String groups = Util.null2String(groupids[m]);
+            if (!groups.equals("")) {
+                String[] groupidArray = Util.TokenizerString2(groups, "_");
+                groupid = Util.getIntValue(groupidArray[0]);
+                tempgroupid = Util.getIntValue(groupidArray[1]);
+            }
+            operators = new ArrayList();
+
+            //自由流程逐个处理
+            FreeSigntype = 0;
+            rs1.executeSql("select Signtype from workflow_nodebase where id = " + nodeid + " and requestid=" + requestid);
+            if (rs1.next()) {
+                FreeSigntype = Util.getIntValue(rs1.getString("Signtype"), 0);
+            }
+            if (FreeSigntype == 2) {
+                rs.executeSql("select * from workflow_agentpersons where requestid = " + requestid + " and groupdetailid=" + groupid);
+                boolean flags = false;
+                boolean flago = false;  //考虑老的数据
+                if (rs.next()) flags = true;
+                if (!flags) {
+                    rs.executeSql("select * from workflow_agentpersons where requestid = " + requestid);  //考虑以前的数据加上该判断
+                    if (rs.next()) flago = true;
+                }
+                if (flags || flago) {
+                    String receivePersions = rs.getString("receivedPersons");
+                    String coadjutants = Util.null2String(rs.getString("coadjutants"));
+                    if (!"".equals(receivePersions)) {
+                        String nextoperator = receivePersions.substring(0, receivePersions.indexOf(","));
+                        addWfInterventionMsg(nextoperator);
+                        operators.add("" + nextoperator + "_0" + "_" + groupid + "_0");
+                        int idx = coadjutants.indexOf(",");
+                        if (idx > 0) {
+                            int tempcoadjutant = Util.getIntValue(coadjutants.substring(0, idx));
+                            if (tempcoadjutant > 0 && operators.indexOf("" + tempcoadjutant + "_0" + "_" + groupid + "_-5") == -1 && operators.indexOf("" + tempcoadjutant + "_0" + "_" + groupid + "_0") == -1) {
+                                operators.add("" + tempcoadjutant + "_0" + "_" + groupid + "_-5");
+                                hasCoadjutant = true;
+                            }
+                        }
+                        try {
+                            if (needUpdate) {
+                                if (flago)
+                                    rst.executeSql("update workflow_agentpersons set receivedPersons = '" + receivePersions.substring(receivePersions.indexOf(",") + 1, receivePersions.length()) + "',coadjutants='" + coadjutants.substring(idx + 1, coadjutants.length()) + "' where requestid = " + requestid);
+                                else if (flags)
+                                    rst.executeSql("update workflow_agentpersons set receivedPersons = '" + receivePersions.substring(receivePersions.indexOf(",") + 1, receivePersions.length()) + "',coadjutants='" + coadjutants.substring(idx + 1, coadjutants.length()) + "' where requestid = " + requestid + " and groupdetailid=" + groupid);
+                            }
+                        } catch (Exception e) {
+                            e.printStackTrace();
+                        }
+                        tempoperatorsht.put("" + tempgroupid, operators);
+                        break;
+                    }
+                }
+            } else {
+                rs1.executeSql("select * from workflow_groupdetail where id = " + groupid + " order by id asc"); //必然是依次逐个递交
+                if (rs1.next()) {                  // 某一个操作组中的多个操作者细项
+                    int type = rs1.getInt("type");
+                    int virtualid = Util.getIntValue(rs1.getString("virtualid"), -1);
+                    int objid = rs1.getInt("objid");
+                    int level = rs1.getInt("level_n");
+                    int level2 = rs1.getInt("level2_n");
+                    String jobobj = rs1.getString("jobobj");//岗位对象
+                    String jobfield = rs1.getString("jobfield");//岗位级别
+                    int groupdetailid = rs1.getInt("id");
+                    int signorder = rs1.getInt("signorder");
+                    int t_groupid = rs1.getInt("groupid");
+                    String conditions = rs1.getString("conditions");
+                    String deptField = rs1.getString("deptField");//部门自定义字段 deptField该字段存储值个格式id_fieldname_fieldlabel
+                    String subcompanyField = rs1.getString("subcompanyField");//分部自定义字段subcompanyField该字段存储值个格式id_fieldname_fieldlabel
+                    String zdysqlName = Util.null2String(rs1.getString("zdysqlname"));
+
+                    int bhxj = rs1.getInt("bhxj");
+                    String orders = rs1.getString("orders");
+                    int IsCoadjutant = Util.getIntValue(rs1.getString("IsCoadjutant"));
+                    int issyscoadjutant = Util.getIntValue(rs1.getString("issyscoadjutant"));
+                    int coadjutant = Util.getIntValue(rs1.getString("coadjutants"));
+
+                    boolean isConform = false;
+
+
+                    //依次逐个处理批次条件日志暂时不记录
+                    if (this.isConformConditions(conditions, rs2, groupdetailid + "", new HashMap<>())) {
+                        isConform = true;
+                    }
+
+                    if (isConform && WFPathUtil.isContinuousProcessing(type) && signorder == 2) {
+                        //流程干预的操作人为“逐个处理”时的特殊处理
+                        if (t_groupid == -2) {
+                            rs.executeSql("select * from workflow_agentpersons where requestid = " + requestid + " and groupdetailid=" + groupdetailid);
+                            boolean flags = false;
+                            boolean flago = false;  //考虑老的数据
+                            if (rs.next()) flags = true;
+                            if (!flags) {
+                                rs.executeSql("select * from workflow_agentpersons where requestid = " + requestid);  //考虑以前的数据加上该判断
+                                if (rs.next()) flago = true;
+                            }
+                            if (flags || flago) {
+                                String receivePersions = rs.getString("receivedPersons");
+                                String coadjutants = Util.null2String(rs.getString("coadjutants"));
+                                if (!"".equals(receivePersions)) {
+                                    String nextoperator = receivePersions.substring(0, receivePersions.indexOf(","));
+                                    addWfInterventionMsg(nextoperator);
+                                    operators.add("" + nextoperator + "_0" + "_" + groupdetailid + "_0");
+                                    int idx = coadjutants.indexOf(",");
+                                    if (idx > 0) {
+                                        int tempcoadjutant = Util.getIntValue(coadjutants.substring(0, idx));
+                                        if (tempcoadjutant > 0 && operators.indexOf("" + tempcoadjutant + "_0" + "_" + groupdetailid + "_-5") == -1 && operators.indexOf("" + tempcoadjutant + "_0" + "_" + groupdetailid + "_0") == -1) {
+                                            operators.add("" + tempcoadjutant + "_0" + "_" + groupdetailid + "_-5");
+                                            hasCoadjutant = true;
+                                        }
+                                    }
+                                    try {
+                                        if (needUpdate) {
+                                            if (flago)
+                                                rst.executeSql("update workflow_agentpersons set receivedPersons = '" + receivePersions.substring(receivePersions.indexOf(",") + 1, receivePersions.length()) + "',coadjutants='" + coadjutants.substring(idx + 1, coadjutants.length()) + "' where requestid = " + requestid);
+                                            else if (flags)
+                                                rst.executeSql("update workflow_agentpersons set receivedPersons = '" + receivePersions.substring(receivePersions.indexOf(",") + 1, receivePersions.length()) + "',coadjutants='" + coadjutants.substring(idx + 1, coadjutants.length()) + "' where requestid = " + requestid + " and groupdetailid=" + groupdetailid);
+                                        }
+                                    } catch (Exception e) {
+                                        e.printStackTrace();
+                                    }
+                                }
+                            }
+                        } else {
+                            if (level2 == -1) {
+                                level2 = Integer.MAX_VALUE;
+                            }
+
+                            OperatorEntity operatorInfo = new OperatorEntity();
+                            operatorInfo.setGroupdetailId(groupdetailid);
+                            operatorInfo.setType(type);
+                            operatorInfo.setSignOrder(signorder + "");
+                            operatorInfo.setOrder(Util.getDoubleValue(orders, 0.00));
+                            operatorInfo.setLevel(level);
+                            operatorInfo.setMaxLevel(level2);
+                            operatorInfo.setCondition(conditions);
+                            operatorInfo.setJobObj(jobobj);
+                            operatorInfo.setJobField(jobfield);
+                            operatorInfo.setBhxj(bhxj + "");
+                            operatorInfo.setVirtual(virtualid + "");
+                            List<String> operatorTemps = new ArrayList<String>();
+                            String objectId = objid + "";
+                            if (objectId.indexOf(",") == -1) {
+                                operatorInfo.setObjectId(Util.getIntValue(objectId));
+                                operatorTemps.add(objectId);
+                            } else {
+                                operatorTemps.addAll(Util.TokenizerString(objectId, ","));
+                            }
+                            operatorInfo.setOperators(operatorTemps);
+                            operatorInfo.setIsCoadjutant(IsCoadjutant);
+                            operatorInfo.setIssyscoadjutant(issyscoadjutant);
+                            operatorInfo.setCoadjutant(coadjutant + "");
+                            operatorInfo.setNodeId(this.nodeid);
+                            operatorInfo.setNextnodeid(nextnodeid);
+                            operatorInfo.setPassNodes(passNodes);
+                            operatorInfo.setZdysqlName(zdysqlName);
+
+
+                            NodeOperatorConfigBiz.getInstance().getOperatorEntity(operatorInfo, requestid, user, src, "1");
+
+
+                            List<OperatorInfoEntity> operatorInfos = operatorInfo.getOperatorInfos();//操作者
+                            List<OperatorInfoEntity> coadjutantInfos = operatorInfo.getCoadjutants();//协办人
+
+                            //非归档节点所有类型均过滤离职人员，归档节点只有指定人不过滤离职人员，其他均过滤
+                            boolean isFilter = getIsDimissionByProp(nextnodetype, type);
+                            Iterator<OperatorInfoEntity> iterator = operatorInfos.iterator();
+                            while (iterator.hasNext()) {
+                                OperatorInfoEntity operatorEntity = iterator.next();
+                                if (isFilter) {
+                                    boolean isDimission = isDimissionPerson(operatorEntity);
+                                    if (isDimission) {
+                                        iterator.remove();
+                                    }
+                                }
+                            }
+
+                            RecordSet rs = new RecordSet(); //added by xwj on 20050617 for td2075
+                            boolean hastheoperator = false;
+                            if (operatorInfos.size() > 0) {
+                                for (OperatorInfoEntity operatorEntity : operatorInfos) {//没看懂这个地方为什么需要一个for循环
+                                    if (hastheoperator) break;
+                                    int tepoperatorid = Util.getIntValue(operatorEntity.getUserId(), 0);
+                                    if (tepoperatorid != 0) {
+								/*--
+								if (userid == tepoperatorid) {
+									for (int j = i + 1; j < theorderbyordervalues.length; j++) {
+										if (hastheoperator) break;
+										tepoperatorid = Util.getIntValue(theorderbyordervalues[j], 0);
+										if (tepoperatorid != 0) {
+											operators.add("" + tepoperatorid + "_0");
+											hastheoperator = true;
+										}
+										i++;
+									}
+								}
+								--*/
+                                        rs.executeSql("select * from workflow_agentpersons where requestid = " + requestid + " and groupdetailid=" + groupdetailid);
+                                        boolean flags = false;
+                                        boolean flago = false;  //考虑老的数据
+                                        if (rs.next()) flags = true;
+                                        if (!flags) {
+                                            rs.executeSql("select * from workflow_agentpersons where requestid = " + requestid);  //考虑以前的数据加上该判断
+                                            if (rs.next()) flago = true;
+                                        }
+                                        if (flags || flago) {
+                                            String receivePersions = rs.getString("receivedPersons");
+                                            String coadjutants = Util.null2String(rs.getString("coadjutants"));
+                                            if (!"".equals(receivePersions)) {
+                                                String nextoperator = receivePersions.substring(0, receivePersions.indexOf(","));
+                                                addWfInterventionMsg(nextoperator);
+                                                operators.add("" + nextoperator + "_0" + "_" + groupdetailid + "_0");
+
+                                                int idx = coadjutants.indexOf(",");
+                                                if (idx > 0) {
+                                                    int tempcoadjutant = Util.getIntValue(coadjutants.substring(0, idx));
+                                                    if (tempcoadjutant > 0 && operators.indexOf("" + tempcoadjutant + "_0" + "_" + groupdetailid + "_-5") == -1 && operators.indexOf("" + tempcoadjutant + "_0" + "_" + groupdetailid + "_0") == -1) {
+                                                        operators.add("" + tempcoadjutant + "_0" + "_" + groupdetailid + "_-5");
+                                                        hasCoadjutant = true;
+                                                    }
+                                                    hastheoperator = true;
+                                                    try {
+                                                        if (needUpdate) {
+                                                            if (flago)
+                                                                rst.executeSql("update workflow_agentpersons set receivedPersons = '" + receivePersions.substring(receivePersions.indexOf(",") + 1, receivePersions.length()) + "',coadjutants='" + coadjutants.substring(idx + 1, coadjutants.length()) + "' where requestid = " + requestid);
+                                                            else if (flags)
+                                                                rst.executeSql("update workflow_agentpersons set receivedPersons = '" + receivePersions.substring(receivePersions.indexOf(",") + 1, receivePersions.length()) + "',coadjutants='" + coadjutants.substring(idx + 1, coadjutants.length()) + "' where requestid = " + requestid + " and groupdetailid=" + groupdetailid);
+                                                        }
+                                                    } catch (Exception e) {
+                                                        e.printStackTrace();
+                                                    }
+                                                }
+                                            }
+
+                                        }
+
+                                    }
+
+                                }
+                            }
+                        }
+
+
+                    }
+
+                }
+                if (operators.size() > 0) tempoperatorsht.put("" + tempgroupid, operators);
+            }
+        }
+
+        //依次逐个处理，过滤掉不符合密级的后续人员
+        StringBuilder messageContent = new StringBuilder();
+        tempoperatorsht = this.deleteOperateBySecLevel2(tempoperatorsht, requestid, messageContent);
+        if (messageContent.length() > 0) {
+            this.generateErrorMsg4SecLevel(messageContent);
+        }
+
+        if (tempoperatorsht.isEmpty())
+            return false;
+        else {
+            operatorsht = tempoperatorsht;
+            return true;
+        }
+
+    }
+
+    private void addWfInterventionMsg(String nextoperator) {
+        try {
+            ResourceComInfo rc = new ResourceComInfo();
+            String tempstatus = rc.getStatus(String.valueOf(nextoperator));
+            if ("4".equals(tempstatus) || "5".equals(tempstatus) || "6".equals(tempstatus)) {
+                JSONObject msgInfo = WorkflowRequestMessage.getBottomInfo(SystemEnv.getHtmlLabelName(126544, languageid) + WorkflowRequestMessage.getBoldDetailInfo(rc.getLastname(nextoperator)) + SystemEnv.getHtmlLabelName(126527, languageid), requestid, WorkflowRequestMessage.WF_INVERVENTION);
+                this.setMessagecontent(msgInfo.toString());
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     * 判断是否为离职人员
+     *
+     * @return
+     */
+    private boolean isDimissionPerson(OperatorInfoEntity operatorEntity) {
+        RecordSet rs = new RecordSet();
+        String opertor = operatorEntity.getUserId();
+        String opertortype = operatorEntity.getUserType() + "";
+        String hrmstatusSql = "";
+        String tempStatus = "";
+        if (!opertortype.equals("0")) {
+            return false;
+        }
+        //在非归档节点，如果下一节点操作者为离职人员，且没有代理，则流程不流转（针对type为：3， 8， 17，18的情况）
+        //根据用户类型来查询不同的表（员工表和客户信息表）。
+        ResourceComInfo resourceComInfo = null;
+        try {
+            resourceComInfo = new ResourceComInfo();
+        } catch (Exception e) {
+
+        }
+        if (opertortype.equals("0")) {
+            try {
+                tempStatus = resourceComInfo.getStatus(opertor);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+            if ("".equals(tempStatus)) {
+                hrmstatusSql = "select status from hrmresource where id=" + opertor;
+            }
+        } else {
+            hrmstatusSql = "select status from CRM_CustomerInfo where id=" + opertor;
+        }
+        if (!"".equals(hrmstatusSql)) {
+            rs.execute(hrmstatusSql);
+            //获取人员状态
+            if (rs.next()) {
+                tempStatus = rs.getString("status");
+            }
+        }
+
+        /**
+         * 下一节点操作者是否过滤人员，只区分在职不在职，不在职的都需要过滤（归档需要根据配置进行判断）；人员“退休”状态按不在职处理 --徐如晶
+         * 0：试用<br>1：正式<br>2：临时<br>3：试用延期<br>4：解聘<br>5：离职<br>6：退休<br>7：无效
+         */
+        if (!"".equals(tempStatus) && !"5".equals(tempStatus) && !"4".equals(tempStatus) && !"7".equals(tempStatus) && !"6".equals(tempStatus)) {
+            return false;
+        }
+
+
+        //查找当前人员是否设置了代理
+        boolean isbeAgent = false;
+        String agenterId = "";
+        String workflowidAll = WorkflowVersion.getVersionStringByWfid(workflowid + "");
+        String agentCheckSql = " select agentuid from workflow_agentConditionSet where workflowId in(" + workflowidAll + ") and bagentuid=" + opertor +
+                " and agenttype = '1' and isproxydeal='1' " +
+                " and ( ( (endDate = '" + TimeUtil.getCurrentDateString() + "' and (endTime='' or endTime is null))" +
+                " or (endDate = '" + TimeUtil.getCurrentDateString() + "' and endTime > '" + (TimeUtil.getCurrentTimeString()).substring(11, 19) + "' ) ) " +
+                " or endDate > '" + TimeUtil.getCurrentDateString() + "' or endDate = '' or endDate is null)" +
+                " and ( ( (beginDate = '" + TimeUtil.getCurrentDateString() + "' and (beginTime='' or beginTime is null))" +
+                " or (beginDate = '" + TimeUtil.getCurrentDateString() + "' and beginTime < '" + (TimeUtil.getCurrentTimeString()).substring(11, 19) + "' ) ) " +
+                " or beginDate < '" + TimeUtil.getCurrentDateString() + "' or beginDate = '' or beginDate is null) order by agentbatch asc  ,id asc";
+        rs.execute(agentCheckSql);
+        //当前人员设置了代理，不再查找下一批次（离职人员设置了代理，不再向下寻找）
+        if (rs.next()) {
+            agenterId = Util.null2String(rs.getString("agentuid"));
+            tempStatus = resourceComInfo.getStatus(agenterId);
+            if ("".equals(tempStatus)) {
+                rs.execute("select status from hrmresource where id=" + agenterId);
+                //获取人员状态
+                if (rs.next()) {
+                    tempStatus = rs.getString("status");
+                }
+            }
+            if (!"".equals(tempStatus) && !"5".equals(tempStatus) && !"4".equals(tempStatus) && !"7".equals(tempStatus) && !"6".equals(tempStatus)) {
+                return false;
+            }
+            return true;
+        }
+
+        return true;
+    }
+
+    /**
+     * 是否是为空或者全部是离职人员<br>
+     */
+    private boolean isEmptyOrAllDimissionPerson(List<String> operators, RecordSet rs) {
+        if (operators == null || operators.isEmpty()) {
+            return true;
+        }
+
+        //归档节点，不检测离职人员
+        if ("3".equals(nextnodetype)) {
+            return false;
+        }
+
+        //迭代本批次操作者
+        for (int i = 0; i < operators.size(); i++) {
+            String operatorinfo = operators.get(i);
+            String[] operatorandtypes = Util.TokenizerString2(operatorinfo, "_");
+            String opertor = operatorandtypes[0];
+            String opertortype = operatorandtypes[1];
+
+            String hrmstatusSql = "";
+            String tempStatus = "";
+            //在非归档节点，如果下一节点操作者为离职人员，且没有代理，则流程不流转（针对type为：3， 8， 17，18的情况）
+            //根据用户类型来查询不同的表（员工表和客户信息表）。
+            if (opertortype.equals("0")) {
+                hrmstatusSql = "select status from hrmresource where id=" + opertor;
+            } else {
+                hrmstatusSql = "select status from CRM_CustomerInfo where id=" + opertor;
+            }
+            rs.execute(hrmstatusSql);
+            //获取人员状态
+            if (rs.next()) {
+                tempStatus = rs.getString("status");
+            }
+
+            //包含一个非内部员工，不再查找下一批次（本批次操作者找到了）
+            if (!opertortype.equals("0")) {
+                return false;
+            }
+            //包含一个非离职人员(或系统管理员)，不再继续查找下一批次（本批次操作者找到了）
+            if ("".equals(tempStatus) || (!"5".equals(tempStatus) && !"4".equals(tempStatus))) {
+                return false;
+            }
+
+            //查找当前人员是否设置了代理
+            boolean isbeAgent = false;
+            String agenterId = "";
+            String agentCheckSql = " select agentuid from workflow_agentConditionSet where workflowId=" + workflowid + " and bagentuid=" + opertor +
+                    " and agenttype = '1' and isproxydeal='1' " +
+                    " and ( ( (endDate = '" + TimeUtil.getCurrentDateString() + "' and (endTime='' or endTime is null))" +
+                    " or (endDate = '" + TimeUtil.getCurrentDateString() + "' and endTime > '" + (TimeUtil.getCurrentTimeString()).substring(11, 19) + "' ) ) " +
+                    " or endDate > '" + TimeUtil.getCurrentDateString() + "' or endDate = '' or endDate is null)" +
+                    " and ( ( (beginDate = '" + TimeUtil.getCurrentDateString() + "' and (beginTime='' or beginTime is null))" +
+                    " or (beginDate = '" + TimeUtil.getCurrentDateString() + "' and beginTime < '" + (TimeUtil.getCurrentTimeString()).substring(11, 19) + "' ) ) " +
+                    " or beginDate < '" + TimeUtil.getCurrentDateString() + "' or beginDate = '' or beginDate is null) order by agentbatch asc  ,id asc";
+            rs.execute(agentCheckSql);
+            //当前人员设置了代理，不再查找下一批次（离职人员设置了代理，不再向下寻找）
+            if (rs.next()) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    /**
+     * 检查指定人员是否设置了代理<br>
+     */
+    private boolean hasAgent4Operator(int operator, RecordSet rs) {
+        if (operator < 0) {
+            return false;
+        }
+        //查找当前人员是否设置了代理
+        boolean isbeAgent = false;
+        String agentCheckSql = " select agentuid from workflow_agentConditionSet where workflowId=" + workflowid + " and bagentuid=" + operator +
+                " and agenttype = '1' and isproxydeal='1' " +
+                " and ( ( (endDate = '" + TimeUtil.getCurrentDateString() + "' and (endTime='' or endTime is null))" +
+                " or (endDate = '" + TimeUtil.getCurrentDateString() + "' and endTime > '" + (TimeUtil.getCurrentTimeString()).substring(11, 19) + "' ) ) " +
+                " or endDate > '" + TimeUtil.getCurrentDateString() + "' or endDate = '' or endDate is null)" +
+                " and ( ( (beginDate = '" + TimeUtil.getCurrentDateString() + "' and (beginTime='' or beginTime is null))" +
+                " or (beginDate = '" + TimeUtil.getCurrentDateString() + "' and beginTime < '" + (TimeUtil.getCurrentTimeString()).substring(11, 19) + "' ) ) " +
+                " or beginDate < '" + TimeUtil.getCurrentDateString() + "' or beginDate = '' or beginDate is null) order by agentbatch asc  ,id asc";
+        rs.execute(agentCheckSql);
+        //当前人员设置了代理，不再查找下一批次（离职人员设置了代理，不再向下寻找）
+        if (rs.next()) {
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * 取得流程下一节点的操作者
+     * 流程的操作组和批次条件判断
+     * 在操作者中加入批次和条件，按批次取得操作者，上一批次无操作者则寻找下一批次操作者，上一批次有操作者则退出
+     * 在每一批次取得操作者是根据设置的条件取得
+     *
+     * @return 是否取得成功r
+     */
+    public boolean getNextOperator() {
+        //ActionLog.writeDebuggerLog("------------ BEGIN -----------------");
+        //ActionLog.writeDebuggerLog("workflowid:[" + workflowid + "],requestid:[" + requestid + "],nextnodeid:[" + nextnodeid + "]");
+        orderflag = false;
+        ArrayList operators = null;
+        Hashtable tempoperatorsht = new Hashtable();
+        String theorderbyordervalue = "";
+        String statustr = "";
+        String allUsers = "";//所有操作者id集
+        Set<String> operators4e9 = new HashSet<String>();//存储所有操作者
+        String src = "";
+        ResourceComInfo resourceComInfo = null;
+        try {
+            resourceComInfo = new ResourceComInfo();
+        } catch (Exception e) {
+
+        }
+        if (this.isreject == 1) {
+            src = "reject";
+        } else if (this.isintervenor.equals("1")) {
+            src = "intervenor";
+        }
+
+        RecordSet rsTemps = new RecordSet();
+        WFCoadjutantManager coadjutantmanager = new WFCoadjutantManager();
+        if (nextnodetype.equals("3"))
+            statustr = "0,1,2,3,5";//如果是归档节点，操作者包括为离职人员
+        else
+            statustr = "0,1,2,3";
+
+        RecordSet rs1 = new RecordSet();
+        RecordSet rs2 = new RecordSet();
+
+        String thedepartmentid = "0";
+        String thesubcompanyid = "0";
+        String supsubcompanyid = "0";
+
+        String crmmanager = "";
+
+        //ActionLog.writeDebuggerLog("====>creatertype:[" + creatertype + "]");
+
+        if (creatertype == 0) {
+            try {
+                ResourceComInfo rc = new ResourceComInfo();
+                DepartmentComInfo dc = new DepartmentComInfo();
+                SubCompanyComInfo sc = new SubCompanyComInfo();
+                thedepartmentid = rc.getDepartmentID("" + creater);
+                if (nodetype.equals("0")) {
+                    rs1.executeSql("select agentorbyagentid from workflow_currentoperator where agenttype='2' and requestid=" + requestid + " and userid=" + creater + " and usertype=" + creatertype + " and nodeid=" + nodeid);
+                    if (rs1.next()) {
+                        thedepartmentid = rc.getDepartmentID(rs1.getString("agentorbyagentid"));
+                    }
+                }
+                if ("".equals(thedepartmentid)) {
+                    thedepartmentid = "0";
+                }
+                thesubcompanyid = dc.getSubcompanyid1(thedepartmentid);
+
+                if ("".equals(thesubcompanyid)) {
+                    thesubcompanyid = "0";
+                }
+                supsubcompanyid = sc.getSupsubcomid(thesubcompanyid);
+                if ("".equals(supsubcompanyid)) {
+                    supsubcompanyid = "0";
+                }
+
+            } catch (Exception rcdc) {
+            }
+        } else {
+            try {
+                CustomerInfoComInfo cc = new CustomerInfoComInfo();
+                ResourceComInfo rc = new ResourceComInfo();
+                DepartmentComInfo dc = new DepartmentComInfo();
+                SubCompanyComInfo sc = new SubCompanyComInfo();
+
+                crmmanager = cc.getCustomerInfomanager("" + creater);
+                thedepartmentid = rc.getDepartmentID(crmmanager);
+                if ("".equals(thedepartmentid)) {
+                    thedepartmentid = "0";
+                }
+                thesubcompanyid = dc.getSubcompanyid1(thedepartmentid);
+                if ("".equals(thesubcompanyid)) {
+                    thesubcompanyid = "0";
+                }
+                supsubcompanyid = sc.getSupsubcomid(thesubcompanyid);
+                if ("".equals(supsubcompanyid)) {
+                    supsubcompanyid = "0";
+                }
+
+            } catch (Exception rcdc) {
+            }
+        }
+
+        //ActionLog.writeDebuggerLog("====>nextnodetype:[" + nextnodetype + "]");
+
+        if (nextnodetype.equals("0")) {   // 回到创建节点
+            OperatorInfoEntity operatorEntity = new OperatorInfoEntity();
+            operatorEntity.setUserId(String.valueOf(creater));
+            operatorEntity.setUserType(creatertype);
+            operators = new ArrayList();
+            operators.add("" + creater + "_" + creatertype + "_" + "0" + "_0");
+            boolean isDimission = isDimissionPerson(operatorEntity);
+            tempGroupId = tempGroupId + 1;    //xwj for td3215 20051205
+            tempoperatorsht.put("" + tempGroupId, operators); // xwj for td3215 20051205
+            if (isDimission) {
+                String lastname = getLastnameByUserStatus(String.valueOf(creater));
+                WorkflowRequestMessage.getDetailInfomx(errorInfoMsgBuffer, "", "", lastname + " " + SystemEnv.getHtmlLabelName(126527, languageid), "", index, languageid);
+                JSONObject msgInfo = WorkflowRequestMessage.getBottomInfo(SystemEnv.getHtmlLabelName(126540, languageid), workflowid, WorkflowRequestMessage.WF_NODE_SET);
+
+                try {
+                    msgInfo.put("details", errorInfoMsgBuffer.toString());
+                } catch (JSONException e) {
+                    e.printStackTrace();
+                }
+                this.setMessagecontent(msgInfo.toString());
+                return false;
+            }
+        } else if (nextnodetype.equals(NodeType.AUTOPROCESS.getValue()) || nextnodetype.equals(NodeType.WAIT.getValue())) {//机器人节点
+            operators = new ArrayList();
+            operators.add("" + RobotNodeBiz.operatorid + "_" + RobotNodeBiz.operatortype + "_" + "0" + "_0");
+            tempGroupId = tempGroupId + 1;    //xwj for td3215 20051205
+            tempoperatorsht.put("" + tempGroupId, operators); // xwj for td3215 20051205
+        } else {
+            //ActionLog.writeDebuggerLog("====> INTO ELSE Line 2865");
+            if (nodeattribute.equals("2") && nextnodeattribute.equals("2")) {
+                rs.executeSql("select max(groupid) from workflow_currentoperator where requestid=" + this.requestid + " and nodeid=" + nodeid);
+                if (rs.next()) {
+                    tempGroupId = rs.getInt(1);
+                }
+            }
+            //下一节点名称
+            String nextnodename = WorkflowRequestMessage.getWorkflowNodename(nextnodeid);
+            rs.executeSql("select * from workflow_nodegroup where nodeid = " + this.nextnodeid + " order by id asc"); //xwj for td2104 on 20050802
+            //下一节点未设置操作组
+            if (rs.getCounts() == 0) {
+                WorkflowRequestMessage.getNodeErrorMsgTitle(errorInfoMsgBuffer, nextnodename, languageid);
+                WorkflowRequestMessage.getDetailInfomx(errorInfoMsgBuffer, "", "", SystemEnv.getHtmlLabelName(126545, languageid), "", index, languageid);
+                JSONObject msgInfo = WorkflowRequestMessage.getBottomInfo(SystemEnv.getHtmlLabelName(126540, languageid), workflowid, WorkflowRequestMessage.WF_NODE_SET);
+                try {
+                    msgInfo.put("details", errorInfoMsgBuffer.toString());
+                } catch (JSONException e) {
+                    e.printStackTrace();
+                }
+                this.setMessagecontent(msgInfo.toString());
+                return false;
+            }
+
+            int groupnum = 0;
+
+            //流程流转操作组日志
+            Map groupsLog = new HashMap();
+            requestFlowLogEntity.getOperatorLog().put("groupsLog", groupsLog);
+
+            WorkflowRequestMessage.getNodeErrorMsgTitle(errorInfoMsgBuffer, nextnodename, languageid);
+            while (rs.next()) {                       // 操作组循环
+                int groupid = Util.getIntValue(rs.getString("id"), 0);
+                String groupname = Util.null2String(rs.getString("groupname"));
+                operators = new ArrayList();
+                ArrayList tempoperators = new ArrayList();
+                String orders = "-1";
+                String ordernew = "-1";
+                boolean hasTmpOperators = false;//同一操作组会签是否已找到操作人
+                //抄送排除在外 2008.3.25 myq
+                rs1.executeSql("select * from workflow_groupdetail where (signorder=0 or signorder=1 or signorder=2 or signorder='' or signorder is null) and groupid = " + groupid + " order by orders, id asc");//xwj for td2104 on 20050802
+                if (rs1.getCounts() == 0) {
+                    //如果有操作组未设置操作者，则先记录信息
+                    WorkflowRequestMessage.getDetailInfomx(errorInfoMsgBuffer, groupname, "", WorkflowRequestMessage.assemMsgInfo("{15808}{124955}", languageid), "", index, languageid);
+                    JSONObject msgInfo = WorkflowRequestMessage.getBottomInfo(SystemEnv.getHtmlLabelName(126540, languageid), workflowid, WorkflowRequestMessage.WF_NODE_SET);
+                    try {
+                        msgInfo.put("details", errorInfoMsgBuffer.toString());
+                    } catch (JSONException e) {
+                        e.printStackTrace();
+                    }
+                    this.setMessagecontent(msgInfo.toString());
+                }
+
+                List<Map> groupDetailLogList = new ArrayList();
+                groupsLog.put("操作组:" + groupname + "(" + groupid + ")", groupDetailLogList);
+                //消息内容
+                while (rs1.next()) {                  // 某一个操作组中的多个操作者细项
+
+                    int type = rs1.getInt("type");
+                    int virtualid = Util.getIntValue(rs1.getString("virtualid"), -1);//组织维度id
+                    int objid = rs1.getInt("objid");
+                    int level = rs1.getInt("level_n");
+                    int level2 = rs1.getInt("level2_n");
+                    String jobobj = rs1.getString("jobobj");//岗位对象
+                    String jobfield = rs1.getString("jobfield");//岗位级别
+                    String deptField = rs1.getString("deptField");//部门自定义字段 deptField该字段存储值个格式id_fieldname_fieldlabel
+                    String deptFieldFlag = "1";//1-表示是选择了'安全级别' 2-表示是选择了'部门自定义字段值'
+                    String subcompanyField = rs1.getString("subcompanyField");//分部自定义字段subcompanyField该字段存储值个格式id_fieldname_fieldlabel
+                    String subcompanyFieldFlag = "1";//1-表示是选择了'安全级别' 2-表示是选择了分部自定义字段值'
+                    int groupdetailid = rs1.getInt("id");
+                    int signorder = rs1.getInt("signorder");
+                    int bhxj = rs1.getInt("bhxj");
+                    String zdysqlName = Util.null2String(rs1.getString("zdysqlname"));
+
+                    //节点操作者为人力资源字段-部门，设定安全级别条件，会签关系选择[非会签]，
+                    //并且设置协办人条件，勾选"抄送协办人"，会签关系选择[会签]，协办人选择"系统设定协办人"(TD30441)
+                    int signtypetmp = rs1.getInt("signtype");
+                    if (signtypetmp == 1 && signorder == 0 && type == 42) signorder = 1;
+
+                    orders = rs1.getString("orders");
+                    int IsCoadjutant = Util.getIntValue(rs1.getString("IsCoadjutant"));
+                    int issyscoadjutant = Util.getIntValue(rs1.getString("issyscoadjutant"));
+                    int coadjutant = Util.getIntValue(rs1.getString("coadjutants"));
+                    if (!isEmptyOrAllDimissionPerson(tempoperators, rs2)) {
+                        hasTmpOperators = true;
+                    }
+
+
+                    //if ((!ordernew.equals("-1")&&!orders.equals(ordernew))&&(operators.size()>0||tempoperators.size()>0))   //在同一批次下找不到操作者才进入下一批次
+                    //if ((!ordernew.equals("-1")&&!orders.equals(ordernew))&&(operators.size()>0||tempoperators.size()>0 || hasTmpOperators))   //在同一批次下找不到操作者才进入下一批次
+                    if ((!ordernew.equals("-1") && !orders.equals(ordernew)) && (!isEmptyOrAllDimissionPerson(operators, rs2))) {
+                        break;
+                    }
+                    //在每一批次必须符合条件才能取得操作者
+                    String conditions = rs1.getString("conditions");
+                    String conditioncn = Util.null2String(rs1.getString("conditioncn"));
+                    //select * from workflow_groupdetail order by id desc(获得最新的操作批次条件)
+                    //select * from formtable_main_314 where requestid=31141 and (formtable_main_314.asdfa ='E-1100 001 B' )
+                    //System.out.println("流程批次条件判断的sql条件"+conditions);
+                    String tempSql = "";
+                    conditions = Util.StringReplace(conditions, "’", "'");
+                    //-----------------------------------------------
+                    // 批次条件不为空,且操作为“退回”，且操作者为：
+                    // 人力资源字段本人、人力资源字段经理、人力资源字段下属、
+                    // 人力资源字段本分部、人力资源字段本部门、人力资源字段上级部门
+                    // 其中之一时，才进行查询Manager字段在退回节点前一个节点的值
+                    // START
+                    //-----------------------------------------------
+                    if (!"".equals(conditions) && conditions.toLowerCase().indexOf(".manager ") != -1 && this.isreject == 1 && (type == 5 || type == 6 || type == 31 || type == 32 || type == 7 || type == 38 || type == 41)) {
+                        String tmpFieldName = "";
+                        String tmpFieldValue = "";
+                        if (isbill == 0) {
+                            rs2.executeSql("select fieldname from workflow_formdict where id =" + objid);
+                        } else {
+                            rs2.executeSql("select fieldname from workflow_billfield where id =" + objid);
+                        }
+
+                        if (rs2.next()) {
+                            tmpFieldName = rs2.getString("fieldname");
+                        }
+
+                        if ("manager".equals(tmpFieldName)) {
+                            String tempFieldValue = tmpFieldValue;
+                            //当退回时，manager字段不能直接取当前的manager的值，应取退回节点之前的节点的操作人的manager
+                            String tempsql = "SELECT userid FROM workflow_currentoperator " +
+                                    "WHERE nodeid IN (SELECT nodeid FROM workflow_nodelink nl ,workflow_nodebase nd WHERE nd.id = nl.nodeid AND destnodeid = " + nextnodeid + " AND (nl.isreject is null or nl.isreject <> '1') and nodeid <> " + nextnodeid + ") " +
+                                    "AND requestid=" + requestid + " AND preisremark=0 AND isremark=2 AND operatedate IS NOT NULL AND operatetime IS NOT NULL ORDER BY groupid DESC ";
+
+                            RecordSet rs_manager = new RecordSet();
+
+                            rs_manager.executeSql(tempsql);
+                            int tempUserid = -1;
+                            int tempManagerid = -1;
+                            if (rs_manager.next()) {
+                                tempUserid = Util.getIntValue(rs_manager.getString("userid"), -1);
+                            }
+
+                            if (tempUserid != -1) {
+                                rs_manager.executeSql("SELECT managerid FROM HrmResource WHERE id=" + tempUserid);
+                                if (rs_manager.next()) {
+                                    tempManagerid = Util.getIntValue(rs_manager.getString("managerid"), -1);
+                                }
+                            }
+                            if (tempManagerid != -1) {
+                                tmpFieldValue = String.valueOf(tempManagerid);
+                            }
+                        }
+                        //  System.out.println("***************tmpFieldValue:  "+tmpFieldValue+"******************");
+                        if (type == 41) {
+                            //case 41:  节点操作者经理，这边只修改了 非会签。
+                            RecordSet rsTemp = new RecordSet();
+                            rsTemp.execute(" select operator from workflow_requestlog where nodeid = " + nextnodeid + " and operatortype=0 and (logtype='0' or logtype='2' or logtype='3') and requestid = " + requestid);
+                            if (rsTemp.next()) {
+                                tmpFieldValue = rsTemp.getString("operator");
+                            }
+
+                        }
+                        if (!"".equals(tmpFieldValue)) {
+                            if (isbill == 0) {
+                                conditions = conditions.toLowerCase().replaceAll("workflow_form.manager ", tmpFieldValue + " ");
+                            } else {
+                                conditions = conditions.toLowerCase().replaceAll(billtablename + ".manager ", tmpFieldValue + " ");
+                            }
+                        }
+                    }
+                    //-----------------
+                    // END
+                    //-----------------
+                    //记录操作者批次条件日志
+                    Map<String, Object> groupDetailLog = new HashMap();
+                    Map ruleInfo = new HashMap();
+                    groupDetailLog.put("ruleInfo", ruleInfo);
+                    groupDetailLog.put("conditions", conditions);
+                    groupDetailLog.put("conditioncn", conditioncn);
+                    groupDetailLog.put("groupdetailid", groupdetailid);
+                    groupDetailLogList.add(groupDetailLog);
+
+                    //ActionLog.writeDebuggerLog("====>ruleInfo:" + ruleInfo.toString());
+                    if (this.isConformConditions(conditions, rsTemps, groupdetailid + "", ruleInfo)) {
+                        if (level2 == -1) {
+                            level2 = Integer.MAX_VALUE;
+                        }
+
+                        OperatorEntity operatorInfo = new OperatorEntity();
+                        operatorInfo.setGroupdetailId(groupdetailid);
+                        operatorInfo.setType(type);
+                        operatorInfo.setSignOrder(signorder + "");
+                        operatorInfo.setOrder(Util.getDoubleValue(orders, 0.00));
+                        operatorInfo.setLevel(level);
+                        operatorInfo.setMaxLevel(level2);
+                        operatorInfo.setCondition(conditions);
+                        operatorInfo.setJobObj(jobobj);
+                        operatorInfo.setJobField(jobfield);
+                        operatorInfo.setBhxj(bhxj + "");
+                        operatorInfo.setVirtual(virtualid + "");
+                        List<String> operatorTemps = new ArrayList<String>();
+                        String objectId = objid + "";
+                        if (objectId.indexOf(",") == -1) {
+                            operatorInfo.setObjectId(Util.getIntValue(objectId));
+                            operatorTemps.add(objectId);
+                        } else {
+                            operatorTemps.addAll(Util.TokenizerString(objectId, ","));
+                        }
+                        operatorInfo.setOperators(operatorTemps);
+                        operatorInfo.setIsCoadjutant(IsCoadjutant);
+                        operatorInfo.setIssyscoadjutant(issyscoadjutant);
+                        operatorInfo.setCoadjutant(coadjutant + "");
+                        operatorInfo.setNodeId(this.nodeid);
+                        operatorInfo.setNextnodeid(nextnodeid);
+                        operatorInfo.setPassNodes(passNodes);
+                        operatorInfo.setZdysqlName(zdysqlName);
+                        operatorInfo.setAutoForecast(this.autoForecast);
+                        operatorInfo.setForecastManagerInfo(this.forecastManagerInfo);
+
+                        NodeOperatorConfigBiz.getInstance().getOperatorEntity(operatorInfo, requestid, user, src, "1");
+
+                        List<OperatorInfoEntity> operatorInfos = operatorInfo.getOperatorInfos();//操作者
+                        List<OperatorInfoEntity> coadjutantInfos = operatorInfo.getCoadjutants();//协办人
+
+
+                        String lastnames = "";
+                        //非归档节点所有类型均过滤离职人员，归档节点只有指定人不过滤离职人员，其他均过滤
+                        boolean isFilter = getIsDimissionByProp(nextnodetype, type);
+                        Iterator<OperatorInfoEntity> iterator = operatorInfos.iterator();
+                        while (iterator.hasNext()) {
+                            OperatorInfoEntity operatorEntity = iterator.next();
+                            if (isFilter) {
+                                boolean isDimission = isDimissionPerson(operatorEntity);
+                                if (isDimission) {
+                                    iterator.remove();
+                                }
+                            }
+                        }
+
+
+                        //错误消息
+                        String msgcontent = "";
+                        if (operatorInfos.size() == 0) {
+                            msgcontent = NodeOperatorConfigBiz.getInstance().getErrorMessageContent(operatorInfo, requestid, user, isintervenor);
+                            assemMsgContent4E9(groupname, orders, msgcontent);
+                            continue;
+                        }
+
+                        //根据密级过滤操作者
+                        this.deleteOperateBySecLevel(operatorInfos, requestid);
+                        this.deleteOperateBySecLevel(coadjutantInfos, requestid);
+
+                        //由密级过滤后无操作者的错误消息
+                        if (operatorInfos.size() == 0) {
+                            operatorInfo.setPassBySecLevel(true);
+                            msgcontent = NodeOperatorConfigBiz.getInstance().getErrorMessageContent(operatorInfo, requestid, user, isintervenor);
+                            if ("".equals(msgcontent)) {
+                                msgcontent = "{500968}";
+                            }
+                            assemMsgContent4E9(groupname, orders, msgcontent);
+                            continue;
+                        }
+
+                        String matrixnodeid = getNodeids(workflowid);
+                        Logger logger = aiyh.utils.Util.getLogger();
+                        aiyh.utils.Util.getLogger().info("查询到的节点信息：" + matrixnodeid + " => " + nextnodeid + " : " + nextnodename);
+//                        ActionLog.writeDebuggerLog("======>matrixnodeid:[" + matrixnodeid + "]");
+
+                        if ("1".equals(operatorInfo.getSignOrder())) {//会签
+                            operators = new ArrayList();
+//                            ActionLog.writeDebuggerLog("======>会签关系：[" + "," + matrixnodeid + "," + "," + nextnodeid + "," + "]");
+//                            ("," + matrixnodeid + ",").indexOf("," + nextnodeid + ",") > -1
+                            if (("," + matrixnodeid + ",").contains("," + nextnodeid + ",")) {
+                                logger.info("进入会签功能！");
+                                List<String> dept = new ArrayList();
+                                Map<String, String> deptmap = new HashMap<String, String>();
+                                for (OperatorInfoEntity operatorEntity : operatorInfos) {
+//                                    tempGroupId = tempGroupId + 1;
+                                    //用户ID
+                                    String userid = operatorEntity.getUserId();
+                                    logger.info("操作用户ID" + userid);
+
+                                    User tempUser = new User(Util.getIntValue(userid, -1));
+
+                                    //部门ID
+                                    String departmentid = "" + tempUser.getUserDepartment();
+
+                                    //将部门分组存储到集合中
+                                    if (!dept.contains("" + departmentid)) {
+                                        dept.add("" + departmentid);
+                                    }
+
+                                    //按部门将人员放到map中
+                                    if (null != deptmap.get("" + departmentid)) {
+                                        deptmap.put("" + departmentid, deptmap.get("" + departmentid) + "," + userid);
+                                    } else {
+                                        deptmap.put("" + departmentid, "" + userid);
+                                    }
+
+                                }
+                                logger.info("部门人员信息：" + deptmap);
+                                logger.info("部门分组集合：" + dept);
+                                logger.info("====>deptmap:" + deptmap.toString());
+                                //根据上面获取到的人员信息进行分类处理
+                                if (dept.size() > 0) {
+                                    for (int index = 0; index < dept.size(); index++) {
+                                        String deptid = (String) dept.get(index);
+                                        String useridstr = Util.null2String(deptmap.get(deptid));//按照部门处理分组数据
+                                        if (!"".equals(useridstr)) {
+                                            tempGroupId = tempGroupId + 1;//不同部门之间是会签关系 同部门直接的人会非会签关系
+                                            List useridlist = Util.TokenizerString(useridstr, ",");
+                                            tempoperators = new ArrayList();
+                                            String czgroupdetieldid = groupdetailid + "9999" + index;//初始化一个操作者id
+                                            for (int j = 0; j < useridlist.size(); j++) {//非会签groupid相同，会签groupid不同
+                                                String uid = (String) useridlist.get(j);
+                                                tempoperators.add("" + uid + "_0" + "_" + czgroupdetieldid + "_0");
+                                            }
+                                            if (!nextnodeattribute.equals("2") || !nodeattribute.equals("2")) {
+                                                tempoperatorsht.put("" + tempGroupId, tempoperators);
+                                            } else {
+                                                tempoperatorsht.put("" + tempGroupId * -1, tempoperators);
+                                            }
+                                        }
+                                    }
+                                }
+//                                ActionLog.writeDebuggerLog("签署信息：" + tempoperatorsht);
+                            } else {
+                                for (OperatorInfoEntity operatorEntity : operatorInfos) {
+                                    tempGroupId = tempGroupId + 1;
+                                    tempoperators = new ArrayList();
+                                    tempoperators.add("" + operatorEntity.getUserId() + "_" + operatorEntity.getUserType() + "_" + operatorInfo.getGroupdetailId() + "_0");
+                                    operators.add("" + operatorEntity.getUserId() + "_" + operatorEntity.getUserType() + "_" + operatorInfo.getGroupdetailId() + "_0");
+                                    operators4e9.add(operatorEntity.getUserId() + ":" + operatorEntity.getUserType());
+
+                                    //处理协办人，放在操作者之后 实际设置是只有一个协办人，当前代码兼容后续扩展多个协办人
+                                    if (coadjutantInfos.size() > 0 && operatorInfo.getType() == 42) {
+                                        for (OperatorInfoEntity coadjutantEntrty : coadjutantInfos) {
+                                            if (tempoperators.indexOf("" + coadjutantEntrty.getUserId() + "_" + coadjutantEntrty.getUserType() + "_" + groupdetailid + "_-5") == -1
+                                                    && tempoperators.indexOf("" + coadjutantEntrty.getUserId() + "_" + coadjutantEntrty.getUserType() + "_" + groupdetailid + "_0") == -1) {
+                                                tempoperators.add("" + coadjutantEntrty.getUserId() + "_" + coadjutantEntrty.getUserType() + "_" + groupdetailid + "_-5");
+                                                operators4e9.add(coadjutantEntrty.getUserId() + ":" + coadjutantEntrty.getUserType());
+                                                hasCoadjutant = true;
+                                            }
+                                        }
+                                    }
+
+                                    if (!nextnodeattribute.equals("2") || !nodeattribute.equals("2")) {
+                                        tempoperatorsht.put("" + tempGroupId, tempoperators);
+                                    } else {
+                                        tempoperatorsht.put("" + tempGroupId * -1, tempoperators);
+                                    }
+                                }
+                            }
+                        } else if ("2".equals(operatorInfo.getSignOrder()) && WFPathUtil.isContinuousProcessing(operatorInfo.getType())) {//依次逐个处理
+                            tempGroupId = tempGroupId + 1;
+                            tempoperators = new ArrayList();
+                            orderflag = true;
+                            String coadjutants = "";
+                            String receivedpersons = "";
+                            operators = new ArrayList();
+                            if (nextnodeid != nodeid || tonextnode) {
+                                if (tonextnode) {
+                                    tonextnode = false;
+                                }
+                                Set<String> operatorSets = new HashSet<>();
+                                boolean hastheoperator = false;
+                                for (OperatorInfoEntity operatorEntity : operatorInfos) {
+                                    if (hastheoperator) {
+                                        break;
+                                    }
+
+                                    tempoperators.add("" + operatorEntity.getUserId() + "_" + operatorEntity.getUserType() + "_" + operatorInfo.getGroupdetailId() + "_0");
+                                    operators.add("" + operatorEntity.getUserId() + "_" + operatorEntity.getUserType() + "_" + operatorInfo.getGroupdetailId() + "_0");
+                                    operators4e9.add(operatorEntity.getUserId() + ":" + operatorEntity.getUserType());
+                                    operatorSets.add(operatorEntity.getUserId() + ":" + operatorEntity.getUserType());
+
+
+                                    //处理协办人，放在操作者之后 实际设置是只有一个协办人，当前代码兼容后续扩展多个协办人
+                                    if (coadjutantInfos.size() > 0 && operatorInfo.getType() == 42) {
+                                        for (OperatorInfoEntity coadjutantEntrty : coadjutantInfos) {
+                                            if (tempoperators.indexOf("" + coadjutantEntrty.getUserId() + "_" + coadjutantEntrty.getUserType() + "_" + groupdetailid + "_-5") == -1
+                                                    && tempoperators.indexOf("" + coadjutantEntrty.getUserId() + "_" + coadjutantEntrty.getUserType() + "_" + groupdetailid + "_0") == -1) {
+                                                tempoperators.add("" + coadjutantEntrty.getUserId() + "_" + coadjutantEntrty.getUserType() + "_" + groupdetailid + "_-5");
+                                                operators4e9.add(coadjutantEntrty.getUserId() + ":" + coadjutantEntrty.getUserType());
+                                                hasCoadjutant = true;
+                                            }
+                                        }
+                                    }
+                                    if (!isintervenor.equals("1")) {
+                                        hastheoperator = true;
+                                    }
+                                }
+
+                                if (!nextnodeattribute.equals("2") || !nodeattribute.equals("2")) {
+                                    tempoperatorsht.put("" + tempGroupId, tempoperators);
+                                } else {
+                                    tempoperatorsht.put("" + tempGroupId * -1, tempoperators);
+                                }
+
+
+                                for (OperatorInfoEntity operatorEntity : operatorInfos) {
+                                    if (operatorSets.contains(operatorEntity.getUserId() + ":" + operatorEntity.getUserType())) {
+                                        continue;
+                                    }
+                                    receivedpersons += operatorEntity.getUserId() + ",";
+                                    if (coadjutantInfos.size() > 0) {//存在协办人时协办人已经被抄送过，这里不需要在保存协办人
+                                        coadjutants = "";
+                                    } else {
+                                        coadjutants += "-1" + ",";
+                                    }
+                                }
+
+                                if (!isintervenor.equals("1") && isFromSubmitConfirm != 1) {
+                                    rs.executeSql("delete from workflow_agentpersons where requestid=" + requestid + " and  (groupdetailid=" + operatorInfo.getGroupdetailId() + " or groupdetailid is null)");//groupdetailid is null主要为了兼容老的数据
+                                    rs.executeSql("insert into workflow_agentpersons (requestid, receivedpersons, groupdetailid,coadjutants) values (" + requestid + ",'" + receivedpersons + "'," + operatorInfo.getGroupdetailId() + ",'" + coadjutants + "')");
+                                }
+                            } else {//根据逻辑，不知道什么时候调用else
+                                rs.executeSql("select * from workflow_agentpersons where requestid = " + requestid + " and groupdetailid=" + groupdetailid);
+                                boolean flags = false;
+                                boolean flago = false;  //考虑老的数据
+                                if (rs.next()) flags = true;
+                                if (!flags) {
+                                    rs.executeSql("select * from workflow_agentpersons where requestid = " + requestid);  //考虑以前的数据加上该判断
+                                    if (rs.next()) flago = true;
+                                }
+                                if (flags || flago) {
+                                    receivedpersons = rs.getString("receivedPersons");
+                                    coadjutants = Util.null2String(rs.getString("coadjutants"));
+                                    if (!"".equals(receivedpersons)) {
+                                        tempoperators.add("" + receivedpersons.substring(0, receivedpersons.indexOf(",")) + "_0" + "_" + groupdetailid + "_0");
+                                        int idx = coadjutants.indexOf(",");
+                                        if (idx > 0) {
+                                            int tempcoadjutant = Util.getIntValue(coadjutants.substring(0, idx));
+                                            if (tempcoadjutant > 0 && tempoperators.indexOf("" + tempcoadjutant + "_0" + "_" + groupdetailid + "_-5") == -1 && tempoperators.indexOf("" + tempcoadjutant + "_0" + "_" + groupdetailid + "_0") == -1) {
+                                                tempoperators.add("" + tempcoadjutant + "_0" + "_" + groupdetailid + "_-5");
+                                                hasCoadjutant = true;
+                                            }
+                                        }
+                                        if (flago)
+                                            rs.executeSql("update workflow_agentpersons set receivedPersons = '" + receivedpersons.substring(receivedpersons.indexOf(",") + 1, receivedpersons.length()) + "',coadjutants='" + coadjutants.substring(idx + 1, coadjutants.length()) + "' where requestid = " + requestid);
+                                        else if (flags)
+                                            rs.executeSql("update workflow_agentpersons set receivedPersons = '" + receivedpersons.substring(receivedpersons.indexOf(",") + 1, receivedpersons.length()) + "',coadjutants='" + coadjutants.substring(idx + 1, coadjutants.length()) + "' where requestid = " + requestid + " and groupdetailid=" + groupdetailid);
+                                    }
+
+                                }
+                            }
+                        } else {//非会签
+                            tempGroupId = tempGroupId + 1;
+                            tempoperators = new ArrayList();
+                            operators = new ArrayList();
+                            for (OperatorInfoEntity operatorEntity : operatorInfos) {
+                                tempoperators.add("" + operatorEntity.getUserId() + "_" + operatorEntity.getUserType() + "_" + operatorInfo.getGroupdetailId() + "_0");
+                                operators.add("" + operatorEntity.getUserId() + "_" + operatorEntity.getUserType() + "_" + operatorInfo.getGroupdetailId() + "_0");
+                                operators4e9.add(operatorEntity.getUserId() + ":" + operatorEntity.getUserType());
+                            }
+
+                            //处理协办人，放在操作者之后 实际设置是只有一个协办人，当前代码兼容后续扩展多个协办人
+                            if (coadjutantInfos.size() > 0 && operatorInfo.getType() == 42) {
+                                for (OperatorInfoEntity coadjutantEntrty : coadjutantInfos) {
+                                    if (tempoperators.indexOf("" + coadjutantEntrty.getUserId() + "_" + coadjutantEntrty.getUserType() + "_" + groupdetailid + "_-5") == -1
+                                            && tempoperators.indexOf("" + coadjutantEntrty.getUserId() + "_" + coadjutantEntrty.getUserType() + "_" + groupdetailid + "_0") == -1) {
+                                        tempoperators.add("" + coadjutantEntrty.getUserId() + "_" + coadjutantEntrty.getUserType() + "_" + groupdetailid + "_-5");
+                                        operators4e9.add(coadjutantEntrty.getUserId() + ":" + coadjutantEntrty.getUserType());
+                                        hasCoadjutant = true;
+                                    }
+                                }
+                            }
+                            //if(!nextnodeattribute.equals("2")||!nodeattribute.equals("2"))  这一块排除了当前节点和下一个节点都是分叉中间点的情况。xwz qc50563
+                            if (tempoperators.size() > 0) {
+                                tempoperatorsht.put("" + tempGroupId, tempoperators);
+                            }
+                        }
+
+
+                        if (StringUtil.isNotNull(lastnames)) {
+                            msgcontent = getOperatorNotWorkingInfo(type, objid, lastnames, groupdetailid);
+                            if (StringUtil.isNotNull(msgcontent)) {
+                                WorkflowRequestMessage.getDetailInfomx(errorInfoMsgBuffer, groupname, orders, msgcontent, "", index, languageid);
+                                JSONObject msgInfo = WorkflowRequestMessage.getBottomInfo(SystemEnv.getHtmlLabelName(126540, languageid), workflowid, WorkflowRequestMessage.WF_NODE_SET);
+                                try {
+                                    msgInfo.put("details", errorInfoMsgBuffer.toString());
+                                } catch (JSONException e) {
+                                    e.printStackTrace();
+                                }
+                                this.setMessagecontent(msgInfo.toString());
+                            }
+                        }
+                    } else {
+                        //如果条件不合格把条件列出来
+                        JSONObject msgInfo = WorkflowRequestMessage.getBottomInfo(SystemEnv.getHtmlLabelName(126540, languageid), workflowid, WorkflowRequestMessage.WF_NODE_SET);
+
+                        //if("".equals(conditioncn)) {
+                        conditioncn = RuleBusiness.getConditionCn(groupdetailid, 2, user);
+                        //}
+
+                        WorkflowRequestMessage.getDetailInfomx(errorInfoMsgBuffer, groupname, orders, "", conditioncn, index, languageid);
+                        index++;
+                        try {
+                            msgInfo.put("details", errorInfoMsgBuffer.toString());
+                        } catch (JSONException e) {
+                            e.printStackTrace();
+                        }
+                        this.setMessagecontent(msgInfo.toString());
+
+                    }
+                    ordernew = orders;
+                }       // 每一个操作组中的细项结束循环
+                //if(!nextnodeattribute.equals("2")||!nodeattribute.equals("2"))  这一块排除了当前节点和下一个节点都是分叉中间点的情况。xwz qc50563
+            }           // 操作组讯息结束
+
+        }
+
+        /*---- xwj for td2104 on 20050802   E N D---*/
+        //全部为离职人员且开启异常处理，则去掉离职人员操作者,走异常处理
+        //if(flowExceptionHandle.hasSettingException(workflowid, nextnodeid)){
+//			Iterator<Map.Entry<String, Object>> tempit = tempoperatorsht.entrySet().iterator();
+//			while(tempit.hasNext()){
+//				Map.Entry<String, Object> entry = tempit.next();
+//				if(isEmptyOrAllDimissionPerson((List<String>) entry.getValue(), rs2))
+//					tempit.remove();
+//			}
+        //}
+        if (tempoperatorsht.isEmpty())
+            return false;
+        else {
+            //已经匹配的操作者，删除错误信息
+            if (!"".equals(this.getMessageid())) {
+                this.setMessageid("");
+                this.setMessagecontent("");
+            }
+
+            if (!nextnodetype.equals("0")) {
+                RecordSet rs3 = new RecordSet();
+                RecordSet rs4 = new RecordSet();
+
+                rs.executeSql("select * from workflow_nodegroup where nodeid = " + this.nextnodeid + " order by id asc");
+                while (rs.next()) {//操作组循环
+                    int groupid = Util.getIntValue(rs.getString("id"), 0);
+                    //抄送处理
+                    rs3.executeSql("select * from workflow_groupdetail where (signorder=4 or signorder=3) and groupid = " + groupid + " order by signorder desc");
+                    while (rs3.next()) {//操作组中的多个操作者细项
+                        int type = rs3.getInt("type");
+                        int virtualid = Util.getIntValue(rs3.getString("virtualid"), -1);
+                        int objid = rs3.getInt("objid");
+                        int groupdetailid = rs3.getInt("id");
+                        int level = rs3.getInt("level_n");
+                        int level2 = rs3.getInt("level2_n");
+                        String jobobj = rs3.getString("jobobj");//岗位对象
+                        String jobfield = rs3.getString("jobfield");//岗位级别
+                        String deptField = rs3.getString("deptField");//部门自定义字段 deptField该字段存储值个格式id_fieldname_fieldlabel
+                        String subcompanyField = rs3.getString("subcompanyField");//分部自定义字段subcompanyField该字段存储值个格式id_fieldname_fieldlabel
+                        int signorder = rs3.getInt("signorder");
+                        int bhxj = rs3.getInt("bhxj");
+                        int IsCoadjutant = Util.getIntValue(rs3.getString("IsCoadjutant"));
+                        int issyscoadjutant = Util.getIntValue(rs3.getString("issyscoadjutant"));
+                        int coadjutant = Util.getIntValue(rs3.getString("coadjutants"));
+                        String zdysqlName = Util.null2String(rs1.getString("zdysqlname"));
+
+                        //必须符合条件才能取得操作者
+                        String conditions = rs3.getString("conditions");
+                        String tempSql = "";
+                        conditions = Util.StringReplace(conditions, "’", "'");
+                        //抄送批次条件暂时不记录。
+                        if (this.isConformConditions(conditions, rs4, groupdetailid + "", new HashMap<>())) {
+                            if (level2 == -1) {
+                                level2 = Integer.MAX_VALUE;
+                            }
+
+                            OperatorEntity operatorInfo = new OperatorEntity();
+                            operatorInfo.setGroupdetailId(groupdetailid);
+                            operatorInfo.setType(type);
+                            operatorInfo.setSignOrder(signorder + "");
+//							operatorInfo.setOrder(Util.getDoubleValue(orders,0.00));
+                            operatorInfo.setLevel(level);
+                            operatorInfo.setMaxLevel(level2);
+                            operatorInfo.setCondition(conditions);
+                            operatorInfo.setJobObj(jobobj);
+                            operatorInfo.setJobField(jobfield);
+                            operatorInfo.setBhxj(bhxj + "");
+                            operatorInfo.setVirtual(virtualid + "");
+                            List<String> operatorTemps = new ArrayList<String>();
+                            String objectId = objid + "";
+                            if (objectId.indexOf(",") == -1) {
+                                operatorInfo.setObjectId(Util.getIntValue(objectId));
+                                operatorTemps.add(objectId);
+                            } else {
+                                operatorTemps.addAll(Util.TokenizerString(objectId, ","));
+                            }
+                            operatorInfo.setOperators(operatorTemps);
+                            operatorInfo.setIsCoadjutant(IsCoadjutant);
+                            operatorInfo.setIssyscoadjutant(issyscoadjutant);
+                            operatorInfo.setCoadjutant(coadjutant + "");
+                            operatorInfo.setNodeId(this.nodeid);
+                            operatorInfo.setNextnodeid(nextnodeid);
+                            operatorInfo.setPassNodes(passNodes);
+                            operatorInfo.setZdysqlName(zdysqlName);
+
+                            NodeOperatorConfigBiz.getInstance().getOperatorEntity(operatorInfo, requestid, user, src, "1");
+
+                            List<OperatorInfoEntity> operatorInfos = operatorInfo.getOperatorInfos();
+
+
+                            //非归档节点所有类型均过滤离职人员，归档节点只有指定人不过滤离职人员，其他均过滤
+                            boolean isFilter = getIsDimissionByProp(nextnodetype, type);
+                            Iterator<OperatorInfoEntity> iterator = operatorInfos.iterator();
+                            while (iterator.hasNext()) {
+                                OperatorInfoEntity operatorEntity = iterator.next();
+                                if (isFilter) {
+                                    boolean isDimission = isDimissionPerson(operatorEntity);
+                                    if (isDimission) {
+                                        iterator.remove();
+                                    }
+                                }
+                            }
+
+                            //根据密级过滤操作者
+                            this.deleteOperateBySecLevel(operatorInfos, requestid);
+
+                            for (OperatorInfoEntity operatorEntity : operatorInfos) {
+                                if (operators4e9.contains(operatorEntity.getUserId() + ":" + operatorEntity.getUserType())) {
+                                    continue;
+                                }
+                                tempGroupId = tempGroupId + 1;
+                                ArrayList tempoperators = new ArrayList();
+                                tempoperators.add("" + operatorEntity.getUserId() + "_" + operatorEntity.getUserType() + "_" + operatorInfo.getGroupdetailId() + "_-" + operatorInfo.getSignOrder());
+                                if (!nextnodeattribute.equals("2") || !nodeattribute.equals("2")) {
+                                    tempoperatorsht.put("" + tempGroupId, tempoperators);
+                                } else {
+                                    tempoperatorsht.put("" + tempGroupId * -1, tempoperators);
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+
+            //ActionLog.writeDebuggerLog("------------ END -----------------");
+            operatorsht = tempoperatorsht;
+            return true;
+        }
+    }
+
+    private String assemMsgContent(String groupname, String orders, int type, int virtualid, int objid, int level, int level2, String deptField, String subcompanyField, int groupdetailid, int signorder, int bhxj, String msgcontent) {
+        try {
+            msgcontent = this.getErrorMessageContent(type, nextnodetype, signorder, virtualid, languageid, objid, bhxj, level, groupdetailid, level2, deptField, subcompanyField);
+            WorkflowRequestMessage.getDetailInfomx(errorInfoMsgBuffer, groupname, orders, msgcontent, "", index, languageid);
+            JSONObject msgInfo = WorkflowRequestMessage.getBottomInfo(SystemEnv.getHtmlLabelName(126540, languageid), workflowid, WorkflowRequestMessage.WF_NODE_SET);
+            msgInfo.put("details", errorInfoMsgBuffer.toString());
+            this.setMessagecontent(msgInfo.toString());
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return msgcontent;
+    }
+
+    /**
+     * 操作组错误提示消息 E9
+     *
+     * @param groupname
+     * @param orders
+     * @param msgcontent
+     * @return
+     */
+    private String assemMsgContent4E9(String groupname, String orders, String msgcontent) {
+        if ("".equals(msgcontent)) {
+            msgcontent = "{127306}";
+        }
+
+        msgcontent = WorkflowRequestMessage.assemMsgInfo(msgcontent, languageid);
+        try {
+            if (assemMsgContentCount > 100) {
+                writeLog("----RequestNodeFlow---line2892--requestid:" + requestid + ",userid:" + userid + ",nodeid:" + nodeid + ",groupname:" + groupname);
+                return "";
+            }
+            assemMsgContentCount++;
+
+            WorkflowRequestMessage.getDetailInfomx(errorInfoMsgBuffer, groupname, orders, msgcontent, "", index, languageid);
+            JSONObject msgInfo = WorkflowRequestMessage.getBottomInfo(SystemEnv.getHtmlLabelName(126540, languageid), workflowid, WorkflowRequestMessage.WF_NODE_SET);
+            msgInfo.put("details", errorInfoMsgBuffer.toString());
+            this.setMessagecontent(msgInfo.toString());
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return msgcontent;
+    }
+
+    /**
+     * 流转异常处理，由用户指定操作者，计算下一节点操作者
+     * 参考getNextOperator(),模拟表单多人力资源字段type=5，非会签/会签/依次逐个处理
+     */
+    public boolean getNextOperatorByAssignUser(String eh_relationship, String eh_operators) throws Exception {
+        if ("".equals(eh_relationship) || "".equals(eh_operators))
+            return false;
+
+        try {//记录下会签关系，以便转办多人时取到会签关系
+            String insertsql = "insert into workflow_requestselectnextflow(requestid,nodeid,destnodeid,signtype,flowoperator)values(?,?,?,?,?)";
+            rst.executeUpdate(insertsql, requestid, nodeid, nextnodeid, eh_relationship, eh_operators);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        int temp_groupdetailid = 0;    //模拟生成groupid,不能<0，WfForceDrawBack.java强制收回需要判断groupdetailid>-1
+        ArrayList operators = new ArrayList();
+        Hashtable tempoperatorsht = new Hashtable();
+        if (nodeattribute.equals("2") && nextnodeattribute.equals("2")) {
+            rs.executeSql("select max(groupid) from workflow_currentoperator where requestid=" + this.requestid + " and nodeid=" + nodeid);
+            if (rs.next()) {
+                tempGroupId = rs.getInt(1);
+            }
+        }
+        String statustr = "";
+        if (nextnodetype.equals("3")) {
+            statustr = "0,1,2,3,5";//如果是归档节点，操作者包括为离职人员
+        } else {
+            statustr = "0,1,2,3";
+        }
+        String strSubClause = Util.getSubINClause(eh_operators, "id", "IN");
+        String sql = " select loginid,id from HrmResource where " + strSubClause + " and status in (" + statustr + ") " +
+                "union select loginid,id from HrmResourceManager where " + strSubClause + " and status in (" + statustr + ") ";
+        RecordSet rs2 = new RecordSet();
+        rs2.executeSql(sql);
+        if ("0".equals(eh_relationship)) {        //非会签
+            while (rs2.next()) {
+                int tepoperatorid = Util.getIntValue(rs2.getString("id"), 0);
+                operators.add("" + tepoperatorid + "_0" + "_" + temp_groupdetailid + "_0");
+            }
+        } else if ("1".equals(eh_relationship)) {    //会签
+            MultiHrmCompositorOrderBean orderBean = null;
+            ArrayList tempoperators = new ArrayList();
+            ArrayList orderList = new ArrayList();
+            String[] hrmStrs = getHrmStrs(5, 1, eh_operators);
+            while (rs2.next()) {
+                int tepoperatorid = Util.getIntValue(rs2.getString("id"), 0);
+                for (int i = 0; i < hrmStrs.length; i++) {
+                    if (tepoperatorid == Integer.parseInt(hrmStrs[i])) {
+                        orderBean = new MultiHrmCompositorOrderBean();
+                        orderBean.setCompositorOrder(i);
+                        orderBean.setHrmId(String.valueOf(tepoperatorid));
+                        orderList.add(orderBean);
+                    }
+                }
+            }
+            Collections.sort(orderList, new MultiHrmCompositorOrderComparator());
+            for (int i = 0; i < orderList.size(); i++) {
+                orderBean = (MultiHrmCompositorOrderBean) orderList.get(i);
+                tempGroupId = tempGroupId + 1;
+                tempoperators = new ArrayList();
+                tempoperators.add("" + orderBean.getHrmId() + "_0" + "_" + temp_groupdetailid + "_0");
+                if (!nextnodeattribute.equals("2") || !nodeattribute.equals("2")) {
+                    tempoperatorsht.put("" + tempGroupId, tempoperators);
+                } else {
+                    tempoperatorsht.put("" + tempGroupId * -1, tempoperators);
+                }
+            }
+        } else if ("2".equals(eh_relationship)) {    //依次逐个处理
+            tempGroupId = tempGroupId + 1;
+            ArrayList tempoperators = new ArrayList();
+            orderflag = true;
+            RecordSet rs = new RecordSet();
+            boolean hastheoperator = false;
+            String theorderbyordervalues[] = Util.TokenizerString2(eh_operators, ",");
+            //协办人coadjutants统一插入空
+            if (theorderbyordervalues != null) {
+                for (int i = 0; i < theorderbyordervalues.length; i++) {
+                    if (hastheoperator) break;
+                    int tepoperatorid = Util.getIntValue(theorderbyordervalues[i], 0);
+                    if (tepoperatorid != 0) {
+                        if (nextnodeid != nodeid) {
+                            //模拟插入workflow_groupdetail
+                            int temp_operatorgroup = -2;
+                            rst.executeProc("workflow_groupdetail_Insert", "" + temp_operatorgroup + flag + 5 + flag + temp_operatorgroup + flag + 0 + flag + -1 + flag + "" + flag + "" + flag + 0 + flag + 2 + flag + "" + flag + "" + flag + "" + flag + "" + flag + "" + flag + "" + flag + "" + flag + "" + flag + "" + flag + "" + flag + "");
+                            if (rst.next()) {
+                                temp_groupdetailid = rst.getInt(1);
+                            }
+
+                            tempoperators.add("" + tepoperatorid + "_0" + "_" + temp_groupdetailid + "_0");
+                            hastheoperator = true;
+                            String tempStr = "";
+                            for (int k = i + 1; k < theorderbyordervalues.length; k++) {
+                                tempStr += theorderbyordervalues[k] + ",";
+                            }
+                            rs.executeSql("delete from workflow_agentpersons where requestid=" + requestid + " and  (groupdetailid=" + temp_groupdetailid + " or groupdetailid is null)");//groupdetailid is null主要为了兼容老的数据
+                            rs.executeSql("insert into workflow_agentpersons (requestid, receivedpersons, groupdetailid,coadjutants) values (" + requestid + ",'" + tempStr.trim() + "'," + temp_groupdetailid + ",'')");
+                        } /*else {		//liuzy先注释，不清楚什么时候调用else
+							rs.executeSql("select * from workflow_agentpersons where requestid = " + requestid+" and groupdetailid="+temp_groupdetailid);
+							boolean flags=false;
+							boolean flago=false;  //考虑老的数据
+							if (rs.next())
+								flags=true;
+							if (!flags){
+								rs.executeSql("select * from workflow_agentpersons where requestid = " + requestid);  //考虑以前的数据加上该判断
+							    if (rs.next())
+							    	flago=true;
+							}
+							if(flags||flago){
+								String receivePersions = rs.getString("receivedPersons");
+								if(!"".equals(receivePersions)){
+									tempoperators.add("" + receivePersions.substring(0,receivePersions.indexOf(",")) + "_0"+"_"+temp_groupdetailid+ "_0");
+									hastheoperator = true;
+									if (flago)
+										rs.executeSql("update workflow_agentpersons set receivedPersons = '" + receivePersions.substring(receivePersions.indexOf(",")+1,receivePersions.length()) + "',coadjutants='' where requestid = " + requestid);
+									else if (flags)
+										rs.executeSql("update workflow_agentpersons set receivedPersons = '" + receivePersions.substring(receivePersions.indexOf(",")+1,receivePersions.length()) + "',coadjutants='' where requestid = " + requestid+" and groupdetailid="+temp_groupdetailid);
+								}
+							}
+						}*/
+                    }
+                }
+            }
+            if (!nextnodeattribute.equals("2") || !nodeattribute.equals("2")) {
+                tempoperatorsht.put("" + tempGroupId, tempoperators);
+            } else {
+                tempoperatorsht.put("" + tempGroupId * -1, tempoperators);
+            }
+        }
+        if (operators.size() > 0) {
+            tempGroupId = tempGroupId + 1;
+            tempoperatorsht.put("" + tempGroupId, operators);
+        }
+        if (tempoperatorsht.isEmpty())
+            return false;
+        else {
+            operatorsht = tempoperatorsht;
+            return true;
+        }
+    }
+
+    private boolean getCurrentNodeType() {
+        rs.executeSql("select a.* from workflow_groupdetail a , workflow_nodegroup b " +
+                " where a.groupid = b.id and b.nodeid = " + this.nodeid);
+        while (rs.next()) {                       // 操作组循环
+            int type = rs.getInt("type");
+            int level = rs.getInt("level_n");
+            int signorder = rs.getInt("signorder");
+
+            if (WFPathUtil.isContinuousProcessing(type) && signorder == 2) {
+                rs.executeSql("select status from workflow_requestbase where requestid = " + requestid);
+                if (rs.next()) linkname = Util.null2String(rs.getString("status"));
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    //定义按姓名拼音首字符排序
+
+    //deleted by xwj for td2461 20051111
+
+    /*------added by xwj for td2104 on 20050801  E N D -------*/
+
+    /*------added by xwj for td2104 on 20050801  B E G I N -------*/
+    private String[] getHrmStrs(int type, int level, String str) {
+        String[] tempStrs = null;
+        if ((type == 5 || type == 43) && (level == 1 || level == 3 || level == 4)) {
+            tempStrs = Util.TokenizerString2(str, ",");
+        }
+        return tempStrs;
+    }
+
+    /**
+     * 定义按orderKey排序人员
+     *
+     * @param sql      取得人员的SQL
+     * @param orderKey 排序依据
+     * @return
+     */
+    private ArrayList roleOrderOperate(String sql, String orderKey) {
+        MultiHrmCompositorOrderBean orderBean = null;
+        ArrayList orderList = new ArrayList();
+        ArrayList orderList_ = null;
+        String[] roleidStrs = getHrmStrs(43, 1, orderKey);
+        RecordSet rs = new RecordSet();
+        rs.executeSql(sql);
+        if (rs.getCounts() != 0) {
+            while (rs.next()) {
+                int roleid = Util.getIntValue(rs.getString("roleid"), 0);
+                for (int i = 0; i < roleidStrs.length; i++) {
+                    if (roleid == Integer.parseInt(roleidStrs[i])) {
+                        orderBean = new MultiHrmCompositorOrderBean();
+                        orderBean.setCompositorOrder(i);
+                        orderBean.setHrmId(rs.getString("id"));
+                        orderList.add(orderBean);
+                    }
+                }
+            }
+            Collections.sort(orderList, new MultiHrmCompositorOrderComparator());
+            orderList_ = orderList;
+        } else {
+            orderList_ = new ArrayList();
+        }
+        return orderList_;
+
+    }
+
+    /**
+     * 获取自由流程的下一节点操作人
+     *
+     * @return
+     */
+    public boolean FreeWorkflowNextoperator() {
+        ArrayList Freeoperatorlist = Util.TokenizerString(Freeoperators, ",");
+        Hashtable tempoperatorsht = new Hashtable();
+        if (Freeoperatorlist.size() > 0) {
+            rs.executeProc("workflow_NodeType_Select", "" + workflowid + flag + nextnodeid);
+            if (rs.next())
+                nextnodetype = Util.null2String(rs.getString(1));
+            else {
+                JSONObject msgjson = new JSONObject();
+                try {
+                    msgjson.put("details", SystemEnv.getHtmlLabelName(126551, languageid));
+                } catch (JSONException e) {
+                    e.printStackTrace();
+                }
+                this.setMessagecontent(msgjson.toString());
+                return false;
+            }
+
+            WFManager wfManager = new WFManager();
+            wfManager.setWfid(workflowid);
+
+            try {
+                wfManager.getWfInfo();
+            } catch (Exception e1) {
+                e1.printStackTrace();
+            }
+            String isFree = wfManager.getIsFree();
+            String freewftype = wfManager.getFreewftype();   //自由流程的模式，1：简易模式，2：高级模式
+
+            rs.executeSql("select nodeattribute,passnum from workflow_nodebase where id=" + nextnodeid);
+            if (rs.next()) {
+                this.nextnodeattribute = Util.null2String(rs.getString("nodeattribute"));
+                this.passnum = rs.getInt("passnum");
+            }
+            if (nodeattribute.equals("2") && nextnodeattribute.equals("2")) {
+                rs.executeSql("select max(groupid) from workflow_currentoperator where requestid=" + this.requestid + " and nodeid=" + nodeid);
+                if (rs.next()) {
+                    tempGroupId = rs.getInt(1);
+                }
+            }
+            int groupdetailid = 0;
+            sql = "select id from workflow_groupdetail where groupid in(select id from workflow_nodegroup where nodeid=" + nextnodeid + ") order by orders, id";
+            rs.executeSql(sql);
+            if (rs.next()) {
+                groupdetailid = rs.getInt(1);
+            }
+            sql = "select * from workflow_NodeLink where nodeid=" + nodeid + " and destnodeid=" + nextnodeid + " order by nodepasstime ,id";
+            rs.executeSql(sql);
+            String lastnames = "";
+            if (rs.getCounts() > 0 || this.SubmitToNodeid > 0) {
+                if (rs.next()) {
+                    nextlinkid = rs.getInt("id");
+                    nextlinkname = Util.null2String(rs.getString("linkname"));
+                    ismustpasss = Util.null2String(rs.getString("ismustpass"));
+                } else {
+                    nextlinkid = -1;
+                    ismustpasss = "";
+                    rs.executeSql("select nodename from workflow_nodebase where id=" + SubmitToNodeid);
+                    if (rs.next()) {
+                        nextlinkname = Util.null2String(rs.getString("nodename"));
+                    } else {
+                        nextlinkname = "";
+                    }
+                }
+                if (FreeSigntype == 0) {//非会签
+                    tempGroupId = tempGroupId + 1;
+                    ArrayList operators = new ArrayList();
+                    for (int i = 0; i < Freeoperatorlist.size(); i++) {
+                        //验证用户是否离职
+                        String lastname = getLastnameByUserStatus(String.valueOf(Freeoperatorlist.get(i)));
+                        if (StringUtil.isNotNull(lastname)) {
+                            lastnames += lastname + "，";
+                        }
+                        operators.add(Freeoperatorlist.get(i) + "_0_" + groupdetailid + "_0");
+                    }
+                    if (operators.size() > 0) {
+                        tempoperatorsht.put("" + tempGroupId, operators);
+                    }
+                } else if (FreeSigntype == 1) {//会签
+                    for (int i = 0; i < Freeoperatorlist.size(); i++) {
+                        ArrayList operators = new ArrayList();
+                        //验证用户是否离职
+                        String lastname = getLastnameByUserStatus(String.valueOf(Freeoperatorlist.get(i)));
+                        if (StringUtil.isNotNull(lastname)) {
+                            lastnames += lastname + "，";
+                        }
+
+                        operators.add(Freeoperatorlist.get(i) + "_0_" + groupdetailid + "_0");
+                        tempGroupId = tempGroupId + 1;
+                        if (!nextnodeattribute.equals("2") || !nodeattribute.equals("2")) {
+                            tempoperatorsht.put("" + tempGroupId, operators);
+                        } else {
+                            tempoperatorsht.put("" + tempGroupId * -1, operators);
+                        }
+                    }
+                } else if (FreeSigntype == 2) {//逐个处理
+                    for (int i = 0; i < Freeoperatorlist.size(); i++) {
+                        ArrayList operators = new ArrayList();
+                        if (nextnodeid != nodeid) {
+                            //验证用户是否离职
+                            String lastname = getLastnameByUserStatus(String.valueOf(Freeoperatorlist.get(i)));
+                            if (StringUtil.isNotNull(lastname)) {
+                                lastnames += lastname + "，";
+                            }
+
+                            operators.add("" + Freeoperatorlist.get(i) + "_0" + "_" + groupdetailid + "_0");
+                            String tempStr = "";
+                            for (int k = i + 1; k < Freeoperatorlist.size(); k++) {
+                                tempStr += Freeoperatorlist.get(k) + ",";
+                            }
+                            rs.executeSql("delete from workflow_agentpersons where requestid=" + requestid + " and  (groupdetailid=" + groupdetailid + " or groupdetailid is null)");//groupdetailid is null主要为了兼容老的数据
+                            rs.executeSql("insert into workflow_agentpersons (requestid, receivedpersons, groupdetailid,coadjutants) values (" + requestid + ",'" + tempStr.trim() + "'," + groupdetailid + ",'')");
+                            if (!nextnodeattribute.equals("2") || !nodeattribute.equals("2"))
+                                tempGroupId = tempGroupId + 1;
+                            tempoperatorsht.put("" + tempGroupId, operators);
+                            break;
+                        } else {
+                            rs.executeSql("select * from workflow_agentpersons where requestid = " + requestid + " and groupdetailid=" + groupdetailid);
+                            boolean flags = false;
+                            boolean flago = false;  //考虑老的数据
+                            if (rs.next()) flags = true;
+                            if (!flags) {
+                                rs.executeSql("select * from workflow_agentpersons where requestid = " + requestid);  //考虑以前的数据加上该判断
+                                if (rs.next()) flago = true;
+                            }
+                            if (flags || flago) {
+                                String receivePersions = rs.getString("receivedPersons");
+                                String coadjutants = Util.null2String(rs.getString("coadjutants"));
+                                if (!"".equals(receivePersions)) {
+                                    String nextoperator = receivePersions.substring(0, receivePersions.indexOf(","));
+                                    String lastname = getLastnameByUserStatus(nextoperator);
+                                    addWfInterventionMsg(nextoperator);
+
+                                    operators.add("" + nextoperator + "_0" + "_" + groupdetailid + "_0");
+                                    int idx = coadjutants.indexOf(",");
+                                    if (idx > 0) {
+                                        int tempcoadjutant = Util.getIntValue(coadjutants.substring(0, idx));
+                                        if (tempcoadjutant > 0 && operators.indexOf("" + tempcoadjutant + "_0" + "_" + groupdetailid + "_-5") == -1 && operators.indexOf("" + tempcoadjutant + "_0" + "_" + groupdetailid + "_0") == -1) {
+                                            operators.add("" + tempcoadjutant + "_0" + "_" + groupdetailid + "_-5");
+                                            hasCoadjutant = true;
+                                        }
+                                    }
+                                    if (flago)
+                                        rs.executeSql("update workflow_agentpersons set receivedPersons = '" + receivePersions.substring(receivePersions.indexOf(",") + 1, receivePersions.length()) + "',coadjutants='" + coadjutants.substring(idx + 1, coadjutants.length()) + "' where requestid = " + requestid);
+                                    else if (flags)
+                                        rs.executeSql("update workflow_agentpersons set receivedPersons = '" + receivePersions.substring(receivePersions.indexOf(",") + 1, receivePersions.length()) + "',coadjutants='" + coadjutants.substring(idx + 1, coadjutants.length()) + "' where requestid = " + requestid + " and groupdetailid=" + groupdetailid);
+                                    if (!nextnodeattribute.equals("2") || !nodeattribute.equals("2"))
+                                        tempGroupId = tempGroupId + 1;
+                                    tempoperatorsht.put("" + tempGroupId, operators);
+                                    break;
+                                }
+                            }
+                        }
+                    }
+                }
+                if (tempoperatorsht.isEmpty()) {
+                    int isroutedit = getFreeNodeIsroutedit();
+                    if ("0".equals(nodetype)) {
+                        isroutedit = 2;
+                    }
+                    String attr = "";
+                    if (isroutedit > 1) {
+                        attr = "，" + SystemEnv.getHtmlLabelName(126549, languageid) + WorkflowRequestMessage.getBoldDetailInfo(SystemEnv.getHtmlLabelName(21781, languageid)) + SystemEnv.getHtmlLabelName(126550, languageid);
+                    }
+                    String messageInfo = SystemEnv.getHtmlLabelName(126548, languageid) + attr;
+                    if (StringUtil.isNotNull(lastnames)) {
+                        lastnames = lastnames.substring(0, lastnames.length() - 1);
+                        messageInfo = SystemEnv.getHtmlLabelName(124958, languageid) + WorkflowRequestMessage.getBoldDetailInfo(lastnames) + SystemEnv.getHtmlLabelName(126527, languageid) + attr;
+                    }
+                    JSONObject msgInfo = null;
+                    if ("0".equals(nodetype) || isroutedit > 1) {
+                        msgInfo = new JSONObject();
+                        try {
+                            msgInfo.put("details", messageInfo);
+                        } catch (JSONException e) {
+                            e.printStackTrace();
+                        }
+                    } else {
+                        msgInfo = WorkflowRequestMessage.getBottomInfo(messageInfo, requestid, WorkflowRequestMessage.WF_INVERVENTION);
+                    }
+                    this.setMessagecontent(msgInfo.toString());
+                    return false;
+                }
+
+                operatorsht = tempoperatorsht;
+                return true;
+            }
+            if (isreject == 1) {//自由流程退回
+                nextlinkid = 0;
+                nextlinkname = "退回";
+                ismustpasss = "";
+                if (FreeSigntype == 0) {//非会签
+                    tempGroupId = tempGroupId + 1;
+                    ArrayList operators = new ArrayList();
+                    for (int i = 0; i < Freeoperatorlist.size(); i++) {
+                        operators.add(Freeoperatorlist.get(i) + "_0_" + groupdetailid + "_0");
+                    }
+                    tempoperatorsht.put("" + tempGroupId, operators);
+                } else if (FreeSigntype == 1) {//会签
+                    for (int i = 0; i < Freeoperatorlist.size(); i++) {
+                        ArrayList operators = new ArrayList();
+                        operators.add(Freeoperatorlist.get(i) + "_0_" + groupdetailid + "_0");
+                        tempGroupId = tempGroupId + 1;
+                        if (!nextnodeattribute.equals("2") || !nodeattribute.equals("2")) {
+                            tempoperatorsht.put("" + tempGroupId, operators);
+                        } else {
+                            tempoperatorsht.put("" + tempGroupId * -1, operators);
+                        }
+                    }
+                } else if (FreeSigntype == 2) {//逐个处理
+                    for (int i = 0; i < Freeoperatorlist.size(); i++) {
+                        ArrayList operators = new ArrayList();
+                        if (nextnodeid != nodeid) {
+                            operators.add("" + Freeoperatorlist.get(i) + "_0" + "_" + groupdetailid + "_0");
+                            String tempStr = "";
+                            for (int k = i + 1; k < Freeoperatorlist.size(); k++) {
+                                tempStr += Freeoperatorlist.get(k) + ",";
+                            }
+                            rs.executeSql("delete from workflow_agentpersons where requestid=" + requestid + " and  (groupdetailid=" + groupdetailid + " or groupdetailid is null)");//groupdetailid is null主要为了兼容老的数据
+                            rs.executeSql("insert into workflow_agentpersons (requestid, receivedpersons, groupdetailid,coadjutants) values (" + requestid + ",'" + tempStr.trim() + "'," + groupdetailid + ",'')");
+                            if (!nextnodeattribute.equals("2") || !nodeattribute.equals("2"))
+                                tempGroupId = tempGroupId + 1;
+                            tempoperatorsht.put("" + tempGroupId, operators);
+                            break;
+                        } else {
+                            rs.executeSql("select * from workflow_agentpersons where requestid = " + requestid + " and groupdetailid=" + groupdetailid);
+                            boolean flags = false;
+                            boolean flago = false;  //考虑老的数据
+                            if (rs.next()) flags = true;
+                            if (!flags) {
+                                rs.executeSql("select * from workflow_agentpersons where requestid = " + requestid);  //考虑以前的数据加上该判断
+                                if (rs.next()) flago = true;
+                            }
+                            if (flags || flago) {
+                                String receivePersions = rs.getString("receivedPersons");
+                                String coadjutants = Util.null2String(rs.getString("coadjutants"));
+                                if ("1".equals(isFree) && "1".equals(freewftype)) {   //简易模式，退回到同一节点的上一操作者
+                                    FreeWorkflowSimple freeWorkflowSimple = new FreeWorkflowSimple();
+                                    String tempuser = freeWorkflowSimple.getRejectUserId(requestid, nextnodeid, userid, usertype);
+                                    operators.add(tempuser + "_0_" + groupdetailid + "_0");
+
+                                    String receivePersions2 = "";
+                                    if (!"".equals(receivePersions)) {
+                                        receivePersions2 = userid + "," + receivePersions + ",";
+                                    } else {
+                                        receivePersions2 = String.valueOf(userid) + ",";
+                                    }
+
+                                    String coadjutants2 = "";
+                                    if (!"".equals(coadjutants)) {
+                                        coadjutants2 = "-1," + coadjutants;
+                                    } else {
+                                        coadjutants2 = "-1";
+                                    }
+
+                                    if (flago) {
+                                        rs.executeSql("update workflow_agentpersons set receivedPersons = '" + receivePersions2 + "',coadjutants='" + coadjutants2 + "' where requestid = " + requestid);
+                                    } else if (flags) {
+                                        rs.executeSql("update workflow_agentpersons set receivedPersons = '" + receivePersions2 + "',coadjutants='" + coadjutants2 + "' where requestid = " + requestid + " and groupdetailid=" + groupdetailid);
+                                    }
+                                    if (!nextnodeattribute.equals("2") || !nodeattribute.equals("2")) {
+                                        tempGroupId = tempGroupId + 1;
+                                    }
+                                    tempoperatorsht.put("" + tempGroupId, operators);
+                                    break;
+                                } else {
+                                    //自由流程，高级模式
+                                    if (!"".equals(receivePersions)) {
+                                        operators.add("" + receivePersions.substring(0, receivePersions.indexOf(",")) + "_0" + "_" + groupdetailid + "_0");
+                                        int idx = coadjutants.indexOf(",");
+                                        if (idx > 0) {
+                                            int tempcoadjutant = Util.getIntValue(coadjutants.substring(0, idx));
+                                            if (tempcoadjutant > 0 && operators.indexOf("" + tempcoadjutant + "_0" + "_" + groupdetailid + "_-5") == -1 && operators.indexOf("" + tempcoadjutant + "_0" + "_" + groupdetailid + "_0") == -1) {
+                                                operators.add("" + tempcoadjutant + "_0" + "_" + groupdetailid + "_-5");
+                                            }
+                                        }
+                                        if (flago)
+                                            rs.executeSql("update workflow_agentpersons set receivedPersons = '" + receivePersions.substring(receivePersions.indexOf(",") + 1, receivePersions.length()) + "',coadjutants='" + coadjutants.substring(idx + 1, coadjutants.length()) + "' where requestid = " + requestid);
+                                        else if (flags)
+                                            rs.executeSql("update workflow_agentpersons set receivedPersons = '" + receivePersions.substring(receivePersions.indexOf(",") + 1, receivePersions.length()) + "',coadjutants='" + coadjutants.substring(idx + 1, coadjutants.length()) + "' where requestid = " + requestid + " and groupdetailid=" + groupdetailid);
+                                        if (!nextnodeattribute.equals("2") || !nodeattribute.equals("2"))
+                                            tempGroupId = tempGroupId + 1;
+                                        tempoperatorsht.put("" + tempGroupId, operators);
+                                        break;
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+                operatorsht = tempoperatorsht;
+                return true;
+            }
+        }
+        return false;
+    }
+
+    private int getFreeNodeIsroutedit() {
+        RecordSet temprs = new RecordSet();
+        temprs.executeQuery("select isroutedit from workflow_freeright where nodeid = ?", nodeid);
+        if (temprs.next()) {
+            return Util.getIntValue(temprs.getString("isroutedit"), 0);
+        }
+        return 0;
+    }
+
+    /**
+     * 获取退回节点Manager的值
+     *
+     * @param requestid  流程id
+     * @param nextnodeid 退回的节点
+     * @return
+     */
+    private String getRjtNodeMgrVal(int requestid, int nextnodeid) {
+        String mgrVal = "-1";
+        //操作日期
+        String tempoperatedate = "";
+        //操作时间
+        String tempoperatetime = "";
+        //操作者id
+        int tempUserid = -1;
+        //操作者上级
+        int tempManagerid = -1;
+        //操作组（会签不相同，飞会签相同）
+        int tempGroupId = -1;
+        //查询退回节点的前一个节点的操作人
+        String tempsql = "select userid, operatedate, operatetime from workflow_currentoperator " +
+                "where nodeid in (select nodeid from workflow_nodelink nl ,workflow_nodebase nd where nd.id = nl.nodeid and destnodeid = " + nextnodeid + " AND (nl.isreject is null or nl.isreject <> '1') and nodeid <> " + nextnodeid + ") " +
+                "and requestid=" + requestid + " and preisremark=0 AND isremark=2 and operatedate is not null and operatetime is not null order by operatedate, operatetime, groupid desc ";
+
+        RecordSet rs_manager = new RecordSet();
+
+        rs_manager.executeSql(tempsql);
+
+        if (rs_manager.next()) {
+            tempUserid = Util.getIntValue(rs_manager.getString("userid"), -1);
+            tempoperatedate = Util.null2String(rs_manager.getString("operatedate"));
+            tempoperatetime = Util.null2String(rs_manager.getString("operatetime"));
+        }
+
+        if (tempUserid != -1) {
+            rs_manager.executeSql("SELECT managerid FROM HrmResource WHERE id=" + tempUserid);
+            if (rs_manager.next()) {
+                tempManagerid = Util.getIntValue(rs_manager.getString("managerid"), -1);
+            }
+        }
+        if (tempManagerid != -1) {
+            mgrVal = String.valueOf(tempManagerid);
+        }
+
+        //出口为本节点（不为退回出口）
+        tempsql = "select nodeid from workflow_nodelink nl ,workflow_nodebase nd where nd.id=nl.nodeid and destnodeid=" + nextnodeid + " and (nl.isreject is null or nl.isreject <> '1') and nodeid=" + nextnodeid;
+        rs_manager.executeSql(tempsql);
+        //不存在循环节点的情况，此manager为最终manager
+        if (!rs_manager.next()) {
+            return mgrVal;
+        }
+
+        while (true) {
+            tempsql = "select userid, groupid, operatedate, operatetime from workflow_currentoperator where requestid=" + requestid
+                    + " AND preisremark = '0' "
+                    + " AND isremark = '2' "
+                    + " AND nodeid=" + nextnodeid
+                    + " AND userid=" + tempManagerid
+                    + " AND receivedate >= '" + tempoperatedate + "' "
+                    + " AND receivetime >= '" + tempoperatetime + "'"
+                    + " and groupid>" + tempGroupId
+                    + " order by operatedate, operatetime, groupid desc";
+
+            rs_manager.executeSql(tempsql);
+
+            if (rs_manager.next()) {
+                tempUserid = Util.getIntValue(rs_manager.getString("userid"), -1);
+                tempGroupId = Util.getIntValue(rs_manager.getString("groupid"), -1);
+                tempoperatedate = Util.null2String(rs_manager.getString("operatedate"));
+                tempoperatetime = Util.null2String(rs_manager.getString("operatetime"));
+
+                if (tempUserid != -1) {
+                    rs_manager.executeSql("select managerid from hrmresource where id=" + tempUserid);
+                    if (rs_manager.next()) {
+                        tempManagerid = Util.getIntValue(rs_manager.getString("managerid"), -1);
+                    }
+                }
+            } else {
+                mgrVal = String.valueOf(tempUserid);
+                break;
+            }
+        }
+
+        return mgrVal;
+    }
+
+    /**
+     * 根据被代理人与流程编号查询代理人编号
+     * add by liao dong for qc56835 in 2013年10月21日
+     *
+     * @param userId 被代理人
+     * @param wfid   流程编号
+     * @return
+     */
+    public String getAgentTypeByUserId(String userId, String wfid) {
+        String agenterId = "";
+        wfAgentCondition wfAgentCondition = new wfAgentCondition();
+        String versionsIds = WorkflowVersion.getAllVersionStringByWFIDs(wfid);
+        versionsIds = "'" + StringUtils.replace(versionsIds, ",", "','") + "'";
+        String agentCheckSql = " select * from workflow_agentConditionSet where workflowId in (" + versionsIds + ") and bagentuid=" + userId +
+                " and agenttype = '1'   and isproxydeal='1' " +
+                " and ( ( (endDate = '" + TimeUtil.getCurrentDateString() + "' and (endTime='' or endTime is null))" +
+                " or (endDate = '" + TimeUtil.getCurrentDateString() + "' and endTime > '" + (TimeUtil.getCurrentTimeString()).substring(11, 19) + "' ) ) " +
+                " or endDate > '" + TimeUtil.getCurrentDateString() + "' or endDate = '' or endDate is null)" +
+                " and ( ( (beginDate = '" + TimeUtil.getCurrentDateString() + "' and (beginTime='' or beginTime is null))" +
+                " or (beginDate = '" + TimeUtil.getCurrentDateString() + "' and beginTime < '" + (TimeUtil.getCurrentTimeString()).substring(11, 19) + "' ) ) " +
+                " or beginDate < '" + TimeUtil.getCurrentDateString() + "' or beginDate = '' or beginDate is null)  order by agentbatch asc ";
+        rs.execute(agentCheckSql);
+        while (rs.next()) {
+            String agentid = rs.getString("agentid");
+            String conditionkeyid = rs.getString("conditionkeyid");
+            //检查当前流程下的代理是否支持批次条件【开启流程中的代理、已经是流转中的、批次条件满足】
+            boolean isagentcond = wfAgentCondition.isagentcondite("" + requestid, "" + workflowid, "" + userId, "" + agentid, "" + conditionkeyid);
+            if (isagentcond) {
+                agenterId = rs.getString("agentuid");
+                break;
+            }
+        }
+        return agenterId;
+    }
+
+    /**
+     * 使用代理的时候，穿透的manager节点应该去穿透节点的manager值
+     * add by liao dong for qc56835 in 2013年10月23日
+     *
+     * @param nodeUserId     被穿透的节点操作编号
+     * @param isbillParam    表单类型
+     * @param formIdParam    表单编号
+     * @param requestidParam 请求编号
+     */
+    public void updateAgentManagerByUserId(String nodeUserId, int isbillParam, int formIdParam, int requestidParam) {
+        String billtablename = "";
+        String oldManager = "";
+        try {
+            ResourceComInfo resource = new ResourceComInfo();
+            int _manager = Util.getIntValue(resource.getManagerID(nodeUserId), -1);
+
+            if (isbillParam == 1) {
+                rs.executeSql("select tablename from workflow_bill where id=" + formIdParam);
+                if (rs.next()) {
+                    billtablename = rs.getString("tablename");
+                }
+                rs.executeSql("select 1 from workflow_billfield where fieldname='manager' and  billid=" + formIdParam);
+                if (rs.next()) {
+                    if (!billtablename.trim().equals("")) {
+                        rs.executeSql("select manager from " + billtablename + " where requestid=" + requestid);
+                        if (rs.next()) {
+                            oldManager = rs.getString("manager");
+                        }
+                        if ("bill_approveproj".equals(billtablename.toLowerCase())) {
+                            rs.executeSql("update " + billtablename + " set manager = " + oldManager + " where requestid=" + requestidParam);
+                        } else {
+                            rs.executeSql("update " + billtablename + " set manager = " + _manager + " where requestid=" + requestidParam);
+                        }
+                    }
+                }
+            } else {
+                rs.executeSql("select 1 from workflow_formfield  a   join  workflow_formdict b  on   a.fieldid = b.id   where   b.fieldname='manager'  and a.formid = '" + formIdParam + "' ");
+                if (rs.next()) {
+                    rs.executeSql("select * from workflow_form where requestid=" + requestid);
+                    if (rs.next()) {
+                        oldManager = rs.getString("manager");
+                    }
+                    rs.executeSql("update workflow_form set manager = " + _manager + " where requestid=" + requestidParam);
+                }
+            }
+        } catch (Exception e) {
+            try {
+                if (isbillParam == 1) {
+                    if (!billtablename.trim().equals("")) {
+                        rs.executeSql("update " + billtablename + " set manager = " + oldManager + " where requestid=" + requestidParam);
+                    }
+                } else {
+                    rs.executeSql("update workflow_form set manager = " + oldManager + " where requestid=" + requestidParam);
+                }
+            } catch (Exception ex) {
+                // System.out.println("使用代理的时候，穿透的manager节点应该去穿透节点的manager值有误"+ex.getMessage());
+            }
+
+        }
+    }
+
+    /**
+     * 获取各类型拼装的sql
+     *
+     * @param type
+     * @param signorder
+     * @param level
+     * @param level2
+     * @param objid
+     * @param rsTemps
+     * @param statustr
+     * @param subcompanyField
+     * @param deptField
+     * @return returnStrs[0] = sql;
+     * returnStrs[1] = subcompanyFieldFlag;
+     * returnStrs[2] = deptFieldFlag;
+     * returnStrs[3] = theorderbyordervalue;
+     */
+    protected String[] getHrmSqlByType(RecordSet rs2, RecordSet rsTemps, int objid, int type, int signorder, int level, int level2, String supsubcompanyid, String thesubcompanyid, String thedepartmentid, String statustr, String subcompanyField, String deptField, String groupdetailid, int virtualid, String jobobj, String jobfield) {
+        String returnStrs[] = new String[4];
+        String sql = "";
+        String subcompanyFieldFlag = "";
+        String deptFieldFlag = "";
+        String theorderbyordervalue = "";
+        String sqlfrom = "HrmResource";
+        String sqlfromdepart = "HrmDepartment";
+        String sqlfromSubCompany = "HrmSubCompany";
+        String sqlwhere = "";
+        HrmCommonService hrmCommonService = null;
+
+        if (virtualid < -1) {//如果是虚拟维度，则初始化相应查询表
+            sqlfrom = "HrmResourceVirtualView";//虚拟维度人力资源视图
+            sqlfromdepart = "HrmDepartmentAllView";//虚拟维度部门视图
+            sqlfromSubCompany = "HrmSubCompanyAllView";//虚拟维度分部视图
+            thedepartmentid = "-1";//初始默认部门-1，表示为空
+            thesubcompanyid = "-1";//初始默认分部-1，表示为空
+            RecordSet rsvirtual = new RecordSet();
+            rsvirtual.executeSql("select departmentid,subcompanyid1 from HrmResourceVirtualView where id =" + creater);
+            while (rsvirtual.next()) {
+                if ("-1".equals(thedepartmentid)) {
+                    thedepartmentid = rsvirtual.getString("departmentid");
+                    thesubcompanyid = rsvirtual.getString("subcompanyid1");
+                } else {
+                    thedepartmentid += "," + rsvirtual.getString("departmentid");
+                    thesubcompanyid += "," + rsvirtual.getString("subcompanyid1");
+                }
+            }
+            sqlwhere = " and virtualtype = " + virtualid;
+        }
+        switch (type) {
+            case 30:               //分部
+                sql = "select id,0 as customerid from " + sqlfrom + " where subcompanyid1 = " + objid + " and seclevel >= " + level + " and seclevel <= " + level2 + " and status in ( " + statustr + " )  order by seclevel asc, dsporder  asc ";
+                break;
+            case 1:                 // 部门
+                sql = "select id,0 as customerid from " + sqlfrom + " where departmentid = " + objid + " and seclevel >= " + level + " and seclevel <= " + level2 + " and status in ( " + statustr + "  )  order by seclevel asc, dsporder  asc ";
+                break;
+            case 2:                 // 角色
+				/*
+				sql = "SELECT a.resourceid as id,0 as customerid FROM HrmRoleMembers a, hrmresource b where a.roleid = " + objid + " and a.rolelevel = " + level
+						+ " and a.resourceid = b.id and (a.rolelevel=2 or ( a.rolelevel=1 and b.subcompanyid1=" + thesubcompanyid
+						+ " ) or ( a.rolelevel=0 and b.departmentid =" + thedepartmentid + ") )  and b.status in ( "+statustr+"  ) ";
+				*/
+                //TD10029 chujun
+                hrmCommonService = new HrmCommonServiceImpl();
+                String roleMemberQuerySql = hrmCommonService.getHrmRoleMemeberSqlByRoleIds(Util.null2String(objid));
+                if (level == 1) {//分部
+                    sql = " select a.resourceid as id,0 as customerid,a.id as idorder,dsporder from (" + roleMemberQuerySql + ") a,hrmresource b where a.resourceid = b.id and  b.subcompanyid1=" + thesubcompanyid + " and b.status in ( " + statustr + " ) and a.rolelevel = 1 order by idorder asc,dsporder asc,id asc ";
+                } else if (level == 2) {//总部
+                    sql += " select a.resourceid as id,0 as customerid,dsporder,a.id as idorder  from (" + roleMemberQuerySql + ") a,hrmresource b where a.resourceid = b.id and b.status in ( " + statustr + "  ) and a.rolelevel = 2 ";
+                    sql += " union all ";
+                    sql += " select a.resourceid as id,0 as customerid,0 as dsporder,a.id as idorder from (" + roleMemberQuerySql + ") a, hrmresourcemanager b where a.resourceid = b.id and b.status in ( " + statustr + " ) and a.rolelevel = 2 order by  idorder asc,dsporder asc,id asc";
+                } else if (level == 3) {//上级分部
+                    sql = " select a.resourceid as id,0 as customerid,a.id as idorder,dsporder from (" + roleMemberQuerySql + ") a, hrmresource b where a.resourceid = b.id and b.subcompanyid1=" + supsubcompanyid + " and b.status in ( " + statustr + "  ) and a.rolelevel = 1 order by  idorder asc,dsporder asc,id asc ";
+                } else {//部门
+                    sql = " select a.resourceid as id,0 as customerid,a.id as idorder,dsporder from (" + roleMemberQuerySql + ") a, hrmresource b where a.resourceid = b.id and b.departmentid =" + thedepartmentid + " and b.status in ( " + statustr + "  ) and a.rolelevel = 0 order by  idorder asc,dsporder asc,id asc ";
+                }
+                break;
+            case 3:                 // 人力资源
+                //sql = "select id,0 as customerid from "+sqlfrom+" where id  in (" + wfoper.getHrmOperator(groupdetailid) + ") and status in ( "+statustr+"  ) ";
+                sql = " select t2.objid as id,0 as customerid from Workflow_HrmOperator t2 where  t2.groupdetailid='" + groupdetailid + "'  and exists(select 1 from HrmResource t where t.id=t2.objid and    t.status in ( " + statustr + "  )  ) order by t2.orders asc ";
+
+                break;
+            case 4:                 // 所有人
+                sql = "select id,0 as customerid from HrmResource where seclevel >= " + level + " and seclevel <= " + level2 + " and status in ( " + statustr + "  )  order by  dsporder  asc ";
+                break;
+            case 58:                 // 岗位
+                if (level == 0) {
+                    //sql = "select id,0 as customerid from HrmResourceVirtualView where jobtitle in("+jobobj+") and (departmentid in("+jobfield+") or hrmdepartmentid in ("+jobfield+")) and status in ( "+statustr+" )  order by  dsporder  asc ";
+                    if (rs.getDBType().equals("oracle")) {
+                        sql = "select id,0 as customerid from HrmResource  where jobtitle in(" + jobobj + ") and (departmentid in(" + jobfield + ") " +
+                                " or exists( select 1 from HrmResourceVirtual where HrmResource.ID = HrmResourceVirtual.RESOURCEID AND HrmResourceVirtual.departmentid in(" + jobfield + ") )) and status in ( " + statustr + " )  " +
+                                " order by instr(cast(" + jobobj + " AS varchar(4000)),jobtitle),dsporder  asc ";
+                    } else if (rs.getDBType().equals("postgresql")) {
+                        sql = "select id,0 as customerid from HrmResource  where jobtitle in(" + jobobj + ") and (departmentid in(" + jobfield + ") " +
+                                " or exists( select 1 from HrmResourceVirtual where HrmResource.ID = HrmResourceVirtual.RESOURCEID AND HrmResourceVirtual.departmentid in(" + jobfield + ") )) and status in ( " + statustr + " )  " +
+                                " order by instr(cast(" + jobobj + " AS varchar(4000)),jobtitle),dsporder  asc ";
+                    } else if (rs.getDBType().equals("mysql")) {
+                        sql = "select id,0 as customerid from HrmResource  where jobtitle in(" + jobobj + ") and (departmentid in(" + jobfield + ") " +
+                                " or exists( select 1 from HrmResourceVirtual where HrmResource.ID = HrmResourceVirtual.RESOURCEID AND HrmResourceVirtual.departmentid in(" + jobfield + ") )) and status in ( " + statustr + " )  " +
+                                " order by  instr(CONCAT(',',CONCAT(jobtitle,''), ','),'," + jobobj + ",'),dsporder  asc ";
+                    } else {
+                        sql = "select id,0 as customerid from HrmResource  where jobtitle in(" + jobobj + ") and (departmentid in(" + jobfield + ") " +
+                                " or exists( select 1 from HrmResourceVirtual where HrmResource.ID = HrmResourceVirtual.RESOURCEID AND HrmResourceVirtual.departmentid in(" + jobfield + ") )) and status in ( " + statustr + " )  " +
+                                " order by  charindex(','+ cast(jobtitle AS varchar(4000)) +',', '," + jobobj + ",'),dsporder  asc ";
+                    }
+
+                } else if (level == 1) {
+                    //sql = "select id,0 as customerid from HrmResourceVirtualView where jobtitle in("+jobobj+") and (subcompanyid1 in("+jobfield+") or hrmsubcompanyid1 in ("+jobfield+")) and status in ( "+statustr+" )  order by  dsporder  asc ";
+                    if (rs.getDBType().equals("oracle")) {
+                        sql = "select id,0 as customerid from HrmResource  where jobtitle in(" + jobobj + ") and (subcompanyid1 in(" + jobfield + ")   " +
+                                " or exists( select 1 from HrmResourceVirtual where HrmResource.ID = HrmResourceVirtual.RESOURCEID AND HrmResourceVirtual.subcompanyid in(" + jobfield + ") )) and status in ( " + statustr + " )" +
+                                " order by instr(cast(" + jobobj + " AS varchar(4000)),jobtitle),dsporder  asc ";
+                    } else if (rs.getDBType().equals("postgresql")) {
+                        sql = "select id,0 as customerid from HrmResource  where jobtitle in(" + jobobj + ") and (subcompanyid1 in(" + jobfield + ")   " +
+                                " or exists( select 1 from HrmResourceVirtual where HrmResource.ID = HrmResourceVirtual.RESOURCEID AND HrmResourceVirtual.subcompanyid in(" + jobfield + ") )) and status in ( " + statustr + " )" +
+                                " order by instr(cast(" + jobobj + " AS varchar(4000)),jobtitle),dsporder  asc ";
+                    } else if (rs.getDBType().equals("mysql")) {
+                        sql = "select id,0 as customerid from HrmResource  where jobtitle in(" + jobobj + ") and (subcompanyid1 in(" + jobfield + ")   " +
+                                " or exists( select 1 from HrmResourceVirtual where HrmResource.ID = HrmResourceVirtual.RESOURCEID AND HrmResourceVirtual.subcompanyid in(" + jobfield + ") )) and status in ( " + statustr + " )" +
+                                " order by  instr(CONCAT(',',CONCAT(jobtitle,''), ','),'," + jobobj + ",'),dsporder  asc ";
+                    } else {
+                        sql = "select id,0 as customerid from HrmResource  where jobtitle in(" + jobobj + ") and (subcompanyid1 in(" + jobfield + ")   " +
+                                " or exists( select 1 from HrmResourceVirtual where HrmResource.ID = HrmResourceVirtual.RESOURCEID AND HrmResourceVirtual.subcompanyid in(" + jobfield + ") )) and status in ( " + statustr + " )" +
+                                " order by  charindex(','+ cast(jobtitle AS varchar(4000)) +',', '," + jobobj + ",'),dsporder  asc ";
+                    }
+                } else {
+                    if (rs.getDBType().equals("oracle")) {
+                        sql = "select id,0 as customerid from HrmResource where jobtitle in(" + jobobj + ") and status in ( " + statustr + "  )  order by instr(cast(" + jobobj + " AS varchar(4000)),jobtitle),dsporder  asc  ";
+                    } else if (rs.getDBType().equals("postgresql")) {
+                        sql = "select id,0 as customerid from HrmResource where jobtitle in(" + jobobj + ") and status in ( " + statustr + "  )  order by instr(cast(" + jobobj + " AS varchar(4000)),jobtitle),dsporder  asc  ";
+                    } else if (rs.getDBType().equals("mysql")) {
+                        sql = "select id,0 as customerid from HrmResource where jobtitle in(" + jobobj + ") and status in ( " + statustr + "  )  order by  instr(CONCAT(',',CONCAT(jobtitle,''), ','),'," + jobobj + ",'),dsporder  asc ";
+                    } else {
+                        sql = "select id,0 as customerid from HrmResource where jobtitle in(" + jobobj + ") and status in ( " + statustr + "  )  order by  charindex(','+ cast(jobtitle AS varchar(4000)) +',', '," + jobobj + ",'),dsporder  asc ";
+                    }
+                }
+                break;
+            case 5:
+            case 49:
+            case 6:
+            case 7:
+            case 8:
+            case 9:
+            case 10:
+            case 11:
+            case 12:
+            case 13:
+            case 14:
+            case 15:
+            case 16:
+            case 23:
+            case 24:
+            case 31:
+            case 32:
+            case 33:
+            case 34:
+            case 35:
+            case 38:
+            case 42:
+            case 43:
+            case 44:
+            case 45:
+            case 46:
+            case 47:
+            case 48:
+            case 50:
+            case 52:
+            case 53:
+            case 54:
+            case 55:
+            case 56:
+            case 57:
+            case 51:
+            case 59://人力资源字段所属岗位
+            case 60://人力资源字段 岗位浏览按钮
+                String fieldname = "";
+                String fieldvalue = "";
+                String tablename = "";
+                String sql1 = "";
+                if (isbill == 0)
+                    rs2.executeSql("select fieldname,0 viewtype,0 groupid from workflow_formdict where id = " + objid + " union select fieldname,1 viewtype,groupid from  workflow_formdictdetail a,workflow_formfield b where a.id = b.fieldid and b.formid = " + formid + " and a.id = " + objid);
+                else
+                    rs2.executeSql("select fieldname,viewtype,detailtable from workflow_billfield where id =" + objid);
+
+                String viewtype = "";
+                if (rs2.next()) {
+                    fieldname = rs2.getString("fieldname");
+                    viewtype = rs2.getString("viewtype");
+                }
+
+                if (isbill == 0) {
+                    if ("1".equals(viewtype)) {
+                        String groupid = rs2.getString(3);
+                        rs2.executeSql("select " + fieldname + " from workflow_formdetail where requestid=" + requestid + " and groupid = " + groupid + " order by id asc");
+                    } else {
+                        rs2.executeSql("select " + fieldname + " from workflow_form where requestid=" + requestid);
+                    }
+                } else {
+                    if ("1".equals(viewtype)) {
+                        String detailtable = rs2.getString(3);
+                        rs2.execute("select " + fieldname + " from " + detailtable + " where mainid = " + billid + " order by id asc");
+                    } else
+                        rs2.executeSql("select " + fieldname + " from " + billtablename + " where id = " + billid);
+                }
+                cachefieldvalue = "";
+                List<String> resultList = new ArrayList<String>();
+                while (rs2.next()) {
+                    String tempValue = Util.null2String(rs2.getString(fieldname));
+                    List temp_list = Util.TokenizerString(tempValue, ",");
+                    for (Object o : temp_list) {
+                        String tempo = (String) o;
+                        if (!resultList.contains(tempo)) {
+                            resultList.add(tempo);
+                            fieldvalue += "," + tempo;
+                        }
+                    }
+                }
+                if (!"".equals(fieldvalue))
+                    fieldvalue = fieldvalue.substring(1);
+
+
+                cachefieldvalue = fieldvalue;
+                /*----------  xwj for td1966 begin---------*/
+                if ("manager".equals(fieldname) && this.isreject == 1) {
+                    String tempFieldValue = fieldvalue;
+
+                    RecordSet rs_new = new RecordSet();
+                    ArrayList arr = new ArrayList();
+                    rs_new.executeSql("select  distinct userid from workflow_currentoperator where requestid =" + requestid + " and nodeid=" + this.nextnodeid + " and isremark = '2'");
+
+                    while (rs_new.next()) {
+
+                        arr.add(rs_new.getString("userid"));
+
+                    }
+
+                    for (int i = 0; i < arr.size(); i++) {
+                        rs_new.executeSql("select managerid from hrmresource where id = " + (String) arr.get(i));
+                        rs_new.next();
+                        if (tempFieldValue.equals(rs_new.getString("managerid"))) {
+                            fieldvalue = (String) arr.get(i);
+                        }
+                    }
+                    String tempsql = "SELECT userid,agentorbyagentid,agenttype FROM workflow_currentoperator " +
+                            "WHERE nodeid IN (SELECT nodeid FROM workflow_nodelink nl ,workflow_nodebase nd WHERE nd.id = nl.nodeid AND destnodeid = " + nextnodeid + " AND (nl.isreject is null or nl.isreject <> '1') and nodeid <> " + nextnodeid + ") " +
+                            "AND requestid=" + requestid + " AND preisremark=0 AND isremark=2 AND operatedate IS NOT NULL AND operatetime IS NOT NULL ORDER BY groupid DESC ";
+
+                    RecordSet rs_manager = new RecordSet();
+
+                    rs_manager.executeSql(tempsql);
+                    int tempUserid = -1;
+                    int tempManagerid = -1;
+                    int agentorbyagentid = -1;
+                    int agenttype = -1;
+                    if (rs_manager.next()) {
+                        tempUserid = Util.getIntValue(rs_manager.getString("userid"), -1);
+                        agentorbyagentid = Util.getIntValue(rs_manager.getString("agentorbyagentid"), -1);
+                        agenttype = Util.getIntValue(rs_manager.getString("agenttype"), -1);
+                    }
+
+                    if (agenttype == 2) {
+                        if (agentorbyagentid != -1) {
+                            rs_manager.executeSql("SELECT managerid FROM HrmResource WHERE id=" + agentorbyagentid);
+                            if (rs_manager.next()) {
+                                tempManagerid = Util.getIntValue(rs_manager.getString("managerid"), -1);
+                            }
+                        }
+                    } else {
+                        if (tempUserid != -1) {
+                            rs_manager.executeSql("SELECT managerid FROM HrmResource WHERE id=" + tempUserid);
+                            if (rs_manager.next()) {
+                                tempManagerid = Util.getIntValue(rs_manager.getString("managerid"), -1);
+                            }
+                        }
+                    }
+                    if (tempManagerid != -1) {
+                        fieldvalue = String.valueOf(tempManagerid);
+                    }
+
+                }
+                /*----------  xwj for td1966 end---------*/
+                if (fieldvalue.equals("")) fieldvalue = "0";
+
+                switch (type) {
+                    case 51:                         //分部
+
+                        if (subcompanyField == null || "0".equals(subcompanyField) || "".equals(subcompanyField)) {//说明下拉框中选择的是安全级别
+
+                            sql = "select id,0 as customerid,subcompanyid1,seclevel,dsporder from HrmResource where  seclevel >= " + level + " and seclevel <= " + level2 + "  and subcompanyid1 in(" + fieldvalue + ")  and status in ( " + statustr + "  )";
+                            sql += " union select id,0 as customerid,subcompanyid1,seclevel,dsporder from HrmResourceVirtualView where  seclevel >= " + level + " and seclevel <= " + level2 + "  and subcompanyid1 in(" + fieldvalue + ")  and status in ( " + statustr + "  )";
+                            if (signorder == 2) {
+                                sql += " order by seclevel asc, dsporder  asc ";
+                            }
+                            subcompanyFieldFlag = "1";
+                            theorderbyordervalue = fieldvalue;
+                        } else {//说明下拉框中选择的是分部自定义字段 subcompanyField该字段存储值个格式id_fieldname_fieldlabel
+                            if (subcompanyField != null && !"".equals(subcompanyField)) {
+                                String[] tempStr = Util.TokenizerString2(subcompanyField, "[_]");
+                                if (tempStr != null && tempStr.length > 2) {
+                                    String subcompanyFieldId = tempStr[0];
+                                    String subcompanyFieldName = tempStr[1];
+                                    if (subcompanyFieldName != null && !"".equals(subcompanyFieldName)) {
+                                        sql = "select " + subcompanyFieldName + " as id,0 as customerid from HrmSubCompanyAllView where id in (" + fieldvalue + ")";
+                                        subcompanyFieldFlag = "2";
+                                    }
+                                }
+                            }
+                        }
+                        break;
+                    case 42:                         //部门
+
+                        if (deptField == null || "0".equals(deptField) || "".equals(deptField)) {//说明下拉框中选择的是安全级别
+                            sql = "select id,0 as customerid,departmentid,seclevel,dsporder from HrmResource where  seclevel >= " + level + " and seclevel <= " + level2 + "  and departmentid in(" + fieldvalue + ")  and status in ( " + statustr + "  ) and status<>5";
+                            sql += " union select id,0 as customerid,departmentid,seclevel,dsporder from HrmResourceVirtualView where  seclevel >= " + level + " and seclevel <= " + level2 + "  and departmentid in(" + fieldvalue + ")  and status in ( " + statustr + "  ) and status<>5";
+                            if (signorder == 2) {
+                                sql += " order by seclevel asc, dsporder  asc ";
+                            }
+                            deptFieldFlag = "1";
+                            theorderbyordervalue = fieldvalue;
+                        } else {//说明下拉框中选择的是部门自定义字段 deptField该字段存储值个格式id_fieldname_fieldlabel
+                            if (deptField != null && !"".equals(deptField)) {
+                                String[] tempStr = Util.TokenizerString2(deptField, "[_]");
+                                if (tempStr != null && tempStr.length > 2) {
+                                    String deptFieldId = tempStr[0];
+                                    String deptFieldName = tempStr[1];
+                                    if (deptFieldName != null && !"".equals(deptFieldName)) {
+                                        sql = "select " + deptFieldName + " as id,0 as customerid from HrmDepartmentAllView where id in (" + fieldvalue + ")";
+                                        deptFieldFlag = "2";
+                                    }
+                                }
+                            }
+                        }
+                        break;
+                    case 43:                         //角色
+                        hrmCommonService = new HrmCommonServiceImpl();
+                        String roleMemberQuerySQl = hrmCommonService.getHrmRoleMemeberSqlByRoleIds(fieldvalue);
+                        sql = "SELECT b.id as id,0 as customerid,a.rolelevel as rolelevel, a.roleid as roleid, a.id as idorder FROM (" + roleMemberQuerySQl + ") a, hrmresource b where a.resourceid = b.id and b.status in ( " + statustr + "  ) ";//xwj for td2104 on 20050802
+                        theorderbyordervalue = fieldvalue; //xwj for td2104 on 20050802
+                        break;
+                    case 44:                         //客户字段经理的经理
+                        sql = "SELECT c.id as id,0 as customerid FROM CRM_CustomerInfo a, hrmresource b,hrmresource c where a.manager = b.id and b.managerid=c.id and a.id in (" + fieldvalue + ") and b.status in ( " + statustr + "  ) and c.status in ( " + statustr + "  )";
+                        break;
+                    case 45:                         //客户字段分部
+                        sql = "select a.id,0 as customerid from HrmResource a,CRM_CustomerInfo b,HrmResource c where a.subcompanyid1=c.subcompanyid1 and b.manager=c.id and b.id=" + fieldvalue + " and a.status in ( " + statustr + "  ) and c.status in ( " + statustr + "  )";
+                        break;
+                    case 46:                         //客户字段部门
+                        sql = "select a.id,0 as customerid from HrmResource a,CRM_CustomerInfo b,HrmResource c where a.departmentid=c.departmentid and b.manager=c.id and b.id=" + fieldvalue + " and a.status in ( " + statustr + "  ) and c.status in ( " + statustr + "  )";
+                        break;
+                    case 47:                         //项目字段经理的经理
+                        sql = "SELECT c.id as id,0 as customerid FROM Prj_ProjectInfo a, hrmresource b,hrmresource c where a.manager = b.id and b.managerid=c.id and a.id in (" + fieldvalue + ") and b.status in ( " + statustr + "  ) and c.status in ( " + statustr + "  )";
+                        break;
+                    case 48:                         //会议室的管理员
+                        RecordSet rs_48 = new RecordSet();
+                        rs_48.execute("SELECT hrmids FROM MeetingRoom where id in (" + fieldvalue + ")");
+                        String hrmids = "";
+                        while (rs_48.next()) {
+                            String id = Util.null2String(rs_48.getString("hrmids"));
+                            if (id.startsWith(",")) {
+                                id = id.substring(1);
+                            }
+                            if (id.endsWith(",")) {
+                                id = id.substring(0, id.length() - 1);
+                            }
+                            id = id.trim();
+                            if (!"".equals(id)) {
+                                if (hrmids.equals("")) {
+                                    hrmids = id;
+                                } else {
+                                    hrmids += "," + id;
+                                }
+                            }
+                        }
+
+                        if (hrmids.equals(""))
+                            hrmids = "0";
+                        sql = "select id,0 as customerid from HrmResource where id in( " + hrmids + ")";
+                        break;
+                    case 5:                         // 人力资源字段本人
+                    case 50:
+                        //sql = "select id,0 as customerid from HrmResource where id in( " + fieldvalue + ") union select id,0 as customerid from HrmResourceManager where id in("+ fieldvalue + ")";
+                        String strsqlClause = Util.getSubINClause(fieldvalue, "id", "IN");
+                        sql = "select id,0 as customerid from HrmResource where " + strsqlClause + " union select id,0 as customerid from HrmResourceManager where " + strsqlClause;
+                        theorderbyordervalue = fieldvalue;
+                        break;
+                    case 6:                         // 人力资源字段经理
+                        strsqlClause = Util.getSubINClause(fieldvalue, "id", "IN");
+                        sql = "select managerid as id,0 as customerid from " + sqlfrom + " where " + strsqlClause + sqlwhere;
+                        break;
+                    case 59:                         // 人力资源字段所属岗位
+                        //--
+                        ArrayList<String> joblist = null;
+                        ResourceComInfo rc = null;
+                        DepartmentComInfo dc = null;
+                        String jobtitleid = "";//岗位id
+                        sqlwhere = "";
+                        try {
+                            rc = new ResourceComInfo();
+                            dc = new DepartmentComInfo();
+
+                            joblist = Util.TokenizerString(fieldvalue, ",");
+                            String subdeptids = "";//本部门及下级部门
+                            String surdept = "";//本部门及上级部门
+                            String subcomid = "";//本分部及下级分部
+                            String surcomid = "";//本分部及上级分部
+                            for (int job = 0; job < joblist.size(); job++) {
+                                //本部门
+                                String jobdepartmentid = "" + Util.getIntValue(rc.getDepartmentID(joblist.get(job)), 0);
+                                //本分部
+                                String jobsubcompanyid = "" + Util.getIntValue(dc.getSubcompanyid1(jobdepartmentid), 0);
+                                if (!"0".equals(jobdepartmentid) && !"0".equals(jobsubcompanyid)) {
+                                    jobtitleid = "" + Util.getIntValue(rc.getJobTitle(joblist.get(job)), 0);
+
+                                    //本部门及下级部门
+                                    subdeptids = "";
+                                    subdeptids = DepartmentComInfo.getAllChildDepartId(jobdepartmentid, subdeptids);
+                                    if (!"".equals(subdeptids)) {
+                                        subdeptids = jobdepartmentid + subdeptids;
+                                    } else {
+                                        subdeptids = jobdepartmentid;
+                                    }
+                                    //本部门及上级部门
+                                    surdept = "";
+                                    surdept = DepartmentComInfo.getAllParentDepartId(jobdepartmentid, surdept);
+                                    if (!"".equals(surdept)) {
+                                        surdept = jobdepartmentid + surdept;
+                                    } else {
+                                        surdept = jobdepartmentid;
+                                    }
+                                    //本分部及下级分部
+                                    subcomid = "";
+                                    subcomid = SubCompanyComInfo.getAllChildSubcompanyId(jobsubcompanyid, subcomid);
+                                    if (!"".equals(subcomid)) {
+                                        subcomid = jobsubcompanyid + subcomid;
+                                    } else {
+                                        subcomid = jobsubcompanyid;
+                                    }
+                                    //本分部及上级分部
+                                    surcomid = "";
+                                    surcomid = SubCompanyComInfo.getAllParentSubcompanyId(jobsubcompanyid, surcomid);
+                                    if (!"".equals(surcomid)) {
+                                        surcomid = jobsubcompanyid + surcomid;
+                                    } else {
+                                        surcomid = jobsubcompanyid;
+                                    }
+                                    //strsqlClause = Util.getSubINClause(jobtitleid, "jobtitle", "IN");
+
+                                    String subdeptidsClause = Util.getSubINClause(subdeptids, "departmentid", "IN");
+                                    String surdeptClause = Util.getSubINClause(surdept, "departmentid", "IN");
+                                    String subcomidClause = Util.getSubINClause(subcomid, "subcompanyid1", "IN");
+                                    String surcomidClause = Util.getSubINClause(surcomid, "subcompanyid1", "IN");
+
+                                    if (level == 0) {
+                                        if ("".equals(sqlwhere)) {
+                                            sqlwhere = " (jobtitle = " + jobtitleid + " )";
+                                        } else {
+                                            sqlwhere += " or (jobtitle = " + jobtitleid + " )";
+                                        }
+                                    } else if (level == 1) {
+                                        if ("".equals(sqlwhere)) {
+                                            sqlwhere = " ( jobtitle = " + jobtitleid + " and (departmentid in (" + jobdepartmentid + ") ))";
+                                        } else {
+                                            sqlwhere += " or ( jobtitle = " + jobtitleid + " and (departmentid in (" + jobdepartmentid + ") ))";
+                                        }
+                                    } else if (level == 2) {
+                                        if ("".equals(sqlwhere)) {
+                                            sqlwhere = " ( jobtitle = " + jobtitleid + " and ( " + subdeptidsClause + "))";
+                                        } else {
+                                            sqlwhere += " or ( jobtitle = " + jobtitleid + " and ( " + subdeptidsClause + "))";
+                                        }
+                                    } else if (level == 3) {
+                                        if ("".equals(sqlwhere)) {
+                                            sqlwhere = " ( jobtitle = " + jobtitleid + " and ( " + surdeptClause + "))";
+                                        } else {
+                                            sqlwhere += " or ( jobtitle = " + jobtitleid + " and ( " + surdeptClause + "))";
+                                        }
+                                    } else if (level == 4) {
+                                        if ("".equals(sqlwhere)) {
+                                            sqlwhere = " ( jobtitle = " + jobtitleid + " and (subcompanyid1 in (" + jobsubcompanyid + ") ))";
+                                        } else {
+                                            sqlwhere += " or ( jobtitle = " + jobtitleid + " and (subcompanyid1 in (" + jobsubcompanyid + ") ))";
+                                        }
+                                    } else if (level == 5) {
+                                        if ("".equals(sqlwhere)) {
+                                            sqlwhere = " ( jobtitle = " + jobtitleid + " and ( " + subcomidClause + "))";
+                                        } else {
+                                            sqlwhere += " or ( jobtitle = " + jobtitleid + " and ( " + subcomidClause + "))";
+                                        }
+                                    } else if (level == 6) {
+                                        if ("".equals(sqlwhere)) {
+                                            sqlwhere = " ( jobtitle = " + jobtitleid + " and ( " + surcomidClause + "))";
+                                        } else {
+                                            sqlwhere += " or ( jobtitle = " + jobtitleid + " and ( " + surcomidClause + "))";
+                                        }
+                                    }
+                                }
+                            }
+                        } catch (Exception e) {
+                            // TODO Auto-generated catch block
+                            e.printStackTrace();
+                        }
+                        if ("".equals(sqlwhere)) {
+                            sqlwhere += " id = -99999 ";
+                        } else {
+                            sqlwhere += " and status in ( " + statustr + " ) order by dsporder asc ";
+                        }
+                        if (!"".equals(jobtitleid) && !"0".equals(jobtitleid)) {
+                            sql = "select id,0 as customerid from HrmResource where " + sqlwhere;
+                        } else {
+                            sql = "select id,0 as customerid from HrmResource where id = -99999";
+                        }
+                        //----
+                        break;
+                    case 60:                         // 人力资源字段 岗位
+                        //----
+                        strsqlClause = Util.getSubINClause(fieldvalue, "jobtitle", "IN");
+                        if (level == 0) {
+                            sqlwhere = " and (departmentid in (" + jobfield + ") " +
+                                    " or exists( select 1 from HrmResourceVirtual where HrmResource.ID = HrmResourceVirtual.RESOURCEID AND HrmResourceVirtual.departmentid in(" + jobfield + ") )) and status in ( " + statustr + " ) order by dsporder asc ";
+                        } else if (level == 1) {
+                            sqlwhere = " and (subcompanyid1 in (" + jobfield + ") " +
+                                    " or exists( select 1 from HrmResourceVirtual where HrmResource.ID = HrmResourceVirtual.RESOURCEID AND HrmResourceVirtual.subcompanyid in(" + jobfield + ") )) and status in ( " + statustr + " ) order by dsporder asc ";
+                        } else if (level == 3) {
+                            String jobfiledtype = "";
+                            String jobviewtype = "";
+                            String jobformname = fieldname;
+
+                            if (isbill == 0)
+                                rs2.executeSql("select fieldname,0 viewtype,0 groupid,type from workflow_formdict where id = " + jobfield + " union select fieldname,1 viewtype,groupid,type from  workflow_formdictdetail a,workflow_formfield b where a.id = b.fieldid and b.formid = " + formid + " and a.id = " + jobfield);
+                            else
+                                rs2.executeSql("select fieldname,viewtype,detailtable,type from workflow_billfield where id =" + jobfield);
+
+                            if (rs2.next()) {
+                                fieldname = Util.null2String(rs2.getString("fieldname"));
+                                jobfiledtype = Util.null2String(rs2.getString("type"));
+                                jobviewtype = rs2.getString("viewtype");
+                            }
+                            if (fieldname.equals(""))
+                                break;
+
+                            //===============================================
+                            if ("1".equals(viewtype)) {//对明细做特殊处理，明细每一行岗位所属部门分部
+                                if (isbill == 0) {
+                                    String groupid = rs2.getString(3);
+                                    rs2.executeSql("select " + fieldname + "," + jobformname + " from workflow_formdetail where requestid=" + requestid + " and groupid = " + groupid + " order by id asc");
+                                } else {
+                                    String detailtable = rs2.getString(3);
+                                    rs2.execute("select " + fieldname + "," + jobformname + " from " + detailtable + " where mainid = " + billid + " order by id asc");
+                                }
+                                strsqlClause = "";
+                                String jobformdvalue = "";
+                                String jobfieldvalue = "";
+                                while (rs2.next()) {
+                                    jobformdvalue = Util.null2String(rs2.getString(jobformname));
+                                    jobfieldvalue = Util.null2String(rs2.getString(fieldname));
+                                    if (!"".equals(jobformdvalue) && !"".equals(jobfieldvalue)) {
+                                        if ("4".equals(jobfiledtype) || "57".equals(jobfiledtype) || "167".equals(jobfiledtype) || "168".equals(jobfiledtype)) {
+                                            if ("".equals(sqlwhere)) {
+                                                sqlwhere = " ( jobtitle in (" + jobformdvalue + ") and (departmentid in (" + jobfieldvalue + ") " +
+                                                        " or exists( select 1 from HrmResourceVirtual where HrmResource.ID = HrmResourceVirtual.RESOURCEID AND HrmResourceVirtual.departmentid in(" + jobfieldvalue + ") ))) ";
+                                            } else {
+                                                sqlwhere += " or ( jobtitle in (" + jobformdvalue + ") and (departmentid in (" + jobfieldvalue + ") " +
+                                                        " or exists( select 1 from HrmResourceVirtual where HrmResource.ID = HrmResourceVirtual.RESOURCEID AND HrmResourceVirtual.departmentid in(" + jobfieldvalue + ") ))) ";
+                                            }
+                                        } else {
+                                            if ("".equals(sqlwhere)) {
+                                                sqlwhere = " ( jobtitle in (" + jobformdvalue + ") and (subcompanyid1 in (" + jobfieldvalue + ") " +
+                                                        " or exists( select 1 from HrmResourceVirtual where HrmResource.ID = HrmResourceVirtual.RESOURCEID AND HrmResourceVirtual.subcompanyid in(" + jobfieldvalue + ") ))) ";
+                                            } else {
+                                                sqlwhere += " or ( jobtitle in (" + jobformdvalue + ") and (subcompanyid1 in (" + jobfieldvalue + ") " +
+                                                        " or exists( select 1 from HrmResourceVirtual where HrmResource.ID = HrmResourceVirtual.RESOURCEID AND HrmResourceVirtual.subcompanyid in(" + jobfieldvalue + ") ))) ";
+                                            }
+                                        }
+                                    }
+                                }
+                                sqlwhere += " and status in ( " + statustr + " ) order by dsporder asc ";
+                            } else {
+                                if (isbill == 0) {
+                                    rs2.executeSql("select " + fieldname + " from workflow_form where requestid=" + requestid);
+                                } else {
+                                    rs2.executeSql("select " + fieldname + " from " + billtablename + " where id = " + billid);
+                                }
+
+                                String jobfieldvalue = "";
+                                while (rs2.next()) {
+                                    if ("".equals(jobfieldvalue)) {
+                                        jobfieldvalue = Util.null2String(rs2.getString(fieldname));
+                                    } else {
+                                        jobfieldvalue += "," + Util.null2String(rs2.getString(fieldname));
+                                    }
+                                }
+                                if ("4".equals(jobfiledtype) || "57".equals(jobfiledtype) || "167".equals(jobfiledtype) || "168".equals(jobfiledtype)) {
+                                    sqlwhere = " and (departmentid in (" + jobfieldvalue + ") " +
+                                            " or exists( select 1 from HrmResourceVirtual where HrmResource.ID = HrmResourceVirtual.RESOURCEID AND HrmResourceVirtual.departmentid in(" + jobfieldvalue + ") )) and status in ( " + statustr + " ) order by dsporder asc ";
+                                } else {
+                                    sqlwhere = " and (subcompanyid1 in (" + jobfieldvalue + ") " +
+                                            " or exists( select 1 from HrmResourceVirtual where HrmResource.ID = HrmResourceVirtual.RESOURCEID AND HrmResourceVirtual.subcompanyid in(" + jobfieldvalue + ") )) and status in ( " + statustr + " ) order by dsporder asc ";
+                                }
+                            }
+                            //===============================================
+                        } else {
+                            sqlwhere = " and status in ( " + statustr + " ) order by dsporder asc ";
+                        }
+                        //----
+                        sql = "select id,0 as customerid from " + sqlfrom + " where " + strsqlClause + sqlwhere;
+                        break;
+                    case 7:                         // 人力资源字段本部门
+                        strsqlClause = Util.getSubINClause(fieldvalue, "id", "IN");
+                        sql = "select id,0 as customerid from " + sqlfrom + " where seclevel >= " + level + " and seclevel <= " + level2 + " and departmentid in (select departmentid from " + sqlfrom + " where " + strsqlClause + ") and status in ( " + statustr + "  ) " + sqlwhere;
+                        if (signorder == 2) {
+                            sql = sql + " order by seclevel asc, dsporder  asc ";
+                        }
+
+                        break;
+                    case 8:                         // 文档字段所有者
+                        sql = "select ownerid as id,0 as customerid,usertype as usertypenew from DocDetail where id =" + fieldvalue;
+                        break;
+                    case 9:                         // 文档字段部门
+                        sql = "select id,0 as customerid from HrmResource where seclevel >= " + level + " and seclevel <= " + level2 + " and departmentid in (select docdepartmentid from DocDetail where id = " + fieldvalue + ") and status in ( " + statustr + "  ) ";
+                        break;
+                    case 10:                        // 项目字段经理
+                        sql = "SELECT manager AS id,0 as customerid FROM Prj_ProjectInfo WHERE id =" + fieldvalue;
+                        break;
+                    case 11:                        // 项目字段本部门
+                        sql = "select id,0 as customerid from HrmResource where seclevel >= " + level + " and seclevel <= " + level2 + " and departmentid in (SELECT department FROM Prj_ProjectInfo WHERE id = " + fieldvalue + ") and status in ( " + statustr + "  ) ";
+                        break;
+                    case 12: {                        // 项目字段成员
+                        //原来的程序用到表Prj_Member，但由于表字段被改以及现在该表不再使用，故使用Prj_ProjectInfo表的members字段 TD9074
+                        RecordSet rs_new = new RecordSet();
+                        rs_new.execute("SELECT members FROM Prj_ProjectInfo WHERE id =" + fieldvalue);
+                        String members = "0";
+                        if (rs_new.next()) {
+                            members = Util.null2String(rs_new.getString("members"));
+                        }
+                        if ("".equals(members) || "null".equalsIgnoreCase(members)) {
+                            members = "0";
+                        }
+                        sql = "select id,0 as customerid from HrmResource where seclevel >= " + level + " and seclevel <= " + level2 + " and id in (" + members + ") and status in ( " + statustr + "  ) ";
+                        break;
+                    }
+                    case 13:                        // 资产字段所有者
+                        sql = "SELECT resourceid AS id,0 as customerid FROM CptCapital WHERE id =" + fieldvalue;
+                        break;
+                    case 14:                        // 资产字段部门
+                        sql = "select id,0 as customerid from HrmResource where seclevel >= " + level + " and seclevel <= " + level2 + " and departmentid in (select departmentid from CptCapital where id = " + fieldvalue + ") and status in ( " + statustr + "  ) ";
+                        break;
+                    case 15:                        // 客户字段经理
+                        sql = "select manager as id,0 as customerid from CRM_CustomerInfo where id = " + fieldvalue;
+                        break;
+                    case 16:                        // 客户联系人经理
+                        sql = "select manager as id,0 as customerid from CRM_CustomerContacter where customerid = " + fieldvalue;
+                        break;
+                    case 23:
+                        sql = "select id as customerid,0 as id from CRM_CustomerInfo where  seclevel >= " + level + " and seclevel <= " + level2 + " and manager in ( " + fieldvalue + ")";
+                        break;
+                    case 24:
+                        sql = "select id as customerid,0 as id from CRM_CustomerInfo where id in( " + fieldvalue + ")";
+                        break;
+                    case 31:                        // 所有下级
+                        String allsubstr = "0";
+                        List<String> tempList = Util.TokenizerString(fieldvalue, ",");
+                        for (String fieldvalue_temp : tempList) {
+                            if (virtualid < -1) {//如果是虚拟维度，则初始化相应查询表
+                                RecordSet lowerrs = new RecordSet();
+                                lowerrs.executeSql("select id from HrmResourceVirtualView where managerid =" + fieldvalue_temp + sqlwhere);
+                                while (lowerrs.next()) {
+                                    allsubstr += "," + lowerrs.getString("id");
+                                }
+                            } else {
+                                AllSubordinate asub = new AllSubordinate();
+                                try {
+                                    if ("0".equals(fieldvalue_temp)) {
+                                        continue;
+                                    }
+                                    asub.getAll(fieldvalue_temp);
+                                } catch (Exception asube) {
+                                }
+                                while (asub.next()) {
+                                    if (!(asub.getSubordinateID()).equals(""))
+                                        allsubstr += "," + asub.getSubordinateID();
+                                }
+                            }
+                        }
+                        strsqlClause = Util.getSubINClause(allsubstr, "id", "IN");
+                        sql = "select id,0 as customerid from " + sqlfrom + " where " + strsqlClause + " and seclevel >= " + level + " and seclevel <= " + level2 + " and status in ( " + statustr + "  ) ";
+                        break;
+                    case 32:                        // 人力资源字段本分部
+                        strsqlClause = Util.getSubINClause(fieldvalue, "id", "IN");
+                        sql = "select id,0 as customerid from " + sqlfrom + " where seclevel >= " + level + " and seclevel <= " + level2 + " and subcompanyid1 in (select subcompanyid1 from " + sqlfrom + " where " + strsqlClause + ") and status in ( " + statustr + "  ) " + sqlwhere;
+                        if (signorder == 2) {
+                            sql = sql + " order by seclevel asc, dsporder  asc ";
+                        }
+
+                        break;
+                    case 33:                        // 文档字段本分部
+                        sql = "select id,0 as customerid from HrmResource where seclevel >= " + level + " and seclevel <= " + level2 + " and subcompanyid1 in (select subcompanyid1 from HrmDepartment where id in (select docdepartmentid from DocDetail where id = " + fieldvalue + ") ) and status in ( " + statustr + "  ) ";
+                        break;
+                    case 34:                        // 项目字段本分部
+                        sql = "select id,0 as customerid from HrmResource where seclevel >= " + level + " and seclevel <= " + level2 + " and subcompanyid1 in (select subcompanyid1 from HrmDepartment where id in (SELECT department FROM Prj_ProjectInfo WHERE id = " + fieldvalue + ") ) and status in ( " + statustr + "  ) ";
+                        break;
+                    case 35:                        // 资产字段本分部
+                        sql = "select id,0 as customerid from HrmResource where seclevel >= " + level + " and seclevel <= " + level2 + " and subcompanyid1 in (select subcompanyid1 from HrmDepartment where id in (select departmentid from CptCapital where id = " + fieldvalue + ") ) and status in ( " + statustr + "  ) ";
+                        break;
+                    case 38:                        // 上级部门
+                        strsqlClause = Util.getSubINClause(fieldvalue, "b.id", "IN");
+                        sql = "select id,0 as customerid from " + sqlfrom + " where seclevel >= " + level + " and seclevel <= " + level2 + " and departmentid in (select supdepid from " + sqlfromdepart + " a , " + sqlfrom + " b where a.id = b.departmentid and " + strsqlClause + ") and status in ( " + statustr + "  ) " + sqlwhere;
+                        if (signorder == 2) {
+                            sql = sql + " order by seclevel asc, dsporder  asc ";
+                        }
+
+                        break;
+                    case 49:                        // 收发文单位
+                        String unitReceiver = "";
+                        RecordSet rs_new = new RecordSet();
+                        //					rs_new.executeSql("select receiverids from DocReceiveUnit where id in("+fieldvalue+")");
+                        //					while(rs_new.next()){
+                        //						String id = rs_new.getString("receiverids");
+                        //						if(!"".equals(id)){
+                        //							if(unitReceiver.equals("")){
+                        //								if(id.indexOf(",") > -1 && id.indexOf(",") == 0){
+                        //									unitReceiver=id.substring(1, id.length());
+                        //								}else{
+                        //									unitReceiver=id;
+                        //								}
+                        //							}else{
+                        //								if(id.indexOf(",") > -1){
+                        //									unitReceiver+=id;
+                        //								}else{
+                        //									unitReceiver+=","+id;
+                        //								}
+                        //							}
+                        //						}
+                        //					}
+                        fieldvalue = Util.null2String(fieldvalue);
+                        if (fieldvalue.startsWith(",")) {
+                            fieldvalue = fieldvalue.substring(1);
+                        }
+                        if (fieldvalue.endsWith(",")) {
+                            fieldvalue = fieldvalue.substring(0, fieldvalue.length() - 1);
+                        }
+                        Set<String> unitIdsSet = new HashSet<String>();
+                        unitIdsSet.addAll(Arrays.asList(StringUtils.split(fieldvalue, ",")));
+                        if (!"".equals(fieldvalue)) {
+                            rs_new.executeSql("select receiverids from DocReceiveUnit where id in(" + StringUtils.join(unitIdsSet, ",") + ")");
+                            unitIdsSet = new HashSet<String>();
+                            while (rs_new.next()) {
+                                String id = Util.null2String(rs_new.getString("receiverids"));
+                                if (id.startsWith(",")) {
+                                    id = id.substring(1);
+                                }
+                                if (id.endsWith(",")) {
+                                    id = id.substring(0, id.length() - 1);
+                                }
+                                id = id.trim();
+                                unitIdsSet.addAll(Arrays.asList(StringUtils.split(id, ",")));
+                                unitReceiver = StringUtils.join(unitIdsSet, ",");
+                            }
+                        }
+                        if (unitReceiver.equals(""))
+                            unitReceiver = "0";
+                        sql = "select id,0 as customerid from HrmResource where id in( " + unitReceiver + ")";
+                        break;
+                    case 52:                        // 组织架构部门负责人
+                        sql = "select zzjgbmfzr as id,0 as customerid from HrmDepartment where id in (" + fieldvalue + ")";
+                        break;
+                    case 53:                        // 组织架构部门分管领导
+                        sql = "select zzjgbmfgld as id,0 as customerid from HrmDepartment where id in (" + fieldvalue + ")";
+                        break;
+                    case 54:                        // 矩阵管理部门负责人
+                        sql = "select jzglbmfzr as id,0 as customerid from HrmDepartment where id in (" + fieldvalue + ")";
+                        break;
+                    case 55:                        // 矩阵管理部门分管领导
+                        sql = "select jzglbmfgld as id,0 as customerid from HrmDepartment where id in (" + fieldvalue + ")";
+                        break;
+                    case 56:                        // 部门负责人
+                        sql = "select bmfzr as id,0 as customerid from HrmDepartment where id in (" + fieldvalue + ")";
+                        break;
+                    case 57:                        // 部门分管领导
+                        sql = "select bmfgld as id,0 as customerid from HrmDepartment where id in (" + fieldvalue + ")";
+                        break;
+                }
+                break;
+            case 17:                                // 创建人
+                sql = "select creatertype*creater as customerid,(1-creatertype)*creater as id from workflow_requestbase where requestid = " + requestid;
+                break;
+            case 18:
+            case 19:
+            case 36:
+            case 37:
+            case 39:
+            case 61:
+                if (creatertype == 0) {
+                    if (type == 18)                  // 创建人经理
+                        sql = " select managerid as id,0 as customerid from " + sqlfrom + " where id = " + creater + sqlwhere;
+                    if (type == 19) {                // 创建人本部门
+                        sql = " select id,0 as customerid from " + sqlfrom + " where seclevel >= " + level + " and seclevel <= " + level2 + " and departmentid in( " + thedepartmentid + ") and status in ( " + statustr + "  ) " + sqlwhere;
+                        if (signorder == 2) {
+                            String sql_orderby = "";
+                            int sqlOrderbyIndex = sql.lastIndexOf(" order by ");
+                            if (sqlOrderbyIndex != -1) {
+                                sql_orderby = sql.substring(sqlOrderbyIndex);
+                                sql = sql.substring(0, sqlOrderbyIndex);
+                            }
+                            sql += " order by seclevel asc,dsporder  asc ";
+                        }
+                    }
+                    if (type == 37) {                 // 创建人本分部
+                        sql = " select id,0 as customerid from " + sqlfrom + " where seclevel >= " + level + " and seclevel <= " + level2 + " and subcompanyid1 in(" + thesubcompanyid + ") and status in ( " + statustr + "  ) " + sqlwhere;
+                        if (signorder == 2) {
+                            String sql_orderby = "";
+                            int sqlOrderbyIndex = sql.lastIndexOf(" order by ");
+                            if (sqlOrderbyIndex != -1) {
+                                sql_orderby = sql.substring(sqlOrderbyIndex);
+                                sql = sql.substring(0, sqlOrderbyIndex);
+                            }
+                            sql += " order by seclevel asc,dsporder  asc ";
+                        }
+                    }
+                    if (type == 36) {               // 创建人下级
+                        String allsubstr = "0";
+                        if (virtualid < -1) {//如果是虚拟维度，则初始化相应查询表
+                            RecordSet crs = new RecordSet();
+                            crs.executeSql("select id from HrmResourceVirtualView where managerid =" + creater + sqlwhere);
+                            while (crs.next()) {
+                                allsubstr += "," + crs.getString("id");
+                            }
+                        } else {
+                            AllSubordinate asub = new AllSubordinate();
+                            try {
+                                asub.getAll("" + creater);
+                            } catch (Exception asube) {
+                            }
+                            while (asub.next()) {
+                                if (!(asub.getSubordinateID()).equals(""))
+                                    allsubstr += "," + asub.getSubordinateID();
+                            }
+                        }
+                        sql = "select id,0 as customerid from " + sqlfrom + " where id in( " + allsubstr + ") and seclevel >= " + level + " and seclevel <= " + level2 + " and status in ( " + statustr + "  ) ";
+                    }
+                    if (type == 39) {                 // 创建人上级部门
+                        sql = " select a.id as id ,0 as customerid from " + sqlfrom + " a , " + sqlfromdepart + " b where a.seclevel >= " + level + " and a.seclevel <= " + level2 + " and a.departmentid = b.supdepid and b.id in( " + thedepartmentid + ") and a.status in ( " + statustr + "  ) ";
+                        if (signorder == 2) {
+                            String sql_orderby = "";
+                            int sqlOrderbyIndex = sql.lastIndexOf(" order by ");
+                            if (sqlOrderbyIndex != -1) {
+                                sql_orderby = sql.substring(sqlOrderbyIndex);
+                                sql = sql.substring(0, sqlOrderbyIndex);
+                            }
+                            sql += " order by seclevel asc,dsporder  asc ";
+                        }
+                    }
+                    if (type == 61) {               // 创建人岗位
+                        //--
+                        ResourceComInfo rc = null;
+                        DepartmentComInfo dc = null;
+                        String jobtitleid = "";//岗位id
+                        try {
+                            rc = new ResourceComInfo();
+                            dc = new DepartmentComInfo();
+
+                            String subdeptids = "";//本部门及下级部门
+                            String surdept = "";//本部门及上级部门
+                            String subcomid = "";//本分部及下级分部
+                            String surcomid = "";//本分部及上级分部
+                            String jobdepartmentid = "" + Util.getIntValue(rc.getDepartmentID("" + creater), 0);
+                            String jobsubcompanyid = "" + Util.getIntValue(dc.getSubcompanyid1(jobdepartmentid), 0);
+
+                            if (!"0".equals(jobdepartmentid) && !"0".equals(jobsubcompanyid)) {
+                                jobtitleid = rc.getJobTitle("" + creater);
+
+                                //本部门及下级部门
+                                subdeptids = "";
+                                subdeptids = DepartmentComInfo.getAllChildDepartId(jobdepartmentid, subdeptids);
+                                if (!"".equals(subdeptids)) {
+                                    subdeptids = jobdepartmentid + subdeptids;
+                                } else {
+                                    subdeptids = jobdepartmentid;
+                                }
+                                //本部门及上级部门
+                                surdept = "";
+                                surdept = DepartmentComInfo.getAllParentDepartId(jobdepartmentid, surdept);
+                                if (!"".equals(surdept)) {
+                                    surdept = jobdepartmentid + surdept;
+                                } else {
+                                    surdept = jobdepartmentid;
+                                }
+                                //本分部及下级分部
+                                subcomid = "";
+                                subcomid = SubCompanyComInfo.getAllChildSubcompanyId(jobsubcompanyid, subcomid);
+                                if (!"".equals(subcomid)) {
+                                    subcomid = jobsubcompanyid + subcomid;
+                                } else {
+                                    subcomid = jobsubcompanyid;
+                                }
+                                //本分部及上级分部
+                                surcomid = "";
+                                surcomid = SubCompanyComInfo.getAllParentSubcompanyId(jobsubcompanyid, surcomid);
+                                if (!"".equals(surcomid)) {
+                                    surcomid = jobsubcompanyid + surcomid;
+                                } else {
+                                    surcomid = jobsubcompanyid;
+                                }
+                            }
+
+                            //----
+                            if (!"".equals(jobtitleid)) {
+                                if (level == 0) {
+                                    sqlwhere = " and status in ( " + statustr + " ) order by dsporder asc ";
+                                } else if (level == 1) {
+                                    sqlwhere = " and departmentid in (" + jobdepartmentid + ") and status in ( " + statustr + " ) order by dsporder asc ";
+                                } else if (level == 2) {
+                                    sqlwhere = " and departmentid in (" + subdeptids + ") and status in ( " + statustr + " ) order by dsporder asc ";
+                                } else if (level == 3) {
+                                    sqlwhere = " and departmentid in (" + surdept + ") and status in ( " + statustr + " ) order by dsporder asc ";
+                                } else if (level == 4) {
+                                    sqlwhere = " and subcompanyid1 in (" + jobsubcompanyid + ") and status in ( " + statustr + " ) order by dsporder asc ";
+                                } else if (level == 5) {
+                                    sqlwhere = " and subcompanyid1 in (" + subcomid + ") and status in ( " + statustr + " ) order by dsporder asc ";
+                                } else if (level == 6) {
+                                    sqlwhere = " and subcompanyid1 in (" + surcomid + ") and status in ( " + statustr + " ) order by dsporder asc ";
+                                }
+                                sql = "select id,0 as customerid from HrmResource where jobtitle = " + jobtitleid + sqlwhere;
+                            } else {
+                                sql = "select id,0 as customerid from HrmResource where jobtitle = -99999 ";
+                            }
+                        } catch (Exception e) {
+                            // TODO Auto-generated catch block
+                            e.printStackTrace();
+                        }
+                        //sql = " select id,0 as customerid from "+sqlfrom+" where id = " + creater +sqlwhere;
+                    }
+                }
+                if (creatertype == 1) {
+                    if (type == 18) {                 // 客户经理
+                        sql = "select manager as id,0 as customerid from CRM_CustomerInfo where id = " + creater;
+                    }
+                    if (type == 19) {                 // 客户部门
+                        sql = "select id,0 as customerid from HrmResource where seclevel >= " + level + " and seclevel <= " + level2 + " and departmentid = " + thedepartmentid + " and status in ( " + statustr + "  ) ";
+                        if (signorder == 2) {
+                            sql = sql + " order by seclevel asc, dsporder  asc ";
+                        }
+                    }
+                    if (type == 37 || type == 36) {
+                        sql = " select 0 as id,0 as customerid from HrmResource where id = 0 ";
+                    }
+                    if (type == 39) {
+                        sql = "select a.id as id,0 as customerid from HrmResource a , HrmDepartment b where a.seclevel >= " + level + " and a.seclevel <= " + level2 + " and a.departmentid = b.supdepid and b.id = " + thedepartmentid + " and a.status in ( " + statustr + "  ) ";
+                    }
+                }
+                break;
+            case 20:
+                sql = "select id as customerid,0 as id from CRM_CustomerInfo where  seclevel >= " + level + " and seclevel <= " + level2 + " and type = " + objid;
+                break;
+            case 21:
+                sql = "select id as customerid,0 as id from CRM_CustomerInfo where  seclevel >= " + level + " and seclevel <= " + level2 + " and status = " + objid;
+                break;
+            case 22:
+                sql = "select id as customerid,0 as id from CRM_CustomerInfo where  seclevel >= " + level + " and seclevel <= " + level2 + " and department = " + objid;
+                break;
+            case 25:
+                sql = "select id as customerid,0 as id from CRM_CustomerInfo where  seclevel >= " + level + " and seclevel <= " + level2;
+                break;
+            /*-----xwj for td1965 20050825 begin----*/
+            case 40:            //节点操作者本人，只对人力资源进行了考虑
+                //sql = "select 0 as customerid , userid as id from workflow_currentoperator where nodeid = " + objid + " and usertype = 0 and (preisremark is null or (preisremark<>'1' and preisremark<>'5' and preisremark<>'8' and preisremark<>'9')) and requestid = " + requestid+" and (groupdetailid>-1 or groupdetailid is null )";
+                //TD9784 chujun 增加对客户为操作者的情况下的判断
+                //sql = "select 0 as customerid , userid as id from workflow_currentoperator where nodeid = " + objid + " and usertype = 0 and (preisremark is null or (preisremark<>'1' and preisremark<>'5' and preisremark<>'8' and preisremark<>'9')) and requestid = " + requestid+" and (groupdetailid>-1 or groupdetailid is null )";
+                //sql += " union select userid as customerid, 0 as id from workflow_currentoperator where nodeid = " + objid + " and usertype = 1 and (preisremark is null or (preisremark<>'1' and preisremark<>'5' and preisremark<>'8' and preisremark<>'9')) and requestid = " + requestid+" and (groupdetailid>-1 or groupdetailid is null )";
+                //TD20827
+                //logtype：0，批准；2，提交；3，退回
+                sql = "select 0 as customerid, case agenttype  when '2'  then agentorbyagentid else operator end as id from workflow_requestlog where requestid=" + requestid + " and nodeid=" + objid + " and operatortype=0 and (logtype='0' or logtype='2' or logtype='3')";
+                sql += " union select operator as customerid, 0 as id from workflow_requestlog where requestid=" + requestid + " and nodeid=" + objid + " and operatortype=1 and (logtype='0' or logtype='2' or logtype='3')";
+                //QC151617
+                //if(objid == this.nodeid || passNodes.contains(""+objid)){//如果就是当前节点的后续节点使用节点操作者本人，要考虑workflow_requestlog可能还没有被插入数据，所以要加上当前操作人
+                if (objid == this.nodeid || passNodes.contains("" + objid) || this.usertype == 1) {//如果就是当前节点的后续节点使用节点操作者本人，要考虑workflow_requestlog可能还没有被插入数据，所以要加上当前操作人
+                    if (this.usertype == 0) {//hrm
+                        //使用objid兼容异常处理情况，不可用nodeid过滤
+                        sql += " union select  0 as customerid ,case agenttype  when '2'  then agentorbyagentid else userid end as id from workflow_currentoperator where nodeid=" + objid + " and userid=" + this.userid + " and usertype = 0 and islasttimes=1 and (preisremark is null or (preisremark<>'1' and preisremark<>'5' and preisremark<>'8' and preisremark<>'9')) and requestid = " + requestid + " and (groupdetailid>-1 or groupdetailid is null ) ";
+                    } else {//crm
+                        sql += " union select id as customerid,0 as id from CRM_CustomerInfo where id=" + this.userid;
+                    }
+                }
+                //add by liaodong for qc76119,76120,54194,64652 start
+                sql += " union select 0 as customerid, case agenttype  when '2'  then agentorbyagentid else operator end as id from workflow_penetrateLog where requestid=" + requestid + " and nodeid=" + objid + " and operatortype=0 and (logtype='0' or logtype='2' or logtype='3' or logtype='z') ";
+                //end
+                break;
+            case 41:
+                String userids = getNodeUserIds(rsTemps, objid);
+                sql = "select 0 as customerid , managerid as id from " + sqlfrom + " where id in ( " + userids + " ) " + sqlwhere;//xwj for td1965 20050823
+                break;
+
+            case 99:
+
+                String matrixnodeid = getNodeids(workflowid);
+                Logger logger = aiyh.utils.Util.getLogger();
+                if (("," + matrixnodeid + ",").indexOf("," + nextnodeid + ",") > -1) {
+                    logger.info("99 进入逻辑：" + matrixnodeid + " => " + nextnodeid );
+                    //相关责任人
+                    String matrixUserids = getUseridsByMatrix(rs2, groupdetailid, "二开业务处理");
+                    logger.info("相关负责人： " + matrixUserids);
+                    if ("".equals(matrixUserids)) {
+                        matrixUserids = "-1";
+                    } else {
+                        matrixUserids = matrixUserids.replaceAll(" ", "");
+                    }
+                    if (!"".equals(matrixUserids)) {
+                        List matrixlist = Util.TokenizerString(matrixUserids, "+");//部门组
+                        String hrmids = "";
+                        sql = "";
+                        for (int j = 0; j < matrixlist.size(); j++) {
+                            String deptgroup = Util.null2String("" + matrixlist.get(j));
+                            if (!deptgroup.equals("")) {
+                                String[] operators = deptgroup.split("_");
+                                String operator = "" + operators[0];
+                                String dept = "" + operators[1];
+                                if (!operator.equals("")) {
+                                    if (sql.equals("")) {
+                                        sql = " SELECT 0 as customerid," + dept + " as deptid ,HrmResource.* FROM HrmResource WHERE id IN( " + operator + ") and status in(0,1,2,3)";
+                                    } else {
+                                        sql += " Union ";
+                                        sql += " SELECT 0 as customerid," + dept + " as deptid ,HrmResource.* FROM HrmResource WHERE id IN( " + operator + ") and status in(0,1,2,3)";
+                                    }
+                                }
+                            }
+                        }
+                    } else {
+                        sql = "SELECT 0 as customerid,HrmResource.Departmentid,HrmResource.* FROM HrmResource WHERE id IN(-1) and status in(0,1,2,3)";
+                        if (rs.getDBType().equals("oracle")) {
+                            sql += " order by instr(',-1,', ','||id||',')";
+                        } else {
+                            sql += " order by charindex(','+ rtrim(id) +',', ',-1,')";
+                        }
+                    }
+                } else {
+                    //相关责任人
+                    String matrixUserids = getUseridsByMatrix(rs2, groupdetailid);
+                    if ("".equals(matrixUserids)) {
+                        matrixUserids = "-1";
+                    } else {
+                        matrixUserids = matrixUserids.replaceAll(" ", "");
+                    }
+                    String matrixUseridsin = Util.getSubINClause(matrixUserids, "id", "in");
+                    sql = "SELECT 0 as customerid,HrmResource.* FROM HrmResource WHERE ( " + matrixUseridsin + ") and status in(0,1,2,3,5)";
+                    if ("2".equals(Util.null2String(eh_operatorMap.get("eh_relationship")))) {
+                        if (rs.getDBType().equals("oracle")) {
+                            sql += " order by instr('," + matrixUserids + ",', ','||id||',')";
+                        } else if (rs.getDBType().equals("postgresql")) {
+                            sql += " order by instr('," + matrixUserids + ",', ','||id||',')";
+                        } else if (rs.getDBType().equals("mysql")) {
+                            sql += " order by instr('," + matrixUserids + ",', concat(',',id,','))";
+                        } else {
+                            sql += " order by charindex(','+ rtrim(id) +',', '," + matrixUserids + ",')";
+                        }
+                    }
+                }
+                break;
+            /*-----xwj for td1965 20050825 end----*/
+        }
+        returnStrs[0] = sql;
+        returnStrs[1] = subcompanyFieldFlag;
+        returnStrs[2] = deptFieldFlag;
+        returnStrs[3] = theorderbyordervalue;
+        return returnStrs;
+    }
+
+    private String getNodeUserIds(RecordSet rsTemps, int objid) {
+        //节点操作者经理，只对人力资源进行了考虑
+        //TD20827，由于已经定义，当初节点是谁操作的，现在就找到谁，如果有代理关系，找被代理人（授权人）
+        String userids = "-1";
+        //add by liaodong for qc76119,76120,54194,64652 start
+        String managerSql = " select operator,agenttype,agentorbyagentid from workflow_requestlog where nodeid = " + objid + " and operatortype=0 and (logtype='0' or logtype='2' or logtype='3') and requestid = " + requestid;
+        managerSql += " union select operator,agenttype,agentorbyagentid from workflow_penetrateLog where nodeid = " + objid + " and operatortype=0 and (logtype='0' or logtype='2' or logtype='3' or logtype='z') and requestid = " + requestid;
+        rsTemps.execute(managerSql);
+        //end
+        while (rsTemps.next()) {
+            if (!(rsTemps.getString("agenttype")).equals("2") && !(rsTemps.getString("agenttype")).equals(""))
+                userids += "," + rsTemps.getString("operator");
+            else
+                userids += "," + rsTemps.getString("agentorbyagentid");
+        }
+        // 如果就是当前节点的后续节点使用节点操作者本人，要考虑workflow_requestlog可能还没有被插入数据，所以要加上当前操作人
+        if (objid == this.nodeid || passNodes.contains("" + objid)) {
+            // 考虑代理
+            String execsql = "";
+            if (isintervenor.equals("1")) {
+                execsql = " select agentorbyagentid,userid,agenttype from workflow_currentoperator where nodeid = " + objid + " and (preisremark is null or (preisremark<>'1' and preisremark<>'5' and preisremark<>'8' and preisremark<>'9')) and requestid = " + requestid + " and (groupdetailid>-1 or groupdetailid is null ) ";
+            } else {
+                execsql = " select agentorbyagentid,userid,agenttype from workflow_currentoperator where nodeid = " + objid + " and userid=" + this.userid + " and usertype = 0 and (preisremark is null or (preisremark<>'1' and preisremark<>'5' and preisremark<>'8' and preisremark<>'9')) and requestid = " + requestid + " and (groupdetailid>-1 or groupdetailid is null ) ";
+            }
+            rsTemps.execute(execsql);
+            while (rsTemps.next()) {
+                if (!(rsTemps.getString("agenttype")).equals("2"))
+                    userids += "," + rsTemps.getString("userid");
+                else
+                    userids += "," + rsTemps.getString("agentorbyagentid");
+            }
+        } else {
+            if ("-1".equals(userids)) {
+                String sltNodeOptSql = "";
+                if (isintervenor.equals("1")) {
+                    sltNodeOptSql = "select userid,agenttype,agentorbyagentid from workflow_currentoperator where nodeid = " + objid + " and usertype=0 and requestid = " + requestid + " and islasttimes=1 and preisremark='0' and isremark in (0,2) order by operatedate desc,operatetime desc, id desc";
+                } else {
+                    sltNodeOptSql = "select userid,agenttype,agentorbyagentid from workflow_currentoperator where nodeid = " + objid + " and usertype=0 and requestid = " + requestid + " and islasttimes=1 and preisremark='0' and isremark=2 order by operatedate desc,operatetime desc, id desc";
+                }
+                rsTemps.execute(sltNodeOptSql);
+                if (rsTemps.next()) {
+                    if (!(rsTemps.getString("agenttype")).equals("2")) {
+                        userids += "," + rsTemps.getString("userid");
+                    } else {
+                        userids += "," + rsTemps.getString("agentorbyagentid");
+                    }
+                }
+            }
+        }
+        return userids;
+    }
+
+    /**
+     * 从矩阵取得userid
+     *
+     * @param rs2
+     * @param groupdetailid
+     * @return
+     */
+    public String getUseridsByMatrix(RecordSet rs2, String groupdetailid) {
+        return getUseridsByMatrix(rs2, groupdetailid, "");
+    }
+
+    /**
+     * 从矩阵取得userid
+     *
+     * @param rs2
+     * @param groupdetailid
+     * @return
+     */
+    public String getUseridsByMatrix(RecordSet rs2, String groupdetailid, String bz) {
+        String userids = "";
+        if ("".equals(bz)) {//标准功能业务处理
+            GroupDetailMatrix matrix = GroupDetailMatrix.read(rs2, groupdetailid);
+            List<GroupDetailMatrixDetail> matrixDetails = GroupDetailMatrixDetail.readAll(rs2, groupdetailid);
+            Map<String, String> matchs = new HashMap<String, String>();
+            for (GroupDetailMatrixDetail matrixDetail : matrixDetails) {
+                String fieldId = matrixDetail.getWorkflow_field();
+                String fieldName = "";
+                String fieldValue = "";
+
+                //创建人部门
+                if ("-12".equals(fieldId)) {
+                    ResourceComInfo rc = null;
+                    try {
+                        rc = new ResourceComInfo();
+                        fieldValue = rc.getDepartmentID("" + creater);
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                } else if ("-13".equals(fieldId)) {              //创建人分部
+                    ResourceComInfo rc = null;
+                    try {
+                        rc = new ResourceComInfo();
+                        fieldValue = rc.getSubCompanyID("" + creater);
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                } else {
+                    if (isbill == 0) {
+                        rs2.executeSql("select fieldname from workflow_formdict where id =" + fieldId);
+                    } else {
+                        rs2.executeSql("select fieldname from workflow_billfield where id =" + fieldId);
+                    }
+
+                    if (rs2.next()) {
+                        fieldName = rs2.getString("fieldname");
+                    }
+
+                    if (isbill == 0)
+                        rs2.executeSql("select " + fieldName + " from workflow_form where requestid=" + requestid);
+                    else
+                        rs2.executeSql("select " + fieldName + " from " + billtablename + " where id = " + billid);
+
+                    if (rs2.next()) {
+                        fieldValue = Util.null2String(rs2.getString(fieldName));
+                    }
+
+                }
+                matchs.put(matrixDetail.getCondition_field(), fieldValue);
+            }
+            MatrixUtil matrixUtil = new MatrixUtil();
+            userids = matrixUtil.getMatrixUsers(matrix.getMatrix(), matrix.getValue_field(), matchs);
+            if (userids.endsWith(",")) {
+                userids = userids.substring(0, userids.length() - 1);
+            }
+
+            if (userids.startsWith(",")) {
+                userids = userids.substring(1);
+            }
+        } else {//二开业务处理
+            MatrixUtil matrixUtil = new MatrixUtil();
+            String returnstr = "";
+            GroupDetailMatrix matrix = GroupDetailMatrix.read(rs2, groupdetailid);
+            List<GroupDetailMatrixDetail> matrixDetails = GroupDetailMatrixDetail.readAll(rs2, groupdetailid);
+            Map<String, String> matchs = new HashMap<String, String>();
+            for (GroupDetailMatrixDetail matrixDetail : matrixDetails) {
+                String fieldId = matrixDetail.getWorkflow_field();
+                String fieldName = "";
+                String fieldValue = "";
+
+                //创建人部门
+                if ("-12".equals(fieldId)) {
+                    ResourceComInfo rc = null;
+                    try {
+                        rc = new ResourceComInfo();
+                        fieldValue = rc.getDepartmentID("" + creater);
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                } else if ("-13".equals(fieldId)) {              //创建人分部
+                    ResourceComInfo rc = null;
+                    try {
+                        rc = new ResourceComInfo();
+                        fieldValue = rc.getSubCompanyID("" + creater);
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                } else {
+                    if (isbill == 0) {
+                        rs2.executeSql("select fieldname from workflow_formdict where id =" + fieldId);
+                    } else {
+                        rs2.executeSql("select fieldname from workflow_billfield where id =" + fieldId);
+                    }
+
+                    if (rs2.next()) {
+                        fieldName = rs2.getString("fieldname");
+                    }
+                    if (isbill == 0)
+                        rs2.executeSql("select " + fieldName + " from workflow_form where requestid=" + requestid);
+                    else
+                        rs2.executeSql("select " + fieldName + " from " + billtablename + " where id = " + billid);
+
+                    if (rs2.next()) {
+                        fieldValue = Util.null2String(rs2.getString(fieldName));
+                    }
+                }
+                List valuelist = Util.TokenizerString(fieldValue, ",");
+                for (int j = 0; j < valuelist.size(); j++) {//根据选择的值单个获取具体的人员，并且将获取的值与部门进行分组拼接一起
+                    matchs.put(matrixDetail.getCondition_field(), "" + valuelist.get(j));
+                    userids = matrixUtil.getMatrixUsers(matrix.getMatrix(), matrix.getValue_field(), matchs);
+                    if (userids.endsWith(",")) {
+                        userids = userids.substring(0, userids.length() - 1);
+                    }
+
+                    if (userids.startsWith(",")) {
+                        userids = userids.substring(1);
+                    }
+                    if (!userids.equals("")) {
+                        if (returnstr.equals("")) {//根据部门获取人员
+                            returnstr = userids + "_" + valuelist.get(j);
+                        } else {
+                            returnstr += "+" + userids + "_" + valuelist.get(j);
+                        }
+                    }
+                }
+            }
+        }
+
+        return userids;
+    }
+
+    /**
+     * 建模配置信息
+     *
+     * @param workflowid
+     * @return
+     */
+    public String getNodeids(int workflowid) {
+        RecordSet rs9 = new RecordSet();
+        String nodeids = "";
+
+        //获取流程类型对应的所有版本
+        String allWfIds = WorkflowVersion.getAllVersionStringByWFIDs(String.valueOf(workflowid));
+
+        rs9.executeQuery("SELECT nodeid FROM uf_hqczrkz where wfid in (" + allWfIds + ")");
+
+//        ActionLog.writeDebuggerLog("===>SELECT nodeid FROM uf_hqczrkz where wfid in (" + allWfIds + ")");
+        //            aiyh - 修改节点判断
+//        修改文件
+        List<String> nodeIdList = new ArrayList<>();
+        while (rs9.next()) {
+//            nodeids += "," + Util.null2String(rs9.getString("nodeid"));
+//            aiyh - 修改节点判断
+            nodeIdList.add(Util.null2String(rs9.getString("nodeid")));
+        }
+
+//        return nodeids;
+        //            aiyh - 修改节点判断
+        return StringUtils.join(nodeIdList, ",");
+    }
+
+    /**
+     * 矩阵无符合条件的操作者查询
+     *
+     * @param groupdetailid
+     * @return
+     */
+    private String checkUseridsByMatrix(String groupdetailid) {
+        RecordSet temprs = new RecordSet();
+        RecordSet rs2 = new RecordSet();
+        GroupDetailMatrix matrix = GroupDetailMatrix.read(rs2, groupdetailid);
+        List<GroupDetailMatrixDetail> matrixDetails = GroupDetailMatrixDetail.readAll(rs2, groupdetailid);
+        String descs = "";
+        String msgcontent = "";
+        boolean hasvalue = false;
+        MatrixUtil mu = new MatrixUtil();
+        String dbType = rs2.getDBType();
+        String muname = matrix.getMatrixName(mu);
+        String fielddesc = matrix.getValueFieldName(mu);
+        // 获取 selectValueField 对应的 fieldname
+        String selectFieldName = mu.getFieldName(matrix.getValue_field(), rs2);
+        StringBuffer condition = new StringBuffer();
+        StringBuffer conditions = new StringBuffer();
+        String conditionstr = "";
+        FormFieldlabelMainManager ffmm = new FormFieldlabelMainManager();
+        for (GroupDetailMatrixDetail matrixDetail : matrixDetails) {
+            String fieldId = matrixDetail.getWorkflow_field();
+            String fieldName = "";
+            String fieldValue = "";
+            String desc = "";
+
+            //创建人部门
+            if ("-12".equals(fieldId)) {
+                ResourceComInfo rc = null;
+                try {
+                    rc = new ResourceComInfo();
+                    fieldValue = rc.getDepartmentID("" + creater);
+                    fieldValue = ("0".equals(fieldValue)) ? "" : fieldValue;
+                    desc = "{126493}{126029}";
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            } else if ("-13".equals(fieldId)) {              //创建人分部
+                ResourceComInfo rc = null;
+                try {
+                    rc = new ResourceComInfo();
+                    fieldValue = rc.getSubCompanyID("" + creater);
+                    fieldValue = ("0".equals(fieldValue)) ? "" : fieldValue;
+                    desc = "{126493}{33553}";
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            } else {
+                if (isbill == 0) {
+                    rs2.executeSql("select fieldname, description from workflow_formdict where id =" + fieldId);
+                } else {
+                    rs2.executeSql("select fieldname, fieldlabel  from workflow_billfield where id =" + fieldId);
+                }
+
+                if (rs2.next()) {
+                    fieldName = rs2.getString("fieldname");
+                    desc = Util.null2String(rs2.getString(2));
+                }
+
+                if (isbill == 0)
+                    rs2.executeSql("select " + fieldName + " from workflow_form where requestid=" + requestid);
+                else
+                    rs2.executeSql("select " + fieldName + " from " + billtablename + " where id = " + billid);
+
+                if (rs2.next()) {
+                    fieldValue = Util.null2String(rs2.getString(fieldName));
+                }
+
+
+            }
+
+            if (StringUtil.isNull(fieldValue)) {
+                if (isbill == 1) {
+                    rs2.execute("select indexdesc from Htmllabelindex where id =" + desc);
+                    if (rs2.next()) {
+                        desc = Util.null2String(rs2.getString("indexdesc"));
+                    }
+                } else {
+                    ffmm.resetParameter();
+                    ffmm.setFormid(formid);
+                    ffmm.setFieldid(Util.getIntValue(fieldId, 0));
+                    ffmm.setLanguageid(languageid);
+                    try {
+                        ffmm.selectSingleFormField();
+                        desc = ffmm.getFieldlabel();
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                }
+                descs += desc + "，";
+            } else {
+                hasvalue = true;
+                String matrixfieldid = matrixDetail.getCondition_field();
+
+                Map<String, Map<String, String>> fieldDetail = mu.getFieldDetail(matrix.getMatrix());
+                String matrixfieldname = mu.getFieldName(matrixfieldid, rs2);
+                Map<String, String> fieldInfo = fieldDetail.get(matrixfieldname);
+                String fieldDisplayname = "";
+                if (fieldInfo != null) {
+                    fieldDisplayname = Util.null2String(fieldInfo.get("namelabel"));
+                }
+
+                String selectFieldType = mu.getFieldType(matrixfieldid, rs2);
+                String browservalue = "";
+
+                if ("161".equals(selectFieldType) || "162".equals(selectFieldType)) {
+                    rs2.execute("select browservalue from MatrixFieldInfo where id=" + matrixfieldid);
+                    if (rs2.next()) {
+                        browservalue = rs2.getString(1);
+                    }
+                }
+
+
+                if ("162".equals(selectFieldType)) {
+                    if ("oracle".equals(dbType)) {
+                        condition.append(" and ','||").append(matrixfieldname).append("||',' like ").append("'%,").append(fieldValue).append(",%' ");
+                    } else if ("postgresql".equals(dbType)) {
+                        condition.append(" and ','||").append(matrixfieldname).append("||',' like ").append("'%,").append(fieldValue).append(",%' ");
+                    } else if (dbType.equals("mysql")) {
+                        condition.append(" and concat(',',").append(matrixfieldname).append(",',') like ").append("'%,").append(fieldValue).append(",%' ");
+                    } else if ("sqlserver".equals(dbType)) {
+                        condition.append(" and ','+").append(matrixfieldname).append("+',' like ").append("'%,").append(fieldValue).append(",%' ");
+                    }
+                } else {
+                    String[] values = fieldValue.split(",");
+                    String valueStr = "";
+                    int j = 0;
+                    for (int i = 0; i < values.length; i++) {
+                        if ("".equals(values[i].trim())) {
+                            continue;
+                        }
+                        if (j > 0) {
+                            valueStr += ",";
+                        }
+                        valueStr += "'" + values[i] + "'";
+                        j++;
+                    }
+                    condition.append(" and ").append(matrixfieldname).append(" in ").append("(").append(valueStr).append(")");
+                }
+
+                rs2.execute("select " + selectFieldName + " from " + mu.MATRIXPREFIX + matrix.getMatrix() + " where 1=1 " + condition.toString());
+                if (!rs2.next()) {
+                    String fieldvaluedesc = getFieldValueDesc(fieldValue, selectFieldType, browservalue);
+                    conditionstr += WorkflowRequestMessage.getBoldDetailInfo(fieldDisplayname) + "{15808}" + WorkflowRequestMessage.getBoldDetailInfo(fieldvaluedesc);
+                }
+                conditions.append(condition);
+            }
+
+        }
+        if (!hasvalue) {
+            if (descs.length() > 0) {
+                descs = descs.substring(0, descs.length() - 1);
+            }
+            msgcontent = "{21740}" + WorkflowRequestMessage.getBoldDetailInfo(descs) + "{126520}";
+        } else {
+            boolean hasUser = false;
+            String sql = "select " + selectFieldName + " from " + mu.MATRIXPREFIX + matrix.getMatrix() + " where 1=1 " + conditions.toString();
+            rs2.execute(sql);
+            String lastnames = "";
+            while (rs2.next()) {
+                String id = rs2.getString(1);
+                if (checkidvalid(Util.null2String(id))) {
+                    hasUser = true;
+                    String lastname = getLastnameByUserStatus(id);
+                    if (StringUtil.isNotNull(lastname)) {
+                        lastnames += lastname + "，";
+                    }
+                }
+            }
+
+            if (!hasUser) {
+                if (rs2.getCounts() == 0) {
+                    if (conditionstr.length() > 1) {
+                        msgcontent = "{34066}" + WorkflowRequestMessage.getBoldDetailInfo(muname) + "{126530}" + conditionstr;
+                    }
+                } else {
+                    msgcontent = "{34066}" + WorkflowRequestMessage.getBoldDetailInfo(muname) + "{126530}" + WorkflowRequestMessage.getBoldDetailInfo(fielddesc) + "{15808}{125212}";
+                }
+            } else {
+                if (lastnames.length() > 0) {
+                    lastnames = lastnames.substring(0, lastnames.length() - 1);
+                    msgcontent = "{34066}" + WorkflowRequestMessage.getBoldDetailInfo(muname) + "{126526}" + WorkflowRequestMessage.getBoldDetailInfo(fielddesc) + WorkflowRequestMessage.getBoldInfo(lastnames) + "{126527}";
+                }
+            }
+        }
+        return msgcontent;
+
+    }
+
+    /**
+     * 矩阵-获取表单值对应中文名称
+     *
+     * @param fieldValue
+     * @param selectFieldType
+     * @return
+     */
+    private String getFieldValueDesc(String fieldValue, String selectFieldType, String browservalue) {
+        String fieldvaluedesc = "";
+        if ("4".equals(selectFieldType)) {//部门
+            try {
+                DepartmentComInfo dci = new DepartmentComInfo();
+                fieldvaluedesc = dci.getDepartmentname(fieldValue);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        } else if ("164".equals(selectFieldType)) {//分部
+            try {
+                SubCompanyComInfo sci = new SubCompanyComInfo();
+                fieldvaluedesc = sci.getSubCompanyname(fieldValue);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+
+        } else if ("1".equals(selectFieldType)) {//人力资源
+            try {
+                ResourceComInfo rci = new ResourceComInfo();
+                fieldvaluedesc = rci.getLastname(fieldValue);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+
+        } else if ("7".equals(selectFieldType)) {//客户
+            try {
+                CustomerInfoComInfo cici = new CustomerInfoComInfo();
+                fieldvaluedesc = cici.getCustomerInfoname(fieldValue);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        } else if ("8".equals(selectFieldType)) {//项目
+            try {
+                ProjectInfoComInfo pici = new ProjectInfoComInfo();
+                fieldvaluedesc = pici.getProjectInfoname(fieldValue);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        } else if ("161".equals(selectFieldType) || "162".equals(selectFieldType)) {//自定义单选
+            Browser browser = (Browser) StaticObj.getServiceByFullname(browservalue, Browser.class);
+            for (String _v : fieldValue.split(",")) {
+                BrowserBean bb = browser.searchById(_v);
+                fieldvaluedesc += bb.getName() + "，";
+            }
+            if (fieldvaluedesc.length() > 0) {
+                fieldvaluedesc = fieldvaluedesc.substring(0, fieldvaluedesc.length() - 1);
+            }
+        } else if ("24".equals(selectFieldType)) {//岗位
+            try {
+                JobComInfo jci = new JobComInfo();
+                fieldvaluedesc = jci.getJobName(fieldValue);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+        return fieldvaluedesc;
+    }
+
+    /**
+     * 判断是否符合条件
+     *
+     * @param conditions
+     * @param rs
+     * @param groupdetailid
+     * @return
+     */
+    protected boolean isConformConditions(String conditions, RecordSet rs, String groupdetailid, Map<String, Object> groupDetailLog) {
+        boolean isConform = false;
+        //在每一批次必须符合条件才能取得操作者
+        String tempSql = "";
+        conditions = Util.StringReplace(conditions, "’", "'");
+        if (conditions.indexOf(".") >= 0 || conditions.indexOf("(") >= 0) {
+            if (isbill == 0) {
+                if (!conditions.trim().equals(""))
+                    tempSql = "select requestid from workflow_form where requestid=" + requestid + " and " + conditions;
+                else
+                    tempSql = "select requestid from workflow_form where requestid=" + requestid;
+            } else {
+                if (!conditions.trim().equals(""))
+                    tempSql = "select requestid from " + billtablename + " where requestid=" + requestid + " and " + conditions;
+                else
+                    tempSql = "select requestid from " + billtablename + " where requestid=" + requestid;
+            }
+            if (conditions.equals("")) {
+                isConform = true;
+            } else {
+                rs.execute(tempSql);
+                if (rs.next()) {
+                    isConform = true;
+                }
+            }
+        } else {
+            RuleInterface rif = new RuleInterface();
+            rif.setUserid(this.userid + "");
+            rif.setAutoForecast(this.autoForecast);
+            rif.setForecastManagerInfo(this.forecastManagerInfo);
+            rif.setRulesInfo(groupDetailLog);
+            boolean cop = rif.compareRuleforWF(conditions, requestid + "", groupdetailid + "", RuleInterface.RULESRC_PC);
+            isConform = cop;
+        }
+        return isConform;
+    }
+
+    /**
+     * 获取依次逐个提交操作人
+     *
+     * @param type
+     * @param rs2
+     * @param theorderbyordervalue
+     * @return
+     */
+    private String getOperatoridByType(int type, RecordSet rs2, String theorderbyordervalue, String subcompanyFieldFlag, String deptFieldFlag) {
+        if (type == 42 && "1".equals(deptFieldFlag)) {
+            String tempoperatorid = "";
+            ArrayList tempdeptids = Util.TokenizerString(theorderbyordervalue, ",");
+            for (int i = 0; i < tempdeptids.size(); i++) {
+                rs2.beforFirst();
+                while (rs2.next()) {
+                    if (Util.null2String(rs2.getString("departmentid")).equals(tempdeptids.get(i))) {
+                        if (tempoperatorid.equals("")) {
+                            tempoperatorid = rs2.getString("id");
+                        } else {
+                            tempoperatorid += "," + rs2.getString("id");
+                        }
+                    }
+                }
+            }
+            theorderbyordervalue = tempoperatorid;
+        }
+        if (type == 42 && "2".equals(deptFieldFlag)) {//部门自定义字段,类似之前组织架构部门负责人 功能
+            String tempoperatorid = "";
+            rs2.beforFirst();
+            ResourceComInfo rc = null;
+            try {
+                rc = new ResourceComInfo();
+            } catch (Exception e) {
+                writeLog(e);
+            }
+            while (rs2.next()) {
+                String bmczr = Util.null2String(rs2.getString("id"));//部门操作人
+                String bmczrs[] = Util.TokenizerString2(bmczr, ",");
+                for (int i = 0; i < bmczrs.length; i++) {
+                    int tempbmoperator = Util.getIntValue(bmczrs[i], 0);//单个操作人
+                    String tempstatus = Util.null2String(rc.getStatus(String.valueOf(tempbmoperator)));//操作人状态
+                    if (!tempstatus.equals("0") && !tempstatus.equals("1") && !tempstatus.equals("2") && !tempstatus.equals("3")) {
+                        continue;
+                    }
+                    if (tempbmoperator == 0 || ("," + tempoperatorid + ",").indexOf("," + tempbmoperator + ",") >= 0) {//已经添加的人，不再添加
+                        continue;
+                    }
+                    if (tempoperatorid.equals("")) {
+                        tempoperatorid = String.valueOf(tempbmoperator);
+                    } else {
+                        tempoperatorid += "," + tempbmoperator;
+                    }
+                }
+            }
+            theorderbyordervalue = tempoperatorid;
+        }
+        if (type == 51 && "1".equals(subcompanyFieldFlag)) {
+            String tempoperatorid = "";
+            ArrayList tempdeptids = Util.TokenizerString(theorderbyordervalue, ",");
+            for (int i = 0; i < tempdeptids.size(); i++) {
+                rs2.beforFirst();
+                while (rs2.next()) {
+                    if (Util.null2String(rs2.getString("subcompanyid1")).equals(tempdeptids.get(i))) {
+                        if (tempoperatorid.equals("")) {
+                            tempoperatorid = rs2.getString("id");
+                        } else {
+                            tempoperatorid += "," + rs2.getString("id");
+                        }
+                    }
+                }
+            }
+            theorderbyordervalue = tempoperatorid;
+        }
+        if (type == 51 && "2".equals(subcompanyFieldFlag)) {//分部自定义字段,类似之前组织架构部门负责人 功能
+            String tempoperatorid = "";
+            rs2.beforFirst();
+            ResourceComInfo rc = null;
+            try {
+                rc = new ResourceComInfo();
+            } catch (Exception e) {
+                writeLog(e);
+            }
+            while (rs2.next()) {
+                String bmczr = Util.null2String(rs2.getString("id"));//分部操作人
+                String bmczrs[] = Util.TokenizerString2(bmczr, ",");
+                for (int i = 0; i < bmczrs.length; i++) {
+                    int tempbmoperator = Util.getIntValue(bmczrs[i], 0);//单个操作人
+                    String tempstatus = Util.null2String(rc.getStatus(String.valueOf(tempbmoperator)));//操作人状态
+                    if (!tempstatus.equals("0") && !tempstatus.equals("1") && !tempstatus.equals("2") && !tempstatus.equals("3")) {
+                        continue;
+                    }
+                    if (tempbmoperator == 0 || ("," + tempoperatorid + ",").indexOf("," + tempbmoperator + ",") >= 0) {//已经添加的人，不再添加
+                        continue;
+                    }
+                    if (tempoperatorid.equals("")) {
+                        tempoperatorid = String.valueOf(tempbmoperator);
+                    } else {
+                        tempoperatorid += "," + tempbmoperator;
+                    }
+                }
+            }
+            theorderbyordervalue = tempoperatorid;
+        }
+        if (type == 52 || type == 53 || type == 54 || type == 55 || type == 56 || type == 57) {//组织架构部门负责人,组织架构部门分管领导,矩阵管理部门负责人,矩阵管理部门分管领导,部门负责人,部门分管领导
+            String tempoperatorid = "";
+            rs2.beforFirst();
+            ResourceComInfo rc = null;
+            try {
+                rc = new ResourceComInfo();
+            } catch (Exception e) {
+                writeLog(e);
+            }
+            while (rs2.next()) {
+                String bmczr = Util.null2String(rs2.getString("id"));//部门操作人
+                String bmczrs[] = Util.TokenizerString2(bmczr, ",");
+                for (int i = 0; i < bmczrs.length; i++) {
+                    int tempbmoperator = Util.getIntValue(bmczrs[i], 0);//单个操作人
+                    String tempstatus = Util.null2String(rc.getStatus(String.valueOf(tempbmoperator)));//操作人状态
+                    if (!tempstatus.equals("0") && !tempstatus.equals("1") && !tempstatus.equals("2") && !tempstatus.equals("3")) {
+                        continue;
+                    }
+                    if (tempbmoperator == 0 || ("," + tempoperatorid + ",").indexOf("," + tempbmoperator + ",") >= 0) {//已经添加的人，不再添加
+                        continue;
+                    }
+                    if (tempoperatorid.equals("")) {
+                        tempoperatorid = String.valueOf(tempbmoperator);
+                    } else {
+                        tempoperatorid += "," + tempbmoperator;
+                    }
+                }
+            }
+            theorderbyordervalue = tempoperatorid;
+        } else if (type == 49 || type == 6 || type == 31 || type == 32 || type == 7 || type == 38 || type == 30 || type == 1 || type == 2 || type == 3 || type == 4 || type == 58 || type == 59 || type == 60 || type == 61) {
+            String tempoperatorid = "";
+            rs2.beforFirst();
+            List<String> list = new ArrayList<String>();
+            while (rs2.next()) {
+                String tempid = rs2.getString("id");
+                if (!list.contains(tempid)) {
+                    if (tempoperatorid.equals("")) {
+                        tempoperatorid = tempid;
+                    } else {
+                        tempoperatorid += "," + tempid;
+                    }
+                }
+                list.add(tempid);
+            }
+            theorderbyordervalue = tempoperatorid;
+        } else if (type == 43) { // 人力资源字段 > 角色(条件)
+            String tempSQL = "";
+            ArrayList byOrderList = new ArrayList();
+            MultiHrmCompositorOrderBean orderBean = null;
+            String tempoperatorid = "";
+            //总部
+            tempSQL = sql + " and a.rolelevel = 2 order by  idorder  asc";
+
+            byOrderList = roleOrderOperate(tempSQL, theorderbyordervalue);
+            for (int i = 0; i < byOrderList.size(); i++) {
+                orderBean = (MultiHrmCompositorOrderBean) byOrderList.get(i);
+                if (tempoperatorid.equals("")) {
+                    tempoperatorid = orderBean.getHrmId();
+                } else {
+                    tempoperatorid += "," + orderBean.getHrmId();
+                }
+            }
+
+            //分部
+            tempSQL = sql + " and a.rolelevel = 1 order by  idorder  asc";
+
+            byOrderList = roleOrderOperate(tempSQL, theorderbyordervalue);
+            for (int i = 0; i < byOrderList.size(); i++) {
+                orderBean = (MultiHrmCompositorOrderBean) byOrderList.get(i);
+                if (tempoperatorid.equals("")) {
+                    tempoperatorid = orderBean.getHrmId();
+                } else {
+                    tempoperatorid += "," + orderBean.getHrmId();
+                }
+            }
+
+            //部门
+            tempSQL = sql + " and a.rolelevel = 0 order by  idorder  asc";
+
+            byOrderList = roleOrderOperate(tempSQL, theorderbyordervalue);
+            for (int i = 0; i < byOrderList.size(); i++) {
+                orderBean = (MultiHrmCompositorOrderBean) byOrderList.get(i);
+                if (tempoperatorid.equals("")) {
+                    tempoperatorid = orderBean.getHrmId();
+                } else {
+                    tempoperatorid += "," + orderBean.getHrmId();
+                }
+            }
+            theorderbyordervalue = tempoperatorid;
+        } else if (type == 40 || type == 41 || type == 17 || type == 18 || type == 36 || type == 37 || type == 19 || type == 39 || type == 48 || type == 99) {
+            String tempoperatorid = "";
+            while (rs2.next()) {
+                int tepoperatorid = Util.getIntValue(rs2.getString("id"), 0);
+                int tepoperatorcrmid = Util.getIntValue(rs2.getString("customerid"), 0);
+                if (tepoperatorid != 0) {
+                    if (tempoperatorid.equals("")) {
+                        tempoperatorid = "" + tepoperatorid;
+                    } else {
+                        tempoperatorid += "," + tepoperatorid;
+                    }
+                } else if (tepoperatorcrmid != 0) {
+                    if (tempoperatorid.equals("")) {
+                        tempoperatorid = "" + tepoperatorcrmid;
+                    } else {
+                        tempoperatorid += "," + tepoperatorcrmid;
+                    }
+                } else {
+                    continue;
+                }
+            }
+
+            theorderbyordervalue = tempoperatorid;
+        }
+        return theorderbyordervalue;
+    }
+
+    //获取操作者
+    public String getObjName(int type, int objid, int bhxj, int language, int virtualid, int level, int detailid, boolean addvirtualname) {
+        String objname = "";
+        if (type == 1 || type == 22) {
+            try {
+                DepartmentComInfo dc = new DepartmentComInfo();
+                objname = dc.getDepartmentname("" + objid);
+                if (bhxj == 1) {
+                    objname += "[" + SystemEnv.getHtmlLabelName(125943, language) + "]";
+                }
+            } catch (Exception e1) {
+                e1.printStackTrace();
+            }
+        } else if (type == 2) {
+            RecordSet _rs = new RecordSet();
+            _rs.executeSql("select rolesmark from hrmroles where id = " + objid);
+            if (_rs.next()) {
+                objname = _rs.getString(1);
+            }
+        } else if (type == 3) {
+            //人力资源缓存 不好使，部分人员根据id获取不到。本次先查询一下，后续缓存类好使了在缓存缓存获取
+            RecordSet _rs = new RecordSet();
+            _rs.executeSql(" select lastname,id from  hrmresource where   id in(select objid from Workflow_HrmOperator where groupdetailid='" + detailid + "' ) ");
+            if (_rs.next()) {
+                objname = Util.null2String(_rs.getString("lastname"));
+            }
+        } else if (type == 5 || type == 49 || type == 6 || type == 7 || type == 8 || type == 9 || type == 10 ||
+                type == 11 || type == 12 || type == 13 || type == 14 || type == 15 || type == 16 || type == 23 ||
+                type == 24 || type == 31 || type == 32 || type == 33 || type == 34 || type == 35 || type == 38 ||
+                type == 42 || type == 52 || type == 53 || type == 54 || type == 55 || type == 56 || type == 57 ||
+                type == 43 || type == 44 || type == 45 || type == 46 || type == 47 || type == 48 || type == 51) {
+            objname = getGroupDetailObjName(objid, language);
+            if (addvirtualname) {
+                String virtualname = WorkflowRequestMessage.getVirtualname(virtualid, language);
+                if (!"".equals(objname) && !"".equals(virtualname)) {
+                    objname += ("".equals(virtualname) ? virtualname : "(" + virtualname + ")");
+                }
+            }
+        } else if (type == 20) {
+            try {
+                CustomerTypeComInfo ctc = new CustomerTypeComInfo();
+                objname = Util.toScreen(ctc.getCustomerTypename("" + objid), language);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        } else if (type == 21) {
+            try {
+                CustomerStatusComInfo csc = new CustomerStatusComInfo();
+                objname = Util.toScreen(csc.getCustomerStatusname("" + objid), language);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        } else if (type == 30) {
+            try {
+                SubCompanyComInfo scc = new SubCompanyComInfo();
+                objname = scc.getSubCompanyname("" + objid);
+                if (bhxj == 1) {
+                    objname += "[" + SystemEnv.getHtmlLabelName(84674, language) + "]";
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        } else if (type == 40 || type == 41) {
+            RecordSet _rs = new RecordSet();
+            _rs.executeQuery("select b.nodename from workflow_flownode a,workflow_nodebase b where a.nodeid = b.id and b.id = ?", objid);
+            if (_rs.next()) {
+                String nodename = _rs.getString(1);
+                if (!"".equals(nodename)) {
+                    String nodevirtualname = WorkflowRequestMessage.getVirtualname(virtualid, language);
+                    objname = nodename + (nodevirtualname == "" ? nodevirtualname : "(" + nodevirtualname + ")");
+                }
+            }
+        } else if (type == 50) {
+            objname = getGroupDetailObjName(objid, language);
+            if (!"".equals(objname)) {
+                try {
+                    RolesComInfo rc = new RolesComInfo();
+                    objname += "/" + rc.getRolesRemark("" + level);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+        } else if (type == 99) {
+            RecordSet _rs = new RecordSet();
+            GroupDetailMatrix matrix = GroupDetailMatrix.read(_rs, String.valueOf(detailid));
+            if (matrix != null) {
+                MatrixUtil matrixUtil = new MatrixUtil();
+                objname = matrix.getMatrixName(matrixUtil) + "(" + matrix.getValueFieldName(matrixUtil) + ")";
+            }
+        }
+        return objname;
+
+    }
+
+    /**
+     * 或缺操作级别
+     *
+     * @param type
+     * @param level
+     * @param level2
+     * @param deptField
+     * @param subcompanyField
+     * @return
+     */
+    private String getLevelStr(int type, int level, int level2, String deptField, String subcompanyField) {
+        String _levelstr = "";
+        if (type == 1 || type == 4 || type == 7 || type == 9 || type == 11 || type == 12 ||
+                type == 14 || type == 19 || type == 20 || type == 21 || type == 22 ||
+                type == 23 || type == 25 || type == 30 || type == 31 || type == 32 ||
+                type == 33 || type == 34 || type == 35 || type == 36 || type == 37 ||
+                type == 38 || type == 39 || type == 45 || type == 46) {
+            if (level2 > 0) {
+                _levelstr = level + "-" + level2;
+            } else {
+                _levelstr = ">=" + level;
+            }
+        } else if (type == 2) {
+            if (level == 0) {
+                _levelstr = SystemEnv.getHtmlLabelName(124, languageid);
+            } else if (level == 1) {
+                _levelstr = SystemEnv.getHtmlLabelName(141, languageid);
+            } else if (level == 2) {
+                _levelstr = SystemEnv.getHtmlLabelName(140, languageid);
+            } else if (level == 3) {
+                _levelstr = SystemEnv.getHtmlLabelName(22753, languageid);
+            }
+        } else if (type == 50) {
+            if (level2 == 1) {
+                _levelstr = SystemEnv.getHtmlLabelName(22689, languageid);
+            } else if (level2 == 2) {
+                _levelstr = SystemEnv.getHtmlLabelName(22690, languageid);
+            } else if (level2 == 3) {
+                _levelstr = SystemEnv.getHtmlLabelName(22667, languageid);
+            } else {
+                _levelstr = SystemEnv.getHtmlLabelName(140, languageid);
+            }
+        } else if (type == 42) {
+            if ("0".equals(deptField) || "".equals(deptField)) {//说明下拉框中选择的是安全级别
+                if (level2 != -1) {
+                    _levelstr = level + "-" + level2;
+                } else {
+                    _levelstr = ">=" + level;
+                }
+            } else {//说明下拉框中选择的是部门自定义字段 deptField该字段存储值个格式id_fieldname_fieldlabel
+                if (deptField != null && !"".equals(deptField)) {
+                    String[] tempStr = Util.TokenizerString2(deptField, "[_]");
+                    if (tempStr != null && tempStr.length > 2) {
+                        String fieldlabelStr = tempStr[2];
+                        int fieldlabel = Util.getIntValue(fieldlabelStr, 0);
+                        _levelstr = SystemEnv.getHtmlLabelName(fieldlabel, languageid);
+                    }
+                }
+            }
+        } else if (type == 51) {
+            if ("0".equals(subcompanyField) || "".equals(subcompanyField)) {//说明下拉框中选择的是安全级别
+                if (level2 != -1) {
+                    _levelstr = level + "-" + level2;
+                } else {
+                    _levelstr = ">=" + level;
+                }
+            } else {//说明下拉框中选择的是分部自定义字段subcompanyField该字段存储值个格式id_fieldname_fieldlabel
+                if (subcompanyField != null && !"".equals(subcompanyField)) {
+                    String[] tempStr = Util.TokenizerString2(subcompanyField, "[_]");
+                    if (tempStr != null && tempStr.length > 2) {
+                        String fieldlabelStr = tempStr[2];
+                        int fieldlabel = Util.getIntValue(fieldlabelStr, 0);
+                        _levelstr = SystemEnv.getHtmlLabelName(fieldlabel, languageid);
+                    }
+                }
+            }
+        }
+
+        return _levelstr;
+    }
+
+    /**
+     * 返回流程操作者查询不到的具体原因
+     *
+     * @param type
+     * @param nodetype
+     * @param signorder
+     * @param virtualid
+     * @param language
+     * @param objid
+     * @param bhxj
+     * @param level
+     * @param detailid
+     * @param level2
+     * @param deptField
+     * @param subcompanyField
+     * @return
+     * @throws Exception
+     */
+    private String getErrorMessageContent(int type, String nodetype, int signorder, int virtualid, int language, int objid, int bhxj, int level, int detailid, int level2, String deptField, String subcompanyField) throws Exception {
+        String typename = WorkflowRequestMessage.getTypeName(type, nodetype, signorder, virtualid, language);
+        String objname = WorkflowRequestMessage.getBoldDetailInfo(this.getObjName(type, objid, bhxj, language, virtualid, level, detailid, true));
+        String levelstr = WorkflowRequestMessage.getBoldDetailInfo(this.getLevelStr(type, level, level2, deptField, subcompanyField));
+        String virtualname = WorkflowRequestMessage.getVirtualname(virtualid, language);
+        String msgcontent = "";
+        String objnameisnullmsg = typename + "{23084}";
+        StringBuffer sb = new StringBuffer();
+        ResourceComInfo rci = null; //人员缓存
+        SubCompanyComInfo scci = null; //分部缓存
+        DepartmentComInfo dci = null;    //部门缓存
+        RolesComInfo roleci = null;//角色缓存类
+        DocReceiveUnitComInfo druci = null; //收发单位缓存
+        MeetingComInfo mci = null;//会议室缓存
+        ProjectInfoComInfo pici = null;//项目缓存
+        CustomerInfoComInfo cici = null;//客户缓存
+
+        RecordSet msgrs;
+        switch (type) {
+            case 30: //分部
+            case 1:  //部门
+                msgcontent = (StringUtil.isNotNull(objname)) ? typename + objname + "{83230}{683}" + levelstr + "{126522}" : objnameisnullmsg;
+                break;
+            case 2:  //角色
+                HrmCommonService hrmCommonService = new HrmCommonServiceImpl();
+                String roleMemberids = hrmCommonService.getRoleMemberIds(objid, level == 2 ? "2" : (level == 1 || level == 3) ? "1" : "0");
+                if (!"".equals(roleMemberids)) {
+                    String levelname = "";
+                    if (level == 0) {
+                        levelname = "{126523}";
+                    } else if (level == 1) {
+                        levelname = "{126524}";
+                    } else if (level == 2) {
+                        levelname = "{140}";
+                    } else if (level == 3) {
+                        levelname = "{126525}";
+                    }
+                    msgcontent = "{122}" + objname + "{83230}" + levelname + "{139}{126526}{18936}";
+                } else {
+                    msgcontent = "{122}" + objname + "{15808}{18936}";
+                }
+                break;
+            case 3: //人力资源
+                rci = new ResourceComInfo();
+                msgcontent = WorkflowRequestMessage.getBoldInfo(rci.getLastname(String.valueOf(objid))) + "{126527}";
+                break;
+            case 4: //所有人
+                msgcontent = "{83230}{683}" + levelstr + "{126522}";
+                break;
+            case 51:
+            case 42:
+            case 31:
+            case 32:
+            case 7:
+            case 38:
+            case 9:
+            case 33:
+            case 34:
+            case 11:
+            case 12:
+            case 14:
+            case 35:
+            case 45:
+            case 46:
+            case 43:
+            case 49:
+            case 48:
+            case 6:
+            case 5:
+            case 8:
+            case 10:
+            case 47:
+            case 13:
+            case 15:
+            case 44:
+            case 16:
+            case 50:
+                if (StringUtil.isNull(cachefieldvalue)) {
+                    objname = WorkflowRequestMessage.getBoldDetailInfo(this.getObjName(type, objid, bhxj, language, virtualid, level, detailid, false));
+                    msgcontent = "{21740}" + objname + "{126520}";
+                } else {
+                    String filedvaluename = "";
+                    switch (type) {
+                        case 51: //人力资源字段-分部
+                            String subcomname = getSubCompanyName(virtualid, cachefieldvalue);
+                            msgcontent = "{33553}" + WorkflowRequestMessage.getBoldDetailInfo(addVirturalname(virtualname, subcomname)) + "{83230}{683}" + levelstr + "{126522}";
+                            break;
+                        case 42: //人力资源字段-部门
+                            String depname = getDepartVirtualName(virtualid, cachefieldvalue);
+                            depname = addVirturalname(virtualname, depname);
+                            msgcontent = "{126029}" + WorkflowRequestMessage.getBoldDetailInfo(depname) + "{83230}{683}" + levelstr + "{126522}";
+                            break;
+                        case 31: //人力资源字段下属
+                            rci = new ResourceComInfo();
+                            filedvaluename = rci.getLastnames(cachefieldvalue);
+                            msgcontent = WorkflowRequestMessage.getBoldInfo(addVirturalname(virtualname, filedvaluename)) + "{126528}" + levelstr + "{126522}";
+                            break;
+                        case 32: //人力资源字段本分部
+                            String subcompanyid = "";
+                            rci = new ResourceComInfo();
+                            if (virtualid < -1) {
+                                String[] reInfo = getResourceVirtualInfos(virtualid, cachefieldvalue);
+                                subcompanyid = reInfo[2];
+                            } else {
+                                subcompanyid = rci.getSubCompanyID(cachefieldvalue);
+                            }
+                            filedvaluename = rci.getLastname(cachefieldvalue);
+                            if (checkidvalid(subcompanyid)) {
+                                String subcompanyname = getSubCompanyName(virtualid, subcompanyid);
+                                subcompanyname = addVirturalname(virtualname, subcompanyname);
+                                msgcontent = "{33553}" + WorkflowRequestMessage.getBoldDetailInfo(subcompanyname) + "{83230}{683}" + levelstr + "{126522}";
+                            } else {
+                                filedvaluename = addVirturalname(virtualname, filedvaluename);
+                                msgcontent = WorkflowRequestMessage.getBoldInfo(filedvaluename) + "{83230}{19799}";
+                            }
+                            break;
+                        case 7:  //人力资源字段本部门
+                            rci = new ResourceComInfo();
+                            filedvaluename = rci.getLastname(cachefieldvalue);
+                            String decid = "";
+                            if (virtualid < -1) {
+                                String[] reInfo = getResourceVirtualInfos(virtualid, cachefieldvalue);
+                                decid = reInfo[1];
+                            } else {
+                                decid = rci.getDepartmentID(cachefieldvalue);
+                            }
+                            if (checkidvalid(decid)) {
+                                String dciname = getDepartVirtualName(virtualid, decid);
+                                filedvaluename = addVirturalname(virtualname, dciname);
+                                msgcontent = "{126029}" + WorkflowRequestMessage.getBoldDetailInfo(dciname) + "{83230}{683}" + levelstr + "{126522}";
+                            } else {
+                                filedvaluename = addVirturalname(virtualname, filedvaluename);
+                                msgcontent = WorkflowRequestMessage.getBoldInfo(filedvaluename) + "{83230}{15393}";
+                            }
+                            break;
+                        case 38: //人力资源字段上级部门
+                            rci = new ResourceComInfo();
+                            filedvaluename = rci.getLastname(cachefieldvalue);
+                            String decid1 = "";
+                            if (virtualid < -1) {
+                                String[] reInfo = getResourceVirtualInfos(virtualid, cachefieldvalue);
+                                decid1 = reInfo[1];
+                            } else {
+                                decid1 = rci.getDepartmentID(cachefieldvalue);
+                            }
+                            if (checkidvalid(decid1)) {
+                                String supdciid = getSupdepartmentID(virtualid, decid1);
+                                if (checkidvalid(supdciid)) {
+                                    String supdciname = getDepartVirtualName(virtualid, supdciid);
+                                    filedvaluename = addVirturalname(virtualname, supdciname);
+                                    msgcontent = "{126029}" + WorkflowRequestMessage.getBoldDetailInfo(supdciname) + "{83230}{683}" + levelstr + "{126522}";
+                                } else {
+                                    String decid1name = getDepartVirtualName(virtualid, decid1);
+                                    filedvaluename = addVirturalname(virtualname, decid1name);
+                                    msgcontent = "{126029}" + WorkflowRequestMessage.getBoldDetailInfo(decid1name) + "{83230}{15772}";
+                                }
+                            } else {
+                                filedvaluename = addVirturalname(virtualname, filedvaluename);
+                                msgcontent = WorkflowRequestMessage.getBoldInfo(filedvaluename) + "{83230}{15393}";
+                            }
+                            break;
+                        case 9:  //文档字段部门
+                            msgrs = new RecordSet();
+                            msgrs.execute("select docdepartmentid,docsubject from DocDetail where id = " + cachefieldvalue);
+                            String docdepartmentiddp = "";
+                            String docsubjectdp = "";
+                            if (msgrs.next()) {
+                                docdepartmentiddp = msgrs.getString(1);
+                                docsubjectdp = msgrs.getString(2);
+                            }
+
+                            if (checkidvalid(docdepartmentiddp)) {
+                                dci = new DepartmentComInfo();
+                                String dpname = dci.getDepartmentname(docdepartmentiddp);
+                                msgcontent = "{126529}{15393}" + WorkflowRequestMessage.getBoldDetailInfo(dpname) + "{83230}{683}" + levelstr + "{126522}";
+                            } else {
+                                msgcontent = "{126529}" + WorkflowRequestMessage.getBoldDetailInfo(docsubjectdp) + "{83230}{15393}";
+                            }
+                            break;
+                        case 33:
+                            msgrs = new RecordSet();
+                            msgrs.execute("select docdepartmentid,docsubject from DocDetail where id = " + cachefieldvalue);
+                            String docdepartmentid = "";
+                            String docsubject = "";
+                            if (msgrs.next()) {
+                                docdepartmentid = msgrs.getString(1);
+                                docsubject = msgrs.getString(2);
+                            }
+                            dci = new DepartmentComInfo();
+                            String docsubcompanyid1 = dci.getSubcompanyid1(docdepartmentid);
+                            if (checkidvalid(docsubcompanyid1)) {
+                                scci = new SubCompanyComInfo();
+                                msgcontent = "{126529}{83562}{19799}" + WorkflowRequestMessage.getBoldDetailInfo(scci.getSubcompanyname(docsubcompanyid1)) + "{83230}{683}" + levelstr + "{126522}";
+                            } else {
+                                msgcontent = "{126529}" + WorkflowRequestMessage.getBoldDetailInfo(docsubject) + "{83230}{19799}";
+                            }
+                            break;
+                        case 34: //项目字段分部
+                            msgrs = new RecordSet();
+                            msgrs.execute("SELECT department,manager FROM Prj_ProjectInfo WHERE id = " + cachefieldvalue);
+                            if (msgrs.next()) {
+                                String xmfbdepart = Util.null2String(msgrs.getString(1));
+                                String xmfbmanager = Util.null2String(msgrs.getString(2));
+                                if (checkidvalid(xmfbdepart)) {
+                                    dci = new DepartmentComInfo();
+                                    String xmfbspid = dci.getSubcompanyid1(xmfbdepart);
+                                    if (checkidvalid(xmfbspid)) {
+                                        scci = new SubCompanyComInfo();
+                                        msgcontent = "{33553}" + WorkflowRequestMessage.getBoldDetailInfo(scci.getSubcompanyname(xmfbspid)) + "{83230}{683}" + levelstr + "{126522}";
+                                    } else {
+                                        rci = new ResourceComInfo();
+                                        msgcontent = "{16573}" + WorkflowRequestMessage.getBoldDetailInfo(rci.getLastname(xmfbmanager)) + "{83230}{19799}";
+                                    }
+                                } else {
+                                    rci = new ResourceComInfo();
+                                    msgcontent = "{16573}" + WorkflowRequestMessage.getBoldDetailInfo(rci.getLastname(xmfbmanager)) + "{83230}{19799}";
+                                }
+                            }
+                            break;
+                        case 11: //项目字段部门
+                            msgrs = new RecordSet();
+                            msgrs.execute("SELECT department,manager FROM Prj_ProjectInfo WHERE id = " + cachefieldvalue);
+                            if (msgrs.next()) {
+                                String xmbmdepart = Util.null2String(msgrs.getString(1));
+                                String xmbmmanager = Util.null2String(msgrs.getString(2));
+                                rci = new ResourceComInfo();
+                                if (checkidvalid(xmbmdepart)) {
+                                    dci = new DepartmentComInfo();
+                                    msgcontent = "{126029}" + WorkflowRequestMessage.getBoldDetailInfo(dci.getDepartmentname(xmbmdepart)) + "{83230}{683}" + levelstr + "{126522}";
+                                } else {
+                                    rci = new ResourceComInfo();
+                                    msgcontent = "{16573}" + WorkflowRequestMessage.getBoldDetailInfo(rci.getLastname(xmbmmanager)) + "{83230}{15393}";
+                                }
+                            }
+                            break;
+                        case 12: //项目字段成员
+                            msgrs = new RecordSet();
+                            msgrs.execute("SELECT members FROM Prj_ProjectInfo WHERE id =" + cachefieldvalue);
+                            if (msgrs.next()) {
+                                String members = Util.null2String(msgrs.getString(1));
+                                pici = new ProjectInfoComInfo();
+                                String projectname = pici.getProjectInfoname(cachefieldvalue);
+                                if (checkidvalid(members)) {
+                                    msgcontent = "{30046}" + WorkflowRequestMessage.getBoldDetailInfo(projectname) + "{126526}{30046}{125212}{126530}{83230}{683}" + levelstr + "{126522}";
+                                } else {
+                                    msgcontent = "{30046}" + WorkflowRequestMessage.getBoldDetailInfo(projectname) + "{83230}{30046}{125212}";
+                                }
+                            }
+                            break;
+                        case 14: //资产字段部门
+                            msgrs = new RecordSet();
+                            msgrs.execute("select departmentid,name from CptCapital where id = " + cachefieldvalue);
+                            if (msgrs.next()) {
+                                String zcbm = Util.null2String(msgrs.getString(1));
+                                String zcmc = Util.null2String(msgrs.getString(2));
+                                rci = new ResourceComInfo();
+                                if (checkidvalid(zcbm)) {
+                                    dci = new DepartmentComInfo();
+                                    msgcontent = "{126029}" + WorkflowRequestMessage.getBoldDetailInfo(dci.getDepartmentname(zcbm)) + "{83230}{683}" + levelstr + "{126522}";
+                                } else {
+                                    msgcontent = "{30044}" + WorkflowRequestMessage.getBoldDetailInfo(zcmc) + "{83230}{15393}";
+                                }
+                            }
+                            break;
+                        case 35: //资产字段分部
+                            msgrs = new RecordSet();
+                            msgrs.execute("select departmentid,name from CptCapital where id = " + cachefieldvalue);
+                            if (msgrs.next()) {
+                                String zcbm = Util.null2String(msgrs.getString(1));
+                                String zcmc = Util.null2String(msgrs.getString(2));
+                                if (checkidvalid(zcbm)) {
+                                    dci = new DepartmentComInfo();
+                                    String zcfb = dci.getSubcompanyid1(zcbm);
+                                    if (checkidvalid(zcfb)) {
+                                        scci = new SubCompanyComInfo();
+                                        msgcontent = "{33553}" + WorkflowRequestMessage.getBoldDetailInfo(scci.getSubcompanyname(zcfb)) + "{83230}{683}" + levelstr + "{126522}";
+                                    } else {
+                                        msgcontent = "{30044}" + WorkflowRequestMessage.getBoldDetailInfo(zcmc) + "{83230}{19799}";
+                                    }
+                                } else {
+                                    rci = new ResourceComInfo();
+                                    msgcontent = "{30044}" + WorkflowRequestMessage.getBoldDetailInfo(zcmc) + "{83230}{15393}";
+                                }
+                            }
+                            break;
+                        case 45: //客户字段分部
+                            //客户管理员所属分部
+                            msgrs = new RecordSet();
+                            msgrs.execute("select manager from CRM_CustomerInfo where id = " + cachefieldvalue);
+                            if (msgrs.next()) {
+                                String crmmanager = Util.null2String(msgrs.getString(1));
+                                if (checkidvalid(crmmanager)) {
+                                    rci = new ResourceComInfo();
+                                    String crmscciid = rci.getSubCompanyID(crmmanager);
+                                    if (checkidvalid(crmscciid)) {
+                                        scci = new SubCompanyComInfo();
+                                        msgcontent = "{33553}" + WorkflowRequestMessage.getBoldDetailInfo(scci.getSubcompanyname(crmscciid)) + "{83230}{683}" + levelstr + "{126522}";
+                                    } else {
+                                        msgcontent = "{84236}{144}" + WorkflowRequestMessage.getBoldDetailInfo(rci.getLastname(crmmanager)) + "{83230}{19799}";
+                                    }
+                                } else {
+                                    msgcontent = "{84236}{144}{126531}";
+                                }
+                            }
+                            break;
+                        case 46: //客户字段部门
+                            msgrs = new RecordSet();
+                            msgrs.execute("select manager from CRM_CustomerInfo where id = " + cachefieldvalue);
+                            if (msgrs.next()) {
+                                String crmmanager = Util.null2String(msgrs.getString(1));
+                                if (checkidvalid(crmmanager)) {
+                                    rci = new ResourceComInfo();
+                                    String crmdpid = rci.getDepartmentID(crmmanager);
+                                    if (checkidvalid(crmdpid)) {
+                                        dci = new DepartmentComInfo();
+                                        msgcontent = "{33553}" + WorkflowRequestMessage.getBoldDetailInfo(dci.getDepartmentname(crmdpid)) + "{83230}{683}" + levelstr + "{126522}";
+                                    } else {
+                                        msgcontent = "{84236}{144}" + WorkflowRequestMessage.getBoldDetailInfo(rci.getLastname(crmmanager)) + "{83230}{15393}";
+                                    }
+                                } else {
+                                    msgcontent = "{84236}{144}{126531}";
+                                }
+                            }
+                            break;
+                        case 43: //人力资源字段-角色
+                            roleci = new RolesComInfo();
+                            String rolenames = "";
+                            for (String roleid : cachefieldvalue.split(",")) {
+                                rolenames += roleci.getRolesRemark(roleid) + ",";
+                            }
+                            if (rolenames.length() > 0) {
+                                rolenames = rolenames.substring(0, rolenames.length() - 1);
+                            }
+                            msgcontent = "{122}" + WorkflowRequestMessage.getBoldDetailInfo(rolenames) + "{15808}{18936}";
+                            break;
+                        case 49: //人力资源字段-收（发）文单位
+                            druci = new DocReceiveUnitComInfo();
+                            String drucinames = "";
+                            for (String druciid : cachefieldvalue.split(",")) {
+                                drucinames += druci.getReceiveUnitName(druciid) + ",";
+                            }
+                            if (drucinames.length() > 0) {
+                                drucinames = drucinames.substring(0, drucinames.length() - 1);
+                            }
+                            msgcontent = "{19309}" + WorkflowRequestMessage.getBoldDetailInfo(drucinames) + "{15808}{126532}";
+                            break;
+                        case 48: //人力资源字段-会议室的管理员
+                            msgrs = new RecordSet();
+                            msgrs.execute("SELECT hrmid,name FROM MeetingRoom where id=" + cachefieldvalue);
+                            if (msgrs.next()) {
+                                String hrmid = msgrs.getString(1);
+                                if (!checkidvalid(hrmid)) {
+                                    msgcontent = "{780}" + WorkflowRequestMessage.getBoldDetailInfo(Util.null2String(msgrs.getString(2))) + "{6}{1507}";
+                                }
+                            }
+                            break;
+                        case 6:  //人力资源字段经理
+                            rci = new ResourceComInfo();
+                            filedvaluename = rci.getLastnames(cachefieldvalue);
+                            filedvaluename = addVirturalname(virtualname, filedvaluename);
+                            msgcontent = WorkflowRequestMessage.getBoldInfo(filedvaluename) + "{83230}{15709}";
+                            break;
+                        case 5:  //人力资源字段本人
+                        case 8:  //文档字段所有者
+                        case 10: //项目字段经理
+                            msgrs = new RecordSet();
+                            msgrs.execute("SELECT manager FROM Prj_ProjectInfo WHERE id =" + cachefieldvalue);
+                            String pm = "";
+                            if (msgrs.next()) {
+                                pm = Util.null2String(msgrs.getString(1));
+                                msgcontent = "{16573}" + WorkflowRequestMessage.getBoldDetailInfo(getTurnoverHrmname(pm, msgrs)) + "{126527}";
+                            }
+                            break;
+                        case 47: //项目字段经理的经理
+                            msgrs = new RecordSet();
+                            msgrs.execute("SELECT manager FROM Prj_ProjectInfo WHERE id =" + cachefieldvalue);
+                            String promanager = "";
+                            if (msgrs.next()) {
+                                promanager = Util.null2String(msgrs.getString(1));
+                                if (checkidvalid(promanager)) {
+                                    rci = new ResourceComInfo();
+                                    String _managerid = rci.getManagerID(promanager);
+                                    if (checkidvalid(_managerid)) {
+                                        msgcontent = "{16573}" + WorkflowRequestMessage.getBoldDetailInfo(rci.getLastname(promanager)) + "{126526}{15709}{126527}";
+                                    } else {
+                                        msgcontent = "{16573}" + WorkflowRequestMessage.getBoldDetailInfo(rci.getLastname(promanager)) + "{83230}{15709}";
+                                    }
+                                } else {
+                                    msgcontent = "{16573}{6}";
+                                }
+                            }
+                            break;
+                        case 13: //资产字段管理员
+                        case 15: //客户字段经理
+                            msgrs = new RecordSet();
+                            msgrs.execute("select manager from CRM_CustomerInfo where id = " + cachefieldvalue);
+                            if (msgrs.next()) {
+                                String crm = Util.null2String(msgrs.getString(1));
+                                rci = new ResourceComInfo();
+                                msgcontent = Util.null2String(rci.getLastname(crm)) + "{126527}";
+                            }
+                            break;
+                        case 44: //客户字段经理的经理
+                            msgrs = new RecordSet();
+                            msgrs.execute("select manager from CRM_CustomerInfo where id = " + cachefieldvalue);
+                            if (msgrs.next()) {
+                                String crmmanager = Util.null2String(msgrs.getString(1));
+                                if (checkidvalid(crmmanager)) {
+                                    rci = new ResourceComInfo();
+                                    String crmparentmanager = rci.getManagerID(crmmanager);
+                                    String crmmanagername = rci.getLastname(crmmanager);
+                                    if (checkidvalid(crmparentmanager)) {
+                                        msgcontent = "{84236}{144}" + WorkflowRequestMessage.getBoldDetailInfo(crmmanagername) + "{126526}{15709}{126527}";
+                                    } else {
+                                        msgcontent = "{84236}{144}" + WorkflowRequestMessage.getBoldDetailInfo(crmmanagername) + "{83230}{15709}";
+                                    }
+                                } else {
+                                    msgcontent = "{84236}{144}{6}";
+                                }
+                            }
+                            break;
+                        case 16: //客户字段联系人经理
+                            msgrs = new RecordSet();
+                            msgrs.execute("select manager,fullname from CRM_CustomerContacter where customerid = " + cachefieldvalue);
+                            if (msgrs.getCounts() > 0) {
+                                String lxrnames = "";
+                                boolean haslxrmanager = false;
+                                while (msgrs.next()) {
+                                    String lxrmanager = Util.null2String(msgrs.getString(1));
+                                    String lxrfullname = Util.null2String(msgrs.getString(2));
+                                    if (StringUtil.isNotNull(lxrmanager)) {
+                                        haslxrmanager = true;
+                                    } else {
+                                        lxrnames += lxrfullname + ",";
+                                    }
+                                }
+                                if (!haslxrmanager) {
+                                    if (lxrnames.length() > 0) {
+                                        lxrnames = lxrnames.substring(0, lxrnames.length() - 1);
+                                    }
+                                    msgcontent = "{84236}{572}" + WorkflowRequestMessage.getBoldDetailInfo(lxrnames) + "{6}{144}";
+                                }
+                            } else {
+                                msgrs.execute("select name from CRM_CustomerInfo where id = " + cachefieldvalue);
+                                if (msgrs.next()) {
+                                    msgcontent = "{84236}" + WorkflowRequestMessage.getBoldDetailInfo(Util.null2String(msgrs.getString(1))) + "{6}{572}";
+                                }
+                            }
+                            break;
+                        case 50: //人力资源字段-角色人员
+                            break;
+                    }
+                }
+                break;
+            case 17://创建人本人
+            case 18://创建人经理
+                String creatermanagerid = "";
+                rci = new ResourceComInfo();
+                if (virtualid < -1) {
+                    String[] reInfo = getResourceVirtualInfos(virtualid, String.valueOf(creater));
+                    creatermanagerid = reInfo[0];
+                } else {
+                    creatermanagerid = rci.getManagerID(String.valueOf(creater));
+                }
+                if (!checkidvalid(creatermanagerid)) {
+                    String createrlastname = rci.getLastname(String.valueOf(creater));
+                    createrlastname = addVirturalname(virtualname, createrlastname);
+                    msgcontent = WorkflowRequestMessage.getBoldInfo(createrlastname) + "{83230}{15709}";
+                }
+                break;
+            case 36: //创建人下属
+                String allsubstr = "";
+                if (virtualid < -1) {//如果是虚拟维度，则初始化相应查询表
+                    RecordSet crs = new RecordSet();
+                    crs.executeSql("select id from HrmResourceVirtualView where managerid =" + creater + " and virtualtype = " + virtualid);
+                    while (crs.next()) {
+                        allsubstr += "," + crs.getString("id");
+                    }
+                } else {
+                    AllSubordinate asub = new AllSubordinate();
+                    try {
+                        asub.getAll("" + creater);
+                    } catch (Exception asube) {
+                    }
+                    while (asub.next()) {
+                        if (!(asub.getSubordinateID()).equals(""))
+                            allsubstr += "," + asub.getSubordinateID();
+                    }
+                }
+                rci = new ResourceComInfo();
+                String creatername = rci.getLastname(String.valueOf(creater));
+                creatername = addVirturalname(virtualname, creatername);
+                if (checkidvalid(allsubstr)) {
+                    msgcontent = WorkflowRequestMessage.getBoldInfo(creatername) + "{126526}{442}{126530}{83230}{683}" + levelstr + "{126522}";
+                } else {
+                    msgcontent = WorkflowRequestMessage.getBoldInfo(creatername) + "{83230}{442}";
+                }
+                break;
+            case 37: //创建人本分部
+                if (creatertype == 0) {
+                    rci = new ResourceComInfo();
+                    String cjrfb = "";
+                    if (virtualid < -1) {
+                        String[] reInfo = getResourceVirtualInfos(virtualid, String.valueOf(creater));
+                        cjrfb = reInfo[2];
+                    } else {
+                        cjrfb = rci.getSubCompanyID(String.valueOf(creater));
+                    }
+                    String cjrname = rci.getLastname(String.valueOf(creater));
+                    if (checkidvalid(cjrfb)) {
+                        String cjrfbname = getSubCompanyName(virtualid, cjrfb);
+                        cjrfbname = addVirturalname(virtualname, cjrfbname);
+                        msgcontent = "{33553}" + WorkflowRequestMessage.getBoldDetailInfo(cjrfbname) + "{83230}{683}" + levelstr + "{126522}";
+                    } else {
+                        cjrname = addVirturalname(virtualname, cjrname);
+                        msgcontent = WorkflowRequestMessage.getBoldInfo(cjrname) + "{83230}{19799}";
+                    }
+                }
+                break;
+            case 19: //创建人本部门
+                if (creatertype == 0) {
+                    rci = new ResourceComInfo();
+                    String cjrbm = "";
+                    if (virtualid < -1) {
+                        String[] reInfo = getResourceVirtualInfos(virtualid, String.valueOf(creater));
+                        cjrbm = reInfo[1];
+                    } else {
+                        cjrbm = rci.getDepartmentID(String.valueOf(creater));
+                    }
+                    String cjrname = rci.getLastname(String.valueOf(creater));
+                    if (checkidvalid(cjrbm)) {
+                        String cjrbmname = getDepartVirtualName(virtualid, cjrbm);
+                        cjrbmname = addVirturalname(virtualname, cjrbmname);
+                        msgcontent = "{33553}" + WorkflowRequestMessage.getBoldDetailInfo(cjrbmname) + "{83230}{683}" + levelstr + "{126522}";
+                    } else {
+                        cjrname = addVirturalname(virtualname, cjrname);
+                        msgcontent = WorkflowRequestMessage.getBoldInfo(cjrname) + "{83230}{15393}";
+                    }
+                }
+                break;
+            case 39: //创建人上级部门
+                rci = new ResourceComInfo();
+                String cjrbm = "";
+                if (virtualid < -1) {
+                    String[] reInfo = getResourceVirtualInfos(virtualid, String.valueOf(creater));
+                    cjrbm = reInfo[1];
+                } else {
+                    cjrbm = rci.getDepartmentID(String.valueOf(creater));
+                }
+                String cjrname = rci.getLastname(String.valueOf(creater));
+                if (checkidvalid(cjrbm)) {
+                    String supdciid = getSupdepartmentID(virtualid, cjrbm);
+                    if (checkidvalid(supdciid)) {
+                        String supdciname = addVirturalname(virtualname, getDepartVirtualName(virtualid, supdciid));
+                        msgcontent = "{126029}" + WorkflowRequestMessage.getBoldDetailInfo(supdciname) + "{83230}{683}" + levelstr + "{126522}";
+                    } else {
+                        String decid1name = addVirturalname(virtualname, getDepartVirtualName(virtualid, cjrbm));
+                        msgcontent = "{126029}" + WorkflowRequestMessage.getBoldDetailInfo(decid1name) + "{83230}{15772}";
+                    }
+                } else {
+                    cjrname = addVirturalname(virtualname, cjrname);
+                    msgcontent = WorkflowRequestMessage.getBoldInfo(cjrname) + "{83230}{15393}";
+                }
+                break;
+            case 40: //节点操作者本人
+                String nodename = WorkflowRequestMessage.getWorkflowNodename(objid);
+                msgcontent = "{33417}" + WorkflowRequestMessage.getBoldDetailInfo(nodename) + "{126521}";
+                break;
+            case 41: //节点操作者经理
+                msgrs = new RecordSet();
+                nodename = WorkflowRequestMessage.getWorkflowNodename(objid);
+                String userids = getNodeUserIds(msgrs, objid);
+                if (checkidvalid(userids)) {
+                    rci = new ResourceComInfo();
+                    String nodeusernames = "";
+                    for (String userid : userids.split(",")) {
+                        if (checkidvalid(userid)) {
+                            nodeusernames += rci.getLastname(userid) + ",";
+                        }
+                    }
+                    if (nodeusernames.length() > 0) {
+                        nodeusernames = nodeusernames.substring(0, nodeusernames.length() - 1);
+                    }
+                    nodeusernames = addVirturalname(virtualname, nodeusernames);
+                    msgcontent = "{33417}{99}" + WorkflowRequestMessage.getBoldDetailInfo(nodeusernames) + "{83230}{15709}";
+                } else {
+                    nodename = addVirturalname(virtualname, nodename);
+                    msgcontent = "{33417}" + WorkflowRequestMessage.getBoldDetailInfo(nodename) + "{126533}，{83230}{99}";
+                }
+                break;
+            case 99: //矩阵相关
+                msgcontent = checkUseridsByMatrix(String.valueOf(detailid));
+                break;
+            case 20://门户相关-客户类型
+                msgcontent = "{126537}" + objname + "{126538}{83230}{683}" + levelstr + "{126526}{84236}";
+                break;
+            case 21://门户相关-客户状态
+                msgcontent = "{126535}" + objname + "{126538}{83230}{683}" + levelstr + "{126526}{84236}";
+                break;
+            case 22://门户相关-客户部门
+                msgcontent = "{126536}" + objname + "{126538}{83230}{683}" + levelstr + "{126526}{84236}";
+                break;
+            case 23://门户相关-客户经理
+                if (StringUtil.isNull(cachefieldvalue)) {
+                    objname = WorkflowRequestMessage.getBoldDetailInfo(this.getObjName(type, objid, bhxj, language, virtualid, level, detailid, false));
+                    msgcontent = "{21740}" + objname + "{126520}";
+                } else {
+                    rci = new ResourceComInfo();
+                    String crmmanagernames = "";
+                    for (String crmmanager : cachefieldvalue.split(",")) {
+                        crmmanagernames = rci.getLastname(crmmanager) + "，";
+                    }
+                    if (crmmanagernames.length() > 0) {
+                        crmmanagernames = crmmanagernames.substring(0, crmmanagernames.length() - 1);
+                    }
+                    msgcontent = "{84236}{144}{126151}" + WorkflowRequestMessage.getBoldDetailInfo(crmmanagernames) + "{126526}{84236}{126530}{83230}{683}" + levelstr + "{126526}{84236}";
+                }
+                break;
+            case 24://门户相关-客户字段本人
+                if (StringUtil.isNull(cachefieldvalue)) {
+                    objname = WorkflowRequestMessage.getBoldDetailInfo(this.getObjName(type, objid, bhxj, language, virtualid, level, detailid, false));
+                    msgcontent = "{21740}" + objname + "{126520}";
+                } else {
+                    cici = new CustomerInfoComInfo();
+                    String crmname = Util.null2String(cici.getCustomerInfoname(cachefieldvalue));
+                    msgcontent = "{84236}" + WorkflowRequestMessage.getBoldDetailInfo(crmname) + "{126534}";
+                }
+                break;
+            case 25:////门户相关-所有客户
+                msgcontent = "{83230}{683}" + levelstr + "{126526}{84236}";
+                break;
+            default:
+                msgcontent = "{127306}";
+        }
+        return WorkflowRequestMessage.assemMsgInfo(msgcontent, languageid);
+    }
+
+    private String getResourceVirtualManageId(int virtualid, int userid) throws Exception {
+        RecordSet rs = new RecordSet();
+        rs.executeQuery(" select * from HrmResourceVirtualView where id = ? and virtualtype = ?", userid, virtualid);
+        if (rs.next()) {
+            return rs.getString("managerid");
+        }
+        return "";
+    }
+
+    /**
+     * 查询虚拟维度用户部门
+     *
+     * @param virtualid
+     * @param resourceid
+     * @return
+     */
+    private String[] getResourceVirtualInfos(int virtualid, String resourceid) {
+        String[] rsInfo = new String[]{"", "", ""};
+        RecordSet rs = new RecordSet();
+        rs.executeQuery("select managerid,departmentid,subcompanyid1  from HrmResourceVirtualView where id = ? and virtualtype = ?", resourceid, virtualid);
+        if (rs.next()) {
+            rsInfo[0] = rs.getString("managerid");
+            rsInfo[1] = rs.getString("departmentid");
+            rsInfo[2] = rs.getString("subcompanyid1");
+        }
+        return rsInfo;
+    }
+
+    /**
+     * 查询部门名称
+     *
+     * @param virtualid
+     * @param departmentid
+     * @return
+     */
+    private String getDepartVirtualName(int virtualid, String departmentid) {
+        if (virtualid < -1) {
+            RecordSet rs = new RecordSet();
+            rs.executeQuery("select departmentname from HrmDepartmentAllView where id = ? and virtualtype = ?", departmentid, virtualid);
+            if (rs.next()) {
+                return rs.getString("departmentname");
+            }
+        } else {
+            DepartmentComInfo dci;
+            try {
+                dci = new DepartmentComInfo();
+                return dci.getDepartmentname(departmentid);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+        return "";
+    }
+
+    /**
+     * 查询分部名称
+     *
+     * @param virtualid
+     * @param subcompanyid1
+     * @return
+     */
+    private String getSubCompanyName(int virtualid, String subcompanyid1) {
+        if (virtualid < -1) {
+            RecordSet rs = new RecordSet();
+            rs.executeQuery("select subcompanyname from HrmSubCompanyAllView where id = ? and virtualtype = ?", subcompanyid1, virtualid);
+            if (rs.next()) {
+                return rs.getString("subcompanyname");
+            }
+        } else {
+            try {
+                SubCompanyComInfo scci = new SubCompanyComInfo();
+                return scci.getSubCompanyname(subcompanyid1);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+        return "";
+    }
+
+    /**
+     * 查询上级部门ID
+     *
+     * @param virtualid
+     * @param departmentid
+     * @return
+     */
+    private String getSupdepartmentID(int virtualid, String departmentid) {
+        if (virtualid < -1) {
+            RecordSet rs = new RecordSet();
+            rs.executeQuery("select supdepid from HrmDepartmentAllView  where id = ? and virtualtype = ?", departmentid, virtualid);
+            if (rs.next()) {
+                return rs.getString("supdepid");
+            }
+        } else {
+            DepartmentComInfo dci;
+            try {
+                dci = new DepartmentComInfo();
+                return dci.getDepartmentsupdepid(departmentid);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+        return "";
+
+    }
+
+    private String addVirturalname(String virtualname, String desc) {
+        if (StringUtil.isNotNull(virtualname)) {
+            desc = desc + "（" + virtualname + "）";
+        }
+        return desc;
+    }
+
+    /**
+     * 操作者不在职提示
+     *
+     * @param type      在查询操作者sql中未加人员状态条件的类型
+     * @param lastnames
+     * @param objid
+     * @return
+     */
+    private String getOperatorNotWorkingInfo(int type, int objid, String lastnames, int groupdetailid) {
+        String msg = "";
+        ResourceComInfo rci = null;
+        try {
+            rci = new ResourceComInfo();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        if (lastnames.length() > 0) {
+            lastnames = lastnames.substring(0, lastnames.length() - 1);
+        } else {
+            return msg;
+        }
+
+        String lastnametemp = WorkflowRequestMessage.getBoldDetailInfo(lastnames);
+
+        switch (type) {
+            case 48:                        //人力资源字段-会议室的管理员
+                msg = "{780}{1507}" + lastnametemp + "{126527}";
+                break;
+            case 6:                         // 人力资源字段经理
+                msg = WorkflowRequestMessage.getBoldInfo(rci.getLastname(cachefieldvalue)) + "{126526}{15709}" + lastnames + "{126527}";
+                break;
+            case 8:                         // 文档字段所有者
+                msg = "{126529}{83562}" + lastnametemp + "{126527}";
+                break;
+            case 10:                        // 项目字段经理
+                msg = "{16573}" + lastnametemp + "{126527}";
+                break;
+            case 13:                        // 资产字段所有者
+                msg = "{30044}{1507}" + lastnametemp + "{126527}";
+                break;
+            case 15:                        // 客户字段经理
+                msg = "{84236}{144}" + lastnametemp + "{126527}";
+                break;
+            case 16:                        // 客户联系人经理
+                msg = "{572}{144}" + lastnametemp + "{126527}";
+                break;
+            case 18:                              //创建人经理
+                msg = WorkflowRequestMessage.getBoldInfo(Util.null2String(rci.getLastname(String.valueOf(creater)))) + "{126526}{15709}{126527}";
+                break;
+            case 40:                        //节点操作者本人
+                String nodename = WorkflowRequestMessage.getWorkflowNodename(objid);
+                msg = "{33417}" + WorkflowRequestMessage.getBoldDetailInfo(nodename) + "{126526}{99}" + lastnametemp + "{126527}";
+                break;
+            case 41:                        //节点操作者经理
+                RecordSet msgrs = new RecordSet();
+                nodename = WorkflowRequestMessage.getWorkflowNodename(objid);
+                String userids = getNodeUserIds(msgrs, objid);
+                if (checkidvalid(userids)) {
+                    String nodeusernames = "";
+                    for (String userid : userids.split(",")) {
+                        if (checkidvalid(userid)) {
+                            nodeusernames += rci.getLastname(userid) + ",";
+                        }
+                    }
+                    if (nodeusernames.length() > 0) {
+                        nodeusernames = nodeusernames.substring(0, nodeusernames.length() - 1);
+                    }
+                    msg = "{33417}{99}" + WorkflowRequestMessage.getBoldDetailInfo(nodeusernames) + "{126526}{15709}" + lastnametemp + "{126527}";
+                }
+                break;
+            case 99:
+                msg = checkUseridsByMatrix(String.valueOf(groupdetailid));
+                break;
+            default:
+                msg = WorkflowRequestMessage.getBoldInfo(lastnames) + "{126527}";
+                break;
+        }
+        return WorkflowRequestMessage.assemMsgInfo(msg, languageid);
+    }
+
+    private String getGroupDetailObjName(int objid, int language) {
+        String name = "";
+        String _sql = "";
+        RecordSet _rs = new RecordSet();
+        if (isbill == 0) {
+            _sql = "select * from (";
+            _sql += " select workflow_formdict.id as id,workflow_fieldlable.fieldlable as name,0 viewtype,0 groupid from workflow_formdict,workflow_formfield,workflow_fieldlable where  workflow_fieldlable.isdefault=1 and workflow_fieldlable.formid = workflow_formfield.formid and workflow_fieldlable.fieldid = workflow_formfield.fieldid and  workflow_formfield.fieldid= workflow_formdict.id and (workflow_formfield.isdetail<>'1' or workflow_formfield.isdetail is null) and workflow_formfield.formid=" + formid + " and workflow_formdict.id = " + objid;      // 包括多人力资源字段
+            _sql += " union all ";
+            _sql += " SELECT workflow_formdictdetail.id AS id,workflow_fieldlable.fieldlable AS name,1 viewtype,workflow_formfield.groupId + 1 FROM workflow_formdictdetail,workflow_formfield,workflow_fieldlable WHERE workflow_fieldlable.isdefault = 1 AND workflow_fieldlable.formid = workflow_formfield.formid AND workflow_fieldlable.fieldid = workflow_formfield.fieldid AND workflow_formfield.fieldid = workflow_formdictdetail.id AND workflow_formfield.isdetail = '1' AND workflow_formfield.formid = " + formid + " and workflow_formdictdetail.id = " + objid;
+            _sql += " )t order by viewtype asc,groupid asc,id asc";
+        } else {
+            _sql = "select * from (";
+            _sql += " select id as id , fieldlabel as name,0 viewtype,0 groupid from workflow_billfield where billid=" + formid + " and id = " + objid + " and viewtype = 0";
+            _sql += " union all";
+            _sql += " select a.id, fieldlabel as name,1 viewtype,b.orderid groupid from workflow_billfield a,Workflow_billdetailtable b where a.billid = b.billid and a.detailtable = b.tablename and a.billid=" + formid + " and viewtype = 1 and a.id = " + objid;
+            _sql += " )t order by viewtype asc,groupid asc,id asc";
+        }
+        _rs.execute(_sql);
+        if (_rs.next()) {
+            String viewtype = _rs.getString("viewtype");
+            String groupid = _rs.getString("groupid");
+            if (isbill == 0) {
+                name = _rs.getString("name");
+            } else {
+                name = SystemEnv.getHtmlLabelName(Util.getIntValue(_rs.getString("name")), language);
+            }
+            if ("1".equals(viewtype)) {
+                name += "（" + SystemEnv.getHtmlLabelName(17463, language) + groupid + "）";
+            }
+        }
+        return name;
+    }
+
+    /**
+     * 非归档节点：所有类型设置均不找离职人员
+     * 归档节点：
+     * 1、节点操作者(40)、指定人员(3) 类型 读取配置文件判断是否过滤离职人员
+     * 2、创建人本人(17) 类型不过滤离职
+     *
+     * @param nodetype 节点类型
+     * @param type     操作者类型
+     * @return true : 过滤离职人员  false : 不过滤离职人员
+     */
+    private boolean getIsDimissionByProp(String nodetype, int type) {
+        boolean isFilter = true;
+        if ("3".equals(nodetype)) {
+            String filterType = Util.null2String(getPropValue("workflow_isDimission", "filterType")).trim();
+            String isDimission = Util.null2String(getPropValue("workflow_isDimission", "isDimission")).trim();
+            if ("0".equals(isDimission) && "".equals(filterType)) {
+                filterType = "3";
+            }
+            if (!"".equals(filterType)) {
+                if ("all".equalsIgnoreCase(filterType)) {
+                    isFilter = false;
+                } else {
+                    if (Util.splitString2List(filterType, ",").contains(type + "")) {
+                        isFilter = false;
+                    }
+                }
+            }
+        }
+        return isFilter;
+    }
+
+    /**
+     * 如果下一节点是必须通过，则清除别的节点错误消息
+     *
+     * @param cacheBuffers
+     */
+    private void hasmustpassnodeClearMsg(List<String> cacheBuffers) {
+        if (cacheBuffers.size() > 0) {
+            String messagecontent = this.getMessagecontent();
+            JSONObject json;
+            try {
+                json = new JSONObject(messagecontent);
+                json.put("details", errorInfoMsgBuffer.toString().replaceFirst(cacheBuffers.get(0), ""));
+                this.setMessagecontent(json.toString());
+            } catch (JSONException e) {
+                e.printStackTrace();
+            }
+        }
+    }
+
+    private Hashtable deleteOperateBySecLevel2(Hashtable operatorsht, int requestId, StringBuilder messageContent) {
+        RequestSecLevelBiz secLevelBiz = new RequestSecLevelBiz();
+        HrmClassifiedProtectionBiz hrmSecBiz = new HrmClassifiedProtectionBiz();
+        boolean isOpenSecLevel = HrmClassifiedProtectionBiz.isOpenClassification();//是否开启涉密系统
+
+        if (isOpenSecLevel) {
+            try {
+                int requestSecLevel = secLevelBiz.getSecLevelByRequestId(requestId + "");
+                ResourceComInfo rci = new ResourceComInfo();
+                Iterator operatorIterator = operatorsht.keySet().iterator();
+                Hashtable newOperatorsht = new Hashtable();
+                while (operatorIterator.hasNext()) {
+                    String key = (String) operatorIterator.next();
+                    List<String> operators = (List<String>) operatorsht.get(key);
+                    List<String> newOperators = new ArrayList<>();
+                    for (String operator : operators) {
+                        String[] operatorStr = Util.null2String(operator).split("_");
+                        if (operatorStr != null && operatorStr.length > 0) {
+                            int hrmSecLevel = Util.getIntValue(hrmSecBiz.getMaxResourceSecLevel(new User(Util.getIntValue(operatorStr[0]))));
+                            if (hrmSecLevel > requestSecLevel) {
+                                messageContent.append("，" + rci.getLastname(operatorStr[0]));
+                                writeLog("RequestNodeFlow==根据requestid = " + requestId
+                                        + " requestLevel= " + requestSecLevel + " 过滤操作者 id = " + operatorStr[0] + " userSecLevel = " + hrmSecLevel);
+                                continue;
+                            }
+                        }
+                        newOperators.add(operator);
+                    }
+                    if (newOperators.size() > 0) {
+                        newOperatorsht.put(key, newOperators);
+                    }
+                }
+                return newOperatorsht;
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+
+        return operatorsht;
+    }
+
+    /**
+     * 根据密级过滤不符合条件的操作者
+     *
+     * @return
+     */
+    private ArrayList deleteOperateBySecLevel2(ArrayList operatorshts, int requestId) {
+        if (HrmClassifiedProtectionBiz.isOpenClassification()) {//是否开启涉密系统
+
+            boolean filterMark = false;//过滤标识
+
+            ArrayList newOperatorshts = new ArrayList();
+            StringBuilder messageContent = new StringBuilder();
+            for (Hashtable operatorsht : (ArrayList<Hashtable>) operatorshts) {
+                if (operatorsht.size() == 0) continue;//没有找到操作者，不进行过滤
+
+                Hashtable newOperatorsht = deleteOperateBySecLevel2(operatorsht, requestId, messageContent);
+                filterMark = true;
+                if (newOperatorsht.size() > 0) {
+                    newOperatorshts.add(newOperatorsht);
+                }
+            }
+            //拼接错误消息
+            if (filterMark && operatorshts.size() > 0 && newOperatorshts.size() == 0) {
+                generateErrorMsg4SecLevel(messageContent);
+                return newOperatorshts;
+            }
+        }
+
+        return operatorshts;
+    }
+
+    /**
+     * 根据密级过滤不符合条件的操作者
+     *
+     * @param operatorInfos
+     * @return
+     */
+    private List<OperatorInfoEntity> deleteOperateBySecLevel(List<OperatorInfoEntity> operatorInfos, int requestId) {
+        RequestSecLevelBiz secLevelBiz = new RequestSecLevelBiz();
+        HrmClassifiedProtectionBiz hrmSecBiz = new HrmClassifiedProtectionBiz();
+        boolean isOpenSecLevel = HrmClassifiedProtectionBiz.isOpenClassification();//是否开启涉密系统
+        //开启涉密系统后，操作者找人，需要过滤密级低于当前流程的操作者
+        if (isOpenSecLevel) {
+            int requestSecLevel = secLevelBiz.getSecLevelByRequestId(requestId + "");
+            Iterator<OperatorInfoEntity> iterator = operatorInfos.iterator();
+            while (iterator.hasNext()) {
+                OperatorInfoEntity operatorEntity = iterator.next();
+                int hrmSecLevel = Util.getIntValue(hrmSecBiz.getMaxResourceSecLevel(new User(Util.getIntValue(operatorEntity.getUserId()))));
+                if (hrmSecLevel > requestSecLevel) {
+                    iterator.remove();
+                    writeLog("RequestNodeFlow==根据requestid = " + requestId
+                            + " requestLevel= " + requestSecLevel + " 过滤操作者 id = " + operatorEntity.getUserId() + " userSecLevel = " + hrmSecLevel);
+                    continue;
+                }
+            }
+        }
+        return operatorInfos;
+    }
+
+    /**
+     * 密级过滤掉操作者之后生成错误消息
+     */
+    private void generateErrorMsg4SecLevel(StringBuilder messageContent) {
+        String nextnodename = WorkflowRequestMessage.getWorkflowNodename(nextnodeid);
+        errorInfoMsgBuffer = new StringBuffer();
+        WorkflowRequestMessage.getNodeErrorMsgTitle(errorInfoMsgBuffer, nextnodename, languageid);
+
+        if (!"".equals(messageContent.toString())) {
+            messageContent = new StringBuilder(messageContent.substring(1));
+        }
+
+        assemMsgContent4E9("", "", WorkflowRequestMessage.getBoldInfo(messageContent.toString()) + "{501273}");
+        this.nextnodeids.clear();
+    }
+
+    public void setForceOverNodeId(int forceOverNodeId) {
+        this.forceOverNodeId = forceOverNodeId;
+    }
+
+    public boolean isForceOver() {
+        return isForceOver;
+    }
+
+    public void setForceOver(boolean isForceOver) {
+        this.isForceOver = isForceOver;
+    }
+
+    //add by liaodong for qc76119,76120,54194,64652 start
+    public String getPenetrateId() {
+        return penetrateId;
+    }
+
+    public void setPenetrateId(String penetrateId) {
+        this.penetrateId = penetrateId;
+    }
+
+    public String getLastNodeId() {
+        return lastNodeId;
+    }
+
+    public void setLastNodeId(String lastNodeId) {
+        this.lastNodeId = lastNodeId;
+    }
+
+    //end
+    //add by liaodong for qc48451 in 2013年10月21日 start
+    public boolean isIsfixbill() {
+        return isfixbill;
+    }
+
+    public void setIsfixbill(boolean isfixbill) {
+        this.isfixbill = isfixbill;
+    }
+
+    //add by liaodong for qc86096 in 2013-11-19 start
+    public String getCurrentdate() {
+        return currentdate;
+    }
+    //end
+
+    public void setCurrentdate(String currentdate) {
+        this.currentdate = currentdate;
+    }
+
+    public String getCurrenttime() {
+        return currenttime;
+    }
+
+    public void setCurrenttime(String currenttime) {
+        this.currenttime = currenttime;
+    }
+
+    //end
+    public Map<String, Object> getEh_operatorMap() {
+        return eh_operatorMap;
+    }
+
+    public void setEh_operatorMap(Map<String, Object> eh_operatorMap) {
+        this.eh_operatorMap = eh_operatorMap;
+    }
+
+    public boolean isNeedChooseOperator() {
+        return isNeedChooseOperator;
+    }
+
+    public ArrayList getRequestexceptiontypes() {
+        return requestexceptiontypes;
+    }
+
+    public String getMessageid() {
+        return messageid;
+    }
+
+    public void setMessageid(String messageid) {
+        this.messageid = messageid;
+    }
+
+    public String getMessagecontent() {
+        return messagecontent;
+    }
+
+    public void setMessagecontent(String messagecontent) {
+        this.messagecontent = messagecontent;
+    }
+
+    public User getUser() {
+        return user;
+    }
+
+    public void setUser(User user) {
+        this.user = user;
+    }
+
+    /**
+     * 用于检查是否分叉中间节点退回到普通节点后，普通节点提交直接到退回节点
+     *
+     * @param nodeid   提交节点id
+     * @param tonodeid 提交到节点id
+     * @return
+     */
+    public boolean IsTrunkSubmitToBranch(RecordSet rs, int nodeid, int tonodeid) {
+        boolean iscansubmit = false;
+        // 0,1,2,3,4,5
+        int nodeattr = 0;
+        int tonodeattr = 0;
+        rs.executeSql("SELECT nodeattribute FROM workflow_nodebase WHERE id=" + nodeid);
+        if (rs.next()) {
+            nodeattr = Util.getIntValue(rs.getString("nodeattribute"), 0);
+        }
+        rs.executeSql("SELECT nodeattribute FROM workflow_nodebase WHERE id=" + tonodeid);
+        if (rs.next()) {
+            tonodeattr = Util.getIntValue(rs.getString("nodeattribute"), 0);
+        }
+        if (nodeattr != 2 && tonodeattr == 2) {
+            iscansubmit = true;
+        }
+        return iscansubmit;
+    }
+
+    public boolean isEquals(ArrayList mustpassnodeids, ArrayList nodeids) {
+        boolean ispass = true;
+        for (int i = 0; i < mustpassnodeids.size(); i++) {
+            if (!nodeids.contains(mustpassnodeids.get(i).toString())) {
+                ispass = false;
+                break;
+            }
+        }
+        return ispass;
+    }
+
+    public int getTempnextnodeid() {
+        return tempnextnodeid;
+    }
+
+    public void setTempnextnodeid(int tempnextnodeid) {
+        this.tempnextnodeid = tempnextnodeid;
+    }
+
+    public String getNextnodetype() {
+        return nextnodetype;
+    }
+
+    public void setNextnodetype(String nextnodetype) {
+        this.nextnodetype = nextnodetype;
+    }
+
+    public boolean isHasCoadjutant() {
+        return hasCoadjutant;
+    }
+
+    public int getWorkflowid() {
+        return workflowid;
+    }
+
+    /**
+     * 设置流程ID
+     *
+     * @param workflowid 流程ID
+     */
+    public void setWorkflowid(int workflowid) {
+        this.workflowid = workflowid;
+    }
+
+    public void setSelectNextFlow(boolean selectNextFlow) {
+        isSelectNextFlow = selectNextFlow;
+    }
+
+    public boolean isAutoForecast() {
+        return autoForecast;
+    }
+
+    public void setAutoForecast(boolean autoForecast) {
+        this.autoForecast = autoForecast;
+    }
+
+    public void setIsFromSubmitConfirm(int isFromSubmitConfirm) {
+        this.isFromSubmitConfirm = isFromSubmitConfirm;
+    }
+}
\ No newline at end of file
diff --git a/src/main/youhong_ai_old_src/weaver/xbk_aiyh_jitu/fadada/common/entity/ErrorCodeMsg.java b/src/main/youhong_ai_old_src/weaver/xbk_aiyh_jitu/fadada/common/entity/ErrorCodeMsg.java
new file mode 100644
index 0000000..2251daf
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/xbk_aiyh_jitu/fadada/common/entity/ErrorCodeMsg.java
@@ -0,0 +1,47 @@
+package weaver.xbk_aiyh_jitu.fadada.common.entity;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * <p>发达大错误码</p>
+ * <p>create 2022/6/13 19:11</p>
+ *
+ * @author ayh
+ */
+
+public class ErrorCodeMsg {
+    private static final Map<String,String> ERROR_MAP = new HashMap<>(16);
+
+
+    static {
+        try {
+            ERROR_MAP.put("0","系统异常");
+            ERROR_MAP.put("1","请求成功");
+            ERROR_MAP.put("2","参数校验异常");
+            ERROR_MAP.put("3","参数类型异常");
+            ERROR_MAP.put("4","业务异常");
+            ERROR_MAP.put("5","其他错误，请联系法大大");
+            ERROR_MAP.put("6","待处理");
+            ERROR_MAP.put("7","签名验证失败");
+            ERROR_MAP.put("8","公共参数验证失败");
+            ERROR_MAP.put("9","业务参数验证失败");
+            ERROR_MAP.put("12","类型不支持");
+            ERROR_MAP.put("13","上传文件错误");
+            ERROR_MAP.put("1001003","账号已存在，请登录");
+            ERROR_MAP.put("1001004","个人信息不存在或者未认证");
+            ERROR_MAP.put("1001005","企业信息不存在或者未认证");
+            ERROR_MAP.put("1001007","帐号激活失败，请直接联系管理员");
+            ERROR_MAP.put("1001008","帐号注册失败，请直接联系管理员");
+            ERROR_MAP.put("1001009","企业客户编号无效");
+            ERROR_MAP.put("1001010","个人客户编号无效");
+            ERROR_MAP.put("1002014","实名认证失败");
+        }catch (Exception ignore){
+
+        }
+    }
+
+    public static String getErrorMsgByCode(String code){
+        return ERROR_MAP.get(code);
+    }
+}
diff --git a/src/main/youhong_ai_old_src/weaver/xbk_aiyh_jitu/fadada/common/util/FadadaRequestUtil.java b/src/main/youhong_ai_old_src/weaver/xbk_aiyh_jitu/fadada/common/util/FadadaRequestUtil.java
new file mode 100644
index 0000000..c2cf2b5
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/xbk_aiyh_jitu/fadada/common/util/FadadaRequestUtil.java
@@ -0,0 +1,230 @@
+package weaver.xbk_aiyh_jitu.fadada.common.util;
+
+import aiyh.utils.Util;
+import aiyh.utils.excention.CustomerException;
+import aiyh.utils.httpUtil.ResponeVo;
+import aiyh.utils.httpUtil.util.HttpUtils;
+import com.alibaba.fastjson.JSON;
+import com.google.common.base.Strings;
+import lombok.AccessLevel;
+import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
+import org.apache.commons.codec.binary.Base64;
+import org.apache.commons.codec.binary.Hex;
+import org.apache.log4j.Logger;
+import weaver.xbk_aiyh_jitu.fadada.common.entity.ErrorCodeMsg;
+
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.util.*;
+
+/**
+ * <p>发达大请求工具类</p>
+ * <p>create 2022/6/13 17:07</p>
+ *
+ * @author ayh
+ */
+
+@Data
+public class FadadaRequestUtil {
+    public static final int SUCCESS_CODE = 200;
+    public static final String SUCCESS_CODE_STR = "1";
+    public static final String CODE = "code";
+    public static final String REPETITION_CODE = "1001003";
+    public static final int  ZH= 7;
+    public static final int EN = 8;
+    /**
+     * 调用方身份标识
+     */
+    private String appId = "100000";
+
+    /**
+     * 调用凭证
+     */
+    private String appKey = "BLEshmz8xZPyKRAG4aUiSopt";
+
+    private Integer reTryNum = 5;
+
+
+    @Setter(AccessLevel.NONE)
+    @Getter(AccessLevel.NONE)
+    private final Logger LOG = Util.getLogger();
+
+    @Setter(AccessLevel.NONE)
+    @Getter(AccessLevel.NONE)
+    private final HttpUtils httpUtils = new HttpUtils();
+
+
+    /**
+     * 生成验签通用请求头信息
+     * @param params 请求参数
+     * @return 验签请求头信息
+     */
+    private Map<String,String> digestSignature(Map<String,Object> params){
+//        加密步骤
+//        1、加密请求参数（除字节、文件流参数）
+        String bizContent = getBizContent(params);
+//        2、设置通用参数并生成验签字符串
+        Map<String,String> signMap = new HashMap<>(16);
+        signMap.put("appId",appId);
+        signMap.put("signType","SHA256");
+        signMap.put("timestamp",Util.getTime("yyyy-MM-dd HH:mm:ss"));
+        signMap.put("bizContent",bizContent);
+        String waitSignStr = getSign(signMap);
+        LOG.info("生成的待签字符串为：" + waitSignStr);
+//       3、对待签字符串加密
+        String sha256Str = string2SHA256(waitSignStr);
+        String sha256StrEncryptStr = string2SHA256(sha256Str + appKey);
+        String signStr = Base64.encodeBase64String(sha256StrEncryptStr.getBytes(StandardCharsets.UTF_8));
+        signMap.put("sign",signStr);
+        return signMap;
+    }
+
+
+    /**
+     * 加密字符串
+     * @param str 待加密字符串
+     * @return 加密字符串
+     */
+    private String string2SHA256(String str) {
+        MessageDigest messageDigest;
+        String encodeStr = "";
+        try {
+            messageDigest = MessageDigest.getInstance("SHA-256");
+            byte[] hash = messageDigest.digest(str.getBytes(StandardCharsets.UTF_8));
+            encodeStr = Hex.encodeHexString(hash);
+            LOG.info("进行SHA-256加密：" + encodeStr);
+        } catch (NoSuchAlgorithmException e) {
+            throw new CustomerException("加密SHA-256失败！");
+        }
+        String result = encodeStr.toUpperCase();
+        LOG.info("进行SHA-256加密后转为全大写：" + result);
+        return result;
+    }
+
+    /**
+     * 获取待签字符串
+     * @param params 通用请求头参数信息
+     * @return 待签字符串
+     */
+    private String getSign(Map<String,String> params){
+        ArrayList<Map.Entry<String,String>> entrySetList = new ArrayList<>(params.entrySet());
+        entrySetList.sort(Map.Entry.comparingByKey());
+        StringBuilder sb = new StringBuilder();
+        for (Map.Entry<String, String> entry : entrySetList) {
+            if (!Strings.isNullOrEmpty(entry.getKey())) {
+                String key = entry.getKey();
+                String val = entry.getValue() == null ? "" : entry.getValue();
+                sb.append(key).append("=").append(val).append("&");
+            }
+        }
+        return sb.toString();
+    }
+
+    /**
+     * 获取bizContent
+     * @param params 请求参数，除文件、数据流、二进制数据参数
+     * @return bizContent
+     */
+    private String getBizContent(Map<String,Object> params){
+        String jsonStr = JSON.toJSONString(params);
+        LOG.info("将请求参数转换为json字符串:" + jsonStr);
+        String urlEncoderStr = "";
+        try {
+            urlEncoderStr = URLEncoder.encode(jsonStr, StandardCharsets.UTF_8.name());
+        }catch (Exception e){
+            throw new CustomerException("url编码转换失败！",e);
+        }
+        LOG.info("将json字符串进行url编码：" + urlEncoderStr);
+        String bizContent = Base64.encodeBase64String(urlEncoderStr.getBytes(StandardCharsets.UTF_8));
+        LOG.info("将URL编码字符串进行base64编码：" + bizContent);
+        return bizContent;
+    }
+
+
+    /**
+     * 注册发达大账号信息
+     * @param url 法大大注册账号地址
+     * @param params 法大大注册请求参数
+     * @return 法大大注册响应结果
+     */
+    public Map<String,Object> registerFddAccount(String url,Map<String,Object> params){
+        Map<String, String> signHeardMap = digestSignature(params);
+        ResponeVo responeVo = null;
+        do {
+            try {
+                responeVo = httpUtils.apiPost(url,params, signHeardMap);
+                if(responeVo.getCode() == SUCCESS_CODE){
+                    Map<String, Object> result = responeVo.getEntityMap();
+                    String code = String.valueOf(result.get(CODE));
+                    if(SUCCESS_CODE_STR.equals(code) || REPETITION_CODE.equals(code)){
+                        return result;
+                    }
+                    LOG.error("法大大注册失败！失败原因：" + ErrorCodeMsg.getErrorMsgByCode(code) +
+                            ",(请求参数：" + JSON.toJSONString(params) +
+                            ",请求头信息：" + JSON.toJSONString(signHeardMap) + ")");
+                    if(this.reTryNum <= 0){
+                        throw new CustomerException("法大大注册失败！失败原因：" + ErrorCodeMsg.getErrorMsgByCode(code));
+                    }
+                }
+                Thread.sleep(1000 * 3);
+            }catch (CustomerException e){
+                throw e;
+            }catch (Exception e){
+                if(this.reTryNum <= 0){
+                    throw new CustomerException("发送注册法大大请求失败！" + (responeVo == null ? "" : responeVo.getEntityString()),e);
+                }
+            }
+        }while (this.reTryNum -- <= 0);
+        throw new CustomerException("法大大账号注册失败！循环体未能正确返回数据或抛出异常！");
+    }
+
+    /**
+     * 法大大实名认证
+     * @param url 法大大实名认证查询地址
+     * @param params 参数
+     * @param language 语言
+     * @return 响应数据
+     */
+    public Map<String,Object> certificationPerson(String url,Map<String,Object> params,Integer language){
+        Map<String, String> signHeardMap = digestSignature(params);
+        if(language == ZH){
+//            中文
+            signHeardMap.put("lang","zh");
+        }else if(language == EN) {
+//            英文
+            signHeardMap.put("lang","en");
+        }
+        ResponeVo responeVo = null;
+        do {
+            try {
+                responeVo = httpUtils.apiPost(url,params, signHeardMap);
+                if(responeVo.getCode() == SUCCESS_CODE){
+                    Map<String, Object> result = responeVo.getEntityMap();
+                    String code = String.valueOf(result.get(CODE));
+                    if(SUCCESS_CODE_STR.equals(code) || REPETITION_CODE.equals(code)){
+                        return result;
+                    }
+                    LOG.error("法大大实名认证失败！失败原因：" + ErrorCodeMsg.getErrorMsgByCode(code));
+                    if(this.reTryNum <= 0){
+                        throw new CustomerException("发大大实名认证失败！失败原因：" + ErrorCodeMsg.getErrorMsgByCode(code) +
+                                ",(请求参数：" + JSON.toJSONString(params) +
+                                ",请求头信息：" + JSON.toJSONString(signHeardMap) + ")");
+                    }
+                }
+                Thread.sleep(1000 * 3);
+            }catch (CustomerException e){
+                throw e;
+            }catch (Exception e){
+                if(this.reTryNum <= 0){
+                    throw new CustomerException("发送实名认证法大大大请求失败！" + (responeVo == null ? "" : responeVo.getEntityString()),e);
+                }
+            }
+        }while (this.reTryNum -- <= 0);
+        throw new CustomerException("法大大账号注册失败！循环体未能正确返回数据或抛出异常！");
+    }
+
+}
diff --git a/src/main/youhong_ai_old_src/weaver/xbk_aiyh_jitu/fadada/common/util/ThreadPoolConfig.java b/src/main/youhong_ai_old_src/weaver/xbk_aiyh_jitu/fadada/common/util/ThreadPoolConfig.java
new file mode 100644
index 0000000..732ec0e
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/xbk_aiyh_jitu/fadada/common/util/ThreadPoolConfig.java
@@ -0,0 +1,34 @@
+package weaver.xbk_aiyh_jitu.fadada.common.util;
+
+import com.google.common.util.concurrent.ThreadFactoryBuilder;
+
+import java.util.concurrent.*;
+
+/**
+ * <p></p>
+ * <p>create 2022/6/14 20:20</p>
+ *
+ * @author ayh
+ */
+
+public class ThreadPoolConfig {
+    private static volatile ExecutorService threadPool;
+
+    public static ExecutorService createThreadPoolInstance() {
+        if(threadPool == null){
+            synchronized (ThreadPoolConfig.class){
+                if(threadPool == null){
+                    ThreadFactory threadFactory = new ThreadFactoryBuilder().setNameFormat("thread-pool-aiyh-%d").build();
+                    threadPool =  new ThreadPoolExecutor(10,
+                            16,
+                            60L,
+                            TimeUnit.SECONDS,
+                            new ArrayBlockingQueue<>(100),
+                            threadFactory,
+                            new ThreadPoolExecutor.AbortPolicy());
+                }
+            }
+        }
+        return threadPool;
+    }
+}
diff --git a/src/main/youhong_ai_old_src/weaver/xbk_aiyh_jitu/fadada/mapper/CertificationPersonMapper.java b/src/main/youhong_ai_old_src/weaver/xbk_aiyh_jitu/fadada/mapper/CertificationPersonMapper.java
new file mode 100644
index 0000000..8cd1e87
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/xbk_aiyh_jitu/fadada/mapper/CertificationPersonMapper.java
@@ -0,0 +1,41 @@
+package weaver.xbk_aiyh_jitu.fadada.mapper;
+
+import aiyh.utils.annotation.recordset.ParamMapper;
+import aiyh.utils.annotation.recordset.Select;
+import aiyh.utils.annotation.recordset.SqlMapper;
+import weaver.conn.RecordSet;
+
+/**
+ * <p></p>
+ * <p>create 2022/6/15 10:25</p>
+ *
+ * @author ayh
+ */
+
+@SqlMapper
+public interface CertificationPersonMapper {
+
+    /**
+     * 查询需要实名认证的人员信息
+     * @param tableName 表明
+     * @param certificationStatus 认证状态  - 已认证的状态值
+     * @param certificationStatusField 认证状态字段名
+     * @param customerIdField customerID字段名（法大大的customerId存储的字段名）
+     * @return 人员信息RecordSet
+     */
+    @Select("select * from $t{tableName} " +
+            "where $t{certificationStatusField} <> #{certificationStatus} " +
+            "and ($t{customerIdField} is not null or $t{customerIdField} <> '')")
+    RecordSet selectCertificationPersonUser(@ParamMapper("tableName") String tableName,
+                                            @ParamMapper("certificationStatusField") String certificationStatusField,
+                                            @ParamMapper("certificationStatus") String certificationStatus,
+                                            @ParamMapper("customerIdField") String customerIdField);
+
+    /**
+     * 查询需要实名认证的人员信息数量
+     * @return 数量
+     */
+    @Select("")
+    Integer selectCertificationPersonCount();
+
+}
diff --git a/src/main/youhong_ai_old_src/weaver/xbk_aiyh_jitu/fadada/schedule/CertificationPersonConJob.java b/src/main/youhong_ai_old_src/weaver/xbk_aiyh_jitu/fadada/schedule/CertificationPersonConJob.java
new file mode 100644
index 0000000..8f68f02
--- /dev/null
+++ b/src/main/youhong_ai_old_src/weaver/xbk_aiyh_jitu/fadada/schedule/CertificationPersonConJob.java
@@ -0,0 +1,140 @@
+package weaver.xbk_aiyh_jitu.fadada.schedule;
+
+import aiyh.utils.Util;
+import aiyh.utils.annotation.RequiredMark;
+import aiyh.utils.excention.CustomerException;
+import com.api.xiao.commons.config.entity.RequestMappingConfig;
+import com.api.xiao.commons.config.service.DealWithMapping;
+import lombok.Data;
+import org.apache.log4j.Logger;
+import weaver.conn.RecordSet;
+import weaver.hrm.User;
+import weaver.interfaces.schedule.BaseCronJob;
+import weaver.xbk_aiyh_jitu.fadada.common.util.FadadaRequestUtil;
+import weaver.xbk_aiyh_jitu.fadada.common.util.ThreadPoolConfig;
+import weaver.xbk_aiyh_jitu.fadada.mapper.CertificationPersonMapper;
+
+import java.util.Map;
+import java.util.concurrent.ExecutorService;
+
+
+/**
+ * <p>实名认证接口</p>
+ * <p>create 2022/6/15 09:35</p>
+ *
+ * @author ayh
+ */
+
+@Data
+public class CertificationPersonConJob extends BaseCronJob {
+
+    /**
+     * appId
+     */
+    private String appId;
+    /**
+     * appKey
+     */
+    private String appKey;
+    /**
+     * 重试次数
+     */
+    private String reTryNum;
+
+    /**
+     * 请求配置唯一标识
+     */
+    @RequiredMark
+    private String requestUniqueCode;
+
+    /**
+     * 建模表表名称
+     */
+    @RequiredMark
+    private String tableName;
+
+    /**
+     * 实名认证状态标志字段
+     */
+    @RequiredMark
+    private String certificationStatusField;
+
+    /**
+     * 实名认证状态 - （已认证状态的值）
+     */
+    @RequiredMark
+    private String certificationStatus;
+
+    /**
+     * 法大大customerID存储字段
+     */
+    @RequiredMark
+    private String customerIdField;
+
+    /**
+     * 人员ID字段
+     */
+    @RequiredMark
+    private String userIdField;
+
+    /**
+     * 单条线程最大执行数据大小
+     */
+    private String maxOnce = "100_000";
+
+    /**
+     * 法大大交易单号存储字段
+     */
+    @RequiredMark
+    private String transactionNoField;
+
+
+    private final Logger LOG = Util.getLogger();
+
+
+    private final FadadaRequestUtil REQUEST_UTIL = new FadadaRequestUtil();
+
+    private final DealWithMapping dealWithMapping = new DealWithMapping();
+
+    private final CertificationPersonMapper mapper = Util.getMapper(CertificationPersonMapper.class);
+
+    private final ExecutorService threadPool = ThreadPoolConfig.createThreadPoolInstance();
+
+    @Override
+    public void execute() {
+        this.paramHandler();
+        boolean b = Util.verifyRequiredField(this);
+        if(!b){
+            throw new CustomerException("必填字段为通过验证，请见检查必填字段是否配置正确！");
+        }
+        RequestMappingConfig requestMappingConfig = dealWithMapping.treeDealWithUniqueCode(requestUniqueCode);
+        RecordSet recordSet = mapper.selectCertificationPersonUser(tableName, certificationStatusField, certificationStatus, customerIdField);
+        while (recordSet.next()){
+            String userId = Util.null2String(recordSet.getString(userIdField));
+            int language = 7;
+            if(!Util.isNullOrEmpty(userId)){
+                User user = new User(Integer.parseInt(userId));
+                language = user.getLanguage();
+            }
+            Map<String, Object> requestParam = dealWithMapping.getRequestParam(recordSet, requestMappingConfig);
+            String requestUrl = requestMappingConfig.getRequestUrl();
+            Map<String, Object> res = REQUEST_UTIL.certificationPerson(requestUrl, requestParam, language);
+        }
+    }
+
+    private void paramHandler() {
+        if(!Util.isNullOrEmpty(appKey)){
+            this.REQUEST_UTIL.setAppKey(appKey);
+        }
+        if(!Util.isNullOrEmpty(appId)){
+            this.REQUEST_UTIL.setAppId(appId);
+        }
+        if(!Util.isNullOrEmpty(reTryNum)){
+            try {
+                this.REQUEST_UTIL.setReTryNum(Integer.parseInt(reTryNum));
+            }catch (Exception e){
+                this.REQUEST_UTIL.setReTryNum(5);
+            }
+        }
+    }
+}