字段赋值调整

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java

@@ -515,11 +515,11 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
         //诉求登记人
         CityCaseLawenforcementdPersonDTO sqdjr = new CityCaseLawenforcementdPersonDTO();
         sqdjr.setId(entity.getId());
-        sqdjr.setXm(entity.getNickName());
+        sqdjr.setXm(entity.getContactName());
         sqdjr.setSsbm(entity.getGrid());
         sqdjr.setSsbmbm(entity.getGridId().toString());
-        sqdjr.setSsjg(code);
-        sqdjr.setSsjgbm(name);
+        sqdjr.setSsjg(name);
+        sqdjr.setSsjgbm(code);
         data.setSqdjr(sqdjr);
         // todo jack照片格式调整为http
         List<ImgEntity> imageList = imgDao.selectListByRefeId(entity.getEventId() == null?entity.getId():entity.getEventId());
@@ -533,6 +533,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
         if(StringUtils.isNotBlank(sqzp)){
             data.setSqzp(sqzp.substring(0,sqzp.length()-1));
         }
+        data.setSbsm("");
         //发送到市平台
         String resultString = cityGridApi.sendItemToCity(data,PushToCityGridConstant.CASE_LAWENFORCEMENT,"执法诉求");
         //保存sqid
@@ -2889,11 +2890,11 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
         //诉求登记人
         CityCaseLivelihoodPersonDTO sqdjr = new CityCaseLivelihoodPersonDTO();
         sqdjr.setId(entity.getId());
-        sqdjr.setXm(entity.getNickName());
-        sqdjr.setSsbm(code);
-        sqdjr.setSsbmbm(name);
-        sqdjr.setSsjg(entity.getGrid());
-        sqdjr.setSsjgbm(getJgbm(entity.getGridId()));
+        sqdjr.setXm(entity.getContactName());
+        sqdjr.setSsbm(entity.getGrid());
+        sqdjr.setSsbmbm(getJgbm(entity.getGridId()));
+        sqdjr.setSsjg(name);
+        sqdjr.setSsjgbm(code);
         data.setSqdjr(sqdjr);
         // todo jack照片格式调整为http
         QueryWrapper<ImgEntity> wrapper = new QueryWrapper<>();
@@ -2907,6 +2908,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
         if(StringUtils.isNotBlank(sqzp)){
             data.setSqzp(sqzp.substring(0,sqzp.length()-1));
         }
+        data.setSbsm("");
         //发送到市平台
         String resultString =  cityGridApi.sendItemToCity(data,PushToCityGridConstant.CASE_LIVELIHOOD,"民生诉求");
         //保存sqid
@@ -2964,12 +2966,12 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
         //诉求登记人
         CityCaseDevelopPersonDTO sqdjr = new CityCaseDevelopPersonDTO();
         sqdjr.setId(entity.getId());
-        sqdjr.setXm(entity.getNickName());
+        sqdjr.setXm(entity.getContactName());
         sqdjr.setSsbm(entity.getGrid());
         sqdjr.setSsbmbm(entity.getGridId().toString());
-        sqdjr.setSsjg(code);
+        sqdjr.setSsjg(name);
        /* sqdjr.setSsjgbm(getJgbm(entity.getGridId()));*/
-        sqdjr.setSsjgbm(name);
+        sqdjr.setSsjgbm(code);
         data.setSqdjr(sqdjr);
         // todo jack照片格式调整为http
         List<ImgEntity> imageList = imgDao.selectListByRefeId(entity.getEventId() == null?entity.getId():entity.getEventId());
@@ -2983,6 +2985,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
         if(StringUtils.isNotBlank(sqzp)){
             data.setSqzp(sqzp.substring(0,sqzp.length()-1));
         }
+        data.setSbsm("");
         //发送到市平台
         String resultString = cityGridApi.sendItemToCity(data,PushToCityGridConstant.CASE_DEVELOP,"发展诉求");
         //保存sqid