2024-10-09 营销管理新增优化

src/main/java/com/baosight/hpjx/hp/yx/service/ServiceHPYX001.java

@@ -16,6 +16,7 @@ import com.baosight.iplat4j.core.ei.EiConstant;
 import com.baosight.iplat4j.core.ei.EiInfo;
 import com.baosight.iplat4j.core.service.impl.ServiceEPBase;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -61,6 +62,7 @@ public class ServiceHPYX001 extends ServiceEPBase {
     public EiInfo save(EiInfo inInfo) {
         try {
             List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();
+            List<HPYX001> list = new ArrayList<>();
             // 写入数据
             for (Map resultRow : resultRows) {
                 HPYX001 hpyx001 = new HPYX001();
@@ -70,7 +72,9 @@ public class ServiceHPYX001 extends ServiceEPBase {
                 } else {
                     this.modify(hpyx001);
                 }
+                list.add(hpyx001);
             }
+            inInfo.getBlock(EiConstant.resultBlock).setRows(list);
             inInfo.setStatus(EiConstant.STATUS_DEFAULT);
             inInfo.setMsg("操作成功！本次对[" + resultRows.size() + "]条数据保存成功!");
         } catch (Exception e) {

src/main/java/com/baosight/hpjx/hp/yx/service/ServiceHPYX002.java

@@ -3,6 +3,7 @@ package com.baosight.hpjx.hp.yx.service;
 import com.baosight.hpjx.aspect.annotation.OperationLogAnnotation;
 import com.baosight.hpjx.core.constant.CommonConstant;
 import com.baosight.hpjx.core.dao.DaoUtils;
+import com.baosight.hpjx.hp.yx.domain.HPYX001;
 import com.baosight.hpjx.hp.yx.domain.HPYX002;
 import com.baosight.hpjx.hp.yx.domain.HPYX003;
 import com.baosight.hpjx.util.DateUtils;
@@ -15,6 +16,7 @@ import com.baosight.iplat4j.core.exception.PlatException;
 import com.baosight.iplat4j.core.resource.I18nMessages;
 import com.baosight.iplat4j.core.service.impl.ServiceEPBase;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -70,6 +72,7 @@ public class ServiceHPYX002 extends ServiceEPBase {
         try {
             List<Map> resultRows = inInfo.getBlock("resultA").getRows();
             // 写入数据
+            List<HPYX002> list = new ArrayList<>();
             for (Map resultRow : resultRows) {
                 HPYX002 hpyx002 = new HPYX002();
                 hpyx002.fromMap(resultRow);
@@ -78,7 +81,9 @@ public class ServiceHPYX002 extends ServiceEPBase {
                 } else {
                     this.modify(hpyx002);
                 }
+                list.add(hpyx002);
             }
+            inInfo.getBlock("resultA").setRows(list);
             inInfo.setStatus(EiConstant.STATUS_DEFAULT);
             inInfo.setMsg("操作成功！本次对[" + resultRows.size() + "]条数据保存成功!");
         } catch (Exception e) {

src/main/java/com/baosight/hpjx/hp/yx/service/ServiceHPYX003.java

@@ -16,6 +16,7 @@ import com.baosight.iplat4j.core.exception.PlatException;
 import com.baosight.iplat4j.core.resource.I18nMessages;
 import com.baosight.iplat4j.core.service.impl.ServiceEPBase;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -71,6 +72,7 @@ public class ServiceHPYX003 extends ServiceEPBase {
         try {
             List<Map> resultRows = inInfo.getBlock("resultB").getRows();
             // 写入数据
+            List<HPYX003> list = new ArrayList<>();
             for (Map resultRow : resultRows) {
                 HPYX003 hpyx003 = new HPYX003();
                 hpyx003.fromMap(resultRow);
@@ -79,7 +81,9 @@ public class ServiceHPYX003 extends ServiceEPBase {
                 } else {
                     this.modify(hpyx003);
                 }
+                list.add(hpyx003);
             }
+            inInfo.getBlock("resultB").setRows(list);
             inInfo.setStatus(EiConstant.STATUS_DEFAULT);
             inInfo.setMsg("操作成功！本次对[" + resultRows.size() + "]条数据保存成功!");
         } catch (Exception e) {

src/main/java/com/baosight/hpjx/hp/yx/service/ServiceHPYX004.java

@@ -17,6 +17,7 @@ import com.baosight.iplat4j.core.exception.PlatException;
 import com.baosight.iplat4j.core.resource.I18nMessages;
 import com.baosight.iplat4j.core.service.impl.ServiceEPBase;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -72,6 +73,7 @@ public class ServiceHPYX004 extends ServiceEPBase {
         try {
             List<Map> resultRows = inInfo.getBlock("resultC").getRows();
             // 写入数据
+            List<HPYX004> list = new ArrayList<>();
             for (Map resultRow : resultRows) {
                 HPYX004 hpyx004 = new HPYX004();
                 hpyx004.fromMap(resultRow);
@@ -80,7 +82,9 @@ public class ServiceHPYX004 extends ServiceEPBase {
                 } else {
                     this.modify(hpyx004);
                 }
+                list.add(hpyx004);
             }
+            inInfo.getBlock("resultC").setRows(list);
             inInfo.setStatus(EiConstant.STATUS_DEFAULT);
             inInfo.setMsg("操作成功！本次对[" + resultRows.size() + "]条数据保存成功!");
         } catch (Exception e) {

src/main/java/com/baosight/hpjx/hp/yx/service/ServiceHPYX005.java

@@ -18,6 +18,7 @@ import com.baosight.iplat4j.core.ei.EiInfo;
 import com.baosight.iplat4j.core.service.impl.ServiceEPBase;
 import com.baosight.iplat4j.ed.util.SequenceGenerator;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -67,13 +68,17 @@ public class ServiceHPYX005 extends ServiceEPBase {
             List<HPYX005> resultRows = MapUtils.toDaoEPBases(inInfo.getBlock(EiConstant.resultBlock).getRows(), HPYX005.class);
             List<HPYX005A> detailRows = MapUtils.toDaoEPBases(inInfo, CommonConstant.Field.DETAIL, HPYX005A.class);
             // 写入数据
+            List<HPYX005> hpyx005List = new ArrayList<>();
             for (HPYX005 hpyx005 : resultRows) {
                 if (hpyx005.getId() == null || hpyx005.getId() == 0) {
                     this.add(hpyx005, detailRows);
                 } else {
                     this.modify(hpyx005,detailRows);
                 }
+                hpyx005List.add(hpyx005);
             }
+            inInfo.getBlock(EiConstant.resultBlock).setRows(hpyx005List);
+            inInfo.getBlock(CommonConstant.Field.DETAIL).setRows(detailRows);
             inInfo.setStatus(EiConstant.STATUS_DEFAULT);
             inInfo.setMsg("操作成功！本次对[" + resultRows.size() + "]条数据保存成功!");
         } catch (Exception e) {

src/main/java/com/baosight/hpjx/hp/yx/service/ServiceHPYX006.java

@@ -5,10 +5,7 @@ import com.baosight.hpjx.common.DdynamicEnum;
 import com.baosight.hpjx.core.constant.CommonConstant;
 import com.baosight.hpjx.core.dao.DaoUtils;
 import com.baosight.hpjx.hp.constant.HPConstant;
-import com.baosight.hpjx.hp.yx.domain.HPYX006;
-import com.baosight.hpjx.hp.yx.domain.HPYX002;
-import com.baosight.hpjx.hp.yx.domain.HPYX003;
-import com.baosight.hpjx.hp.yx.domain.HPYX007;
+import com.baosight.hpjx.hp.yx.domain.*;
 import com.baosight.hpjx.util.CommonMethod;
 import com.baosight.hpjx.util.DateUtils;
 import com.baosight.hpjx.util.LogUtils;
@@ -18,6 +15,7 @@ import com.baosight.iplat4j.core.ei.EiInfo;
 import com.baosight.iplat4j.core.service.impl.ServiceEPBase;
 import com.baosight.iplat4j.ed.util.SequenceGenerator;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -65,6 +63,7 @@ public class ServiceHPYX006 extends ServiceEPBase {
         try {
             List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();
             // 写入数据
+            List<HPYX006> hpyx006s = new ArrayList<>();
             for (Map resultRow : resultRows) {
                 HPYX006 hpyx006 = new HPYX006();
                 hpyx006.fromMap(resultRow);
@@ -73,7 +72,9 @@ public class ServiceHPYX006 extends ServiceEPBase {
                 } else {
                     this.modify(hpyx006);
                 }
+                hpyx006s.add(hpyx006);
             }
+            inInfo.getBlock(EiConstant.resultBlock).setRows(hpyx006s);
             inInfo.setStatus(EiConstant.STATUS_DEFAULT);
             inInfo.setMsg("操作成功！本次对[" + resultRows.size() + "]条数据保存成功!");
         } catch (Exception e) {

src/main/java/com/baosight/hpjx/hp/yx/service/ServiceHPYX007.java

@@ -17,6 +17,7 @@ import com.baosight.iplat4j.core.resource.I18nMessages;
 import com.baosight.iplat4j.core.service.impl.ServiceEPBase;
 import com.baosight.iplat4j.ed.util.SequenceGenerator;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -72,6 +73,7 @@ public class ServiceHPYX007 extends ServiceEPBase {
         try {
             List<Map> resultRows = inInfo.getBlock("resultA").getRows();
             // 写入数据
+            List<HPYX007> hpyx007List = new ArrayList<>();
             for (Map resultRow : resultRows) {
                 HPYX007 hpyx007 = new HPYX007();
                 hpyx007.fromMap(resultRow);
@@ -80,7 +82,9 @@ public class ServiceHPYX007 extends ServiceEPBase {
                 } else {
                     this.modify(hpyx007);
                 }
+                hpyx007List.add(hpyx007);
             }
+            inInfo.getBlock("resultA").setRows(hpyx007List);
             inInfo.setStatus(EiConstant.STATUS_DEFAULT);
             inInfo.setMsg("操作成功！本次对[" + resultRows.size() + "]条数据保存成功!");
         } catch (Exception e) {

src/main/java/com/baosight/hpjx/hp/yx/service/ServiceHPYX008.java

@@ -4,6 +4,7 @@ import com.baosight.hpjx.aspect.annotation.OperationLogAnnotation;
 import com.baosight.hpjx.core.constant.CommonConstant;
 import com.baosight.hpjx.core.dao.DaoUtils;
 import com.baosight.hpjx.hp.yx.domain.HPYX006;
+import com.baosight.hpjx.hp.yx.domain.HPYX007;
 import com.baosight.hpjx.hp.yx.domain.HPYX008;
 import com.baosight.hpjx.util.DateUtils;
 import com.baosight.hpjx.util.LogUtils;
@@ -15,6 +16,7 @@ import com.baosight.iplat4j.core.exception.PlatException;
 import com.baosight.iplat4j.core.resource.I18nMessages;
 import com.baosight.iplat4j.core.service.impl.ServiceEPBase;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -70,15 +72,18 @@ public class ServiceHPYX008 extends ServiceEPBase {
         try {
             List<Map> resultRows = inInfo.getBlock("resultB").getRows();
             // 写入数据
+            List<HPYX008> hpyx008List = new ArrayList<>();
             for (Map resultRow : resultRows) {
-                HPYX008 hpyx003 = new HPYX008();
-                hpyx003.fromMap(resultRow);
-                if (hpyx003.getId() == null || hpyx003.getId() == 0) {
-                    this.add(hpyx003);
+                HPYX008 hpyx008 = new HPYX008();
+                hpyx008.fromMap(resultRow);
+                if (hpyx008.getId() == null || hpyx008.getId() == 0) {
+                    this.add(hpyx008);
                 } else {
-                    this.modify(hpyx003);
+                    this.modify(hpyx008);
                 }
+                hpyx008List.add(hpyx008);
             }
+            inInfo.getBlock("resultB").setRows(hpyx008List);
             inInfo.setStatus(EiConstant.STATUS_DEFAULT);
             inInfo.setMsg("操作成功！本次对[" + resultRows.size() + "]条数据保存成功!");
         } catch (Exception e) {

src/main/java/com/baosight/hpjx/hp/yx/service/ServiceHPYX009.java

@@ -15,6 +15,7 @@ import com.baosight.iplat4j.core.exception.PlatException;
 import com.baosight.iplat4j.core.resource.I18nMessages;
 import com.baosight.iplat4j.core.service.impl.ServiceEPBase;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -70,6 +71,7 @@ public class ServiceHPYX009 extends ServiceEPBase {
         try {
             List<Map> resultRows = inInfo.getBlock("resultC").getRows();
             // 写入数据
+            List<HPYX009> hpyx009List = new ArrayList<>();
             for (Map resultRow : resultRows) {
                 HPYX009 hpyx009 = new HPYX009();
                 hpyx009.fromMap(resultRow);
@@ -78,7 +80,9 @@ public class ServiceHPYX009 extends ServiceEPBase {
                 } else {
                     this.modify(hpyx009);
                 }
+                hpyx009List.add(hpyx009);
             }
+            inInfo.getBlock("resultC").setRows(hpyx009List);
             inInfo.setStatus(EiConstant.STATUS_DEFAULT);
             inInfo.setMsg("操作成功！本次对[" + resultRows.size() + "]条数据保存成功!");
         } catch (Exception e) {

src/main/java/com/baosight/hpjx/hp/yx/service/ServiceHPYX010.java

@@ -15,6 +15,7 @@ import com.baosight.iplat4j.core.resource.I18nMessages;
 import com.baosight.iplat4j.core.service.impl.ServiceEPBase;
 import com.baosight.iplat4j.ed.util.SequenceGenerator;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -70,6 +71,7 @@ public class ServiceHPYX010 extends ServiceEPBase {
         try {
             List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();
             // 写入数据
+            List<HPYX010> hpyx010List = new ArrayList<>();
             for (Map resultRow : resultRows) {
                 HPYX010 hpyx010 = new HPYX010();
                 hpyx010.fromMap(resultRow);
@@ -78,7 +80,9 @@ public class ServiceHPYX010 extends ServiceEPBase {
                 } else {
                     this.modify(hpyx010);
                 }
+                hpyx010List.add(hpyx010);
             }
+            inInfo.getBlock(EiConstant.resultBlock).setRows(hpyx010List);
             inInfo.setStatus(EiConstant.STATUS_DEFAULT);
             inInfo.setMsg("操作成功！本次对[" + resultRows.size() + "]条数据保存成功!");
         } catch (Exception e) {

src/main/java/com/baosight/hpjx/hp/yx/sql/HPYX005.xml

@@ -114,7 +114,7 @@
     		  $orderBy$
 			</isNotEmpty>
 			<isEmpty property="orderBy">
-    		  ID asc
+				SELL_DATE desc,ID desc
 			</isEmpty>
 		</dynamic>
 

src/main/webapp/HP/YX/HPYX005B.jsp

@@ -20,6 +20,7 @@
 <EF:EFPage title="新增营销业绩">
     <EF:EFRegion id="inqu1" title="销售业绩信息">
         <div class="row">
+            <EF:EFInput ename="result-0-id" cname="ID" colWidth="4" readonly="true" type="hidden"/>
             <EF:EFDatePicker cname="销售日期" ename="result-0-sellDate" colWidth="4" required="true"
                              format="yyyy-MM-dd" parseFormats="['yyyyMMdd']"/>
             <EF:EFSelect cname="客户名称" ename="result-0-clientCode" colWidth="4" required="true" filter="contains">