信息牌接口对接调整 2023-03-31

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabSecurityApplyController.java

@@ -799,6 +799,12 @@ public class LabSecurityApplyController extends BaseController
     {
         startPage(pageNumber,pageSize);
         List<Map<String,Object>> list = labSecurityApplyService.selectLabSecurityApply(subjectId);
+        for(Map<String,Object> map:list){
+            if(StringUtils.isNotNull(map.get("avatar"))){
+                String avatar=fileConfigUtils.getFileDomainApp() + map.get("avatar");
+                map.put("avatar",avatar);
+            }
+        }
         return ResultData.success(list);
     }
 }

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabSubjectAccessRecordController.java

@@ -5,6 +5,8 @@ import java.io.IOException;
 import java.util.Map;
 import javax.servlet.http.HttpServletResponse;
 
+import com.zd.common.core.utils.FileConfigUtils;
+import com.zd.common.core.utils.StringUtils;
 import com.zd.model.domain.ResultData;
 import com.zd.model.domain.per.PerFun;
 import com.zd.model.domain.per.PerPrefix;
@@ -34,6 +36,8 @@ import com.zd.model.page.TableDataInfo;
 public class LabSubjectAccessRecordController extends BaseController {
     @Autowired
     private ILabSubjectAccessRecordService labSubjectAccessRecordService;
+    @Autowired
+    private FileConfigUtils fileConfigUtils;
 
     /**
      * 查询实验室进出记录列表
@@ -153,6 +157,13 @@ public class LabSubjectAccessRecordController extends BaseController {
     /*************************************************/
     @RequestMapping("/selectSubjectSignList")
     public ResultData selectSubjectSignList(Long subjectId) {
-        return ResultData.success(labSubjectAccessRecordService.selectSubjectSignList(subjectId));
+        List<Map<String,Object>> mapSignList=labSubjectAccessRecordService.selectSubjectSignList(subjectId);
+        for(Map<String,Object> map:mapSignList){
+            if(StringUtils.isNotNull(map.get("avatar"))){
+               String avatar=fileConfigUtils.getFileDomainApp() + map.get("avatar");
+               map.put("avatar",avatar);
+            }
+        }
+        return ResultData.success(mapSignList);
     }
 }

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabXxpDutyController.java

@@ -197,9 +197,9 @@ public class LabXxpDutyController extends BaseController
         Optional.ofNullable(list).orElseGet(Collections::emptyList)
                 .stream()
                 .forEach(a->{
-                    if(StringUtils.isNotNull(a.get("userImg"))){
-                        String url = fileConfigUtils.getFileDomainApp() + a.get("userImg");
-                        a.put("userImg",url);
+                    if(StringUtils.isNotNull(a.get("avatar"))){
+                        String url = fileConfigUtils.getFileDomainApp() + a.get("avatar");
+                        a.put("avatar",url);
                     }
                 });
         return ResultData.success(list);

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabXxpInspectionController.java

@@ -227,9 +227,9 @@ public class LabXxpInspectionController extends BaseController
         Optional.ofNullable(list).orElseGet(Collections::emptyList)
                 .stream()
                 .forEach(a->{
-                    if(StringUtils.isNotNull(a.get("userImg"))){
-                        String url = fileConfigUtils.getFileDomainApp() + a.get("userImg");
-                        a.put("userImg",url);
+                    if(StringUtils.isNotNull(a.get("avatar"))){
+                        String url = fileConfigUtils.getFileDomainApp() + a.get("avatar");
+                        a.put("avatar",url);
                     }
                 });
         return ResultData.success(list);

zd-modules/zd-modules-laboratory/src/main/resources/mapper/laboratory/LabSecurityApplyMapper.xml

@@ -573,7 +573,7 @@
 
     <!--获取实验室准入人员信息-->
     <select id="selectLabSecurityApply" resultType="java.util.Map">
-          SELECT  id id,user_name userName,date_format(valid_end_time,'%Y-%m-%d') validEndTime,
+          SELECT  id id,user_name userName,date_format(valid_begin_time,'%Y-%m-%d') validBeginTime,date_format(valid_end_time,'%Y-%m-%d') validEndTime,
           (SELECT avatar FROM sys_user WHERE user_id=lab.user_id) AS avatar,
           (SELECT user_name FROM sys_user WHERE user_id=lab.user_id) AS jobNumber
                 FROM  lab_security_apply AS lab WHERE audit_status=2 AND subject_id=#{subjectId} and valid_end_time &gt;= now()

zd-modules/zd-modules-laboratory/src/main/resources/mapper/laboratory/XxpDutyMapper.xml

@@ -87,7 +87,7 @@
 
 
     <select id="selectDutyUserList" resultType="java.util.Map">
-        select user_name userName,user_phone userPhone,user_img userImg,duty_time dutyTime from  xxp_duty xxp
+        select user_name userName,user_phone userPhone,user_img avatar,duty_time dutyTime from  xxp_duty xxp
         <where>
             xxp.subject_id=#{labId}
             <if test="startTime!=null">

zd-modules/zd-modules-laboratory/src/main/resources/mapper/laboratory/XxpInspectionMapper.xml

@@ -69,7 +69,7 @@
 
     SELECT i.user_id userId,
                 i.user_name userName,
-                i.user_img userImg,
+                i.user_img avatar,
                 DATE_FORMAT(i.sign_in,'%Y-%m-%d %H:%i:%s') AS signTime,
                 date_format(MAX(i.sign_out),'%Y-%m-%d %H:%i:%s') AS signOut,
                 COUNT(1) AS signNumber,