From 79c79d1218e559240a1fd9652421f05e0ba8e2ff Mon Sep 17 00:00:00 2001 From: IT-xiaoXiong <774495953@qq.com> Date: Thu, 9 Dec 2021 10:51:20 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E6=97=A0=E5=85=B3=E7=9A=84TO?= =?UTF-8?q?DO=E6=A0=87=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/WorkflowQueueService.java | 2 +- .../aiyh_kafang/service/InvoiceService.java | 4 +- com/api/aiyh_kafang/web/UploadByBase64.java | 2 +- .../service/impl/FaDDContractService.java | 10 ++-- .../fadada/service/impl/FaDDServiceImpl.java | 10 ++-- .../patentWall/service/PatentWallService.java | 2 +- customization/test/NewUtilTest.java | 16 +++---- .../util/SyncOrganizationUtils.java | 22 ++++----- .../CopyAttachmentSecretAction.java | 2 +- .../fadada/UploadFile2FaDDAction.java | 8 ++-- .../fadada/util/FaddContractUtil.java | 2 +- .../AddCustomer_Action.java | 48 +++++++++---------- .../config/CRM_Config.java | 2 +- 13 files changed, 63 insertions(+), 67 deletions(-) diff --git a/com/api/aiyh_guijiu/service/WorkflowQueueService.java b/com/api/aiyh_guijiu/service/WorkflowQueueService.java index 30b53cd..d66a6fc 100644 --- a/com/api/aiyh_guijiu/service/WorkflowQueueService.java +++ b/com/api/aiyh_guijiu/service/WorkflowQueueService.java @@ -218,7 +218,7 @@ public class WorkflowQueueService { List list = new ArrayList<>(); // 循环查询流程中时间是否存在冲突 for (WorkflowConfigDTO workflowConfigDTO : workflowConfigDTOS) { -// 查询冲突的流程数据 TODO 流程相关人 查询数据库 +// 查询冲突的流程数据 流程相关人 查询数据库 toolUtil.writeErrorLog(hrmStr); toolUtil.writeErrorLog(workflowConfigDTO.toString() + "\n"); for (String hrmId : hrmStr.split(",")) { diff --git a/com/api/aiyh_kafang/service/InvoiceService.java b/com/api/aiyh_kafang/service/InvoiceService.java index 68594ed..d627dd5 100644 --- a/com/api/aiyh_kafang/service/InvoiceService.java +++ b/com/api/aiyh_kafang/service/InvoiceService.java @@ -247,7 +247,7 @@ public class InvoiceService { * @param requestId */ public void saveInvoiceInfo(JSONObject invoiceInfo, String requestId) { -// TODO 查询是否已经存在，不存在则新增，存在则更新 +// 查询是否已经存在，不存在则新增，存在则更新 String query = "select * from " + ModeTable + " where lc = ?"; rs.executeQuery(query, requestId); if (rs.next()) { @@ -260,7 +260,7 @@ public class InvoiceService { Util.getIntValue(formModeId, -1), 1, 0, TimeUtil.getCurrentDateString(), TimeUtil.getOnlyCurrentTimeString()); -// TODO 插入数据库信息 +// 插入数据库信息 invoiceMapping.saveInvoiceInfo(dataId, ModeTable, requestId); saveInvoiceDetail(invoiceInfo, requestId, String.valueOf(dataId)); ModeRightInfo mri = new ModeRightInfo(); diff --git a/com/api/aiyh_kafang/web/UploadByBase64.java b/com/api/aiyh_kafang/web/UploadByBase64.java index a6beaad..b515949 100644 --- a/com/api/aiyh_kafang/web/UploadByBase64.java +++ b/com/api/aiyh_kafang/web/UploadByBase64.java @@ -44,7 +44,7 @@ public class UploadByBase64 { public String uploadImage(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody Map base64Map) { int i = uploadByBase64Service.uploadImage(base64Map); -// TODO 上传完成过后，调用发票识别接口，将数据保存到建模表中 +// 上传完成过后，调用发票识别接口，将数据保存到建模表中 User user = HrmUserVarify.getUser(request, response); JSONObject invoiceInfo = null; try { diff --git a/com/api/aiyh_pcn/fadada/service/impl/FaDDContractService.java b/com/api/aiyh_pcn/fadada/service/impl/FaDDContractService.java index 0d8de0c..73f586c 100644 --- a/com/api/aiyh_pcn/fadada/service/impl/FaDDContractService.java +++ b/com/api/aiyh_pcn/fadada/service/impl/FaDDContractService.java @@ -269,12 +269,12 @@ public class FaDDContractService { } break; case 8: -// TODO +// // 流程名称 value = aiyh.utils.Util.getWorkflowNameById(String.valueOf(dataMap.get("workflowid"))); break; case 9: -// TODO +// // 请求标题 value = aiyh.utils.Util.getRequestTitleById(String.valueOf(dataMap.get("requestid"))); break; @@ -330,7 +330,7 @@ public class FaDDContractService { } if ("2".equals(Util.null2String(ufContractInfoDTO.getSignedType()))) { update.put("contract_status", 4); -// TODO 仅对方签署完成后，添加用户信息 +// 仅对方签署完成后，添加用户信息 // 获取配置表信息 FaDaDaConfigDTO faDaDaConfigDTO = faDDContractMapping.queryConfig(String.valueOf(ufContractInfoDTO.getWorkflowType()), 4); RecordSet rs = new RecordSet(); @@ -384,7 +384,7 @@ public class FaDDContractService { } if ("2".equals(Util.null2String(ufContractInfoDTO.getSignedType()))) { update.put("contract_status", 4); - // TODO 仅对方签署完成后，添加用户信息 + // 仅对方签署完成后，添加用户信息 // 获取配置表信息 FaDaDaConfigDTO faDaDaConfigDTO = faDDContractMapping.queryConfig(String.valueOf(ufContractInfoDTO.getWorkflowType()), 4); RecordSet rs = new RecordSet(); @@ -530,7 +530,7 @@ public class FaDDContractService { Util.createPrepWhereImpl().whereAnd("workflow_request_id").whereEqual(ufContractInfoDTO.getWorkflowRequestId())); rs.executeUpdate(sqlResult.getSqlStr(), sqlResult.getArgs()); updateData.clear(); -// 更新明细表合同信息 TODO 明细表添加字段，signed_status（合同方签署状态） +// 更新明细表合同信息 明细表添加字段，signed_status（合同方签署状态） // 签署状态，1 已发送待签署，2 已签蜀 updateData.put("signed_status", 1); sqlResult = Util.createSqlBuilder().updateSql(ufContractInfoDTO.getWorkflowDetailTable(), updateData, diff --git a/com/api/aiyh_pcn/fadada/service/impl/FaDDServiceImpl.java b/com/api/aiyh_pcn/fadada/service/impl/FaDDServiceImpl.java index fa51825..b76ed0a 100644 --- a/com/api/aiyh_pcn/fadada/service/impl/FaDDServiceImpl.java +++ b/com/api/aiyh_pcn/fadada/service/impl/FaDDServiceImpl.java @@ -278,17 +278,17 @@ public class FaDDServiceImpl implements IFaDDService { } break; case 8: -// TODO +// // 流程名称 value = Util.getWorkflowNameById(String.valueOf(dataMap.get("workflowid"))); break; case 9: -// TODO +// // 请求标题 value = Util.getRequestTitleById(String.valueOf(dataMap.get("requestid"))); break; case 10: -// TODO +// // 流程requestId value = dataMap.get("requestid"); break; @@ -339,10 +339,10 @@ public class FaDDServiceImpl implements IFaDDService { toolUtil.writeDebuggerLog("转换错误：" + e); } if ("1".equals(String.valueOf(result.get("status"))) || "6".equals(String.valueOf(result.get("status")))) { -// 发送请求催一下 TODO 签署合同 +// 发送请求催一下 签署合同 notSignedContracts.add(map); } else { -// 合同状态发生改变，需要修改数据库中的状态信息 TODO 百分百会出问题 +// 合同状态发生改变，需要修改数据库中的状态信息 百分百会出问题 map.put("contract_status", result.get("status")); // statusList.add() faDDServiceMapping.updateContractStatus(map, workflowId, 3); diff --git a/com/api/aiyh_pcn/patentWall/service/PatentWallService.java b/com/api/aiyh_pcn/patentWall/service/PatentWallService.java index 5207d2b..d4f8a99 100644 --- a/com/api/aiyh_pcn/patentWall/service/PatentWallService.java +++ b/com/api/aiyh_pcn/patentWall/service/PatentWallService.java @@ -215,7 +215,7 @@ public class PatentWallService { } public String handleParsingConf(String parsing, Map data,List args){ - // TODO 值解析 + // 值解析 // 解析 ${}类型的参数，直接替换 String pattern = "\\$\\{(?(\\s|\\S)+?)}"; Pattern compile = Pattern.compile(pattern); diff --git a/customization/test/NewUtilTest.java b/customization/test/NewUtilTest.java index 435002b..c6fde67 100644 --- a/customization/test/NewUtilTest.java +++ b/customization/test/NewUtilTest.java @@ -389,20 +389,16 @@ public class NewUtilTest { @Test public void testMessage() { - MessageType messageType = MessageType.newInstance(1146); //消息来源（见文档第四点补充） Set userIdList = new HashSet<>(); //接收人id userIdList.add("22"); - userIdList.add("23"); - userIdList.add("24"); - String title = "标题"; //标题 - String context = "内容"; //内容 - String linkUrl = ""; //PC端链接 纯文本就传空字符串 - String linkMobileUrl = ""; //移动端链接 纯文本就传空字符串 + userIdList.add("1"); + String linkUrl = "/spa/cube/index.html#/main/cube/search?customid=36"; //PC端链接 + String linkMobileUrl = ""; //移动端链接 + String title = "我是标题淦"; + String context = "我是内容啊啊啊"; try { - MessageBean messageBean = Util_Message.createMessage(messageType, userIdList, title, context, linkUrl, linkMobileUrl); + MessageBean messageBean = Util_Message.createMessage(MessageType.newInstance(1146), userIdList, title, context, linkUrl, linkMobileUrl); messageBean.setCreater(1);//创建人id -//message.setBizState("0");需要修改消息状态时传入,表示消息最初状态为待处理 - // messageBean.setTargetId("121|22"); //消息来源code +“|”+业务id 需要修改消息状态时传入，这个字段是自定义的，和修改消息状态的时候传入相同的值，可做更新。 Util_Message.store(messageBean); } catch (IOException e) { e.printStackTrace(); diff --git a/weaver/aiyh_pcn/async_organization/util/SyncOrganizationUtils.java b/weaver/aiyh_pcn/async_organization/util/SyncOrganizationUtils.java index e19f6eb..ffe387f 100644 --- a/weaver/aiyh_pcn/async_organization/util/SyncOrganizationUtils.java +++ b/weaver/aiyh_pcn/async_organization/util/SyncOrganizationUtils.java @@ -36,7 +36,7 @@ public class SyncOrganizationUtils extends ToolUtil { // 上级部门的id int supDepId = 0; // 如果该部门是属于根部门，则需要进行分部的同步 - // TODO 查询手动维护的分部信息表，将分部信息保存到分部表hrmsubcompany中，并且将部门的分部id赋值 + // 查询手动维护的分部信息表，将分部信息保存到分部表hrmsubcompany中，并且将部门的分部id赋值 if (department.getPARENTDEPARTMENDID() == 0) { // 查询mapping表，查看分部与部门的映射关系,通过部门id查询分部信息 String querySql = "select * from uf_sub_mapping where frist_company = " @@ -75,7 +75,7 @@ public class SyncOrganizationUtils extends ToolUtil { supDepId = Util.getIntValue(Util.null2String(rs.getString("id"))); } // 处理部门信息 -// 查询HR同步配置表用于更新或者插入字段 TODO 查询配置表 +// 查询HR同步配置表用于更新或者插入字段 查询配置表 Map> configTableInfo = this.queryConfigTableInfo(department, getModelValue, "m.api_field_type = 0"); Map sysDep = configTableInfo.get("sys"); Map defDep = configTableInfo.get("def"); @@ -93,7 +93,7 @@ public class SyncOrganizationUtils extends ToolUtil { int finalSubcompanyid = subcompanyid1; if (rs.next()) { // 存在该部门 -// 拼接更新SQL TODO +// 拼接更新SQL // 查询父级部门的id并更新 String querySupId = "select * from hrmdepartment where outkey = ?"; RecordSet r_rs = new RecordSet(); @@ -110,13 +110,13 @@ public class SyncOrganizationUtils extends ToolUtil { Map sysMap = new HashMap<>(); sysMap.put("modified", this.getTime()); this.addDefaultUpdateSql(sysSetSql, sysMap); -// 更新数据库 TODO +// 更新数据库 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 TODO +// 拼接插入SQL // 不存在部门信息 Map insertSysBuilderMap = this.builderSql(sysDep, 2); StringBuilder sysInsertSqlField = insertSysBuilderMap.get("insertField"); @@ -168,7 +168,7 @@ public class SyncOrganizationUtils extends ToolUtil { public Map asyncPosition(Position position) { // writeErrorLog( "---------------"+className+" asyncPosition Begin --------------------"); -// TODO 职位同步的SQL +// 职位同步的SQL RecordSet rs = new RecordSet(); Map successMark = new HashMap<>(); try { @@ -275,7 +275,7 @@ public class SyncOrganizationUtils extends ToolUtil { } // 人员id int hrmid = 0; -// TODO 不知道是否需要判断组织编码是否存在 +// 不知道是否需要判断组织编码是否存在 GetModelValue getModelValue = new GetModelValue<>(); RecordSet rs = new RecordSet(); // 查询配置表信息 @@ -334,7 +334,7 @@ public class SyncOrganizationUtils extends ToolUtil { this.addDefaultUpdateSql(sysSetSql, sysMap); this.executeUpdateData(sysSetSql, "hrmresource", "id = '" + hrmid + "'"); -// TODO 待完善更新自定义人员信息表 +// 待完善更新自定义人员信息表 // 判断该字段的scopeid for (Map.Entry entry : defDep.entrySet()) { // 判断该字段属于的scopeid @@ -347,7 +347,7 @@ public class SyncOrganizationUtils extends ToolUtil { } rs.next(); String scopeid = Util.null2String(rs.getString("scopeid")); -// TODO 判断是否存在该信息，如果存在着更新，不存在着插入 +// 判断是否存在该信息，如果存在着更新，不存在着插入 rs.executeQuery("select id from cus_fielddata where id = '" + hrmid + "' and scope = 'HrmCustomFieldByInfoType' and scopeid = '" + scopeid + "'"); if (rs.next()) { // 存在该信息,更新指定信息 @@ -530,7 +530,7 @@ public class SyncOrganizationUtils extends ToolUtil { // 查询该员工的直接上级id => 查询该员工的职位的cmssupjobid对应的职位 // 由于需要判断该员工的职位是否存在上级职位，所以不能一条SQL搞定，首先需要查询该员工的职位的上级职位id，也就是判断是否存在上级职位 String queryJobTitleId = "select id,cmssupjobid from hrmjobtitles where outkey = ?"; -// TODO 不知道需不需要在维护一下职位表中的所属部门id，如果需要的haunt将部门id更新进去就可以 +// 不知道需不需要在维护一下职位表中的所属部门id，如果需要的haunt将部门id更新进去就可以 // 查询当前人员对应的职位id以及cms中的上级职位id try { rs.executeQuery(queryJobTitleId, Util.null2String(String.valueOf(employee.getJOBCODEID()))); @@ -841,7 +841,7 @@ public class SyncOrganizationUtils extends ToolUtil { } Map sysDep = new HashMap<>(); Map defDep = new HashMap<>(); -// TODO 判断转换规则，如果是自定义SQL，则需要先执行SQL，如果是固定值，则需要进行直接赋值，如果是不转换，则按照默认走 +// 判断转换规则，如果是自定义SQL，则需要先执行SQL，如果是固定值，则需要进行直接赋值，如果是不转换，则按照默认走 while (rs.next()) { String apiFieldType = Util.null2String(rs.getString("api_field_type")); String oaFieldType = Util.null2String(rs.getString("oa_field_type")); diff --git a/weaver/aiyh_pcn/copy_attachment/CopyAttachmentSecretAction.java b/weaver/aiyh_pcn/copy_attachment/CopyAttachmentSecretAction.java index df371a8..f04413a 100644 --- a/weaver/aiyh_pcn/copy_attachment/CopyAttachmentSecretAction.java +++ b/weaver/aiyh_pcn/copy_attachment/CopyAttachmentSecretAction.java @@ -54,7 +54,7 @@ public class CopyAttachmentSecretAction extends ToolUtil implements Action { rs_1.executeQuery(query, requestId); Map requestData = Util.recordSet2Map(rs_1); toolUtil.writeDebuggerLog(requestData.toString()); -// 如果不是第一次添加，则直接返回 TODO 隐藏bug，如果用户第一次选择添加，后面被退回后，将附件清空了，重新上传，然后又需要安全协议，但是已经不是第一次添加了，所以并不会生效 +// 如果不是第一次添加，则直接返回 隐藏bug，如果用户第一次选择添加，后面被退回后，将附件清空了，重新上传，然后又需要安全协议，但是已经不是第一次添加了，所以并不会生效 if (StringUtils.isNullOrEmpty(secretField)) { if (requestData.get(firstAddField) != null && !Util.null2String(firstAddValue).equals(String.valueOf(requestData.get(firstAddField)))) { return Action.SUCCESS; diff --git a/weaver/aiyh_pcn/fadada/UploadFile2FaDDAction.java b/weaver/aiyh_pcn/fadada/UploadFile2FaDDAction.java index a485bb3..044bf17 100644 --- a/weaver/aiyh_pcn/fadada/UploadFile2FaDDAction.java +++ b/weaver/aiyh_pcn/fadada/UploadFile2FaDDAction.java @@ -186,7 +186,7 @@ public class UploadFile2FaDDAction extends ToolUtil implements Action { } fileInfo.setContractExtension(imagefilename.substring(imagefilename.lastIndexOf("."))); fileInfo.setContractTitle(imagefilename); -// TODO fileInfo.setCustomerNo(Util.null2String(detail.get("customer_no"))); +// fileInfo.setCustomerNo(Util.null2String(detail.get("customer_no"))); // fileInfo.setCustomerNo("e23deb7a29714d0da5b806665ab3e2f8"); fileInfo.setCustomerNo(Util.null2String(customer)); if (StringUtils.isNullOrEmpty(fileInfo.getCustomerNo())) { @@ -391,17 +391,17 @@ public class UploadFile2FaDDAction extends ToolUtil implements Action { } break; case 8: -// TODO +// // 流程名称 value = Util.getWorkflowNameById(String.valueOf(dataMap.get("workflowid"))); break; case 9: -// TODO +// // 请求标题 value = Util.getRequestTitleById(String.valueOf(dataMap.get("requestid"))); break; case 10: -// TODO +// // 流程requestId value = dataMap.get("requestid"); break; diff --git a/weaver/aiyh_pcn/fadada/util/FaddContractUtil.java b/weaver/aiyh_pcn/fadada/util/FaddContractUtil.java index fdcc0fc..a79080c 100644 --- a/weaver/aiyh_pcn/fadada/util/FaddContractUtil.java +++ b/weaver/aiyh_pcn/fadada/util/FaddContractUtil.java @@ -264,7 +264,7 @@ public class FaddContractUtil { Util.createPrepWhereImpl().whereAnd("workflow_request_id").whereEqual(requestId)); rs.executeUpdate(sqlResult.getSqlStr(), sqlResult.getArgs()); update.clear(); -// 更新明细表合同信息 TODO 明细表添加字段，signed_status（合同方签署状态） +// 更新明细表合同信息 明细表添加字段，signed_status（合同方签署状态） // 签署状态，1 已发送待签署，2 已签蜀 update.put("signed_status", 1); sqlResult = Util.createSqlBuilder().updateSql(tableName, update, diff --git a/weaver/aiyh_pcn/workflow_to_customer/AddCustomer_Action.java b/weaver/aiyh_pcn/workflow_to_customer/AddCustomer_Action.java index 6189835..eb5b02f 100644 --- a/weaver/aiyh_pcn/workflow_to_customer/AddCustomer_Action.java +++ b/weaver/aiyh_pcn/workflow_to_customer/AddCustomer_Action.java @@ -94,7 +94,7 @@ public class AddCustomer_Action extends ToolUtil implements Action { } } } else { -// TODO 表示根据流程字段判断是插入还是更新 +// 表示根据流程字段判断是插入还是更新 String workflowName; if ("main_table".equals(this.mainResult.getUpdateInsertTable())) { workflowName = this.tableName; @@ -136,14 +136,14 @@ public class AddCustomer_Action extends ToolUtil implements Action { public void updateCustomerModel(MainResult mainResult, Map>> configInfoMap, String customerId) { // 1、更新客户基本信息crm_customerinfo if (Utils.conformSql(configInfoMap, "CRM_CustomerInfo")) { -// TODO 将客户基本信息更新 +// 将客户基本信息更新 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) { -// TODO 将客户联系信息更新到客户联系表中 +// 将客户联系信息更新到客户联系表中 if (Utils.conformSql(configInfoMap, "CRM_CustomerContacter")) { this.updateCustomerContacter(configInfoMap.get("CRM_CustomerContacter"), customerId); } else { @@ -152,31 +152,31 @@ public class AddCustomer_Action extends ToolUtil implements Action { } // 3、判断更新客户地址信息CRM_CustomerAddress if (Utils.conformSql(configInfoMap, "CRM_CustomerAddress")) { -// TODO 将客户信息更新到客户地址表中 +// 将客户信息更新到客户地址表中 this.updateCustomerAddress(configInfoMap.get("CRM_CustomerAddress"), customerId); } // 4、判断更新客户销售商机信息CRM_SellChance if (Utils.conformSql(configInfoMap, "CRM_SellChance")) { -// TODO 将客户联系信息更新到客户联系表中 +// 将客户联系信息更新到客户联系表中 this.updateCustomerSellChance(configInfoMap.get("CRM_SellChance"), customerId); } // 5、判断更新虚拟分部信息hrmsubcompanyvirtual if (Utils.conformSql(configInfoMap, "hrmsubcompanyvirtual") || this.mainResult.getIsOutUser() == 0) { -// TODO 将客户信息更新到虚拟分部信息表中 +// 将客户信息更新到虚拟分部信息表中 this.updateHrmsubcompanyvirtual(configInfoMap.get("hrmsubcompanyvirtual"), customerId); } else { return; } // 6、判断更新虚拟部门信息hrmdepartmentvirtual if (Utils.conformSql(configInfoMap, "hrmdepartmentvirtual") || this.mainResult.getIsOutUser() == 0) { -// TODO 见客户信息更新到虚拟部门信息表中 +// 见客户信息更新到虚拟部门信息表中 this.updateHrmdepartmentvirtual(configInfoMap.get("hrmdepartmentvirtual"), customerId); } else { return; } // 7、判断更新外部人员信息hrmresource if (Utils.conformSql(configInfoMap, "hrmResource") || this.mainResult.getIsOutUser() == 0) { -// TODO 将客户更新到外部人员信息表中 +// 将客户更新到外部人员信息表中 this.updateHrmresource(configInfoMap.get("hrmResource"), customerId); } } @@ -371,14 +371,14 @@ public class AddCustomer_Action extends ToolUtil implements Action { Map customer; // 1、插入客户基本信息crm_customerinfo if (Utils.conformSql(configInfoMap, "CRM_CustomerInfo")) { -// TODO 将客户基本信息插入表中 +// 将客户基本信息插入表中 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) { -// TODO 将客户联系信息插入到客户联系表中 +// 将客户联系信息插入到客户联系表中 if (Utils.conformSql(configInfoMap, "CRM_CustomerContacter")) { this.insertCustomerContacter(configInfoMap.get("CRM_CustomerContacter"), customer, 0); } else { @@ -387,18 +387,18 @@ public class AddCustomer_Action extends ToolUtil implements Action { } // 3、判断插入客户地址信息CRM_CustomerAddress if (Utils.conformSql(configInfoMap, "CRM_CustomerAddress")) { -// TODO 将客户信息出入到客户地址表中 +// 将客户信息出入到客户地址表中 this.insertCustomerAddress(configInfoMap.get("CRM_CustomerAddress"), customer); } // 4、判断插入客户销售商机信息CRM_SellChance if (Utils.conformSql(configInfoMap, "CRM_SellChance")) { -// TODO 将客户联系信息插入到客户联系表中 +// 将客户联系信息插入到客户联系表中 this.insertCustomerSellChance(configInfoMap.get("CRM_SellChance"), customer); } /*// 5、判断插入虚拟分部信息hrmsubcompanyvirtual if (Utils.conformSql(configInfoMap, "hrmsubcompanyvirtual") || this.mainResult.getIsOutUser() == 0) { -// TODO 将客户信息插入到虚拟分部信息表中 +// 将客户信息插入到虚拟分部信息表中 this.subId = this.insertHrmsubcompanyvirtual(configInfoMap.get("hrmsubcompanyvirtual"), customer); } else { return; @@ -406,14 +406,14 @@ public class AddCustomer_Action extends ToolUtil implements Action { // 6、判断插入虚拟部门信息hrmdepartmentvirtual if (Utils.conformSql(configInfoMap, "hrmdepartmentvirtual") || this.mainResult.getIsOutUser() == 0) { -// TODO 见客户信息插入到虚拟部门信息表中 +// 见客户信息插入到虚拟部门信息表中 this.deprtId = this.insertHrmdepartmentvirtual(configInfoMap.get("hrmdepartmentvirtual"), customer, subId); } else { return; }*/ // 7、判断插入外部人员信息hrmresource if (Utils.conformSql(configInfoMap, "hrmResource") || this.mainResult.getIsOutUser() == 0) { -// TODO 将客户插入到外部人员信息表中 +// 将客户插入到外部人员信息表中 this.insertHrmresource(configInfoMap.get("hrmResource"), customer, subId, deprtId); } } @@ -827,7 +827,7 @@ public class AddCustomer_Action extends ToolUtil implements Action { } } } -// TODO 添加必要参数 +// 添加必要参数 CityComInfo cityComInfo = new CityComInfo(); ResourceComInfo resourceComInfo = null; try { @@ -944,7 +944,7 @@ public class AddCustomer_Action extends ToolUtil implements Action { // 判断客户是否存在，通过用户id和客户姓名 String querySql = "select * from crm_customerInfo where deleted <> 1 and name = ? and manager =?"; if (rs.executeQuery(querySql, item.get("name"), finalManagerId) && rs.next()) { - // TODO 如果客户名重复则特殊处理，如果如果该客户就进行更新 + // 如果客户名重复则特殊处理，如果如果该客户就进行更新 customerIdStr.set(rs.getString("id")); this.updateCustomerInfo(item, customerIdStr.get()); throw new DataExistsException("break now forEach"); @@ -971,7 +971,7 @@ public class AddCustomer_Action extends ToolUtil implements Action { this.customerID = customerIdStr.get(); return cusMap; } -// TODO 插入客户基本信息 +// 插入客户基本信息 this.insertHandle("CRM_CustomerInfo", mapList); CustomerInfoComInfo customerInfo = new CustomerInfoComInfo(); @@ -1025,7 +1025,7 @@ public class AddCustomer_Action extends ToolUtil implements Action { public void insertHandle(String tableName, List> mapList) { RecordSet rs = new RecordSet(); if (mapList.size() == 1) { -// TODO 单条数据插入 +// 单条数据插入 this.insertHandle(tableName, mapList.get(0)); } else { mapList.forEach(item -> this.insertHandle(tableName, item)); @@ -1035,10 +1035,10 @@ public class AddCustomer_Action extends ToolUtil implements Action { public void insertHandle(String tableName, Map map) { RecordSet rs = new RecordSet(); -// TODO 单条数据插入 +// 单条数据插入 SqlResult sqlResult = BuilderSqlUtil.builderInsertSql(tableName, map); if (!Objects.isNull(sqlResult)) { -// TODO 插入数据库数据 +// 插入数据库数据 this.writeDebuggerLog(sqlResult.getSqlStr()); this.writeDebuggerLog(Arrays.toString(sqlResult.getArgs()) + "\n"); rs.executeUpdate(sqlResult.getSqlStr(), sqlResult.getArgs()); @@ -1049,7 +1049,7 @@ public class AddCustomer_Action extends ToolUtil implements Action { RecordSet rs = new RecordSet(); if (mapList.size() == 1) { -// TODO 单条数据插入 +// 单条数据插入 this.updateHandle(tableName, mapList.get(0), where); } else { mapList.forEach(item -> this.updateHandle(tableName, item, where)); @@ -1059,9 +1059,9 @@ public class AddCustomer_Action extends ToolUtil implements Action { public void updateHandle(String tableName, Map map, PrepSQLWhere where) { RecordSet rs = new RecordSet(); -// TODO 单条数据插入 +// 单条数据插入 SqlResult sqlResult = BuilderSqlUtil.builderUpdateSql(tableName, map, where); - // TODO 插入数据库数据 + // 插入数据库数据 // Console.log(sqlResult.getSqlStr()); // Console.log(Arrays.toString(sqlResult.getArgs()) + "\n"); this.writeDebuggerLog(sqlResult.getSqlStr()); diff --git a/weaver/aiyh_pcn/workflow_to_customer/config/CRM_Config.java b/weaver/aiyh_pcn/workflow_to_customer/config/CRM_Config.java index fc61b82..ed73fdc 100644 --- a/weaver/aiyh_pcn/workflow_to_customer/config/CRM_Config.java +++ b/weaver/aiyh_pcn/workflow_to_customer/config/CRM_Config.java @@ -346,7 +346,7 @@ public class CRM_Config extends ToolUtil { sqlMap.put(tableField.getCustomerField().toLowerCase() , value); }else{ -// TODO bug,外部用户的字段不能出现在客户基本信息里面 +// bug,外部用户的字段不能出现在客户基本信息里面 sqlMap.put(tableField.getOutUserField().toLowerCase() , value); }