1.地铁盘查7.15提交

src/main/java/com/metro/entity/search/WarFruitSearch.java

@@ -1,6 +1,5 @@
 package com.metro.entity.search;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.metro.baseRe.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -8,7 +7,6 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.io.Serializable;
-import java.util.Date;
 
 /**
  */
@@ -18,12 +16,10 @@ import java.util.Date;
 public class WarFruitSearch extends BaseEntity implements Serializable {
 
     @ApiModelProperty(value = "开始时间")
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date startTime;
+    private String startTime;
 
     @ApiModelProperty(value = "结束时间")
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date endTime;
+    private String endTime;
 
     @ApiModelProperty(value = "派出所")
     private String companyId;

src/main/java/com/metro/entity/vo/WarningDetailOneVO.java

@@ -64,4 +64,10 @@ public class WarningDetailOneVO implements Serializable {
 
     @ApiModelProperty("健康码颜色")
     private String healthCode;
+
+    @ApiModelProperty("情况")
+    private String kind;
+
+    @ApiModelProperty("通过情况")
+    private String displayMsg;
 }

src/main/java/com/metro/service/impl/PassreCordsServiceImpl.java

@@ -304,10 +304,10 @@ public class PassreCordsServiceImpl extends BaseService implements PassreCordsSe
 //        }
         if(type == 2){
             wrapper.select(PassreCords.class,p ->!p.getColumn().equals("scene_photo"));
-            List<Integer> list = new ArrayList<>();
-            list.add(0);
-            list.add(1);
-            wrapper.in(PassreCords::getPass, list);
+//            List<Integer> list = new ArrayList<>();
+//            list.add(0);
+//            list.add(1);
+//            wrapper.in(PassreCords::getPass, list);
         }
 
         JPersonVO userInfo = jPersonsService.getUserInfo();

src/main/java/com/metro/service/impl/WarFruitServiceImpl.java

@@ -15,6 +15,7 @@ import com.metro.entity.vo.WarFruitTopVO;
 import com.metro.entity.vo.WarFruitVO;
 import com.metro.mapper.CompanysMapper;
 import com.metro.mapper.DataShowMapper;
+import com.metro.mapper.JPersonsMapper;
 import com.metro.mapper.WarFruitMapper;
 import com.metro.restful.ServiceException;
 import com.metro.service.CompanyService;
@@ -28,7 +29,6 @@ import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import java.net.URLEncoder;
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -48,6 +48,8 @@ public class WarFruitServiceImpl implements WarFruitService {
     @Resource
     private WarFruitMapper warFruitMapper;
     @Resource
+    private JPersonsMapper jPersonsMapper;
+    @Resource
     private CompanysMapper companysMapper;
     @Resource
     private CompanyService companyService;
@@ -87,15 +89,13 @@ public class WarFruitServiceImpl implements WarFruitService {
 
     @Override
     public WarFruitTopVO policeTop10(WarFruitSearch warFruitSearch) {
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         JPersonVO jPersonVO = this.rootTrue();
         PoliceSearch policeSearch = new PoliceSearch();
         policeSearch.setPageNum(0);
         policeSearch.setPageSize(10);
-        policeSearch.setStartTime(warFruitSearch.getStartTime() == null?null:sdf.format(warFruitSearch.getStartTime()));
-        policeSearch.setEndTime(warFruitSearch.getEndTime() == null?null:sdf.format(warFruitSearch.getStartTime()));
+        policeSearch.setStartTime(warFruitSearch.getStartTime());
+        policeSearch.setEndTime(warFruitSearch.getEndTime());
         policeSearch.setCompanyId(jPersonVO.getCompanyId() !=null ? jPersonVO.getCompanyId() : null);
-        policeSearch.setBranchId(jPersonVO.getBranchId() !=null ? jPersonVO.getBranchId() : null);
         /*如果是一级账号的话 可以传入派出所*/
         if(jPersonVO.getType() == 1 && StringUtils.isNotEmpty(warFruitSearch.getCompanyId())){
             policeSearch.setCompanyId(warFruitSearch.getCompanyId());
@@ -129,17 +129,18 @@ public class WarFruitServiceImpl implements WarFruitService {
     private IPage<WarFruitVO> policePageListType(PoliceSearch policeSearch ,Integer type){
          JPersonVO jPersonVO = jPersonsService.getUserInfo();
         if(jPersonVO.getType() == 3)policeSearch.setCardId(jPersonVO.getCardId());
-        if(jPersonVO.getType() == 1 && StringUtils.isNotEmpty(policeSearch.getCompanyId())){
-
-        }
-        else{
+        if(jPersonVO.getType() != 1){
             policeSearch.setCompanyId(jPersonVO.getCompanyId() !=null ? jPersonVO.getCompanyId() : null);
         }
-        policeSearch.setBranchId(jPersonVO.getBranchId() !=null ? jPersonVO.getBranchId() : null);
-        policeSearch.setType(type);//需要照片
-
+        policeSearch.setType(type);
         Page<WarFruitVO> page = new Page<>(policeSearch.getPageNum(),policeSearch.getPageSize());
         IPage<WarFruitVO> warFruitVOIPage = warFruitMapper.policePageList(page, policeSearch);
+//        /*type = 1 代表需要照片*/
+//        List<WarFruitVO> records = warFruitVOIPage.getRecords();
+//        List<String> collect = records.stream().map(WarFruitVO::getCardId).collect(Collectors.toList());//身份证列表
+//        jPersonsMapper.selectList(new LambdaQueryWrapper<JPersons>().in)
+
+
         return warFruitVOIPage;
     }
     @Override

src/main/resources/mapper/WarFruitMapper.xml

@@ -3,42 +3,32 @@
 <mapper namespace="com.metro.mapper.WarFruitMapper">
     <select id="policePageList" resultType="com.metro.entity.vo.WarFruitVO">
         select
-            p.xm,
-            p.card_id,
-            p.phone,
-            p.company_id,
+        Max(p.xm) as xm,
         <if test="policeSearch.type == 1">
-            p.photo,
+            Max(p.photo) as photo,
         </if>
-            b.number,
-            b.arrestNumber,
-            b.doubtNumber,
-            b.exceptionNumber
+        Max(p.phone) as phone,
+        Max(p.company_id) as companyId,
+        p.card_id,
+        SUM(b.number) as number,
+        SUM(b.arrest_number) as arrestNumber,
+        SUM(b.doubt_number) as doubtNumber,
+        SUM(b.pass_number) as passNumber,
+        SUM(b.exception_number) as exceptionNumber
         from j_persons p
-        LEFT JOIN (
-            SELECT
-            card_id,
-            SUM(number) as number,
-            SUM(arrest_number) as arrestNumber,
-            SUM(doubt_number) as doubtNumber,
-            SUM(pass_number) as passNumber,
-            SUM(exception_number) as exceptionNumber
-            FROM war_fruit
-            <where>
-                <if test="policeSearch.startTime !=null and policeSearch.startTime !=''">
-                    AND  <![CDATA[ date >= #{policeSearch.startTime}]]>
-                </if>
-                <if test="policeSearch.endTime !=null and policeSearch.endTime !=''">
-                    AND  <![CDATA[ date >= #{policeSearch.endTime}]]>
-                </if>
-            </where>
-            group by card_id
-        )b on p.card_id = b.card_id
+        LEFT JOIN  war_fruit b on p.card_id = b.card_id
         where
         p.company_id !='' and p.branch_id !=''
         <if test="policeSearch.companyId != null and policeSearch.companyId != '' ">
             AND  p.company_id = #{policeSearch.companyId}
         </if>
-        ORDER BY b.number desc
+        <if test="policeSearch.startTime !=null and policeSearch.startTime !=''">
+            AND  <![CDATA[ b.date >= #{policeSearch.startTime}]]>
+        </if>
+        <if test="policeSearch.endTime !=null and policeSearch.endTime !=''">
+            AND  <![CDATA[ b.date <= #{policeSearch.endTime}]]>
+        </if>
+        GROUP BY p.card_id
+        ORDER BY number desc
     </select>
 </mapper>