合并分支 'dev' 到 '2020.08.10【669】'

Dev

查看合并请求 !30

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

@@ -723,9 +723,7 @@ public class ${item.getCodeName()}ServiceImpl extends ServiceImpl<${de.getCodeNa
         if(!ObjectUtils.isEmpty(et.get${MajorKeyFieldCodeName}())){
             ${pub.getPKGCodeName()}.core.${MajorEntity.getPSSystemModule().getCodeName()?lower_case}.domain.${MajorEntity.getCodeName()} ${MajorEntityName}=et.get${MajorEntityName?cap_first}();
             if(ObjectUtils.isEmpty(${MajorEntityName})){
-                ${pub.getPKGCodeName()}.core.${MajorEntity.getPSSystemModule().getCodeName()?lower_case}.domain.${MajorEntity.getCodeName()} majorEntity=${MajorEntityService}.getById(et.get${MajorKeyFieldCodeName}());
-                if(ObjectUtils.isEmpty(majorEntity))
-                    return;
+                ${pub.getPKGCodeName()}.core.${MajorEntity.getPSSystemModule().getCodeName()?lower_case}.domain.${MajorEntity.getCodeName()} majorEntity=${MajorEntityService}.get(et.get${MajorKeyFieldCodeName}());
                 et.set${MajorEntityName?cap_first}(majorEntity);
                 ${MajorEntityName}=majorEntity;
             }

SLN/%PUBPRJ%-core/src/main/resources/sysmodel/%SYS%.json.ftl

@@ -64,8 +64,8 @@ TARGET=PSSYSTEM
     {"name":"${majorPSDER.name}",
      "relation_type":"${majorPSDER.getDERType()}",
      "code_name":"${majorPSDER.getCodeName()}",
-     "entity_name":"${majorPSDER.getMajorPSDataEntity().name}",
-     "ref_entity_name":"${majorPSDER.getMinorPSDataEntity().name}"
+     "entity_name":"${majorPSDER.getMinorPSDataEntity().name}",
+     "ref_entity_name":"${majorPSDER.getMajorPSDataEntity().name}"
      <#--"nested_name":"",-->
      <#--"lookup":""-->
     }<#if majorPSDER_has_next>,</#if>
@@ -78,8 +78,8 @@ TARGET=PSSYSTEM
     {"name":"${minorPSDER.name}",
      "relation_type":"${minorPSDER.getDERType()}",
      "code_name":"${minorPSDER.getCodeName()}",
-     "entity_name":"${minorPSDER.getMajorPSDataEntity().name}",
-     "ref_entity_name":"${minorPSDER.getMinorPSDataEntity().name}"
+     "entity_name":"${minorPSDER.getMinorPSDataEntity().name}",
+     "ref_entity_name":"${minorPSDER.getMajorPSDataEntity().name}"
      <#--"nested_name":"",-->
      <#--"lookup":""-->
     }<#if minorPSDER_has_next>,</#if>

SLN/%PUBPRJ%-provider/%PUBPRJ%-provider-%SYSAPI_PKGPATH%/src/main/java/%SYS_PKGPATH%/%SYSAPI_PKGPATH%/dto/%ITEM%DTO.java.ftl

@@ -23,6 +23,8 @@ import java.math.BigDecimal;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.alibaba.fastjson.annotation.JSONField;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
@@ -66,6 +68,10 @@ public class ${item.getCodeName()}DTO extends ${dtoBase} implements Serializable
     @JSONField(name = "${jsonfield}")
             </#if>
     @JsonProperty("${jsonfield}")
+    <#comment>Long型数据转String,解决前端精度丢失问题</#comment>
+    <#if srfr7javatype(apifield.getStdDataType())=='Long'>
+    @JsonSerialize(using = ToStringSerializer.class)
+    </#if>
     <@valueRule defield />
     private ${srfr7javatype(apifield.getStdDataType())} ${prvateCodeName};