信息牌bug修改

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

@@ -84,6 +84,19 @@ public class LabSecurityApplyController extends BaseController
     @Autowired
     private ILabWhitelistService labWhitelistService;
 
+
+    /**
+     * @param labSecurityApplyVO
+     * @return
+     */
+    @RequestMapping("/test")
+    public TableDataInfo<LabSecurityApplyVO> test(LabSecurityApplyVO labSecurityApplyVO)
+    {
+        startPage();
+        List<LabSecurityApplyVO> list = labSecurityApplyService.selectLabSecurityApplyList(labSecurityApplyVO);
+        return getDataTable(list);
+    }
+
     /**
      * 查询安全准入申请列表
      */

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/domain/vo/LabSecurityApplyVO.java

@@ -48,6 +48,8 @@ public class LabSecurityApplyVO extends LabSecurityApply {
 
     private List<Long> subjectIds;//实验室id集合
 
+    private Integer valid;//0有效
+
     public String getLaboratoryDeptName() {        return laboratoryDeptName;    }
 
     public void setLaboratoryDeptName(String laboratoryDeptName) {        this.laboratoryDeptName = laboratoryDeptName;    }
@@ -122,4 +124,12 @@ public class LabSecurityApplyVO extends LabSecurityApply {
     public List<Long> getSubjectIds() {        return subjectIds;    }
 
     public void setSubjectIds(List<Long> subjectIds) {        this.subjectIds = subjectIds;    }
+
+    public Integer getValid() {
+        return valid;
+    }
+
+    public void setValid(Integer valid) {
+        this.valid = valid;
+    }
 }

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/onemachine/service/OneMachineService.java

@@ -166,6 +166,7 @@ public class OneMachineService implements ValidationSignInPerInfo {
                     labSecurityApply.setSubjectId(signInfoVO.getSubId());
                     labSecurityApply.setUserId(signInfoVO.getSingInUser().getUserId());
                     labSecurityApply.setAuditStatus(2);
+                    labSecurityApply.setValid(0);
                     List<LabSecurityApplyVO> listapply= iLabSecurityApplyService.selectLabSecurityApplyList(labSecurityApply);
                     if (listapply.size()==0) {
                         messages.add("您未获取准入凭证！您需要通过小程序申请实验室准入资格后才能签到。");

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

@@ -125,6 +125,10 @@
                     #{subject_id}
                 </foreach>
             </if>
+            <if test="valid == 0 ">
+                and date_format(now(), '%Y-%m-%d') &gt;= DATE_FORMAT(valid_begin_time, '%Y-%m-%d')
+                and date_format(now(), '%Y-%m-%d') &lt;= DATE_FORMAT(valid_end_time, '%Y-%m-%d')
+            </if>
             <!-- 数据范围过滤 -->
             ${params.dataScope}
         </where>
@@ -169,7 +173,10 @@
             <if test="endTime != null and endTime != ''"><!-- 结束时间检索 -->
                 AND DATE_FORMAT(t.creat_time,'%Y-%m-%d') &lt;= date_format(#{endTime},'%Y-%m-%d')
             </if>
-
+            <if test="valid == 0 ">
+                and date_format(now(), '%Y-%m-%d') &gt;= DATE_FORMAT(valid_begin_time, '%Y-%m-%d')
+                and date_format(now(), '%Y-%m-%d') &lt;= DATE_FORMAT(valid_end_time, '%Y-%m-%d')
+             </if>
             <if test="validLength != null "> and valid_length = #{validLength}</if>
             <if test="validBeginTime != null "> and valid_begin_time = #{validBeginTime}</if>
             <if test="validEndTime != null "> and valid_end_time = #{validEndTime}</if>