2024-10-09 营销管理优化

src/main/java/com/baosight/hpjx/hp/wd/sql/HPWD009.xml

@@ -59,7 +59,7 @@
                 $orderBy$
             </isNotEmpty>
             <isEmpty property="orderBy">
-                T.ID asc
+                T.ID DESC
             </isEmpty>
         </dynamic>
     </sql>
@@ -79,7 +79,7 @@
         FROM ${hpjxSchema}.T_HPWD009 T
         INNER JOIN ${platSchema}.XS_USER B ON T.USER_ID = B.LOGIN_NAME
         LEFT JOIN ${platSchema}.TXSOG02 C ON B.USER_ID = C.USER_ID
-        LEFT JOIN ${platSchema}.TXSOG01 D ON C.ORG_ID = D.ORG_ID
+        LEFT JOIN ${platSchema}.TXSOG01 D ON D.ORG_ID = T.FACTORY_CODE
         WHERE 1=1
         <include refid="condition"/>
         <include refid="orderBy"/>
@@ -88,8 +88,7 @@
     <select id="count" resultClass="int">
         SELECT COUNT(*) FROM ${hpjxSchema}.T_HPWD009 T
         INNER JOIN ${platSchema}.XS_USER B ON T.USER_ID = B.LOGIN_NAME
-        LEFT JOIN ${platSchema}.TXSOG02 C ON B.USER_ID = C.USER_ID
-        LEFT JOIN ${platSchema}.TXSOG01 D ON C.ORG_ID = D.ORG_ID
+        LEFT JOIN ${platSchema}.TXSOG01 D ON D.ORG_ID = T.FACTORY_CODE
         WHERE 1=1
         <include refid="condition"/>
     </select>

src/main/java/com/baosight/hpjx/hp/yx/domain/HPYX006.java

@@ -79,7 +79,7 @@ public class HPYX006 extends DaoEPBase {
 	private Integer deleteFlag = 0;	/* 是否删除0.否1.是*/
 	private String productCode = " ";		/* 产品编码*/
 	private String productName = " ";		/* 产品名称*/
-	private Boolean productType;	/* 产品类型*/
+	private Integer productType;	/* 产品类型*/
 	private String productPecu = " ";		/* 产品特性*/
 	private String productGood = " ";		/* 产品卖点*/
 	private BigDecimal productPrice = new BigDecimal(0.00);		/* 产品定价*/
@@ -377,7 +377,7 @@ public class HPYX006 extends DaoEPBase {
 	 * get the productType - 产品类型.
 	 * @return the productType
 	 */
-	public Boolean getProductType() {
+	public Integer getProductType() {
 		return this.productType;
 	}
 
@@ -386,7 +386,7 @@ public class HPYX006 extends DaoEPBase {
 	 *
 	 * @param productType - 产品类型
 	 */
-	public void setProductType(Boolean productType) {
+	public void setProductType(Integer productType) {
 		this.productType = productType;
 	}
 	/**
@@ -489,7 +489,7 @@ public class HPYX006 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(NumberUtils.toInteger(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/HP/YX/HPYX006.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="HPYX009">
                 <EF:EFColumn ename="id" primaryKey="true" cname="内码" hidden="true"/>
                 <EF:EFColumn ename="companyCode" cname="企业编码" hidden="true"/>