Explorar el Código

1、新增工作时间记录;
2、按需求返回待审核小票;

pc147123 hace 1 año
padre
commit
d50b43ea75

+ 38 - 0
src/main/java/com/pavis/ctr/audit/project/controller/RecordOCRTimeController.java

@@ -0,0 +1,38 @@
+package com.pavis.ctr.audit.project.controller;
+
+
+import com.pavis.ctr.audit.project.domain.RecordOcrTime;
+import com.pavis.ctr.audit.project.service.IRecordOcrTimeService;
+import com.pavis.ctr.audit.web.domain.AjaxResult;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 用于记录每日OCR的完成时间
+ */
+@Api("记录OCR的完成时间")
+@RestController
+public class RecordOCRTimeController {
+
+    @Autowired
+    private IRecordOcrTimeService recordOcrTimeService;
+
+    @ApiOperation("记录运行OCR完成的时间")
+    @GetMapping("/recordTime/OCRTime")
+    public AjaxResult recordOCRTime(RecordOcrTime recordOcrTime) {
+        System.out.println("调用记录ocr接口");
+        System.out.println(recordOcrTime.toString());
+        boolean insertOcrTimeAndStatus = recordOcrTimeService.insertOcrTimeAndStatus(recordOcrTime);
+
+        if (insertOcrTimeAndStatus) {
+            return AjaxResult.success("数据插入成功");
+
+        }else {
+            return AjaxResult.error("数据插入失败");
+        }
+    }
+
+}

+ 82 - 0
src/main/java/com/pavis/ctr/audit/project/controller/ResultTripForUserController.java

@@ -0,0 +1,82 @@
+package com.pavis.ctr.audit.project.controller;
+
+import com.pavis.ctr.audit.common.utils.ConvertObjUtils;
+import com.pavis.ctr.audit.project.domain.AuditResultUser;
+import com.pavis.ctr.audit.project.domain.AuditTripResult;
+import com.pavis.ctr.audit.project.service.IAuditTripMainService;
+import com.pavis.ctr.audit.project.service.IAuditTripResultService;
+import com.pavis.ctr.audit.web.domain.AjaxResult;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+
+/**
+ * 把符合结论的小票信息返还给用户
+ */
+@RestController
+@Api("返还小票信息")
+public class ResultTripForUserController {
+
+    @Autowired
+    private IAuditTripResultService auditTripResultService;
+
+    @Autowired
+    private IAuditTripMainService auditTripMainService;
+
+    @ApiOperation("传入用户id,返还权重最高的一条数据")
+    @PostMapping("/resultTrip/userId")
+    public AjaxResult resultTripForUser(String userId) {
+        if (userId == null) {
+            return AjaxResult.error("请输入用户编号");
+        }
+        //给userId拼接cn
+        userId="cn"+userId;
+
+        AjaxResult ajaxResult = new AjaxResult();
+
+        List<AuditTripResult> tripResultList = auditTripResultService.getTripResult(userId);
+
+        //对于list<obj>的判断不仅仅是否为null,还要判断size是否小于等于0,和单个obj不同
+        if (tripResultList==null || tripResultList.size()<=0) {
+            ajaxResult.put("userId", userId);
+            ajaxResult.put("msg", "当前用户没有符合条件的数据");
+            return ajaxResult;
+        }
+
+
+        //对符合条件的数据进一步的筛选,
+        List<AuditTripResult> resultByUserIdUploadId = auditTripResultService.getResultByUserIdUploadId(tripResultList);
+
+
+        if (resultByUserIdUploadId==null || resultByUserIdUploadId.size()<=0) {
+            ajaxResult.put("userId", userId);
+            ajaxResult.put("msg", "当前用户没有符合条件的数据");
+            return ajaxResult;
+        }
+
+        //给返回给用户的数据添加标志
+        int num = auditTripResultService.pushSign(resultByUserIdUploadId.get(0).getUploadId());
+        System.out.println("更新第一条数据备注状态"+num+":");
+
+        //这里不需要判断是否为空,operateErrorTrip不为空则该步骤也不为空。
+        //对符合的数据进行提示文本填充,返回优先级最高的一条
+        List<AuditResultUser> auditResultUsers = ConvertObjUtils.convertTripResult(userId, resultByUserIdUploadId);
+
+        if (auditResultUsers.size() <= 0 || auditResultUsers.isEmpty()) {
+            ajaxResult.put("userId", userId);
+            ajaxResult.put("msg", "当前用户没有符合条件的数据");
+            return ajaxResult;
+        }else {
+            //这里计算了符合七种条件的小票结果数组,但是只返回这个数组权重最大的第一条数据,
+            ajaxResult.put("trip",auditResultUsers.get(0));
+            return ajaxResult;
+        }
+
+    }
+
+}