修改关于许多通用的接口 oa方面

WeiChat/src/main/java/com/xzjmyk/pm/activity/adapter/PlatComAfAdapter.java

@@ -47,20 +47,30 @@ public class PlatComAfAdapter extends BaseAdapter{
 
     @Override
     public int getCount() {
-        if (!ListUtils.isEmpty(mPlatComAfBean.getData())){
-            return mPlatComAfBean.getData()== null ? 0 : mPlatComAfBean.getData().size();
-        }else{
-            return mPlatComAfBean.getNodes() == null ? 0 : mPlatComAfBean.getNodes().size();
+        if (mPlatComAfBean != null){
+            if (!ListUtils.isEmpty(mPlatComAfBean.getData())){
+                return mPlatComAfBean.getData()== null ? 0 : mPlatComAfBean.getData().size();
+            }else{
+                return mPlatComAfBean.getNodes() == null ? 0 : mPlatComAfBean.getNodes().size();
+            }
+        }else {
+            return 0;
         }
+
     }
 
     @Override
     public Object getItem(int position) {
-        if (!ListUtils.isEmpty(mPlatComAfBean.getData())){
-            return mPlatComAfBean.getData().get(position);
+        if (mPlatComAfBean != null){
+            if (!ListUtils.isEmpty(mPlatComAfBean.getData())){
+                return mPlatComAfBean.getData().get(position);
+            }else {
+                return mPlatComAfBean.getNodes().get(position);
+            }
         }else {
-            return mPlatComAfBean.getNodes().get(position);
+            return 0;
         }
+
     }
 
     @Override
@@ -114,7 +124,7 @@ public class PlatComAfAdapter extends BaseAdapter{
             }
         }else if (datanum != 0 && nodesnum != 0){
             if (position > (datanum - nodesnum - 1)){//已走过审批流的节点
-                if (mPlatComAfBean.getNodes().get(datanum - position -1).getJn_dealResult().equals("同意")){
+                if (mPlatComAfBean.getNodes().get(datanum - position -1).getJn_result().equals("同意")){
                     viewHolder.AppFlowStatus.setTextColor(mContext.getResources().getColor(R.color.done_approval));
                     viewHolder.AppFlowStatus.setText("已审批");
                     viewHolder.AppFlowNode.setImageResource(R.drawable.node_finished3);
@@ -142,14 +152,14 @@ public class PlatComAfAdapter extends BaseAdapter{
                         viewHolder.AppFlowDescriptionll.setVisibility(View.GONE);
                         viewHolder.AppFlowDescriptiontv.setText("");
                     }
-                }else if ((mPlatComAfBean.getNodes().get(datanum -position -1).getJn_dealResult().equals("不同意"))){
+                }else if ((mPlatComAfBean.getNodes().get(datanum -position -1).getJn_result().equals("不同意"))){
                     viewHolder.AppFlowStatus.setTextColor(mContext.getResources().getColor(R.color.no_approval));
                     viewHolder.AppFlowStatus.setText("不同意");
                     viewHolder.AppFlowNode.setImageResource(R.drawable.icon_disagree_nor);
                     viewHolder.AppFlowTime.setText(mPlatComAfBean.getNodes().get(datanum - position - 1).getJn_dealTime());
                 }
             }else if (position == (datanum - nodesnum -1)){//当前待处理的节点（nodes里面将要统计的数据）
-                if (mPlatComAfBean.getNodes().get(datanum - position - 2).getJn_dealResult().equals("同意")){
+                if (mPlatComAfBean.getNodes().get(datanum - position - 2).getJn_result().equals("同意")){
                     viewHolder.AppFlowNode.setImageResource(R.drawable.node_wait3);
                     viewHolder.AppFlowStatus.setTextColor(mContext.getResources().getColor(R.color.no_approval));
                     viewHolder.AppFlowStatus.setText("待审批");

WeiChat/src/main/java/com/xzjmyk/pm/activity/adapter/PlatDailyAdapter.java

@@ -142,6 +142,7 @@ public class PlatDailyAdapter extends BaseAdapter {
         String url = ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().delete_work_daily;
         Map<String,Object> param = new HashMap<>();
         param.put("id",mkeyValue);
+        param.put("whichpage",4);
         param.put("enuu", Long.valueOf(CommonUtil.getSharedPreferences(MyApplication.getInstance().getApplicationContext(), "companyEnUu")).longValue());
         param.put("emcode",Long.valueOf(CommonUtil.getSharedPreferences(MyApplication.getInstance().getApplicationContext(), "b2b_uu")).longValue());LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
         headers.put("Cookie", "JSESSIONID=" + ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().getCookie());

WeiChat/src/main/java/com/xzjmyk/pm/activity/adapter/WorkDailyPaperAdapter.java

@@ -1,384 +0,0 @@
-package com.xzjmyk.pm.activity.adapter;
-
-import android.content.Context;
-import android.os.Handler;
-import android.os.Message;
-import android.text.SpannableStringBuilder;
-import android.text.TextUtils;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.BaseAdapter;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.android.volley.Response;
-import com.android.volley.VolleyError;
-import com.xzjmyk.pm.activity.MyApplication;
-import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.bean.User;
-import com.xzjmyk.pm.activity.bean.circle.Comment;
-import com.xzjmyk.pm.activity.bean.circle.Praise;
-import com.xzjmyk.pm.activity.bean.circle.PublicMessage;
-import com.xzjmyk.pm.activity.helper.AvatarHelper;
-import com.xzjmyk.pm.activity.ui.base.BaseActivity;
-import com.xzjmyk.pm.activity.util.HtmlUtils;
-import com.xzjmyk.pm.activity.util.LinkMovementClickMethod;
-import com.xzjmyk.pm.activity.util.StringUtils;
-import com.xzjmyk.pm.activity.util.TimeUtils;
-import com.xzjmyk.pm.activity.util.ToastUtil;
-import com.xzjmyk.pm.activity.view.MyListView;
-import com.xzjmyk.pm.activity.volley.ObjectResult;
-import com.xzjmyk.pm.activity.volley.Result;
-import com.xzjmyk.pm.activity.volley.StringJsonObjectRequest;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-
-/**
- * Created by FANGlh on 2016/11/1.
- */
-public class WorkDailyPaperAdapter extends BaseAdapter{
-    private static final int PRAISE_WHAT = 0x11;
-    private User user;
-    private List<PublicMessage> messages;
-    private Context context;
-    private CommentAdapter mAdapter;
-    private int pon;//点赞的对象
-    private Handler handler = new Handler() {
-        @Override
-        public void handleMessage(Message msg) {
-            String message = msg.getData().getString("result");
-            switch (msg.what) {
-                case PRAISE_WHAT:
-                    JSONObject json = JSON.parseObject(message);
-                    if (json.getIntValue("resultCode") != 1) return;
-                    if (json.getString("data") == null) {//为取消点赞
-                        messages.get(pon).setIsPraise(0);
-                        messages.get(pon).setPraise(messages.get(pon).getPraise() - 1);
-                        List<Praise> praises = messages.get(pon).getPraises();
-                        for (int i = 0; i < praises.size(); i++) {
-                            if (praises.get(i).getUserId().equals(MyApplication.getInstance().mLoginUser.getUserId())) {
-                                praises.remove(i);
-                                break;
-                            }
-                        }
-                    } else {//点赞
-                        messages.get(pon).setIsPraise(1);
-                        Praise bean = new Praise();
-                        bean.setNickName(MyApplication.getInstance().mLoginUser.getNickName());
-                        bean.setUserId(MyApplication.getInstance().mLoginUser.getUserId());
-                        bean.setPraiseId(json.getString("data"));
-                        messages.get(pon).getPraises().add(0, bean);
-                        messages.get(pon).setPraise(messages.get(pon).getPraise() + 1);
-                    }
-                    notifyDataSetChanged();
-                    break;
-            }
-
-        }
-    };
-
-    public WorkDailyPaperAdapter(Context context, List<PublicMessage> messages) {
-        this.context = context;
-        this.messages = messages;
-        this.user = MyApplication.getInstance().mLoginUser;
-    }
-
-    public void setData(List<PublicMessage> messages) {
-        this.messages = messages;
-    }
-
-
-    @Override
-    public int getCount() {
-        return messages == null ? 0 : messages.size();
-    }
-
-    @Override
-    public Object getItem(int i) {
-        return messages.get(i);
-    }
-
-    @Override
-    public long getItemId(int i) {
-        return i;
-    }
-
-    @Override
-    public View getView(int i, View view, ViewGroup viewGroup) {
-        ViewHolder holder;
-        if (view == null) {
-            holder = new ViewHolder();
-            view = LayoutInflater.from(context).inflate(R.layout.item_activity_worklogs, null);
-            holder.avatar_img = (ImageView) view.findViewById(R.id.avatar_img);
-            holder.comment_tag = (LinearLayout) view.findViewById(R.id.comment_tag);
-            holder.name_tv = (TextView) view.findViewById(R.id.name_tv);
-            holder.content_tv = (TextView) view.findViewById(R.id.content_tv);
-            holder.time_tv = (TextView) view.findViewById(R.id.time_tv);
-            holder.like_tv = (TextView) view.findViewById(R.id.like_tv);
-            holder.command_tv = (TextView) view.findViewById(R.id.command_tv);
-            holder.command_lv = (MyListView) view.findViewById(R.id.command_lv);
-            view.setTag(holder);
-        } else {
-            holder = (ViewHolder) view.getTag();
-        }
-        bindData(holder, i);
-        return view;
-    }
-
-    private PublicMessage.Body body;//临时变量
-
-    private void bindData(ViewHolder holder, final int i) {
-        final PublicMessage message = messages.get(i);
-        holder.name_tv.setText(message.getNickName());//名字
-        AvatarHelper.getInstance().displayAvatar(message.getUserId(), holder.avatar_img, false);//头像设置
-        holder.time_tv.setText(TimeUtils.getFriendlyTimeDesc(context, (int) message.getTime()));//时间设置
-        body = message.getBody();
-        String text;
-        if (body == null || body.getText() == null) text = "";
-        else text = body.getText();
-        holder.content_tv.setText(text);
-        final List<Comment> comments = message.getComments();
-        holder.like_tv.setText(message.getPraise() + "");
-        final boolean isPraise = message.getIsPraise() != 1;
-        holder.command_tv.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                if (listener == null) return;
-                listener.onClick(i, message.getMessageId(), message.getUserId(), message.getNickName());
-            }
-        });
-        holder.like_tv.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                praiseOrCancle(i, isPraise);
-            }
-        });
-        if (comments == null || comments.size() <= 0) {
-            holder.comment_tag.setVisibility(View.GONE);
-        } else {
-            holder.comment_tag.setVisibility(View.VISIBLE);
-        }
-        holder.command_tv.setText(comments.size() + "");
-        mAdapter = new CommentAdapter(comments);
-        holder.command_lv.setAdapter(mAdapter);
-    }
-
-    class ViewHolder {
-        ImageView avatar_img; //头像
-        TextView name_tv,//名字
-                content_tv,//内容
-                time_tv, //发表时间
-                like_tv, //点赞按钮
-                command_tv;//评论
-        MyListView command_lv;
-        LinearLayout comment_tag;
-    }
-
-
-    //评论适配器
-    public class CommentAdapter extends BaseAdapter {
-        private int messagePosition;
-        private List<Comment> datas;
-
-        public CommentAdapter(int messagePosition, List<Comment> datas) {
-            this.messagePosition = messagePosition;
-            this.datas = datas;
-        }
-
-        public CommentAdapter(List<Comment> datas) {
-            this.datas = datas;
-        }
-
-        @Override
-        public int getCount() {
-            return datas.size();
-        }
-
-        @Override
-        public Object getItem(int position) {
-            return position;
-        }
-
-        @Override
-        public long getItemId(int position) {
-            return position;
-        }
-
-        @Override
-        public View getView(final int position, View convertView, ViewGroup parent) {
-            ViewHolder holder = null;
-            if (convertView == null) {
-                holder = new ViewHolder();
-                convertView = LayoutInflater.from(context).inflate(R.layout.p_msg_comment_list_item, null);
-                holder.text_view = (TextView) convertView.findViewById(R.id.text_view);
-                convertView.setTag(holder);
-            } else {
-                holder = (ViewHolder) convertView.getTag();
-            }
-            final Comment comment = datas.get(position);
-            SpannableStringBuilder builder = new SpannableStringBuilder();
-            String showName = comment.getNickName();
-            UserClickableSpan.setClickableSpan(context, builder, showName, comment.getUserId());// 设置评论者的ClickSpanned
-            if (!TextUtils.isEmpty(comment.getToUserId()) && !TextUtils.isEmpty(comment.getToNickname())) {
-                builder.append(context.getString(R.string.replay));
-                String toShowName = comment.getToNickname();
-                UserClickableSpan.setClickableSpan(context, builder, toShowName, comment.getToUserId());// 设置被评论者的ClickSpanned
-            }
-
-            builder.append(":");
-            // 设置评论内容
-            String commentBody = comment.getBody();
-            if (!TextUtils.isEmpty(commentBody)) {
-                commentBody = StringUtils.replaceSpecialChar(comment.getBody());
-                CharSequence charSequence = HtmlUtils.transform200SpanString(commentBody.replaceAll("\n", "\r\n"),
-                        true);
-                builder.append(charSequence);
-            }
-            holder.text_view.setText(builder);
-            holder.text_view.setLinksClickable(true);
-            holder.text_view.setMovementMethod(LinkMovementClickMethod.getInstance());
-            holder.text_view.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    //点击操作
-//                    if (comment.getUserId().equals(mLoginUserId)) {// 如果消息是我发的，那么就弹出删除和复制的对话框
-//                        showCommentLongClickDialog(messagePosition, position, CommentAdapter.this);
-//                    } else {// 弹出回复的框
-//                        String toShowName = getShowName(comment.getUserId(), comment.getNickName());
-//                        // 懒得写回调的，直接强转，以后如果不适用，可以写个接口回调
-//                        if (context instanceof BusinessCircleActivity) {
-//                            ((BusinessCircleActivity) mContext).showCommentEnterView(messagePosition,
-//                                    comment.getUserId(), comment.getNickName(), toShowName);
-//
-//                        } else {
-//                            ((MainActivity) context).getBusinessCircleFragment().showCommentEnterView(messagePosition,
-//                                    comment.getUserId(), comment.getNickName(), toShowName);
-//                        }
-//                    }
-                }
-            });
-            holder.text_view.setOnLongClickListener(new View.OnLongClickListener() {
-                @Override
-                public boolean onLongClick(View v) {
-
-                    return true;
-                }
-            });
-
-            return convertView;
-        }
-
-        class ViewHolder {
-            TextView text_view;
-        }
-    }
-
-
-    private ButtonViewListener listener;
-
-    public void setButtonViewListener(ButtonViewListener listener) {
-        this.listener = listener;
-    }
-
-    public interface ButtonViewListener {
-        void onClick(int i, String messageId, String userId, String nickName);
-    }
-
-
-    /**
-     * 赞或者取消赞
-     *
-     * @param
-     * @param isPraise
-     */
-//    private void praiseOrCancle(final int position, final boolean isPraise) {
-//        pon = position;
-//        //参数
-//        final PublicMessage message = messages.get(position);
-//        String requestUrl = null;
-//        if (isPraise) {
-//            requestUrl = MyApplication.getInstance().getConfig().MSG_PRAISE_ADD;
-//        } else {
-//            requestUrl = MyApplication.getInstance().getConfig().MSG_PRAISE_DELETE;
-//        }
-//        HashMap<String, Object> params = new HashMap<>();
-//        params.put("access_token", MyApplication.getInstance().mAccessToken);
-//        params.put("messageId", message.getMessageId());
-//        ViewUtil.httpSendRequest(context, requestUrl, params, handler, null, PRAISE_WHAT, null, null, "get");
-//    }
-
-    /**
-     * 赞或者取消赞
-     *
-     * @param
-     * @param isPraise
-     */
-    private void praiseOrCancle(final int position, final boolean isPraise) {
-        pon = position;
-        final PublicMessage message = messages.get(position);
-        if (message == null) {
-            return;
-        }
-
-        HashMap<String, String> params = new HashMap<String, String>();
-        params.put("access_token", MyApplication.getInstance().mAccessToken);
-        params.put("messageId", message.getMessageId());
-        String requestUrl = null;
-        if (isPraise) {
-            requestUrl = MyApplication.getInstance().getConfig().MSG_PRAISE_ADD;
-        } else {
-            requestUrl = MyApplication.getInstance().getConfig().MSG_PRAISE_DELETE;
-        }
-
-        StringJsonObjectRequest<Void> request = new StringJsonObjectRequest<Void>(requestUrl, new Response.ErrorListener() {
-            @Override
-            public void onErrorResponse(VolleyError arg0) {
-                ToastUtil.showErrorNet(context);
-            }
-        }, new StringJsonObjectRequest.Listener<Void>() {
-
-            @Override
-            public void onResponse(ObjectResult<Void> result) {
-                boolean success = Result.defaultParser(context, result, true);
-                if (success) {
-                    message.setIsPraise(isPraise ? 1 : 0);
-                    List<Praise> praises = message.getPraises();
-                    if (praises == null) {
-                        praises = new ArrayList<Praise>();
-                        message.setPraises(praises);
-                    }
-                    int praiseCount = message.getPraise();
-                    if (isPraise) {// 代表我点赞
-                        // 消息实体的改变
-                        Praise praise = new Praise();
-                        praise.setUserId(MyApplication.getInstance().mLoginUser.getUserId());
-                        praise.setNickName(MyApplication.getInstance().mLoginUser.getNickName());
-                        praises.add(0, praise);
-                        praiseCount++;
-                        message.setPraise(praiseCount);
-                    } else {// 取消我的赞
-                        // 消息实体的改变
-                        for (int i = 0; i < praises.size(); i++) {
-                            if (MyApplication.getInstance().mLoginUser.getUserId().equals(praises.get(i).getUserId())) {
-                                praises.remove(i);
-                                praiseCount--;
-                                message.setPraise(praiseCount);
-                                break;
-                            }
-                        }
-                    }
-                    notifyDataSetChanged();
-                }
-            }
-        }, Void.class, params);
-        ((BaseActivity) context).addDefaultRequest(request);
-    }
-
-}
-

WeiChat/src/main/java/com/xzjmyk/pm/activity/bean/oa/PlatComAfBean.java

@@ -58,9 +58,17 @@ public class PlatComAfBean  {
         private String jn_dealManId;
         private String jn_dealManName;
         private String jn_dealTime;
-        private String jn_dealResult;
+        private String jn_result;
         private Object jn_nodeDescription;
 
+        public String getJn_result() {
+            return jn_result;
+        }
+
+        public void setJn_result(String jn_result) {
+            this.jn_result = jn_result;
+        }
+
         public String getJn_id() {
             return jn_id;
         }
@@ -101,13 +109,6 @@ public class PlatComAfBean  {
             this.jn_dealTime = jn_dealTime;
         }
 
-        public String getJn_dealResult() {
-            return jn_dealResult;
-        }
-
-        public void setJn_dealResult(String jn_dealResult) {
-            this.jn_dealResult = jn_dealResult;
-        }
 
         public Object getJn_nodeDescription() {
             return jn_nodeDescription;

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

@@ -16,6 +16,7 @@ import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.inputmethod.InputMethodManager;
 import android.widget.AdapterView;
 import android.widget.AdapterView.OnItemClickListener;
 import android.widget.BaseAdapter;
@@ -386,4 +387,20 @@ public class DbfindListActivity extends BaseActivity {
         }
     }
 
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        return super.onCreateOptionsMenu(menu);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        putDownInput();
+        return super.onOptionsItemSelected(item);
+    }
+
+    private void putDownInput() {
+        InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
+        imm.hideSoftInputFromWindow(et_Search.getWindowToken(), 0);
+    }
+
 }

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

@@ -428,11 +428,7 @@ public class LeaveActivity extends BaseActivity implements OnClickListener, Reco
                 break;
 
             case R.id.bt_save:
-
-                if (et_leave_man.testValidity() &&
-//                        et_leave_days.testValidity() &&
-//                        et_leave_hours.testValidity() &&
-                        et_leave_reason.testValidity() &&
+                if (et_leave_reason.testValidity() &&
                         tv_start_time.testValidity() &&
                         tv_end_time.testValidity() &&
                         et_leave_category.testValidity()
@@ -441,24 +437,18 @@ public class LeaveActivity extends BaseActivity implements OnClickListener, Reco
                     boolean falg = ViewUtil.isCheckDateTime(tv_start_time.getText()
                                     .toString(),
                             tv_end_time.getText().toString(), "yyyy-MM-dd HH:mm");
-
                     if (falg) {
                         ToastMessage("结束时间小于开始时间！");
                     } else {
                         progressDialog.show();
-//                        getPreHttpData();
                         httpSave();
                     }
                 }
-
                 break;
-
             case R.id.bt_commit:
                 progressDialog.show();
                 httpCommit();
-
                 break;
-
             case R.id.bt_add:
                 // 清空编辑框数据
                 // 隐藏button
@@ -500,7 +490,6 @@ public class LeaveActivity extends BaseActivity implements OnClickListener, Reco
                         httpUpdate();
                     }
                 }
-
                 break;
 
             case R.id.et_leave_category:
@@ -508,24 +497,17 @@ public class LeaveActivity extends BaseActivity implements OnClickListener, Reco
 //                loadDataForServer("va_vacationtype", SUCCESS_VACATION);
                 selectLeaveType();
                 break;
-
             case R.id.et_leave_type:
                 progressDialog.show();
                 loadDataForServer("va_holidaytype", SUCCESS_LEAVETYPE);
-
-
                 break;
-
             case R.id.tv_start_time:
 //                showDialog(v);
                 showDateDialog(this, tv_start_time);
-
                 break;
-
             case R.id.tv_end_time:
 //                showDialog(v);
                 showDateDialog(this, tv_end_time);
-
                 break;
 
             case R.id.et_leave_man:

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/form/DataFormDetailActivity.java

@@ -1075,6 +1075,25 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
                     editText.setOnClickListener(new View.OnClickListener() {
                         @Override
                         public void onClick(View v) {
+//                            if (data.getType().equals("D")){
+//                                boolean hasMenu=false;
+//                                if ("Ask4Leave".equals(caller)) hasMenu=true;
+//                                Log.d("date:",startDate_v + ","+endDate_v);
+//                                if ("Ask4Leave".equals(caller)){
+//                                    String breastfeeding = "breastfeeding";
+//                                    startActivityForResult(new Intent(mContext,SelectCalendarActivity.class)
+//                                            .putExtra("startDate",startDate_v)
+//                                            .putExtra("endDate", endDate_v)
+//                                            .putExtra("hasMenu",hasMenu)
+//                                            .putExtra("id", categoryIndex)
+//                                            .putExtra("field",data.getField())
+//                                            .putExtra("object", data)
+//                                            .putExtra("caller",caller)
+//                                            .putExtra("breastfeeding",breastfeeding)
+//                                            ,0x30);
+//                                }
+//                            }
+
                             if (data.getType().equals("D")) {
                                boolean hasMenu=false;
                                 if ("Ask4Leave".equals(caller)) hasMenu=true;

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/form/SelectCalendarActivity.java

@@ -131,6 +131,7 @@ public class SelectCalendarActivity extends BaseActivity implements View.OnClick
     private String first_end_date;
     private String first_start_time;
     private String first_end_time;
+    private Boolean breastfeeding = false;
 
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
@@ -141,7 +142,7 @@ public class SelectCalendarActivity extends BaseActivity implements View.OnClick
 
     @Override
     public boolean onPrepareOptionsMenu(Menu menu) {
-        if (isMenuShuffle) {
+        if (isMenuShuffle || breastfeeding) {
             menu.findItem(R.id.oa_leave).setVisible(true);
             menu.findItem(R.id.oa_signin_set).setVisible(true);
         } else {
@@ -226,6 +227,11 @@ public class SelectCalendarActivity extends BaseActivity implements View.OnClick
             endDate = intent.getStringExtra("endDate");
             field = intent.getStringExtra("field");
             String mcaller = intent.getStringExtra("caller");
+            String bf = intent.getStringExtra("breastfeeding");
+            Log.d("bf",bf);
+            if (!StringUtils.isEmpty(bf) && "breastfeeding".equals(bf)){
+                breastfeeding = true;
+            }
             if (!TextUtils.isEmpty(mcaller) && "Workovertime".equals(mcaller)) {
                 mWorkovertime = true;
             }

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/message/ProcessB2BActivity.java

@@ -1,6 +1,7 @@
 package com.xzjmyk.pm.activity.ui.erp.activity.message;
 
 import android.content.Context;
+import android.content.Intent;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
@@ -34,12 +35,14 @@ import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.audio.voicerecognition.JsonParser;
 import com.xzjmyk.pm.activity.audio.voicerecognition.VoiceToWord;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+import com.xzjmyk.pm.activity.ui.erp.activity.oa.PlatWDdetailyActivity;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.Constants;
 import com.xzjmyk.pm.activity.ui.erp.util.LogUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
 import com.xzjmyk.pm.activity.ui.erp.view.EmptyLayout;
+import com.xzjmyk.pm.activity.ui.platform.pageforms.FormDetailActivity;
 import com.xzjmyk.pm.activity.util.DateFormatUtil;
 import com.xzjmyk.pm.activity.view.ClearEditText;
 import com.xzjmyk.pm.activity.wxapi.ApiConfig;
@@ -92,7 +95,7 @@ public class ProcessB2BActivity extends BaseActivity implements View.OnClickList
             switch (msg.what) {
                 case SUSSCESS_un:
 
-                    JSONArray itemArray = JSON.parseObject(result).getJSONArray("data");
+                    itemArray = JSON.parseObject(result).getJSONArray("data");
                     if (page == 1) array.clear();
                     array.addAll(itemArray);
                     //array = CommonUtil.sortJsonArray(array);//排序
@@ -182,6 +185,8 @@ public class ProcessB2BActivity extends BaseActivity implements View.OnClickList
         }
     };
     private int currentId;
+    private int mPosition;
+    private JSONArray itemArray;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -263,10 +268,13 @@ public class ProcessB2BActivity extends BaseActivity implements View.OnClickList
             @Override
             public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
                 ProcessAdapter.ViewModel model = (ProcessAdapter.ViewModel) view.getTag();
+                mPosition = (int) parent.getItemIdAtPosition(position);
                 currentId=position;
                 LogUtil.d(TAG,position+"");
                 String title = "";
                 String url = "";
+                String doc_type = "";
+                int deal_id = -1;
                 switch (tab_type) {
                     case 1:
                         title = "待审批";
@@ -278,6 +286,21 @@ public class ProcessB2BActivity extends BaseActivity implements View.OnClickList
 //                        } else if ("unprocess".equals(model.typecode)) {
 //                            url = "jsps/mobile/process.jsp?nodeId=" + model.JP_NODEID + "%26_do=1";
 //                        }
+                         doc_type = itemArray.getJSONObject(position).getString("jp_name");
+                         deal_id = itemArray.getJSONObject(position).getInteger("jp_id");
+                        if (!StringUtils.isEmpty(doc_type) && "工作日报".equals(doc_type)){
+                            startActivityForResult(new Intent(ProcessB2BActivity.this, PlatWDdetailyActivity.class)
+                                    .putExtra("fromwhere", "examine_and_approve")
+                                    .putExtra("doc_type", doc_type)
+                                    .putExtra("deal_id", deal_id)
+                                    ,0x322); //TODO 你根据这个0x322 我的详情界面审批操作返回后这里改变列表数据状态，或者remove该条单据
+                        }else {
+                            startActivityForResult(new Intent(ProcessB2BActivity.this, FormDetailActivity.class)
+                                    .putExtra("fromwhere", "examine_and_approve")
+                                    .putExtra("doc_type", doc_type)
+                                    .putExtra("deal_id", deal_id)
+                                    ,0x321); //TODO 你根据这个0x321 我的详情界面审批操作返回后这里改变列表数据状态，或者remove该条单据
+                        }
 
                         break;
                     case 2:

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

@@ -361,7 +361,7 @@ public class MsgsSecondCommonActivity extends BaseActivity implements View.OnCli
 
 
     private void showMarkReadPW() {
-        View viewContext = LayoutInflater.from(ct).inflate(R.layout.msgs_long_click, null);
+        View viewContext = LayoutInflater.from(ct).inflate(R.layout.second_msgs_long_click, null);
         viewContext.findViewById(R.id.msg_delete_tv).setOnClickListener(this);
 
         msg_detail_tv = (TextView) viewContext.findViewById(R.id.msg_detail_tv);

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

@@ -30,7 +30,6 @@ import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.ListUtils;
 import com.xzjmyk.pm.activity.ui.erp.util.LogUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
-import com.xzjmyk.pm.activity.ui.erp.view.EmptyLayout;
 import com.xzjmyk.pm.activity.util.TimeUtils;
 import com.xzjmyk.pm.activity.view.MyListView;
 import com.xzjmyk.pm.activity.wxapi.ApiConfig;
@@ -97,7 +96,6 @@ public class PlatWDdetailyActivity extends BaseActivity {
     private String wd_status;
     private int mkeyValue;
     private String fromwhere;
-    private EmptyLayout mEmptyLayput_approvalflow;
     private String mCaller = "WorkDaily";
     private String plan;
     private String experience;
@@ -122,17 +120,12 @@ public class PlatWDdetailyActivity extends BaseActivity {
         progressDialog.show();
         done_task_ll.setVisibility(View.GONE);
         undo_task_ll.setVisibility(View.GONE);
-        mEmptyLayput_approvalflow = new EmptyLayout(this, approval_flowlv);
-        mEmptyLayput_approvalflow.setShowEmptyButton(false);
-        mEmptyLayput_approvalflow.setShowErrorButton(false);
-        mEmptyLayput_approvalflow.setShowLoadingButton(false);
 
         afpeople_names = new ArrayList<>();
         af_status = new ArrayList<>();
         //TODO 加载审批流的适配器
         myAdapter = new PlatComAfAdapter(this);
         mPlatComAfBean = new PlatComAfBean();
-        myAdapter.setmPlatComAfBean(mPlatComAfBean);
         approval_flowlv.setAdapter(myAdapter);
 
         Intent intent = getIntent();
@@ -142,12 +135,12 @@ public class PlatWDdetailyActivity extends BaseActivity {
             deal_id = intent.getIntExtra("deal_id",-1);
             resanddel_ll.setVisibility(View.GONE);
             a_and_disa_ll.setVisibility(View.VISIBLE);
-            Log.d("走到了", " 同意/不同意");
+            Log.d("走到了deal_id", " 同意/不同意" + deal_id);
             initeapData(deal_id);  //  领导审批时进入的界面  TODO ： 同意/不同意
         }else {
             mkeyValue = intent.getIntExtra("ID", -1);
             a_and_disa_ll.setVisibility(View.GONE);
-            Log.d("走到了", "重新提交/删除");
+            Log.d("走到了mkeyValue", "重新提交/删除" + mkeyValue);
             initData();  // 个人从列表，录入跳转的详情界面 TODO ： 重新提交/删除
         }
     }
@@ -158,7 +151,6 @@ public class PlatWDdetailyActivity extends BaseActivity {
             // 请求获取审批流数据
             if (MyApplication.getInstance().isNetworkActive()){
                 loadeapData(deal_id);
-//                loadPlatAppFlow(mCaller,deal_id);
             }else {
                 ToastMessage(getResources().getString(R.string.networks_out));
             }

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

@@ -59,7 +59,13 @@ public class SearchLocationActivity extends OABaseActivity implements ISearchVie
         search_edit.addTextChangedListener(new EditChangeListener() {
             @Override
             public void afterTextChanged(Editable s) {
-                presenter.search(s.toString());
+                if (s.toString().length() > 0){
+                    listview.setVisibility(View.VISIBLE);
+                    presenter.search(s.toString());
+                }else {
+                    listview.setVisibility(View.INVISIBLE);
+                }
+
             }
         });
         listview.setOnItemClickListener(new AdapterView.OnItemClickListener() {

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

@@ -33,6 +33,9 @@ import com.xzjmyk.pm.activity.ui.erp.util.LogUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
 import com.xzjmyk.pm.activity.ui.erp.view.EmptyLayout;
 import com.xzjmyk.pm.activity.view.ClearEditText;
+import com.xzjmyk.pm.activity.wxapi.ApiConfig;
+import com.xzjmyk.pm.activity.wxapi.ApiPlatform;
+import com.xzjmyk.pm.activity.wxapi.ApiUtils;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -44,7 +47,8 @@ import java.util.List;
  * 1.type 类型(1.网络请求  2.本地数据)(int)
  * 2.title 标题(String)
  * 3.reid  标题主题(int)
- * 4.isSingle  是否单选(默认单选)(boolean)
+ * 4.isSingle  是否单选(默认单选)(boolean)  d
+ * 多选 0x21  单选 0x20
  * <p/>
  * location
  * data   List<SelectBean>  供选择的数组对象
@@ -224,6 +228,7 @@ public class SelectActivity extends BaseActivity {
 
         }
     };
+    private String method;
 
     private void setAdapter() {
         if (!ListUtils.isEmpty(formBeaan)) {
@@ -404,6 +409,7 @@ public class SelectActivity extends BaseActivity {
         Intent intent = getIntent();
         if (intent == null) return;
         type = intent.getIntExtra("type", -1);
+        method=intent.getStringExtra("method");
         title = intent.getStringExtra("title");
         id = intent.getIntExtra("id", 0);
         object = intent.getParcelableExtra("object");
@@ -437,16 +443,25 @@ public class SelectActivity extends BaseActivity {
     private void loadDateByNet() {
         if (progressDialog != null)
             progressDialog.show();
-        String url = CommonUtil.getSharedPreferences(ct, "erp_baseurl") + action;
+        String url ="";
+        LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
+        if (ApiUtils.getApiModel() instanceof ApiPlatform){
+          url=  action;
+            headers.put("Cookie", ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().getCookie());
+        }else {
+            url=  CommonUtil.getSharedPreferences(ct, "erp_baseurl") + action;
+            headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
+        }
         String sessionId = CommonUtil.getSharedPreferences(ct, "sessionId");
         if (param != null) {
             param.put("sessionId", sessionId);
         } else {
             return;
         }
-        LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
-        headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
-        ViewUtil.httpSendRequest(ct, url, param, handler, headers, 0x11, null, null, "post");
+        
+        
+        if (StringUtils.isEmpty(method))method="post";
+        ViewUtil.httpSendRequest(ct, url, param, handler, headers, 0x11, null, null, method);
     }
     
     

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

@@ -148,6 +148,7 @@ public class WorkDailyShowActivity extends BaseActivity implements RecognizerDia
 
                 }
 
+
             }
         });
 

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/net/ViewUtil.java

@@ -1024,5 +1024,6 @@ public class ViewUtil {
         CommonUtil.clearSharedPreferences(ct, "b2b_login");
         CommonUtil.clearSharedPreferences(ct, "b2b_uu");
         CommonUtil.clearSharedPreferences(ct, "Master_ch");
+        CommonUtil.clearSharedPreferences(ct, "erp_emname");
     }
 }

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/presenter/WorkPresenter.java

@@ -241,7 +241,7 @@ public class WorkPresenter implements HttpHandler.OnResultListener, IWorkPresent
         }
         Intent intent = new Intent(ct, SearchLocationActivity.class);
         SearchPoiParam poiParam = new SearchPoiParam();
-        poiParam.setType(1);
+        poiParam.setType(2);
         poiParam.setTitle("地点微调");
         poiParam.setRadius(300);
         poiParam.setContrastLatLng(new LatLng(companyLocation.getLocation().longitude, companyLocation.getLocation().latitude));

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/platform/pageforms/FormDetailActivity.java

@@ -8,8 +8,11 @@ import android.os.Message;
 import android.support.v7.app.AlertDialog;
 import android.util.Log;
 import android.view.View;
+import android.view.ViewGroup;
+import android.widget.BaseAdapter;
 import android.widget.LinearLayout;
 import android.widget.SimpleAdapter;
+import android.widget.TextView;
 import android.widget.Toast;
 
 import com.alibaba.fastjson.JSON;
@@ -52,7 +55,7 @@ public class FormDetailActivity extends BaseActivity {
     @ViewInject(R.id.list_detail)
     private  PullToRefreshListView mDetail;
     @ViewInject(R.id.common_approval_flow_lv)
-    private MyListView common_approval_flow_lv;
+    private MyListView approval_flowlv;
     @ViewInject(R.id.common_docui_resubmit_ll)
     private LinearLayout resubmit_ll;
     @ViewInject(R.id.common_docui_delete_ll)
@@ -67,6 +70,12 @@ public class FormDetailActivity extends BaseActivity {
     private LinearLayout resanddel_ll;
     @ViewInject(R.id.common_docui_change_dealman_ll)
     private LinearLayout change_dealman_ll;
+    @ViewInject(R.id.common_docui_main_msg_lv)
+    private MyListView cdmain_lv;
+    @ViewInject(R.id.common_docui_secondmsg_ll)
+    private LinearLayout cdsecong_out_ll;
+    @ViewInject(R.id.common_docui_second_msg_lv)
+    private MyListView cdsecond_out_lv;
     List<LinkedHashMap<String,String>> datas=new ArrayList<>();
     List<LinkedHashMap<String,String>> details=new ArrayList<>();
     private int mkeyValue = -1;
@@ -79,6 +88,11 @@ public class FormDetailActivity extends BaseActivity {
     private String status;
     private int deal_id;
     private int agree_type;
+    private List<String> doc_key;
+    private List<String> doc_value;
+    private List<String> doc_detail_key;
+    private List<String> doc_detail_value;
+    private PCDMainAdapter mymainAdapter;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -93,19 +107,32 @@ public class FormDetailActivity extends BaseActivity {
         afpeople_names = new ArrayList<>();
         mPlatComAfBean = new PlatComAfBean();
         mPlatComAfAdapter = new PlatComAfAdapter(this);
+        approval_flowlv.setAdapter(mPlatComAfAdapter);
 
         Intent intent = getIntent();
         fromwhere = intent.getStringExtra("fromwhere");
         doc_type = intent.getStringExtra("doc_type");
-        whichpage = intent.getIntExtra("whichpage",-1);
+        whichpage = intent.getIntExtra("whichpage", -1);
+
+        if (!StringUtils.isEmpty(doc_type)){
+            switch (doc_type){
+                case "请假单":
+                    whichpage = 1;
+                    break;
+                case "出差单":
+                    whichpage = 2;
+                    break;
+                case "加班单":
+                    whichpage = 3;
+                    break;
+            }
+        }else {
+            whichpage = 1;
+        }
 
         if (!StringUtils.isEmpty(fromwhere) && "examine_and_approve".equals(fromwhere)){
             deal_id = intent.getIntExtra("deal_id",-1);
-            resanddel_ll.setVisibility(View.GONE);
-            if (deal_id !=-1 && whichpage != -1){
-                loadPlatDocDetails(deal_id, whichpage);
-            }
-            getSupportActionBar().setTitle(doc_type + "详情");
+            initEAndAView();
             Log.d("走到了", " 同意/不同意");              //  领导审批时进入的界面   同意/不同意，
         }else {
             mkeyValue = intent.getIntExtra("ID", -1);
@@ -118,6 +145,24 @@ public class FormDetailActivity extends BaseActivity {
         initClickEvent(); //统一点击事件
     }
 
+    private void initEAndAView() {
+        getSupportActionBar().setTitle(doc_type + "详情");
+
+        resanddel_ll.setVisibility(View.GONE);
+        mForm.setVisibility(View.GONE);
+        mDetail.setVisibility(View.GONE);
+        if (deal_id !=-1 && whichpage != -1){
+            loadPlatDocDetails(deal_id, whichpage);
+        }
+        doc_key = new ArrayList<>();
+        doc_value = new ArrayList<>();
+        doc_detail_key = new ArrayList<>();
+        doc_detail_value = new ArrayList<>();
+
+        mymainAdapter = new PCDMainAdapter();
+        cdmain_lv.setAdapter(mymainAdapter);
+    }
+
     private void initClickEvent() {
         resubmit_ll.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -130,7 +175,7 @@ public class FormDetailActivity extends BaseActivity {
                         .setPositiveButton("确认", new DialogInterface.OnClickListener() {
                             @Override
                             public void onClick(DialogInterface dialog, int which) {
-                                String retype = "reforsub";
+                                String retype ="reforsub";
                                 doresubmit(retype);
                             }
                         }).show();
@@ -148,7 +193,7 @@ public class FormDetailActivity extends BaseActivity {
                         .setPositiveButton("确认", new DialogInterface.OnClickListener() {
                             @Override
                             public void onClick(DialogInterface dialog, int which) {
-                                String retype = "refordelete";
+                                String retype ="refordelete";
                                 doresubmit(retype);
                                 progressDialog.show();
                             }
@@ -208,9 +253,9 @@ public class FormDetailActivity extends BaseActivity {
         param.put("emcode", Long.valueOf(CommonUtil.getSharedPreferences(MyApplication.getInstance().getApplicationContext(), "b2b_uu")).longValue());
         LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
         headers.put("Cookie", "JSESSIONID=" + ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().getCookie());
-        if (retype.equals("reforsub")){  //反提交之重新提交请求
+        if ("reforsub".equals(retype)){  //反提交之重新提交请求
             ViewUtil.httpSendRequest(this, url, param, handler, headers, RESUBMIT_OF_DELETEAPPFL, null, null, "post");
-        }else if (retype.equals("refordelete")){ //反提交之删除请求
+        }else if ("refordelete".equals(retype)){ //反提交之删除请求
             ViewUtil.httpSendRequest(this, url, param, handler, headers, DELETE_OF_DELETEAPPFL, null, null, "post");
         }
     }
@@ -221,10 +266,6 @@ public class FormDetailActivity extends BaseActivity {
                 new String[]{"title", "key1", "key2", "key3", "value1", "value2", "value3"},
                 new int[]{R.id.tv_field1, R.id.tv_key1, R.id.tv_key2, R.id.tv_key3,
                         R.id.tv_value1, R.id.tv_value2, R.id.tv_value3}));
-
-        if (mkeyValue != -1) {
-            loadPlatAppFlow(mkeyValue);
-        }
     }
 
     private void loadPlatDocDetails(int deal_id, int whichpage) {
@@ -247,6 +288,9 @@ public class FormDetailActivity extends BaseActivity {
             String detailJson=intent.getStringExtra("detail");
             getSupportActionBar().setTitle(intent.getStringExtra("title"));
             mkeyValue = intent.getIntExtra("mkeyValue", -1);
+            if (mkeyValue != -1) {
+                loadPlatAppFlow(mkeyValue);
+            }
             status = intent.getStringExtra("status");
             doStatusShow(status);
             Log.d("mkeyValue", mkeyValue + "");
@@ -320,7 +364,7 @@ public class FormDetailActivity extends BaseActivity {
                     if (msg.getData() != null){
                         String r_for_s_result = msg.getData().getString("result");
                         LogUtil.prinlnLongMsg("r_for_s_result", r_for_s_result);
-                        ToastMessage("反提交成功");
+                        ToastMessage("重新提交之反提交成功");
                         Log.i("doresubmit_id", mkeyValue + "");
                         // TODO 跳转至录入界面操作
 
@@ -330,7 +374,8 @@ public class FormDetailActivity extends BaseActivity {
                 case DELETE_OF_DELETEAPPFL:
                     if (msg.getData() != null){
                         String r_for_d_result = msg.getData().getString("result");
-                        LogUtil.prinlnLongMsg("r_for_d_result", r_for_d_result); ToastMessage("反提交成功");
+                        LogUtil.prinlnLongMsg("r_for_d_result", r_for_d_result);
+                        ToastMessage("重新提交之反提交成功");
                         doPlatDeleteByid(mkeyValue);
                     }
                     break;
@@ -357,6 +402,7 @@ public class FormDetailActivity extends BaseActivity {
                     if (msg.getData() != null) {
                         if (!StringUtils.isEmpty(msg.getData().getString("result"))) {
                             ToastMessage(msg.getData().getString("result"));
+                            progressDialog.dismiss();
                         }
                     }
                     break;
@@ -366,7 +412,7 @@ public class FormDetailActivity extends BaseActivity {
 
     private void doPlatDeleteByid(int mkeyValue) {
         //删除
-        String url = ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().delete_work_daily;
+        String url = ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().delete_common_doc_url;
         Map<String,Object> param = new HashMap<>();
         param.put("id",mkeyValue);
         param.put("whichpage",whichpage);
@@ -380,7 +426,7 @@ public class FormDetailActivity extends BaseActivity {
     private void doPlatComAfShow(String app_flow_result) {
         JSONObject resultJsonObject = JSON.parseObject(app_flow_result);
         if (resultJsonObject == null){
-            common_approval_flow_lv.setVisibility(View.GONE);
+            approval_flowlv.setVisibility(View.GONE);
 //            hide_above_af.setVisibility(View.GONE);
         }else {
             mPlatComAfBean = JSON.parseObject(resultJsonObject.toString(),PlatComAfBean.class);
@@ -417,6 +463,8 @@ public class FormDetailActivity extends BaseActivity {
                 mPlatComAfAdapter.setAfpeople_names(afpeople_names);
                 mPlatComAfAdapter.setmPlatComAfBean(mPlatComAfBean);
                 mPlatComAfAdapter.notifyDataSetChanged();
+
+                Log.d("afpeople_names",afpeople_names.toString());
             }
 
         }
@@ -426,19 +474,90 @@ public class FormDetailActivity extends BaseActivity {
         JSONObject Object  = JSON.parseObject(details_result);
         JSONObject detailsObject  = Object.getJSONObject("data");
         if (detailsObject != null){
+            if (!ListUtils.isEmpty(doc_key)) doc_key.clear();
+            if (!ListUtils.isEmpty(doc_value)) doc_value.clear();
             if ("请假单".equals(doc_type)){
                 mkeyValue = JSON.parseObject("data").getIntValue("va_id");
+                doc_key.add("录入人");doc_value.add(JSON.parseObject("data").getString("va_recorder"));
+                doc_key.add("录入时间");doc_value.add(JSON.parseObject("data").getString("va_date")+"");
+                doc_key.add("请假类型");doc_value.add(JSON.parseObject("data").getString("va_vacationtype"));
+                doc_key.add("单据状态");doc_value.add(JSON.parseObject("data").getString("va_status"));
+                doc_key.add("开始时间");doc_value.add(JSON.parseObject("data").getString("va_startime")+"");
+                doc_key.add("结束时间");doc_value.add(JSON.parseObject("data").getString("va_endtime")+"");
+                doc_key.add("备注");doc_value.add(JSON.parseObject("data").getString("va_remark"));
             }
             if("出差单".equals(doc_type)){
                 mkeyValue = JSON.parseObject("data").getIntValue("wo_id");
+                doc_key.add("录入人");doc_value.add(JSON.parseObject("data").getString("wo_recorder"));
+                doc_key.add("录入时间");doc_value.add(JSON.parseObject("data").getString("wo_date")+"");
+                doc_key.add("单据状态");doc_value.add(JSON.parseObject("data").getString("wo_status"));
+                doc_key.add("加班目的");doc_value.add(JSON.parseObject("data").getString("wo_worktask"));
+
+                //从表明细
+                doc_detail_key.add("开始时间");doc_detail_value.add(JSON.parseObject("data").getJSONObject("workovertimedet").getString("wod_startdate"));
+                doc_detail_key.add("结束时间");doc_detail_value.add(JSON.parseObject("data").getJSONObject("workovertimedet").getString("wod_enddate"));
+                doc_detail_key.add("加班时长");doc_detail_value.add(JSON.parseObject("data").getJSONObject("workovertimedet").getString("wod_count"));
             }
             if("加班单".equals(doc_type)){
                 mkeyValue = JSON.parseObject("data").getIntValue("fd_id");
+                doc_key.add("录入人");doc_value.add(JSON.parseObject("data").getString("fp_people2"));
+                doc_key.add("录入时间");doc_value.add(JSON.parseObject("data").getString("fp_recorddate")+"");
+                doc_key.add("单据状态");doc_value.add(JSON.parseObject("data").getString("fp_status"));
+                doc_key.add("开始时间");doc_value.add(JSON.parseObject("data").getString("fp_prestartdate")+"");
+                doc_key.add("结束时间");doc_value.add(JSON.parseObject("data").getString("fp_preenddate")+"");
+                doc_key.add("出差事由");doc_value.add(JSON.parseObject("data").getString("fp_v3"));
             }
-            
+
+            mymainAdapter.setDoc_key(doc_key);
+            mymainAdapter.setDoc_value(doc_value);
+            mymainAdapter.notifyDataSetChanged();
             if (mkeyValue != -1){
                 loadPlatAppFlow(mkeyValue);
             }
         }
     }
+    // Plat Common Details Mian Adapter TODO 主表适配器
+    private class PCDMainAdapter extends BaseAdapter {
+        private List<String> doc_key;
+        private List<String> doc_value;
+
+        public List<String> getDoc_key() {return doc_key;}
+
+        public void setDoc_key(List<String> doc_key) {this.doc_key = doc_key;}
+
+        public List<String> getDoc_value() {return doc_value;}
+
+        public void setDoc_value(List<String> doc_value) {this.doc_value = doc_value;}
+
+        @Override
+        public int getCount() {return doc_key == null ? 0 : doc_key.size();}
+
+        @Override
+        public Object getItem(int position) {return doc_key.get(position);}
+
+        @Override
+        public long getItemId(int position) {return position;}
+        @Override
+        public View getView(int position, View convertView, ViewGroup parent) {
+            ViewHolder viewHolder = null;
+            if (convertView == null) {
+                viewHolder = new ViewHolder();
+                convertView = View.inflate(mContext, R.layout.item_comdoc_am, null);
+                viewHolder.docmainmsg_list = (TextView) convertView.findViewById(R.id.item_comdoc_am_list_tv);
+                viewHolder.docmainmsg_value = (TextView) convertView.findViewById(R.id.item_comdoc_am_value_tv);
+                convertView.setTag(viewHolder);
+            } else {
+                viewHolder = (ViewHolder) convertView.getTag();
+            }
+
+            viewHolder.docmainmsg_list.setText(doc_key.get(position));
+            viewHolder.docmainmsg_value.setText(doc_value.get(position));
+            return convertView;
+        }
+
+        class ViewHolder {
+            TextView docmainmsg_list;
+            TextView docmainmsg_value;
+        }
+    }
 }

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/platform/pageforms/LeavePageActivity.java

@@ -68,10 +68,10 @@ public class LeavePageActivity extends BaseActivity {
                             JSONObject object = array.getJSONObject(i);
                             PagesModel model = new PagesModel();
                             model.setModeJson(object.toJSONString());
-                            model.setEndTime(DateFormatUtil.getFormatDate(object.getLong("va_endtime")));
+                            model.setEndTime(DateFormatUtil.getFormatDate(object.getLong("va_endtime")==null?0:object.getLong("va_endtime")));
                             model.setCode(object.getString("va_code"));
                             model.setId(object.getString("va_id"));
-                            model.setStartTime(DateFormatUtil.getFormatDate(object.getLong("va_startime")));
+                            model.setStartTime(DateFormatUtil.getFormatDate(object.getLong("va_startime")==null?0:object.getLong("va_startime")));
                             model.setState(object.getString("va_status"));
                             mDatas.add(model);
                         }
@@ -139,8 +139,8 @@ public class LeavePageActivity extends BaseActivity {
                 JSONObject map = new JSONObject(true);
                 map.put("请假类型", root.getString("va_vacationtype"));
                 map.put("单据状态", root.getString("va_status"));
-                map.put("开始时间", DateFormatUtil.getFormatDate(root.getLong("va_startime")));
-                map.put("结束时间", DateFormatUtil.getFormatDate(root.getLong("va_endtime")));
+                map.put("开始时间", DateFormatUtil.getFormatDate(root.getLong("va_startime") == null ? 0 : root.getLong("va_startime")));
+                map.put("结束时间", DateFormatUtil.getFormatDate(root.getLong("va_endtime") == null ? 0 : root.getLong("va_endtime")));
                 map.put("请假原因", root.getString("va_remark"));
                 Log.d("mkeyValue", root.getString("va_id"));
                 LogUtil.d(map.toJSONString());
@@ -148,7 +148,8 @@ public class LeavePageActivity extends BaseActivity {
                         .putExtra("data", map.toString())
                         .putExtra("title", "请假单详情")
                         .putExtra("mkeyValue",root.getIntValue("va_id"))
-                        .putExtra("status",root.getString("va_status")));
+                        .putExtra("status",root.getString("va_status"))
+                        .putExtra("whichpage",1));
             }
         });
 

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/platform/pageforms/TravelPageActivity.java

@@ -158,7 +158,8 @@ public class TravelPageActivity extends BaseActivity{
                         .putExtra("data", map.toJSONString())
                         .putExtra("detail", detail.toJSONString())
                         .putExtra("title", "出差单详情")
-                        .putExtra("mkeyValue",root.getIntValue("va_id")));
+                        .putExtra("mkeyValue",root.getIntValue("va_id"))
+                        .putExtra("whichpage",2));
             }
         });
 

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/platform/pageforms/WorkPageActivity.java

@@ -157,7 +157,8 @@ public class WorkPageActivity extends BaseActivity {
                         .putExtra("data", map.toString())
                         .putExtra("detail", detail.toJSONString())
                         .putExtra("title", "加班单详情")
-                        .putExtra("mkeyValue",root.getIntValue("va_id")));
+                        .putExtra("mkeyValue",root.getIntValue("va_id"))
+                        .putExtra("whichpage",3));
             }
         });
 

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/platform/task/TaskAddB2BActivity.java

@@ -33,7 +33,9 @@ import com.lidroid.xutils.http.ResponseInfo;
 import com.lidroid.xutils.http.callback.RequestCallBack;
 import com.lidroid.xutils.http.client.HttpRequest;
 import com.lidroid.xutils.view.annotation.ViewInject;
+import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.R;
+import com.xzjmyk.pm.activity.bean.oa.SelectBean;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.SelectActivity;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
@@ -237,6 +239,7 @@ public class TaskAddB2BActivity extends BaseActivity implements View.OnClickList
                 break;
             case R.id.save:
                 ToastMessage("开始保存");
+                saveTask("");
                 break;
         }
         return true;
@@ -350,9 +353,11 @@ public class TaskAddB2BActivity extends BaseActivity implements View.OnClickList
                 bundle.putSerializable("param", param);
                 Intent intent = new Intent(ct, SelectActivity.class);
                 intent.putExtra("type", 1);
+                //intent.putExtra("isSingle",false);
                 intent.putExtra("reid", R.style.OAThemeMeet);
                 intent.putExtras(bundle);
                 intent.putExtra("key", "data");
+                intent.putExtra("method", "get");
                 intent.putExtra("showKey", "emcode");
                 //mobile/common/getCombo.action
                 intent.putExtra("action", ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().getUsersInfo);//
@@ -394,102 +399,101 @@ public class TaskAddB2BActivity extends BaseActivity implements View.OnClickList
 //                showDialog(v);
 //                break;
             case R.id.voice_display_voice_play:
-                // 播放录音
-                if (!mPlayState) {
-                    mMediaPlayer = new MediaPlayer();
-                    // 添加录音的路径
-                    try {
-                        mMediaPlayer.setDataSource(finalFile.getAbsolutePath());
-                        // 准备
-                        mMediaPlayer.prepare();
-                        // 播放
-                        mMediaPlayer.start();
-                        // 修改播放状态
-                        mPlayState = true;
-                        // 根据时间修改界面
-                        new Thread(new Runnable() {
-
-                            public void run() {
-
-                                display_voice_progressbar
-                                        .setMax((int) mRecord_Time);
-                                mPlayCurrentPosition = 0;
-                                while (mMediaPlayer.isPlaying()) {
-                                    mPlayCurrentPosition = mMediaPlayer
-                                            .getCurrentPosition() / 1000;
-                                    display_voice_progressbar
-                                            .setProgress(mPlayCurrentPosition);
-                                }
-                            }
-                        }).start();
-                        mPlayState = true;
-                        // 修改播放图标
-                        bt_voice_play
-                                .setImageResource(R.drawable.globle_player_btn_stop);
-
-                        mMediaPlayer
-                                .setOnCompletionListener(new MediaPlayer.OnCompletionListener() {
-                                    // 播放结束后调用
-                                    public void onCompletion(MediaPlayer mp) {
-                                        // 停止播放
-                                        mMediaPlayer.stop();
-                                        // 修改播放状态
-                                        mPlayState = false;
-                                        // 停止播放图标
-                                        //stopRecordAnimation();
-                                        // 修改播放图标
-                                        bt_voice_play
-                                                .setImageResource(R.drawable.globle_player_btn_play);
-                                        // 初始化播放数据
-                                        mPlayCurrentPosition = 0;
-                                        display_voice_progressbar
-                                                .setProgress(mPlayCurrentPosition);
-
-                                    }
-                                });
-                    } catch (IllegalArgumentException e) {
-                        e.printStackTrace();
-                    } catch (SecurityException e) {
-                        e.printStackTrace();
-                    } catch (IllegalStateException e) {
-                        e.printStackTrace();
-                    } catch (IOException e) {
-                        e.printStackTrace();
-                    }
-
-                } else {
-
-                    if (mMediaPlayer != null) {
-                        // 根据播放状态修改显示内容
-                        if (mMediaPlayer.isPlaying()) {
-                            mPlayState = false;
-                            mMediaPlayer.stop();
-                            // 修改播放图标
-                            bt_voice_play
-                                    .setImageResource(R.drawable.globle_player_btn_play);
-                            // 初始化播放数据
-                            mPlayCurrentPosition = 0;
-                            display_voice_progressbar
-                                    .setProgress(mPlayCurrentPosition);
-                            // 停止播放图标
-                            //stopRecordAnimation();
-
-                        } else {
-                            mPlayState = false;
-                            bt_voice_play
-                                    .setImageResource(R.drawable.globle_player_btn_play);
-                            // 初始化播放数据
-                            mPlayCurrentPosition = 0;
-                            display_voice_progressbar
-                                    .setProgress(mPlayCurrentPosition);
-                            // 停止播放图标
-                            //	stopRecordAnimation();
-
-                        }
-                    }
-                }
-
-
+//                // 播放录音
+//                if (!mPlayState) {
+//                    mMediaPlayer = new MediaPlayer();
+//                    // 添加录音的路径
+//                    try {
+//                        mMediaPlayer.setDataSource(finalFile.getAbsolutePath());
+//                        // 准备
+//                        mMediaPlayer.prepare();
+//                        // 播放
+//                        mMediaPlayer.start();
+//                        // 修改播放状态
+//                        mPlayState = true;
+//                        // 根据时间修改界面
+//                        new Thread(new Runnable() {
+//
+//                            public void run() {
+//
+//                                display_voice_progressbar
+//                                        .setMax((int) mRecord_Time);
+//                                mPlayCurrentPosition = 0;
+//                                while (mMediaPlayer.isPlaying()) {
+//                                    mPlayCurrentPosition = mMediaPlayer
+//                                            .getCurrentPosition() / 1000;
+//                                    display_voice_progressbar
+//                                            .setProgress(mPlayCurrentPosition);
+//                                }
+//                            }
+//                        }).start();
+//                        mPlayState = true;
+//                        // 修改播放图标
+//                        bt_voice_play
+//                                .setImageResource(R.drawable.globle_player_btn_stop);
+//
+//                        mMediaPlayer
+//                                .setOnCompletionListener(new MediaPlayer.OnCompletionListener() {
+//                                    // 播放结束后调用
+//                                    public void onCompletion(MediaPlayer mp) {
+//                                        // 停止播放
+//                                        mMediaPlayer.stop();
+//                                        // 修改播放状态
+//                                        mPlayState = false;
+//                                        // 停止播放图标
+//                                        //stopRecordAnimation();
+//                                        // 修改播放图标
+//                                        bt_voice_play
+//                                                .setImageResource(R.drawable.globle_player_btn_play);
+//                                        // 初始化播放数据
+//                                        mPlayCurrentPosition = 0;
+//                                        display_voice_progressbar
+//                                                .setProgress(mPlayCurrentPosition);
+//
+//                                    }
+//                                });
+//                    } catch (IllegalArgumentException e) {
+//                        e.printStackTrace();
+//                    } catch (SecurityException e) {
+//                        e.printStackTrace();
+//                    } catch (IllegalStateException e) {
+//                        e.printStackTrace();
+//                    } catch (IOException e) {
+//                        e.printStackTrace();
+//                    }
+//
+//                } else {
+//
+//                    if (mMediaPlayer != null) {
+//                        // 根据播放状态修改显示内容
+//                        if (mMediaPlayer.isPlaying()) {
+//                            mPlayState = false;
+//                            mMediaPlayer.stop();
+//                            // 修改播放图标
+//                            bt_voice_play
+//                                    .setImageResource(R.drawable.globle_player_btn_play);
+//                            // 初始化播放数据
+//                            mPlayCurrentPosition = 0;
+//                            display_voice_progressbar
+//                                    .setProgress(mPlayCurrentPosition);
+//                            // 停止播放图标
+//                            //stopRecordAnimation();
+//
+//                        } else {
+//                            mPlayState = false;
+//                            bt_voice_play
+//                                    .setImageResource(R.drawable.globle_player_btn_play);
+//                            // 初始化播放数据
+//                            mPlayCurrentPosition = 0;
+//                            display_voice_progressbar
+//                                    .setProgress(mPlayCurrentPosition);
+//                            // 停止播放图标
+//                            //	stopRecordAnimation();
+//
+//                        }
+//                    }
+//                }
+                
                 break;
             default:
                 break;
@@ -539,11 +543,11 @@ public class TaskAddB2BActivity extends BaseActivity implements View.OnClickList
 
     }
 
-    //保存任务
+    //保存任务 id是文件
     private void saveTask(String id) {
-        int type = cb_task_reply.isChecked() == true ? 1 : 0;
-        String name = "来自" + CommonUtil.getSharedPreferences(ct, "erp_username") + "的任务";
-        String formStore;
+//        int type = cb_task_reply.isChecked() == true ? 1 : 0;
+  //      String name = "来自" + CommonUtil.getSharedPreferences(ct, "erp_username") + "的任务";
+ 
         String[] people = et_task_people.getTags();
         String resourcename = "";
         for (int i = 0; i < people.length; i++) {
@@ -554,25 +558,34 @@ public class TaskAddB2BActivity extends BaseActivity implements View.OnClickList
             }
         }
 
-        if (id == null) {
-
-            formStore = "{'name':'" + name + "'"
-                    + ",'startdate':'" + CommonUtil.getStringDate(System.currentTimeMillis()) + "',"
-                    + "'enddate':'" + et_task_startime.getText().toString() + "',"
-                    + "'type':'" + type + "','resourcename':'" + resourcename + "',"
-                    + "'description':'" + et_task_remark.getText().toString() + "'"
-                    + "}";
-        } else {
-            //上传附件
-            formStore = "{'name':'" + name + "'"
-                    + ",'startdate':'" + CommonUtil.getStringDate(System.currentTimeMillis()) + "',"
-                    + "'enddate':'" + et_task_startime.getText().toString() + "',"
-                    + "'type':'" + type + "','resourcename':'" + resourcename + "',"
-                    + "'description':'" + et_task_remark.getText().toString() + "',"
-                    + "'attachs':'" + id + "'"
-                    + "}";
-        }
-        Log.i("fromStore", formStore);
+//        if (id == null) {
+//
+//            formStore = "{'name':'" + name + "'"
+//                    + ",'startdate':'" + CommonUtil.getStringDate(System.currentTimeMillis()) + "',"
+//                    + "'enddate':'" + et_task_startime.getText().toString() + "',"
+//                    + "'type':'" + type + "','resourcename':'" + resourcename + "',"
+//                    + "'description':'" + et_task_remark.getText().toString() + "'"
+//                    + "}";
+//        } else {
+//            //上传附件
+//            formStore = "{'name':'" + name + "'"
+//                    + ",'startdate':'" + CommonUtil.getStringDate(System.currentTimeMillis()) + "',"
+//                    + "'enddate':'" + et_task_startime.getText().toString() + "',"
+//                    + "'type':'" + type + "','resourcename':'" + resourcename + "',"
+//                    + "'description':'" + et_task_remark.getText().toString() + "',"
+//                    + "'attachs':'" + id + "'"
+//                    + "}";
+//        }
+//        Log.i("fromStore", formStore);
+        String formStore= "{\n" +
+                "\"detail\":\""+et_title.getText().toString()+"\",\n" +
+                "\"recordercode\":\""+CommonUtil.getSharedPreferences(MyApplication.getInstance(),"b2b_uu")+"\",\n" +
+                "\"uu\":\""+ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().getEnuu()+"\",\n" +
+                "\"taskname\":\""+et_task_remark.getText().toString()+"\",\n" +//任务名称
+                "\"domancode\":\""+resourcename+"\",\n" +//执行人uu
+                "\"startdate\":\""+et_startime.getText().toString()+"\",\n" +
+                "\"enddate\":\""+et_task_startime.getText().toString()+"\"\n" +
+                "}";
         sendDataToServer(formStore);
     }
     
@@ -810,29 +823,28 @@ public class TaskAddB2BActivity extends BaseActivity implements View.OnClickList
      * @功能:添加任务
      */
     public void sendDataToServer(String formStore) {
-//		progressDialog.show();
-        String url = Constants.getAppBaseUrl(ct) + "plm/task/addbilltask.action";
+        String url = ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().task_save;
         Log.i(TAG, url);
         Log.i(TAG, formStore);
         Map<String, Object> param = new HashMap<String, Object>();
         param.put("formStore", formStore);
         //param.put("sessionId", CommonUtil.getSharedPreferences(ct, "sessionId"));
         LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
-        headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
+        headers.put("Cookie", ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().getCookie());
         ViewUtil.httpSendRequest(
                 ct, url,
                 param,
-                mhandler, headers, LOAD_SUCCESS_ADD, null, null, "get");
+                mhandler, headers, LOAD_SUCCESS_ADD, null, null, "post");
     }
 
 
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        if (data == null) {
+            return;
+        }
         switch (requestCode) {
             case 2:
-                if (data == null) {
-                    return;
-                }
                 if (resultCode == 2) {
                     String en_name = data.getStringExtra("en_name");
                     et_task_people.setTags(en_name);
@@ -844,8 +856,19 @@ public class TaskAddB2BActivity extends BaseActivity implements View.OnClickList
                     et_task_people.setTags(tag_values);
                 }
                 break;
-            case 1:
-
+            case 0x01:
+//                ArrayList<SelectBean> temps=data.getParcelableArrayListExtra("data");
+//                if (temps==null)return;
+//                String[] tag_values=new String[temps.size()];
+//                int i=0;
+//                for(SelectBean bean:temps){
+//                    tag_values[i]=bean.getName();
+//                    i++;
+//                }
+                SelectBean d=data.getParcelableExtra("data");
+                String[] tag_values ={d.getName()};
+                       
+                et_task_people.setTags(tag_values);
                 break;
             default:
                 break;

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/platform/task/TaskB2BActivity.java

@@ -246,9 +246,7 @@ public class TaskB2BActivity extends BaseActivity {
         if (state_unconfirmed.isSelected()) {
             sendResquestForServer("UNCONFIRMED", 2);
         }
-        if (state_taskforme.isSelected()) {
-            sendResquestForServerOther(2);
-        }
+       
     }
     
 
@@ -289,6 +287,7 @@ public class TaskB2BActivity extends BaseActivity {
             state_add = (Button) view.findViewById(R.id.btn_state_ADD);
             state_all = (Button) view.findViewById(R.id.btn_state_ALL);
             state_taskforme = (Button) view.findViewById(R.id.btn_state_TASKFOME);
+            state_taskforme.setVisibility(View.GONE);
             // 创建一个PopuWidow对象
             popupWindow = new PopupWindow(view, windowManager.getDefaultDisplay().getWidth(), windowManager.getDefaultDisplay().getHeight() / 3);
             state_start.setSelected(true);
@@ -361,7 +360,6 @@ public class TaskB2BActivity extends BaseActivity {
             @Override
             public void onClick(View v) {
                 popupWindow.dismiss();
-                sendResquestForServerOther(2);
                 state_start.setSelected(false);
                 state_finish.setSelected(false);
                 state_unconfirmed.setSelected(false);
@@ -379,8 +377,7 @@ public class TaskB2BActivity extends BaseActivity {
                 state_finish.setSelected(false);
                 state_unconfirmed.setSelected(false);
                 state_all.setSelected(true);
-                sendResquestForServer("所有", 2);
-//                sendResquestForServerAll(2);
+                sendResquestForServer("", 2);
             }
         });
     }
@@ -396,51 +393,14 @@ public class TaskB2BActivity extends BaseActivity {
         params.put("emuu", CommonUtil.getSharedPreferences(MyApplication.getInstance(),"b2b_uu"));
         params.put("enuu", ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().getEnuu());
         params.put("pageNumber", "1");
-        params.put("pageSize", "10");
+        params.put("pageSize", "100");
         params.put("status", status);
         LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
         headers.put("Cookie",  ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().getCookie());
         ViewUtil.httpSendRequest(context, url, params, handler, headers, handlerWhat, null, null, "get");
     }
 
-    /**
-     * @注释： 带条件的调转
-     */
-    public void sendResquestForServerAll(int handlerWhat) {
-        String url = Constants.getAppBaseUrl(context) + "common/datalist/data.action";
-        Map<String, Object> mparams = new HashMap<String, Object>();
-        mparams.put("sessionId", CommonUtil.getSharedPreferences(context, "sessionId"));
-        mparams.put("caller", "ResourceAssignment");
-        mparams.put("page", "1");
-        mparams.put("pageSize", "100");
-        mparams.put("_noc", "1");
-        String em_code = CommonUtil.getSharedPreferences(context, "erp_username");
-        mparams.put("condition", "ra_resourcecode='" + em_code + "'" + " and nvl(class,' ')<>'projecttask'");
-        LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
-        headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(context, "sessionId"));
-        ViewUtil.httpSendRequest(context, url, mparams, handler, headers, handlerWhat, null, null, "get");
-    }
-
-    /**
-     * @注释： 下属任务
-     */
-    public void sendResquestForServerOther(int handlerWhat) {
-        String url = Constants.getAppBaseUrl(context) + "common/datalist/data.action";
-        Map<String, Object> mparams = new HashMap<String, Object>();
-        mparams.put("sessionId", CommonUtil.getSharedPreferences(context, "sessionId"));
-        mparams.put("caller", "ResourceAssignment");
-        mparams.put("page", "1");
-        mparams.put("pageSize", "100");
-        mparams.put("_noc", "1");
-        String em_code = CommonUtil.getSharedPreferences(context, "erp_emid");
-        mparams.put("condition", "recorderid='" + em_code + "'" + "and handstatuscode<>'FINISHED'" + " and nvl(class,' ')<>'projecttask'");
-        LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
-        headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(context, "sessionId"));
-        ViewUtil.httpSendRequest(
-                context, url,
-                mparams,
-                handler, headers, handlerWhat, null, null, "get");
-    }
+    
 
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/platform/task/TaskDetailB2BActivity.java

@@ -6,6 +6,7 @@ import android.media.MediaPlayer;
 import android.os.Bundle;
 import android.os.Environment;
 import android.os.Handler;
+import android.text.TextUtils;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -35,6 +36,7 @@ import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.Constants;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
 import com.xzjmyk.pm.activity.ui.erp.view.CustomerListView;
+import com.xzjmyk.pm.activity.util.DateFormatUtil;
 import com.xzjmyk.pm.activity.wxapi.ApiConfig;
 import com.xzjmyk.pm.activity.wxapi.ApiUtils;
 
@@ -136,13 +138,13 @@ public class TaskDetailB2BActivity extends BaseActivity implements View.OnClickL
                     break;
                 case LOAD_SUCCESS_MSGTASK:
                     result = msg.getData().getString("result");
+                    Log.i(TAG, "回复内容：" + result);
                     if (adapter == null) {
-                        adapter = new SimpleAdapter(ct, JSON.parseObject(result).getJSONArray("taskmsg"));
+                        adapter = new SimpleAdapter(ct, JSON.parseObject(result).getJSONArray("listdata"));
                         iv_taskMsg.setAdapter(adapter);
                     } else {
                         adapter.notifyDataSetChanged();
                     }
-                    Log.i(TAG, "回复内容：" + result);
 //				progressDialog.dismiss();
                     break;
                 case Constants.APP_SOCKETIMEOUTEXCEPTION:
@@ -203,7 +205,7 @@ public class TaskDetailB2BActivity extends BaseActivity implements View.OnClickL
                 .setText(intent.getStringExtra("tasktime") == null ? "未填写" : intent.getStringExtra("tasktime"));
         taskId = intent.getStringExtra("taskid");
         tv_task_endtime.setText(intent.getStringExtra("endtime") == null ? "未填写" : intent.getStringExtra("endtime"));
-        
+
         String ra_taskid = intent.getStringExtra("ra_taskid");
         String attachs = intent.getStringExtra("attachs");
         if (!StringUtils.isEmpty(attachs)) {
@@ -217,27 +219,27 @@ public class TaskDetailB2BActivity extends BaseActivity implements View.OnClickL
         String status = intent.getStringExtra("status");
         if ("进行中".equals(status)) {
             // 执行人
-            if (getIsHandle(intent.getStringExtra("performer"))) {
-                ll_bt_task.setVisibility(View.GONE);
-                bt_task_huifu.setVisibility(View.VISIBLE);
-                et_task_name.setVisibility(View.VISIBLE);
-            } else {
-                et_task_name.setVisibility(View.GONE);
-                ll_bt_task.setVisibility(View.GONE);
-                bt_task_huifu.setVisibility(View.GONE);
-            }
+//            if (getIsHandle(intent.getStringExtra("performer"))) {
+            ll_bt_task.setVisibility(View.GONE);
+            bt_task_huifu.setVisibility(View.VISIBLE);
+            et_task_name.setVisibility(View.VISIBLE);
+//            } else {
+//                et_task_name.setVisibility(View.GONE);
+//                ll_bt_task.setVisibility(View.GONE);
+//                bt_task_huifu.setVisibility(View.GONE);
+//            }
 
         } else if ("待确认".equals(status)) {
             // 提出人等于当前用户
-            if (getIsHandle(intent.getStringExtra("taskemcode"))) {
-                ll_bt_task.setVisibility(View.VISIBLE);
-                bt_task_huifu.setVisibility(View.GONE);
-                et_task_name.setVisibility(View.VISIBLE);
-            } else {
-                et_task_name.setVisibility(View.GONE);
-                ll_bt_task.setVisibility(View.GONE);
-                bt_task_huifu.setVisibility(View.GONE);
-            }
+//            if (getIsHandle(intent.getStringExtra("taskemcode"))) {
+            ll_bt_task.setVisibility(View.VISIBLE);
+            bt_task_huifu.setVisibility(View.GONE);
+            et_task_name.setVisibility(View.VISIBLE);
+//            } else {
+//                et_task_name.setVisibility(View.GONE);
+//                ll_bt_task.setVisibility(View.GONE);
+//                bt_task_huifu.setVisibility(View.GONE);
+//            }
 
         } else if ("已完成".equals(status)) {
             et_task_name.setVisibility(View.GONE);
@@ -269,9 +271,22 @@ public class TaskDetailB2BActivity extends BaseActivity implements View.OnClickL
             case R.id.bt_task_huifu:
                 Map<String, String> param = new HashMap<String, String>();
                 if (!StringUtils.isEmpty(et_task_name.getText().toString())) {
-                    param.put("ra_id", taskId);
-                    param.put("record", et_task_name.getText().toString());
-                    sendDataToServer("plm/record/endBillTask.action", param);
+                    String formStore = "{\n" +
+                            "\"id\":\"" + taskId + "\",\n" +//单据id
+                            "\"status\":\"待确认\",\n" +//状态
+                            "\"statuscode\":\"unconfirmed\"\n" +//状态码
+                            "}";
+                    String gridStore = "{\n" +
+                            "\"taskid\":\"" + taskId + "\",\n" +//单据id
+                            "\"replyman\":\"" + CommonUtil.getSharedPreferences(this, "b2b_uu") + "\",\n" +//个人uu
+                            "\"Replytime\":\"" + DateFormatUtil.getFormatDate(System.currentTimeMillis()) + "\",\n" +
+                            "\"Replydetail\":\"" + et_task_name.getText().toString().trim() + "\",\n" +//回复内容
+                            "\"uu\":\"" + ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().getEnuu() + "\"\n" +//企业uu enUU
+                            "}";
+                    param.put("formStore", formStore);
+                    param.put("gridStore", gridStore);
+//                    sendDataToServer("plm/record/endBillTask.action", param);
+                    sendDataToB2BServer(ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().task_change, param);
                 } else {
                     ViewUtil.ShowMessageTitle(ct, "输入完整信息！");
                 }
@@ -279,9 +294,22 @@ public class TaskDetailB2BActivity extends BaseActivity implements View.OnClickL
             case R.id.bt_task_bohui:
                 if (!StringUtils.isEmpty(et_task_name.getText().toString())) {
                     param = new HashMap<String, String>();
-                    param.put("ra_id", taskId);
-                    param.put("record", et_task_name.getText().toString());
-                    sendDataToServer("plm/record/noConfirmBillTask.action", param);
+                    String formStore = "{\n" +
+                            "\"id\":\"" + taskId + "\",\n" +//单据id
+                            "\"status\":\"进行中\",\n" +//状态
+                            "\"statuscode\":\"start\"\n" +//状态码
+                            "}";
+                    String gridStore = "{\n" +
+                            "\"taskid\":\"" + taskId + "\",\n" +//单据id
+                            "\"replyman\":\"" + CommonUtil.getSharedPreferences(this, "b2b_uu") + "\",\n" +//个人uu
+                            "\"Replytime\":\"" + DateFormatUtil.getFormatDate(System.currentTimeMillis()) + "\",\n" +
+                            "\"Replydetail\":\"" + et_task_name.getText().toString().trim() + "\",\n" +//回复内容
+                            "\"uu\":\"" + ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().getEnuu() + "\"\n" +//企业uu enUU
+                            "}";
+                    param.put("formStore", formStore);
+                    param.put("gridStore", gridStore);
+//                    sendDataToServer("plm/record/endBillTask.action", param);
+                    sendDataToB2BServer(ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().task_change, param);
                 } else {
                     ViewUtil.ShowMessageTitle(ct, "输入完整信息！");
                 }
@@ -290,9 +318,22 @@ public class TaskDetailB2BActivity extends BaseActivity implements View.OnClickL
             case R.id.bt_task_queren:
                 if (!StringUtils.isEmpty(et_task_name.getText().toString())) {
                     param = new HashMap<String, String>();
-                    param.put("ra_id", taskId);
-                    param.put("record", et_task_name.getText().toString());
-                    sendDataToServer("plm/record/confirmBillTask.action", param);
+                    String formStore = "{\n" +
+                            "\"id\":\"" + taskId + "\",\n" +//单据id
+                            "\"status\":\"已完成\",\n" +//状态
+                            "\"statuscode\":\"done\"\n" +//状态码
+                            "}";
+                    String gridStore = "{\n" +
+                            "\"taskid\":\"" + taskId + "\",\n" +//单据id
+                            "\"replyman\":\"" + CommonUtil.getSharedPreferences(this, "b2b_uu") + "\",\n" +//个人uu
+                            "\"Replytime\":\"" + DateFormatUtil.getFormatDate(System.currentTimeMillis()) + "\",\n" +
+                            "\"Replydetail\":\"" + et_task_name.getText().toString().trim() + "\",\n" +//回复内容
+                            "\"uu\":\"" + ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().getEnuu() + "\"\n" +//企业uu enUU
+                            "}";
+                    param.put("formStore", formStore);
+                    param.put("gridStore", gridStore);
+//                    sendDataToServer("plm/record/endBillTask.action", param);
+                    sendDataToB2BServer(ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().task_change, param);
                 } else {
                     ViewUtil.ShowMessageTitle(ct, "输入完整信息！");
                 }
@@ -316,13 +357,19 @@ public class TaskDetailB2BActivity extends BaseActivity implements View.OnClickL
         ViewUtil.startNetThread(ct, url, param, mhandler, Constants.LOAD_SUCCESS, null, null, "get");
     }
 
+    public void sendDataToB2BServer(String url, Map<String, String> param) {
+//		progressDialog.show();
+        Log.i(TAG, url);
+        param.put("sessionId", ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().getCookie());
+        ViewUtil.startNetThread(ct, url, param, mhandler, Constants.LOAD_SUCCESS, null, null, "post");
+    }
+
     public void sendDataToServer(String url, Map<String, Object> param, int what) {
 //		progressDialog.show();
-        url = Constants.getAppBaseUrl(ct) + url;
         Log.i(TAG, url);
-        param.put("sessionId", CommonUtil.getSharedPreferences(ct, "sessionId"));
+        param.put("sessionId", ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().getCookie());
         LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
-        headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
+        headers.put("Cookie", "JSESSIONID=" + ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().getCookie());
         ViewUtil.httpSendRequest(ct, url, param, mhandler, headers, what, null, null, "get");
     }
 
@@ -502,12 +549,12 @@ public class TaskDetailB2BActivity extends BaseActivity implements View.OnClickL
 
         @Override
         public int getCount() {
-            return jsonArray.size();
+            return jsonArray == null ? 0 : jsonArray.size();
         }
 
         @Override
         public Object getItem(int position) {
-            return jsonArray.getJSONArray(position);
+            return jsonArray == null ? null : jsonArray.getJSONArray(position);
         }
 
         @Override
@@ -529,9 +576,12 @@ public class TaskDetailB2BActivity extends BaseActivity implements View.OnClickL
                 model = (ViewModel) view.getTag();
             }
 
-            model.template_man.setText(jsonArray.getJSONObject(position).getString("录入人"));
-            model.template_time.setText(jsonArray.getJSONObject(position).getString("时间"));
-            model.template_content.setText(jsonArray.getJSONObject(position).getString("内容"));
+            model.template_man.setText(jsonArray.getJSONObject(position).getString("replyman"));
+            if (!TextUtils.isEmpty(jsonArray.getJSONObject(position).getString("replytime"))
+                    && !"null".equals(jsonArray.getJSONObject(position).getString("replytime"))) {
+                model.template_time.setText(DateFormatUtil.getFormatDate(Long.parseLong(jsonArray.getJSONObject(position).getString("replytime"))));
+            }
+            model.template_content.setText(jsonArray.getJSONObject(position).getString("replydetail"));
 
             return view;
         }

WeiChat/src/main/java/com/xzjmyk/pm/activity/wxapi/ApiBase.java

@@ -86,6 +86,7 @@ public abstract class ApiBase {
     public String common_doc_detaily_url; //获取单据详情
 
     public String common_delete_approval_flow_url; //通用删除的审批流
+    public String delete_common_doc_url;//通用单据的删除
 
     public String getCommon_delete_approval_flow_url() {
         return common_delete_approval_flow_url;

WeiChat/src/main/java/com/xzjmyk/pm/activity/wxapi/ApiPlatform.java

@@ -20,34 +20,35 @@ public class ApiPlatform extends ApiBase implements ApiModel {
     private String TRAVEL_REQUEST_URL = mBaseUrl + "/feePlease/getFeePlease?enuu=10030994&emcode=1000003217&pageNumber=1&pageSize=10";
     private String NEWS_CENTER_URL = mBaseUrl + "/newsCenter/getAllNews?pageNumber=1&pageSize=10&enuu=10030994";
     private String NOTIFICATION_CENTER_URL = mBaseUrl + "/noticeCenter/getAllNotices?pageNumber=1&pageSize=10&enuu=10030994";
+    private String PUNCH_RECORD_URL = mBaseUrl + "mobile/signCardLog/getListdata";
+    private String USER_INFO_QUERY_URL = mBaseUrl + "mobile/userCenter/getUserInfo";
     private String PUNCH_RECORD_URL = mBaseUrl + "/signCardLog/getListdata";
     private String LEAVE_APPLICATION_URL = mBaseUrl + "/vacation/getAllVacation?emcode=1000003217&enuu=10030994&pageNumber=1&pageSize=10";
     private String DAILY_WORK_URL = mBaseUrl + "/workDaily/getWorkDaily?emcode=1000003217&pageNumber=1&pageSize=10&enuu=10030994";
     private String WORK_SCHEDULE_URL = mBaseUrl + "/workData/getWorkData?enuu=10030994";
     private String WORK_OVERTIME_URL = mBaseUrl + "/workOvertime/getWorkOvertime?enuu=10030994&emcode=1000003217&pageNumber=1&pageSize=10";
-    private String WORK_ORDER_URL = mBaseUrl + "/workSchedule/getWorkSchedule?enuu=10030994&emcode=1000003217";
-    private String SAVE_LEAVE_URL = mBaseUrl + "/vacation/saveVacation";
-    private String SAVE_TRAVEL_URL = mBaseUrl + "/feePlease/saveFeePlease";
-    private String SAVE_OVERTIME_URL = mBaseUrl + "/workOvertime/saveWorkOvertime";
-    private String SIGN_GET_OFFICE_URL = mBaseUrl + "/clockAddress/getSignCardAddress";
-    private String DELETE_PLAT_OFFICE_ADDRESS_URL = mBaseUrl + "/clockAddress/deleteById";
-    private String GET_PLAT_SENIOR_SETTING_URL = mBaseUrl + "/advancedSettings/getAdvancedSettings";
-    private String SAVE_PLAT_SENIOR_TIME_URL = mBaseUrl + "/advancedSettings/saveAdvancedSettings";
-    private String SAVE_PLAT_OFFICE_ADDRESS_URL = mBaseUrl + "/clockAddress/saveSignCardAddress";
+    private String WORK_ORDER_URL = mBaseUrl + "mobile/workSchedule/getWorkSchedule?enuu=10030994&emcode=1000003217";
+    private String SAVE_LEAVE_URL = mBaseUrl + "mobile/vacation/saveVacation";
+    private String SAVE_TRAVEL_URL = mBaseUrl + "mobile/feePlease/saveFeePlease";
+    private String SAVE_OVERTIME_URL = mBaseUrl + "mobile/workOvertime/saveWorkOvertime";
+    private String SIGN_GET_OFFICE_URL = mBaseUrl + "mobile/clockAddress/getSignCardAddress";
+    private String DELETE_PLAT_OFFICE_ADDRESS_URL = mBaseUrl + "mobile/clockAddress/deleteById";
+    private String GET_PLAT_SENIOR_SETTING_URL = mBaseUrl + "mobile/advancedSettings/getAdvancedSettings";
+    private String SAVE_PLAT_SENIOR_TIME_URL = mBaseUrl + "mobile/advancedSettings/saveAdvancedSettings";
+    private String SAVE_PLAT_OFFICE_ADDRESS_URL = mBaseUrl + "mobile/clockAddress/saveSignCardAddress";
     //工作日报
-    private String FIRST_ADD_WORKDAILY_URL = mBaseUrl + "/workDaily/saveWorkDaily";
-    private String DELETE_APPROVAL_FLOW_URL = mBaseUrl + "/workDaily/deleteById";
-    private String DELETE_WORK_DAILY_URL = mBaseUrl + "/workDaily/deleteById";
-    private String UPDATE_WORK_DAILY_URL = mBaseUrl + "/workDaily/updateWorkDaily";
-    private String GETDAILY_LIST_URL = mBaseUrl + "/workDaily/getWorkDaily";
+    private String FIRST_ADD_WORKDAILY_URL = mBaseUrl + "mobile/workDaily/saveWorkDaily";
+    private String DELETE_WORK_DAILY_URL = mBaseUrl + "mobile/workDaily/deleteById";
+    private String UPDATE_WORK_DAILY_URL = mBaseUrl + "mobile/workDaily/updateWorkDaily";
+    private String GETDAILY_LIST_URL = mBaseUrl + "mobile/workDaily/getWorkDaily";
 
     //单据
-    private String COMMON_APP_FLOW_NODES_URL = mBaseUrl + "/approvalflow/getNodesAndLog";
-    private String COMMON_DOC_DETAILY_URL = mBaseUrl + "/detailCenter/getDetail";
+    private String COMMON_APP_FLOW_NODES_URL = mBaseUrl + "mobile/approvalflow/getNodesAndLog";
+    private String COMMON_DOC_DETAILY_URL = mBaseUrl + "mobile/detailCenter/getDetail";
 
     //单据的领导审批操作 同意/不同意/变更处理人
-    private String COMMON_DOC_EXAMINE_AND_APPROVE_URL = mBaseUrl + "/approvalflow/auditDocuments";
-    private String COMMON_DELETE_APPROVAL_FLOW_URL = mBaseUrl + "/detailCenter/resubmitDocuments";  //通用删除的审批流
+    private String COMMON_DOC_EXAMINE_AND_APPROVE_URL = mBaseUrl + "mobile/approvalflow/auditDocuments";
+    private String COMMON_DELETE_APPROVAL_FLOW_URL = mBaseUrl + "mobile/detailCenter/resubmitDocuments";  //通用删除的审批流
 
     public ApiPlatform() {
         /**
@@ -72,6 +73,36 @@ public class ApiPlatform extends ApiBase implements ApiModel {
         super.task_reply=mBaseUrl+"mobile/mobiletask/getTaskReply";
         super.task_change = mBaseUrl + "mobile/mobiletask/changeTaskStaus";
 
+        //日报、考勤单据
+        super.first_add_workdaily = mBaseUrl + "mobile/workDaily/saveWorkDaily"; // 首次提交工作日报
+        super.delete_work_daily = mBaseUrl + "mobile/workDaily/deleteById"; //删除日报
+        super.update_work_daily = mBaseUrl + "mobile/workDaily/updateWorkDaily"; //更新日报
+        super.getdaily_list = mBaseUrl + "mobile/workDaily/getWorkDaily"; //获取日报列表
+        super.common_app_flow_nodes_url = mBaseUrl + "mobile/approvalflow/getNodesAndLog";//单据获取审批流节点数据
+        super.common_doc_detaily_url = mBaseUrl + "mobile/detailCenter/getDetail"; //获取单据详情
+        super.common_delete_approval_flow_url = mBaseUrl + "mobile/detailCenter/resubmitDocuments";  //通用删除的审批流
+        super.delete_common_doc_url =  mBaseUrl + "mobile/detailCenter/deleteDocuments"; //通用单据的删除
+
+        //打卡2.0
+        super.get_plat_senior_setting_url = mBaseUrl + "mobile/advancedSettings/getAdvancedSettings";//获取平台高级设置时间
+        super.save_plat_senior_time_url =  mBaseUrl + "mobile/advancedSettings/saveAdvancedSettings";//保存平台高级设置
+        super.sign_get_office_url = mBaseUrl + "mobile/clockAddress/getSignCardAddress";// 获取平台办公地址
+        super.save_plat_office_address_url = mBaseUrl + "mobile/clockAddress/saveSignCardAddress";//保存平台办公地址
+        super.delete_plat_office_address_url = mBaseUrl + "mobile/clockAddress/deleteById";
+        super.punch_worksignin_url = mBaseUrl + "mobile/signCardLog/saveSignCard";//打卡
+        super.getAllWorkData =  mBaseUrl + "mobile/workData/getWorkData";//获取打卡班次
+        super.saveWorkData =  mBaseUrl + "mobile/workData/saveWorkData";
+
+
+        //外勤
+        super.saveOutAddress = mBaseUrl + "mobile/outplan/saveOutAddress";//保存外勤地址
+        super.getOutAddress = mBaseUrl + "mobile/outplan/getOutAddress";//获取外勤地址
+        super.saveOutSet = mBaseUrl + "mobile/outplan/saveOutSet";//保存外勤设置
+        super.getOutSet = mBaseUrl + "mobile/outplan/getOutSet";//获取外勤设置
+        super.getOutPlan =  mBaseUrl + "mobile/outplan/getOutPlan";//获取外勤计划列表
+        super.saveOutPlan =  mBaseUrl + "mobile/outplan/saveOutPlan";//保存外勤计划
+        super.saveOutSign =  mBaseUrl + "mobile/outplan/saveOutPlan";//保存外勤打卡记录
+
         /*strat by Bitliker*/
         super.saveOutAddress = mBaseUrl + "mobile/outplan/saveOutAddress";
         super.saveOutSet = mBaseUrl + "mobile/outplan/saveOutSet";
@@ -121,7 +152,7 @@ public class ApiPlatform extends ApiBase implements ApiModel {
         setCommon_app_flow_nodes_url(COMMON_APP_FLOW_NODES_URL); //单据获取审批流节点数据
         setCommon_doc_detaily_url(COMMON_DOC_DETAILY_URL); //获取单据详情
         setCommon_doc_examine_and_approve_url(COMMON_DOC_EXAMINE_AND_APPROVE_URL);//单据的领导审批操作 同意/不同意/变更处理人
-        setCommon_delete_approval_flow_url(COMMON_DELETE_APPROVAL_FLOW_URL); //删除日报审批流
+        setCommon_delete_approval_flow_url(COMMON_DELETE_APPROVAL_FLOW_URL); //删除审批流
     }
 
 

WeiChat/src/main/res/layout/activity_form_detail.xml

@@ -42,7 +42,46 @@
         android:divider="@drawable/bg_bar"
         android:layerType="software"
         android:scrollingCache="false" />
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:background="@color/item_line"
+                android:layout_marginLeft="10dp"
+                android:layout_marginRight="10dp"/>
+            <com.xzjmyk.pm.activity.view.MyListView
+                android:id="@+id/common_docui_main_msg_lv"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="10dp"
+                android:layout_marginTop="5dp"
+                android:layout_marginRight="10dp"
+                android:focusableInTouchMode="false">
+            </com.xzjmyk.pm.activity.view.MyListView>
+
+            <LinearLayout
+                android:id="@+id/common_docui_secondmsg_ll"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:layout_marginLeft="10dp"
+                android:layout_marginRight="10dp">
+
+                <com.xzjmyk.pm.activity.view.MyListView
+                    android:id="@+id/common_docui_second_msg_lv"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="5dp"
+                    android:focusableInTouchMode="false">
+                </com.xzjmyk.pm.activity.view.MyListView>
 
+            </LinearLayout>
+            <View
+                android:id="@+id/hide_above_af"
+                android:layout_width="match_parent"
+                android:layout_height="10dp"
+                android:background="@color/item_line"
+                android:layout_marginTop="5dp"
+                android:visibility="visible"/>
     <com.xzjmyk.pm.activity.view.MyListView
         android:id="@+id/common_approval_flow_lv"
         android:layout_width="match_parent"

WeiChat/src/main/res/layout/activity_workdaily_detail.xml

@@ -312,7 +312,7 @@
             <ImageView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:src="@drawable/icon_answer"
+                android:src="@drawable/tongyi"
                 android:layout_gravity="center_vertical"
                 />
 
@@ -347,7 +347,7 @@
             <ImageView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:src="@drawable/icon_answer"
+                android:src="@drawable/butongyi"
                 android:layout_gravity="center_vertical"
                 />
             <TextView
@@ -379,7 +379,7 @@
             <ImageView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:src="@drawable/icon_answer"
+                android:src="@drawable/biangeng"
                 android:layout_gravity="center_vertical"
                 />
             <TextView

WeiChat/src/main/res/layout/msgs_long_click.xml

@@ -43,7 +43,7 @@
             android:layout_width="200dp"
             android:layout_height="1dp"
             android:background="@color/gray_light"
-            android:visibility="visible" />
+            android:visibility="gone" />
 
         <TextView
             android:id="@+id/msg_detail_tv"
@@ -54,7 +54,7 @@
             android:text="查看消息"
             android:textColor="@color/black"
             android:textSize="15sp"
-            android:visibility="visible" />
+            android:visibility="gone" />
     </LinearLayout>
 
 

WeiChat/src/main/res/layout/second_msgs_long_click.xml

@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@drawable/bg_popuwin"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="150dp"
+        android:layout_height="match_parent"
+        android:layout_gravity="center_horizontal"
+        android:background="@color/white"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/msg_delete_tv"
+            android:layout_width="150dp"
+            android:layout_height="45dp"
+            android:background="@drawable/selector_me_menu_item_bg"
+            android:gravity="center"
+            android:text="删除"
+            android:textColor="@color/black"
+            android:textSize="15sp" />
+
+
+        <View
+            android:layout_width="200dp"
+            android:layout_height="1dp"
+            android:background="@color/gray_light"
+            android:visibility="visible" />
+
+        <TextView
+            android:id="@+id/msg_markread_tv"
+            android:layout_width="150dp"
+            android:layout_height="45dp"
+            android:background="@drawable/selector_me_menu_item_bg"
+            android:gravity="center"
+            android:text="标为已读"
+            android:textColor="@color/black"
+            android:textSize="15sp"
+            android:visibility="visible" />
+        <View
+            android:layout_width="200dp"
+            android:layout_height="1dp"
+            android:background="@color/gray_light"
+            android:visibility="visible" />
+
+        <TextView
+            android:id="@+id/msg_detail_tv"
+            android:layout_width="150dp"
+            android:layout_height="45dp"
+            android:background="@drawable/selector_me_menu_item_bg"
+            android:gravity="center"
+            android:text="查看消息"
+            android:textColor="@color/black"
+            android:textSize="15sp"
+            android:visibility="visible" />
+    </LinearLayout>
+
+
+</LinearLayout>