乱码修复

com.awspaas.user.apps.donenow_crm/src/com/awspaas/user/apps/donenow_crm/controller/accountController.java

@@ -1,11 +1,5 @@
 package com.awspaas.user.apps.donenow_crm.controller;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
 import com.actionsoft.bpms.bo.engine.BO;
 import com.actionsoft.bpms.commons.database.RowMap;
 import com.actionsoft.bpms.commons.htmlframework.HtmlPageTemplate;
@@ -15,15 +9,22 @@ import com.actionsoft.bpms.server.bind.annotation.Controller;
 import com.actionsoft.bpms.server.bind.annotation.Mapping;
 import com.actionsoft.bpms.util.DBSql;
 import com.actionsoft.sdk.local.SDK;
-import com.alibaba.cloud.commons.lang.StringUtils;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.awspaas.user.apps.donenow_crm.constant.CrmConstant;
+import org.apache.commons.lang3.StringUtils;
+
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 @Controller
 public class AccountController extends BaseController {
-	  /**
-     * 删除客户
+    /**
+     * 鍒犻櫎瀹㈡埛
      * @param uc
      * @param ids
      * @return
@@ -32,18 +33,18 @@ public class AccountController extends BaseController {
     @Mapping(value = "com.awspaas.user.apps.donenow_DelAccount")
     public ResponseObject delAccount(UserContext uc, String ids) throws SQLException {
         if (StringUtils.isBlank(ids))
-            return ResponseObject.newErrResponse("请选择要删除的数据");
+            return ResponseObject.newErrResponse("璇烽€夋嫨瑕佸垹闄ょ殑鏁版嵁");
 
         String tableName = "BO_EU_DNCRM_ACCOUNT";
 
-        //引用校验
+        //寮曠敤鏍￠獙
         String result = verifyDel(tableName, ids);
         if (result != null)
             return ResponseObject.newErrResponse(result);
 
         Connection conn = null;
         try {
-            //引用校验
+            //寮曠敤鏍￠獙
             conn = DBSql.open();
             conn.setAutoCommit(false);
 
@@ -52,19 +53,19 @@ public class AccountController extends BaseController {
                 bo.set("CLOSED", "1");
                 SDK.getBOAPI().update(tableName, bo, conn);
 
-                //Contacts联系人 删除
+                //Contacts鑱旂郴浜� 鍒犻櫎
                 List<BO> contacts = SDK.getBOAPI().query("BO_EU_DNCRM_CONTACT").addQuery("ACCOUNT_ID=", id).addQuery("CLOSED=", 0).list();
                 for (BO contact : contacts) {
                     contact.set("CLOSED", "1");
                     SDK.getBOAPI().update("BO_EU_DNCRM_CONTACT", contact, conn);
 
-                    //删除 组织中对应的用户
+                    //鍒犻櫎 缁勭粐涓��搴旂殑鐢ㄦ埛
                     String userId = DBSql.getString(conn, "SELECT USERID FROM orguser WHERE ext5=? AND CLOSED=0 ", new Object[]{contact.getId()});
                     if (StringUtils.isNotBlank(userId))
-                        SDK.getORGAPI().disabledUser(userId);//禁用组织中用户
+                        SDK.getORGAPI().disabledUser(userId);//绂佺敤缁勭粐涓�敤鎴�
                 }
 
-                //配置项逻辑删除
+                //閰嶇疆椤归€昏緫鍒犻櫎
                 List<BO> installedProducts = SDK.getBOAPI().query("BO_EU_DNCRM_INSTALLED_PRODUCT").addQuery("ACCOUNT_ID=", id).addQuery("CLOSED=", 0).list();
                 for (BO installedProduct : installedProducts) {
                     installedProduct.set("CLOSED", "1");
@@ -72,7 +73,7 @@ public class AccountController extends BaseController {
                 }
 
 
-                //客户地址
+                //瀹㈡埛鍦板潃
                 List<BO> address = SDK.getBOAPI().query("BO_EU_DNCRM_LOCATION").addQuery("ACCOUNT_ID=", id).addQuery("CLOSED=", 0).list();
                 for (BO addressBO : address) {
                     addressBO.set("CLOSED", "1");
@@ -96,7 +97,7 @@ public class AccountController extends BaseController {
 
 
     /**
-     * 删除联系人
+     * 鍒犻櫎鑱旂郴浜�
      * @param uc
      * @param ids
      * @return
@@ -105,11 +106,11 @@ public class AccountController extends BaseController {
     @Mapping(value = "com.awspaas.user.apps.donenow_DelContact")
     public ResponseObject delContact(UserContext uc, String ids) throws SQLException {
         if (StringUtils.isBlank(ids))
-            return ResponseObject.newErrResponse("请选择要删除的数据");
+            return ResponseObject.newErrResponse("璇烽€夋嫨瑕佸垹闄ょ殑鏁版嵁");
 
         String tableName = "BO_EU_DNCRM_CONTACT";
 
-        //引用校验
+        //寮曠敤鏍￠獙
         String result = verifyDel(tableName, ids);
         if (result != null)
             return ResponseObject.newErrResponse(result);
@@ -124,43 +125,43 @@ public class AccountController extends BaseController {
 /*
             if (DBSql.getInt(conn,"SELECT COUNT(*) from BO_EU_DNSDK_TASK where contact_id=? and closed=0",new Object[]{id}) > 0)
             {
-                return "该联系人是公司的外包联系人（工单中的外包人员）";
+                return "璇ヨ仈绯讳汉鏄�叕鍙哥殑澶栧寘鑱旂郴浜猴紙宸ュ崟涓�殑澶栧寘浜哄憳锛�";
             }
 */
                 if (DBSql.getInt(conn, "SELECT COUNT(*) from BO_EU_DNSDK_TASK where contact_id=? and closed=0", new Object[]{id}) > 0) {
-                    throw new Exception("该联系人有关联的工单或任务");
+                    throw new Exception("璇ヨ仈绯讳汉鏈夊叧鑱旂殑宸ュ崟鎴栦换鍔�");
                 }
 
                 if (DBSql.getInt(conn, "SELECT COUNT(*) from BO_EU_DNCOM_ACTIVITY where CREATEUSER=(SELECT USERID FROM orguser WHERE ext5=? AND CLOSED=0 ) and closed=0", new Object[]{id}) > 0) {
-                    throw new Exception("该联系人在自助服务台创建过工单备注");
+                    throw new Exception("璇ヨ仈绯讳汉鍦ㄨ嚜鍔╂湇鍔″彴鍒涘缓杩囧伐鍗曞�娉�");
                 }
 /*
 
             if (_dal.FindSignleBySql<int>($"SELECT COUNT(*) from com_attachment where create_user_id={id} and delete_time=0") > 0)
             {
-                return "该联系人在自助服务台创建过附件";
+                return "璇ヨ仈绯讳汉鍦ㄨ嚜鍔╂湇鍔″彴鍒涘缓杩囬檮浠�";
             }
 */
 
                 if (DBSql.getInt(conn, "SELECT COUNT(*) from BO_EU_DNCTT_CONTRACT where (contact_id=? OR bill_to_contact_id=?)  and closed=0", new Object[]{id, id}) > 0) {
-                    throw new Exception("该联系人是客户的账单联系人");
+                    throw new Exception("璇ヨ仈绯讳汉鏄��鎴风殑璐﹀崟鑱旂郴浜�");
                 }
 
                 if (DBSql.getInt(conn, "SELECT COUNT(*) from BO_EU_DNCRM_ACCOUNT_REFERENCE where email_to_contacts=? and closed=0", new Object[]{id}) > 0) {
-                    throw new Exception("该联系人是客户的唯一的一个发票邮件接收人");
+                    throw new Exception("璇ヨ仈绯讳汉鏄��鎴风殑鍞�竴鐨勪竴涓�彂绁ㄩ偖浠舵帴鏀朵汉");
                 }
 
-                //Contacts联系人 删除
+                //Contacts鑱旂郴浜� 鍒犻櫎
                 BO contact = SDK.getBOAPI().get("BO_EU_DNCRM_CONTACT", id);
                 contact.set("CLOSED", "1");
                 SDK.getBOAPI().update("BO_EU_DNCRM_CONTACT", contact, conn);
 
-                //删除 组织中对应的用户
+                //鍒犻櫎 缁勭粐涓��搴旂殑鐢ㄦ埛
                 String userId = DBSql.getString(conn, "SELECT USERID FROM orguser WHERE ext5=? AND CLOSED=0 ", new Object[]{contact.getId()});
                 if (StringUtils.isNotBlank(userId))
-                    SDK.getORGAPI().disabledUser(userId);//禁用组织中用户
+                    SDK.getORGAPI().disabledUser(userId);//绂佺敤缁勭粐涓�敤鎴�
 
-                //配置项逻辑删除
+                //閰嶇疆椤归€昏緫鍒犻櫎
                 List<BO> installedProducts = SDK.getBOAPI().query("BO_EU_DNCRM_INSTALLED_PRODUCT").addQuery("CONTACT_ID=", id).addQuery("CLOSED=", 0).list();
                 for (BO installedProduct : installedProducts) {
                     installedProduct.set("CLOSED", "1");
@@ -185,7 +186,7 @@ public class AccountController extends BaseController {
     }
 
     /**
-     * 删除配置项
+     * 鍒犻櫎閰嶇疆椤�
      * @param uc
      * @param ids
      * @return
@@ -195,11 +196,11 @@ public class AccountController extends BaseController {
     public ResponseObject delInstallProd(UserContext uc, String ids) throws SQLException {
 
         if (StringUtils.isBlank(ids))
-            return ResponseObject.newErrResponse("请选择要删除的数据");
+            return ResponseObject.newErrResponse("璇烽€夋嫨瑕佸垹闄ょ殑鏁版嵁");
 
         String tableName = "BO_EU_DNCRM_INSTALLED_PRODUCT";
 
-        //引用校验
+        //寮曠敤鏍￠獙
         String result = verifyDel(tableName, ids);
         if (result != null)
             return ResponseObject.newErrResponse(result);
@@ -216,7 +217,7 @@ public class AccountController extends BaseController {
                 installProd.set("CLOSED", "1");
                 SDK.getBOAPI().update(tableName, installProd, conn);
 
-                //合同成本  修改项目成本
+                //鍚堝悓鎴愭湰  淇�敼椤圭洰鎴愭湰
                 String CONTRACT_COST_ID = installProd.getString("CONTRACT_COST_ID");
                 if (StringUtils.isNotBlank(CONTRACT_COST_ID)) {
                     BO contractCost = SDK.getBOAPI().get("BO_EU_DNCTT_CONTRACT_COST", CONTRACT_COST_ID);
@@ -244,7 +245,7 @@ public class AccountController extends BaseController {
 
 
     /**
-     * 删除地址
+     * 鍒犻櫎鍦板潃
      * @param uc
      * @param ids
      * @return
@@ -254,11 +255,11 @@ public class AccountController extends BaseController {
     public ResponseObject delLocation(UserContext uc, String ids) throws SQLException {
 
         if (StringUtils.isBlank(ids))
-            return ResponseObject.newErrResponse("请选择要删除的数据");
+            return ResponseObject.newErrResponse("璇烽€夋嫨瑕佸垹闄ょ殑鏁版嵁");
 
         String tableName = "BO_EU_DNCRM_LOCATION";
 
-        //引用校验
+        //寮曠敤鏍￠獙
         String result = verifyDel(tableName, ids);
         if (result != null)
             return ResponseObject.newErrResponse(result);
@@ -307,20 +308,20 @@ public class AccountController extends BaseController {
                     for (RowMap rowMap : list) {
                         errMsg += rowMap.getString("NAME") + rowMap.getString("NUM") + "\r\n";
                     }
-                    return "删除失败，被以下数据引用：\r\n" + errMsg;
+                    return "鍒犻櫎澶辫触锛岃�浠ヤ笅鏁版嵁寮曠敤锛歕r\n" + errMsg;
                 }
             }
         }
         return null;
     }
 
-	 @Mapping("com.awspaas.user.apps.donenow_crm.querydepartment")
+    @Mapping("com.awspaas.user.apps.donenow_crm.querydepartment")
 	    public String findPchSelect(String accountId,UserContext uc) {
 	       RowMap map = DBSql.getMap("SELECT * FROM orgdepartment WHERE EXT1=?", new Object[] {accountId});
 	       if(map==null) {
-	    	  return fail("请先保存主表数据"); 
+	    	  return fail("锟斤拷锟饺憋拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷"); 
 	       }
-		 return success("保存成功");
+		 return success("锟斤拷锟斤拷晒锟�");
 	      
 	    }
 	 
@@ -338,27 +339,27 @@ public class AccountController extends BaseController {
 		   
 		   String ORGID = uc.getCompanyModel().getId();
 			 System.out.println("ORGID:"+ORGID);
-			 //查询配置项类型
+			 //锟斤拷询锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷
 			BO detail = SDK.getBOAPI().query(CrmConstant.BO_EU_DNSYS_UDF_GROUP).detailById(cateId);
 			if(null==detail) {
 				return StringUtils.EMPTY;
 			}
-			 //查询配置项类型自定义字段，比如EXTTEXT5
+			 //锟斤拷询锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟皆讹拷锟斤拷锟街段ｏ拷锟斤拷锟斤拷EXTTEXT5
 			List<BO> fieldList = SDK.getBOAPI().query(CrmConstant.BO_EU_DNSYS_UDF_GROUP_FIELD).bindId(detail.getBindId()).list();
 			List<String> list=new ArrayList<String>();
 			for (BO bo : fieldList) {
 				list.add("'"+bo.getString("UDF_FIELD_COL_NAME")+"'");
 			}
-			//根据配置信息去自定义属性表中查询所有字段信息，返回前端拼接成页面
+			//锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷息去锟皆讹拷锟斤拷锟斤拷锟皆憋拷锟叫诧拷询锟斤拷锟斤拷锟街讹拷锟斤拷息锟斤拷锟斤拷锟斤拷前锟斤拷拼锟接筹拷页锟斤拷
 			String fieldSql="SELECT * FROM "+CrmConstant.BO_EU_DNSYS_UDF_FIELD+" WHERE COL_NAME IN ("+org.apache.commons.lang3.StringUtils.join(list, ",")+") AND ORGID=? AND CATE_ID="+CrmConstant.PZXID+"  ORDER BY SORT_ORDER";
 		   List<RowMap> udfList = DBSql.getMaps(fieldSql, new Object[] { ORGID }); 
 		   System.out.println("sql2:"+fieldSql);
 
-		   map.put("formTitle", "配置项自定义字段");
+		   map.put("formTitle", "锟斤拷锟斤拷锟斤拷锟皆讹拷锟斤拷锟街讹拷");
 		   
 		   List<Map<String, Object>> colFields = new ArrayList<>();
 		   
-		   //查询配置表存储数据
+		   //锟斤拷询锟斤拷锟矫憋拷娲�拷锟斤拷锟�
 		   BO object=SDK.getBOAPI().query(CrmConstant.BO_EU_DNCRM_INSTALLED_PRODUCT).detailById(objectId);
 		   for (RowMap udf : udfList) {
 		     Map<String, Object> field = new HashMap<>();
@@ -422,7 +423,7 @@ public class AccountController extends BaseController {
 
 	     DBSql.update(sql, values.toArray());
 	     
-	     return ResponseObject.newOkResponse("保存成功");
+	     return ResponseObject.newOkResponse("锟斤拷锟斤拷晒锟�");
    }
 	 
 	

com.awspaas.user.apps.donenow_ctt/com.awspaas.user.apps.donenow_ctt.iml

@@ -8,23 +8,5 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="aws_lib" level="project" />
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../zhongzhao/lib/icu4j-60.2.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../dn_form_before_save/lib/dn_form_before_save.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
   </component>
 </module>

com.awspaas.user.apps.donenow_sys/com.awspaas.user.apps.donenow_sys.iml

@@ -8,14 +8,5 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="aws_lib" level="project" />
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/lib/jsoup-1.21.1.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
   </component>
 </module>