添加站点政务同步接口

base-manager/src/main/java/com/mortals/xhx/module/matter/service/impl/MatterServiceImpl.java

@@ -184,6 +184,7 @@ public class MatterServiceImpl extends AbstractCRUDCacheServiceImpl<MatterDao, M
             siteMatterEntity.setMatterName(item.getMatterName());
             siteMatterEntity.setDeptCode(item.getDeptCode());
             siteMatterEntity.setSource(item.getSource());
+            siteMatterEntity.setEventTypeShow(item.getEventTypeShow());
             siteMatterEntity.setDeptName(deptEntity == null ? "" : deptEntity.getName());
             siteMatterEntity.setDeptId(deptEntity == null ? -1L : deptEntity.getId());
             siteMatterEntity.setCreateUserId(context == null ? 1L : context.getUser() == null ? 1L : context.getUser().getId());

base-manager/src/main/java/com/mortals/xhx/module/site/model/SiteMatterEntity.java

@@ -39,6 +39,10 @@ public class SiteMatterEntity extends SiteMatterVo {
      * 部门名称
      */
     private String deptName;
+    /**
+     * 事项类型
+     */
+    private String eventTypeShow;
     /**
      * 事项来源
      */
@@ -149,6 +153,20 @@ public class SiteMatterEntity extends SiteMatterVo {
     public void setDeptName(String deptName){
         this.deptName = deptName;
     }
+    /**
+     * 获取 事项类型
+     * @return String
+     */
+    public String getEventTypeShow(){
+        return eventTypeShow;
+    }
+    /**
+     * 设置 事项类型
+     * @param eventTypeShow
+     */
+    public void setEventTypeShow(String eventTypeShow){
+        this.eventTypeShow = eventTypeShow;
+    }
     /**
      * 获取 事项来源
      * @return Integer
@@ -206,6 +224,7 @@ public class SiteMatterEntity extends SiteMatterVo {
         sb.append(",matterCode:").append(getMatterCode());
         sb.append(",deptId:").append(getDeptId());
         sb.append(",deptName:").append(getDeptName());
+        sb.append(",eventTypeShow:").append(getEventTypeShow());
         sb.append(",source:").append(getSource());
         sb.append(",deptCode:").append(getDeptCode());
         return sb.toString();
@@ -213,7 +232,7 @@ public class SiteMatterEntity extends SiteMatterVo {
 
     public void initAttrValue(){
 
-        this.siteId = -1L;
+        this.siteId = null;
 
         this.siteName = "";
 
@@ -227,6 +246,8 @@ public class SiteMatterEntity extends SiteMatterVo {
 
         this.deptName = "";
 
+        this.eventTypeShow = "";
+
         this.source = 0;
 
         this.deptCode = "";

base-manager/src/main/java/com/mortals/xhx/module/site/service/impl/SiteServiceImpl.java

@@ -22,6 +22,7 @@ import com.mortals.xhx.feign.user.IUserFeign;
 import com.mortals.xhx.module.area.model.AreaEntity;
 import com.mortals.xhx.module.area.model.AreaQuery;
 import com.mortals.xhx.module.area.service.AreaService;
+import com.mortals.xhx.module.dept.model.DeptEntity;
 import com.mortals.xhx.module.dept.service.DeptService;
 import com.mortals.xhx.module.matter.model.MatterEntity;
 import com.mortals.xhx.module.matter.model.MatterQuery;
@@ -431,8 +432,9 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE
                     log.info("需要添加事项数量====" + subList.size());
                     //差集进行插入并更新详细数据
                     if (!ObjectUtils.isEmpty(subList)) {
-
                         for (MatterEntity matterEntity : subList) {
+                            DeptEntity deptCache = deptService.getExtCache(matterEntity.getDeptCode());
+                            matterEntity.setDeptName(deptCache == null ? "" : deptCache.getName());
                             matterService.save(matterEntity, context);
                         }