Commit 01506839 authored by 赵啸非's avatar 赵啸非

添加材料数量统计

parent dd14c7b8
...@@ -109,7 +109,6 @@ public class HomeController extends BaseJsonBodyController { ...@@ -109,7 +109,6 @@ public class HomeController extends BaseJsonBodyController {
Rest<Object> ret = new Rest(); Rest<Object> ret = new Rest();
Map<String, Object> model = new HashMap(); Map<String, Object> model = new HashMap();
String busiDesc = "查询站点部门列表"; String busiDesc = "查询站点部门列表";
int code = 1; int code = 1;
try { try {
......
...@@ -90,11 +90,17 @@ public class MatterDatumServiceImpl extends AbstractCRUDServiceImpl<MatterDatumD ...@@ -90,11 +90,17 @@ public class MatterDatumServiceImpl extends AbstractCRUDServiceImpl<MatterDatumD
@Override @Override
protected void saveAfter(MatterDatumEntity entity, Context context) throws AppException { protected void saveAfter(MatterDatumEntity entity, Context context) throws AppException {
statDatumCount(context, entity); statDatumCount(entity,context);
addPubdatum(entity, context); addPubdatum(entity, context);
super.saveAfter(entity, context); super.saveAfter(entity, context);
} }
@Override
protected void updateAfter(MatterDatumEntity entity, Context context) throws AppException {
addPubdatum(entity, context);
super.updateAfter(entity, context);
}
private void addPubdatum(MatterDatumEntity entity, Context context) { private void addPubdatum(MatterDatumEntity entity, Context context) {
if (!ObjectUtils.isEmpty(entity.getPub()) && entity.getPub() == YesNoEnum.YES.getValue()) { if (!ObjectUtils.isEmpty(entity.getPub()) && entity.getPub() == YesNoEnum.YES.getValue()) {
//添加到公共库 //添加到公共库
...@@ -108,11 +114,7 @@ public class MatterDatumServiceImpl extends AbstractCRUDServiceImpl<MatterDatumD ...@@ -108,11 +114,7 @@ public class MatterDatumServiceImpl extends AbstractCRUDServiceImpl<MatterDatumD
} }
@Override
protected void updateAfter(MatterDatumEntity entity, Context context) throws AppException {
addPubdatum(entity, context);
super.updateAfter(entity, context);
}
@Override @Override
public int remove(Long id, Context context) throws AppException { public int remove(Long id, Context context) throws AppException {
...@@ -120,7 +122,7 @@ public class MatterDatumServiceImpl extends AbstractCRUDServiceImpl<MatterDatumD ...@@ -120,7 +122,7 @@ public class MatterDatumServiceImpl extends AbstractCRUDServiceImpl<MatterDatumD
MatterDatumEntity matterDatumEntity = this.get(id, context); MatterDatumEntity matterDatumEntity = this.get(id, context);
int iRet = this.dao.delete(id); int iRet = this.dao.delete(id);
this.removeAfter(id, context, iRet); this.removeAfter(id, context, iRet);
statDatumCount(context, matterDatumEntity); statDatumCount(matterDatumEntity,context);
return iRet; return iRet;
} }
...@@ -131,11 +133,11 @@ public class MatterDatumServiceImpl extends AbstractCRUDServiceImpl<MatterDatumD ...@@ -131,11 +133,11 @@ public class MatterDatumServiceImpl extends AbstractCRUDServiceImpl<MatterDatumD
MatterDatumEntity matterDatumEntity = this.get(ids[0], context); MatterDatumEntity matterDatumEntity = this.get(ids[0], context);
int iRet = this.dao.delete(ids); int iRet = this.dao.delete(ids);
this.removeAfter(ids, context, iRet); this.removeAfter(ids, context, iRet);
statDatumCount(context, matterDatumEntity); statDatumCount(matterDatumEntity,context);
return iRet; return iRet;
} }
private void statDatumCount(Context context, MatterDatumEntity matterDatumEntity) { private void statDatumCount( MatterDatumEntity matterDatumEntity,Context context) {
int count = this.count(new MatterDatumQuery().matterId(matterDatumEntity.getMatterId()), context); int count = this.count(new MatterDatumQuery().matterId(matterDatumEntity.getMatterId()), context);
MatterEntity matterEntity = matterService.get(matterDatumEntity.getMatterId(), context); MatterEntity matterEntity = matterService.get(matterDatumEntity.getMatterId(), context);
if (!ObjectUtils.isEmpty(matterEntity)) { if (!ObjectUtils.isEmpty(matterEntity)) {
...@@ -152,7 +154,7 @@ public class MatterDatumServiceImpl extends AbstractCRUDServiceImpl<MatterDatumD ...@@ -152,7 +154,7 @@ public class MatterDatumServiceImpl extends AbstractCRUDServiceImpl<MatterDatumD
//生成样表预览图片 //生成样表预览图片
String rootPath = this.filePath.endsWith("/") ? this.filePath : this.filePath + "/"; String rootPath = this.filePath.endsWith("/") ? this.filePath : this.filePath + "/";
String samplePath = rootPath + entity.getSamplePath(); String samplePath = rootPath + entity.getSamplePath();
String prePath = "/file/preview/"; String prePath = "file/preview/";
String filePath = rootPath + prePath; String filePath = rootPath + prePath;
File pathDir = new File(filePath); File pathDir = new File(filePath);
if (!pathDir.exists()) { if (!pathDir.exists()) {
......
...@@ -86,15 +86,13 @@ public class MatterController extends BaseCRUDJsonBodyMappingController<MatterSe ...@@ -86,15 +86,13 @@ public class MatterController extends BaseCRUDJsonBodyMappingController<MatterSe
matterDatumQuery.setMatterIdList(matterIdList); matterDatumQuery.setMatterIdList(matterIdList);
} }
model.put("matterDatumTotal", count); model.put("matterDatumTotal", count);
// int recommendCount = paramService.getParamIntValue(ParamKey.MATTER_RECOMMEND_COUNT);
// model.put("matterDatumTotal", count);
return super.doListAfter(query, model, context); return super.doListAfter(query, model, context);
} }
@RequestMapping(value = {"createMatter"}, method = {RequestMethod.POST, RequestMethod.GET}) @RequestMapping(value = {"createMatter"}, method = {RequestMethod.POST, RequestMethod.GET})
public String createMatter(Long[] ids, Long siteId) { public String createMatter(Long[] ids, Long siteId) {
Map<String, Object> model = new HashMap(); Map<String, Object> model = new HashMap();
int code = 1; int code = VALUE_RESULT_SUCCESS;
String busiDesc = "站点事项转事项"; String busiDesc = "站点事项转事项";
try { try {
Rest<String> rest = this.service.createMatterbBySheetMatter(ids, siteId, getContext()); Rest<String> rest = this.service.createMatterbBySheetMatter(ids, siteId, getContext());
...@@ -102,7 +100,7 @@ public class MatterController extends BaseCRUDJsonBodyMappingController<MatterSe ...@@ -102,7 +100,7 @@ public class MatterController extends BaseCRUDJsonBodyMappingController<MatterSe
this.recordSysLog(this.request, rest.getMsg()); this.recordSysLog(this.request, rest.getMsg());
} catch (Exception var7) { } catch (Exception var7) {
code = -1; code = VALUE_RESULT_FAILURE;
this.doException(this.request, busiDesc, model, var7); this.doException(this.request, busiDesc, model, var7);
} }
......
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