事件添加上报人

.idea/.name

@@ -0,0 +1 @@
+departmentclient

.idea/compiler.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="11" />
+    <bytecodeTargetLevel target="1.8" />
   </component>
 </project>

.idea/gradle.xml

@@ -5,7 +5,7 @@
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
         <option name="delegatedBuild" value="true" />
-        <option name="testRunner" value="PLATFORM" />
+        <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="modules">
@@ -21,7 +21,6 @@
             <option value="$PROJECT_DIR$/supervisionmodule" />
           </set>
         </option>
-        <option name="resolveModulePerSourceSet" value="false" />
       </GradleProjectSettings>
     </option>
   </component>

.idea/misc.xml

@@ -5,7 +5,16 @@
       <configuration PROFILE_NAME="Debug" CONFIG_NAME="Debug" />
     </configurations>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="DesignSurface">
+    <option name="filePathToZoomLevelMap">
+      <map>
+        <entry key="commonmodule/src/main/res/layout/activity_incident_detail.xml" value="0.2504528985507246" />
+        <entry key="supervisionmodule/src/main/res/layout/activity_incident_accept_dept_detail.xml" value="0.3591485507246377" />
+        <entry key="supervisionmodule/src/main/res/layout/activity_incident_check_dept_detail.xml" value="0.3591485507246377" />
+      </map>
+    </option>
+  </component>
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">

.idea/runConfigurations.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RunConfigurationProducerService">
-    <option name="ignoredProducers">
-      <set>
-        <option value="com.android.tools.idea.compose.preview.runconfiguration.ComposePreviewRunConfigurationProducer" />
-      </set>
-    </option>
-  </component>
-</project>

supervisionmodule/src/main/java/com/tengshisoft/supervisionmodule/activitys/IncidentAcceptDeptDetailActivity.java

@@ -62,6 +62,7 @@ import androidx.core.widget.NestedScrollView;
 import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
+
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.Unbinder;
@@ -115,6 +116,8 @@ public class IncidentAcceptDeptDetailActivity extends BaseActivity {
     TextureMapView mTmvMap;
     @BindView(R2.id.iv_cover)
     ImageView mIvCover;
+    @BindView(R2.id.tv_report_name)
+    TextView mTvReportName;
     private Unbinder mBind;
     private String mTaskId;
     private int mLevel;
@@ -658,6 +661,7 @@ public class IncidentAcceptDeptDetailActivity extends BaseActivity {
             mRlvTags.setVisibility(View.GONE);
         }
         mTvGrid.setText(b.getBGId());
+        mTvReportName.setText(b.getCreatorName());
         mTvComponent.setText(b.getCasePartsObjName());
         mTvType.setText(b.getCaseTypeName1() + "/" + b.getCaseTypeName2());
         if (b.getIsSelf() == 0) {

supervisionmodule/src/main/java/com/tengshisoft/supervisionmodule/activitys/IncidentCheckDeptDetailActivity.java

@@ -69,6 +69,7 @@ import androidx.core.widget.NestedScrollView;
 import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
+
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.Unbinder;
@@ -161,6 +162,8 @@ public class IncidentCheckDeptDetailActivity extends BaseActivity {
     TextureMapView mTmvMap;
     @BindView(R2.id.iv_cover)
     ImageView mIvCover;
+    @BindView(R2.id.tv_report_name)
+    TextView mTvReportName;
     private Unbinder mBind;
     private IncidentDetailBean mIncidentDetailBean;
     private String mReportId;
@@ -754,6 +757,7 @@ public class IncidentCheckDeptDetailActivity extends BaseActivity {
             mRlvTags.setVisibility(View.GONE);
         }
         mTvGrid.setText(mIncidentDetailBean.getBGId());
+        mTvReportName.setText(mIncidentDetailBean.getCreatorName());
         mTvComponent.setText(mIncidentDetailBean.getCasePartsObjName());
         mTvType.setText(mIncidentDetailBean.getCaseTypeName1() + "/" + mIncidentDetailBean.getCaseTypeName2());
         if (mIncidentDetailBean.getIsSelf() == 0) {

supervisionmodule/src/main/res/layout/activity_incident_accept_dept_detail.xml

@@ -89,6 +89,22 @@
                                 style="@style/item_content"
                                 android:hint="未录入" />
                         </LinearLayout>
+                        <LinearLayout style="@style/item_white">
+
+                            <ImageView
+                                style="@style/style_hint_star"
+                                android:visibility="invisible" />
+
+                            <TextView
+                                style="@style/item_title"
+                                android:text="上报人" />
+
+
+                            <TextView
+                                android:id="@+id/tv_report_name"
+                                style="@style/item_content"
+                                android:hint="未录入" />
+                        </LinearLayout>
 
                         <LinearLayout style="@style/item_white">
 

supervisionmodule/src/main/res/layout/activity_incident_check_dept_detail.xml

@@ -93,6 +93,22 @@
                                     style="@style/item_content"
                                     android:hint="未录入" />
                             </LinearLayout>
+                            <LinearLayout style="@style/item_white">
+
+                                <ImageView
+                                    style="@style/style_hint_star"
+                                    android:visibility="invisible" />
+
+                                <TextView
+                                    style="@style/item_title"
+                                    android:text="上报人" />
+
+
+                                <TextView
+                                    android:id="@+id/tv_report_name"
+                                    style="@style/item_content"
+                                    android:hint="未录入" />
+                            </LinearLayout>
 
                             <LinearLayout style="@style/item_white">