Merge branch 'dev' of http://git.pseer.com:8800/platform/hp-smart into dev-ly

src/main/java/com/baosight/hpjx/hp/fw/service/ServiceHPFW001B.java

@@ -66,6 +66,8 @@ public class ServiceHPFW001B extends ServiceEPBase {
 			} else {
 				this.modify(fFw001);
 			}
+			// 回填实体信息，移动端更新数据使用
+			inInfo.set("detail", fFw001);
 			inInfo.setStatus(EiConstant.STATUS_DEFAULT);
 			inInfo.setMsg("保存成功！");
 		} catch (Exception e) {

src/main/java/com/baosight/hpjx/hp/fw/service/ServiceHPFW002B.java

@@ -66,6 +66,8 @@ public class ServiceHPFW002B extends ServiceEPBase {
 			} else {
 				this.modify(fFw002);
 			}
+			// 回填实体信息，移动端更新数据使用
+			inInfo.set("detail", fFw002);
 			inInfo.setStatus(EiConstant.STATUS_DEFAULT);
 			inInfo.setMsg("保存成功！");
 		} catch (Exception e) {

src/main/java/com/baosight/hpjx/hp/fw/service/ServiceHPFW003B.java

@@ -67,6 +67,8 @@ public class ServiceHPFW003B extends ServiceEPBase {
 			} else {
 				this.modify(fFw003);
 			}
+			// 回填实体信息，移动端更新数据使用
+			inInfo.set("detail", fFw003);
 			inInfo.setStatus(EiConstant.STATUS_DEFAULT);
 			inInfo.setMsg("保存成功！");
 		} catch (Exception e) {

src/main/java/com/baosight/hpjx/hp/fw/service/ServiceHPFW004B.java

@@ -64,6 +64,8 @@ public class ServiceHPFW004B extends ServiceEPBase {
 			} else {
 				this.modify(fFw004);
 			}
+			// 回填实体信息，移动端更新数据使用
+			inInfo.set("detail", fFw004);
 			inInfo.setStatus(EiConstant.STATUS_DEFAULT);
 			inInfo.setMsg("保存成功！");
 		} catch (Exception e) {

src/main/java/com/baosight/hpjx/hp/fw/service/ServiceHPFW007.java

 package com.baosight.hpjx.hp.fw.service;
 
 import com.baosight.hpjx.aspect.annotation.OperationLogAnnotation;
+import com.baosight.hpjx.common.DdynamicEnum;
 import com.baosight.hpjx.core.constant.CommonConstant;
 import com.baosight.hpjx.core.dao.DaoUtils;
 import com.baosight.hpjx.core.security.UserSessionUtils;
@@ -9,15 +10,18 @@ import com.baosight.hpjx.hp.fw.constant.HpFwSqlConst;
 import com.baosight.hpjx.hp.fw.domain.HPFW007;
 import com.baosight.hpjx.hp.fw.utils.HpFwUtils;
 import com.baosight.hpjx.util.AssertUtils;
+import com.baosight.hpjx.util.CommonMethod;
 import com.baosight.hpjx.util.DateUtils;
 import com.baosight.hpjx.util.EiInfoUtils;
 import com.baosight.hpjx.util.LogUtils;
 import com.baosight.hpjx.util.MapUtils;
+import com.baosight.hpjx.util.contants.ACConstants;
 import com.baosight.iplat4j.core.ei.EiConstant;
 import com.baosight.iplat4j.core.ei.EiInfo;
 import com.baosight.iplat4j.core.exception.PlatException;
 import com.baosight.iplat4j.core.service.impl.ServiceBase;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -200,4 +204,24 @@ public class ServiceHPFW007 extends ServiceBase {
 		AssertUtils.isNotEquals(dbFw007.getStatus(), HPConstant.dealStatus.S0,
 				String.format("回访单【%s】不是\"待回访\"状态，不允许操作", folNo));
 	}
+	
+	/**
+	 * 销售单号
+	 *
+	 * @param inInfo
+	 * @return
+	 */
+	@OperationLogAnnotation(operModul = "组织管理", operType = "查询", operDesc = "组下拉框")
+	public EiInfo querySaleNo(EiInfo inInfo) {
+		try {
+			Map queryRow = EiInfoUtils.getFirstRow(inInfo);
+			List<DdynamicEnum> list = new ArrayList<>();
+			list.add(DdynamicEnum.SALE_NO_BLOCK_ID);
+			CommonMethod.initBlock(inInfo, list, queryRow, false);
+		} catch (Exception e) {
+			LogUtils.setMsg(inInfo, e, "查询失败");
+		}
+		return inInfo;
+	}
+	
 }

src/main/java/com/baosight/hpjx/hp/fw/service/ServiceHPFW007B.java

@@ -66,6 +66,8 @@ public class ServiceHPFW007B extends ServiceEPBase {
 			} else {
 				this.modify(fFw007);
 			}
+			// 回填实体信息，移动端更新数据使用
+			inInfo.set("detail", fFw007);
 			inInfo.setStatus(EiConstant.STATUS_DEFAULT);
 			inInfo.setMsg("保存成功！");
 		} catch (Exception e) {

src/main/java/com/baosight/hpjx/hp/xt/service/ServiceHPXT011B.java

@@ -57,14 +57,16 @@ public class ServiceHPXT011B extends ServiceEPBase {
 	 */
 	public EiInfo save(EiInfo inInfo) {
 		try {
-			HPXT011 fXt001 = MapUtils.toDaoEPBase(inInfo, HPXT011.class);
-			fXt001.setNoticeDate(DateUtils.formatShort(fXt001.getNoticeDate()));
-			fXt001.setExpireDate(DateUtils.formatShort(fXt001.getExpireDate()));
-			if (StringUtils.isBlank(fXt001.getNoticeNo())) {
-				this.add(fXt001);
+			HPXT011 fXt011 = MapUtils.toDaoEPBase(inInfo, HPXT011.class);
+			fXt011.setNoticeDate(DateUtils.formatShort(fXt011.getNoticeDate()));
+			fXt011.setExpireDate(DateUtils.formatShort(fXt011.getExpireDate()));
+			if (StringUtils.isBlank(fXt011.getNoticeNo())) {
+				this.add(fXt011);
 			} else {
-				this.modify(fXt001);
+				this.modify(fXt011);
 			}
+			// 回填实体信息，移动端更新数据使用
+			inInfo.set("detail", fXt011);
 			inInfo.setStatus(EiConstant.STATUS_DEFAULT);
 			inInfo.setMsg("保存成功！");
 		} catch (Exception e) {
@@ -77,24 +79,24 @@ public class ServiceHPXT011B extends ServiceEPBase {
 	/**
 	 * 新增
 	 *
-	 * @param fXt001
+	 * @param fXt011
 	 */
-	private void add(HPXT011 fXt001) {
-		fXt001.setNoticeNo(SequenceGenerator.getNextSequence(HPConstant.SequenceId.NOTICE_NO));
-		fXt001.setStatus(HPConstant.submitStatus.S0);
-		fXt001.setDeleteFlag(CommonConstant.YesNo.NO_0);
-		DaoUtils.insert(HPXT011.INSERT, fXt001);
+	private void add(HPXT011 fXt011) {
+		fXt011.setNoticeNo(SequenceGenerator.getNextSequence(HPConstant.SequenceId.NOTICE_NO));
+		fXt011.setStatus(HPConstant.submitStatus.S0);
+		fXt011.setDeleteFlag(CommonConstant.YesNo.NO_0);
+		DaoUtils.insert(HPXT011.INSERT, fXt011);
 	}
 	
 	/**
 	 * 修改数据
 	 *
-	 * @param fXt001
+	 * @param fXt011
 	 */
-	private void modify(HPXT011 fXt001) {
-		HPXT011 dbXt001 = HpXtUtils.HpXt011.lockAndGet(fXt001);
-		this.checkData(fXt001, dbXt001);
-		DaoUtils.update(HPXT011.UPDATE, fXt001);
+	private void modify(HPXT011 fXt011) {
+		HPXT011 dbXt011 = HpXtUtils.HpXt011.lockAndGet(fXt011);
+		this.checkData(fXt011, dbXt011);
+		DaoUtils.update(HPXT011.UPDATE, fXt011);
 	}
 	
 	/**
@@ -117,15 +119,15 @@ public class ServiceHPXT011B extends ServiceEPBase {
 	/**
 	 * 数据校验
 	 *
-	 * @param fXt001
-	 * @param dbXt001
+	 * @param fXt011
+	 * @param dbXt011
 	 */
-	private void checkData(HPXT011 fXt001, HPXT011 dbXt001) {
-		String noticeNo = fXt001.getNoticeNo();
-		AssertUtils.isNull(dbXt001, String.format("公告【%s】不存在", noticeNo));
-		AssertUtils.isNotEquals(dbXt001.getDeleteFlag(), CommonConstant.YesNo.NO_0,
+	private void checkData(HPXT011 fXt011, HPXT011 dbXt011) {
+		String noticeNo = fXt011.getNoticeNo();
+		AssertUtils.isNull(dbXt011, String.format("公告【%s】不存在", noticeNo));
+		AssertUtils.isNotEquals(dbXt011.getDeleteFlag(), CommonConstant.YesNo.NO_0,
 				String.format("公告【%s】不是\"未删除\"状态，不允许操作", noticeNo));
-		AssertUtils.isNotEquals(dbXt001.getStatus(), HPConstant.dealStatus.S0,
+		AssertUtils.isNotEquals(dbXt011.getStatus(), HPConstant.dealStatus.S0,
 				String.format("公告【%s】不是\"未提交\"状态，不允许操作", noticeNo));
 	}