Merge branch 'develop' of gitlab.beecode.cn:kunlun/xyst_dinas/xyst_dinas_backend into develop

backend/build.war/src/main/java/com/beecode/inz/war/TenantInitListener.java

@@ -100,6 +100,7 @@ public class TenantInitListener  implements ApplicationListener<ApplicationReady
 		this.addLicence("md_sys");
 		this.addLicence("md_bill");
 		this.addLicence("md_bi");
+		this.addLicence("md_fileshared");
 	}
 	
 	private void  addLicence(String key){

backend/inz.authmgr/src/main/java/com/beecode/inz/authmgr/common/AuthMgrConstants.java

@@ -21,6 +21,7 @@ public final class AuthMgrConstants {
 		public final static String STATISTICS = "统计";
 		public final static String BILL = "报表";
 		public final static String BI = "综合BI";
+		public final static String FILESHARED = "文件共享";
 	}
 	
 	public static final class SystemRoleGroup{

backend/inz.authmgr/src/main/java/com/beecode/inz/authmgr/internal/service/AuthManagerServiceImpl.java

@@ -411,6 +411,9 @@ public class AuthManagerServiceImpl implements AuthManagerService,ApplicationEve
 		if(RoleRootGroup.BI.equals(privilegeGroup)) {
 			return LicenseKeys.BI_PERMIT;
 		}
+		if(RoleRootGroup.FILESHARED.equals(privilegeGroup)) {
+			return LicenseKeys.FILESHARED_PERMIT;
+		}
 		return null;
 	}
 	

backend/inz.basis/src/main/resources/com/beecode/inz/portal/functiontree/DefaultFunctionTree.jmx

@@ -1716,7 +1716,7 @@
                     <m:name>fileshared_list</m:name>
                     <m:title>文件共享</m:title>
                     <m:index>1000</m:index>
-                    <m:license></m:license>
+                    <m:license>md_fileshared</m:license>
                     <m:privilege>com.xyst.dinas.fileshared.auth.FilesharedList</m:privilege>
                     <m:role></m:role>
                     <m:function-definition>

backend/inz.common/src/main/java/com/beecode/inz/common/LicenseKeys.java

@@ -69,4 +69,8 @@ public interface LicenseKeys {
 	 * 许可访问综合BI模块
 	 */
 	public final String BI_PERMIT = "md_bi";
+	/**
+	 * 许可访问文件共享模块
+	 */
+	public final String FILESHARED_PERMIT = "md_fileshared";
 }

backend/inz.message/src/main/java/com/beecode/inz/message/web/info/MessageInfo.java

@@ -8,7 +8,6 @@ import org.slf4j.LoggerFactory;
 
 import com.beecode.bcp.type.KObject;
 import com.beecode.inz.message.MessageInfoConstants;
-import com.fasterxml.jackson.annotation.JsonFormat;
 
 public class MessageInfo {
 
@@ -22,7 +21,6 @@ public class MessageInfo {
 	
 	private ReferenceInfo sender;
 	
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
 	private Date createTime;
 	
 	private String type;

backend/xyst.dinas.biz/src/main/resources/config/DinasType.hbm.xml

@@ -67,7 +67,7 @@
             </column>
         </property>
 
-        <property name="sortOrder" type="int" not-null="true"  unique="true" update="false" insert="false" index="dinas_sort_index" >
+        <property name="sortOrder" type="int" not-null="false"  unique="false"  >
             <column name="sort_order" length="10">
                 <comment >排序</comment>
             </column>

backend/xyst.dinas.biz/src/main/resources/config/SandMiningArea.hbm.xml

@@ -87,7 +87,7 @@
                 <comment>不通过原因</comment>
             </column>
         </property>
-        <property name="sortOrder" type="int" not-null="true"  unique="true" index="sand_mining_area_sort_index" >
+        <property name="sortOrder" type="int" not-null="false">
             <column name="sort_order" length="10">
                 <comment >排序</comment>
             </column>

backend/xyst.dinas.biz/src/main/resources/config/ShipInfo.hbm.xml

@@ -80,7 +80,7 @@
                 <comment>备注</comment>
             </column>
         </property>
-        <property name="sortOrder" type="int" not-null="true"  unique="true" index="station_sort_index" >
+        <property name="sortOrder" type="int" not-null="false"  unique="false"  >
             <column name="sort_order" length="10">
                 <comment >排序</comment>
             </column>

backend/xyst.dinas.biz/src/main/resources/config/Station.hbm.xml

@@ -85,7 +85,7 @@
                 <comment>备注</comment>
             </column>
         </property>
-        <property name="sortOrder" type="int" not-null="true"  unique="true" index="station_sort_index" >
+        <property name="sortOrder" type="int" not-null="false" >
             <column name="sort_order" length="10">
                 <comment >排序</comment>
             </column>

backend/xyst.dinas.camera/src/main/resources/config/CameraInfo.hbm.xml

@@ -154,7 +154,7 @@
             </column>
         </property>
 
-        <property name="sortOrder" type="int" not-null="true"  unique="true" update="false" insert="false" index="camera_sort_index" >
+        <property name="sortOrder" type="int" not-null="true"  unique="true" >
             <column name="sort_order" length="10">
                 <comment >排序</comment>
             </column>

backend/xyst.dinas.contract/src/main/java/com/xyst/dinas/contract/internal/service/ContractServiceImpl.java

@@ -23,9 +23,7 @@ import com.beecode.bap.log.LogConstants;
 import com.beecode.bap.log.service.LogService;
 import com.beecode.bap.staff.Staff;
 import com.beecode.bap.staff.service.StaffService;
-import com.beecode.bap.workflow.constants.BizProcessConstant;
 import com.beecode.bcp.core.context.AminoContextHolder;
-import com.beecode.bcp.task.assignment.Actor;
 import com.beecode.bcp.type.KClass;
 import com.beecode.bcp.type.KObject;
 import com.beecode.bcp.type.json.JSONObjectUtils;
@@ -488,7 +486,7 @@ public class ContractServiceImpl implements ContractService {
 			remObject.put(RemindConstants.DATA, contractId);
 			remObject.put(RemindConstants.LOOK_NAME, "合同审核提醒");
 			remObject.put(RemindConstants.LOOK_TYPE, "Contract");
-			remObject.put("_type", ContractConstant.ENTITY_CONTRACT);
+			remObject.put("_type", com.beecode.inz.message.CommonConstants.REMIND_ENTITY);
 			JSONObject businessInfo = new JSONObject();
 	//		businessInfo.put("biztypeName", "company-info");
 	//		businessInfo.put("triggerAction", "create");

backend/xyst.dinas.contract/src/main/java/com/xyst/dinas/contract/listener/ContractTaskEventListenerHandle.java

@@ -75,7 +75,7 @@ public class ContractTaskEventListenerHandle implements ApplicationListener<Cont
 			remObject.put(RemindConstants.DATA, dataId);
 			remObject.put(RemindConstants.LOOK_NAME, "合同待审提醒");
 			remObject.put(RemindConstants.LOOK_TYPE, "Contract");
-			remObject.put("_type", ContractConstant.ENTITY_CONTRACT);
+			remObject.put("_type",  CommonConstants.REMIND_ENTITY);
 			JSONObject businessInfo = new JSONObject();
 	//		businessInfo.put("biztypeName", "company-info");
 	//		businessInfo.put("triggerAction", "create");

backend/xyst.dinas.finance/src/main/java/com/xyst/dinas/finance/internal/service/ArtificialRechargeServiceImpl.java

@@ -37,7 +37,7 @@ public class ArtificialRechargeServiceImpl implements ArtificialRechargeService
 				contract.set("depositBalance", contract.getBigDecimal("depositBalance") == null ? new BigDecimal("0").add(jsonObject.getBigDecimal("rechargeAmount")) : contract.getBigDecimal("depositBalance").add(jsonObject.getBigDecimal("rechargeAmount")));
 			}
 		    contractDao.update(contract);
-		    BaseBusinessWarn warn = warningService.createWarn("合同", contractId, "预付款余额");
+		    BaseBusinessWarn warn = warningService.createWarn("合同", contract.getUuid("contractId"), "预付款余额");
 		    warn.setWarningCalculate(new StockAmountWarnCalculate(contract.getDouble("advanceBalance")));
 		    warn.warn();
 		    return ResponseObj.success();