实体数据导入

SLN/%PUBPRJ%-core/src/main/java/%SYS_PKGPATH%/core/%MOD_PKGPATH%/mapping/%DE%%ITEM%.java.ftl

@@ -12,7 +12,7 @@ public interface ${de.codeName}${item.codeName} {
 
     <#if item.getPSDEDataImportItems?? && item.getPSDEDataImportItems()??>
     @Mappings({
-        <#list de.getPSDEDataImportItems as importItem>
+        <#list item.getPSDEDataImportItems as importItem>
             <#if importItem.getPSDEField()??>
             <#assign deFieldName = srfcaseformat(importItem.getPSDEField().getCodeName(),'l_u2lC') >
             @Mapping(target = "${deFieldName}",source = "${deFieldName}"),

SLN/%PUBPRJ%-core/src/main/java/%SYS_PKGPATH%/core/%MOD_PKGPATH%/service/impl/%DE%ServiceImpl.java.ftl

@@ -96,6 +96,7 @@ import ${pub.getPKGCodeName()}.core.${item.getPSSystemModule().getCodeName()?low
 import ${pub.getPKGCodeName()}.core.${item.getPSSystemModule().getCodeName()?lower_case}.service.I${de.getCodeName()}Service;
 
 import ${pub.getPKGCodeName()}.util.helper.CachedBeanCopier;
+import ${pub.getPKGCodeName()}.util.helper.DEFieldCacheMap;
 
 <#comment>SQL存储-Mybatis</#comment>
 <#if de.getStorageMode()==1>
@@ -2443,7 +2444,7 @@ ${deaction.getRender().code}
     /**
      * 上传数据检查
      * @param entities
-     * @param mode
+     * @param isIgnoreError
      * @return
      */
     private JSONObject testImportData(List<${de.codeName}> entities,boolean isIgnoreError) {
@@ -2463,7 +2464,7 @@ ${deaction.getRender().code}
         }
         //主键重复性判断.外键约束判断（上传数据自身的检查/数据库的检查）
         for(int i=0;i<entities.size();i++) {
-        ${de.codeName} entity = entities.get(i);
+            ${de.codeName} entity = entities.get(i);
             Object id = entity.get(keyField);
             if(ObjectUtils.isEmpty(id)) {
                 id = entity.getDefaultKey(true);
@@ -2490,17 +2491,18 @@ ${deaction.getRender().code}
                 <#if MinorPSDER?? && MinorPSDER.getDERType()=='DER1N' && (MinorPSDER.getMajorPSDataEntity().getStorageMode()==1||MinorPSDER.getMajorPSDataEntity().getStorageMode()==2||MinorPSDER.getMajorPSDataEntity().getStorageMode()==4)>
                     <#if MinorPSDER.getMajorPSDataEntity?? && MinorPSDER.getMajorPSDataEntity()?? && MinorPSDER.getCodeName?? && MinorPSDER.getCodeName()??>
                         <#assign MajorKeyFieldCodeName =srfcaseformat(MinorPSDER.getPSPickupDEField().codeName,'l_u2lC')?cap_first>
+                        <#assign MajorEntity=MinorPSDER.getMajorPSDataEntity()>
                         <#assign MajorEntityCodeName=MinorPSDER.getMajorPSDataEntity().codeName>
                         <#assign MajorEntityService=srfcaseformat(MinorPSDER.getMajorPSDataEntity().getCodeName(),'l_u2lC')+"Service">
         //实体关系[${MinorPSDER.name}]
-        if(!ObjectUtils.isEmpty(et.get${MajorKeyFieldCodeName}())){
-                        ${MajorEntityCodeName} fkEntity=${MajorEntityService}.getById(et.get${MajorKeyFieldCodeName}());
+        if(!ObjectUtils.isEmpty(entity.get${MajorKeyFieldCodeName}())){
+                ${pub.getPKGCodeName()}.core.${MajorEntity.getPSSystemModule().getCodeName()?lower_case}.domain.${MajorEntityCodeName} fkEntity=${MajorEntityService}.getById(entity.get${MajorKeyFieldCodeName}());
                 if(ObjectUtils.isEmpty(fkEntity)){
                     Integer lineNum = i + 1;
                     errorLines.add(lineNum);
-                    errorMsgs.add(String.format("第" + lineNum + "行：[%s]父数据有误。",et.get${MajorKeyFieldCodeName}()));
+                    errorMsgs.add(String.format("第" + lineNum + "行：[%s]父数据有误。",entity.get${MajorKeyFieldCodeName}()));
                     if(isIgnoreError){
-                        et.set${MajorKeyFieldCodeName}(null);
+                        entity.set${MajorKeyFieldCodeName}(null);
                         continue;
                     }
                     else{
@@ -2532,7 +2534,7 @@ ${deaction.getRender().code}
      * 实体数据导入
      * @param entities
      * @param batchSize
-     * @param mode
+     * @param isIgnoreError
      * @return
      */
     @Override

SLN/%PUBPRJ%-provider/%PUBPRJ%-provider-%SYSAPI_PKGPATH%/src/main/java/%SYS_PKGPATH%/%SYSAPI_PKGPATH%/rest/%ITEM%Resource.java.ftl

@@ -645,7 +645,7 @@ public class ${itemCodeName}Resource {
             }
             <#else>
             else if(config.equals("${deImport.codeName}")){
-                rs=${deCodeNameLC}Service.importData(${deImport.codeName?lower_case}ImpMapping.toDomain(dtos),${deImport.getBatchSize()},${deImport.isIgnoreError()?c});
+                rs=${deCodeNameLC}Service.importData(${deImport.codeName?lower_case}ImpMapping.toDomain(dtos),${deImport.getBatchSize()?c},${deImport.isIgnoreError()?c});
             }
             </#if>
             </#list>