优化详情

lawenforcement-ui/src/views/lawenforcement/record/DetailsVue.vue

@@ -1,7 +1,10 @@
 <template>
-    <el-dialog :visible.sync="show" title="工单详情" width="1500px" @close="closeDetail">
+    <el-dialog :visible.sync="show" title="工单详情" width="1700px" @close="closeDetail">
       <el-descriptions title="基本信息" :column="4" border>
-        <el-descriptions-item label="任务类型">{{ workOrderDetails.jobType }}</el-descriptions-item>
+        <el-descriptions-item label="任务类型">
+          <dict-tag :options="dict.type.lawenforcement_jobType" :value="workOrderDetails.jobType"/>
+<!--          {{ workOrderDetails.jobType }}-->
+        </el-descriptions-item>
         <el-descriptions-item label="任务创建人姓名">{{ workOrderDetails.creatorName }}</el-descriptions-item>
         <el-descriptions-item label="任务创建部门名称">{{ workOrderDetails.deptName }}</el-descriptions-item>
         <el-descriptions-item label="地区">{{ workOrderDetails.areaId }}</el-descriptions-item>
@@ -11,38 +14,77 @@
         <el-descriptions-item label="检查对象代码">{{ workOrderDetails.checkObjectCode }}</el-descriptions-item>
         <el-descriptions-item label="检查对象名称">{{ workOrderDetails.checkObjectName }}</el-descriptions-item>
         <el-descriptions-item label="检查对象联系电话">{{ workOrderDetails.checkObjectPhone }}</el-descriptions-item>
-        <el-descriptions-item label="检查开始时间">{{ workOrderDetails.checkStartTime }}</el-descriptions-item>
-        <el-descriptions-item label="检查结束时间">{{ workOrderDetails.checkEndTime }}</el-descriptions-item>
+        <el-descriptions-item label="检查开始时间">
+          {{ formatDate(workOrderDetails.checkStartTime) }}
+        </el-descriptions-item>
+        <el-descriptions-item label="检查结束时间">
+          {{ formatDate(workOrderDetails.checkEndTime) }}
+        </el-descriptions-item>
         <el-descriptions-item label="检查子项数量">{{ workOrderDetails.subitemCount }}</el-descriptions-item>
         <el-descriptions-item label="备注">{{ workOrderDetails.remark }}</el-descriptions-item>
       </el-descriptions>
       <el-divider></el-divider>
       <el-descriptions title="其他信息" :column="4" border>
-        <el-descriptions-item label="是否核验">{{ workOrderDetails.verify }}</el-descriptions-item>
+        <el-descriptions-item label="是否核验">
+          <span v-if="workOrderDetails.verify === '1'">是</span>
+          <span v-else-if="workOrderDetails.verify === '0'">否</span>
+          <span v-else>未知</span>
+        </el-descriptions-item>
         <el-descriptions-item label="无法核验原因">{{ workOrderDetails.unableVerifyReason }}</el-descriptions-item>
         <el-descriptions-item label="扫码人身份证号">{{ workOrderDetails.scanId }}</el-descriptions-item>
         <el-descriptions-item label="扫码人姓名">{{ workOrderDetails.scanName }}</el-descriptions-item>
-        <el-descriptions-item label="扫码时间">{{ workOrderDetails.scanTime }}</el-descriptions-item>
-        <el-descriptions-item label="核验人ID">{{ workOrderDetails.verifyPeopleId }}</el-descriptions-item>
+        <el-descriptions-item label="扫码时间">
+          {{ formatDate(workOrderDetails.scanTime) }}
+        </el-descriptions-item>
+<!--        <el-descriptions-item label="核验人ID">{{ workOrderDetails.verifyPeopleId }}</el-descriptions-item>-->
         <el-descriptions-item label="核验人姓名">{{ workOrderDetails.verifyPeopleName }}</el-descriptions-item>
-        <el-descriptions-item label="核验时间">{{ workOrderDetails.verifyTime }}</el-descriptions-item>
-        <el-descriptions-item label="评价">{{ workOrderDetails.evaluation }}</el-descriptions-item>
+        <el-descriptions-item label="核验时间">
+          {{ formatDate(workOrderDetails.verifyTime) }}
+        </el-descriptions-item>
+        <el-descriptions-item label="评价">
+          <span v-if="workOrderDetails.evaluation === '0'">待评价</span>
+          <span v-else-if="workOrderDetails.evaluation === '1'">好评</span>
+          <span v-else-if="workOrderDetails.evaluation === '2'">一般</span>
+          <span v-else-if="workOrderDetails.evaluation === '3'">差评</span>
+        </el-descriptions-item>
         <el-descriptions-item label="评价内容">{{ workOrderDetails.evaluationContent }}</el-descriptions-item>
-        <el-descriptions-item label="评价时间">{{ workOrderDetails.evaluationTime }}</el-descriptions-item>
-        <el-descriptions-item label="是否有检查结果">{{ workOrderDetails.result }}</el-descriptions-item>
-        <el-descriptions-item label="检查结果录入时间">{{ workOrderDetails.resultTime }}</el-descriptions-item>
+        <el-descriptions-item label="评价时间">
+          {{ formatDate(workOrderDetails.evaluationTime) }}
+        </el-descriptions-item>
+        <el-descriptions-item label="是否有检查结果">
+          <span v-if="workOrderDetails.result === '0'">未填</span>
+          <span v-else-if="workOrderDetails.result === '1'">已填</span>
+        </el-descriptions-item>
+        <el-descriptions-item label="检查结果录入时间">
+          {{ formatDate(workOrderDetails.resultTime) }}
+        </el-descriptions-item>
         <el-descriptions-item label="检查结果录入人员">{{ workOrderDetails.resultPersonId }}</el-descriptions-item>
-        <el-descriptions-item label="任务状态">{{ workOrderDetails.status }}</el-descriptions-item>
-        <el-descriptions-item label="任务创建时间">{{ workOrderDetails.createTime }}</el-descriptions-item>
+<!--        <el-descriptions-item label="任务状态"> </el-descriptions-item>-->
+        <el-descriptions-item label="任务创建时间">
+          {{ formatDate(workOrderDetails.createTime) }}
+        </el-descriptions-item>
         <el-descriptions-item label="创建者">{{ workOrderDetails.createBy }}</el-descriptions-item>
-        <el-descriptions-item label="是否延续检查">{{ workOrderDetails.isLast }}</el-descriptions-item>
-        <el-descriptions-item label="原任务Id">{{ workOrderDetails.jobId }}</el-descriptions-item>
+        <el-descriptions-item label="是否延续检查">
+          <span v-if="workOrderDetails.isLast === 0">否</span>
+          <span v-else-if="workOrderDetails.isLast === 1">是</span>
+        </el-descriptions-item>
+<!--        <el-descriptions-item label="原任务Id">{{ workOrderDetails.jobId }}</el-descriptions-item>-->
         <el-descriptions-item label="延续任务类型">{{ workOrderDetails.lastJobType }}</el-descriptions-item>
         <el-descriptions-item label="数据来源">{{ workOrderDetails.source }}</el-descriptions-item>
-        <el-descriptions-item label="创建方式">{{ workOrderDetails.createMethod }}</el-descriptions-item>
-        <el-descriptions-item label="是否跨部门">{{ workOrderDetails.isCrossDept }}</el-descriptions-item>
+        <el-descriptions-item label="创建方式">
+          <span v-if="workOrderDetails.createMethod === 1">自建</span>
+          <span v-else-if="workOrderDetails.createMethod === 2">API对接</span>
+          <span v-else-if="workOrderDetails.createMethod === 3">数据同步</span>
+          <span v-else>未知方式</span>
+        </el-descriptions-item>
+        <el-descriptions-item label="是否跨部门">
+          <span v-if="workOrderDetails.isCrossDept === 0">否</span>
+          <span v-else-if="workOrderDetails.isCrossDept === 1">是</span>
+        </el-descriptions-item>
         <el-descriptions-item label="设备名称">{{ workOrderDetails.deviceName }}</el-descriptions-item>
-        <el-descriptions-item label="任务状态">{{ workOrderDetails.recordStatus }}</el-descriptions-item>
+        <el-descriptions-item label="任务状态">
+          <dict-tag :options="dict.type.lawenforcement_type" :value="workOrderDetails.recordStatus"/>
+        </el-descriptions-item>
       </el-descriptions>
       <el-divider></el-divider>
       <template>
@@ -53,7 +95,12 @@
             <el-table-column prop="personCode" label="证件号码"></el-table-column>
             <el-table-column prop="personPhone" label="联系方式"></el-table-column>
             <el-table-column prop="deptName" label="部门名称"></el-table-column>
-            <el-table-column prop="mainPerson" label="是否主办"></el-table-column>
+            <el-table-column prop="mainPerson" label="是否主办">
+              <template v-slot="scope">
+                <span v-if="scope.row.mainPerson === '1'">是</span>
+                <span v-else-if="scope.row.mainPerson === '0'">否</span>
+              </template>
+            </el-table-column>
           </el-table>
         </div>
       </template>
@@ -61,8 +108,8 @@
       <el-tabs v-model="activeTab" type="card">
         <el-tab-pane label="执法记录" name="recordLogList">
           <el-table :data="workOrderDetails.recordLogList" style="width: 100%">
-            <el-table-column prop="officerName" label="执法人员姓名"></el-table-column>
-            <el-table-column prop="officerDept" label="执法人员部门"></el-table-column>
+            <el-table-column prop="personCode" label="执法人员姓名"></el-table-column>
+            <el-table-column prop="deptName" label="执法人员部门"></el-table-column>
             <el-table-column prop="deviceName" label="执法使用的设备名称"></el-table-column>
             <el-table-column prop="startTime" label="执法开始时间"></el-table-column>
             <el-table-column prop="endTime" label="执法结束时间"></el-table-column>
@@ -72,19 +119,57 @@
           <el-table :data="workOrderDetails.subitems" style="width: 100%">
             <el-table-column prop="subitemName" label="子项名称"></el-table-column>
             <el-table-column prop="subitemCode" label="子项代码"></el-table-column>
+            <el-table-column prop="checkResult" label="检查结果状态">
+              <template v-slot="scope">
+                <span v-if="scope.row.checkResult === '1'">已完成</span>
+                <span v-else-if="scope.row.checkResult === '0'">未完成</span>
+              </template>
+            </el-table-column>
             <el-table-column prop="checkResultType" label="检查结果类型"></el-table-column>
             <el-table-column prop="decisionReason" label="决定理由"></el-table-column>
-            <el-table-column prop="measures" label="处理措施"></el-table-column>
+            <el-table-column prop="measures" label="处理措施">
+              <template v-slot="scope">
+                <span v-if="scope.row.measures === '1'">责令整改</span>
+                <span v-else-if="scope.row.measures === '2'">行政指导</span>
+                <span v-else-if="scope.row.measures === '3'">行政处罚</span>
+                <span v-else-if="scope.row.measures === '4'">行政强制</span>
+                <span v-else>其他</span>
+<!--                {{ formatDate(scope.row.measures) }}-->
+              </template>
+            </el-table-column>
             <el-table-column prop="measuresDetail" label="其他处理措施详细内容"></el-table-column>
-            <el-table-column prop="fillTime" label="填报时间"></el-table-column>
-            <el-table-column prop="punishResult" label="处罚结果"></el-table-column>
+            <el-table-column prop="fillTime" label="填报时间">
+              <template v-slot="scope">
+                {{ formatDate(scope.row.fillTime) }}
+              </template>
+            </el-table-column>
+            <el-table-column prop="punishResult" label="处罚结果">
+              <template v-slot="scope">
+                <span v-if="scope.row.measures === '0'">未填报</span>
+                <span v-else-if="scope.row.measures === '3'">行政处罚</span>
+                <span v-else-if="scope.row.measures === '99'">其他</span>
+              </template>
+            </el-table-column>
             <el-table-column prop="punishContent" label="处罚内容"></el-table-column>
-            <el-table-column prop="punishTime" label="反馈时间"></el-table-column>
-            <el-table-column prop="timeout" label="是否超时"></el-table-column>
+            <el-table-column prop="punishTime" label="反馈时间">
+              <template v-slot="scope">
+                {{ formatDate(scope.row.punishTime) }}
+              </template>
+            </el-table-column>
+            <el-table-column prop="timeout" label="是否超时">
+              <template v-slot="scope">
+                <span v-if="scope.row.timeout === '0'">否</span>
+                <span v-else-if="scope.row.timeout === '1'">是</span>
+              </template>
+            </el-table-column>
             <el-table-column prop="randomResult" label="双随机检查结果"></el-table-column>
             <el-table-column prop="randomResultDetail" label="双随机检查结果详情"></el-table-column>
-            <el-table-column prop="resultPersonId" label="填报人员ID"></el-table-column>
-            <el-table-column prop="isProofOut" label="证据是否留存至自建系统"></el-table-column>
+            <el-table-column prop="isProofOut" label="证据是否留存至自建系统">
+              <template v-slot="scope">
+                <span v-if="scope.row.isProofOut === '0'">否</span>
+                <span v-else-if="scope.row.isProofOut === '1'">是</span>
+              </template>
+            </el-table-column>
             <el-table-column prop="remark" label="备注"></el-table-column>
           </el-table>
         </el-tab-pane>
@@ -94,9 +179,14 @@
 
 <script>
 import {getDetails} from "@/api/lawenforcement/record";
+import dict from "@/utils/dict";
 
 export default {
   name: 'DetailsVue',
+  dicts: [
+    'lawenforcement_type',
+    'lawenforcement_jobType'
+  ],
   props: {
     workOrderId: {
       type: String,
@@ -122,6 +212,30 @@ export default {
     },
     closeDetail(){
       this.$emit('closeDialog');
+    },
+    /*formatDate(timestamp) {
+      if (!timestamp) return ''; // 如果时间戳为空，返回空字符串
+      const date = new Date(timestamp);
+      const year = date.getFullYear();
+      const month = String(date.getMonth() + 1).padStart(2, '0');
+      const day = String(date.getDate()).padStart(2, '0');
+      return `${year}-${month}-${day}`;
+    }*/
+    formatDate(timestamp) {
+      if (!timestamp) return ''; // 如果时间戳为空，返回空字符串
+
+      // 将字符串时间戳转换为数字
+      const timestampNum = Number(timestamp);
+      if (isNaN(timestampNum)) {
+        console.error('Invalid timestamp:', timestamp);
+        return 'Invalid timestamp';
+      }
+
+      const date = new Date(timestampNum);
+      const year = date.getFullYear();
+      const month = String(date.getMonth() + 1).padStart(2, '0');
+      const day = String(date.getDate()).padStart(2, '0');
+      return `${year}-${month}-${day}`;
     }
   },
   watch: {

src/main/java/com/sooka/sponest/lawenforcement/record/domain/LawenforcementRecordLog.java

@@ -21,6 +21,7 @@ public class LawenforcementRecordLog extends BaseEntity {
     private Date startTime;
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date endTime;
+    private String deptName;
 
     public LawenforcementRecordLog(String id, String personCode, String recordId, String deviceId, Date startTime, Date endTime) {
         this.id = id;

src/main/java/com/sooka/sponest/lawenforcement/record/service/impl/LawenforcementRecordServiceImpl.java

@@ -9,6 +9,7 @@ import com.sooka.sponest.lawenforcement.person.mapper.LawenforcementPersonMapper
 import com.sooka.sponest.lawenforcement.record.domain.LawenforcementRecord;
 import com.sooka.sponest.lawenforcement.record.domain.LawenforcementRecordLog;
 import com.sooka.sponest.lawenforcement.record.domain.bo.LawenforcementFillFormBO;
+import com.sooka.sponest.lawenforcement.record.domain.vo.LawenforcementPersonDetailVO;
 import com.sooka.sponest.lawenforcement.record.domain.vo.LawenforcementRecordDetailVO;
 import com.sooka.sponest.lawenforcement.record.mapper.LawenforcementRecordMapper;
 import com.sooka.sponest.lawenforcement.record.service.ILawenforcementRecordService;
@@ -183,6 +184,16 @@ public class LawenforcementRecordServiceImpl implements ILawenforcementRecordSer
     @Override
     public LawenforcementRecordDetailVO getDeatilsById(String id) {
         LawenforcementRecordDetailVO detailvo = recordMapper.getDetailById(id);
+        List<LawenforcementRecordLog> recordLogList = detailvo.getRecordLogList();
+        List<LawenforcementPersonDetailVO> persons = detailvo.getPersons();
+        recordLogList.forEach(logInfo->{
+            persons.forEach(person->{
+                if(logInfo.getPersonCode().equals(person.getPersonCode())){
+                    logInfo.setPersonCode(person.getPersonName());
+                    logInfo.setDeptName(person.getDeptName());
+                }
+            });
+        });
         return detailvo;
     }
 

src/main/resources/mapper/lawenforcement/LawenforcementRecordMapper.xml

@@ -427,7 +427,7 @@
         <result property="timeout" column="timeout"/>
         <result property="randomResult" column="random_result"/>
         <result property="randomResultDetail" column="random_result_detail"/>
-        <result property="resultPersonId" column="result_person_id"/>
+        <result property="resultPersonId" column="subitem_result_person_id"/>
         <result property="isProofOut" column="is_proof_out"/>
         <result property="remark" column="subitem_remark"/>
         <collection property="standards" resultMap="standardDetailResult"/>
@@ -437,15 +437,15 @@
         <result property="personName" column="person_name"/>
         <result property="personCode" column="person_code"/>
         <result property="personPhone" column="person_phone"/>
-        <result property="deptName" column="dept_name"/>
+        <result property="deptName" column="person_dept_name"/>
         <result property="personType" column="person_type"/>
         <result property="mainPerson" column="main_person"/>
         <result property="remark" column="person_remark"/>
     </resultMap>
 
     <resultMap id="recordLogDetailResult" type="LawenforcementRecordLog">
-        <result property="personCode" column="person_code"/>
-        <result property="deviceName" column="device_name"/>
+        <result property="personCode" column="log_person_code"/>
+        <result property="deviceName" column="log_device_name"/>
         <result property="startTime" column="start_time"/>
         <result property="endTime" column="end_time"/>
     </resultMap>
@@ -456,8 +456,8 @@
         <result property="checkResult" column="check_result"/>
         <result property="checkResultType" column="check_result_type"/>
         <result property="decisionReason" column="decision_reason"/>
-        <result property="resultPersonId" column="result_person_id"/>
-        <result property="fillTime" column="fill_time"/>
+        <result property="resultPersonId" column="result_personId"/>
+        <result property="fillTime" column="standard_fill_time"/>
         <result property="isProofOut" column="is_proof_out"/>
         <result property="remark" column="standard_remark"/>
     </resultMap>
@@ -470,14 +470,14 @@
                lr.evaluation,lr.evaluation_content,lr.evaluation_time,lr.result,lr.result_time,lr.result_person_id,
                lr.status,lr.create_time,lr.create_by,lr.is_last,lr.job_id,lr.last_job_type,lr.source,lr.create_method,
                lr.is_cross_dept,lr.device_name,lr.record_status,
-               lp.person_name,lp.person_code,lp.person_phone,lp.dept_name,lp.person_type,lp.main_person,lp.remark as person_remark,
+               lp.person_name,lp.person_code,lp.person_phone,lp.dept_name as person_dept_name,lp.person_type,lp.main_person,lp.remark as person_remark,
                ls.subitem_name,ls.subitem_code,ls.check_result,ls.check_result_type,ls.decision_reason,ls.measures,
                ls.measures_detail,ls.fill_time,ls.punish_result,ls.punish_content,ls.punish_time,ls.timeout,ls.random_result,
-               ls.random_result_detail,ls.result_person_id,ls.is_proof_out,ls.remark as subitem_remark,
+               ls.random_result_detail,ls.result_person_id as subitem_result_person_id,ls.is_proof_out,ls.remark as subitem_remark,
                lss.standard_name,lss.standard_code,lss.check_result,lss.check_result_type,lss.decision_reason,
-               lss.result_personId,lss.fill_time,lss.is_proof_out,lss.remark as standard_remark,
-               lrl.person_code,lrl.start_time,lrl.end_time,
-               crc.camera_name as device_name
+               lss.result_personId,lss.fill_time as standard_fill_time,lss.is_proof_out,lss.remark as standard_remark,
+               lrl.person_code as log_person_code,lrl.start_time,lrl.end_time,
+               crc.camera_name as log_device_name
         FROM lawenforcement_record lr
                  LEFT JOIN lawenforcement_person lp on lr.id = lp.record_id
                  LEFT JOIN lawenforcement_subitem ls on lr.id = ls.record_id