2024-10-09 销售业绩产品类型调整

src/main/java/com/baosight/hggp/hg/yx/domain/HGYX006.java

@@ -80,7 +80,7 @@ public class HGYX006 extends DaoEPBase {
 	private Integer deleteFlag = 0;	/* 是否删除0.否1.是*/
 	private String productCode = " ";		/* 产品编码*/
 	private String productName = " ";		/* 产品名称*/
-	private Boolean productType;	/* 产品类型*/
+	private String productType = " ";	/* 产品类型*/
 	private String productPecu = " ";		/* 产品特性*/
 	private String productGood = " ";		/* 产品卖点*/
 	private BigDecimal productPrice = new BigDecimal(0.00);		/* 产品定价*/
@@ -378,7 +378,7 @@ public class HGYX006 extends DaoEPBase {
 	 * get the productType - 产品类型.
 	 * @return the productType
 	 */
-	public Boolean getProductType() {
+	public String getProductType() {
 		return this.productType;
 	}
 
@@ -387,7 +387,7 @@ public class HGYX006 extends DaoEPBase {
 	 *
 	 * @param productType - 产品类型
 	 */
-	public void setProductType(Boolean productType) {
+	public void setProductType(String productType) {
 		this.productType = productType;
 	}
 	/**
@@ -490,7 +490,7 @@ public class HGYX006 extends DaoEPBase {
 		setDeleteFlag(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_DELETE_FLAG)), deleteFlag));
 		setProductCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PRODUCT_CODE)), productCode));
 		setProductName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PRODUCT_NAME)), productName));
-		setProductType(NumberUtils.toBoolean(StringUtils.toString(map.get(FIELD_PRODUCT_TYPE)), productType));
+		setProductType(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PRODUCT_TYPE)), productType));
 		setProductPecu(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PRODUCT_PECU)), productPecu));
 		setProductGood(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PRODUCT_GOOD)), productGood));
 		setProductPrice(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_PRODUCT_PRICE)), productPrice));

src/main/webapp/HG/YX/HGYX006.jsp

@@ -96,7 +96,7 @@
                              enable="false"/>
             </EF:EFGrid>
         </div>
-        <div title="营销调查">
+        <div title="营销资源">
             <EF:EFGrid blockId="resultC" autoDraw="override" autoBind="false" needAuth="false" serviceName="HGYX009">
                 <EF:EFColumn ename="id" primaryKey="true" cname="内码" hidden="true"/>
                 <EF:EFColumn ename="companyCode" cname="企业编码" hidden="true"/>