diff --git a/basepro-manager/basepro-manager-interface/src/main/java/basepro/manager/service/ITbMdjfjxxxbService.java b/basepro-manager/basepro-manager-interface/src/main/java/basepro/manager/service/ITbMdjfjxxxbService.java
index 54b9f76..85d829a 100644
--- a/basepro-manager/basepro-manager-interface/src/main/java/basepro/manager/service/ITbMdjfjxxxbService.java
+++ b/basepro-manager/basepro-manager-interface/src/main/java/basepro/manager/service/ITbMdjfjxxxbService.java
@@ -38,6 +38,8 @@ public interface ITbMdjfjxxxbService
      */
     public int insertTbMdjfjxxxb(TbMdjfjxxxb tbMdjfjxxxb);
 
+    public int insertTbMdjfjxxxbGs(TbMdjfjxxxb tbMdjfjxxxb);
+
     /**
      * 修改矛盾纠纷简项信息
      * 
diff --git a/basepro-manager/basepro-manager-service/src/main/java/basepro/manager/service/impl/TbMdjfjxxxbServiceImpl.java b/basepro-manager/basepro-manager-service/src/main/java/basepro/manager/service/impl/TbMdjfjxxxbServiceImpl.java
index de0a661..1381b20 100644
--- a/basepro-manager/basepro-manager-service/src/main/java/basepro/manager/service/impl/TbMdjfjxxxbServiceImpl.java
+++ b/basepro-manager/basepro-manager-service/src/main/java/basepro/manager/service/impl/TbMdjfjxxxbServiceImpl.java
@@ -4,12 +4,14 @@ import java.util.List;
 import java.util.UUID;
 
 import basepro.manager.common.utils.DateUtils;
+import basepro.manager.config.DataSourceUtil;
 import basepro.manager.mapper.TbMdjfjxxxbMapper;
 import basepro.manager.pojo.TbMdjfjxxxb;
 import basepro.manager.pojo.TbXjxdzhxxb;
 import basepro.manager.service.ITbMdjfjxxxbService;
 import com.alibaba.dubbo.config.annotation.Service;
 import com.github.pagehelper.PageHelper;
+import guo.ping.e3mall.common.annotation.DataSource;
 import guo.ping.e3mall.common.page.TableDataInfo;
 import org.springframework.beans.factory.annotation.Autowired;
 import basepro.manager.common.core.text.Convert;
@@ -68,8 +70,21 @@ public class TbMdjfjxxxbServiceImpl implements ITbMdjfjxxxbService
     @Override
     public int insertTbMdjfjxxxb(TbMdjfjxxxb tbMdjfjxxxb)
     {
-        UUID uuid = UUID.randomUUID();
-        tbMdjfjxxxb.setMdjfbh(uuid.toString());
+        try {
+            tbMdjfjxxxb.setFssj(DateUtils.parseDate(tbMdjfjxxxb.getFssjStr(),"yyyy-MM-dd HH:mm:ss"));
+            tbMdjfjxxxb.setDjsj(DateUtils.parseDate(tbMdjfjxxxb.getDjsjStr(),"yyyy-MM-dd HH:mm:ss"));
+            tbMdjfjxxxb.setTcsj(DateUtils.parseDate(tbMdjfjxxxb.getTcsjStr(),"yyyy-MM-dd HH:mm:ss"));
+            tbMdjfjxxxb.setJlgxsj(DateUtils.parseDate(tbMdjfjxxxb.getJlgxsjStr(),"yyyy-MM-dd HH:mm:ss"));
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+
+        return tbMdjfjxxxbMapper.insertTbMdjfjxxxb(tbMdjfjxxxb);
+    }
+
+    @Override
+    public int insertTbMdjfjxxxbGs(TbMdjfjxxxb tbMdjfjxxxb) {
+        DataSourceUtil.setDB("db2");
         try {
             tbMdjfjxxxb.setFssj(DateUtils.parseDate(tbMdjfjxxxb.getFssjStr(),"yyyy-MM-dd HH:mm:ss"));
             tbMdjfjxxxb.setDjsj(DateUtils.parseDate(tbMdjfjxxxb.getDjsjStr(),"yyyy-MM-dd HH:mm:ss"));
diff --git a/basepro-manager/basepro-manager-web/src/main/java/basepro/manager/controller/TbMdjfjxxxbController.java b/basepro-manager/basepro-manager-web/src/main/java/basepro/manager/controller/TbMdjfjxxxbController.java
index 51bb1c0..ea3c4ca 100644
--- a/basepro-manager/basepro-manager-web/src/main/java/basepro/manager/controller/TbMdjfjxxxbController.java
+++ b/basepro-manager/basepro-manager-web/src/main/java/basepro/manager/controller/TbMdjfjxxxbController.java
@@ -1,6 +1,7 @@
 package basepro.manager.controller;
 
 import java.util.List;
+import java.util.UUID;
 
 import basepro.manager.common.annotation.DataScope;
 import basepro.manager.common.utils.poi.ExcelUtil;
@@ -93,6 +94,8 @@ public class TbMdjfjxxxbController extends BaseController
     @ResponseBody
     public AjaxResult addSave(TbMdjfjxxxb tbMdjfjxxxb)
     {
+        String uuid = UUID.randomUUID().toString();
+        tbMdjfjxxxb.setMdjfbh(uuid);
         return toAjax(tbMdjfjxxxbService.insertTbMdjfjxxxb(tbMdjfjxxxb));
     }