Commit 179b1589 authored by 赵啸非's avatar 赵啸非

修改根据业务查询部门逻辑

parent 838d18ec
...@@ -53,9 +53,6 @@ public class MatterInfo { ...@@ -53,9 +53,6 @@ public class MatterInfo {
* 承诺办结时限 * 承诺办结时限
*/ */
private String promiseTimeLimitShow; private String promiseTimeLimitShow;
/**
* 行政处罚排除
*/
private List <String> eventTypeShowNotList;
} }
\ No newline at end of file
...@@ -16,4 +16,9 @@ public class MatterVo extends BaseEntityLong { ...@@ -16,4 +16,9 @@ public class MatterVo extends BaseEntityLong {
private List<Long> idList; private List<Long> idList;
/**
* 行政处罚排除
*/
private List <String> eventTypeShowNotList;
} }
\ No newline at end of file
...@@ -4,6 +4,7 @@ import cn.hutool.setting.Setting; ...@@ -4,6 +4,7 @@ import cn.hutool.setting.Setting;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.mortals.framework.annotation.UnAuth; import com.mortals.framework.annotation.UnAuth;
import com.mortals.framework.common.Rest; import com.mortals.framework.common.Rest;
import com.mortals.framework.exception.AppException;
import com.mortals.framework.model.Context; import com.mortals.framework.model.Context;
import com.mortals.framework.model.PageInfo; import com.mortals.framework.model.PageInfo;
import com.mortals.framework.model.Result; import com.mortals.framework.model.Result;
...@@ -25,6 +26,7 @@ import org.springframework.web.bind.annotation.RequestBody; ...@@ -25,6 +26,7 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.stream.Collectors; import java.util.stream.Collectors;
...@@ -54,6 +56,23 @@ public class MatterController extends BaseCRUDJsonBodyMappingController<MatterSe ...@@ -54,6 +56,23 @@ public class MatterController extends BaseCRUDJsonBodyMappingController<MatterSe
super.setModuleDesc("基础事项"); super.setModuleDesc("基础事项");
} }
/**
* @param query
* @param model
* @param context
* @throws AppException
*/
@Override
protected void doListBefore(MatterEntity query, Map<String, Object> model, Context context) throws AppException {
if(ObjectUtils.isEmpty(query.getEventTypeShowNotList())){
ArrayList<String> notList = new ArrayList<>();
notList.add("行政处罚");
query.setEventTypeShowNotList(notList);
}
super.doListBefore(query, model, context);
}
@Override @Override
protected void init(Map<String, Object> model, Context context) { protected void init(Map<String, Object> model, Context context) {
this.addDict(model, "appoveObjectShow", paramService.getParamBySecondOrganize("Matter", "appoveObjectShow")); this.addDict(model, "appoveObjectShow", paramService.getParamBySecondOrganize("Matter", "appoveObjectShow"));
......
...@@ -20,9 +20,8 @@ POST {{baseUrl}}/matter/list ...@@ -20,9 +20,8 @@ POST {{baseUrl}}/matter/list
Content-Type: application/json Content-Type: application/json
{ {
"siteId": "", "siteId": 1,
"matterName": "%对墓穴占地面积超过标准的处罚%", "eventTypeShowNotList": ["行政处罚"],
"deptCode":"",
"page": 1, "page": 1,
"size": 10 "size": 10
} }
......
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