兴安保安确认放行校验

dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/visitor/controller/VisCarryStuffController.java

@@ -32,18 +32,15 @@ import com.dcsoft.system.service.ISysDictDataService;
 import com.dcsoft.system.service.ISysPeopleService;
 import com.dcsoft.system.service.ISysUserService;
 import com.dcsoft.system.utils.ByteArrayMultipartFile;
-import com.dcsoft.system.utils.PdfHeaderFooterEvent;
 import com.dcsoft.system.utils.PdfWatermark;
 import com.dcsoft.system.utils.UuidUtil;
 import com.dcsoft.system.visitor.domain.*;
 import com.dcsoft.system.visitor.service.IVisCarryStuffService;
+import com.dcsoft.system.visitor.service.IVisExitOutRecordService;
 import com.dcsoft.system.visitor.service.IVisVisitorExamineService;
 import com.dcsoft.system.visitor.service.IVisitorService;
 import com.itextpdf.text.*;
-import com.itextpdf.text.pdf.BaseFont;
+import com.itextpdf.text.pdf.*;
-import com.itextpdf.text.pdf.PdfPCell;
-import com.itextpdf.text.pdf.PdfPTable;
-import com.itextpdf.text.pdf.PdfWriter;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -56,17 +53,10 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import java.io.ByteArrayOutputStream;
-import java.net.URL;
-import java.util.*;
 import java.util.List;
+import java.util.*;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
-import com.itextpdf.text.Image;
-import com.itextpdf.text.pdf.BarcodeQRCode;
-import com.itextpdf.text.pdf.PdfContentByte;
-import com.itextpdf.text.pdf.PdfGState;
-import com.itextpdf.text.pdf.PdfPageEventHelper;
-import com.itextpdf.text.pdf.PdfWriter;
 
 @Slf4j
 @RestController
@@ -98,6 +88,9 @@ public class VisCarryStuffController  extends BaseController {
     @Autowired
     private IVisVisitorExamineService visVisitorExamineService;
 
+    @Resource
+    private IVisExitOutRecordService visExitOutRecordService;
+
     private static final String APPROVE_KEY = "APPROVE_KEY:STUFF_APPROVE";
 
     @Autowired
@@ -249,6 +242,13 @@ public class VisCarryStuffController  extends BaseController {
         if(CollUtil.isNotEmpty(reviewProcess)) {
             stuffVo.setReviewProcessList(reviewProcess);
         }
+
+        //查询放行记录，确认保安是否已放行
+        VisExitOutRecordVo visExitOutRecordVo = new VisExitOutRecordVo();
+        List<VisExitOutRecordVo> visExitOutRecordVos = visExitOutRecordService.selectList(visExitOutRecordVo);
+        if (CollUtil.isNotEmpty(visExitOutRecordVos)) {
+            stuffVo.setIsRelease(1);
+        }
         return success(stuffVo);
     }
 

dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/visitor/domain/VisExitOutVo.java

@@ -165,4 +165,9 @@ public class VisExitOutVo extends BaseEntity {
      * 小程序判断是否是保安
      */
     private String appDeptId;
+
+    /**
+     * 小程序判断是否已确认放行 0:否，1：是
+     */
+    private Integer isRelease = 0;
 }

dcsoft-modules/dcsoft-system/src/main/resources/mapper/system/visitor/VisExitOutRecordMapper.xml

@@ -63,6 +63,7 @@
             <if test="createTimeEnd != null">and r.create_time <![CDATA[ <= ]]> #{createTimeEnd}</if>
             <if test="exitPermitNo != null and exitPermitNo != ''">and e.exitPermit_no = #{exitPermitNo}</if>
             <if test="applyName != null and applyName != ''">and e.`name` like concat('%', #{applyName}, '%')</if>
+            <if test="exitId != null">and r.`exit_id` = #{exitId}</if>
         </where>
     </select>