Commit 09120a07 by 王祖波

创建数据

parent c04e2326
...@@ -17,6 +17,7 @@ import com.gic.haoban.common.utils.EntityUtil; ...@@ -17,6 +17,7 @@ import com.gic.haoban.common.utils.EntityUtil;
import com.gic.haoban.manage.api.dto.StaffDTO; import com.gic.haoban.manage.api.dto.StaffDTO;
import com.gic.haoban.manage.web.controller.content.adaptor.ClerkStoreAdaptor; import com.gic.haoban.manage.web.controller.content.adaptor.ClerkStoreAdaptor;
import com.gic.haoban.manage.web.controller.content.adaptor.MaterialDataAdaptor; import com.gic.haoban.manage.web.controller.content.adaptor.MaterialDataAdaptor;
import com.gic.haoban.manage.web.qo.content.ContentAuditMaterialDataQO;
import com.gic.haoban.manage.web.qo.content.ContentAuditMaterialQO; import com.gic.haoban.manage.web.qo.content.ContentAuditMaterialQO;
import com.gic.haoban.manage.web.qo.content.ContentMaterialSaveQO; import com.gic.haoban.manage.web.qo.content.ContentMaterialSaveQO;
import com.gic.haoban.manage.web.vo.content.creative.ContentMaterialConvsVO; import com.gic.haoban.manage.web.vo.content.creative.ContentMaterialConvsVO;
...@@ -217,9 +218,10 @@ public class ContentCreativeController { ...@@ -217,9 +218,10 @@ public class ContentCreativeController {
*/ */
@ResponseBody @ResponseBody
@RequestMapping("/material-data") @RequestMapping("/material-data")
public RestResponse<ContentMaterialDataVO> auditMaterialData(@RequestBody ContentAuditMaterialQO auditMaterialQO) { public RestResponse<ContentMaterialDataVO> auditMaterialData(@RequestBody ContentAuditMaterialDataQO auditMaterialQO) {
ContentMaterialPageQDTO pageQDTO = new ContentMaterialPageQDTO(); ContentMaterialPageQDTO pageQDTO = new ContentMaterialPageQDTO();
String enterpriseId = auditMaterialQO.getEnterpriseId(); String enterpriseId = auditMaterialQO.getEnterpriseId();
Integer createFlag = auditMaterialQO.getCreateFlag();
pageQDTO.setEnterpriseId(enterpriseId); pageQDTO.setEnterpriseId(enterpriseId);
pageQDTO.setStoreId(auditMaterialQO.getStoreId()); pageQDTO.setStoreId(auditMaterialQO.getStoreId());
pageQDTO.setClerkId(auditMaterialQO.getClerkId()); pageQDTO.setClerkId(auditMaterialQO.getClerkId());
...@@ -233,6 +235,7 @@ public class ContentCreativeController { ...@@ -233,6 +235,7 @@ public class ContentCreativeController {
ContentMaterialDataVO materialDataVO = new ContentMaterialDataVO(); ContentMaterialDataVO materialDataVO = new ContentMaterialDataVO();
materialDataVO.setAuditCount(auditResponse.getResult()); materialDataVO.setAuditCount(auditResponse.getResult());
materialDataVO.setCreateCount(response.getResult()); materialDataVO.setCreateCount(response.getResult());
if (createFlag == null || createFlag == Constant.FLAG_FALSE) {
//转化数据 //转化数据
ServiceResponse<List<Long>> idListResponse = contentMaterialApiService.listMaterialIdBySearch(pageQDTO); ServiceResponse<List<Long>> idListResponse = contentMaterialApiService.listMaterialIdBySearch(pageQDTO);
if (!idListResponse.isSuccess()) { if (!idListResponse.isSuccess()) {
...@@ -240,6 +243,7 @@ public class ContentCreativeController { ...@@ -240,6 +243,7 @@ public class ContentCreativeController {
} }
ContentMaterialConvsVO materialConvsVO = materialDataAdaptor.queryCreativeConvsOverview(enterpriseId, idListResponse.getResult()); ContentMaterialConvsVO materialConvsVO = materialDataAdaptor.queryCreativeConvsOverview(enterpriseId, idListResponse.getResult());
materialDataVO.setConvs(materialConvsVO); materialDataVO.setConvs(materialConvsVO);
}
return RestResponse.successResult(materialDataVO); return RestResponse.successResult(materialDataVO);
} }
......
package com.gic.haoban.manage.web.qo.content;
public class ContentAuditMaterialDataQO {
/**
* 企业id
*/
private String enterpriseId;
/**
* 门店id
*/
private String storeId;
/**
* 导购id
*/
private String clerkId;
/**
* 是否仅查创建数
*/
private Integer createFlag;
public String getEnterpriseId() {
return enterpriseId;
}
public void setEnterpriseId(String enterpriseId) {
this.enterpriseId = enterpriseId;
}
public String getStoreId() {
return storeId;
}
public void setStoreId(String storeId) {
this.storeId = storeId;
}
public String getClerkId() {
return clerkId;
}
public void setClerkId(String clerkId) {
this.clerkId = clerkId;
}
public Integer getCreateFlag() {
return createFlag;
}
public void setCreateFlag(Integer createFlag) {
this.createFlag = createFlag;
}
}
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