Merge remote-tracking branch 'origin/develop' into develop

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/policy/WorkerLogic.java

@@ -647,7 +647,10 @@ public class WorkerLogic {
                 .eq(WorkerSignConfirmManual::getStatus, ExamineStatusEnum.WAIT.getKey())
                 .count();
         if (count > 0) {
-            throw new RemoteServiceException("待人工审核" + companyName + "的确认书");
+            bean.setStatus(true);
+            bean.setReason("签署超5次识别失败转人工审核");
+            return bean;
+//            throw new RemoteServiceException("待人工审核" + companyName + "的确认书");
         }
 //        String path = System.getProperty("user.dir");
         // 生成的文件的存放路径
@@ -701,7 +704,7 @@ public class WorkerLogic {
                         .setUrl(commonFile.getUrl())
                         .setStatus(ExamineStatusEnum.WAIT.getKey())
                         .insert();
-                bean.setStatus(false);
+                bean.setStatus(true);
                 bean.setReason("手写文字识别结果:" + name + ", 5次识别失败转人工审核");
                 return bean;
             }

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/utils/ocr/OCRUtil.java

@@ -130,6 +130,9 @@ public class OCRUtil {
         log.info("百度OCR返回结果:" + result);
         final JSONObject jsonBody = new JSONObject(result);
         final JSONArray jsonArray = jsonBody.getJSONArray("words_result");
+        if (jsonArray.size() <= 0) {
+            return "";
+        }
         final Object words = jsonArray.getBean(0, Map.class).get("words");
         return words.toString();
     }

mall-server-api/src/main/java/com/gree/mall/manager/logic/worker/WorkerElecConfirmLogic.java

@@ -122,9 +122,10 @@ public class WorkerElecConfirmLogic {
             throw new RemoteServiceException(manual.getNickName() + "师傅签名记录已存在");
         }
 
-       manual.setConfirmBy(adminUser.getNickName())
+        manual.setConfirmBy(adminUser.getNickName())
                 .setConfirmTime(DateUtil.date())
-                .setStatus(status.getKey());
+                .setStatus(status.getKey())
+                .updateById();
 
         if (status.getKey().equals(ExamineStatusEnum.OK.getKey())) {
             WorkerSignConfirm confirm = new WorkerSignConfirm();

mall-server-api/src/main/resources/mapper/CommonMapper.xml

@@ -1685,19 +1685,21 @@
         ${ex.orderBy}
     </select>
     <select id="workerSignConfirmCount" resultType="java.lang.Integer">
-        SELECT
-            COUNT(IF(IFNULL(d.create_time, 1)=1, 1, 0))
-        FROM
-            websit_user a
-                LEFT JOIN admin_websit b ON a.websit_id = b.websit_id
-                LEFT JOIN `user` c ON a.user_id = c.user_id
-                LEFT JOIN worker_sign_confirm d ON b.belong_company_code = d.belong_company_code AND a.worker_number = d.worker_number
-        WHERE
-            a.examine_status IN ('OK', 'EXPIRED')
-          AND b.attr = 'SELF'
-        GROUP BY
-            b.belong_company_code,
-            a.worker_number
+        SELECT COUNT(*) FROM (
+            SELECT
+                IF(IFNULL(d.create_time, 1)=1, 1, 0) AS status
+            FROM
+                websit_user a
+                    LEFT JOIN admin_websit b ON a.websit_id = b.websit_id
+                    LEFT JOIN `user` c ON a.user_id = c.user_id
+                    LEFT JOIN worker_sign_confirm d ON b.belong_company_code = d.belong_company_code AND a.worker_number = d.worker_number
+            WHERE
+                a.examine_status IN ('OK', 'EXPIRED')
+              AND b.attr = 'SELF'
+            GROUP BY
+                b.belong_company_code,
+                a.worker_number
+        )a WHERE a.status = 1
     </select>
     <select id="workerSignConfirmManualPage"
             resultType="com.gree.mall.manager.bean.worker.WorkerElecConfirmManualVO">
@@ -1706,6 +1708,7 @@
         FROM
             worker_sign_confirm_manual a
         ${ex.query}
+        AND a.status IN ('WAIT')
         <if test="ex.orderBy == null or ex.orderBy ==''">
             ORDER BY a.create_time DESC
         </if>