|
|
@@ -17,6 +17,7 @@ import org.dromara.common.core.constant.DefaultConstants;
|
|
|
import org.dromara.common.core.domain.R;
|
|
|
import org.dromara.common.core.domain.model.ResultInfo;
|
|
|
import org.dromara.common.core.enums.CardOperateEnum;
|
|
|
+import org.dromara.common.core.enums.CardStatusEnum;
|
|
|
import org.dromara.common.core.enums.ResultCodeEnum;
|
|
|
import org.dromara.common.core.exception.ApiException;
|
|
|
import org.dromara.common.message.kafka.aop.annotation.SyncDataToLocal;
|
|
|
@@ -156,7 +157,7 @@ public class CardApiController extends BaseController {
|
|
|
PtCardBo bo = new PtCardBo();
|
|
|
bo.setCardId(ObjUtil.isNotEmpty(initParam.get("cardId")) ? Long.parseLong(initParam.get("cardId").toString()) : null);
|
|
|
bo.setUserId(ObjUtil.isNotEmpty(initParam.get("userId")) ? Long.parseLong(initParam.get("userId").toString()) : 0);
|
|
|
- bo.setCardType(ObjUtil.isNotEmpty(initParam.get("cardTypeId")) ? Long.parseLong(initParam.get("cardTypeId").toString()) : 0);
|
|
|
+ bo.setCardType(ObjUtil.isNotEmpty(initParam.get("cardTypeId")) ? Long.parseLong(initParam.get("cardTypeId").toString()) : 1);
|
|
|
bo.setLifespan(ObjUtil.isNotEmpty(initParam.get("expiryDate")) ? DateUtil.parse(initParam.get("expiryDate").toString(),
|
|
|
DefaultConstants.DATE_TIME_FORMAT) : null);
|
|
|
bo.setFactoryId(ObjUtil.isNotEmpty(initParam.get("factoryFixId")) ? Long.parseLong(initParam.get("factoryFixId").toString()) : 0);
|
|
|
@@ -173,6 +174,7 @@ public class CardApiController extends BaseController {
|
|
|
} else {
|
|
|
bo.setOperateType(CardOperateEnum.ISSUE);
|
|
|
}
|
|
|
+ bo.setStatus(CardStatusEnum.NORMAL.code().toString());
|
|
|
bo.setStationNumb(ObjUtil.isNotEmpty(initParam.get("workStationNumb")) ? Long.parseLong(initParam.get("workStationNumb").toString()) : 0);
|
|
|
bo.setTenantId(ObjUtil.isNotEmpty(initParam.get("tenantId")) ? initParam.get("tenantId").toString() : defaultTenantId);
|
|
|
bo.setOldCardNo(ObjUtil.isNotEmpty(initParam.get("oldCardNo")) ? Long.parseLong(initParam.get("oldCardNo").toString()) : 0);
|