自动化代码生成优化

admin

2021-10-13 052e1d5c47c4e536fde79074d53b0481c7d4f9b6

 src/main/java/org/yeshi/utils/generater/vo/dao/MyBatisDBDaoVO.java

@@ -2,6 +2,7 @@

import org.springframework.data.annotation.Id;
import org.springframework.data.annotation.Transient;
import org.yeshi.utils.StringUtil;
import org.yeshi.utils.generater.annotation.admin.DaoQueryCondition;
import org.yeshi.utils.generater.entity.*;
import org.yeshi.utils.generater.mybatis.Column;
@@ -119,6 +120,7 @@
                    //主键
                    if (a instanceof Id) {
                        identity = columData;
                        identity.setType(fd.getType().getName());
                        valid = false;
                        break;
                    }
@@ -134,7 +136,12 @@
                //获取查询条件
                for (Annotation a : as) {
                    if (a instanceof DaoQueryCondition) {
                        daoQueryColumnList.add(new DaoQueryColumnData(columData.getProperty(), columData, fd.getType().getSimpleName(), ((DaoQueryCondition) a).queryType()));
                        if (fd.getType().getSimpleName().equalsIgnoreCase("Date")) {
                            daoQueryColumnList.add(new DaoQueryColumnData("max" + StringUtil.firstCharToUpper(columData.getProperty()), columData, fd.getType().getSimpleName(), DaoQueryCondition.QueryType.lt));
                            daoQueryColumnList.add(new DaoQueryColumnData("min" + StringUtil.firstCharToUpper(columData.getProperty()), columData, fd.getType().getSimpleName(), DaoQueryCondition.QueryType.gte));
                        } else {
                            daoQueryColumnList.add(new DaoQueryColumnData(columData.getProperty(), columData, fd.getType().getSimpleName(), ((DaoQueryCondition) a).queryType()));
                        }
                        break;
                    }
                }