|
@@ -136,8 +136,9 @@ public class RyjbxxServiceImpl extends BaseService<RyjbxxEntity, Long>
|
|
|
ryjbxxDao.logicDelete(ryjbxxEntity);
|
|
|
ryjbxxZSDao.logicDelete(zsEntities);
|
|
|
ryjbxxEntity.setRecordStatus(BaseEntity.RECORD_STATE_DELETE);
|
|
|
- /*// 同步到省级
|
|
|
- deleteTbSj(ryjbxxEntity);*/
|
|
|
+ /*
|
|
|
+ * // 同步到省级 deleteTbSj(ryjbxxEntity);
|
|
|
+ */
|
|
|
}
|
|
|
|
|
|
/**
|
|
@@ -225,7 +226,7 @@ public class RyjbxxServiceImpl extends BaseService<RyjbxxEntity, Long>
|
|
|
ryqkWebService.delete(ryjbxxEntity);
|
|
|
ryjbxxEntity.setTbzt(Constants.YES);
|
|
|
this.save(ryjbxxEntity);
|
|
|
- }
|
|
|
+ }
|
|
|
} catch (Exception e) {
|
|
|
e.printStackTrace();
|
|
|
}
|
|
@@ -280,8 +281,8 @@ public class RyjbxxServiceImpl extends BaseService<RyjbxxEntity, Long>
|
|
|
// 如果人员类型为0 。则循环出四种人员类型,不为0,则进行一次查询就好
|
|
|
// ryList = zslxList(ryList, 0l, rylx, nd, true);
|
|
|
// 各个所在地的人员基本信息
|
|
|
- List<CodeEntity> szdList = codeDao
|
|
|
- .findByParent(Constants.SZD_ID_PROVINCE);
|
|
|
+ List<CodeEntity> szdList = codeDao.findByParentAndGroupcode(
|
|
|
+ Constants.SZD_ID_PROVINCE, Constants.GROUP_CODE_SZD);
|
|
|
szdList.add(0, codeDao.findOne(Constants.SZD_ID_PROVINCE));
|
|
|
for (CodeEntity szdEntity : szdList) {
|
|
|
RyjbxxCountEntity szdhj = new RyjbxxCountEntity();
|