1.质量反馈问题

2.//TODO 设备三个子菜单,坩埚下单，mes其他页面，质量反馈字段修改，mes新菜单，mes用户反馈空也展示，编辑任务担当无法修改.支数参数

app/src/main/AndroidManifest.xml

@@ -1553,7 +1553,7 @@
             android:theme="@style/Work.Base"
             android:windowSoftInputMode="adjustPan" />
         <activity
-            android:name=".ui.activity.mes.quality.MesQualityFactoryActivity"
+            android:name=".ui.activity.mes.quality.MesQualityAboutDeptActivity"
             android:configChanges="keyboardHidden|orientation"
             android:label="质量反馈审核意见"
             android:launchMode="singleTop"
@@ -1561,7 +1561,7 @@
             android:theme="@style/Work.Base"
             android:windowSoftInputMode="adjustPan" />
         <activity
-            android:name=".ui.activity.mes.quality.MesQualityManagerActivity"
+            android:name=".ui.activity.mes.quality.MesQualityDeptActivity"
             android:configChanges="keyboardHidden|orientation"
             android:label="质量反馈审核意见"
             android:launchMode="singleTop"
@@ -1953,7 +1953,14 @@
             android:screenOrientation="portrait"
             android:theme="@style/Work.Base"
             android:windowSoftInputMode="adjustPan" />
-
+        <activity
+            android:name=".ui.activity.mes.quality.MesChooseQuestionDeptActivity"
+            android:configChanges="keyboardHidden|orientation"
+            android:label="选择问题部门"
+            android:launchMode="singleTop"
+            android:screenOrientation="portrait"
+            android:theme="@style/Work.Base"
+            android:windowSoftInputMode="adjustPan" />
         <provider
             android:name="androidx.core.content.FileProvider"
             android:authorities="com.wd.workoffice.fileprovider"

app/src/main/java/com/wd/workoffice/bean/mesBean/FeedbackDetailBean.java

@@ -107,7 +107,7 @@ public class FeedbackDetailBean {
     private Object boxId;
     private String boxCode;
     private String serialNumber;
-    private Object caster;
+    private String caster;
     private String casterName;
     private Object defectId;
     private Object defectCode;
@@ -126,7 +126,7 @@ public class FeedbackDetailBean {
     private String factoryImplement;
     private Object procedureId;
     private String procedureCode;
-    private Object procedureName;
+    private String procedureName;
     private Object defectMudId;
     private Object defectMudCode;
     private String defectMudName;
@@ -138,7 +138,7 @@ public class FeedbackDetailBean {
     private Object severity;
     private String treatRectPlan;
     private String status;
-    private  List<ImageBean> attachments;
+    private List<ImageBean> attachments;
     private Object responsibleUserId;
     private String responsibleUserName;
     private String factoryTreatmentDateTime;
@@ -165,6 +165,69 @@ public class FeedbackDetailBean {
     private AttachmentVOBean attachmentVO;
     private Object defectMudIds;
     private boolean delete;
+    private String responsibleQualityDate;
+    private String responsibleQualityName;
+    private String closeUserId;
+    private String closeUserDate;
+    private String closeUserName;
+    private String siteName;
+    private String analyCause;
+
+    public String getAnalyCause() {
+        return analyCause;
+    }
+
+    public void setAnalyCause(String analyCause) {
+        this.analyCause = analyCause;
+    }
+
+    public String getSiteName() {
+        return siteName;
+    }
+
+    public void setSiteName(String siteName) {
+        this.siteName = siteName;
+    }
+
+    public String getCloseUserName() {
+        return closeUserName;
+    }
+
+    public void setCloseUserName(String closeUserName) {
+        this.closeUserName = closeUserName;
+    }
+
+    public String getCloseUserId() {
+        return closeUserId;
+    }
+
+    public void setCloseUserId(String closeUserId) {
+        this.closeUserId = closeUserId;
+    }
+
+    public String getCloseUserDate() {
+        return closeUserDate;
+    }
+
+    public void setCloseUserDate(String closeUserDate) {
+        this.closeUserDate = closeUserDate;
+    }
+
+    public String getResponsibleQualityDate() {
+        return responsibleQualityDate;
+    }
+
+    public void setResponsibleQualityDate(String responsibleQualityDate) {
+        this.responsibleQualityDate = responsibleQualityDate;
+    }
+
+    public String getResponsibleQualityName() {
+        return responsibleQualityName;
+    }
+
+    public void setResponsibleQualityName(String responsibleQualityName) {
+        this.responsibleQualityName = responsibleQualityName;
+    }
 
     public String getProcId() {
         return procId;
@@ -326,11 +389,11 @@ public class FeedbackDetailBean {
         this.serialNumber = serialNumber;
     }
 
-    public Object getCaster() {
+    public String getCaster() {
         return caster;
     }
 
-    public void setCaster(Object caster) {
+    public void setCaster(String caster) {
         this.caster = caster;
     }
 
@@ -478,11 +541,11 @@ public class FeedbackDetailBean {
         this.procedureCode = procedureCode;
     }
 
-    public Object getProcedureName() {
+    public String getProcedureName() {
         return procedureName;
     }
 
-    public void setProcedureName(Object procedureName) {
+    public void setProcedureName(String procedureName) {
         this.procedureName = procedureName;
     }
 
@@ -574,11 +637,11 @@ public class FeedbackDetailBean {
         this.status = status;
     }
 
-    public  List<ImageBean> getAttachments() {
+    public List<ImageBean> getAttachments() {
         return attachments;
     }
 
-    public void setAttachments( List<ImageBean> attachments) {
+    public void setAttachments(List<ImageBean> attachments) {
         this.attachments = attachments;
     }
 

app/src/main/java/com/wd/workoffice/retrofit/MesApiService.java

@@ -456,6 +456,11 @@ public interface MesApiService {
      */
     @POST("/himes/api/feedback/show/bom/page.json")
     Observable<BaseMesBean> questionList(@Query("functionId") String functionId, @Body RequestBody requestBody);
+    /**
+     * @return
+     */
+    @POST("/himes/api/feedback/show/siteList.json")
+    Observable<BaseMesBean> questionDeptList(@Query("functionId") String functionId, @Body RequestBody requestBody);
 
     /**
      * @return

app/src/main/java/com/wd/workoffice/ui/activity/mes/quality/MesChooseQuestionDeptActivity.java

+package com.wd.workoffice.ui.activity.mes.quality;
+
+import android.content.Intent;
+import android.view.View;
+import android.widget.Button;
+import android.widget.EditText;
+
+import com.alibaba.fastjson.JSON;
+import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.wd.workoffice.R;
+import com.wd.workoffice.app.BaseMesBean;
+import com.wd.workoffice.app.WorkToolBarActivity;
+import com.wd.workoffice.bean.mesBean.ChooseDeptBean;
+import com.wd.workoffice.bean.mesBean.QuestionBean;
+import com.wd.workoffice.retrofit.RtfUtils;
+import com.wd.workoffice.retrofit.WorkObserver;
+import com.wd.workoffice.ui.adapter.MesQuestionAdapter;
+import com.wd.workoffice.ui.adapter.MesQuestionDeptAdapter;
+import com.wd.workoffice.util.WorkUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import butterknife.OnClick;
+import flexible.xd.android_base.network.rtfhttp.Transformer;
+import io.reactivex.disposables.Disposable;
+
+/**
+ * 选择泥料问题
+ * author : flexible
+ * email : lgd19940421@163.com
+ * github: https://github.com/FlexibleXd
+ **/
+public class MesChooseQuestionDeptActivity extends WorkToolBarActivity {
+
+    @BindView(R.id.et_key)
+    EditText etKey;
+    @BindView(R.id.btn_search)
+    Button btnSearch;
+    @BindView(R.id.rv_client)
+    RecyclerView rvClient;
+    private Map<String, Object> param;
+    private List<ChooseDeptBean.ListBean> clientList;
+    private MesQuestionDeptAdapter clientAdapter;
+    private int page = 1;
+    private Map<String, Object> paramMap;
+    @Override
+    protected void initView() {
+        ButterKnife.bind(this);
+        rvClient.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
+        etKey.setHint("搜索问题泥料");
+    }
+
+    @Override
+    protected void initData() {
+        clientList = new ArrayList<>();
+        clientAdapter = new MesQuestionDeptAdapter(R.layout.item_store_client, clientList);
+        clientAdapter.bindToRecyclerView(rvClient);
+        clientAdapter.setEmptyView(R.layout.view_empty_content, rvClient);
+        param = WorkUtils.pageMesKey();
+        paramMap = WorkUtils.simpleParam();
+        param.put("paramMap", paramMap);
+        param.put("pageNum", 1);
+        getData();
+    }
+
+    private void getData() {
+        RtfUtils.getMesRtf().questionDeptList("1", WorkUtils.convertMapToBody(param)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
+            @Override
+            public void doOnSubscribe(Disposable d) {
+            }
+
+            @Override
+            public void onFail(String errorMsg) {
+                hideLoading();
+                toast(errorMsg);
+            }
+
+            @Override
+            public void onSuccess(BaseMesBean data) {
+                hideLoading();
+                if (!data.isSuccess()) {
+                    toast(data.getMessage());
+                    return;
+                }
+                List<ChooseDeptBean.ListBean> getList = JSON.parseObject(data.getData().toString(), ChooseDeptBean.class).getList();
+                if (page == 1) {
+                    clientList.clear();
+                    clientList.addAll(getList);
+                    clientAdapter.notifyDataSetChanged();
+                    clientAdapter.loadMoreComplete();
+                } else {
+                    clientAdapter.loadMoreComplete();
+                    clientList.addAll(getList);
+                    clientAdapter.notifyDataSetChanged();
+                }
+                if (getList.size() == 0) {
+                    clientAdapter.loadMoreEnd();
+                } else {
+                    page++;
+                }
+                toast("搜索成功");
+            }
+        });
+    }
+
+    @Override
+    protected void initEvent() {
+        clientAdapter.setOnLoadMoreListener(new BaseQuickAdapter.RequestLoadMoreListener() {
+            @Override
+            public void onLoadMoreRequested() {
+                param.put("pageNum", page);
+                getData();
+            }
+        }, rvClient);
+        clientAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
+            @Override
+            public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
+                Intent intent = new Intent();
+                intent.putExtra("data", JSON.toJSONString(clientList.get(position)));
+                setResult(10001, intent);
+                finish();
+            }
+        });
+    }
+
+    @Override
+    protected int layoutId() {
+        return R.layout.activity_mes_ticket_take_on;
+    }
+
+
+    @OnClick(R.id.btn_search)
+    public void onViewClicked() {
+        paramMap.put("siteName", etKey.getText().toString());
+        param.put("pageNum", 1);
+        page = 1;
+        getData();
+    }
+}

app/src/main/java/com/wd/workoffice/ui/activity/mes/quality/MesQualityFactoryActivity.java → app/src/main/java/com/wd/workoffice/ui/activity/mes/quality/MesQualityAboutDeptActivity.java

@@ -22,7 +22,6 @@ import com.wd.workoffice.retrofit.RtfUtils;
 import com.wd.workoffice.retrofit.WorkObserver;
 import com.wd.workoffice.util.DataKeeper;
 import com.wd.workoffice.util.PickTimeUtils;
-import com.wd.workoffice.util.UserKeeper;
 import com.wd.workoffice.util.WorkUtils;
 
 import org.greenrobot.eventbus.EventBus;
@@ -44,7 +43,7 @@ import io.reactivex.disposables.Disposable;
  * email : lgd19940421@163.com
  * github: https://github.com/FlexibleXd
  **/
-public class MesQualityFactoryActivity extends WorkToolBarActivity {
+public class MesQualityAboutDeptActivity extends WorkToolBarActivity {
     @BindView(R.id.tv_factory_reason)
     EditText tvFactoryReason;
     @BindView(R.id.tv_factory_suggest)
@@ -86,7 +85,6 @@ public class MesQualityFactoryActivity extends WorkToolBarActivity {
         data = JSON.parseObject(getIntent().getStringExtra("data"), FeedbackDetailBean.class);
         param.put("id", data.getId());
         param.put("procId", data.getProcId());
-//        param.put("status",3);
     }
 
     private void submit() {
@@ -95,9 +93,10 @@ public class MesQualityFactoryActivity extends WorkToolBarActivity {
 //        tvVerifyPerson.setText(detailBean.getApprovalUserName());
 //        tvQuestion.setText(detailBean.getDefectMudName());
 //        tvTime.setText(detailBean.getFactoryTreatmentDateTime());
-        param.put("factoryAnalysis",tvFactoryReason.getText().toString());
+        param.put("analyCause",tvFactoryReason.getText().toString());
         param.put("factoryImplement",tvFactoryStatus.getText().toString());
-        param.put("factoryLeaderOpinion",tvFactorySuggest.getText().toString());
+        param.put("treatRectPlan",tvFactorySuggest.getText().toString());
+        param.put("verifyUserDate",TimeUtils.getNowString());
         RtfUtils.getMesRtf().startFeedback(DataKeeper.getInstance().getMenuId(), WorkUtils.convertMapToBody(param)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
             @Override
             public void doOnSubscribe(Disposable d) {
@@ -117,7 +116,7 @@ public class MesQualityFactoryActivity extends WorkToolBarActivity {
                     return;
                 }
                 EventBus.getDefault().post(new CheckFeedbackEvent());
-                toast("审核成功");
+                toast("提交成功");
                 finish();
             }
         });
@@ -129,7 +128,7 @@ public class MesQualityFactoryActivity extends WorkToolBarActivity {
 
     @Override
     protected int layoutId() {
-        return R.layout.activity_mes_quality_factory;
+        return R.layout.activity_mes_quality_other_dept;
     }
 
     @Override

app/src/main/java/com/wd/workoffice/ui/activity/mes/quality/MesQualityClientActivity.java

 package com.wd.workoffice.ui.activity.mes.quality;
 
 import android.content.Intent;
+import android.os.Bundle;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.widget.EditText;
@@ -17,7 +18,6 @@ import com.wd.workoffice.bean.mesBean.ManagerUserBean;
 import com.wd.workoffice.retrofit.RtfUtils;
 import com.wd.workoffice.retrofit.WorkObserver;
 import com.wd.workoffice.util.DataKeeper;
-import com.wd.workoffice.util.UserKeeper;
 import com.wd.workoffice.util.WorkUtils;
 
 import org.greenrobot.eventbus.EventBus;
@@ -43,13 +43,12 @@ public class MesQualityClientActivity extends WorkToolBarActivity {
     EditText tvClientStatus;
     @BindView(R.id.tv_client_reply)
     EditText tvClientReply;
-    @BindView(R.id.tv_client_record)
-    EditText tvClientRecord;
     @BindView(R.id.tv_client_person)
     TextView tvClientPerson;
     @BindView(R.id.rl_client_person)
     RelativeLayout rlClientPerson;
     private Map<String, Object> param;
+
     @Override
     protected void initView() {
         ButterKnife.bind(this);
@@ -60,14 +59,14 @@ public class MesQualityClientActivity extends WorkToolBarActivity {
     protected void initData() {
         param = WorkUtils.simpleParam();
         FeedbackDetailBean data = JSON.parseObject(getIntent().getStringExtra("data"), FeedbackDetailBean.class);
-        param.put("id",data.getId());
-        param.put("procId",data.getProcId());
+        param.put("id", data.getId());
+        param.put("procId", data.getProcId());
     }
 
     private void submit() {
-        param.put("rapidResponse",tvClientStatus.getText().toString());
-        param.put("customerResponse",tvClientReply.getText().toString());
-        param.put("relatedRecord",tvClientRecord.getText().toString());
+        param.put("rapidResponse", tvClientStatus.getText().toString());
+        param.put("customerResponse", tvClientReply.getText().toString());
+//        param.put("relatedRecord",tvClientRecord.getText().toString());
 
         RtfUtils.getMesRtf().startFeedback(DataKeeper.getInstance().getMenuId(), WorkUtils.convertMapToBody(param)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
             @Override
@@ -88,7 +87,7 @@ public class MesQualityClientActivity extends WorkToolBarActivity {
                     return;
                 }
                 EventBus.getDefault().post(new CheckFeedbackEvent());
-                toast("审核成功");
+                toast("提交成功");
                 finish();
             }
         });
@@ -109,6 +108,7 @@ public class MesQualityClientActivity extends WorkToolBarActivity {
         }
         return super.onOptionsItemSelected(item);
     }
+
     @Override
     protected void initEvent() {
     }
@@ -119,10 +119,9 @@ public class MesQualityClientActivity extends WorkToolBarActivity {
     }
 
 
-
     @OnClick(R.id.rl_client_person)
     public void onViewClicked() {
-        startActivityForResult(MesChooseMangerActivity.class,10001);
+        startActivityForResult(MesChooseMangerActivity.class, 10001);
     }
 
     @Override
@@ -132,11 +131,12 @@ public class MesQualityClientActivity extends WorkToolBarActivity {
             case 10001:
                 if (resultCode == 10001) {
                     ManagerUserBean.ListBean manager = JSON.parseObject(data.getStringExtra("data"), ManagerUserBean.ListBean.class);
-                    param.put("recordUserId",manager.getId());
-                    param.put("recorUserName",manager.getName());
+                    param.put("closeUserId", manager.getId());
+                    param.put("closeUserDate", manager.getName());
                     tvClientPerson.setText(manager.getName());
                 }
                 break;
         }
     }
+
 }

app/src/main/java/com/wd/workoffice/ui/activity/mes/quality/MesQualityManagerActivity.java → app/src/main/java/com/wd/workoffice/ui/activity/mes/quality/MesQualityDeptActivity.java

 package com.wd.workoffice.ui.activity.mes.quality;
 
-import android.Manifest;
 import android.content.Intent;
-import android.content.pm.ActivityInfo;
-import android.net.Uri;
 import android.view.Menu;
 import android.view.MenuItem;
-import android.view.View;
 import android.widget.EditText;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
 
 import com.alibaba.fastjson.JSON;
-import com.chad.library.adapter.base.BaseQuickAdapter;
-import com.tbruyelle.rxpermissions2.RxPermissions;
 import com.wd.workoffice.R;
 import com.wd.workoffice.app.BaseMesBean;
 import com.wd.workoffice.app.WorkToolBarActivity;
 import com.wd.workoffice.bean.event.CheckFeedbackEvent;
+import com.wd.workoffice.bean.mesBean.ChooseDeptBean;
 import com.wd.workoffice.bean.mesBean.FeedbackDetailBean;
-import com.wd.workoffice.bean.mesBean.ImageBean;
 import com.wd.workoffice.retrofit.RtfUtils;
 import com.wd.workoffice.retrofit.WorkObserver;
-import com.wd.workoffice.ui.adapter.ImgAddAdapter;
 import com.wd.workoffice.util.DataKeeper;
-import com.wd.workoffice.util.Glide4Engine;
+import com.wd.workoffice.util.UserKeeper;
 import com.wd.workoffice.util.WorkUtils;
-import com.zhihu.matisse.Matisse;
-import com.zhihu.matisse.MimeType;
-import com.zhihu.matisse.internal.entity.CaptureStrategy;
 
 import org.greenrobot.eventbus.EventBus;
 
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
 import java.util.Map;
 
 import androidx.annotation.Nullable;
-import androidx.recyclerview.widget.GridLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
 import butterknife.BindView;
 import butterknife.ButterKnife;
+import butterknife.OnClick;
 import flexible.xd.android_base.network.rtfhttp.Transformer;
-import flexible.xd.android_base.utils.FileUtils;
+import flexible.xd.android_base.utils.TimeUtils;
 import io.reactivex.disposables.Disposable;
-import okhttp3.MediaType;
-import okhttp3.MultipartBody;
-import okhttp3.RequestBody;
 
 /**
+ * 二、质量部信息详情
  * author : flexible
  * email : lgd19940421@163.com
  * github: https://github.com/FlexibleXd
  **/
-public class MesQualityManagerActivity extends WorkToolBarActivity {
+public class MesQualityDeptActivity extends WorkToolBarActivity {
 
 
     @BindView(R.id.tv_desc)
     EditText tvDesc;
-    @BindView(R.id.tv_use_status)
-    EditText tvUseStatus;
-    @BindView(R.id.tv_suggest)
-    EditText tvSuggest;
-    @BindView(R.id.rv_img)
-    RecyclerView rvImg;
+    @BindView(R.id.tv_dept)
+    TextView tvDept;
+    @BindView(R.id.rl_dept)
+    RelativeLayout rlDept;
     private Map<String, Object> param;
-    private List<ImageBean> imgList;
-    private ImgAddAdapter imgAddAdapter;
+
     @Override
     protected void initView() {
         ButterKnife.bind(this);
-        rvImg.setLayoutManager( new GridLayoutManager(this,3,RecyclerView.VERTICAL,false));
-
     }
 
     @Override
     protected void initData() {
         param = WorkUtils.simpleParam();
         FeedbackDetailBean data = JSON.parseObject(getIntent().getStringExtra("data"), FeedbackDetailBean.class);
-        param.put("id",data.getId());
-        param.put("procId",data.getProcId());
-        imgList=new ArrayList<>();
-        ImageBean imageBean = new ImageBean();
-        imageBean.setUri(null);
-        imgList.add(imageBean);
-        imgAddAdapter = new ImgAddAdapter(R.layout.item_mes_ticket_img, imgList);
-        imgAddAdapter.bindToRecyclerView(rvImg);
+        param.put("id", data.getId());
+        param.put("procId", data.getProcId());
     }
 
     private void submit() {
-        param.put("feedbackDescription",tvDesc.getText().toString());
-        param.put("otherProviderBehavior",tvUseStatus.getText().toString());
-        param.put("salerOpinion",tvSuggest.getText().toString());
-        List<ImageBean> uploadImg =new ArrayList<>();
-        for (int i = 0; i < imgList.size()-1; i++) {
-            uploadImg.add(imgList.get(i));
-        }
-        param.put("attachments",uploadImg);
+        param.put("factoryAnalysis", tvDesc.getText().toString());
+        param.put("responsibleQualityId", UserKeeper.getInstance().getMesUid());
+        param.put("responsibleQualityDate", TimeUtils.getNowString());
         RtfUtils.getMesRtf().startFeedback(DataKeeper.getInstance().getMenuId(), WorkUtils.convertMapToBody(param)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
             @Override
             public void doOnSubscribe(Disposable d) {
@@ -115,7 +85,7 @@ public class MesQualityManagerActivity extends WorkToolBarActivity {
                     return;
                 }
                 EventBus.getDefault().post(new CheckFeedbackEvent());
-                toast("审核成功");
+                toast("提交成功");
                 finish();
             }
         });
@@ -139,110 +109,33 @@ public class MesQualityManagerActivity extends WorkToolBarActivity {
 
     @Override
     protected void initEvent() {
-        imgAddAdapter.setOnItemChildClickListener(new BaseQuickAdapter.OnItemChildClickListener() {
-            @Override
-            public void onItemChildClick(BaseQuickAdapter adapter, View view, int position) {
-                imgList.remove(position);
-                imgAddAdapter.notifyDataSetChanged();
-            }
-        });
-        imgAddAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
-            @Override
-            public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
-                if (position==imgList.size()-1){
-                    addImg();
-                }
-            }
-        });
     }
 
     @Override
     protected int layoutId() {
-        return R.layout.activity_mes_quality_manager;
+        return R.layout.activity_mes_quality_dept;
     }
 
     @Override
     protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
-       if (requestCode == 10002 && resultCode == RESULT_OK) {
-            List<Uri> dataUri = Matisse.obtainResult(data);
-            for (Uri uri : dataUri) {
-                upload( uri);
-            }
+        switch (requestCode) {
+            case 10001:
+                if (resultCode == 10001) {
+                    ChooseDeptBean.ListBean manager = JSON.parseObject(data.getStringExtra("data"), ChooseDeptBean.ListBean.class);
+                    param.put("siteId",manager.getSiteId());
+                    param.put("siteCode", manager.getSiteCode());
+                    param.put("siteName", manager.getSiteName());
+                    tvDept.setText(manager.getSiteName());
+                }
+                break;
         }
     }
-    private void addImg() {
-        RxPermissions rxPermissions = new RxPermissions(this);
-        rxPermissions
-                .request(Manifest.permission.CAMERA,
-                        Manifest.permission.READ_EXTERNAL_STORAGE,
-                        Manifest.permission.WRITE_EXTERNAL_STORAGE)
-                .subscribe(granted -> {
-                    if (granted) {
-                        // All requested permissions are granted
-                        Matisse.from(MesQualityManagerActivity.this)
-                                .choose(MimeType.ofImage())
-                                .countable(true)
-                                .maxSelectable(3).capture(true).
-                                captureStrategy(new CaptureStrategy(true, "com.wd.workoffice.fileprovider"))
-//                                        .addFilter(new GifSizeFilter(320, 320, 5 * Filter.K * Filter.K))
-//                                        .gridExpectedSize(getResources().getDimensionPixelSize(R.dimen.grid_expected_size))
-                                .restrictOrientation(ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED)
-                                .thumbnailScale(0.85f)
-                                .imageEngine(new Glide4Engine())
-                                .forResult(10002);
-                    } else {
-                        // At least one permission is denied
-                        toast("您需要开启拍照、存储权限！");
-                    }
-                });
-    }
-    /**
-     *
-     * @param uri
-     */
-    private void upload( Object uri) {
-        showLoading();
-        File file;
-        if (uri instanceof  Uri){
-            file = WorkUtils.uriToFile((Uri) uri, this);
-        }
-        else {
-            file =new File(uri.toString());
-        }
-        RequestBody requestFile = RequestBody.create(MediaType.parse("multipart/form-data"), file);
-        RtfUtils.getMesRtf().
-                upload(MultipartBody.Part.createFormData("file", file.getName(), requestFile)).
-                compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
-            @Override
-            public void doOnSubscribe(Disposable d) {
 
-            }
 
-            @Override
-            public void onFail(String errorMsg) {
-                hideLoading();
-                toast(errorMsg);
-            }
 
-            @Override
-            public void onSuccess(BaseMesBean data) {
-                hideLoading();
-                if (!data.isSuccess()) {
-                    toast(data.getMessage());
-                    return;
-                }
-                toast("上传成功");
-                ImageBean imageBean = new ImageBean();
-                imageBean.setPath(data.getData().toString());
-                imageBean.setName(file.getName());
-                imageBean.setSize(FileUtils.getFileLength(file));
-                imageBean.setType(data.getData().toString().split("\\.")[1]);
-
-                    imgList.add(imgList.size()-1, imageBean);
-                    imgAddAdapter.notifyDataSetChanged();
-                    imageBean.setUri((Uri) uri);
-            }
-        });
+    @OnClick(R.id.rl_dept)
+    public void onViewClicked() {
+        startActivityForResult(MesChooseQuestionDeptActivity.class,10001);
     }
 }

app/src/main/java/com/wd/workoffice/ui/activity/mes/quality/MesQualityDetailActivity.java

@@ -3,7 +3,9 @@ package com.wd.workoffice.ui.activity.mes.quality;
 import android.os.Bundle;
 import android.view.View;
 import android.widget.Button;
+import android.widget.EditText;
 import android.widget.LinearLayout;
+import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 import com.alibaba.fastjson.JSON;
@@ -40,6 +42,8 @@ import io.reactivex.disposables.Disposable;
  **/
 public class MesQualityDetailActivity extends WorkToolBarActivity {
 
+    @BindView(R.id.btn_refuse)
+    Button btnRefuse;
     @BindView(R.id.btn_reviews)
     Button btnReviews;
     @BindView(R.id.ll_bottom)
@@ -74,14 +78,24 @@ public class MesQualityDetailActivity extends WorkToolBarActivity {
     TextView tvDefect;
     @BindView(R.id.tv_defect_reason)
     TextView tvDefectReason;
-    @BindView(R.id.tv_desc)
-    TextView tvDesc;
-    @BindView(R.id.tv_use_status)
-    TextView tvUseStatus;
-    @BindView(R.id.tv_suggest)
-    TextView tvSuggest;
+    @BindView(R.id.tv_feedback_desc)
+    TextView tvFeedbackDesc;
+    @BindView(R.id.tv_other_supplier)
+    TextView tvOtherSupplier;
+    @BindView(R.id.tv_feedback_suggest)
+    TextView tvFeedbackSuggest;
     @BindView(R.id.rv_img)
     RecyclerView rvImg;
+    @BindView(R.id.tv_desc)
+    EditText tvDesc;
+    @BindView(R.id.tv_dept)
+    TextView tvDept;
+    @BindView(R.id.rl_dept)
+    RelativeLayout rlDept;
+    @BindView(R.id.tv_quality_person)
+    TextView tvQualityPerson;
+    @BindView(R.id.tv_quality_time)
+    TextView tvQualityTime;
     @BindView(R.id.ll_manager)
     LinearLayout llManager;
     @BindView(R.id.tv_factory_reason)
@@ -106,14 +120,12 @@ public class MesQualityDetailActivity extends WorkToolBarActivity {
     TextView tvClientStatus;
     @BindView(R.id.tv_client_reply)
     TextView tvClientReply;
-    @BindView(R.id.tv_client_record)
-    TextView tvClientRecord;
     @BindView(R.id.tv_client_person)
     TextView tvClientPerson;
     @BindView(R.id.ll_client)
     LinearLayout llClient;
-    @BindView(R.id.btn_refuse)
-    Button btnRefuse;
+    @BindView(R.id.tv_client_time)
+    TextView tvClientTime;
     private FeedbackDetailBean detailBean;
     private List<ImageBean> imgList;
     private ImgAdapter imgAdapter;
@@ -224,28 +236,34 @@ public class MesQualityDetailActivity extends WorkToolBarActivity {
         tvBox.setText(detailBean.getBoxCode());
         tvNum.setText(detailBean.getDefectCount());
         tvMarkCode.setText(detailBean.getSerialNumber());
-        tvMachine.setText(detailBean.getCasterName());
+        tvMachine.setText(detailBean.getCaster());
         tvSteelType.setText(detailBean.getSteelTypeId());
         tvDefect.setText(detailBean.getDefectName());
         tvDefectReason.setText(detailBean.getMainCause());
-        //二、销售经理反馈信息
-        tvDesc.setText(detailBean.getFeedbackDescription());
-        tvUseStatus.setText(detailBean.getOtherProviderBehavior());
-        tvSuggest.setText(detailBean.getSalerOpinion());
-        //三、公司本部反馈信息
-        tvFactoryReason.setText(detailBean.getFactoryAnalysis());
+
+        tvFeedbackDesc.setText(detailBean.getFeedbackDescription());
+        tvOtherSupplier.setText(detailBean.getOtherProviderBehavior());
+        tvFeedbackSuggest.setText(detailBean.getSalerOpinion());
+        ///二、质量部信息详情
+        tvDesc.setText(detailBean.getFactoryAnalysis());
+        tvDept.setText(detailBean.getSiteName());
+        tvQualityPerson.setText(detailBean.getResponsibleQualityName());
+        tvQualityTime.setText(detailBean.getResponsibleQualityDate());
+        //三、相关部门反馈信息
+        tvFactoryReason.setText(detailBean.getAnalyCause());
         tvFactoryStatus.setText(detailBean.getFactoryImplement());
-        tvFactorySuggest.setText(detailBean.getFactoryLeaderOpinion());
-        tvProcess.setText(detailBean.getTreatRectPlan());
+        tvFactorySuggest.setText(detailBean.getTreatRectPlan());
+        tvProcess.setText(detailBean.getProcedureName());
         tvDutyPerson.setText(detailBean.getResponsibleUserName());
         tvVerifyPerson.setText(detailBean.getVerifyUserName());
         tvQuestion.setText(detailBean.getDefectMudName());
         tvTime.setText(detailBean.getFactoryTreatmentDateTime());
+
         //四、客户回馈信息
         tvClientStatus.setText(detailBean.getRapidResponse());
         tvClientReply.setText(detailBean.getCustomerResponse());
-        tvClientRecord.setText(detailBean.getRelatedRecord());
-        tvClientPerson.setText(detailBean.getRecorUserName());
+        tvClientPerson.setText(detailBean.getCloseUserName());
+        tvClientTime.setText(detailBean.getCloseUserDate());
     }
 
     @Override
@@ -258,7 +276,6 @@ public class MesQualityDetailActivity extends WorkToolBarActivity {
     }
 
 
-
     @Override
     public void onStart() {
         super.onStart();
@@ -277,7 +294,6 @@ public class MesQualityDetailActivity extends WorkToolBarActivity {
     }
 
 
-
     @OnClick({R.id.btn_refuse, R.id.btn_reviews})
     public void onViewClicked(View view) {
         switch (view.getId()) {
@@ -291,10 +307,10 @@ public class MesQualityDetailActivity extends WorkToolBarActivity {
                         check(0);
                         break;
                     case "4":
-                        startActivity(MesQualityManagerActivity.class, "data", JSON.toJSONString(detailBean));
+                        startActivity(MesQualityDeptActivity.class, "data", JSON.toJSONString(detailBean));
                         break;
                     case "5":
-                        startActivity(MesQualityFactoryActivity.class, "data", JSON.toJSONString(detailBean));
+                        startActivity(MesQualityAboutDeptActivity.class, "data", JSON.toJSONString(detailBean));
                         break;
                     case "6":
                         startActivity(MesQualityClientActivity.class, "data", JSON.toJSONString(detailBean));
@@ -308,10 +324,10 @@ public class MesQualityDetailActivity extends WorkToolBarActivity {
 
     private void check(int status) {// 0 同意 1 拒绝
         Map<String, Object> param = WorkUtils.simpleParam();
-        param.put("approved",status);
-        param.put("id",detailBean.getId());
-        param.put("procId",detailBean.getProcId());
-        RtfUtils.getMesRtf().feedbackApproved( "1",WorkUtils.convertMapToBody(param)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
+        param.put("approved", status);
+        param.put("id", detailBean.getId());
+        param.put("procId", detailBean.getProcId());
+        RtfUtils.getMesRtf().feedbackApproved("1", WorkUtils.convertMapToBody(param)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
             @Override
             public void doOnSubscribe(Disposable d) {
             }
@@ -334,4 +350,11 @@ public class MesQualityDetailActivity extends WorkToolBarActivity {
             }
         });
     }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        // TODO: add setContentView(...) invocation
+        ButterKnife.bind(this);
+    }
 }

app/src/main/java/com/wd/workoffice/ui/adapter/MesQuestionDeptAdapter.java

+package com.wd.workoffice.ui.adapter;
+
+
+import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.chad.library.adapter.base.BaseViewHolder;
+import com.wd.workoffice.R;
+import com.wd.workoffice.bean.mesBean.ChooseDeptBean;
+import com.wd.workoffice.bean.mesBean.QuestionBean;
+
+import java.util.List;
+
+/**
+ * Created by flexible on 2018/8/13.
+ */
+
+public class MesQuestionDeptAdapter extends BaseQuickAdapter<ChooseDeptBean.ListBean, BaseViewHolder> {
+    public MesQuestionDeptAdapter(int layoutResId, List data) {
+        super(layoutResId, data);
+    }
+
+    @Override
+    protected void convert(BaseViewHolder helper, ChooseDeptBean.ListBean item) {
+        helper.setText(R.id.tv_name, item.getSiteName());
+    }
+}
+

app/src/main/res/layout/activity_mes_quality_add.xml

@@ -386,7 +386,7 @@
                     android:text="支数"
                     android:textSize="14sp" />
 
-                <TextView
+                <EditText
                     android:id="@+id/et_num"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -395,6 +395,7 @@
                     android:layout_weight="1"
                     android:background="@null"
                     android:gravity="right"
+                    android:hint="请输入"
                     android:padding="3mm"
                     android:textColor="@color/flexible_text_gray"
                     android:textSize="14sp" />
@@ -580,6 +581,100 @@
                 android:minLines="4"
                 android:padding="5mm"
                 android:textSize="14sp" />
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="@color/flexible_background"
+                android:paddingHorizontal="20mm"
+                android:paddingVertical="9mm">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="反馈信息"
+                    android:textSize="18sp" />
+
+            </RelativeLayout>
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingHorizontal="20mm"
+                android:paddingVertical="13mm"
+                android:text="反馈信息详细描述"
+                android:textSize="14sp" />
+
+            <EditText
+                android:id="@+id/tv_feedback_desc"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="20mm"
+                android:layout_marginTop="3mm"
+                android:layout_marginBottom="30mm"
+                android:hint="请输入"
+                android:background="@drawable/shape_input_white"
+                android:gravity="top"
+                android:minLines="4"
+                android:padding="5mm"
+                android:textSize="14sp" />
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingHorizontal="20mm"
+                android:paddingVertical="13mm"
+                android:text="其他供货厂家及使用情况"
+                android:textSize="14sp" />
+
+            <EditText
+                android:id="@+id/tv_other_supplier"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="20mm"
+                android:layout_marginTop="3mm"
+                android:layout_marginBottom="30mm"
+                android:background="@drawable/shape_input_white"
+                android:gravity="top"
+                android:hint="请输入"
+                android:minLines="4"
+                android:padding="5mm"
+                android:textSize="14sp" />
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingHorizontal="20mm"
+                android:paddingVertical="13mm"
+                android:text="分析及建议"
+                android:textSize="14sp" />
+
+            <EditText
+                android:id="@+id/tv_feedback_suggest"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="20mm"
+                android:layout_marginTop="3mm"
+                android:layout_marginBottom="30mm"
+                android:background="@drawable/shape_input_white"
+                android:gravity="top"
+                android:minLines="4"
+                android:hint="请输入"
+                android:padding="5mm"
+                android:textSize="14sp" />
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="20mm"
+                android:layout_marginTop="10mm"
+                android:text="上传现场照片"
+                android:textSize="15sp" />
+
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/rv_img"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="10mm" />
+
         </LinearLayout>
     </androidx.core.widget.NestedScrollView>
 </RelativeLayout>
\ No newline at end of file

app/src/main/res/layout/activity_mes_quality_client.xml

@@ -69,29 +69,6 @@
             android:padding="5mm"
             android:textSize="14sp" />
 
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:paddingHorizontal="20mm"
-            android:paddingVertical="13mm"
-            android:text="相关记录"
-            android:textSize="14sp" />
-
-        <EditText
-            android:id="@+id/tv_client_record"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginHorizontal="20mm"
-            android:layout_marginTop="3mm"
-            android:background="@drawable/shape_input_white"
-            android:gravity="top"
-            android:hint="请输入"
-            android:minLines="4"
-            android:padding="5mm"
-            android:textSize="14sp" />
-
-
-
         <RelativeLayout
             android:id="@+id/rl_client_person"
             android:layout_width="match_parent"

app/src/main/res/layout/activity_mes_quality_manager.xml → app/src/main/res/layout/activity_mes_quality_dept.xml

 <?xml version="1.0" encoding="utf-8"?>
 <androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
@@ -19,7 +20,7 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="反馈信息"
+                android:text="质量部信息详情"
                 android:textSize="18sp" />
 
         </RelativeLayout>
@@ -30,7 +31,7 @@
             android:layout_height="wrap_content"
             android:paddingHorizontal="20mm"
             android:paddingVertical="13mm"
-            android:text="反馈信息详情描述"
+            android:text="分析问题原因"
             android:textSize="14sp" />
 
         <EditText
@@ -39,7 +40,6 @@
             android:layout_height="wrap_content"
             android:layout_marginHorizontal="20mm"
             android:layout_marginTop="3mm"
-            android:layout_marginBottom="30mm"
             android:background="@drawable/shape_input_white"
             android:gravity="top"
             android:hint="请输入"
@@ -47,63 +47,45 @@
             android:padding="5mm"
             android:textSize="14sp" />
 
-        <TextView
+        <RelativeLayout
+            android:id="@+id/rl_dept"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:paddingHorizontal="20mm"
-            android:paddingVertical="13mm"
-            android:text="其它供货厂家及使用情况"
-            android:textSize="14sp" />
+            android:paddingVertical="9mm">
 
-        <EditText
-            android:id="@+id/tv_use_status"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginHorizontal="20mm"
-            android:layout_marginTop="3mm"
-            android:layout_marginBottom="30mm"
-            android:background="@drawable/shape_input_white"
-            android:gravity="top"
-            android:hint="请输入"
-            android:minLines="4"
-            android:padding="5mm"
-            android:textSize="14sp" />
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentLeft="true"
+                android:layout_centerVertical="true"
+                android:text="问题部门"
+                android:textSize="14sp" />
 
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:paddingHorizontal="20mm"
-            android:paddingVertical="13mm"
-            android:text="分析及建议"
-            android:textSize="14sp" />
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:gravity="center_vertical">
 
-        <EditText
-            android:id="@+id/tv_suggest"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginHorizontal="20mm"
-            android:layout_marginTop="3mm"
-            android:layout_marginBottom="30mm"
-            android:background="@drawable/shape_input_white"
-            android:gravity="top"
-            android:hint="请输入"
-            android:minLines="4"
-            android:padding="5mm"
-            android:textSize="14sp" />
+                <TextView
+                    android:id="@+id/tv_dept"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentLeft="true"
+                    android:layout_marginRight="3mm"
+                    android:text="请选择"
+                    android:textColor="@color/flexible_text_gray"
+                    android:textSize="14sp" />
 
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginHorizontal="20mm"
-            android:layout_marginTop="10mm"
-            android:text="上传现场照片"
-            android:textSize="15sp" />
+                <ImageView
+                    android:layout_width="15mm"
+                    android:layout_height="20mm"
+                    android:src="@mipmap/arrow_right_gray" />
+            </LinearLayout>
+
+        </RelativeLayout>
 
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/rv_img"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="10mm" />
 
     </LinearLayout>
 </androidx.core.widget.NestedScrollView>
\ No newline at end of file

app/src/main/res/layout/activity_mes_quality_factory.xml → app/src/main/res/layout/activity_mes_quality_other_dept.xml

@@ -19,7 +19,7 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="反馈信息"
+                android:text="相关部门反馈信息"
                 android:textSize="18sp" />
 
         </RelativeLayout>
@@ -30,7 +30,7 @@
             android:layout_height="wrap_content"
             android:paddingHorizontal="20mm"
             android:paddingVertical="13mm"
-            android:text="生产厂分析原因"
+            android:text="分析问题原因"
             android:textSize="14sp" />
 
         <EditText
@@ -52,7 +52,7 @@
             android:layout_height="wrap_content"
             android:paddingHorizontal="20mm"
             android:paddingVertical="13mm"
-            android:text="领导意见及建议"
+            android:text="处理及整改方案"
             android:textSize="14sp" />
 
         <EditText