From 2d586372a987e4e93eae0fd9ea236386b6ab6b87 Mon Sep 17 00:00:00 2001 From: yujh Date: Tue, 11 Feb 2025 15:02:48 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0ext5,ext6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pal/pal/repository/dao/PALRepository.java | 22 ++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/dao/PALRepository.java b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/dao/PALRepository.java index aa162e04..fe717903 100755 --- a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/dao/PALRepository.java +++ b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/dao/PALRepository.java @@ -341,6 +341,8 @@ public class PALRepository extends DaoObject { .append(PALRepositoryModelImpl.FIELD_PL_EXT2).append(",") .append(PALRepositoryModelImpl.FIELD_PL_EXT3).append(",") .append(PALRepositoryModelImpl.FIELD_PL_EXT4).append(",") + .append(PALRepositoryModelImpl.FIELD_PL_EXT5).append(",") + .append(PALRepositoryModelImpl.FIELD_PL_EXT6).append(",") .append(PALRepositoryModelImpl.FIELD_SECURITY_LEVEL).append(")") .append(" VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)"); prest = conn.prepareStatement(sql.toString(), ResultSet.TYPE_SCROLL_SENSITIVE, ResultSet.CONCUR_READ_ONLY); @@ -388,10 +390,12 @@ public class PALRepository extends DaoObject { prest.setString(40, model.getExt2()); prest.setString(41, model.getExt3()); prest.setString(42, model.getExt4()); + prest.setString(43, model.getExt5()); + prest.setString(44, model.getExt6()); if (null == model.getSecurityLevel()){ - prest.setInt(43, -1); + prest.setInt(45, -1); }else{ - prest.setInt(43, model.getSecurityLevel()); + prest.setInt(46, model.getSecurityLevel()); } prest.addBatch(); } @@ -476,6 +480,8 @@ public class PALRepository extends DaoObject { model.setExt2(rs.getString(PALRepositoryModelImpl.FIELD_PL_EXT2)); model.setExt3(rs.getString(PALRepositoryModelImpl.FIELD_PL_EXT3)); model.setExt4(rs.getString(PALRepositoryModelImpl.FIELD_PL_EXT4)); + model.setExt5(rs.getString(PALRepositoryModelImpl.FIELD_PL_EXT5)); + model.setExt6(rs.getString(PALRepositoryModelImpl.FIELD_PL_EXT6)); //三员管理-密级 model.setSecurityLevel(rs.getInt(PALRepositoryModelImpl.FIELD_SECURITY_LEVEL)); model.setConvertCount(rs.getInt(PALRepositoryModelImpl.FIELD_CONVERT_COUNT)); @@ -534,6 +540,8 @@ public class PALRepository extends DaoObject { + PALRepositoryModelImpl.FIELD_PL_EXT2 + "=?, " + PALRepositoryModelImpl.FIELD_PL_EXT3 + "=?, " + PALRepositoryModelImpl.FIELD_PL_EXT4 + "=?," + + PALRepositoryModelImpl.FIELD_PL_EXT5 + "=?," + + PALRepositoryModelImpl.FIELD_PL_EXT6 + "=?," + PALRepositoryModelImpl.FIELD_SECURITY_LEVEL +"=?" + " where " + PALRepositoryModelImpl.FIELD_UUID + "=?"; @@ -618,7 +626,7 @@ public class PALRepository extends DaoObject { model.getMethodCategory(), model.getMethodId(), model.getVersion(), model.getVersionId(), filePath, model.isUse() ? 1 : 0, input, out, model.isPublish() ? 1 : 0, createUser, createDate, modifyUser, modifyDate, model.getViewCount(), dutyDept, dutyUser, lockUser, model.isStop() ? 1 : 0, - model.isApproval() ? 1 : 0, model.getExt1(), model.getExt2(), model.getExt3(), model.getExt4(), securityLevel, + model.isApproval() ? 1 : 0, model.getExt1(), model.getExt2(), model.getExt3(), model.getExt4() ,model.getExt5() ,model.getExt6(), securityLevel, model.getId() }; int r = DBSql.update(sql, args); if (r > 0) { @@ -633,7 +641,7 @@ public class PALRepository extends DaoObject { if (UtilString.isEmpty(model.getId()) || plModel == null) { return -1; } - String sql = "UPDATE " + PALRepositoryModelImpl.DATABASE_ENTITY + " set " + PALRepositoryModelImpl.FIELD_IS_USE + "=?, " + PALRepositoryModelImpl.FIELD_PL_ISPUBLISH + "=?, " + PALRepositoryModelImpl.FIELD_PL_ISSTOP + "=?, " + PALRepositoryModelImpl.FIELD_PL_ISAPPROVAL + "=?, " + PALRepositoryModelImpl.FIELD_PL_EXT1 + "=?, " + PALRepositoryModelImpl.FIELD_PL_EXT2 + "=?, " + PALRepositoryModelImpl.FIELD_PL_EXT3 + "=?, " + PALRepositoryModelImpl.FIELD_PL_EXT4 + "=?, " + PALRepositoryModelImpl.FIELD_PL_MODIFYUSER + "=?, " + PALRepositoryModelImpl.FIELD_PL_MODIFYDATE + "=? where " + PALRepositoryModelImpl.FIELD_UUID + "=?"; + String sql = "UPDATE " + PALRepositoryModelImpl.DATABASE_ENTITY + " set " + PALRepositoryModelImpl.FIELD_IS_USE + "=?, " + PALRepositoryModelImpl.FIELD_PL_ISPUBLISH + "=?, " + PALRepositoryModelImpl.FIELD_PL_ISSTOP + "=?, " + PALRepositoryModelImpl.FIELD_PL_ISAPPROVAL + "=?, " + PALRepositoryModelImpl.FIELD_PL_EXT1 + "=?, " + PALRepositoryModelImpl.FIELD_PL_EXT2 + "=?, " + PALRepositoryModelImpl.FIELD_PL_EXT3 + "=?, " + PALRepositoryModelImpl.FIELD_PL_EXT4 + "=?, "+ PALRepositoryModelImpl.FIELD_PL_EXT5 + "=?, "+ PALRepositoryModelImpl.FIELD_PL_EXT6 + "=?, " + PALRepositoryModelImpl.FIELD_PL_MODIFYUSER + "=?, " + PALRepositoryModelImpl.FIELD_PL_MODIFYDATE + "=? where " + PALRepositoryModelImpl.FIELD_UUID + "=?"; Object[] args = { model.isUse() ? 1 : 0, model.isPublish() ? 1 : 0, model.isStop() ? 1 : 0, model.isApproval() ? 1 : 0, model.getExt1(), model.getExt2(), model.getExt3(), model.getExt4(), model.getModifyUser(), model.getModifyDate(), model.getId()}; int r = DBSql.update(sql, args); if (r > 0) { @@ -645,6 +653,8 @@ public class PALRepository extends DaoObject { plModel.setExt2(model.getExt2()); plModel.setExt3(model.getExt3()); plModel.setExt4(model.getExt4()); + plModel.setExt4(model.getExt5()); + plModel.setExt4(model.getExt6()); plModel.setModifyDate(model.getModifyDate()); plModel.setModifyUser(model.getModifyUser()); PALRepositoryCache.getCache().put(model.getId(), plModel); @@ -716,6 +726,8 @@ public class PALRepository extends DaoObject { + PALRepositoryModelImpl.FIELD_PL_EXT2 + "=?, " + PALRepositoryModelImpl.FIELD_PL_EXT3 + "=?, " + PALRepositoryModelImpl.FIELD_PL_EXT4 + "=? " + + PALRepositoryModelImpl.FIELD_PL_EXT5 + "=? " + + PALRepositoryModelImpl.FIELD_PL_EXT6 + "=? " + " where " + PALRepositoryModelImpl.FIELD_UUID + "=?"; String filePath = ""; @@ -795,7 +807,7 @@ public class PALRepository extends DaoObject { model.getMethodCategory(), model.getMethodId(), model.getVersion(), model.getVersionId(), filePath, model.isUse() ? 1 : 0, input, out, model.isPublish() ? 1 : 0, createUser, createDate, modifyUser, modifyDate, model.getViewCount(), dutyDept, dutyUser, lockUser, model.isStop() ? 1 : 0, - model.isApproval() ? 1 : 0, model.getExt1(), model.getExt2(), model.getExt3(), model.getExt4(), + model.isApproval() ? 1 : 0, model.getExt1(), model.getExt2(), model.getExt3(), model.getExt4(),model.getExt5(),model.getExt6(), model.getId() }; int r = DBSql.update(conn, sql, args); if (r > 0) {