imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/mq/TaskWorkNode.java

@@ -512,8 +512,8 @@ public class TaskWorkNode {
                                         log.setRequestParam(jsonParam);
                                         log.setRequestUrl(instructionUrl);
                                         HttpEntity<String> formEntity = new HttpEntity<String>(jsonParam, headers);
-                                        //returnData = restTemplate.postForObject(instructionUrl, formEntity, String.class);
-                                        returnData = "{\"result\": \"true\"}";
+                                        returnData = restTemplate.postForObject(instructionUrl, formEntity, String.class);
+                                        //returnData = "{\"result\": \"true\"}";
 
 
 

imcs-admin-boot/imcs-business-biz/src/main/resources/mapper_business/base/operationManagementCenter/TTaskMapper.xml

@@ -562,7 +562,7 @@
                  GROUP BY complete_batch_no
              ) a
         WHERE a.endTime IS NOT NULL
-                  AND YEAR(a.endTime) = YEAR(CURDATE()) and count=4;
+                  AND YEAR(a.endTime) = YEAR(CURDATE()) and (count=4 or count=3);
     </select>
 
     <select id="getMonthProductCount" resultType="java.lang.Integer">
@@ -574,7 +574,7 @@
              ) a
         WHERE a.endTime IS NOT NULL
           AND WEEK(a.endTime, 1) = WEEK(CURDATE(), 1)
-          and count=4
+          and (count=4 or count=3)
     </select>
 
     <select id="getMinTool" resultType="com.github.zuihou.business.centralToolMagazine.entity.ToolCostomAddressHistory">