add:增加表单模板xml文件

src/main/java/com/seeyon/apps/thirdparyServlet/ThirdparyServlet.java

@@ -243,8 +243,9 @@ public class ThirdparyServlet extends HttpServlet {
         Map<String,Object> newContent = (Map<String, Object>) syncContent.get("newContent");
         Map<String,Object> parentInfo = (Map<String, Object>) newContent.get("parentInfo");
         Map<String,Object> baseInfo = (Map<String, Object>) newContent.get("baseInfo");
-        V3xOrgAccount account = orgManager.getAccountByName((String) baseInfo.get("deptName"));
-        if (account == null){
+        Long accId = accountManager.getAccountIdByCode((String) baseInfo.get("deptUniCode"));
+        V3xOrgAccount account = orgManager.getAccountById(accId);
+        if (account != null){
             returnMap.put("status",2);
             returnMap.put("errcode","SYNC_ERR_1_1_0001");
             returnMap.put("errormsg","组织已存在");
@@ -263,7 +264,8 @@ public class ThirdparyServlet extends HttpServlet {
         unit.setCode((String) baseInfo.get("deptUniCode"));
         unit.setName((String) baseInfo.get("deptName"));
         unit.setSortId(Long.parseLong((String) baseInfo.get("showNum")));
-        if (StringUtils.isEmpty((String) parentInfo.get("parentCode"))){
+        if (StringUtils.isEmpty(((String) parentInfo.get("parentCode"))) ||
+                (((String)parentInfo.get("parentCode")).equals((String)baseInfo.get("deptUniCode")))){
             Long accountId = accountManager.getAccountIdByCode("org-admin");
             if (StringUtils.isEmpty(accountId)||accountId.equals(-1L)){
                 returnMap.put("status",2);
@@ -284,7 +286,7 @@ public class ThirdparyServlet extends HttpServlet {
             unit.setSuperior(accountId);
         }
         Map admininfo = new HashMap();
-        admininfo.put("loginName", baseInfo.get("deptName")+"管理员");//管理员登录名
+        admininfo.put("loginName", (String)baseInfo.get("deptUniCode")+"gly");//管理员登录名
         admininfo.put("password", "123456");//管理员密码
         V3xOrgMember adminmember = MemberUtil.createMember(admininfo);
         OrganizationMessage result = new OrganizationMessage();
@@ -303,9 +305,66 @@ public class ThirdparyServlet extends HttpServlet {
     private void deleteAccount(Map<String, Object> map,Map<String,Object> returnMap) {
 
     }
-    private void updateAccount(Map<String, Object> map,Map<String,Object> returnMap) {
-
+    private void updateAccount(Map<String, Object> map,Map<String,Object> returnMap) throws BusinessException {
+        Map<String,Object> syncContent = (Map<String, Object>) map.get("syncContent");
+        Map<String,Object> newContent = (Map<String, Object>) syncContent.get("newContent");
+        Map<String,Object> oldContent = (Map<String, Object>) syncContent.get("oldContent");
+        Map<String,Object> baseInfoOld = (Map<String, Object>) oldContent.get("baseInfo");
+        Map<String,Object> parentInfo = (Map<String, Object>) newContent.get("parentInfo");
+        Map<String,Object> baseInfo = (Map<String, Object>) newContent.get("baseInfo");
+        if (StringUtils.isEmpty(baseInfo.get("deptName"))|| StringUtils.isEmpty(baseInfo.get("deptUniCode"))
+                || StringUtils.isEmpty(baseInfo.get("showNum"))){
+            returnMap.put("status",2);
+            returnMap.put("errcode","SYNC_ERR_1_4_0003");
+            returnMap.put("errormsg","必填属性未填");
+            return;
+        }
+        Long accId = accountManager.getAccountIdByCode((String) baseInfo.get("deptUniCode"));
+        V3xOrgAccount account = orgManager.getAccountById(accId);
+//        V3xOrgAccount account = orgManager.getAccountByName((String) baseInfoOld.get("deptName"));
+        if (account == null){
+            returnMap.put("status",2);
+            returnMap.put("errcode","SYNC_ERR_1_4_0002");
+            returnMap.put("errormsg","组织不存在");
+            return;
+        }
+        if (StringUtils.isEmpty(((String) parentInfo.get("parentCode"))) ||
+                (((String)parentInfo.get("parentCode")).equals((String)baseInfo.get("deptUniCode")))){
+            Long accountId = accountManager.getAccountIdByCode("org-admin");
+            if (StringUtils.isEmpty(accountId)||accountId.equals(-1L)){
+                returnMap.put("status",2);
+                returnMap.put("errcode","SYNC_ERR_1_4_0004");
+                returnMap.put("errormsg","找不到父级");
+                return;
+            }
+            account.setSuperior(accountId);
+        }else {
+            String code = (String) parentInfo.get("parentCode");
+            Long accountId = accountManager.getAccountIdByCode(code);
+            if (StringUtils.isEmpty(accountId)||accountId.equals(-1L)){
+                returnMap.put("status",2);
+                returnMap.put("errcode","SYNC_ERR_1_4_0004");
+                returnMap.put("errormsg","找不到父级");
+                return;
+            }
+            account.setSuperior(accountId);
+        }
+        account.setName((String) baseInfo.get("deptName"));
+        account.setSortId(Long.parseLong((String) baseInfo.get("showNum")));
+        OrganizationMessage result = new OrganizationMessage();
+        result = orgManagerDirect.updateAccount(account);
+        System.out.println(result.isSuccess());
+        if (!result.isSuccess()){
+            returnMap.put("status",2);
+            returnMap.put("errcode","SYNC_ERR_1_4_9999");
+            returnMap.put("errormsg","其它错误");
+        }else {
+            returnMap.put("status",1);
+            returnMap.put("errcode","");
+            returnMap.put("errormsg","");
+        }
     }
+
     private void addDept(Map<String, Object> map,Map<String,Object> returnMap) throws BusinessException {
         Map<String,Object> syncContent = (Map<String, Object>) map.get("syncContent");
         Map<String,Object> newContent = (Map<String, Object>) syncContent.get("newContent");
@@ -318,8 +377,10 @@ public class ThirdparyServlet extends HttpServlet {
             returnMap.put("errormsg","必填属性未填");
             return;
         }
-        V3xOrgAccount account = orgManager.getAccountByName((String) baseInfo.get("deptName"));
-        if (account == null){
+        Long accId = departmentManager.getDepartmentIdByCode((String) baseInfo.get("deptUniCode"));
+        V3xOrgDepartment orgDepartment = orgManager.getDepartmentById(accId);
+//        V3xOrgAccount account = orgManager.getAccountByName((String) baseInfo.get("deptName"));
+        if (orgDepartment != null){
             returnMap.put("status",2);
             returnMap.put("errcode","SYNC_ERR_1_1_0001");
             returnMap.put("errormsg","组织已存在");
@@ -353,22 +414,90 @@ public class ThirdparyServlet extends HttpServlet {
         }
         department.setSortId(Long.parseLong((String) baseInfo.get("showNum")));
         department.setEnabled(true);
-        orgManagerDirect.addDepartment(department);
+        OrganizationMessage result = orgManagerDirect.addDepartment(department);
+        System.out.println(result.isSuccess());
+        if (!result.isSuccess()){
+            returnMap.put("status",2);
+            returnMap.put("errcode","SYNC_ERR_1_1_9999");
+            returnMap.put("errormsg","其它错误");
+        }else {
+            returnMap.put("status",1);
+            returnMap.put("errcode","");
+            returnMap.put("errormsg","");
+        }
     }
 
     private void deleteDept(Map<String, Object> map,Map<String,Object> returnMap) {
 
     }
-    private void updateDept(Map<String, Object> map,Map<String,Object> returnMap) {
-
+    private void updateDept(Map<String, Object> map,Map<String,Object> returnMap) throws BusinessException {
+        Map<String,Object> syncContent = (Map<String, Object>) map.get("syncContent");
+        Map<String,Object> newContent = (Map<String, Object>) syncContent.get("newContent");
+        Map<String,Object> parentInfo = (Map<String, Object>) newContent.get("parentInfo");
+        Map<String,Object> baseInfo = (Map<String, Object>) newContent.get("baseInfo");
+        if (StringUtils.isEmpty(baseInfo.get("deptName"))|| StringUtils.isEmpty(baseInfo.get("deptUniCode"))
+                || StringUtils.isEmpty(baseInfo.get("showNum"))||StringUtils.isEmpty(parentInfo.get("parentCode"))){
+            returnMap.put("status",2);
+            returnMap.put("errcode","SYNC_ERR_1_4_0003");
+            returnMap.put("errormsg","必填属性未填");
+            return;
+        }
+        Long deptId = departmentManager.getDepartmentIdByCode((String) baseInfo.get("deptUniCode"));
+        V3xOrgDepartment orgDepartment = orgManager.getDepartmentById(deptId);
+        if (orgDepartment == null){
+            returnMap.put("status",2);
+            returnMap.put("errcode","SYNC_ERR_1_4_0002");
+            returnMap.put("errormsg","组织不存在");
+            return;
+        }
+        /**
+         * SYNC_ERR_1_4_0004	找不到父级
+         * SYNC_ERR_1_4_9999	其它错误
+         */
+        if (parentInfo.get("isCorp").equals("0")){
+            Long departmentId = departmentManager.getDepartmentIdByCode((String) parentInfo.get("parentCode"));
+            if (StringUtils.isEmpty(departmentId)||departmentId.equals(-1L)){
+                returnMap.put("status",2);
+                returnMap.put("errcode","SYNC_ERR_1_4_0004");
+                returnMap.put("errormsg","找不到父级");
+                return;
+            }
+            orgDepartment.setSuperior(departmentId);
+            V3xOrgUnit unit = orgManager.getUnitById(departmentId);
+            orgDepartment.setOrgAccountId(unit.getOrgAccountId());
+        } else if (parentInfo.get("isCorp").equals("1")){
+            Long accountId = accountManager.getAccountIdByCode((String) parentInfo.get("parentCode"));
+            if (StringUtils.isEmpty(accountId)||accountId.equals(-1L)){
+                returnMap.put("status",2);
+                returnMap.put("errcode","SYNC_ERR_1_4_0004");
+                returnMap.put("errormsg","找不到父级");
+                return;
+            }
+            orgDepartment.setSuperior(accountId);
+            orgDepartment.setOrgAccountId(accountId);
+        }
+        orgDepartment.setName((String) baseInfo.get("deptName"));
+        orgDepartment.setSortId(Long.parseLong((String) baseInfo.get("showNum")));
+        OrganizationMessage result = orgManagerDirect.updateDepartment(orgDepartment);
+        System.out.println(result.isSuccess());
+        if (!result.isSuccess()){
+            returnMap.put("status",2);
+            returnMap.put("errcode","SYNC_ERR_1_4_9999");
+            returnMap.put("errormsg","其它错误");
+        }else {
+            returnMap.put("status",1);
+            returnMap.put("errcode","");
+            returnMap.put("errormsg","");
+        }
     }
+
     private void addMember(Map<String, Object> map,Map<String,Object> returnMap) throws BusinessException, ParseException {
         Map<String,Object> syncContent = (Map<String, Object>) map.get("syncContent");
         Map<String,Object> newContent = (Map<String, Object>) syncContent.get("newContent");
         Map<String,Object> parentInfo = (Map<String, Object>) newContent.get("parentInfo");
         Map<String,Object> baseInfo = (Map<String, Object>) newContent.get("baseInfo");
         V3xOrgMember orgMember = orgManager.getMemberByLoginName((String) baseInfo.get("loginName"));
-        if (orgMember == null){
+        if (orgMember != null){
             returnMap.put("status",2);
             returnMap.put("errcode","SYNC_ERR_2_1_0001");
             returnMap.put("errormsg","用户已存在");
@@ -398,7 +527,7 @@ public class ThirdparyServlet extends HttpServlet {
         member.setName((String) baseInfo.get("userName"));
         member.setProperty("birthday",Datetimes.parse(String.valueOf(baseInfo.get("birthday")), TimeZone.getDefault(), "yyyy-MM-dd"));
         member.setProperty("idnum",(String)baseInfo.get("idCardNumber"));
-        Integer gender = baseInfo.get("gender").equals("Z02") ? 2 : 1;
+        Integer gender = baseInfo.get("gender").equals("Z02") ? 2 : baseInfo.get("gender").equals("Z01") ? 1 : -1;
         member.setProperty("gender",gender);
         member.setProperty("telnumber",(String)baseInfo.get("mobile"));
         member.setProperty("officenumber",(String)baseInfo.get("telephone"));

src/main/java/com/seeyon/ctp/common/util/XmlUtil.java

@@ -88,7 +88,8 @@ public class XmlUtil {
         if (parentInfo != null){
             Map<String, Object> tempMap = new HashMap<>();
             Element parentCode = (Element) parentInfo.selectSingleNode("./parentCode");
-            tempMap.put(parentCode.getName(),parentCode.getText());
+            if (parentCode != null) {
+                tempMap.put(parentCode.getName(), parentCode.getText());
 //            List childElements1 = parentInfo.elements();
 //            if (childElements1.size() > 0) {
 //                Iterator var44 = childElements1.iterator();
@@ -101,7 +102,14 @@ public class XmlUtil {
 //                tempMap.put("isCorp",syncContent.attributeValue("isCorp"));
 //                map.put("parentInfo",tempMap);
 //            }
-            tempMap.put("isCorp",parentCode.attributeValue("isCorp"));
+                tempMap.put("isCorp", parentCode.attributeValue("isCorp"));
+                Element corpName = (Element) parentInfo.selectSingleNode("./corpName");
+                if (corpName != null)
+                    tempMap.put(corpName.getName(), corpName.getText());
+                Element showNum = (Element) parentInfo.selectSingleNode("./showNum");
+                if (showNum != null)
+                    tempMap.put(showNum.getName(), showNum.getText());
+            }
             map.put("parentInfo",tempMap);
         }
         return map;