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

src/main/java/com/baosight/hggp/hg/cb/service/ServiceHGCB001.java

@@ -3,9 +3,12 @@ package com.baosight.hggp.hg.cb.service;
 import com.baosight.hggp.aspect.annotation.OperationLogAnnotation;
 import com.baosight.hggp.common.DdynamicEnum;
 import com.baosight.hggp.core.dao.DaoUtils;
+import com.baosight.hggp.core.security.UserSessionUtils;
 import com.baosight.hggp.hg.cb.domain.HGCB001;
+import com.baosight.hggp.hg.xs.domain.Company;
 import com.baosight.hggp.util.CommonMethod;
 import com.baosight.hggp.util.DateUtils;
+import com.baosight.hggp.util.EiInfoUtils;
 import com.baosight.hggp.util.LogUtils;
 import com.baosight.iplat4j.core.ei.EiConstant;
 import com.baosight.iplat4j.core.ei.EiInfo;
@@ -31,10 +34,15 @@ public class ServiceHGCB001 extends ServiceBase {
 	@OperationLogAnnotation(operModul = "账期维护",operType = "查询",operDesc = "初始化")
 	public EiInfo initLoad(EiInfo inInfo) {
 		try {
-			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.COMPANY_BOX_BLOCK_ID), null, false);
+			EiInfoUtils.addBlock(inInfo,"roleCompany", UserSessionUtils.getRoleCompany(), Company.class);
+//			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.COMPANY_BOX_BLOCK_ID), null, false);
 			inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HGCB001().eiMetadata);
 		} catch (PlatException e) {
 			LogUtils.setDetailMsg(inInfo, e, "初始化失败");
+		} catch (InstantiationException e) {
+			e.printStackTrace();
+		} catch (IllegalAccessException e) {
+			e.printStackTrace();
 		}
 		return inInfo;
 	}

src/main/java/com/baosight/hggp/hg/cb/service/ServiceHGCB005.java

+package com.baosight.hggp.hg.cb.service;
+
+import com.baosight.hggp.core.security.UserSessionUtils;
+import com.baosight.hggp.hg.cb.domain.HGCB001;
+import com.baosight.hggp.hg.cb.domain.HGCB002;
+import com.baosight.hggp.hg.cb.domain.HGCB005;
+import com.baosight.hggp.hg.cb.tools.HGCBTools;
+import com.baosight.hggp.hg.cw.domain.HGCW001;
+import com.baosight.hggp.hg.cw.tools.HGCWTools;
+import com.baosight.hggp.hg.utils.HGUtils;
+import com.baosight.hggp.hg.xs.domain.Company;
+import com.baosight.hggp.util.*;
+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.ServiceEPBase;
+
+import java.util.Map;
+import java.util.Objects;
+
+public class ServiceHGCB005 extends ServiceEPBase {
+
+    @Override
+    public EiInfo initLoad(EiInfo inInfo) {
+        try {
+            inInfo = super.initLoad(inInfo, EiConstant.resultBlock, new HGCB005());
+            EiInfoUtils.addBlock(inInfo,"company_code_block_id", UserSessionUtils.getRoleCompany(), Company.class);
+        } catch (Exception e) {
+            LogUtils.setDetailMsg(inInfo, e, "初始化失败");
+        }
+        return inInfo;
+    }
+
+    @Override
+    public EiInfo query(EiInfo inInfo) {
+        try{
+            inInfo = super.query(inInfo, HGCB005.QUERY, new HGCB005());
+            inInfo.setStatus(EiConstant.STATUS_DEFAULT);
+        } catch (PlatException e) {
+            LogUtils.setDetailMsg(inInfo, e, "查询失败");
+        }
+        return inInfo;
+    }
+
+    public EiInfo synchData(EiInfo inInfo) {
+        Map params= EiInfoUtils.getFirstRow(inInfo);
+        HGUtils.setCondition(params);
+        HGCB001 hgcw001Today = HGCBTools.HgCb001.select(params);
+        if (hgcw001Today != null && hgcw001Today.getAccountPeriodStatus() == 0) {
+            throw new PlatException(String.format("公司[%s]会计期[%s]状态为关账状态，数据同步失败！", hgcw001Today.getCompanyCode(), hgcw001Today.getAccountPeriod()));
+        }
+        HGCB001 hgcw001Last = HGCBTools.HgCb001.selectLast(params);
+        if (hgcw001Last != null && hgcw001Last.getAccountPeriodStatus() == 1) {
+            throw new PlatException(String.format("公司[%s]上月会计期[%s]为开账状态，数据同步失败！", hgcw001Last.getCompanyCode(), hgcw001Last.getAccountPeriod()));
+        }
+        HGCW001 hgcw001 = HGCWTools.HgCw001.getByCondition(params);
+        AssertUtils.isNull(hgcw001,String.format("公司[%s]会计期[%s]会计账期数据异常，数据同步失败！", hgcw001Today.getCompanyCode(), hgcw001Today.getAccountPeriod()));
+        HGCBTools.THGCB005.synchData(hgcw001);
+        return inInfo;
+    }
+}

src/main/java/com/baosight/hggp/hg/cb/tools/HGCBTools.java

@@ -627,8 +627,7 @@ public class HGCBTools {
          *
          * @return
          */
-        public static void synchData() {
-            HGCW001 hgcw001 = new HGCW001();
+        public static void synchData(HGCW001 hgcw001) {
             //通过业务账期信息查询入库单
             Map kc003ParamMap = new HashMap();
             kc003ParamMap.put(HGKC003.FIELD_DELETE_FLAG, CommonConstant.YesNo.NO_0);

src/main/java/com/baosight/hggp/hg/cw/tools/HGCWTools.java

@@ -40,6 +40,11 @@ public class HGCWTools {
             AssertUtils.isEmpty(list, "未找到公司对应的会计期");
             return list.get(0);
         }
+
+        public static HGCW001 getByCondition(Map paramMap){
+            List<HGCW001> results = DaoBase.getInstance().query(HGCW001.QUERY, paramMap);
+            return CollectionUtils.isEmpty(results) ? null : results.get(0);
+        }
     }
 
     public static class HgCw002 {

src/main/webapp/HG/CB/HGCB001.jsp

@@ -28,7 +28,7 @@
             <EF:EFColumn ename="id" cname="主键" hidden="true"/>
             <EF:EFComboColumn ename="companyCode" cname="公司名称" width="110" align="center"
                               filter="contains" readonly="true">
-                <EF:EFOptions blockId="companyBox_block_id" valueField="valueField" textField="textField"/>
+                <EF:EFOptions blockId="roleCompany" valueField="companyCode" textField="companyName"/>
             </EF:EFComboColumn>
             <EF:EFColumn ename="accountYear" cname="会计年度" width="100" align="center" start="decade" depth="decade"
                          editType="date" dateFormat="yyyy" parseFormats="['yyyy']" required="true"/>