Commit 6f4ed7b8 authored by 赵啸非's avatar 赵啸非

添加事项渠道

parent 9acc5326
package com.mortals.xhx.module.matter.model.vo; package com.mortals.xhx.module.matter.model.vo;
import com.mortals.framework.model.BaseEntityLong; import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.matter.model.MatterEntity; import com.mortals.xhx.module.matter.model.*;
import lombok.Data; import lombok.Data;
import java.util.ArrayList; import java.util.ArrayList;
...@@ -27,6 +27,16 @@ public class MatterVo extends BaseEntityLong { ...@@ -27,6 +27,16 @@ public class MatterVo extends BaseEntityLong {
private String genFilePath; private String genFilePath;
private List<MatterAcceptEntity> matterAcceptList;
private List<MatterDatumEntity> matterDatumList;
private List<MatterChannelEntity> matterChannelList;
private List<MatterChargesEntity> matterChargesList;
private List<MatterFlowlimitEntity> matterFlowlimitList;
private List<MatterIntermediaryEntity> matterIntermediaryList;
private List<MatterQuestionEntity> matterQuestionList;
private List<MatterSetbaseEntity> matterSetbaseList;
} }
\ No newline at end of file
...@@ -17,9 +17,8 @@ import com.mortals.xhx.common.code.JointInfoShowEnum; ...@@ -17,9 +17,8 @@ import com.mortals.xhx.common.code.JointInfoShowEnum;
import com.mortals.xhx.common.code.YesNoEnum; import com.mortals.xhx.common.code.YesNoEnum;
import com.mortals.xhx.module.base.model.BaseAreaEntity; import com.mortals.xhx.module.base.model.BaseAreaEntity;
import com.mortals.xhx.module.base.service.BaseAreaService; import com.mortals.xhx.module.base.service.BaseAreaService;
import com.mortals.xhx.module.matter.model.MatterEntity; import com.mortals.xhx.module.matter.model.*;
import com.mortals.xhx.module.matter.model.MatterQuery; import com.mortals.xhx.module.matter.service.*;
import com.mortals.xhx.module.matter.service.MatterService;
import com.mortals.xhx.module.site.model.SiteThemeQuery; import com.mortals.xhx.module.site.model.SiteThemeQuery;
import com.mortals.xhx.module.site.service.SiteThemeService; import com.mortals.xhx.module.site.service.SiteThemeService;
import org.apache.poi.ss.formula.functions.T; import org.apache.poi.ss.formula.functions.T;
...@@ -60,6 +59,25 @@ public class MatterController extends BaseCRUDJsonBodyMappingController<MatterSe ...@@ -60,6 +59,25 @@ public class MatterController extends BaseCRUDJsonBodyMappingController<MatterSe
@Autowired @Autowired
private BaseAreaService baseAreaService; private BaseAreaService baseAreaService;
@Autowired
private MatterFlowlimitService matterFlowlimitService;
@Autowired
private MatterAcceptService matterAcceptService;
@Autowired
private MatterSetbaseService matterSetbaseService;
@Autowired
private MatterQuestionService matterQuestionService;
@Autowired
private MatterIntermediaryService matterIntermediaryService;
@Autowired
private MatterDatumService matterDatumService;
@Autowired
private MatterDatumFileService matterDatumFileService;
@Autowired
private MatterChargesService matterChargesService;
@Autowired
private MatterChannelService matterChannelService;
public MatterController() { public MatterController() {
super.setModuleDesc("基础事项"); super.setModuleDesc("基础事项");
} }
...@@ -169,6 +187,45 @@ public class MatterController extends BaseCRUDJsonBodyMappingController<MatterSe ...@@ -169,6 +187,45 @@ public class MatterController extends BaseCRUDJsonBodyMappingController<MatterSe
} }
/**
* @param id
* @param model
* @param entity
* @param context
* @return
* @throws AppException
*/
@Override
protected int infoAfter(Long id, Map<String, Object> model, MatterEntity entity, Context context) throws AppException {
List<MatterAcceptEntity> matterAcceptEntities = matterAcceptService.find(new MatterAcceptQuery().matterId(entity.getId()));
entity.setMatterAcceptList(matterAcceptEntities);
List<MatterDatumEntity> matterDatumEntities = matterDatumService.find(new MatterDatumQuery().matterId(entity.getId()));
entity.setMatterDatumList(matterDatumEntities);
List<MatterChannelEntity> matterChannelEntities = matterChannelService.find(new MatterChannelQuery().matterId(entity.getId()));
entity.setMatterChannelList(matterChannelEntities);
List<MatterChargesEntity> matterChargesEntities = matterChargesService.find(new MatterChargesQuery().matterId(entity.getId()));
entity.setMatterChargesList(matterChargesEntities);
List<MatterFlowlimitEntity> matterFlowlimitEntities = matterFlowlimitService.find(new MatterFlowlimitQuery().matterId(entity.getId()));
entity.setMatterFlowlimitList(matterFlowlimitEntities);
List<MatterIntermediaryEntity> matterIntermediaryEntities = matterIntermediaryService.find(new MatterIntermediaryQuery().matterId(entity.getId()));
entity.setMatterIntermediaryList(matterIntermediaryEntities);
List<MatterQuestionEntity> matterQuestionEntities = matterQuestionService.find(new MatterQuestionQuery().matterId(entity.getId()));
entity.setMatterQuestionList(matterQuestionEntities);
List<MatterSetbaseEntity> matterSetbaseEntities = matterSetbaseService.find(new MatterSetbaseQuery().matterId(entity.getId()));
entity.setMatterSetbaseList(matterSetbaseEntities);
return super.infoAfter(id, model, entity, context);
}
@PostMapping(value = "sublist") @PostMapping(value = "sublist")
@UnAuth @UnAuth
public Rest<Object> sublist(@RequestBody MatterEntity query) { public Rest<Object> sublist(@RequestBody MatterEntity query) {
...@@ -243,7 +300,7 @@ public class MatterController extends BaseCRUDJsonBodyMappingController<MatterSe ...@@ -243,7 +300,7 @@ public class MatterController extends BaseCRUDJsonBodyMappingController<MatterSe
matterEntity.setGenFilePath(query.getGenFilePath()); matterEntity.setGenFilePath(query.getGenFilePath());
this.service.genMatterMarkdown(matterEntity, getContext()); this.service.genMatterMarkdown(matterEntity, getContext());
} }
}else{ } else {
this.service.genMatterMarkdown(query, getContext()); this.service.genMatterMarkdown(query, getContext());
} }
model.put(MESSAGE_INFO, busiDesc + "成功"); model.put(MESSAGE_INFO, busiDesc + "成功");
......
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