Skip to content

G
gic-store
Commit ce4fdfd3 by 陶光胜
Options

Merge branch 'developer' into 'master' 

Developer

See merge request !17
parents cff242ba 03a02fa3
Showing with 188 additions and 26 deletions
gic-store-api/src/main/java/com/gic/store/constant/Constants.java
......@@ -11,7 +11,7 @@ public interface Constants {
Integer STORE_BATCH_IMPORT_TASK_TYPE = 6;
Integer CLERK_BATCH_IMPORT_TASK_TYPE = 8;
String dateformat = "YYYY-MM-dd HH:mm:ss";
String dateformat = "yyyy-MM-dd HH:mm:ss";
// enterprise:store:${enterpriseId}:#{storeId}
String STORE_KEY = "enterprise:store:";
// 小程序默认图片
......
gic-store-api/src/main/java/com/gic/store/constant/StoreFieldDateEnum.java
......@@ -7,10 +7,10 @@ package com.gic.store.constant;
* @date 2019/7/2 4:34 PM
*/
public enum StoreFieldDateEnum {
YMD(1, "年月日", "YYYY-MM-dd"),
YM(2, "年月", "YYYY-MM"),
YMD(1, "年月日", "yyyy-MM-dd"),
YM(2, "年月", "yyyy-MM"),
MD(3, "月日", "MM-dd"),
YMDHMS(4, "年月日时分秒", "YYYY-MM-dd HH:mm:ss"),
YMDHMS(4, "年月日时分秒", "yyyy-MM-dd HH:mm:ss"),
Hms(5, "时分秒", "HH:mm:ss");
private int code;
......
gic-store-api/src/main/java/com/gic/store/dto/StoreSearchDTO.java
......@@ -15,6 +15,7 @@ public class StoreSearchDTO implements Serializable {
private Integer enterpriseId;
private String storeIds;
private String storeInfoIds;
private String storeIdsOfNot;
private Integer storeBrandId;
private String searchJson;
private String authSearchJson;
......@@ -24,6 +25,7 @@ public class StoreSearchDTO implements Serializable {
private Integer currentPage=1;
private Integer pageSize=20;
private Integer storeTagId;
private Integer completeStatus;
public Integer getStoreGroupId() {
return storeGroupId;
......@@ -192,4 +194,22 @@ public class StoreSearchDTO implements Serializable {
public void setStoreTagId(Integer storeTagId) {
this.storeTagId = storeTagId;
}
public String getStoreIdsOfNot() {
return storeIdsOfNot;
}
public StoreSearchDTO setStoreIdsOfNot(String storeIdsOfNot) {
this.storeIdsOfNot = storeIdsOfNot;
return this;
}
public Integer getCompleteStatus() {
return completeStatus;
}
public StoreSearchDTO setCompleteStatus(Integer completeStatus) {
this.completeStatus = completeStatus;
return this;
}
}
gic-store-api/src/main/java/com/gic/store/service/ClerkApiService.java
......@@ -211,4 +211,14 @@ public interface ClerkApiService {
* @return com.gic.api.base.commons.ServiceResponse<java.lang.Void>


*/
ServiceResponse<Void> syncClerkToWeimob(Integer wmMallStoreId, String clerkIds, Integer enterpriseId);
/**
* @Title: syncClerkToWeimobWhenModify

* @Description: 导购增改时同步微盟任务

* @author guojuxing
* @param param

* @return com.gic.api.base.commons.ServiceResponse<java.lang.Void>


*/
ServiceResponse<Void> syncClerkToWeimobWhenModify(String param);
}
gic-store-api/src/main/java/com/gic/store/service/StoreApiService.java
......@@ -117,6 +117,15 @@ public interface StoreApiService {
ServiceResponse<StoreDTO> getStoreByStoreCode(Integer enterpriseId, Integer regionId, String storeCode);
/**
* 查询门店，包括营业时间数据
* @param enterpriseId
* @param regionId
* @param storeCode
* @return
*/
ServiceResponse<StoreDTO> getStoreContainBusinessTimeByStoreCode(Integer enterpriseId, Integer regionId, String storeCode);
/**
* @Title: validateFieldExceptRepeat
* @Description: 校验除 是否重复 外的所有条件
* @author zhiwj
......
gic-store-api/src/main/java/com/gic/store/service/StoreWidgetApiService.java
......@@ -2,9 +2,9 @@ package com.gic.store.service;
import com.gic.api.base.commons.Page;
import com.gic.api.base.commons.ServiceResponse;
import com.gic.store.dto.StoreBrandDTO;
import com.gic.store.dto.StoreDTO;
import com.gic.store.dto.StoreWidgetDTO;
import com.sun.imageio.plugins.common.I18N;
import java.util.List;
......@@ -58,10 +58,11 @@ public interface StoreWidgetApiService {
ServiceResponse<Page<Integer>> listStoreInfoIdByStoreWidgetId(Integer enterpriseId, Integer storeWidgetId, int pageNum, int pageSize);
ServiceResponse<List<Integer>> listStoreIdByStoreWidgetId(Integer enterpriseId, Integer storeWidgetId);
ServiceResponse<List<Integer>> listStoreInfoIdByStoreWidgetId(Integer enterpriseId, Integer storeWidgetId);
ServiceResponse<List<StoreBrandDTO>> listBrandIdByStoreWidgetId(Integer enterpriseId, Integer storeWidgetId);
/** @Description: 判断门店是否在门店控件里
* @author taogs
* @Date 11:03 2020/3/27
......
gic-store-service/src/main/java/com/gic/store/service/outer/impl/ClerkApiServiceImpl.java
......@@ -7,9 +7,11 @@ import com.gic.commons.util.CollectionUtil;
import com.gic.commons.util.EntityUtil;
import com.gic.commons.util.GICMQClientUtil;
import com.gic.enterprise.constants.Constants;
import com.gic.enterprise.dto.wm.WmStoreSyncLogDTO;
import com.gic.enterprise.error.ErrorCode;
import com.gic.enterprise.response.EnterpriseServiceResponse;
import com.gic.enterprise.service.EnterpriseApiService;
import com.gic.enterprise.service.WmStoreSyncLogApiService;
import com.gic.mq.sdk.GicMQClient;
import com.gic.store.constant.ClerkLogReasonEnum;
import com.gic.store.constant.ImportClerkBatchResultEnum;
......@@ -62,6 +64,8 @@ public class ClerkApiServiceImpl implements ClerkApiService {
private EnterpriseApiService enterpriseApiService;
@Autowired
private WeimobStoreSiteService weimobStoreSiteService;
@Autowired
private WmStoreSyncLogApiService wmStoreSyncLogApiService;
@Override
public ServiceResponse saveOrUpdate(ClerkDTO clerkDTO) {
......@@ -112,12 +116,16 @@ public class ClerkApiServiceImpl implements ClerkApiService {
clerkLogService.saveClerkLogBySaveClerk(clerkDTO.getEnterpriseId(), id, clerkDTO.getReason(),
clerkDTO.getRemark(), clerkDTO.getOperatorId(), clerkDTO.getOperatorName());
storeLogByAddClerk(clerkDTO);
synClerkInfoToWeimobMQ(clerkDTO);
} else {
TabClerk oldClerk = this.clerkService.getById(clerkDTO.getClerkId());
clerkService.update(clerkDTO);
clerkLogService.saveClerkLogByUpdateClerk(oldClerk, clerkDTO, clerkDTO.getEnterpriseId(),
clerkDTO.getClerkId(), clerkDTO.getReason(), clerkDTO.getRemark(), clerkDTO.getOperatorId(),
clerkDTO.getOperatorName());
synClerkInfoToWeimobMQ(clerkDTO);
}
return ServiceResponse.success(clerkDTO.getClerkId());
}
......@@ -666,9 +674,10 @@ public class ClerkApiServiceImpl implements ClerkApiService {
ClerkSearchDTO searchDTO = new ClerkSearchDTO();
searchDTO.setEnterpriseId(enterpriseId);
StringBuilder sb = new StringBuilder();
storeIdList.forEach(e -> sb.append(e).append(","));
storeIdList.forEach(e -> sb.append(e).append(" "));
searchDTO.setStoreIds(sb.toString());
ServiceResponse<Page<ClerkStoreListDTO>> pageResult = listClerk(enterpriseId, searchDTO, 0, storeIdList.size());
ServiceResponse<Page<ClerkStoreListDTO>> pageResult = listClerk(enterpriseId, searchDTO, 1, storeIdList.size());
logger.info("同步门店-同步导购-查询导购数据结果:{}", JSONObject.toJSONString(pageResult));
if (pageResult.isSuccess()) {
Page<ClerkStoreListDTO> page = pageResult.getResult();
if (page != null) {
......@@ -702,6 +711,7 @@ public class ClerkApiServiceImpl implements ClerkApiService {
String wmMallStoreId = jsonObject.getString("wmMallStoreId");
String wmGuiderDTOStr = (String) jsonObject.get("wmGuiderDTO");
WeimobGuiderSynDTO wmGuiderDTO = JSONObject.parseObject(wmGuiderDTOStr, WeimobGuiderSynDTO.class);
logger.info("异步导购微盟放入参数:{}", JSONObject.toJSONString(wmGuiderDTO));
ServiceResponse<Void> result = weimobStoreSiteService.addWeimobGuider(Integer.parseInt(wmMallStoreId),
Integer.parseInt(enterpriseId), wmGuiderDTO);
logger.info("异步导购结果：code:{}, message:{}", result.getCode(), result.getMessage());
......@@ -721,7 +731,7 @@ public class ClerkApiServiceImpl implements ClerkApiService {
if (CollectionUtils.isNotEmpty(storeInfoIdList)) {
StoreSearchDBDTO storeSearchDBDTO = new StoreSearchDBDTO();
storeSearchDBDTO.setStoreInfoIdList(storeInfoIdList);
com.github.pagehelper.Page<StoreDTO> storePage = storeService.listStore(storeSearchDBDTO, 0, storeInfoIdList.size());
com.github.pagehelper.Page<StoreDTO> storePage = storeService.listStore(storeSearchDBDTO, 1, storeInfoIdList.size());
if (storePage != null) {
List<StoreDTO> storeList = storePage.getResult();
if (CollectionUtils.isNotEmpty(storeList)) {
......@@ -744,6 +754,49 @@ public class ClerkApiServiceImpl implements ClerkApiService {
return ServiceResponse.success();
}
@Override
public ServiceResponse<Void> syncClerkToWeimobWhenModify(String param) {
JSONObject jsonObject = JSONObject.parseObject(param);
String clerkInfo = jsonObject.getString("clerkInfo");
ClerkDTO clerkDTO = JSONObject.parseObject(clerkInfo, ClerkDTO.class);
ServiceResponse<StoreDTO> storeResult = storeApiService
.getStoreByStoreInfoId(clerkDTO.getEnterpriseId(), clerkDTO.getStoreInfoId());
if (storeResult.isSuccess()) {
StoreDTO storeDTO = storeResult.getResult();
ServiceResponse<List<WmStoreSyncLogDTO>> wmStoreListResult = wmStoreSyncLogApiService
.listByStoreId(storeDTO.getStoreId(), storeDTO.getEnterpriseId());
if (wmStoreListResult.isSuccess()) {
WeimobGuiderSynDTO weimobGuiderSynDTO = new WeimobGuiderSynDTO();
weimobGuiderSynDTO.setStoreNumber(storeDTO.getStoreCode());
weimobGuiderSynDTO.setClerkId(clerkDTO.getClerkId());
weimobGuiderSynDTO.setGuiderName(clerkDTO.getClerkName());
weimobGuiderSynDTO.setGuiderPhone(clerkDTO.getPhoneNumber());
weimobGuiderSynDTO.setJobNumber(clerkDTO.getClerkCode());
weimobGuiderSynDTO.setStoreInfoId(clerkDTO.getStoreInfoId());
List<WmStoreSyncLogDTO> wmStoreLog = wmStoreListResult.getResult();
wmStoreLog.forEach(storeLog -> {
ServiceResponse<Boolean> isExitClerkResult = weimobStoreSiteService
.isExitClerk(storeLog.getWmMallStoreId(), clerkDTO.getPhoneNumber());
if (isExitClerkResult.isSuccess()) {
ServiceResponse<Void> weimobResult;
if (isExitClerkResult.getResult()) {
//如果存在了，则是更新操作
weimobResult = weimobStoreSiteService
.updateWeimobGuider(storeLog.getWmMallStoreId(), storeLog.getEnterpriseId(), weimobGuiderSynDTO);
} else {
//新增操作
weimobResult = weimobStoreSiteService
.addWeimobGuider(storeLog.getWmMallStoreId(), storeLog.getEnterpriseId(), weimobGuiderSynDTO);
}
logger.warn("导购增改微盟返回结果:{}", JSONObject.toJSONString(weimobResult));
}
});
}
}
return ServiceResponse.success();
}
private void asynClerkInfoToWeimobMQ(Integer wmMallStoreId, Integer enterpriseId, WeimobGuiderSynDTO wmGuiderDTO) {
GicMQClient client = GICMQClientUtil.getClientInstance();
Map<String, Object> params = new HashMap<>(4);
......@@ -751,7 +804,6 @@ public class ClerkApiServiceImpl implements ClerkApiService {
params.put("wmMallStoreId", wmMallStoreId);
params.put("wmGuiderDTO", JSONObject.toJSONString(wmGuiderDTO));
logger.info("异步导购微盟放入参数:{}", JSONObject.toJSONString(params));
try {
client.sendMessage("tmpClerkToWeimob", JSONObject.toJSONString(params));
} catch (Exception e) {
......@@ -764,4 +816,17 @@ public class ClerkApiServiceImpl implements ClerkApiService {
return ServiceResponse.failure(error.getCode(), error.toString());
}
private void synClerkInfoToWeimobMQ(ClerkDTO powerClerkDTO) {
GicMQClient client = GICMQClientUtil.getClientInstance();
Map<String, Object> params = new HashMap<>(4);
params.put("clerkInfo", JSONObject.toJSONString(powerClerkDTO));
try {
logger.info("导购增改微盟参数:{}", JSONObject.toJSONString(params));
client.sendMessage("synClerkInfoToWeimobMq", JSONObject.toJSONString(params));
} catch (Exception e) {
e.printStackTrace();
}
}
}
\ No newline at end of file
gic-store-service/src/main/java/com/gic/store/service/outer/impl/StoreApiServiceImpl.java
......@@ -210,6 +210,11 @@ public class StoreApiServiceImpl implements StoreApiService {
// 更新缓存
refreshCache(storeDTO.getEnterpriseId(), storeDTO.getStoreId());
JSONObject json = new JSONObject();
json.put("enterpriseId", storeDTO.getEnterpriseId());
json.put("storeId", storeDTO.getStoreId());
json.put("logId", -1);
this.addStoreToIndexMq(json.toJSONString());
return ServiceResponse.success(storeDTO);
}
......@@ -588,7 +593,7 @@ public class StoreApiServiceImpl implements StoreApiService {
dynamicSearchDTO.setReturnFileds(returnFileds);
logger.info("es查询条件：{}", JSON.toJSONString(dynamicSearchDTO,true));
ServiceResponse<ESResponseQueryBatchDTO> response = this.esBusinessOperaApiService.queryDataBatch(dynamicSearchDTO, false, null);
logger.info("es查询结果：,{}", JSON.toJSONString(response, true));
logger.info("es查询结果：,{}", response.getResult().getRes().size());
return response;
}
......@@ -1046,6 +1051,20 @@ public class StoreApiServiceImpl implements StoreApiService {
return ServiceResponse.success();
}
@Override
public ServiceResponse<StoreDTO> getStoreContainBusinessTimeByStoreCode(Integer enterpriseId, Integer regionId, String storeCode) {
ServiceResponse<StoreDTO> result = getStoreByStoreCode(enterpriseId, regionId, storeCode);
if (result.isSuccess()) {
StoreDTO storeDTO = result.getResult();
List<TabStoreBusinessTime> list = storeBusinessTimeService.listBusinessTime(storeDTO.getStoreInfoId());
List<StoreBusinessTimeDTO> businessTimeDTOList = EntityUtil.changeEntityListByOrika(StoreBusinessTimeDTO.class, list);
storeDTO.setBusinessTimeList(businessTimeDTOList);
storeBusinessTimeService.convertBusinessTime(businessTimeDTOList);
return ServiceResponse.success(storeDTO);
}
return ServiceResponse.success();
}
private StoreDTO getStoreDTO(Integer enterpriseId, Integer storeId) {
StoreDTO store = storeService.getById(storeId);
if (store == null) {
......@@ -1438,6 +1457,10 @@ public class StoreApiServiceImpl implements StoreApiService {
json = QueryConditionAssemblyUtil.createSimpleQueryNode(StoreESFieldsEnum.STATUS.getField(), OperateEnum.OPERATE_EQ, storeSearchDTO.getStatus());
jsonObjectList.add(json);
}
if (storeSearchDTO.getCompleteStatus() != null) {
json = QueryConditionAssemblyUtil.createSimpleQueryNode(StoreESFieldsEnum.COMPLETESTATUS.getField(), OperateEnum.OPERATE_EQ, storeSearchDTO.getCompleteStatus());
jsonObjectList.add(json);
}
if (StringUtils.isNotBlank(storeSearchDTO.getStoreCode())) {
json = QueryConditionAssemblyUtil.createSimpleQueryNode(StoreESFieldsEnum.STORECODE.getField(), OperateEnum.OPERATE_EQ, storeSearchDTO.getStoreCode());
jsonObjectList.add(json);
......@@ -1445,9 +1468,7 @@ public class StoreApiServiceImpl implements StoreApiService {
if (StringUtils.isNotBlank(storeSearchDTO.getSearch())) {
JSONObject storeNameSearch = QueryConditionAssemblyUtil.createSimpleQueryNode(StoreESFieldsEnum.STORENAME.getField(), OperateEnum.OPERATE_LIKE, storeSearchDTO.getSearch());
JSONObject storeCodeSearch = QueryConditionAssemblyUtil.createSimpleQueryNode(StoreESFieldsEnum.STORECODE.getField(), OperateEnum.OPERATE_LIKE, storeSearchDTO.getSearch());
JSONObject storeAreaSearch = QueryConditionAssemblyUtil.createSimpleQueryNode(StoreESFieldsEnum.PROVINCES.getField(), OperateEnum.OPERATE_LIKE, storeSearchDTO.getSearch());
List<JSONObject> list = new ArrayList<>();
list.add(storeAreaSearch);
list.add(storeCodeSearch);
list.add(storeNameSearch);
json = QueryConditionAssemblyUtil.createListQueryNode(list, OperateEnum.OPERATE_OR);
......@@ -1508,6 +1529,17 @@ public class StoreApiServiceImpl implements StoreApiService {
}
}
enterpriseJson = QueryConditionAssemblyUtil.createListQueryNode(jsonObjectList, OperateEnum.OPERATE_AND);
/***build notIn search****/
if(StringUtils.isNotBlank(storeSearchDTO.getStoreIdsOfNot())){
List<JSONObject> list = new ArrayList<>();
json = QueryConditionAssemblyUtil.createSimpleQueryNode(StoreESFieldsEnum.STOREID.getField(), OperateEnum.OPERATE_ARR_CONTAIN, storeSearchDTO.getStoreIdsOfNot());
list.add(json);
JSONObject notJSON = QueryConditionAssemblyUtil.createListQueryNode(list, OperateEnum.OPERATE_AND_NOT);
List<JSONObject> _list = new ArrayList<>();
_list.add(enterpriseJson);
_list.add(notJSON);
enterpriseJson = QueryConditionAssemblyUtil.createListQueryNode(_list, OperateEnum.OPERATE_AND);
}
return enterpriseJson;
}
......@@ -1554,7 +1586,7 @@ public class StoreApiServiceImpl implements StoreApiService {
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("HH:mm");
List<StoreBusinessTimeDTO> businessTimeList = storeDTO.getBusinessTimeList();
if (CollectionUtils.isNotEmpty(businessTimeList)) {
businessTimeList.stream().map(e -> {
businessTimeList.stream().filter(e -> e != null).map(e -> {
String businessHours = simpleDateFormat.format(e.getOpenTime()) + "-" + simpleDateFormat.format(e.getCloseTime());
return e.getWeekdayShow() + businessHours;
}).forEach(businessTime::append);
......
gic-store-service/src/main/java/com/gic/store/service/outer/impl/StoreWidgetApiServiceImpl.java
......@@ -5,12 +5,14 @@ import com.gic.api.base.commons.ServiceResponse;
import com.gic.enterprise.error.ErrorCode;
import com.gic.enterprise.response.EnterpriseServiceResponse;
import com.gic.store.constant.StoreESFieldsEnum;
import com.gic.store.dto.StoreBrandDTO;
import com.gic.store.dto.StoreDTO;
import com.gic.store.dto.StoreSearchDTO;
import com.gic.store.dto.StoreWidgetDTO;
import com.gic.store.service.StoreApiService;
import com.gic.store.service.StoreWidgetApiService;
import com.gic.store.service.StoreWidgetService;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
......@@ -159,6 +161,24 @@ public class StoreWidgetApiServiceImpl implements StoreWidgetApiService {
}
@Override
public ServiceResponse<List<StoreBrandDTO>> listBrandIdByStoreWidgetId(Integer enterpriseId, Integer storeWidgetId) {
ServiceResponse<Page<StoreDTO>> serviceResponse = this.listStoreByStoreWidgetId(enterpriseId, storeWidgetId, 1, 10000);
if (!serviceResponse.isSuccess()) {
return EnterpriseServiceResponse.failure(serviceResponse.getCode(), serviceResponse.getMessage());
}
List<StoreDTO> list = serviceResponse.getResult().getResult();
List<StoreBrandDTO> brandList = new ArrayList<>();
if (CollectionUtils.isNotEmpty(list)) {
for (StoreDTO storeDTO : list) {
if (CollectionUtils.isNotEmpty(storeDTO.getBrandList())) {
brandList.addAll(storeDTO.getBrandList());
}
}
}
return EnterpriseServiceResponse.success(brandList);
}
@Override
public ServiceResponse exist(Integer enterpriseId, Integer storeWidgetId, Integer storeId) {
StoreWidgetDTO storeWidgetDTO = this.storeWidgetService.getStoreWidget(storeWidgetId);
if(storeWidgetDTO != null){
......
gic-store-service/src/main/resources/mapper/TabStoreFieldMapper.xml
......@@ -34,6 +34,10 @@
</sql>
<sql id="Base_Column_List_Enterprise">
a.store_field_id, a.store_field_name, a.store_field_code, a.store_field_type, b.enterprise_id,
a.status, a.create_time, a.update_time, a.store_field_detail, a.erp_rel_code, a.sort, b.own_type
</sql>
<sql id="Base_Column_List_Field">
a.store_field_id, a.store_field_name, a.store_field_code, a.store_field_type, b.enterprise_id,
a.status, a.create_time, a.update_time, a.store_field_detail, a.erp_rel_code, a.sort, b.own_type,c.region_id
</sql>
<sql id="Base_Column_List_Region">
......@@ -234,7 +238,7 @@
<select id="listStoreField" resultMap="BaseResultMap_Dto">
select
<include refid="Base_Column_List_Enterprise" />
<include refid="Base_Column_List_Field" />
from tab_store_field a
left join tab_store_field_rel b
on a.store_field_id = b.store_field_id
......
gic-store-web/src/main/java/com/gic/store/web/controller/StoreController.java
......@@ -768,22 +768,22 @@ public class StoreController extends DownloadUtils {
SimpleDateFormat simpleDateFormat = map.get(dateType);
if(simpleDateFormat == null){
if(StoreFieldDateEnum.YMDHMS.getCode() == dateType){
simpleDateFormat = new SimpleDateFormat("YYYY-MM-dd HH:mm:ss");
simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
}
if(StoreFieldDateEnum.YMD.getCode() == dateType){
simpleDateFormat = new SimpleDateFormat("YYYY-MM-dd");
simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
}
if(StoreFieldDateEnum.YM.getCode() == dateType){
simpleDateFormat = new SimpleDateFormat("YYYY-MM");
simpleDateFormat = new SimpleDateFormat("yyyy-MM");
}
if(StoreFieldDateEnum.MD.getCode() == dateType){
simpleDateFormat = new SimpleDateFormat("MM-dd");
}
if(StoreFieldDateEnum.Hms.getCode() == dateType){
simpleDateFormat = new SimpleDateFormat("YYYY-MM-dd HH:mm:ss");
simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
}
if(simpleDateFormat == null){
simpleDateFormat = new SimpleDateFormat("YYYY-MM-dd");
simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
}
map.put(dateType, simpleDateFormat);
}
......@@ -794,22 +794,22 @@ public class StoreController extends DownloadUtils {
SimpleDateFormat simpleDateFormat = map1.get(dateType);
if(simpleDateFormat == null){
if(StoreFieldDateEnum.YMDHMS.getCode() == dateType){
simpleDateFormat = new SimpleDateFormat("YYYYMMddHHmmss");
simpleDateFormat = new SimpleDateFormat("yyyyMMddHHmmss");
}
if(StoreFieldDateEnum.YMD.getCode() == dateType){
simpleDateFormat = new SimpleDateFormat("YYYYMMdd");
simpleDateFormat = new SimpleDateFormat("yyyyMMdd");
}
if(StoreFieldDateEnum.YM.getCode() == dateType){
simpleDateFormat = new SimpleDateFormat("YYYYMM");
simpleDateFormat = new SimpleDateFormat("yyyyMM");
}
if(StoreFieldDateEnum.MD.getCode() == dateType){
simpleDateFormat = new SimpleDateFormat("MMdd");
}
if(StoreFieldDateEnum.Hms.getCode() == dateType){
simpleDateFormat = new SimpleDateFormat("YYYYMMddHHmmss");
simpleDateFormat = new SimpleDateFormat("yyyyMMddHHmmss");
}
if(simpleDateFormat == null){
simpleDateFormat = new SimpleDateFormat("YYYYMMdd");
simpleDateFormat = new SimpleDateFormat("yyyyMMdd");
}
map1.put(dateType, simpleDateFormat);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment