1.总结接口添加

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

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

@@ -9,17 +9,18 @@ import java.util.List;
  **/
 public class LogBean {
 
+
     /**
-     * id : 49
-     * createDateTime : 1587906695000
-     * updateDateTime : 1587906695000
-     * jobNo : 40
-     * logDateTime : 2020-04-26 21:11:35
+     * id : 48
+     * createDateTime : 1587880137000
+     * updateDateTime : 1587880137000
+     * jobNo : SCTN20042605
+     * logDateTime : 2020-04-26 13:48:57
      * writeUserId : 398c852b38e911ea8334fa163e1166bd
      * writeUserName : hello
-     * jobContent : null
-     * problemDescription : null
-     * customerDemand : null
+     * jobContent : 123
+     * problemDescription : 123
+     * customerDemand : 123
      * createUserId : 398c852b38e911ea8334fa163e1166bd
      * createUserName : null
      * updateUserId : null
@@ -29,7 +30,7 @@ public class LogBean {
      * approvalDateTime : null
      * approvalStatus : null
      * remark : null
-     * attachments : []
+     * attachments : [{"id":"9f1faeae878111ea8334fa163e1166bd","name":"1.png","path":"group1/M00/00/0A/wKgAwV6lIMiATCNxAABBiqJSaT8612.png","type":"png","size":16778,"url":"http://114.116.55.221/group1/M00/00/0A/wKgAwV6lIMiATCNxAABBiqJSaT8612.png"}]
      * delete : null
      */
 
@@ -44,16 +45,16 @@ public class LogBean {
     private String problemDescription;
     private String customerDemand;
     private String createUserId;
-    private String createUserName;
-    private String updateUserId;
-    private String updateUserName;
-    private String approvalUserId;
-    private String approvalUserName;
-    private String approvalDateTime;
-    private String approvalStatus;
-    private String remark;
-    private String delete;
-    private List<?> attachments;
+    private Object createUserName;
+    private Object updateUserId;
+    private Object updateUserName;
+    private Object approvalUserId;
+    private Object approvalUserName;
+    private Object approvalDateTime;
+    private Object approvalStatus;
+    private Object remark;
+    private Object delete;
+    private List<AttachmentsBean> attachments;
 
     public String getId() {
         return id;
@@ -143,83 +144,149 @@ public class LogBean {
         this.createUserId = createUserId;
     }
 
-    public String getCreateUserName() {
+    public Object getCreateUserName() {
         return createUserName;
     }
 
-    public void setCreateUserName(String createUserName) {
+    public void setCreateUserName(Object createUserName) {
         this.createUserName = createUserName;
     }
 
-    public String getUpdateUserId() {
+    public Object getUpdateUserId() {
         return updateUserId;
     }
 
-    public void setUpdateUserId(String updateUserId) {
+    public void setUpdateUserId(Object updateUserId) {
         this.updateUserId = updateUserId;
     }
 
-    public String getUpdateUserName() {
+    public Object getUpdateUserName() {
         return updateUserName;
     }
 
-    public void setUpdateUserName(String updateUserName) {
+    public void setUpdateUserName(Object updateUserName) {
         this.updateUserName = updateUserName;
     }
 
-    public String getApprovalUserId() {
+    public Object getApprovalUserId() {
         return approvalUserId;
     }
 
-    public void setApprovalUserId(String approvalUserId) {
+    public void setApprovalUserId(Object approvalUserId) {
         this.approvalUserId = approvalUserId;
     }
 
-    public String getApprovalUserName() {
+    public Object getApprovalUserName() {
         return approvalUserName;
     }
 
-    public void setApprovalUserName(String approvalUserName) {
+    public void setApprovalUserName(Object approvalUserName) {
         this.approvalUserName = approvalUserName;
     }
 
-    public String getApprovalDateTime() {
+    public Object getApprovalDateTime() {
         return approvalDateTime;
     }
 
-    public void setApprovalDateTime(String approvalDateTime) {
+    public void setApprovalDateTime(Object approvalDateTime) {
         this.approvalDateTime = approvalDateTime;
     }
 
-    public String getApprovalStatus() {
+    public Object getApprovalStatus() {
         return approvalStatus;
     }
 
-    public void setApprovalStatus(String approvalStatus) {
+    public void setApprovalStatus(Object approvalStatus) {
         this.approvalStatus = approvalStatus;
     }
 
-    public String getRemark() {
+    public Object getRemark() {
         return remark;
     }
 
-    public void setRemark(String remark) {
+    public void setRemark(Object remark) {
         this.remark = remark;
     }
 
-    public String getDelete() {
+    public Object getDelete() {
         return delete;
     }
 
-    public void setDelete(String delete) {
+    public void setDelete(Object delete) {
         this.delete = delete;
     }
 
-    public List<?> getAttachments() {
+    public List<AttachmentsBean> getAttachments() {
         return attachments;
     }
 
-    public void setAttachments(List<?> attachments) {
+    public void setAttachments(List<AttachmentsBean> attachments) {
         this.attachments = attachments;
     }
+
+    public static class AttachmentsBean {
+        /**
+         * id : 9f1faeae878111ea8334fa163e1166bd
+         * name : 1.png
+         * path : group1/M00/00/0A/wKgAwV6lIMiATCNxAABBiqJSaT8612.png
+         * type : png
+         * size : 16778
+         * url : http://114.116.55.221/group1/M00/00/0A/wKgAwV6lIMiATCNxAABBiqJSaT8612.png
+         */
+
+        private String id;
+        private String name;
+        private String path;
+        private String type;
+        private int size;
+        private String url;
+
+        public String getId() {
+            return id;
+        }
+
+        public void setId(String id) {
+            this.id = id;
+        }
+
+        public String getName() {
+            return name;
+        }
+
+        public void setName(String name) {
+            this.name = name;
+        }
+
+        public String getPath() {
+            return path;
+        }
+
+        public void setPath(String path) {
+            this.path = path;
+        }
+
+        public String getType() {
+            return type;
+        }
+
+        public void setType(String type) {
+            this.type = type;
+        }
+
+        public int getSize() {
+            return size;
+        }
+
+        public void setSize(int size) {
+            this.size = size;
+        }
+
+        public String getUrl() {
+            return url;
+        }
+
+        public void setUrl(String url) {
+            this.url = url;
+        }
+    }
 }

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

+package com.wd.workoffice.bean.mesBean;
+
+import java.util.List;
+
+/**
+ * author : flexible
+ * email : lgd19940421@163.com
+ * github: https://github.com/FlexibleXd
+ **/
+public class SummaryBean {
+
+    /**
+     * id : 36
+     * createDateTime : 1587880187000
+     * updateDateTime : 1587883582000
+     * jobNo : SCTN20042605
+     * jobTypeId : 3
+     * productDrawingConfirmation : null
+     * siteInvestigation : null
+     * feasibilityReport : null
+     * productsCode : 7202010116D
+     * productsName : 座砖Z124
+     * experimentProcess : null
+     * experimentResult : null
+     * improveProposal : null
+     * feedbackQualityIssues : 123123
+     * siteUseSituation : 123123
+     * causeAnalysis : 123123
+     * solution : 123123
+     * communicativePurposes : null
+     * communicativeSituation : null
+     * reachOpinion : null
+     * productDevise : null
+     * productQuotedPrice : null
+     * completionSituation : 123123
+     * dataCollectionStatus : 1
+     * attachmentId : null
+     * attachments : [{"id":"a4224559878911ea8334fa163e1166bd","name":"1.png","path":"group1/M00/00/0A/wKgAwV6lLjaABF2QAABBiqJSaT8874.png","type":"png","size":16778,"url":"http://114.116.55.221/group1/M00/00/0A/wKgAwV6lLjaABF2QAABBiqJSaT8874.png"},{"id":"a42e116e878911ea8334fa163e1166bd","name":"头像.jpg","path":"group1/M00/00/0A/wKgAwV6lLjuAXyb0AAFWcDujM5E039.jpg","type":"jpg","size":87664,"url":"http://114.116.55.221/group1/M00/00/0A/wKgAwV6lLjuAXyb0AAFWcDujM5E039.jpg"}]
+     * createUserId : 398c852b38e911ea8334fa163e1166bd
+     * createUserName : hello
+     * updateUserId : 398c852b38e911ea8334fa163e1166bd
+     * updateUserName : null
+     * remark : null
+     * delete : false
+     */
+
+    private String id;
+    private long createDateTime;
+    private long updateDateTime;
+    private String jobNo;
+    private int jobTypeId;
+    private Object productDrawingConfirmation;
+    private Object siteInvestigation;
+    private Object feasibilityReport;
+    private String productsCode;
+    private String productsName;
+    private Object experimentProcess;
+    private Object experimentResult;
+    private Object improveProposal;
+    private String feedbackQualityIssues;
+    private String siteUseSituation;
+    private String causeAnalysis;
+    private String solution;
+    private Object communicativePurposes;
+    private Object communicativeSituation;
+    private Object reachOpinion;
+    private Object productDevise;
+    private Object productQuotedPrice;
+    private String completionSituation;
+    private int dataCollectionStatus;
+    private Object attachmentId;
+    private String createUserId;
+    private String createUserName;
+    private String updateUserId;
+    private Object updateUserName;
+    private Object remark;
+    private boolean delete;
+    private List<AttachmentsBean> attachments;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public long getCreateDateTime() {
+        return createDateTime;
+    }
+
+    public void setCreateDateTime(long createDateTime) {
+        this.createDateTime = createDateTime;
+    }
+
+    public long getUpdateDateTime() {
+        return updateDateTime;
+    }
+
+    public void setUpdateDateTime(long updateDateTime) {
+        this.updateDateTime = updateDateTime;
+    }
+
+    public String getJobNo() {
+        return jobNo;
+    }
+
+    public void setJobNo(String jobNo) {
+        this.jobNo = jobNo;
+    }
+
+    public int getJobTypeId() {
+        return jobTypeId;
+    }
+
+    public void setJobTypeId(int jobTypeId) {
+        this.jobTypeId = jobTypeId;
+    }
+
+    public Object getProductDrawingConfirmation() {
+        return productDrawingConfirmation;
+    }
+
+    public void setProductDrawingConfirmation(Object productDrawingConfirmation) {
+        this.productDrawingConfirmation = productDrawingConfirmation;
+    }
+
+    public Object getSiteInvestigation() {
+        return siteInvestigation;
+    }
+
+    public void setSiteInvestigation(Object siteInvestigation) {
+        this.siteInvestigation = siteInvestigation;
+    }
+
+    public Object getFeasibilityReport() {
+        return feasibilityReport;
+    }
+
+    public void setFeasibilityReport(Object feasibilityReport) {
+        this.feasibilityReport = feasibilityReport;
+    }
+
+    public String getProductsCode() {
+        return productsCode;
+    }
+
+    public void setProductsCode(String productsCode) {
+        this.productsCode = productsCode;
+    }
+
+    public String getProductsName() {
+        return productsName;
+    }
+
+    public void setProductsName(String productsName) {
+        this.productsName = productsName;
+    }
+
+    public Object getExperimentProcess() {
+        return experimentProcess;
+    }
+
+    public void setExperimentProcess(Object experimentProcess) {
+        this.experimentProcess = experimentProcess;
+    }
+
+    public Object getExperimentResult() {
+        return experimentResult;
+    }
+
+    public void setExperimentResult(Object experimentResult) {
+        this.experimentResult = experimentResult;
+    }
+
+    public Object getImproveProposal() {
+        return improveProposal;
+    }
+
+    public void setImproveProposal(Object improveProposal) {
+        this.improveProposal = improveProposal;
+    }
+
+    public String getFeedbackQualityIssues() {
+        return feedbackQualityIssues;
+    }
+
+    public void setFeedbackQualityIssues(String feedbackQualityIssues) {
+        this.feedbackQualityIssues = feedbackQualityIssues;
+    }
+
+    public String getSiteUseSituation() {
+        return siteUseSituation;
+    }
+
+    public void setSiteUseSituation(String siteUseSituation) {
+        this.siteUseSituation = siteUseSituation;
+    }
+
+    public String getCauseAnalysis() {
+        return causeAnalysis;
+    }
+
+    public void setCauseAnalysis(String causeAnalysis) {
+        this.causeAnalysis = causeAnalysis;
+    }
+
+    public String getSolution() {
+        return solution;
+    }
+
+    public void setSolution(String solution) {
+        this.solution = solution;
+    }
+
+    public Object getCommunicativePurposes() {
+        return communicativePurposes;
+    }
+
+    public void setCommunicativePurposes(Object communicativePurposes) {
+        this.communicativePurposes = communicativePurposes;
+    }
+
+    public Object getCommunicativeSituation() {
+        return communicativeSituation;
+    }
+
+    public void setCommunicativeSituation(Object communicativeSituation) {
+        this.communicativeSituation = communicativeSituation;
+    }
+
+    public Object getReachOpinion() {
+        return reachOpinion;
+    }
+
+    public void setReachOpinion(Object reachOpinion) {
+        this.reachOpinion = reachOpinion;
+    }
+
+    public Object getProductDevise() {
+        return productDevise;
+    }
+
+    public void setProductDevise(Object productDevise) {
+        this.productDevise = productDevise;
+    }
+
+    public Object getProductQuotedPrice() {
+        return productQuotedPrice;
+    }
+
+    public void setProductQuotedPrice(Object productQuotedPrice) {
+        this.productQuotedPrice = productQuotedPrice;
+    }
+
+    public String getCompletionSituation() {
+        return completionSituation;
+    }
+
+    public void setCompletionSituation(String completionSituation) {
+        this.completionSituation = completionSituation;
+    }
+
+    public int getDataCollectionStatus() {
+        return dataCollectionStatus;
+    }
+
+    public void setDataCollectionStatus(int dataCollectionStatus) {
+        this.dataCollectionStatus = dataCollectionStatus;
+    }
+
+    public Object getAttachmentId() {
+        return attachmentId;
+    }
+
+    public void setAttachmentId(Object attachmentId) {
+        this.attachmentId = attachmentId;
+    }
+
+    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 String getUpdateUserId() {
+        return updateUserId;
+    }
+
+    public void setUpdateUserId(String 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 boolean isDelete() {
+        return delete;
+    }
+
+    public void setDelete(boolean delete) {
+        this.delete = delete;
+    }
+
+    public List<AttachmentsBean> getAttachments() {
+        return attachments;
+    }
+
+    public void setAttachments(List<AttachmentsBean> attachments) {
+        this.attachments = attachments;
+    }
+
+    public static class AttachmentsBean {
+        /**
+         * id : a4224559878911ea8334fa163e1166bd
+         * name : 1.png
+         * path : group1/M00/00/0A/wKgAwV6lLjaABF2QAABBiqJSaT8874.png
+         * type : png
+         * size : 16778
+         * url : http://114.116.55.221/group1/M00/00/0A/wKgAwV6lLjaABF2QAABBiqJSaT8874.png
+         */
+
+        private String id;
+        private String name;
+        private String path;
+        private String type;
+        private int size;
+        private String url;
+
+        public String getId() {
+            return id;
+        }
+
+        public void setId(String id) {
+            this.id = id;
+        }
+
+        public String getName() {
+            return name;
+        }
+
+        public void setName(String name) {
+            this.name = name;
+        }
+
+        public String getPath() {
+            return path;
+        }
+
+        public void setPath(String path) {
+            this.path = path;
+        }
+
+        public String getType() {
+            return type;
+        }
+
+        public void setType(String type) {
+            this.type = type;
+        }
+
+        public int getSize() {
+            return size;
+        }
+
+        public void setSize(int size) {
+            this.size = size;
+        }
+
+        public String getUrl() {
+            return url;
+        }
+
+        public void setUrl(String url) {
+            this.url = url;
+        }
+    }
+}

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

@@ -9,6 +9,7 @@ import io.reactivex.Observable;
 import okhttp3.RequestBody;
 import retrofit2.http.Body;
 import retrofit2.http.POST;
+import retrofit2.http.Path;
 import retrofit2.http.Query;
 
 /**
@@ -55,10 +56,26 @@ public interface MesApiService {
     Observable<BaseMesBean> logList(@Query("functionId") String functionId, @Body RequestBody requestBody);
 
     /**
-     * 功能
+     * 日志新增
      *
      * @return
      */
     @POST("/himes/api/msWorkLogReport/save.json")
     Observable<BaseMesBean> logAdd(@Query("functionId") String functionId, @Query("option") String option, @Body RequestBody requestBody);
+
+    /**
+     * 工作总结根据jobNo查询
+     *
+     * @return
+     */
+    @POST("/himes/api/msWorkSummary/show/{id}.json")
+    Observable<BaseMesBean> summaryDetail(@Query("functionId") String functionId, @Path("id") String id);
+
+    /**
+     * 工作总结新增
+     *
+     * @return
+     */
+    @POST("/himes/api/msWorkSummary/save.json")
+    Observable<BaseMesBean> summaryAdd(@Query("functionId") String functionId, @Body RequestBody requestBody);
 }

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

@@ -8,10 +8,14 @@ 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.retrofit.RtfUtils;
 import com.wd.workoffice.retrofit.WorkObserver;
+import com.wd.workoffice.util.WorkUtils;
+
+import java.util.Map;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
@@ -25,8 +29,7 @@ import io.reactivex.disposables.Disposable;
  * github: https://github.com/FlexibleXd
  **/
 public class MesTicketAddSummaryActivity extends WorkToolBarActivity {
-    private AccountBean dataBean;
-
+    private Map<String, Object> param;
     @Override
     protected void initView() {
         ButterKnife.bind(this);
@@ -34,11 +37,12 @@ public class MesTicketAddSummaryActivity extends WorkToolBarActivity {
 
     @Override
     protected void initData() {
-        getData();
+        param = WorkUtils.simpleParam();
+        param.put("jobNo", getIntent().getStringExtra("id"));
     }
 
-    private void getData() {
-        RtfUtils.getRtf().getAccount().compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
+    private void submit() {
+        RtfUtils.getMesRtf().summaryAdd("", WorkUtils.convertMapToBody(param)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
 
 
             @Override
@@ -52,17 +56,12 @@ public class MesTicketAddSummaryActivity 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()));
             }
         });
     }
@@ -86,6 +85,7 @@ public class MesTicketAddSummaryActivity extends WorkToolBarActivity {
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
             case R.id.finish:
+                submit();
                 break;
         }
         return super.onOptionsItemSelected(item);

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

@@ -190,13 +190,13 @@ public class MesTicketDetailActivity extends WorkToolBarActivity {
             case R.id.btn_receive:
                 break;
             case R.id.btn_submit:
-                startActivity(MesTicketAddSummaryActivity.class);
+                startActivity(MesTicketAddSummaryActivity.class, "id", data.getJobNo());
                 break;
             case R.id.rl_log:
-                startActivity(MesTicketLogActivity.class, "id", data.getId() + "");
+                startActivity(MesTicketLogActivity.class, "id", data.getJobNo());
                 break;
             case R.id.rl_add_log:
-                startActivity(MesTicketAddLogActivity.class, "id", data.getId() + "");
+                startActivity(MesTicketAddLogActivity.class, "id", data.getJobNo());
                 break;
         }
     }