Merge branch 'developer' of https://gitlab.com/Arisono/SkWeiChat-Baidu into developer

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/crm/BusinessLessActivity.java

@@ -18,6 +18,7 @@ import com.lidroid.xutils.view.annotation.ViewInject;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
+import com.xzjmyk.pm.activity.ui.erp.util.CodeUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.Constants;
 import com.xzjmyk.pm.activity.util.ToastUtil;
@@ -34,7 +35,7 @@ import java.util.Map;
  * @param:
  * @return:
  */
-public class BusinessLessActivity extends BaseActivity implements View.OnClickListener{
+public class BusinessLessActivity extends BaseActivity implements View.OnClickListener {
     @ViewInject(R.id.ll_moment)
     private LinearLayout ll_moment;
     @ViewInject(R.id.ll_leader)
@@ -47,7 +48,9 @@ public class BusinessLessActivity extends BaseActivity implements View.OnClickLi
     @ViewInject(R.id.tv_leader)
     private TextView tv_leader;
     @ViewInject(R.id.tv_date)
-    private TextView  tv_date;
+    private TextView tv_date;
+
+    private String bcd_code = "";
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -72,13 +75,14 @@ public class BusinessLessActivity extends BaseActivity implements View.OnClickLi
     private String code;
     private String process;
     private String doman;
+
     private void initData() {
         Intent intent = getIntent();
         if (intent != null) {
             type = intent.getIntExtra("type", 1);
-            code=intent.getStringExtra("code");
-            process=intent.getStringExtra("process");
-            doman=intent.getStringExtra("doman");
+            code = intent.getStringExtra("code");
+            process = intent.getStringExtra("process");
+            doman = intent.getStringExtra("doman");
         }
 
         switch (type) {
@@ -107,11 +111,19 @@ public class BusinessLessActivity extends BaseActivity implements View.OnClickLi
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
             case R.id.btn_save:
-                if (type==1) {
-                    sendHttpResquest(Constants.HTTP_SUCCESS_INIT,"失效");
+                if (type == 1) {
+                    CodeUtil.getInstance().getCode(ct, "BusinessChanceData", new CodeUtil.OnCodeLinstener() {
+                        @Override
+                        public void callBack(String code) {
+                            bcd_code = code;
+                            sendHttpResquest(Constants.HTTP_SUCCESS_INIT, "失效");
+                        }
+                    });
+
                 }
-                if (type==2){
-                    sendHttpResquest(Constants.HTTP_SUCCESS_INIT,"继续跟进");
+                if (type == 2) {
+                    sendHttpResquest(Constants.HTTP_SUCCESS_INIT, "继续跟进");
+
                 }
                 break;
             case android.R.id.home:
@@ -122,14 +134,19 @@ public class BusinessLessActivity extends BaseActivity implements View.OnClickLi
     }
 
 
-    private Handler mHandler=new Handler(){
+    private Handler mHandler = new Handler() {
         @Override
         public void handleMessage(Message msg) {
-            switch (msg.what){
+            switch (msg.what) {
                 case Constants.HTTP_SUCCESS_INIT:
                     progressDialog.dismiss();
                     Log.i(TAG, "handleMessage:" + msg.getData().getString("result"));
                     ViewUtil.ToastMessage(ct, "操作成功！");
+                    if (type == 2) {
+                        updataSchedule(0x16);
+                    }
+                    break;
+                case 0x16:
                     jumpToStateActivity();
                     break;
                 case Constants.APP_SOCKETIMEOUTEXCEPTION:
@@ -140,7 +157,7 @@ public class BusinessLessActivity extends BaseActivity implements View.OnClickLi
                 case 2:
                     progressDialog.dismiss();
                     Log.i(TAG, "handleMessage:" + msg.getData().getString("result"));
-                    String leader= JSON.parseObject(msg.getData().getString("result"))
+                    String leader = JSON.parseObject(msg.getData().getString("result"))
                             .getJSONObject("data").getString("em_name");
                     tv_leader.setText(leader);
                     break;
@@ -154,39 +171,47 @@ public class BusinessLessActivity extends BaseActivity implements View.OnClickLi
         startActivity(intent);
     }
 
-    private void sendHttpResquest(int what,String type){
+    private void updataSchedule(int what) {
+        String url = Constants.getAppBaseUrl(ct) + "mobile/crm/updateSchedule.action";
+        Map<String, Object> params = new HashMap<>();
+        params.put("code", code);
+        LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
+        headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
+        ViewUtil.httpSendRequest(ct, url, params, mHandler, headers, what, null, null, "post");
+    }
+
+    private void sendHttpResquest(int what, String type) {
         progressDialog.show();
-        String remark=et_remark.getText().toString();
-        String gridSore="{\n" +
-                "\"bcd_bccode\":\""+code+"\",\n" +
-                "\"bcd_remark\":\""+remark+"\",\n" +
-                "\"bcd_leader\":\""+tv_leader.getText().toString()+"\",\n" +
-                "\"bcd_date\":\""+tv_date.getText().toString()+"\",\n" +
-                "\"bcd_bsname\":\""+process+"\",\n" +
-                "\"bcd_type\":\""+type+"\",\n" +
-                "\"bcd_man\":\""+doman+"\""+
+        String remark = et_remark.getText().toString();
+        String gridSore = "{\n" +
+                "\"bcd_bccode\":\"" + code + "\",\n" +
+                "\"bcd_remark\":\"" + remark + "\",\n" +
+                "\"bcd_leader\":\"" + tv_leader.getText().toString() + "\",\n" +
+                "\"bcd_date\":\"" + tv_date.getText().toString() + "\",\n" +
+                "\"bcd_bsname\":\"" + process + "\",\n" +
+                "\"bcd_type\":\"" + type + "\",\n" +
+                "\"bcd_man\":\"" + doman + "\"" + (this.type == 1 ? ",\n\"bcd_code\":\"" + bcd_code + "\"\n" : "") +
                 "}";
-        String url= Constants.getAppBaseUrl(ct)+"mobile/crm/updatebusinessChanceData.action";
-
-        Map<String,Object> params=new HashMap<>();
+        String url = Constants.getAppBaseUrl(ct) + "mobile/crm/updatebusinessChanceData.action";
+        Map<String, Object> params = new HashMap<>();
         params.put("gridStore", gridSore);
         params.put("caller", "BusinessChance");
-        LinkedHashMap<String , Object> headers=new LinkedHashMap<>();
+        LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
         headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
         ViewUtil.httpSendRequest(ct, url, params, mHandler, headers, what, null, null, "post");
     }
-    
-    private void loadLeader(int what){
-        String url= Constants.getAppBaseUrl(ct)+"mobile/crm/getheadmanmsg.action";
-        Map<String,Object> params=new HashMap<>();
+
+    private void loadLeader(int what) {
+        String url = Constants.getAppBaseUrl(ct) + "mobile/crm/getheadmanmsg.action";
+        Map<String, Object> params = new HashMap<>();
         params.put("emcode", CommonUtil.getSharedPreferences(ct, "erp_username"));
-        LinkedHashMap<String , Object> headers=new LinkedHashMap<>();
+        LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
         headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
         ViewUtil.httpSendRequest(ct, url, params, mHandler, headers, what, null, null, "post");
     }
-    
-    private void showDateWheel(final int resId){
-        DatePicker picker = new DatePicker(this,DatePicker.YEAR_MONTH_DAY);
+
+    private void showDateWheel(final int resId) {
+        DatePicker picker = new DatePicker(this, DatePicker.YEAR_MONTH_DAY);
         picker.setRange(1950, 2030);
         //Calendar.getInstance().get(Calendar.DAY_OF_MONTH)
         picker.setSelectedItem(
@@ -194,11 +219,11 @@ public class BusinessLessActivity extends BaseActivity implements View.OnClickLi
                 Calendar.getInstance().get(Calendar.MONTH) + 1);
         picker.setOnDatePickListener(new DatePicker.OnYearMonthDayPickListener() {
             @Override
-            public void onDatePicked(String year, String month,String day) {
+            public void onDatePicked(String year, String month, String day) {
                 switch (resId) {
                     case R.id.tv_date://排名
                         ToastUtil.showToast(ct, year + "-" + month);
-                       tv_date.setText(year + "-" + month+"-"+day);
+                        tv_date.setText(year + "-" + month + "-" + day);
                         break;
                 }
             }
@@ -206,10 +231,10 @@ public class BusinessLessActivity extends BaseActivity implements View.OnClickLi
         picker.show();
     }
 
-   
+
     @Override
     public void onClick(View v) {
-        switch (v.getId()){
+        switch (v.getId()) {
             case R.id.tv_leader:
                 loadLeader(2);
                 break;

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/crm/TaskAddActivity.java

@@ -57,6 +57,7 @@ public class TaskAddActivity extends BaseActivity implements View.OnClickListene
 
     private String code = null;
     private int type;
+    private boolean isBusiness;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -70,6 +71,7 @@ public class TaskAddActivity extends BaseActivity implements View.OnClickListene
         ViewUtils.inject(this);
         type = getIntent().getIntExtra("type", 0);
         code = getIntent().getStringExtra("data");
+        isBusiness = getIntent().getBooleanExtra("business", false);
         if (type == 0) {
             getSupportActionBar().setTitle("新增任务");
             tv_type.setText("任务");
@@ -186,6 +188,11 @@ public class TaskAddActivity extends BaseActivity implements View.OnClickListene
         } else {
             str = "Task";
         }
+        String strs = null;
+        if (isBusiness) {
+            strs = "\"handstatus\":\"" + "未完成" + "\",\n" +//编号
+                    "\"handstatuscode\":\"" + "UNFINISHED" + "\",\n";
+        }
         String formStore = "{\n" +
                 "\"taskcode\":\"" + tv_code + "\",\n" +//编号
                 "\"name\":\"" + tv_name.getText().toString() + "\",\n" +//名称
@@ -211,7 +218,7 @@ public class TaskAddActivity extends BaseActivity implements View.OnClickListene
                 "\",\n" +
                 "\"description\":\"" +
                 tv_content.getText().toString() +
-                "\",\n" +
+                "\",\n" + (isBusiness ? strs : "") +
                 "}";
         String url = Constants.getAppBaseUrl(ct) + "plm/task/addbilltask.action";
         Map<String, Object> params = new HashMap<>();

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/AddMeetingActivity.java

@@ -204,6 +204,7 @@ public class AddMeetingActivity extends BaseActivity implements View.OnClickList
         finish();
         progressDialog.dismiss();
     }
+
     //判断是否可以进行创建
     private void signinAble(int id) {
         if (StringUtils.isEmpty(name_et.getText().toString())) {
@@ -362,7 +363,8 @@ public class AddMeetingActivity extends BaseActivity implements View.OnClickList
         if (requestCode == this.request) {
             if (resultCode == 0x11) {
                 entities = data.getParcelableArrayListExtra("data");
-                users_tv.setText("选择" + entities.size() + "人");
+                if (entities != null)
+                    users_tv.setText("选择" + entities.size() + "人");
             }
         }
     }

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/MeetingActivity.java

@@ -275,7 +275,7 @@ public class MeetingActivity extends BaseActivity {
             // 当会议开始时间<系统时间会议状态为进行中，当会议发起人点击结束会议按钮，
             // 状态更新为已结束，否则即使超过会议结束时间状态也是进行中
             String str = entity.getMa_stage();
-            if (str == null) {
+            if (str == null || str.trim().length() <= 0) {
                 if (TimeUtils.f_str_2_long(entity.getMa_starttime()) > System.currentTimeMillis())
                     str = "未开始";
                 else

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/UserSelectActivity.java

@@ -186,6 +186,10 @@ public class UserSelectActivity extends BaseActivity {
             return;
         }
         for (int i = 0; i < adapter.getUsers().size(); i++) {
+            if (CommonUtil.getSharedPreferences(ct, "username").trim().equals(adapter.getUsers().get(i).getEmCode().trim())) {
+                list.add(adapter.getUsers().get(i));
+                continue;
+            }
             if (adapter.getUsers().get(i).isClick())
                 list.add(adapter.getUsers().get(i));
         }