修复

modules/ibizlab-generator-core/src/main/java/cn/ibizlab/codegen/model/ApiDtoFieldModel.java

@@ -28,7 +28,7 @@ public class ApiDtoFieldModel extends BaseModel {
         this.apiDto = apiDto;
         this.type = iPSDEMethodDTOField.getType();
         this.setCodeName(iPSDEMethodDTOField.getName());
-        this.setName(iPSDEMethodDTOField.getName());
+        this.setName(iPSDEMethodDTOField.getPSDEField()==null?iPSDEMethodDTOField.getName():iPSDEMethodDTOField.getPSDEField().getName());
     }
 
     public IPSDEMethodDTOField getPSDEMethodDTOField() {
@@ -56,6 +56,35 @@ public class ApiDtoFieldModel extends BaseModel {
         return getPSDEMethodDTOField().getLogicName();
     }
 
+
+    private String format;
+    private String timeType;
+
+    public String getTimeType()
+    {
+        getFormat();
+        return timeType;
+    }
+
+    public String getFormat(){
+        if("Timestamp".equals(getJavaType())&& org.springframework.util.StringUtils.isEmpty(format)&&getPSDEMethodDTOField().getPSDEField()!=null)
+        {
+            if(getPSDEMethodDTOField().getPSDEField().getDataType().equals("DATE")||"%1$tY-%1$tm-%1$td".equalsIgnoreCase(getPSDEMethodDTOField().getPSDEField().getValueFormat())){
+                timeType="DATE";
+                format = "yyyy-MM-dd";
+            }
+            else if(getPSDEMethodDTOField().getPSDEField().getDataType().equals("TIME")||"%1$tH:%1$tM:%1$tS".equalsIgnoreCase(getPSDEMethodDTOField().getPSDEField().getValueFormat())){
+                timeType="TIME";
+                format = "HH:mm:ss";
+            }
+            else{
+                timeType="DATETIME";
+                format = "yyyy-MM-dd HH:mm:ss";
+            }
+        }
+        return format;
+    }
+
     public String getJsonName() {
         return getPSDEMethodDTOField().getName().toLowerCase();
     }

modules/ibizlab-generator-core/src/main/java/cn/ibizlab/codegen/model/EntityModel.java

@@ -74,27 +74,17 @@ public class EntityModel  extends BaseModel {
     {
         if(dataQueries==null)
             dataQueries=new LinkedHashMap<>();
-        dataQueries.put(dataSet.codeName,dataSet);
+        dataQueries.put(dataSet.getDatasetId(),dataSet);
+        if("View".equalsIgnoreCase(dataSet.codeName)&&viewDataQuery==null)
+            viewDataQuery=dataSet;
+        if(getDataEntity().getDefaultPSDEDataSet().getCodeName().equalsIgnoreCase(dataSet.codeName)&&defaultDataQuery==null)
+            defaultDataQuery=dataSet;
         return this;
     }
 
-    public DataSetModel getViewDataQuery()
-    {
-        if(dataQueries!=null)
-        {
-            return dataQueries.get("View");
-        }
-        return null;
-    }
+    private DataSetModel viewDataQuery;
 
-    public DataSetModel getDefaultDataQuery()
-    {
-        if(dataQueries!=null)
-        {
-            return dataQueries.get(getDataEntity().getDefaultPSDEDataSet().getCodeName());
-        }
-        return null;
-    }
+    private DataSetModel defaultDataQuery;
 
     private List<DataSetModel> dataSets;
 
@@ -786,6 +776,8 @@ public class EntityModel  extends BaseModel {
                     if(dataQuery.getAllPSDEDataQueryCodes()!=null)
                     {
                         dataQuery.getAllPSDEDataQueryCodes().forEach(dq->{
+                            if(StringUtils.isEmpty(dq.getQueryCode()))
+                                return;
                             String select=TransUtils.contextParamConvert(dq.getQueryCode());
                             String where=null;
                             if(dq.getPSDEDataQueryCodeConds()!=null)

modules/ibizlab-generator-core/src/main/resources/templ/r7/{{projectName}}-core/src/main/java/{{packageName}}/core/{{modules}}/service/impl/{{entities@SQL}}ServiceImpl.java.hbs

@@ -23,6 +23,7 @@ import org.springframework.data.domain.Pageable;
 import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
 import org.springframework.util.Assert;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Value;
 import cn.ibizlab.util.errors.BadRequestAlertException;
 {{#system.enableGlobalTransaction}}
@@ -74,7 +75,7 @@ public class {{entity.codeName}}ServiceImpl extends ServiceImpl<{{entity.codeNam
     public {{entity.codeName}} get({{entity.codeName}} et) {
         {{entity.codeName}} rt = this.baseMapper.selectEntity(et);
         Assert.notNull(rt,"数据不存在,{{entity.logicName}}:"+et.get{{pascalCase entity.keyField.codeName}}());
-        CachedBeanCopier.copy(rt, et);
+        BeanUtils.copyProperties(rt, et);
         {{#entity.nesteds}}
             {{#unless listCode}}
                 {{#unless columnName}}

modules/ibizlab-generator-core/src/main/resources/templ/r7/{{projectName}}-core/src/main/resources/mapper/{{modules}}/{{entities}}/{{entities@SQL}}Mapper.xml.hbs

@@ -110,7 +110,7 @@
 
     {{/each}}
     {{#each entity.dataSets}}
-    <select id="search{{pascalCase codeName}}"  parameterType="{{packageName}}.core.{{entity.module}}.filter.{{entity.codeName}}SearchContext"  resultType={{#if enableGroup}}"java.util.HashMap"{{else}}"{{entity.codeName}}ResultMap"{{/if}}>
+    <select id="search{{pascalCase codeName}}"  parameterType="{{packageName}}.core.{{entity.module}}.filter.{{entity.codeName}}SearchContext"  {{#if enableGroup}}resultType="java.util.HashMap"{{else}}resultMap="{{entity.codeName}}ResultMap"{{/if}}>
         {{select}} 
         from (
             {{#each queries}}