.通风记录只有发起人才可以修改

.更改版本号

app/build.gradle

@@ -8,8 +8,8 @@ android {
         applicationId "com.unis.sxzcl"
         minSdkVersion 16
         targetSdkVersion 28
-        versionCode 1
-        versionName "1.0"
+        versionCode 2
+        versionName "1.2"
         ndk {
             //设置支持的SO库架构
             abiFilters 'armeabi-v7a' //,'x86', 'x86_64', 'arm64-v8a'
@@ -67,16 +67,12 @@ android {
         variant.outputs.all { output ->
 //            def flavorsName = variant.productFlavors[0].name
             def date = new Date().format("yyyyMMddHHmm")
-            def versionname = defaultConfig.versionName
-            def versioncode = defaultConfig.versionCode
+            def versionName = defaultConfig.versionName
+            def versionCode = defaultConfig.versionCode
+            def buildType = variant.buildType.name
 
 //            ${date}
-            if (variant.buildType.name.equals('debug')) {
-                outputFileName = "sxzcl_${versionname}_${versioncode}_debug.apk"
-            }
-            if (variant.buildType.name.equals('release')) {
-                outputFileName = "sxzcl_${versionname}_${versioncode}_release.apk"
-            }
+            outputFileName = "sxzcl_${buildType}_${versionName}_${versionCode}.apk"
         }
     }
 }

app/src/main/java/com/unis/sxzcl/ui/aeration/AerationDetailAdapter.java

@@ -162,7 +162,7 @@ public class AerationDetailAdapter extends BaseProviderMultiAdapter<DetailItemBe
                 // 存储选中index
                 currentItem.setSelectIndex(index);
                 // 存储选中时间
-                currentItem.setTime(DateTool.formatDate(new Date(), DateTool.FULL_DATE));
+                currentItem.setTime(DateTool.formatDate(new Date(), DateTool.YTDTD_DATE));
 
                 // 刷新当前项
                 notifyItemChanged(getItemPosition(currentItem));

app/src/main/java/com/unis/sxzcl/ui/aeration/AerationDetailFragment.java

@@ -288,29 +288,25 @@ public class AerationDetailFragment extends BaseListFragment<FragmentAerationDet
             mBinding.tvSubmit.setText("保存并提交审批");
         } else {
             // 切换按钮显示
-            String flowId = item.getFlowId();
-            mFinish = true;
-            for (DetailItemBean bean : mAdapter.getData()) {
-                if (bean.getFlowId().equals(flowId)) {
-                    // 选中项为空时 是暂存
-                    String selectIndex = bean.getSelectIndex();
-                    if (selectIndex == null || selectIndex.equals("-1")) {
-                        mFinish = false;
-                        break;
-                    }
-                }
-            }
+            showButton(item.getFlowId());
+        }
+    }
 
-            if (mFinish) {
-                // 显示提交
-                mBinding.tvSave.setVisibility(View.GONE);
-                mBinding.tvSubmit.setVisibility(View.VISIBLE);
-                mBinding.tvSubmit.setText("保存并提交");
-            } else {
-                // 显示暂存
-                mBinding.tvSave.setVisibility(View.VISIBLE);
-                mBinding.tvSubmit.setVisibility(View.GONE);
-            }
+    /**
+     * 根据流程id 判断底部按钮的显示
+     *
+     * @param flowId
+     */
+    public void showButton(String flowId) {
+        if (isStepSelectFinish(flowId)) {
+            // 选项已全选 保存并提交
+            mBinding.tvSave.setVisibility(View.GONE);
+            mBinding.tvSubmit.setVisibility(View.VISIBLE);
+            mBinding.tvSubmit.setText("保存并提交");
+        } else {
+            // 选项未全选 暂存
+            mBinding.tvSave.setVisibility(View.VISIBLE);
+            mBinding.tvSubmit.setVisibility(View.GONE);
         }
     }
 
@@ -334,9 +330,6 @@ public class AerationDetailFragment extends BaseListFragment<FragmentAerationDet
             subList.add(map);
         }
 
-        // 流程索引
-        int ongoingStep = mStepAdapter.getMaxClickIndex();
-
         showProgress("正在提交...", false);
         if (mPageType.equals("add")) {
             ProcessModel.get().add(
@@ -346,31 +339,30 @@ public class AerationDetailFragment extends BaseListFragment<FragmentAerationDet
                     depotId,
                     user.getUid(),
                     user.getUid(),
-                    String.valueOf(ongoingStep),
+                    "0",
                     mDataCallBack);
         } else {
 
             // 进行中
             String auditState = "3";
             // 当前最大可见流程
-            ongoingStep = mStepAdapter.getMaxClickIndex();
+            String ongoingStep = mBean.getOngoingStep();
 
-            // 保存并提交时
-            if (mFinish) {
-                if (ongoingStep < mStepAdapter.getData().size() - 1) {
-                    // 不是最后一个流程
+            // 取出最高可见流程id
+            int maxClickIndex = mStepAdapter.getMaxClickIndex();
+            String id = mStepAdapter.getData().get(maxClickIndex).id;
+            if (isStepSelectFinish(id)) {
+                // 保存并提交 最大可见流程
 
-                    // 状态 3=进行中
-                    auditState = "3";
-                    // 索引传下个流程索引
-                    if (mStepAdapter.getCurrentIndex() == mStepAdapter.getMaxClickIndex())
-                        ongoingStep = mStepAdapter.getMaxClickIndex() + 1;
-                } else {
+                if (Integer.parseInt(ongoingStep) == mStepAdapter.getData().size() - 1) {
                     // 最后一个流程
                     // 状态 4=已完成
                     auditState = "4";
-                    // 索引 当前流程
-                    ongoingStep = mStepAdapter.getMaxClickIndex();
+                } else {
+                    // 不是最后一个流程
+                    // 流程索引+1
+                    int index = Integer.parseInt(ongoingStep) + 1;
+                    ongoingStep = String.valueOf(index);
                 }
             }
 
@@ -385,6 +377,27 @@ public class AerationDetailFragment extends BaseListFragment<FragmentAerationDet
 
     }
 
+
+    /**
+     * 最高流程的所有选项
+     * 是否已全部选中
+     *
+     * @return true=已全部选中   false=有未选中项
+     */
+    public boolean isStepSelectFinish(String flowId) {
+        // 判断流程是否完成
+        for (DetailItemBean item : mAdapter.getData()) {
+            if (item.getFlowId().equals(flowId)) {
+                // 流程选项
+                if (item.getSelectIndex() == null)
+                    // 有未选中项
+                    return false;
+            }
+        }
+        // 全部选中
+        return true;
+    }
+
     DataCallBack mDataCallBack = new DataCallBack<String>() {
         @Override
         public void onSuccess(String data) {
@@ -404,10 +417,24 @@ public class AerationDetailFragment extends BaseListFragment<FragmentAerationDet
         }
     };
 
+    /**
+     * 顶部流程切换监听
+     *
+     * @param item
+     */
     @Override
     public void onSwitchListener(ProcessStepBean item) {
         // 流程切换回调方法
         mAdapter.setFlowId(item.id);
+        mBinding.recyclerView.scrollToPosition(0);
+
+        if (mStepAdapter.getCurrentIndex() == 0 && !mPageType.equals("add")) {
+            // 非新增页 的第一个流程 隐藏提交按钮
+            mBinding.tvSave.setVisibility(View.GONE);
+            mBinding.tvSubmit.setVisibility(View.GONE);
+        } else
+            // 切换底部按钮的显示
+            showButton(item.id);
     }
 
 

app/src/main/java/com/unis/sxzcl/ui/aeration/AerationListFragment.java

@@ -8,6 +8,7 @@ import com.google.gson.Gson;
 import com.unis.model.DataCallBack;
 import com.unis.model.HouseModel;
 import com.unis.model.ProcessModel;
+import com.unis.model.UserModel;
 import com.unis.model.bean.HouseListBean;
 import com.unis.model.bean.aeration.AerationBean;
 import com.unis.model.event.AerationEvent;
@@ -129,11 +130,15 @@ public class AerationListFragment extends BaseListFragment<FragmentBaseListTitle
         Bundle bundle = new Bundle();
         bundle.putString("data", new Gson().toJson(item));
 
-        // 状态是已完成时  跳转详情
+
         String auditState = item.getAuditState();
-        if (auditState != null && auditState.equals("4")) {
+        String uid = UserModel.get().getUser().getUid();
+
+        if (auditState != null && auditState.equals("4") || !uid.equals(item.getApplyPeople())) {
+            // 状态是已完成 登录人不是申请人  跳转详情
             bundle.putString("pageType", "detail");
         } else {
+            // 跳转编辑
             bundle.putString("pageType", "edit");
         }
         navigation(R.id.aerationDetailFragment, bundle);

app/src/main/java/com/unis/sxzcl/ui/grain_check/GrainCheckDetailFragment.java

@@ -209,9 +209,6 @@ public class GrainCheckDetailFragment extends BaseListFragment<FragmentAddBindin
      * 显示信息
      */
     private void showData() {
-        if (mPageType.equals("add")) {
-            mBinding.tvSave.setVisibility(View.VISIBLE);
-        }
         if (mData == null)
             return;
 
@@ -298,16 +295,16 @@ public class GrainCheckDetailFragment extends BaseListFragment<FragmentAddBindin
         }
 
         // 设置状态
-        String recordStatus = mData.recordStatus;
-        if (recordStatus != null && recordStatus.equals("1")) {
-            // 1已完成
-            mBinding.tvSave.setVisibility(View.GONE);
-            mBinding.tvSubmit.setVisibility(View.GONE);
-        } else {
-            // 0进行中
-            mBinding.tvSave.setVisibility(View.VISIBLE);
-            mBinding.tvSubmit.setVisibility(View.GONE);
-        }
+//        String recordStatus = mData.recordStatus;
+//        if (recordStatus != null && recordStatus.equals("1")) {
+//            // 1已完成
+//            mBinding.tvSave.setVisibility(View.GONE);
+//            mBinding.tvSubmit.setVisibility(View.GONE);
+//        } else {
+//            // 0进行中
+//            mBinding.tvSave.setVisibility(View.VISIBLE);
+//            mBinding.tvSubmit.setVisibility(View.GONE);
+//        }
 
     }
 

app/src/main/java/com/unis/sxzcl/ui/todo/TodoApplyListAdapter.java

@@ -65,7 +65,7 @@ public class TodoApplyListAdapter extends BaseQuickAdapter<AerationBean, BaseVie
         ;
         holder.setText(R.id.tv_content, sb.toString());
         // 业务时间
-        holder.setText(R.id.tv_time, item.getAuditTime());
+        holder.setText(R.id.tv_time, item.getApplyTime());
 
         // 业务状态
         TextView tvStatus = holder.getView(R.id.tv_status);
@@ -86,6 +86,16 @@ public class TodoApplyListAdapter extends BaseQuickAdapter<AerationBean, BaseVie
                 tvStatus.setText("审批不通过");
                 tvStatus.setTextColor(ContextCompat.getColor(getContext(), R.color.colorRed));
                 break;
+            case "3":
+                // 进行中
+                tvStatus.setText("进行中");
+                tvStatus.setTextColor(ContextCompat.getColor(getContext(), R.color.colorText55));
+                break;
+            case "4":
+                // 已完成
+                tvStatus.setText("已完成");
+                tvStatus.setTextColor(ContextCompat.getColor(getContext(), R.color.colorTheme));
+                break;
         }
 
         holder.itemView.setTag(item);

app/src/main/java/com/unis/sxzcl/ui/todo/TodoDetailFragment.java

@@ -54,7 +54,7 @@ public class TodoDetailFragment extends BaseListFragment<FragmentTodoDetailBindi
             public void onSuccess(ProcessDetailBean data) {
                 if (!isActive()) return;
                 // 获取当前审批流程数据
-                String flowId = data.process.get(mOngoingStep).step.id;
+                String flowId = data.process.get(0).step.id;
                 approveMap.put(flowId, data.audit);
 
                 // 选项列表 和 流程

app/src/main/java/com/unis/sxzcl/ui/todo/TodoFinishListAdapter.java

@@ -89,6 +89,16 @@ public class TodoFinishListAdapter extends BaseQuickAdapter<AerationBean, BaseVi
                 tvStatus.setText("审批不通过");
                 tvStatus.setTextColor(ContextCompat.getColor(getContext(), R.color.colorRed));
                 break;
+            case "3":
+                // 进行中
+                tvStatus.setText("进行中");
+                tvStatus.setTextColor(ContextCompat.getColor(getContext(), R.color.colorText55));
+                break;
+            case "4":
+                // 已完成
+                tvStatus.setText("已完成");
+                tvStatus.setTextColor(ContextCompat.getColor(getContext(), R.color.colorTheme));
+                break;
         }
 
         holder.itemView.setTag(item);

app/src/main/res/navigation/nav_graph.xml

@@ -169,7 +169,11 @@
     <fragment
         android:id="@+id/aerationDetailFragment"
         android:name="com.unis.sxzcl.ui.aeration.AerationDetailFragment"
-        android:label="机械通风详情" />
+        android:label="机械通风详情" >
+        <action
+            android:id="@+id/action_aerationDetailFragment_to_todoHomeFragment"
+            app:destination="@id/todoHomeFragment" />
+    </fragment>
     <fragment
         android:id="@+id/todoDetailFragment"
         android:name="com.unis.sxzcl.ui.todo.TodoDetailFragment"

model/src/main/java/com/unis/model/ProcessModel.java

@@ -178,9 +178,7 @@ public class ProcessModel {
     }
 
     /**
-     * 增加记录
-     *
-     * @param callBack
+     * 修改机械通风
      */
     public void update(
             List<Map<String, Object>> subList,
@@ -189,12 +187,18 @@ public class ProcessModel {
             String processId,
             String ongoingStep,
             final DataCallBack<String> callBack) {
+
         Map<String, Object> map = new HashMap<>();
-        map.put("processId", processId);// 流程id
-        map.put("type", type);// 流程类型(如:tf）
-        map.put("subList", subList);// 流程选项
-        map.put("auditState", Integer.parseInt(auditState));// 审批状态(0:提交,1审批通过:,2:审批不通过，3:审批完成进行中，4已完成）
-        map.put("ongoingStep", ongoingStep);// 进行到哪一步的主流程id
+        // 流程id
+        map.put("processId", processId);
+        // 流程类型(如:tf）
+        map.put("type", type);
+        // 流程选项
+        map.put("subList", subList);
+        // 审批状态(0:提交,1审批通过:,2:审批不通过，3:审批完成进行中，4已完成）
+        map.put("auditState", Integer.parseInt(auditState));
+        // 进行到哪一步的流程索引
+        map.put("ongoingStep", ongoingStep);
         PostRequest<String> request = OkGo.post(UrlPath.process_update);
         request.upJson(new Gson().toJson(map));
         request.execute(new MyStringCallback() {