feats

src/main/java/com/njyunzhi/pet_identity/controller/TaApplicationController.java

@@ -8,6 +8,7 @@ import com.njyunzhi.pet_identity.entity.*;
 import com.njyunzhi.pet_identity.service.ITaCardNoService;
 import com.njyunzhi.pet_identity.service.ITaOrderService;
 import com.njyunzhi.pet_identity.service.ITaPetIdentityService;
+import com.njyunzhi.pet_identity.vo.ApplicationParams;
 import com.njyunzhi.pet_identity.vo.AuditParam;
 import com.njyunzhi.pet_identity.vo.MakeCardParam;
 import io.swagger.annotations.Api;
@@ -95,53 +96,28 @@ public class TaApplicationController extends BaseController {
         SysUser sysUser = currentUser();
 
         IPage<TaApplication> pg = new Page<>(pageNum, pageSize);
-        QueryWrapper<TaApplication> queryWrapper = new QueryWrapper<>();
-        queryWrapper.gt("status", Constants.STATUS_DELETE);
-        queryWrapper.eq(!StringUtils.isEmpty(applyType), "apply_type", applyType);
-        queryWrapper.eq(null != applyMethod, "apply_method", applyMethod);
-        queryWrapper.eq(null != status, "status", status);
-        queryWrapper.eq(null != payStatus, "pay_status", payStatus);
-        queryWrapper.eq(null != verifyStatus, "verify_status", verifyStatus);
-        queryWrapper.eq(null != isOrg, "is_org", isOrg);
-        queryWrapper.like(!StringUtils.isEmpty(orgName), "org_name", "%" + orgName + "%");
-        queryWrapper.like(!StringUtils.isEmpty(personName), "person_name", "%" + personName + "%");
-        queryWrapper.like(!StringUtils.isEmpty(phone), "phone", "%" + phone + "%");
-        queryWrapper.like(!StringUtils.isEmpty(petName), "pet_name", "%" + petName + "%");
-        queryWrapper.like(!StringUtils.isEmpty(originCardNo), "origin_card_no", "%" + originCardNo + "%");
-        queryWrapper.ge(!StringUtils.isEmpty(applyStart), "create_date", applyStart);
-        queryWrapper.le(!StringUtils.isEmpty(applyEnd), "create_date", applyEnd);
-        queryWrapper.ge(!StringUtils.isEmpty(auditStart), "verify_date", auditStart);
-        queryWrapper.le(!StringUtils.isEmpty(auditEnd), "verify_date", auditEnd);
-        queryWrapper.ge(!StringUtils.isEmpty(makeStart), "make_date", makeStart);
-        queryWrapper.le(!StringUtils.isEmpty(makeEnd), "make_date", makeEnd);
-
-        if (Constants.WORKFLOW_PROCESS_AUDIT == process) {
-            // 过滤待审批列表
-            queryWrapper.in("status", new Integer[] { Constants.WORKFLOW_STATUS_PROCESSING, Constants.WORKFLOW_STATUS_AUDIT });
-        } else if (Constants.WORKFLOW_PROCESS_MADE == process) {
-            // 过滤待制卡列表
-            // 必须是审核通过的, 且是初次提审或者挂失补办的
-            queryWrapper.in("status", new Integer[] { Constants.WORKFLOW_STATUS_AUDIT, Constants.WORKFLOW_STATUS_MADE });
-            queryWrapper.eq("verify_Status", Constants.AUDIT_STATUS_PASSED);
-            queryWrapper.in("apply_type", new String[] { Constants.APPLY_TYPE_FIRST,  Constants.APPLY_TYPE_REISSUE});
-        }
 
-//        // 审核人角色
-//        if (Constants.USER_AUDITOR.equals(sysUser.getRoleName())) {
-//            queryWrapper.ge("status", Constants.WORKFLOW_STATUS_PROCESSING);
-//            queryWrapper.le("status", Constants.WORKFLOW_STATUS_AUDIT);
-//        }
-//
-//        // 发证(制卡)人角色
-//        if (Constants.USER_MAKER.equals(sysUser.getRoleName())) {
-//            queryWrapper.ge("status", Constants.WORKFLOW_STATUS_AUDIT);
-//            queryWrapper.le("status", Constants.WORKFLOW_STATUS_MADE);
-//        }
-
-        queryWrapper.orderByAsc("status");
-        queryWrapper.orderByDesc("create_date");
-
-        IPage<TaApplication> result = iTaApplicationService.page(pg, queryWrapper);
+        ApplicationParams params = new ApplicationParams();
+        params.setProcess(process);
+        params.setApplyStart(applyStart);
+        params.setApplyEnd(applyEnd);
+        params.setAuditStart(auditStart);
+        params.setAuditEnd(auditEnd);
+        params.setMakeStart(makeStart);
+        params.setMakeEnd(makeEnd);
+        params.setApplyType(applyType);
+        params.setApplyMethod(applyMethod);
+        params.setPayStatus(payStatus);
+        params.setVerifyStatus(verifyStatus);
+        params.setPersonName(personName);
+        params.setPhone(phone);
+        params.setPetName(petName);
+        params.setOriginCardNo(originCardNo);
+        params.setIsOrg(isOrg);
+        params.setOrgName(orgName);
+        params.setStatus(status);
+
+        IPage<TaApplication> result = iTaApplicationService.getPageBy(pg, params);
         return ResponseBean.success(result);
     }
 

src/main/java/com/njyunzhi/pet_identity/mapper/TaApplicationMapper.java

@@ -1,8 +1,11 @@
 package com.njyunzhi.pet_identity.mapper;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.njyunzhi.pet_identity.entity.TaApplication;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njyunzhi.pet_identity.vo.ApplicationParams;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
@@ -15,4 +18,5 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface TaApplicationMapper extends BaseMapper<TaApplication> {
 
+    IPage<TaApplication> getPageBy(IPage<TaApplication> pg, @Param("params") ApplicationParams params);
 }

src/main/java/com/njyunzhi/pet_identity/service/ITaApplicationService.java

@@ -1,7 +1,9 @@
 package com.njyunzhi.pet_identity.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.njyunzhi.pet_identity.entity.TaApplication;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.njyunzhi.pet_identity.vo.ApplicationParams;
 
 import java.time.LocalDateTime;
 
@@ -18,4 +20,6 @@ public interface ITaApplicationService extends IBaseService<TaApplication> {
     int countBetween(LocalDateTime dayStart, LocalDateTime dayEnd);
 
     Integer getTotalCharge(TaApplication taApplication);
+
+    IPage<TaApplication> getPageBy(IPage<TaApplication> pg, ApplicationParams params);
 }

src/main/java/com/njyunzhi/pet_identity/service/impl/TaApplicationServiceImpl.java

@@ -1,6 +1,7 @@
 package com.njyunzhi.pet_identity.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.njyunzhi.pet_identity.common.Constants;
 import com.njyunzhi.pet_identity.entity.SysSetting;
 import com.njyunzhi.pet_identity.entity.TaApplication;
@@ -8,6 +9,7 @@ import com.njyunzhi.pet_identity.mapper.SysSettingMapper;
 import com.njyunzhi.pet_identity.mapper.TaApplicationMapper;
 import com.njyunzhi.pet_identity.service.ITaApplicationService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.njyunzhi.pet_identity.vo.ApplicationParams;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -55,4 +57,9 @@ public class TaApplicationServiceImpl extends BaseServiceImpl<TaApplicationMappe
 
         return fee1 + fee2;
     }
+
+    @Override
+    public IPage<TaApplication> getPageBy(IPage<TaApplication> pg, ApplicationParams params) {
+        return baseMapper.getPageBy(pg, params);
+    }
 }

src/main/java/com/njyunzhi/pet_identity/vo/ApplicationParams.java

@@ -0,0 +1,64 @@
+package com.njyunzhi.pet_identity.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("办证申请查询条件")
+public class ApplicationParams {
+
+    @ApiModelProperty("表单进度")
+    Integer process;
+
+    @ApiModelProperty("申请开始时间")
+    String applyStart;
+
+    @ApiModelProperty("申请结束时间")
+    String applyEnd;
+
+    @ApiModelProperty("审核开始时间")
+    String auditStart;
+
+    @ApiModelProperty("审核结束时间")
+    String auditEnd;
+
+    @ApiModelProperty("发证开始时间")
+    String makeStart;
+
+    @ApiModelProperty("发证结束时间")
+    String makeEnd;
+
+    @ApiModelProperty("申请类型")
+    String applyType;
+
+    @ApiModelProperty("申领方式")
+    Integer applyMethod;
+
+    @ApiModelProperty("付款状态")
+    Integer payStatus;
+
+    @ApiModelProperty("审核状态")
+    Integer verifyStatus;
+
+    @ApiModelProperty("犬主")
+    String personName;
+
+    @ApiModelProperty("手机号")
+    String phone;
+
+    @ApiModelProperty("犬名")
+    String petName;
+
+    @ApiModelProperty("卡号")
+    String originCardNo;
+
+    @ApiModelProperty("是否企业")
+    Boolean isOrg;
+
+    @ApiModelProperty("企业名称")
+    String orgName;
+
+    @ApiModelProperty("状态")
+    Integer status;
+}

src/main/resources/mapper/TaApplicationMapper.xml

@@ -2,4 +2,80 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.njyunzhi.pet_identity.mapper.TaApplicationMapper">
 
+    <select id="getPageBy" resultType="com.njyunzhi.pet_identity.entity.TaApplication">
+        SELECT
+            t.*
+        FROM
+            ta_application t
+        WHERE
+            t.`status` &gt; - 1
+          <if test="null != params.applyType and '' != params.applyType">
+              AND t.apply_type = #{params.applyType}
+          </if>
+        <if test="null != params.applyMethod and '' != params.applyMethod">
+            AND t.apply_method = #{params.applyMethod}
+        </if>
+        <if test="null != params.status">
+            AND t.`status` = #{params.status}
+        </if>
+        <if test="null != params.payStatus">
+            AND t.pay_status = #{params.payStatus}
+        </if>
+        <if test="null != params.verifyStatus">
+            AND t.verify_status = #{params.verifyStatus}
+        </if>
+        <if test="null != params.isOrg and params.isOrg">
+            AND t.is_org = 1
+        </if>
+        <if test="null != params.orgName and '' != params.orgName">
+            AND t.org_name LIKE CONCAT( '%', #{params.orgName}, '%' )
+        </if>
+        <if test="null != params.personName and '' != params.personName">
+            AND t.person_name LIKE CONCAT( '%', #{params.personName}, '%' )
+        </if>
+        <if test="null != params.phone and '' != params.phone">
+            AND t.phone LIKE CONCAT( '%', #{params.phone}, '%' )
+        </if>
+        <if test="null != params.petName and '' != params.petName">
+            AND t.pet_name LIKE CONCAT( '%', #{params.petName}, '%' )
+        </if>
+        <if test="null != params.originCardNo and '' != params.originCardNo">
+            AND t.origin_card_no LIKE CONCAT( '%', #{params.originCardNo}, '%' )
+        </if>
+        <if test="null != params.applyStart and '' != params.applyStart">
+            AND t.create_date &gt;= #{params.applyStart}
+        </if>
+        <if test="null != params.applyEnd and '' != params.applyEnd">
+            AND t.create_date &lt;= #{params.applyEnd}
+        </if>
+        <if test="null != params.auditStart and '' != params.auditStart">
+            AND t.verify_date &gt;= #{params.auditStart}
+        </if>
+        <if test="null != params.auditEnd and '' != params.auditEnd">
+            AND t.verify_date &lt;= #{params.auditEnd}
+        </if>
+        <if test="null != params.makeStart and '' != params.makeStart">
+            AND t.make_date &gt;= #{params.makeStart}
+        </if>
+        <if test="null != params.makeEnd and '' != params.makeEnd">
+            AND t.make_date &lt;= #{params.makeEnd}
+        </if>
+        <if test="null != params.process and 1 == params.process">
+            AND t.`status` IN ( 1, 2 )
+            AND NOT EXISTS (
+                SELECT * FROM ta_pet_identity a WHERE t.origin_card_no = a.card_no AND a.`status` != 1
+            )
+        </if>
+        <if test="null != params.process and 2 == params.process">
+            AND t.`status` IN ( 2, 3 )
+            AND t.verify_status = 1
+            AND t.apply_type IN ( 'first', 'reissue' )
+            AND NOT EXISTS (
+                SELECT * FROM ta_pet_identity a WHERE t.origin_card_no = a.card_no AND a.`status` != 1
+            )
+        </if>
+        ORDER BY
+            t.`status` ASC,
+            t.create_date DESC
+    </select>
 </mapper>