Merge remote-tracking branch 'origin/dev' into dev

src/main/java/org/rcisoft/sys/sysuser/controller/DoorRecordController.java

@@ -6,6 +6,7 @@ package org.rcisoft.sys.sysuser.controller;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
+import oracle.jdbc.proxy.annotation.Post;
 import org.rcisoft.core.anno.CyOpeLogAnno;
 import org.rcisoft.core.operlog.enums.CyLogTypeEnum;
 import org.rcisoft.core.util.CyEpExcelUtil;
@@ -98,7 +99,7 @@ public class DoorRecordController extends CyPaginationController<DoorRecord> {
     @CyOpeLogAnno(title = "system-通行记录信息表管理-查询通行记录信息表", businessType = CyLogTypeEnum.QUERY)
     @ApiOperation(value = "查询单一通行记录信息表", notes = "查询单一通行记录信息表")
     @ApiImplicitParams({@ApiImplicitParam(name = "userId", value = "userId", required = true, dataType = "varchar")})
-    @GetMapping("/detail")
+    @PostMapping("/detail")
     public CyResult detail(@RequestBody DoorRecord doorRecord) {
         return CyResultGenUtil.builder(new CyPersistModel(1),
                 CyMessCons.MESSAGE_ALERT_SUCCESS,

src/main/java/org/rcisoft/sys/sysuser/service/impl/DoorRecordServiceImpl.java

@@ -114,6 +114,21 @@ public class DoorRecordServiceImpl extends ServiceImpl<DoorRecordRepository, Doo
     public DoorRecord findById(DoorRecord doorRecord) {
         //TODO 需要重写
         DoorRecord doorRecord1 = baseMapper.queryDoorRecordById(doorRecord.getRecordId());
+        //获取登记时间
+        Date createDate = doorRecord1.getCreateDate();
+        //截取登记日期
+        SimpleDateFormat sf = new SimpleDateFormat("yyyy-MM-dd");
+        doorRecord1.setDate(sf.format(createDate));
+        //截取登记时间
+        SimpleDateFormat sf2 = new SimpleDateFormat("HH:mm:ss");
+        doorRecord1.setTime(sf2.format(createDate));
+        //获取登记方式id
+        String cardType = doorRecord1.getCardType();
+        //获取登记方式中文
+        SysDictData sysDictData = sysDictDataRepositorys.queryDataByCardType(cardType);
+        if (sysDictData != null) {
+            doorRecord1.setCardTypeLabel(sysDictData.getDictLabel());
+        }
         return doorRecord1;
     }
 

src/main/resources/mapper/DoorRecordMapper.xml

@@ -62,7 +62,7 @@
 
     <select id="queryDoorRecordsPaged" resultMap="BaseResultMap">
         SELECT
-        dr.record_id,su.name,dr.tenement_type,dr.create_date,dr.device_type,dr.device_name,dr.card_type,dr.record_type,dr.card_type_label,dr.abnormal
+        dr.record_id,su.name,dr.tenement_type,dr.create_date,dr.device_id,dr.device_type,dr.device_name,dr.card_type,dr.record_type,dr.card_type_label,dr.abnormal
         FROM door_record_2022 dr
         left JOIN sys_user su ON dr.person_id = su.person_id
         WHERE dr.del_flag = 0
@@ -75,8 +75,8 @@
         <if test="entity.endTime != null and entity.endTime !='' "><!-- 结束时间检索 -->
             and date_format(dr.create_date,'%Y-%m-%d') &lt;= date_format(#{entity.endTime},'%Y-%m-%d')
         </if>
-        <if test="entity.deviceName !=null and entity.deviceName != '' ">
-            and dr.device_name in(${entity.deviceName})
+        <if test="entity.deviceId !=null and entity.deviceId != '' ">
+            and dr.device_id in(${entity.deviceId})
         </if>
         <if test="entity.tenementType !=null and entity.tenementType != '' ">
             and dr.tenement_type = #{entity.tenementType}