修改综窗事项列表接口

common-lib/src/main/java/com/mortals/xhx/system/MessageProducer.java

-package com.mortals.xhx.system;
-
-import com.alibaba.fastjson.JSON;
-import com.mortals.framework.model.AccessLogPdu;
-import com.mortals.framework.model.BizLogPdu;
-import com.mortals.framework.model.ErrorLogPdu;
-import com.mortals.framework.model.OperateLogPdu;
-import com.mortals.framework.service.IMessageProduceService;
-import com.mortals.xhx.common.keys.QueueKey;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.amqp.rabbit.core.RabbitTemplate;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Primary;
-import org.springframework.stereotype.Component;
-
-@Component
-@Primary
-@Slf4j
-public class MessageProducer implements IMessageProduceService {
-
-    @Autowired
-    private RabbitTemplate rabbitTemplate;
-
-    public void syncAccessSend(AccessLogPdu accessLogPdu) {
-        //new Message(JSON.toJSONString(accessLogPdu).getBytes(StandardCharsets.UTF_8))
-        //rabbitTemplate.send(QueueKey.EXCHANGE, QueueKey.ACCESS_LOG_QUEUE,new Message(JSON.toJSONString(accessLogPdu).getBytes(StandardCharsets.UTF_8)));
-
-        rabbitTemplate.convertAndSend(QueueKey.EXCHANGE, QueueKey.ACCESS_LOG_QUEUE, JSON.toJSONString(accessLogPdu));
-        //rabbitTemplate.convertAndSend(QueueKey.EXCHANGE, QueueKey.ACCESS_LOG_QUEUE, accessLogPdu);
-    }
-
-    @Override
-    public void syncBizSend(BizLogPdu bizLogPdu) {
-        rabbitTemplate.convertAndSend(QueueKey.EXCHANGE, QueueKey.BIZ_LOG_QUEUE, JSON.toJSONString(bizLogPdu));
-    }
-
-    @Override
-    public void syncErrorSend(ErrorLogPdu errorLogPdu) {
-        rabbitTemplate.convertAndSend(QueueKey.EXCHANGE, QueueKey.ERROR_LOG_QUEUE, JSON.toJSONString(errorLogPdu));
-    }
-
-    @Override
-    public void syncOperSend(OperateLogPdu operLogPdu) {
-        rabbitTemplate.convertAndSend(QueueKey.EXCHANGE, QueueKey.OPERATION_LOG_QUEUE, JSON.toJSONString(operLogPdu));
-    }
-
-}
+//package com.mortals.xhx.system;
+//
+//import com.alibaba.fastjson.JSON;
+//import com.mortals.framework.model.AccessLogPdu;
+//import com.mortals.framework.model.BizLogPdu;
+//import com.mortals.framework.model.ErrorLogPdu;
+//import com.mortals.framework.model.OperateLogPdu;
+//import com.mortals.framework.service.IMessageProduceService;
+//import com.mortals.xhx.common.keys.QueueKey;
+//import lombok.extern.slf4j.Slf4j;
+//import org.springframework.amqp.rabbit.core.RabbitTemplate;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.context.annotation.Primary;
+//import org.springframework.stereotype.Component;
+//
+////@Component
+//@Primary
+//@Slf4j
+//public class MessageProducer implements IMessageProduceService {
+//
+//    @Autowired
+//    private RabbitTemplate rabbitTemplate;
+//
+//    public void syncAccessSend(AccessLogPdu accessLogPdu) {
+//        //new Message(JSON.toJSONString(accessLogPdu).getBytes(StandardCharsets.UTF_8))
+//        //rabbitTemplate.send(QueueKey.EXCHANGE, QueueKey.ACCESS_LOG_QUEUE,new Message(JSON.toJSONString(accessLogPdu).getBytes(StandardCharsets.UTF_8)));
+//
+//        rabbitTemplate.convertAndSend(QueueKey.EXCHANGE, QueueKey.ACCESS_LOG_QUEUE, JSON.toJSONString(accessLogPdu));
+//        //rabbitTemplate.convertAndSend(QueueKey.EXCHANGE, QueueKey.ACCESS_LOG_QUEUE, accessLogPdu);
+//    }
+//
+//    @Override
+//    public void syncBizSend(BizLogPdu bizLogPdu) {
+//        rabbitTemplate.convertAndSend(QueueKey.EXCHANGE, QueueKey.BIZ_LOG_QUEUE, JSON.toJSONString(bizLogPdu));
+//    }
+//
+//    @Override
+//    public void syncErrorSend(ErrorLogPdu errorLogPdu) {
+//        rabbitTemplate.convertAndSend(QueueKey.EXCHANGE, QueueKey.ERROR_LOG_QUEUE, JSON.toJSONString(errorLogPdu));
+//    }
+//
+//    @Override
+//    public void syncOperSend(OperateLogPdu operLogPdu) {
+//        rabbitTemplate.convertAndSend(QueueKey.EXCHANGE, QueueKey.OPERATION_LOG_QUEUE, JSON.toJSONString(operLogPdu));
+//    }
+//
+//}

complex-window-manager/src/main/java/com/mortals/xhx/busiz/web/ComplexApiController.java

@@ -9,6 +9,8 @@ import com.alibaba.fastjson.TypeReference;
 import com.mortals.framework.annotation.UnAuth;
 import com.mortals.framework.common.Rest;
 import com.mortals.framework.exception.AppException;
+import com.mortals.framework.model.PageInfo;
+import com.mortals.framework.model.Result;
 import com.mortals.framework.service.ICacheService;
 import com.mortals.xhx.busiz.req.ComplexImplementationReq;
 import com.mortals.xhx.busiz.req.FindHandlingPageReq;
@@ -32,6 +34,7 @@ import com.mortals.xhx.protocol.complex.matter.model.rsp.HandlingRspInfoList;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.axis.utils.StringUtils;
 import org.apache.commons.collections4.CollectionUtils;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -39,7 +42,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.io.File;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collector;
 import java.util.stream.Collectors;
@@ -65,6 +70,7 @@ public class ComplexApiController {
     @Autowired
     private ApplyMatterService applyMatterService;
 
+
     /**
      * 事项列表查询
      *
@@ -76,33 +82,46 @@ public class ComplexApiController {
     public String eventImplementationList(@RequestBody ComplexImplementationReq req) {
         log.info("【事项列表查询】【请求体】-->  " + JSONObject.toJSONString(req));
         req.setUrlPath("eventImplementation/list");
-        ApiResp<String> rsp = new ApiResp<>();
+        ApiResp<Object> rsp = new ApiResp<>();
         rsp.setMsg(ApiRespCodeEnum.SUCCESS.getLabel());
         rsp.setCode(ApiRespCodeEnum.SUCCESS.getValue());
         try {
-            req.setNonce(RandomUtil.randomNumbers(6));
-            cacheService.lpush(KEY_COMPLEX_REQ, JSONObject.toJSONString(req));
-            String rest = cacheService.blpop(KEY_EVENT_IMPLEMENTATION_RESP + req.getNonce(), HTTP_TIMEOUT, String.class);
-            if (ObjectUtil.isEmpty(rest)) {
-                throw new AppException("请求访问超时");
-            }
-            Rest<ImplementEventInfo> eventListRest = JSON.parseObject(rest, new TypeReference<Rest<ImplementEventInfo>>() {
-            });
-            if(eventListRest.getCode()==1){
-                Integer applyType = req.getApplyType()==null?1:req.getApplyType();
-                List<ApplyMatterEntity> entityList = applyMatterService.find(new ApplyMatterQuery().applyType(applyType));
-                if(CollectionUtils.isNotEmpty(entityList)) {
-                    Set<String> matter = entityList.stream().map(t -> t.getEventId()).collect(Collectors.toSet());
-                    for (RecordsItem item : eventListRest.getData().getRecords()) {
-                        if(matter.contains(item.getEventId())){
-                            item.setEnableFlag(1);
-                        }else {
-                            item.setEnableFlag(0);
-                        }
-                    }
-                }
-            }
-            return JSON.toJSONString(eventListRest);
+            PageInfo pageInfo = new PageInfo(req.getPageSize());
+            pageInfo.setCurrPage(req.getCurrentPage());
+            ApplyMatterEntity query = new ApplyMatterEntity();
+            BeanUtils.copyProperties(req, query);
+
+            Result<ApplyMatterEntity> result = applyMatterService.find(query,pageInfo,null);
+            Map<String, Object> model = new HashMap();
+            model.put("records",result.getList());
+            model.put("current",result.getPageInfo().getCurrPage());
+            model.put("pages",result.getPageInfo().getTotalPage());
+            model.put("size",result.getPageInfo().getPrePageResult());
+            model.put("total",result.getPageInfo().getTotalResult());
+            rsp.setData(model);
+//            req.setNonce(RandomUtil.randomNumbers(6));
+//            cacheService.lpush(KEY_COMPLEX_REQ, JSONObject.toJSONString(req));
+//            String rest = cacheService.blpop(KEY_EVENT_IMPLEMENTATION_RESP + req.getNonce(), HTTP_TIMEOUT, String.class);
+//            if (ObjectUtil.isEmpty(rest)) {
+//                throw new AppException("请求访问超时");
+//            }
+//            Rest<ImplementEventInfo> eventListRest = JSON.parseObject(rest, new TypeReference<Rest<ImplementEventInfo>>() {
+//            });
+//            if(eventListRest.getCode()==1){
+//                Integer applyType = req.getApplyType()==null?1:req.getApplyType();
+//                List<ApplyMatterEntity> entityList = applyMatterService.find(new ApplyMatterQuery().applyType(applyType));
+//                if(CollectionUtils.isNotEmpty(entityList)) {
+//                    Set<String> matter = entityList.stream().map(t -> t.getEventId()).collect(Collectors.toSet());
+//                    for (RecordsItem item : eventListRest.getData().getRecords()) {
+//                        if(matter.contains(item.getEventId())){
+//                            item.setEnableFlag(1);
+//                        }else {
+//                            item.setEnableFlag(0);
+//                        }
+//                    }
+//                }
+//            }
+            return JSON.toJSONString(rsp);
         } catch (Exception e) {
             log.error("接收数据失败", e);
             rsp.setCode(ApiRespCodeEnum.FAILED.getValue());

complex-window-manager/src/main/java/com/mortals/xhx/module/matter/model/ApplyMatterEntity.java

@@ -10,11 +10,11 @@ import com.mortals.framework.model.BaseEntityLong;
 import com.mortals.xhx.module.matter.model.vo.ApplyMatterVo;
 import lombok.Data;
 /**
-* 申报事项列表实体对象
-*
-* @author zxfei
-* @date 2024-06-20
-*/
+ * 申报事项列表实体对象
+ *
+ * @author zxfei
+ * @date 2024-07-01
+ */
 @Data
 public class ApplyMatterEntity extends ApplyMatterVo {
     private static final long serialVersionUID = 1L;
@@ -47,6 +47,18 @@ public class ApplyMatterEntity extends ApplyMatterVo {
      * 事项面向对象分类
      */
     private String eventObjectType;
+    /**
+     * 是否纳入通办
+     */
+    private String crossFlag;
+    /**
+     * 委托部门
+     */
+    private Integer deptId;
+    /**
+     * 委托部门
+     */
+    private String deptName;
     @Override
     public int hashCode() {
         return this.getId().hashCode();
@@ -71,5 +83,8 @@ public class ApplyMatterEntity extends ApplyMatterVo {
         this.handlingItemCode = "";
         this.implementName = "";
         this.eventObjectType = "";
+        this.crossFlag = "";
+        this.deptId = null;
+        this.deptName = "";
     }
 }
\ No newline at end of file

complex-window-manager/src/main/java/com/mortals/xhx/module/matter/model/ApplyMatterQuery.java

@@ -3,11 +3,11 @@ package com.mortals.xhx.module.matter.model;
 import java.util.List;
 import com.mortals.xhx.module.matter.model.ApplyMatterEntity;
 /**
-* 申报事项列表查询对象
-*
-* @author zxfei
-* @date 2024-06-20
-*/
+ * 申报事项列表查询对象
+ *
+ * @author zxfei
+ * @date 2024-07-01
+ */
 public class ApplyMatterQuery extends ApplyMatterEntity {
     /** 开始 序号，主键，自增长 */
     private Long idStart;
@@ -111,6 +111,31 @@ public class ApplyMatterQuery extends ApplyMatterEntity {
     /** 结束 更新时间 */
     private String updateTimeEnd;
 
+    /** 是否纳入通办 */
+    private List<String> crossFlagList;
+
+    /** 是否纳入通办排除列表 */
+    private List <String> crossFlagNotList;
+    /** 开始 委托部门 */
+    private Integer deptIdStart;
+
+    /** 结束 委托部门 */
+    private Integer deptIdEnd;
+
+    /** 增加 委托部门 */
+    private Integer deptIdIncrement;
+
+    /** 委托部门列表 */
+    private List <Integer> deptIdList;
+
+    /** 委托部门排除列表 */
+    private List <Integer> deptIdNotList;
+
+    /** 委托部门 */
+    private List<String> deptNameList;
+
+    /** 委托部门排除列表 */
+    private List <String> deptNameNotList;
     /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
     private List<ApplyMatterQuery> orConditionList;
 
@@ -699,6 +724,151 @@ public class ApplyMatterQuery extends ApplyMatterEntity {
         this.updateTimeEnd = updateTimeEnd;
     }
 
+    /**
+     * 获取 是否纳入通办
+     * @return crossFlagList
+     */
+    public List<String> getCrossFlagList(){
+        return this.crossFlagList;
+    }
+
+    /**
+     * 设置 是否纳入通办
+     * @param crossFlagList
+     */
+    public void setCrossFlagList(List<String> crossFlagList){
+        this.crossFlagList = crossFlagList;
+    }
+
+    /**
+     * 获取 是否纳入通办
+     * @return crossFlagNotList
+     */
+    public List<String> getCrossFlagNotList(){
+        return this.crossFlagNotList;
+    }
+
+    /**
+     * 设置 是否纳入通办
+     * @param crossFlagNotList
+     */
+    public void setCrossFlagNotList(List<String> crossFlagNotList){
+        this.crossFlagNotList = crossFlagNotList;
+    }
+
+    /**
+     * 获取 开始 委托部门
+     * @return deptIdStart
+     */
+    public Integer getDeptIdStart(){
+        return this.deptIdStart;
+    }
+
+    /**
+     * 设置 开始 委托部门
+     * @param deptIdStart
+     */
+    public void setDeptIdStart(Integer deptIdStart){
+        this.deptIdStart = deptIdStart;
+    }
+
+    /**
+     * 获取 结束 委托部门
+     * @return $deptIdEnd
+     */
+    public Integer getDeptIdEnd(){
+        return this.deptIdEnd;
+    }
+
+    /**
+     * 设置 结束 委托部门
+     * @param deptIdEnd
+     */
+    public void setDeptIdEnd(Integer deptIdEnd){
+        this.deptIdEnd = deptIdEnd;
+    }
+
+    /**
+     * 获取 增加 委托部门
+     * @return deptIdIncrement
+     */
+    public Integer getDeptIdIncrement(){
+        return this.deptIdIncrement;
+    }
+
+    /**
+     * 设置 增加 委托部门
+     * @param deptIdIncrement
+     */
+    public void setDeptIdIncrement(Integer deptIdIncrement){
+        this.deptIdIncrement = deptIdIncrement;
+    }
+
+    /**
+     * 获取 委托部门
+     * @return deptIdList
+     */
+    public List<Integer> getDeptIdList(){
+        return this.deptIdList;
+    }
+
+    /**
+     * 设置 委托部门
+     * @param deptIdList
+     */
+    public void setDeptIdList(List<Integer> deptIdList){
+        this.deptIdList = deptIdList;
+    }
+
+    /**
+     * 获取 委托部门
+     * @return deptIdNotList
+     */
+    public List<Integer> getDeptIdNotList(){
+        return this.deptIdNotList;
+    }
+
+    /**
+     * 设置 委托部门
+     * @param deptIdNotList
+     */
+    public void setDeptIdNotList(List<Integer> deptIdNotList){
+        this.deptIdNotList = deptIdNotList;
+    }
+
+
+    /**
+     * 获取 委托部门
+     * @return deptNameList
+     */
+    public List<String> getDeptNameList(){
+        return this.deptNameList;
+    }
+
+    /**
+     * 设置 委托部门
+     * @param deptNameList
+     */
+    public void setDeptNameList(List<String> deptNameList){
+        this.deptNameList = deptNameList;
+    }
+
+    /**
+     * 获取 委托部门
+     * @return deptNameNotList
+     */
+    public List<String> getDeptNameNotList(){
+        return this.deptNameNotList;
+    }
+
+    /**
+     * 设置 委托部门
+     * @param deptNameNotList
+     */
+    public void setDeptNameNotList(List<String> deptNameNotList){
+        this.deptNameNotList = deptNameNotList;
+    }
+
     /**
      * 设置  序号，主键，自增长
      * @param id
@@ -1031,6 +1201,98 @@ public class ApplyMatterQuery extends ApplyMatterEntity {
     }
 
 
+
+    /**
+     * 设置 是否纳入通办
+     * @param crossFlag
+     */
+    public ApplyMatterQuery crossFlag(String crossFlag){
+        setCrossFlag(crossFlag);
+        return this;
+    }
+
+    /**
+     * 设置 是否纳入通办
+     * @param crossFlagList
+     */
+    public ApplyMatterQuery crossFlagList(List<String> crossFlagList){
+        this.crossFlagList = crossFlagList;
+        return this;
+    }
+
+    /**
+     * 设置  委托部门
+     * @param deptId
+     */
+    public ApplyMatterQuery deptId(Integer deptId){
+        setDeptId(deptId);
+        return this;
+    }
+
+    /**
+     * 设置 开始 委托部门
+     * @param deptIdStart
+     */
+    public ApplyMatterQuery deptIdStart(Integer deptIdStart){
+        this.deptIdStart = deptIdStart;
+        return this;
+    }
+
+    /**
+     * 设置 结束 委托部门
+     * @param deptIdEnd
+     */
+    public ApplyMatterQuery deptIdEnd(Integer deptIdEnd){
+        this.deptIdEnd = deptIdEnd;
+        return this;
+    }
+
+    /**
+     * 设置 增加 委托部门
+     * @param deptIdIncrement
+     */
+    public ApplyMatterQuery deptIdIncrement(Integer deptIdIncrement){
+        this.deptIdIncrement = deptIdIncrement;
+        return this;
+    }
+
+    /**
+     * 设置 委托部门
+     * @param deptIdList
+     */
+    public ApplyMatterQuery deptIdList(List<Integer> deptIdList){
+        this.deptIdList = deptIdList;
+        return this;
+    }
+
+    /**
+     * 设置 委托部门
+     * @param deptIdNotList
+     */
+    public ApplyMatterQuery deptIdNotList(List<Integer> deptIdNotList){
+        this.deptIdNotList = deptIdNotList;
+        return this;
+    }
+
+
+    /**
+     * 设置 委托部门
+     * @param deptName
+     */
+    public ApplyMatterQuery deptName(String deptName){
+        setDeptName(deptName);
+        return this;
+    }
+
+    /**
+     * 设置 委托部门
+     * @param deptNameList
+     */
+    public ApplyMatterQuery deptNameList(List<String> deptNameList){
+        this.deptNameList = deptNameList;
+        return this;
+    }
+
     /**
      * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
      * @return orConditionList

complex-window-manager/src/main/java/com/mortals/xhx/module/matter/model/EventImplementationEntity.java

@@ -10,11 +10,11 @@ import com.mortals.framework.model.BaseEntityLong;
 import com.mortals.xhx.module.matter.model.vo.EventImplementationVo;
 import lombok.Data;
 /**
-* 综窗事项列表实体对象
-*
-* @author zxfei
-* @date 2024-06-20
-*/
+ * 综窗事项列表实体对象
+ *
+ * @author zxfei
+ * @date 2024-07-01
+ */
 @Data
 public class EventImplementationEntity extends EventImplementationVo {
     private static final long serialVersionUID = 1L;
@@ -43,6 +43,18 @@ public class EventImplementationEntity extends EventImplementationVo {
      * 事项面向对象分类
      */
     private String eventObjectType;
+    /**
+     * 是否纳入通办
+     */
+    private String crossFlag;
+    /**
+     * 委托部门
+     */
+    private Integer deptId;
+    /**
+     * 委托部门
+     */
+    private String deptName;
     @Override
     public int hashCode() {
         return this.getId().hashCode();
@@ -66,5 +78,8 @@ public class EventImplementationEntity extends EventImplementationVo {
         this.handlingItemCode = "";
         this.implementName = "";
         this.eventObjectType = "";
+        this.crossFlag = "";
+        this.deptId = null;
+        this.deptName = "";
     }
 }
\ No newline at end of file

complex-window-manager/src/main/java/com/mortals/xhx/module/matter/model/EventImplementationQuery.java

@@ -3,11 +3,11 @@ package com.mortals.xhx.module.matter.model;
 import java.util.List;
 import com.mortals.xhx.module.matter.model.EventImplementationEntity;
 /**
-* 综窗事项列表查询对象
-*
-* @author zxfei
-* @date 2024-06-20
-*/
+ * 综窗事项列表查询对象
+ *
+ * @author zxfei
+ * @date 2024-07-01
+ */
 public class EventImplementationQuery extends EventImplementationEntity {
     /** 开始 序号，主键，自增长 */
     private Long idStart;
@@ -96,6 +96,31 @@ public class EventImplementationQuery extends EventImplementationEntity {
     /** 结束 更新时间 */
     private String updateTimeEnd;
 
+    /** 是否纳入通办 */
+    private List<String> crossFlagList;
+
+    /** 是否纳入通办排除列表 */
+    private List <String> crossFlagNotList;
+    /** 开始 委托部门 */
+    private Integer deptIdStart;
+
+    /** 结束 委托部门 */
+    private Integer deptIdEnd;
+
+    /** 增加 委托部门 */
+    private Integer deptIdIncrement;
+
+    /** 委托部门列表 */
+    private List <Integer> deptIdList;
+
+    /** 委托部门排除列表 */
+    private List <Integer> deptIdNotList;
+
+    /** 委托部门 */
+    private List<String> deptNameList;
+
+    /** 委托部门排除列表 */
+    private List <String> deptNameNotList;
     /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
     private List<EventImplementationQuery> orConditionList;
 
@@ -603,6 +628,151 @@ public class EventImplementationQuery extends EventImplementationEntity {
         this.updateTimeEnd = updateTimeEnd;
     }
 
+    /**
+     * 获取 是否纳入通办
+     * @return crossFlagList
+     */
+    public List<String> getCrossFlagList(){
+        return this.crossFlagList;
+    }
+
+    /**
+     * 设置 是否纳入通办
+     * @param crossFlagList
+     */
+    public void setCrossFlagList(List<String> crossFlagList){
+        this.crossFlagList = crossFlagList;
+    }
+
+    /**
+     * 获取 是否纳入通办
+     * @return crossFlagNotList
+     */
+    public List<String> getCrossFlagNotList(){
+        return this.crossFlagNotList;
+    }
+
+    /**
+     * 设置 是否纳入通办
+     * @param crossFlagNotList
+     */
+    public void setCrossFlagNotList(List<String> crossFlagNotList){
+        this.crossFlagNotList = crossFlagNotList;
+    }
+
+    /**
+     * 获取 开始 委托部门
+     * @return deptIdStart
+     */
+    public Integer getDeptIdStart(){
+        return this.deptIdStart;
+    }
+
+    /**
+     * 设置 开始 委托部门
+     * @param deptIdStart
+     */
+    public void setDeptIdStart(Integer deptIdStart){
+        this.deptIdStart = deptIdStart;
+    }
+
+    /**
+     * 获取 结束 委托部门
+     * @return $deptIdEnd
+     */
+    public Integer getDeptIdEnd(){
+        return this.deptIdEnd;
+    }
+
+    /**
+     * 设置 结束 委托部门
+     * @param deptIdEnd
+     */
+    public void setDeptIdEnd(Integer deptIdEnd){
+        this.deptIdEnd = deptIdEnd;
+    }
+
+    /**
+     * 获取 增加 委托部门
+     * @return deptIdIncrement
+     */
+    public Integer getDeptIdIncrement(){
+        return this.deptIdIncrement;
+    }
+
+    /**
+     * 设置 增加 委托部门
+     * @param deptIdIncrement
+     */
+    public void setDeptIdIncrement(Integer deptIdIncrement){
+        this.deptIdIncrement = deptIdIncrement;
+    }
+
+    /**
+     * 获取 委托部门
+     * @return deptIdList
+     */
+    public List<Integer> getDeptIdList(){
+        return this.deptIdList;
+    }
+
+    /**
+     * 设置 委托部门
+     * @param deptIdList
+     */
+    public void setDeptIdList(List<Integer> deptIdList){
+        this.deptIdList = deptIdList;
+    }
+
+    /**
+     * 获取 委托部门
+     * @return deptIdNotList
+     */
+    public List<Integer> getDeptIdNotList(){
+        return this.deptIdNotList;
+    }
+
+    /**
+     * 设置 委托部门
+     * @param deptIdNotList
+     */
+    public void setDeptIdNotList(List<Integer> deptIdNotList){
+        this.deptIdNotList = deptIdNotList;
+    }
+
+
+    /**
+     * 获取 委托部门
+     * @return deptNameList
+     */
+    public List<String> getDeptNameList(){
+        return this.deptNameList;
+    }
+
+    /**
+     * 设置 委托部门
+     * @param deptNameList
+     */
+    public void setDeptNameList(List<String> deptNameList){
+        this.deptNameList = deptNameList;
+    }
+
+    /**
+     * 获取 委托部门
+     * @return deptNameNotList
+     */
+    public List<String> getDeptNameNotList(){
+        return this.deptNameNotList;
+    }
+
+    /**
+     * 设置 委托部门
+     * @param deptNameNotList
+     */
+    public void setDeptNameNotList(List<String> deptNameNotList){
+        this.deptNameNotList = deptNameNotList;
+    }
+
     /**
      * 设置  序号，主键，自增长
      * @param id
@@ -881,6 +1051,98 @@ public class EventImplementationQuery extends EventImplementationEntity {
     }
 
 
+
+    /**
+     * 设置 是否纳入通办
+     * @param crossFlag
+     */
+    public EventImplementationQuery crossFlag(String crossFlag){
+        setCrossFlag(crossFlag);
+        return this;
+    }
+
+    /**
+     * 设置 是否纳入通办
+     * @param crossFlagList
+     */
+    public EventImplementationQuery crossFlagList(List<String> crossFlagList){
+        this.crossFlagList = crossFlagList;
+        return this;
+    }
+
+    /**
+     * 设置  委托部门
+     * @param deptId
+     */
+    public EventImplementationQuery deptId(Integer deptId){
+        setDeptId(deptId);
+        return this;
+    }
+
+    /**
+     * 设置 开始 委托部门
+     * @param deptIdStart
+     */
+    public EventImplementationQuery deptIdStart(Integer deptIdStart){
+        this.deptIdStart = deptIdStart;
+        return this;
+    }
+
+    /**
+     * 设置 结束 委托部门
+     * @param deptIdEnd
+     */
+    public EventImplementationQuery deptIdEnd(Integer deptIdEnd){
+        this.deptIdEnd = deptIdEnd;
+        return this;
+    }
+
+    /**
+     * 设置 增加 委托部门
+     * @param deptIdIncrement
+     */
+    public EventImplementationQuery deptIdIncrement(Integer deptIdIncrement){
+        this.deptIdIncrement = deptIdIncrement;
+        return this;
+    }
+
+    /**
+     * 设置 委托部门
+     * @param deptIdList
+     */
+    public EventImplementationQuery deptIdList(List<Integer> deptIdList){
+        this.deptIdList = deptIdList;
+        return this;
+    }
+
+    /**
+     * 设置 委托部门
+     * @param deptIdNotList
+     */
+    public EventImplementationQuery deptIdNotList(List<Integer> deptIdNotList){
+        this.deptIdNotList = deptIdNotList;
+        return this;
+    }
+
+
+    /**
+     * 设置 委托部门
+     * @param deptName
+     */
+    public EventImplementationQuery deptName(String deptName){
+        setDeptName(deptName);
+        return this;
+    }
+
+    /**
+     * 设置 委托部门
+     * @param deptNameList
+     */
+    public EventImplementationQuery deptNameList(List<String> deptNameList){
+        this.deptNameList = deptNameList;
+        return this;
+    }
+
     /**
      * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
      * @return orConditionList

complex-window-manager/src/main/java/com/mortals/xhx/module/matter/service/impl/EventImplementationServiceImpl.java

@@ -20,6 +20,7 @@ import com.mortals.xhx.module.matter.model.ApplyMatterEntity;
 import com.mortals.xhx.module.matter.model.EventImplementationQuery;
 import com.mortals.xhx.module.matter.service.ApplyMatterService;
 import org.apache.commons.collections4.CollectionUtils;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
@@ -169,12 +170,16 @@ public class EventImplementationServiceImpl extends AbstractCRUDServiceImpl<Even
                 for (EventImplementationEntity item:list){
                     ApplyMatterEntity applyMatterEntity = new ApplyMatterEntity();
                     applyMatterEntity.initAttrValue();
-                    applyMatterEntity.setEventId(item.getEventId());
-                    applyMatterEntity.setEventObjectType(item.getEventObjectType());
-                    applyMatterEntity.setEventType(item.getEventType());
-                    applyMatterEntity.setHandlingItemCode(item.getHandlingItemCode());
-                    applyMatterEntity.setImplementName(item.getImplementName());
-                    applyMatterEntity.setImplementCoding(item.getImplementCoding());
+                    BeanUtils.copyProperties(item, applyMatterEntity);
+//                    applyMatterEntity.setEventId(item.getEventId());
+//                    applyMatterEntity.setEventObjectType(item.getEventObjectType());
+//                    applyMatterEntity.setEventType(item.getEventType());
+//                    applyMatterEntity.setHandlingItemCode(item.getHandlingItemCode());
+//                    applyMatterEntity.setImplementName(item.getImplementName());
+//                    applyMatterEntity.setImplementCoding(item.getImplementCoding());
+//                    applyMatterEntity.setCrossFlag(item.getCrossFlag());
+//                    applyMatterEntity.setDeptId(item.getDeptId());
+//                    applyMatterEntity.setDeptName(item.getDeptName());
                     applyMatterEntity.setApplyType(entity.getApplyType());
                     applyMatterEntity.setCreateTime(new Date());
                     applyMatterEntity.setCreateUserId(userId);
@@ -194,12 +199,16 @@ public class EventImplementationServiceImpl extends AbstractCRUDServiceImpl<Even
             for (RecordsItem item:records){
                 EventImplementationEntity entity = new EventImplementationEntity();
                 entity.initAttrValue();
-                entity.setEventId(item.getEventId());
-                entity.setEventObjectType(item.getEventObjectType());
-                entity.setEventType(item.getEventType());
-                entity.setHandlingItemCode(item.getHandlingItemCode());
-                entity.setImplementName(item.getImplementName());
-                entity.setImplementCoding(item.getImplementCoding());
+                BeanUtils.copyProperties(item, entity);
+//                entity.setEventId(item.getEventId());
+//                entity.setEventObjectType(item.getEventObjectType());
+//                entity.setEventType(item.getEventType());
+//                entity.setHandlingItemCode(item.getHandlingItemCode());
+//                entity.setImplementName(item.getImplementName());
+//                entity.setImplementCoding(item.getImplementCoding());
+//                entity.setCrossFlag(item.getCrossFlag());
+//                entity.setDeptId(item.getDeptId());
+//                entity.setDeptName(item.getDeptName());
                 list.add(entity);
             }
         }