1.评价，总结

2.//TODO erp用户是否选择新部门为空，质检接口数据无对应问题,内部交易订单审核，审核规则，领用申请列表/退件列表/参数，坩埚下单，mes，刷新token，编辑任务担当无法修改

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

+package com.wd.workoffice.bean.mesBean;
+
+/**
+ * author : flexible
+ * email : lgd19940421@163.com
+ * github: https://github.com/FlexibleXd
+ **/
+public class ReviewBean {
+
+    /**
+     * id : 17
+     * createDateTime : null
+     * updateDateTime : null
+     * jobNo : SCTN20041511
+     * evaluationScore : 5
+     * evaluationUserId : 398c852b38e911ea8334fa163e1166bd
+     * evaluationUserName : hello
+     * evaluationDateTime : 2020-04-26 11:51:47
+     * createUserId : 398c852b38e911ea8334fa163e1166bd
+     * createUserName : hello
+     * updateUserId : null
+     * updateUserName : null
+     * remark : null
+     * delete : null
+     */
+
+    private String id;
+    private Object createDateTime;
+    private Object updateDateTime;
+    private String jobNo;
+    private int evaluationScore;
+    private String evaluationUserId;
+    private String evaluationUserName;
+    private String evaluationDateTime;
+    private String createUserId;
+    private String createUserName;
+    private Object updateUserId;
+    private Object updateUserName;
+    private Object remark;
+    private Object delete;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public Object getCreateDateTime() {
+        return createDateTime;
+    }
+
+    public void setCreateDateTime(Object createDateTime) {
+        this.createDateTime = createDateTime;
+    }
+
+    public Object getUpdateDateTime() {
+        return updateDateTime;
+    }
+
+    public void setUpdateDateTime(Object updateDateTime) {
+        this.updateDateTime = updateDateTime;
+    }
+
+    public String getJobNo() {
+        return jobNo;
+    }
+
+    public void setJobNo(String jobNo) {
+        this.jobNo = jobNo;
+    }
+
+    public int getEvaluationScore() {
+        return evaluationScore;
+    }
+
+    public void setEvaluationScore(int evaluationScore) {
+        this.evaluationScore = evaluationScore;
+    }
+
+    public String getEvaluationUserId() {
+        return evaluationUserId;
+    }
+
+    public void setEvaluationUserId(String evaluationUserId) {
+        this.evaluationUserId = evaluationUserId;
+    }
+
+    public String getEvaluationUserName() {
+        return evaluationUserName;
+    }
+
+    public void setEvaluationUserName(String evaluationUserName) {
+        this.evaluationUserName = evaluationUserName;
+    }
+
+    public String getEvaluationDateTime() {
+        return evaluationDateTime;
+    }
+
+    public void setEvaluationDateTime(String evaluationDateTime) {
+        this.evaluationDateTime = evaluationDateTime;
+    }
+
+    public String getCreateUserId() {
+        return createUserId;
+    }
+
+    public void setCreateUserId(String createUserId) {
+        this.createUserId = createUserId;
+    }
+
+    public String getCreateUserName() {
+        return createUserName;
+    }
+
+    public void setCreateUserName(String createUserName) {
+        this.createUserName = createUserName;
+    }
+
+    public Object getUpdateUserId() {
+        return updateUserId;
+    }
+
+    public void setUpdateUserId(Object updateUserId) {
+        this.updateUserId = updateUserId;
+    }
+
+    public Object getUpdateUserName() {
+        return updateUserName;
+    }
+
+    public void setUpdateUserName(Object updateUserName) {
+        this.updateUserName = updateUserName;
+    }
+
+    public Object getRemark() {
+        return remark;
+    }
+
+    public void setRemark(Object remark) {
+        this.remark = remark;
+    }
+
+    public Object getDelete() {
+        return delete;
+    }
+
+    public void setDelete(Object delete) {
+        this.delete = delete;
+    }
+}

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

@@ -49,7 +49,7 @@ public class SummaryBean {
     private long updateDateTime;
     private String jobNo;
     private int jobTypeId;
-    private String productDrawingConfirmation;
+    private int productDrawingConfirmation;
     private String siteInvestigation;
     private String feasibilityReport;
     private String productsCode;
@@ -117,11 +117,11 @@ public class SummaryBean {
         this.jobTypeId = jobTypeId;
     }
 
-    public String getProductDrawingConfirmation() {
+    public int getProductDrawingConfirmation() {
         return productDrawingConfirmation;
     }
 
-    public void setProductDrawingConfirmation(String productDrawingConfirmation) {
+    public void setProductDrawingConfirmation(int productDrawingConfirmation) {
         this.productDrawingConfirmation = productDrawingConfirmation;
     }
 

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

@@ -8,6 +8,7 @@ import com.wd.workoffice.app.Config;
 import io.reactivex.Observable;
 import okhttp3.RequestBody;
 import retrofit2.http.Body;
+import retrofit2.http.GET;
 import retrofit2.http.POST;
 import retrofit2.http.Path;
 import retrofit2.http.Query;
@@ -77,8 +78,24 @@ public interface MesApiService {
      *
      * @return
      */
-    @POST("/himes/api/msWorkSummary/show/{id}.json")
-    Observable<BaseMesBean> summaryDetail(@Query("functionId") String functionId, @Path("id") String id);
+    @GET("/himes/api/msWorkSummary/show/{id}.json")
+    Observable<BaseMesBean> summaryDetail(@Path("id") String id, @Query("functionId") String functionId);
+
+    /**
+     * msWorkEvaluation
+     *
+     * @return
+     */
+    @GET("/himes/api/msWorkEvaluation/show/{id}.json")
+    Observable<BaseMesBean> review(@Path("id") String id, @Query("functionId") String functionId);
+
+    /**
+     * msWorkEvaluation
+     *
+     * @return
+     */
+    @POST("/himes/api/msWorkEvaluation/save.json")
+    Observable<BaseMesBean> reviewAdd(@Query("functionId") String functionId, @Query("option") String option, @Body RequestBody requestBody);
 
     /**
      * 工作总结新增

app/src/main/java/com/wd/workoffice/ui/activity/mes/ticket/MesTicketDetailReviewActivity.java

 package com.wd.workoffice.ui.activity.mes.ticket;
 
 import android.os.Bundle;
+import android.text.TextUtils;
+import android.view.View;
+import android.widget.EditText;
+import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 import com.alibaba.fastjson.JSON;
 import com.wd.workoffice.R;
-import com.wd.workoffice.app.BaseBean;
+import com.wd.workoffice.app.BaseMesBean;
 import com.wd.workoffice.app.WorkToolBarActivity;
-import com.wd.workoffice.bean.AccountBean;
+import com.wd.workoffice.bean.mesBean.ReviewBean;
+import com.wd.workoffice.bean.mesBean.SummaryBean;
+import com.wd.workoffice.bean.mesBean.TicketBean;
 import com.wd.workoffice.retrofit.RtfUtils;
 import com.wd.workoffice.retrofit.WorkObserver;
 import com.wd.workoffice.ui.adapter.ImgAdapter;
@@ -22,6 +28,7 @@ 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;
 
@@ -34,22 +41,80 @@ import io.reactivex.disposables.Disposable;
 public class MesTicketDetailReviewActivity extends WorkToolBarActivity {
     @BindView(R.id.tv_code)
     TextView tvCode;
-    @BindView(R.id.rl_client)
-    RelativeLayout rlClient;
-    @BindView(R.id.rl_company)
-    RelativeLayout rlCompany;
     @BindView(R.id.rv_star)
     RecyclerView rvStar;
-    @BindView(R.id.rv_data)
+    @BindView(R.id.rv_img)
     RecyclerView rvData;
-    private AccountBean dataBean;
+    @BindView(R.id.tv_finish)
+    TextView tvFinish;
+    @BindView(R.id.tv_design_confirm)
+    TextView tvDesignConfirm;
+    @BindView(R.id.et_design1)
+    EditText etDesign1;
+    @BindView(R.id.et_design2)
+    EditText etDesign2;
+    @BindView(R.id.ll_design)
+    LinearLayout llDesign;
+    @BindView(R.id.tv_try_pro)
+    TextView tvTryPro;
+    @BindView(R.id.rl_try_pro)
+    RelativeLayout rlTryPro;
+    @BindView(R.id.et_try1)
+    EditText etTry1;
+    @BindView(R.id.et_try2)
+    EditText etTry2;
+    @BindView(R.id.et_try3)
+    EditText etTry3;
+    @BindView(R.id.ll_try)
+    LinearLayout llTry;
+    @BindView(R.id.tv_quality_pro)
+    TextView tvQualityPro;
+    @BindView(R.id.rl_quality_pro)
+    RelativeLayout rlQualityPro;
+    @BindView(R.id.et_quality1)
+    EditText etQuality1;
+    @BindView(R.id.et_quality2)
+    EditText etQuality2;
+    @BindView(R.id.et_quality3)
+    EditText etQuality3;
+    @BindView(R.id.et_quality4)
+    EditText etQuality4;
+    @BindView(R.id.ll_quality)
+    LinearLayout llQuality;
+    @BindView(R.id.tv_tech_pro)
+    TextView tvTechPro;
+    @BindView(R.id.rl_tech_pro)
+    RelativeLayout rlTechPro;
+    @BindView(R.id.et_tech1)
+    EditText etTech1;
+    @BindView(R.id.et_tech2)
+    EditText etTech2;
+    @BindView(R.id.et_tech3)
+    EditText etTech3;
+    @BindView(R.id.ll_tech)
+    LinearLayout llTech;
+    @BindView(R.id.et_tender1)
+    EditText etTender1;
+    @BindView(R.id.et_tender2)
+    EditText etTender2;
+    @BindView(R.id.ll_tender)
+    LinearLayout llTender;
+    @BindView(R.id.tv_detail)
+    TextView tvDetail;
+    @BindView(R.id.tv_score)
+    TextView tvScore;
     private StarAdapter starAdapter;
     private List<Object> imgList;
     private ImgAdapter imgAdapter;
+    private SummaryBean dataBean;
+    private TicketBean.ListBean data;
 
     @Override
     protected void initView() {
         ButterKnife.bind(this);
+        data = JSON.parseObject(getIntent().getStringExtra("data"), TicketBean.ListBean.class);
+        tvCode.setText(data.getJobNo());
+        changView();
         rvData.setLayoutManager(new LinearLayoutManager(this, RecyclerView.HORIZONTAL, false));
         rvStar.setLayoutManager(new LinearLayoutManager(this, RecyclerView.HORIZONTAL, false));
     }
@@ -67,9 +132,18 @@ public class MesTicketDetailReviewActivity extends WorkToolBarActivity {
         getData();
     }
 
-    private void getData() {
-        RtfUtils.getRtf().getAccount().compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
 
+    @Override
+    protected void initEvent() {
+    }
+
+    @Override
+    protected int layoutId() {
+        return R.layout.activity_mes_ticket_detail_reviews;
+    }
+
+    private void getData() {
+        RtfUtils.getMesRtf().summaryDetail(data.getJobNo(), "1").compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
 
             @Override
             public void doOnSubscribe(Disposable d) {
@@ -82,29 +156,92 @@ public class MesTicketDetailReviewActivity extends WorkToolBarActivity {
             }
 
             @Override
-            public void onSuccess(BaseBean data) {
+            public void onSuccess(BaseMesBean data) {
                 hideLoading();
-                if (data.getCode() != 0) {
+                if (!data.isSuccess()) {
                     toast(data.getMessage());
                     return;
                 }
-                dataBean = JSON.parseObject(data.getData().toString(), AccountBean.class);
-//                tvName.setText(dataBean.getName());
-//                tvDpeName.setText(dataBean.getName());
-//                tvDpePrice.setText(MathUtils.converData(dataBean.getBalance(), 2));
-//                tvDpeFreezePrice.setText(String.valueOf(dataBean.getFrozenAmount()));
+                dataBean = JSON.parseObject(data.getData().toString(), SummaryBean.class);
+                setViewData();
             }
         });
+        RtfUtils.getMesRtf().review(data.getJobNo(), "1").compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
+
+            @Override
+            public void doOnSubscribe(Disposable d) {
             }
 
             @Override
-    protected void initEvent() {
+            public void onFail(String errorMsg) {
+                hideLoading();
+                toast(errorMsg);
             }
 
             @Override
-    protected int layoutId() {
-        return R.layout.activity_mes_ticket_detail_reviews;
+            public void onSuccess(BaseMesBean data) {
+                hideLoading();
+                if (!data.isSuccess()) {
+                    toast(data.getMessage());
+                    return;
+                }
+                ReviewBean dataBean = JSON.parseObject(data.getData().toString(), ReviewBean.class);
+                starAdapter.setScore(dataBean.getEvaluationScore());
+                tvScore.setText(String.format("%s分", dataBean.getEvaluationScore()));
+            }
+        });
     }
 
+    private void setViewData() {
+        if (TextUtils.equals(data.getJobTypeId(), "01")) {
+            tvDesignConfirm.setText(dataBean.getProductDrawingConfirmation() == 0 ? "是" : "否");
+            etDesign1.setText(dataBean.getSiteInvestigation());
+            etDesign2.setText(dataBean.getFeasibilityReport());
+        } else if (TextUtils.equals(data.getJobTypeId(), "02")) {
+            etTry1.setText(dataBean.getExperimentProcess());
+            etTry2.setText(dataBean.getExperimentResult());
+            etTry3.setText(dataBean.getImproveProposal());
+        } else if (TextUtils.equals(data.getJobTypeId(), "03")) {
+            etQuality1.setText(dataBean.getFeedbackQualityIssues());
+            etQuality2.setText(dataBean.getSiteUseSituation());
+            etQuality3.setText(dataBean.getCauseAnalysis());
+            etQuality4.setText(dataBean.getSolution());
+        } else if (TextUtils.equals(data.getJobTypeId(), "04")) {
+            etTech1.setText(dataBean.getCommunicativePurposes());
+            etTech2.setText(dataBean.getCommunicativeSituation());
+            etTech3.setText(dataBean.getReachOpinion());
+        } else if (TextUtils.equals(data.getJobTypeId(), "05")) {
+            etTender1.setText(dataBean.getProductDevise());
+            etTender2.setText(dataBean.getProductQuotedPrice());
+        }
+        if (!TextUtils.isEmpty(dataBean.getProductsCode())) {
+            tvQualityPro.setText(dataBean.getProductsName());
+            tvTechPro.setText(dataBean.getProductsName());
+            tvTryPro.setText(dataBean.getProductsName());
+        }
+        tvFinish.setText(dataBean.getCommunicativeSituation());
+    }
+
+    private void changView() {
+        if (TextUtils.equals(data.getJobTypeId(), "01")) {
+            llDesign.setVisibility(View.VISIBLE);
+        } else if (TextUtils.equals(data.getJobTypeId(), "02")) {
+            llTry.setVisibility(View.VISIBLE);
+        } else if (TextUtils.equals(data.getJobTypeId(), "03")) {
+            llQuality.setVisibility(View.VISIBLE);
+        } else if (TextUtils.equals(data.getJobTypeId(), "04")) {
+            llTech.setVisibility(View.VISIBLE);
+        } else if (TextUtils.equals(data.getJobTypeId(), "05")) {
+            llTender.setVisibility(View.VISIBLE);
+        }
+    }
 
+    @OnClick({R.id.tv_detail})
+    public void onViewClicked(View view) {
+        switch (view.getId()) {
+            case R.id.tv_detail:
+                startActivity(MesTicketDetailActivity.class, "data", JSON.toJSONString(data));
+                break;
+        }
+    }
 }

app/src/main/java/com/wd/workoffice/ui/activity/mes/ticket/MesTicketListActivity.java

@@ -141,10 +141,10 @@ public class MesTicketListActivity extends WorkToolBarActivity {
                         startActivity(MesTicketDetailActivity.class, "data", JSON.toJSONString(dataList.get(position)));
                         break;
                     case 3:
-                        startActivity(MesTicketDetailReviewActivity.class, "data", JSON.toJSONString(dataList.get(position)));
+                        startActivity(MesTicketDetailFinishActivity.class, "data", JSON.toJSONString(dataList.get(position)));
                         break;
                     case 4:
-                        startActivity(MesTicketDetailFinishActivity.class, "data", JSON.toJSONString(dataList.get(position)));
+                        startActivity(MesTicketDetailReviewActivity.class, "data", JSON.toJSONString(dataList.get(position)));
                         break;
                 }
             }