Merge branch 'dev'

src/main/java/com/baosight/hpjx/hp/pz/service/ServiceHPPZ015A.java

@@ -50,11 +50,11 @@ public class ServiceHPPZ015A extends ServiceBase {
 			CommonMethod.initBlock(inInfo,
 					Arrays.asList(DdynamicEnum.INVENT_NAME_BLOCK_ID, DdynamicEnum.CODESET_CODE_BLOCK_ID), map,
 					false);
-			Map queryMap = EiInfoUtils.getFirstRow(inInfo);
-			String id = MapUtils.getString(queryMap, "projId");
-			HPSC001 hpsc001 = HPSCTools.HpSc001.getId(id);
-			HPPZ015A hppz015A = new HPPZ015A();
-			hppz015A.setProjCode(hpsc001.getProjCode());
+//			Map queryMap = EiInfoUtils.getFirstRow(inInfo);
+//			String id = MapUtils.getString(queryMap, "projId");
+//			HPPZ015 hppz015 = HPPZTools.HpPz015.getId(id);
+//			HPPZ015A hppz015A = new HPPZ015A();
+//			hppz015A.setProjCode(hppz015.getProjCode());
 			inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HPPZ015A().eiMetadata);
 		} catch (Exception e) {
 			LogUtils.setDetailMsg(inInfo, e, "初始化失败");

src/main/java/com/baosight/hpjx/hp/pz/tools/HPPZTools.java

@@ -699,6 +699,23 @@ public class HPPZTools {
 			AssertUtils.isEmpty(results, String.format("部件编码[%s]信息不存在", prdtCode));
 			return results.get(0);
 		}
+
+		/**
+		 * 查询
+		 *
+		 * @param id
+		 * @return
+		 */
+		public static HPPZ015 getId(String id) {
+			AssertUtils.isEmpty(id, "项目编码不能为空");
+			String companyCode = UserSessionUtils.getCompanyCode();
+			Map queryMap = new HashMap();
+			queryMap.put("id", id);
+			queryMap.put("companyCode", companyCode);
+			List<HPPZ015> results = DaoBase.getInstance().query(HPPZ015.QUERY, queryMap);
+			AssertUtils.isNull(results.get(0).getProjCode(), String.format("项目名[%s]信息不存在", id));
+			return results.get(0);
+		}
 	}
 
 	/**

src/main/java/com/baosight/hpjx/hp/rz/sql/HPRZ001.xml

@@ -3,7 +3,7 @@
 	<!--      table information
 		Generate time : 2024-02-23 15:28:50
    		Version :  1.0
-		tableName :${hpjxSchema}.tsys_operation_log
+		tableName :${hpjxSchema}.sys_operation_log
 		 ID  BIGINT   NOT NULL   primarykey,
 		 COMPANY_CODE  VARCHAR   NOT NULL,
 		 CREATED_BY  VARCHAR,
@@ -40,7 +40,7 @@
 				OPER_TYPE	as "operType",  <!-- 操作类型 -->
 				OPER_DESC	as "operDesc",  <!-- 操作说明 -->
 				OPER_CONTENT	as "operContent" <!-- 操作内容 -->
-		FROM ${hpjxSchema}.tsys_operation_log WHERE 1=1
+		FROM ${hpjxSchema}.sys_operation_log WHERE 1=1
         <include refid="authCondition"/>
 		<isNotEmpty prepend=" AND " property="companyCode">
 			COMPANY_CODE = #companyCode#
@@ -72,7 +72,7 @@
 	</select>
 
 	<select id="count" resultClass="int">
-		SELECT COUNT(*) FROM ${hpjxSchema}.tsys_operation_log WHERE 1=1
+		SELECT COUNT(*) FROM ${hpjxSchema}.sys_operation_log WHERE 1=1
         <include refid="authCondition"/>
 		<isNotEmpty prepend=" AND " property="companyCode">
 			COMPANY_CODE = #companyCode#
@@ -125,7 +125,7 @@
 	-->
 
 	<insert id="insert">
-		INSERT INTO ${hpjxSchema}.tsys_operation_log (ID,  <!-- 主键id -->
+		INSERT INTO ${hpjxSchema}.sys_operation_log (ID,  <!-- 主键id -->
 										COMPANY_CODE,  <!-- 企业编码 -->
 										CREATED_BY,  <!-- 创建人 -->
 										CREATED_NAME,  <!-- 创建人名称 -->
@@ -139,12 +139,12 @@
 	</insert>
 
 	<delete id="delete">
-		DELETE FROM ${hpjxSchema}.tsys_operation_log WHERE
+		DELETE FROM ${hpjxSchema}.sys_operation_log WHERE
 			ID = #id#
 	</delete>
 
 	<update id="update">
-		UPDATE ${hpjxSchema}.tsys_operation_log
+		UPDATE ${hpjxSchema}.sys_operation_log
 		SET
 					COMPANY_CODE	= #companyCode#,   <!-- 企业编码 -->
 					CREATED_BY	= #createdBy#,   <!-- 创建人 -->
@@ -162,7 +162,7 @@
 	<select id="queryOperModulComboBox" parameterClass="java.util.HashMap" resultClass="java.util.HashMap">
 		SELECT
 		distinct OPER_MODUL	as "operModul"  <!-- 操作模块 -->
-		FROM ${hpjxSchema}.tsys_operation_log WHERE 1=1
+		FROM ${hpjxSchema}.sys_operation_log WHERE 1=1
 		<isNotEmpty prepend=" AND " property="companyCode">
 			COMPANY_CODE = #companyCode#
 		</isNotEmpty>
@@ -172,7 +172,7 @@
 	<select id="queryOperTypeComboBox" parameterClass="java.util.HashMap" resultClass="java.util.HashMap">
 		SELECT
 		distinct OPER_TYPE	as "operType"  <!-- 操作类型 -->
-		FROM ${hpjxSchema}.tsys_operation_log WHERE 1=1
+		FROM ${hpjxSchema}.sys_operation_log WHERE 1=1
 		<isNotEmpty prepend=" AND " property="companyCode">
 			COMPANY_CODE = #companyCode#
 		</isNotEmpty>