feats

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

                                           @ApiParam("犬主") @RequestParam(value ="personName", required = false) String personName,
                                           @ApiParam("手机号") @RequestParam(value ="phone", required = false) String phone,
                                           @ApiParam("犬名") @RequestParam(value ="petName", required = false) String petName,
-                                          @ApiParam("卡号") @RequestParam(value ="originCardNo", required = false) String originCardNo,
+                                          @ApiParam("卡号") @RequestParam(value ="cardNo", required = false) String cardNo,
                                           @ApiParam("是否企业") @RequestParam(value ="isOrg", required = false) Boolean isOrg,
                                           @ApiParam("企业名称") @RequestParam(value ="orgName", required = false) String orgName,
                                           @ApiParam("状态") @RequestParam(value ="status", required = false) Integer status) throws Exception{
         params.setPersonName(personName);
         params.setPhone(phone);
         params.setPetName(petName);
-        params.setOriginCardNo(originCardNo);
+        params.setCardNo(cardNo);
         params.setIsOrg(isOrg);
         params.setOrgName(orgName);
         params.setStatus(status);
             return ResponseBean.error("请先完善个人信息");
         }
 
+        // 如果有提交记录
+        List<TaApplication> applicationList = iTaApplicationService.getNormalApplication(taApplication.getPetId());
+        if (null != applicationList && applicationList.size() > 0) {
+            return ResponseBean.error("当前狗狗已有申请在处理");
+        }
+
         taApplication.setPersonId(taPerson.getPersonId());
         taApplication.setPersonName(taPerson.getNickName());
         taApplication.setPhone(taPerson.getPhone());
                 return ResponseBean.error("未找到原始证件信息");
             }
 
+            // 原始申请记录
+            TaApplication origin = iTaApplicationService.getLastApplication(taApplication.getPetId());
+            if (null == origin) {
+                return ResponseBean.error("系统未找到上次申请记录");
+            }
+            taApplication.setOriginApplyId(origin.getApplyId());
+
+            if (!taApplication.getOriginCardNo().equals(origin.getCardNo())) {
+                return ResponseBean.error("原始证件信息校验异常");
+            }
+
             // 续期不需要缴费, 直接状态位待审核
             taApplication.setStatus(Constants.WORKFLOW_STATUS_PROCESSING);
         } else if (Constants.APPLY_TYPE_REISSUE.equals(taApplication.getApplyType())) {
                 return ResponseBean.error("未找到原始证件信息");
             }
 
+            // 原始申请记录
+            TaApplication origin = iTaApplicationService.getLastApplication(taApplication.getPetId());
+            if (null == origin) {
+                return ResponseBean.error("系统未找到上次申请记录");
+            }
+            taApplication.setOriginApplyId(origin.getApplyId());
+
+            if (!taApplication.getOriginCardNo().equals(origin.getOriginCardNo())) {
+                return ResponseBean.error("原始证件信息校验异常");
+            }
+
             // 直接将原卡置为挂失
             taPetIdentity.setStatus(Constants.CARD_STATUS_LOSS);
             if (!iTaPetIdentityService.updateById(taPetIdentity)) {
                 // 不需要缴费
                 taApplication.setStatus(Constants.WORKFLOW_STATUS_PROCESSING);
             }
-
         } else {
             // 当前狗狗是否存在证件
             TaPetIdentity origin = iTaPetIdentityService.getByPet(taApplication.getPetId(), taApplication.getPersonId());
             if (Constants.PAY_STATUS_PAID == taApplication.getPayStatus()) {
                 iTaOrderService.refundByApplication(taApplication);
             }
+
+            // 驳回, 意味着流程结束
+            taApplication.setProcessingDone(true);
         }
 
         taApplication.setVerifyStatus(auditParam.getVerifyStatus());
                 taApplication.setStatus(Constants.WORKFLOW_STATUS_MADE);
                 taApplication.setMakeStatus(Constants.MAKE_STATUS_MADE);
             }
+
+            // 续期, 不需要制卡
+            taApplication.setCardNo(taApplication.getOriginCardNo());
+            taApplication.setProcessingDone(true);
         } else if (Constants.APPLY_TYPE_REISSUE.equals(taApplication.getApplyType())) {
             // 补办
 //            if (taApplication.getPayStatus() != Constants.PAY_STATUS_PAID) {
             }
         }
 
-        taApplication.setOriginCardNo(makeCardParam.getCardNo());
+        taApplication.setCardNo(makeCardParam.getCardNo());
         iTaApplicationService.updateById(taApplication);
         TaPetIdentity newCard = iTaPetIdentityService.createNewCard(taApplication, makeCardParam);
         return ResponseBean.success(newCard);
         taApplication.setTrackingType(makeCardParam.getTrackingType());
         taApplication.setTrackingNo(makeCardParam.getTrackingNo());
         taApplication.setStatus(Constants.WORKFLOW_STATUS_MADE);
+        taApplication.setProcessingDone(true);
 
-        TaPetIdentity taPetIdentity = iTaPetIdentityService.getExistBy("card_no", taApplication.getOriginCardNo(), false, true);
-        if (!taApplication.getApplyType().equals(Constants.APPLY_TYPE_REISSUE)) {
+        TaPetIdentity taPetIdentity = iTaPetIdentityService.getExistBy("card_no", taApplication.getCardNo(), false, true);
+        if (null != taPetIdentity) {
             // 新办 续期，都需要重置有效期
             iTaPetIdentityService.updateCardDate(taPetIdentity.getCardNo());
         }

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

                                 @ApiParam("犬主") @RequestParam(value ="personName", required = false) String personName,
                                 @ApiParam("手机号") @RequestParam(value ="phone", required = false) String phone,
                                 @ApiParam("是否企业") @RequestParam(value ="isOrg", required = false) Boolean isOrg,
-                                @ApiParam("企业名称") @RequestParam(value ="orgName", required = false) String orgName) throws Exception{
+                                @ApiParam("企业名称") @RequestParam(value ="orgName", required = false) String orgName,
+                                @ApiParam("状态") @RequestParam(value ="status", required = false) Integer status) throws Exception{
 
         IPage<TaPetIdentity> pg = new Page<>(pageNum, pageSize);
         QueryWrapper<TaPetIdentity> queryWrapper = new QueryWrapper<>();
         queryWrapper.like(!StringUtils.isEmpty(phone), "phone", "%" + phone + "%");
         queryWrapper.eq(null != isOrg, "is_org", isOrg);
         queryWrapper.like(!StringUtils.isEmpty(orgName), "org_name", "%" + orgName + "%");
-        queryWrapper.gt("status", Constants.STATUS_DELETE);
+        queryWrapper.gt(null == status, "status", Constants.STATUS_DELETE);
+        queryWrapper.eq(null != status, "status", status);
         queryWrapper.orderByDesc("create_date");
 
         IPage<TaPetIdentity> result = iTaPetIdentityService.page(pg, queryWrapper);

src/main/java/com/njyunzhi/pet_identity/entity/TaApplication.java

     /** 申请人手机;冗余 */
     @ApiModelProperty(value = "申请人手机",notes = "冗余")
     private String phone ;
+    /** 证件号 */
+    @ApiModelProperty(value = "证件号",notes = "")
+    private String cardNo ;
     /** 原始证件 */
     @ApiModelProperty(value = "原始证件",notes = "")
     private String originCardNo ;
     private String criminalInfo ;
     @ApiModelProperty(value = "处罚信息",notes = "")
     private String penaltyInfo ;
+
+    @ApiModelProperty(value = "是否流程结束",notes = "")
+    private Boolean processingDone;
+
+    @ApiModelProperty(value = "上次申请记录",notes = "")
+    private Integer originApplyId;
 }

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

 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * <p>
  * 我的申请 Mapper 接口
 public interface TaApplicationMapper extends BaseMapper<TaApplication> {
 
     IPage<TaApplication> getPageBy(IPage<TaApplication> pg, @Param("params") ApplicationParams params);
+
+    List<TaApplication> getNormalApplication(@Param("petId") String petId);
+
+    TaApplication getLastApplication(@Param("petId") String petId);
 }

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

 import com.njyunzhi.pet_identity.vo.ApplicationParams;
 
 import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  * <p>
     Integer getTotalCharge(TaApplication taApplication);
 
     IPage<TaApplication> getPageBy(IPage<TaApplication> pg, ApplicationParams params);
+
+    List<TaApplication> getNormalApplication(String petId);
+
+    TaApplication getLastApplication(String petId);
 }

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

 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  * <p>
     public IPage<TaApplication> getPageBy(IPage<TaApplication> pg, ApplicationParams params) {
         return baseMapper.getPageBy(pg, params);
     }
+
+    /**
+     * 获取狗子的正常申请记录
+     * @param personId
+     * @param petId
+     * @return
+     */
+    @Override
+    public List<TaApplication> getNormalApplication(String petId) {
+        return baseMapper.getNormalApplication(petId);
+    }
+
+    @Override
+    public TaApplication getLastApplication(String petId) {
+        return baseMapper.getLastApplication(petId);
+    }
 }

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

     String petName;
 
     @ApiModelProperty("卡号")
-    String originCardNo;
+    String cardNo;
 
     @ApiModelProperty("是否企业")
     Boolean isOrg;

src/main/resources/mapper/TaApplicationMapper.xml

         <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 test="null != params.cardNo and '' != params.cardNo">
+            AND t.card_no LIKE CONCAT( '%', #{params.cardNo}, '%' )
         </if>
         <if test="null != params.applyStart and '' != params.applyStart">
             AND t.create_date &gt;= #{params.applyStart}
         <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
+                SELECT * FROM ta_application a WHERE t.apply_id = a.origin_apply_id
             )
         </if>
         <if test="null != params.process and 2 == params.process">
             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
+                SELECT * FROM ta_application a WHERE t.apply_id = a.origin_apply_id
             )
         </if>
         ORDER BY
             t.`status` ASC,
             t.create_date DESC
     </select>
+    <select id="getNormalApplication" resultType="com.njyunzhi.pet_identity.entity.TaApplication">
+        SELECT
+            *
+        FROM
+            ta_application t
+        WHERE
+            t.pet_id = #{petId}
+            AND t.processing_done = 0
+    </select>
+    <select id="getLastApplication" resultType="com.njyunzhi.pet_identity.entity.TaApplication">
+        SELECT
+            *
+        FROM
+            ta_application t
+        WHERE
+            t.pet_id = #{petId}
+          AND t.processing_done = 1
+          AND t.`status` &gt; -1
+        HAVING 1
+        ORDER BY t.create_date DESC
+        LIMIT 1
+    </select>
 </mapper>