Merge remote-tracking branch 'origin/master'

qhse-common/src/main/java/com/rongwei/bscommon/sys/service/QhseVisitorManagementService.java

@@ -26,6 +26,6 @@ public interface QhseVisitorManagementService extends IService<QhseVisitorManage
 
     int getBlackListByIdNum(String idnumber);
 
-    void previewForAttachmentWithSignature(String signature, String fileId, HttpServletResponse response);
+    void previewForAttachmentWithSignature(String signature, String fileId, String fileName, HttpServletResponse response);
 }
 

qhse-common/src/main/java/com/rongwei/bscommon/sys/service/impl/QhseVisitorManagementServiceImpl.java

@@ -4,6 +4,7 @@ import com.aspose.cells.PdfCompliance;
 import com.aspose.cells.PdfSaveOptions;
 import com.aspose.words.Document;
 import com.aspose.words.SaveFormat;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.rongwei.bscommon.sys.fegin.AdminFeginService;
 import com.rongwei.bscommon.sys.dao.QhseVisitorManagementDao;
@@ -57,6 +58,10 @@ public class QhseVisitorManagementServiceImpl extends ServiceImpl<QhseVisitorMan
     @Autowired
     private FileFormatConversionServiceImpl fileFormatConversionService;
 
+
+    @Autowired
+    private SysFileItemServiceImpl sysFileItemServiceImpl;
+
     @Override
     public void generalMsInsert(MasterSlaveInsertVo masterSlaveInsert) {
         adminFeginService.generalMsInsert(masterSlaveInsert);
@@ -90,9 +95,15 @@ public class QhseVisitorManagementServiceImpl extends ServiceImpl<QhseVisitorMan
     }
 
     @Override
-    public void previewForAttachmentWithSignature(String signature, String fileId, HttpServletResponse response) {
+    public void previewForAttachmentWithSignature(String signature, String fileId,  String fileName,HttpServletResponse response) {
+
+        SysFileItemDo tempDo = null;
+        if(StringUtils.isBlank(fileId)){
+            tempDo= sysFileItemServiceImpl.getOne(new LambdaQueryWrapper<SysFileItemDo>().eq(SysFileItemDo::getFilename, fileName).eq(SysFileItemDo::getDeleted, "0"));
+        }else {
+            tempDo = fileFormatConversionService.fileCheck(fileId);
+        }
 
-        SysFileItemDo tempDo = fileFormatConversionService.fileCheck(fileId);
         if (tempDo == null) {
             logger.error("无法根据id:{}获取到文件信息", fileId);
             throw new RuntimeException("无法获取到附件模板");
@@ -130,13 +141,13 @@ public class QhseVisitorManagementServiceImpl extends ServiceImpl<QhseVisitorMan
             objectObjectHashMap.put("YFQM", signaturePath);
             WordUtils.MailMergeFill(objectObjectHashMap, doc);
 
-            String fileName = null;
-            try {
-               fileName = URLEncoder.encode(tempDo.getFilename(), "utf-8");
-
-            } catch (Exception e) {
-                throw new RuntimeException("文件名转换异常");
-            }
+//            String name = null;
+//            try {
+//                name = URLEncoder.encode(tempDo.getFilename(), "utf-8");
+//
+//            } catch (Exception e) {
+//                throw new RuntimeException("文件名转换异常");
+//            }
             response.setContentType("application/pdf");
 
            response.setHeader("X-Content-Length", String.valueOf(tempDo.getFilesize()));

qhse-common/src/main/java/com/rongwei/bscommon/sys/service/impl/RohhServiceImpl.java

@@ -38,6 +38,11 @@ public class RohhServiceImpl implements RohhService {
     @Autowired
     private QhseRohhEventServiceImpl qhseRohhEventService;
 
+    /**
+     * 创建整改记录
+     *
+     * @param id
+     */
     @Override
     public void createRectification(String id) {
         QhseRohhDo qhseRohhDo = rohhCheck(id);
@@ -56,9 +61,9 @@ public class RohhServiceImpl implements RohhService {
         // 增加事件
         ROHHEventVo rohhEventVo = new ROHHEventVo();
         rohhEventVo.setRohhid(id);
-        rohhEventVo.setEventname("分配");
-        rohhEventVo.setEventtype("任务分配");
-        rohhEventVo.setDescribe("当前任务已交由" + qhseRohhDo.getRectificationuser() + "整改");
+        rohhEventVo.setEventname("整改");
+        rohhEventVo.setEventtype("整改登记");
+        rohhEventVo.setDescribe("任务已整改登记完成");
         createRPEvent(rohhEventVo);
     }
 
@@ -77,6 +82,15 @@ public class RohhServiceImpl implements RohhService {
         qhseRohhValidateDo.setVerifierphoto(qhseRohhDo.getVerifierphoto());
         qhseRohhValidateDo.setVerifierresult(qhseRohhDo.getVerifierresult());
         qhseRohhValidateService.save(qhseRohhValidateDo);
+        // 复诊结果
+        String verifierResult = qhseRohhDo.getVerifierresult();
+        // 增加事件
+        ROHHEventVo rohhEventVo = new ROHHEventVo();
+        rohhEventVo.setRohhid(id);
+        rohhEventVo.setEventname("复证");
+        rohhEventVo.setEventtype(verifierResult.equals("1") ? "复证通过" :"复证不通过");
+        rohhEventVo.setDescribe(verifierResult.equals("1") ? "任务已整改登记完成" : qhseRohhDo.getVerifierdesc());
+        createRPEvent(rohhEventVo);
     }
 
     @Override
@@ -144,9 +158,9 @@ public class RohhServiceImpl implements RohhService {
             qhseRohhEventDo = new QhseRohhEventDo();
             qhseRohhEventDo.setRohhid(id);
             qhseRohhEventDo.setId(SecurityUtil.getUUID());
-            qhseRohhEventDo.setEventname("整改");
+            qhseRohhEventDo.setEventname(taskTransferVo.getEventName());
             qhseRohhEventDo.setEventtype("任务转派");
-            qhseRohhEventDo.setDescribe("当前任务已交由" + userName + "处理;转派说明:"+taskTransferVo.getZpsm());
+            qhseRohhEventDo.setDescribe("当前任务已交由" + userName + "处理;转派说明:" + taskTransferVo.getZpsm());
             QHSEUtils.initModelGeneralParameters(qhseRohhEventDo, currentUser);
             eventSavaList.add(qhseRohhEventDo);
 

qhse-entity/src/main/java/com/rongwei/bsentity/vo/TaskTransferVo.java

@@ -16,4 +16,5 @@ public class TaskTransferVo {
     private String userId;
     private String userName;
     private String zpsm;
+    private String eventName;
 }

qhse-server/src/main/java/com/rongwei/controller/QhseVisitorManagementController.java

@@ -119,9 +119,12 @@ public class QhseVisitorManagementController  {
      */
     @GetMapping("/previewForAttachmentWithSignature")
     public void previewForAttachmentWithSignature( @RequestParam("signature") String signature,
-                                                         @RequestParam("fileId") String fileId, HttpServletResponse response) {
-        logger.info("增加签名接口入参为：signature:{},fileId:{}", signature,fileId);
-        qhseVisitorManagementService.previewForAttachmentWithSignature(signature,fileId, response);
+                                                   @RequestParam("fileId") String fileId,
+                                                   @RequestParam("fileName") String fileName,
+                                                   HttpServletResponse response) {
+        logger.info("增加签名接口入参为：signature:{},fileId:{},fileName:{}", signature,fileId,fileName);
+        qhseVisitorManagementService.previewForAttachmentWithSignature(signature,fileId,fileName, response);
     }
 
+
 }