bugfix

src/main/java/com/caimei365/commodity/model/po/ProcurePo.java

@@ -56,4 +56,8 @@ public class ProcurePo {
      * 是否删除 0 未删除 其他删除
      */
     private String delFlag;
+    /**
+     * 机构名称
+     */
+    private String clubName;
 }

src/main/java/com/caimei365/commodity/service/impl/AdditionalService.java

@@ -2,12 +2,12 @@ package com.caimei365.commodity.service.impl;
 
 import com.caimei365.commodity.mapper.AdditionalRepository;
 import com.caimei365.commodity.model.po.AdditionalPo;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.util.List;
 
 /**
@@ -19,13 +19,17 @@ import java.util.List;
 @Service
 public class AdditionalService {
 
-    @Autowired private AdditionalRepository additionalRepository;
-    @Autowired private MongoTemplate mongoTemplate;
+    @Resource
+    private AdditionalRepository additionalRepository;
+    @Resource
+    private MongoTemplate mongoTemplate;
+
     /**
      * 保存
+     *
      * @param additional
      */
-    public void save(AdditionalPo additional){
+    public void save(AdditionalPo additional) {
         //如果需要自定义主键，可以在这里指定主键；如果不指定主键，MongoDB会自动生成主键
         //设置一些默认初始值。。。
         //调用dao
@@ -34,60 +38,67 @@ public class AdditionalService {
 
     /**
      * 修改
+     *
      * @param additional
      */
-    public void update(AdditionalPo additional){
+    public void update(AdditionalPo additional) {
         //调用dao
         additionalRepository.save(additional);
     }
 
     /**
      * 根据id删除
+     *
      * @param id
      */
-    public void deleteById(String id){
+    public void deleteById(String id) {
         //调用dao
         additionalRepository.deleteById(id);
     }
 
     /**
      * 根据条件删除
+     *
      * @param additional
      */
-    public void deleteByParams(AdditionalPo additional){
+    public void deleteByParams(AdditionalPo additional) {
         //调用dao
         additionalRepository.delete(additional);
     }
 
     /**
      * 查询所有
+     *
      * @return
      */
-    public List<AdditionalPo> findList(){
+    public List<AdditionalPo> findList() {
         //调用dao
         return additionalRepository.findAll();
     }
+
     /**
      * 根据id查询
+     *
      * @param id
      * @return
      */
-    public AdditionalPo findById(String id){
+    public AdditionalPo findById(String id) {
         //调用dao
         return additionalRepository.findById(id).get();
     }
 
     /**
      * 根据主集采Id查询
+     *
      * @param procureId
      * @return
      */
-    public List<AdditionalPo> findProcureById(String procureId){
+    public List<AdditionalPo> findProcureById(String procureId) {
         //调用dao
         Query query = new Query();
         query.addCriteria(Criteria.where("procureId").is(procureId));
         query.addCriteria(Criteria.where("delFlag").is("0"));
-        return mongoTemplate.find(query,AdditionalPo.class);
+        return mongoTemplate.find(query, AdditionalPo.class);
     }
 
 }

src/main/java/com/caimei365/commodity/service/impl/ProcureService.java

@@ -2,15 +2,16 @@ package com.caimei365.commodity.service.impl;
 
 import com.caimei365.commodity.mapper.ProcureRepository;
 import com.caimei365.commodity.model.po.ProcurePo;
-import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.PageImpl;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.mongodb.core.MongoTemplate;
-import org.springframework.data.mongodb.core.aggregation.Aggregation;
-import org.springframework.data.mongodb.core.aggregation.LookupOperation;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.util.List;
 
 /**
@@ -22,15 +23,18 @@ import java.util.List;
 @Service
 public class ProcureService {
 
-    @Autowired private ProcureRepository procureRepository;
-    @Autowired private MongoTemplate mongoTemplate;
+    @Resource
+    private ProcureRepository procureRepository;
+    @Resource
+    private MongoTemplate mongoTemplate;
 
 
     /**
      * 保存
+     *
      * @param procure
      */
-    public void save(ProcurePo procure){
+    public void save(ProcurePo procure) {
         //如果需要自定义主键，可以在这里指定主键；如果不指定主键，MongoDB会自动生成主键
         //设置一些默认初始值。。。
         //调用dao
@@ -39,47 +43,55 @@ public class ProcureService {
 
     /**
      * 修改
+     *
      * @param procure
      */
-    public void update(ProcurePo procure){
+    public void update(ProcurePo procure) {
         //调用dao
         procureRepository.save(procure);
     }
 
     /**
      * 根据id删除
+     *
      * @param id
      */
-    public void deleteById(String id){
+    public void deleteById(String id) {
         //调用dao
         procureRepository.deleteById(id);
     }
 
     /**
      * 查询所有集采
+     *
      * @return
      */
-    public List<ProcurePo> findList(int pageNo, int pageSize){
+    public List<ProcurePo> findList(int pageNo, int pageSize) {
         //调用dao
+        Pageable pageable = PageRequest.of(pageNo, pageSize);
         Query query = new Query();
         query.addCriteria(Criteria.where("delFlag").is("0"));
         query.with(Sort.by(Sort.Direction.DESC, "saveTime"));
-        query.limit(pageSize);
-        query.skip(pageSize * (pageNo - 1));
-        return mongoTemplate.find(query, ProcurePo.class);
+        List<ProcurePo> procurePos = mongoTemplate.find(query.with(pageable), ProcurePo.class);
+//        long count1 = mongoTemplate.count(query, ProcurePo.class);
+//        PageImpl<ProcurePo> procurePos1 = new PageImpl<>(procurePos, pageable, count1);
+        return procurePos;
     }
+
     /**
      * 根据id查询
+     *
      * @param id
      * @return
      */
-    public ProcurePo findById(String id){
+    public ProcurePo findById(String id) {
         //调用dao
         return procureRepository.findById(id).get();
     }
 
     /**
      * 我参与的集采
+     *
      * @param userId
      * @return
      */
@@ -98,6 +110,7 @@ public class ProcureService {
 
     /**
      * 我发起的集采
+     *
      * @param userId
      * @return
      */

src/main/java/com/caimei365/commodity/service/impl/ProcurementServiceImpl.java

@@ -36,8 +36,8 @@ public class ProcurementServiceImpl implements ProcurementService {
     // 发起与参与关联
     @Resource AdditionalService additionalService;
 
-    private static SimpleDateFormat saveFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-    private static SimpleDateFormat returnFormat = new SimpleDateFormat("yyyy-MM-dd");
+    private static final SimpleDateFormat saveFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+    private static final SimpleDateFormat returnFormat = new SimpleDateFormat("yyyy-MM-dd");
 
     /**
      * 所有集采