Merge branch 'master' of ssh://111.61.77.35:15/gengdidi/gassafety-progress

gassafetyprogress-system/src/main/java/com/zehong/system/domain/TEventReceive.java

@@ -61,7 +61,7 @@ public class TEventReceive extends BaseEntity
 
     /** 指派公司id */
     @Excel(name = "指派公司id")
-    private String enterpriseId;
+    private Integer enterpriseId;
 
     /** 指派公司名称 */
     @Excel(name = "指派公司名称")
@@ -183,12 +183,12 @@ public class TEventReceive extends BaseEntity
     {
         return describe;
     }
-    public void setEnterpriseId(String enterpriseId) 
+    public void setEnterpriseId(Integer enterpriseId)
     {
         this.enterpriseId = enterpriseId;
     }
 
-    public String getEnterpriseId() 
+    public Integer getEnterpriseId()
     {
         return enterpriseId;
     }

gassafetyprogress-system/src/main/java/com/zehong/system/service/impl/TEventReceiveServiceImpl.java

@@ -53,6 +53,9 @@ public class TEventReceiveServiceImpl implements ITEventReceiveService
     @Override
     public int insertTEventReceive(TEventReceive tEventReceive)
     {
+        if(tEventReceive.getEnterpriseId()!=null){
+            tEventReceive.setStatus(2);
+        }
         tEventReceive.setCreateTime(DateUtils.getNowDate());
         return tEventReceiveMapper.insertTEventReceive(tEventReceive);
     }