rakor
/
nflg_project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom

This commit is contained in:
大米 2024-05-22 16:54:29 +08:00
parent 5e9b6b14cf 3d92f0f87b
commit 71563c1e55
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewPbomParentMapper.xml
View File

@ -121,7 +121,7 @@
and fac_code = #{query.facCode} and fac_code = #{query.facCode}
</if> </if>
<if test="query.materialNo!= null and query.materialNo!=''"> <if test="query.materialNo!= null and query.materialNo!=''">
and material_no = #{query.materialNo} and a.material_no = #{query.materialNo}
</if> </if>
<if test="query.drawingNo!= null and query.drawingNo!=''"> <if test="query.drawingNo!= null and query.drawingNo!=''">
and drawing_no = #{query.drawingNo} and drawing_no = #{query.drawingNo}

15
nflg_project_dev/nflg-boot-base/nflg-boot-core/src/main/java/com/nflg/product/base/core/config/MybatisPlusHandler.java
View File

@ -3,6 +3,7 @@ package com.nflg.product.base.core.config;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler; import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
import com.nflg.product.base.core.conmon.util.SessionUtil; import com.nflg.product.base.core.conmon.util.SessionUtil;
import com.nflg.product.base.core.exception.NflgBusinessException;
import org.apache.ibatis.reflection.MetaObject; import org.apache.ibatis.reflection.MetaObject;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
@ -17,16 +18,24 @@ import java.time.LocalDateTime;
public class MybatisPlusHandler implements MetaObjectHandler { public class MybatisPlusHandler implements MetaObjectHandler {
@Override @Override
public void insertFill(MetaObject metaObject) { public void insertFill(MetaObject metaObject) {
this.strictInsertFill(metaObject, "createdBy", String.class, SessionUtil.getUserName()); this.strictInsertFill(metaObject, "createdBy", String.class, getUserName());
this.strictInsertFill(metaObject, "createdTime", LocalDateTime.class, LocalDateTime.now()); this.strictInsertFill(metaObject, "createdTime", LocalDateTime.class, LocalDateTime.now());
this.strictInsertFill(metaObject, "updatedBy", String.class, StrUtil.isNotBlank(SessionUtil.getRealName())?SessionUtil.getRealName() :SessionUtil.getUserName()); this.strictInsertFill(metaObject, "updatedBy", String.class, getUserName());
this.strictInsertFill(metaObject, "updatedTime", LocalDateTime.class, LocalDateTime.now()); this.strictInsertFill(metaObject, "updatedTime", LocalDateTime.class, LocalDateTime.now());
} }
@Override @Override
public void updateFill(MetaObject metaObject) { public void updateFill(MetaObject metaObject) {
this.strictInsertFill(metaObject, "updatedBy", String.class, StrUtil.isNotBlank(SessionUtil.getRealName())?SessionUtil.getRealName() :SessionUtil.getUserName()); this.strictInsertFill(metaObject, "updatedBy", String.class, getUserName());
this.strictInsertFill(metaObject, "updatedTime", LocalDateTime.class, LocalDateTime.now()); this.strictInsertFill(metaObject, "updatedTime", LocalDateTime.class, LocalDateTime.now());
} }
private String getUserName() {
try {
return StrUtil.isNotBlank(SessionUtil.getRealName()) ? SessionUtil.getRealName() : SessionUtil.getUserName();
} catch (NflgBusinessException e) {
return "admin";
}
}
} }