Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/baosight/hggp/hg/kc/service/ServiceHGKC005.java

@@ -11,16 +11,26 @@ import com.baosight.hggp.hg.constant.HGConstant;
 import com.baosight.hggp.hg.constant.HGSqlConstant;
 import com.baosight.hggp.hg.cw.tools.HGCWTools;
 import com.baosight.hggp.hg.cw.vo.UserVO;
-import com.baosight.hggp.hg.kc.domain.*;
+import com.baosight.hggp.hg.kc.domain.HGKC005;
+import com.baosight.hggp.hg.kc.domain.HGKC006;
+import com.baosight.hggp.hg.kc.domain.HGKC006A;
+import com.baosight.hggp.hg.kc.domain.HGKC007;
+import com.baosight.hggp.hg.kc.domain.HGKC007A;
 import com.baosight.hggp.hg.kc.tools.HGKCTools;
-import com.baosight.hggp.hg.kc.utils.HGKCUtils;
 import com.baosight.hggp.hg.pz.domain.HGPZ005;
 import com.baosight.hggp.hg.pz.tools.HGPZTools;
-import com.baosight.hggp.hg.sc.domain.HGSC004A;
-import com.baosight.hggp.hg.sc.tools.HGSCTools;
 import com.baosight.hggp.hg.xs.utils.HGXSUtils;
 import com.baosight.hggp.hg.yx.domain.HGYX001;
-import com.baosight.hggp.util.*;
+import com.baosight.hggp.util.AssertUtils;
+import com.baosight.hggp.util.CommonMethod;
+import com.baosight.hggp.util.DateUtils;
+import com.baosight.hggp.util.EiInfoUtils;
+import com.baosight.hggp.util.ErrorCodeUtils;
+import com.baosight.hggp.util.ExcelUtils;
+import com.baosight.hggp.util.LogUtils;
+import com.baosight.hggp.util.ObjectUtils;
+import com.baosight.hggp.util.StringUtil;
+import com.baosight.hggp.util.StringUtils;
 import com.baosight.hggp.util.contants.ACConstants;
 import com.baosight.iplat4j.core.ei.EiBlock;
 import com.baosight.iplat4j.core.ei.EiConstant;
@@ -32,7 +42,11 @@ import com.baosight.iplat4j.ed.util.SequenceGenerator;
 import org.apache.commons.collections.MapUtils;
 
 import java.math.BigDecimal;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * @author LiuYang
@@ -62,9 +76,9 @@ public class ServiceHGKC005 extends ServiceEPBase {
                     DdynamicEnum.SPEC_RECORD_BLOCK_ID,
                     DdynamicEnum.INVENT_TYPE_BLOCK_ID), queryMap);
             inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HGKC005().eiMetadata);
-            UserVO userVO = HGCWTools.HgCw002.getUserCompany();
-            inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HGYX001.FIELD_COMPANY_CODE, userVO.getUsercode());
-            inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0,HGYX001.FIELD_COMPANY_NAME, userVO.getUsername());
+//            UserVO userVO = HGCWTools.HgCw002.getUserCompany();
+//            inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HGYX001.FIELD_COMPANY_CODE, userVO.getUsercode());
+//            inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0,HGYX001.FIELD_COMPANY_NAME, userVO.getUsername());
         } catch (PlatException e) {
             LogUtils.setDetailMsg(inInfo, e, "初始化失败");
         }