添加自定义导入修改

base-manager/src/main/java/com/mortals/xhx/module/matter/model/vo/MatterCustomImportEntity.java

@@ -46,7 +46,7 @@ public class MatterCustomImportEntity extends BaseEntityLong {
     /**
      * 事项详情链接
      */
-    @Excel(name = "办事指南地址", type = Excel.Type.IMPORT)
+    @Excel(name = "办事指南地址")
     private String url;
 
 

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

@@ -2113,10 +2113,7 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter
                     matterEntity.setDeptCode(deptEntity.getDeptNumber());
                     this.update(matterEntity);
                 }
-
-
                 //todo 固定新增办事流程
-
                 ArrayList<MatterFlowlimitEntity> matterFlowlimitEntities = new ArrayList<>();
 
                 MatterFlowlimitEntity matterFlowlimitEntity = new MatterFlowlimitEntity();
@@ -2159,8 +2156,14 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter
 
                 SucessCount++;
             } else {
-                log.info("事项已存在：" + matterEntity.getMatterName());
-                failCount++;
+                log.info("事项已存在,更新事项：" + matterEntity.getMatterName());
+                BeanUtils.copyProperties(matterCustomImportEntity, matterEntity, new String[]{"areaCode", "deptName", "matterName"});
+                matterEntity.setMatterNo(RandomUtil.randomString(12));
+
+                matterEntity.setUpdateTime(new Date());
+                matterEntity.setUpdateUserId(1L);
+                this.dao.update(matterEntity);
+                // failCount++;
             }
         }