查当天发布动态数

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/SettledCompanyDynamicsController.java

@@ -97,6 +97,17 @@ public class SettledCompanyDynamicsController {
     public SettledCompanyDynamics getSettledCompanyDynamics(String id) {
         return settledCompanyDynamicsService.getSettledCompanyDynamics(id);
     }
+    /**
+     * 查看当天发布
+     *
+     * @param phone
+     * @return
+     */
+    @GetMapping("/count")
+    public Integer count(@RequestParam String phone) {
+        return settledCompanyDynamicsService.count(phone);
+    }
+
 
 
 }

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/ISettledCompanyDynamicsService.java

@@ -64,4 +64,11 @@ public interface ISettledCompanyDynamicsService extends IService<SettledCompanyD
      * @return
      */
     SettledCompanyDynamics getSettledCompanyDynamics(String id);
+
+    /**
+     * 查看当天发布条数
+     * @param phone
+     * @return
+     */
+    Integer count(String phone);
 }

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/PurchaseOrderServiceImpl.java

@@ -615,6 +615,17 @@ public class PurchaseOrderServiceImpl extends ServiceImpl<PurchaseOrderMapper, P
     @Override
     public PurchaseOrder getInfo(String id) {
        PurchaseOrder purchaseOrder=this.selectById(id);
+        ProcurementPlanInfo procurementPlanInfo = procurementPlanInfoService.selectById(purchaseOrder.getPlanId());
+        if (procurementPlanInfo != null) {
+            purchaseOrder.setProcurementPlanType(procurementPlanInfo.getProcurementPlanType());
+        }
+        String taskId = "";
+        // 只有待审核状态才有taskId
+        if (StringUtils.isNotBlank(purchaseOrder.getWorkflowId())) {
+            JSONObject jsonObject = workflowService.getActiveTask(Lists.newArrayList(purchaseOrder.getWorkflowId()), purchaseOrder.getId());
+            taskId = jsonObject.getString("taskId");
+            purchaseOrder.setTaskId(taskId);
+        }
        return purchaseOrder;
     }
 

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/SaleOrderServiceImpl.java

@@ -646,6 +646,17 @@ public class SaleOrderServiceImpl extends ServiceImpl<SaleOrderMapper, SaleOrder
     @Override
     public SaleOrder getInfo(String id) {
         SaleOrder saleOrder=this.selectById(id);
+        SalePlanInfo salePlanInfo=salePlanInfoService.selectById(saleOrder.getPlanId());
+        if (salePlanInfo!=null){
+            saleOrder.setSalePlanType(salePlanInfo.getSalePlanType());
+        }
+        String taskId = "";
+        // 只有待审核状态才有taskId
+        if (StringUtils.isNotBlank(saleOrder.getWorkflowId())) {
+            JSONObject jsonObject = workflowService.getActiveTask(Lists.newArrayList(saleOrder.getWorkflowId()), saleOrder.getId());
+            taskId = jsonObject.getString("taskId");
+            saleOrder.setTaskId(taskId);
+        }
         return saleOrder;
     }
 }

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/SettledCompanyDynamicsServiceImpl.java

@@ -16,10 +16,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
+import org.springframework.util.SimpleIdGenerator;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.text.SimpleDateFormat;
+import java.util.*;
 
 /**
  * <p>
@@ -176,6 +176,26 @@ public class SettledCompanyDynamicsServiceImpl extends ServiceImpl<SettledCompan
         return settledCompanyDynamics;
     }
 
+    /**
+     * 查看当天发布条数
+     * @param phone
+     * @return
+     */
+    @Override
+    public Integer count(String phone) {
+        //当天零点
+        SimpleDateFormat now = new SimpleDateFormat("yyyy-MM-dd 00:00:00");
+        Calendar c = Calendar.getInstance();
+        c.setTime(new Date());
+        c.add(Calendar.YEAR, 0);
+        Date y = c.getTime();
+        String year = now.format(y);
+        Integer count=this.selectCount(new EntityWrapper<SettledCompanyDynamics>()
+        .eq("phone",phone)
+        .ge("create_date",year));
+        return count;
+    }
+
     /**
      * 发布动态列表
      *

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/SettledCompanyInfoServiceImpl.java

@@ -355,7 +355,8 @@ public class SettledCompanyInfoServiceImpl extends ServiceImpl<SettledCompanyInf
     @Override
     public List<SettledCompanyInfo> companyList(SettledCompanyInfo settledCompanyInfo) {
         List<SettledCompanyInfo> settledCompanyInfoList = this.selectList(new EntityWrapper<SettledCompanyInfo>()
-        .eq("create_phone",settledCompanyInfo.getLoginPhone()));
+        .eq("create_phone",settledCompanyInfo.getLoginPhone())
+        .eq("status_flag","3"));
         return settledCompanyInfoList;
     }