|
@@ -421,7 +421,7 @@ public class AdminProjectReportedImportService extends CrudService<AdminProjectR
|
|
|
if(StringUtils.isNotBlank(reported.getReportStatus())){
|
|
|
oldStatus = Integer.parseInt(reported.getReportStatus());
|
|
|
}
|
|
|
- reported.setReportStatus(String.valueOf(ProjectStatusEnum.SIGNED.getValue()));
|
|
|
+ //reported.setReportStatus(String.valueOf(ProjectStatusEnum.SIGNED.getValue()));
|
|
|
//查询是否已经上报项目信息
|
|
|
if (StringUtils.isBlank(reported.getId())){
|
|
|
reported.setCompany(UserUtils.getSelectCompany());
|
|
@@ -431,7 +431,7 @@ public class AdminProjectReportedImportService extends CrudService<AdminProjectR
|
|
|
reported.setId(reported.getProjectId());
|
|
|
dao.insert(reported);
|
|
|
}else{
|
|
|
- reported.preUpdate();
|
|
|
+ //reported.preUpdate();
|
|
|
dao.update(reported);
|
|
|
}
|
|
|
//删除上报咨询员信息
|
|
@@ -496,9 +496,9 @@ public class AdminProjectReportedImportService extends CrudService<AdminProjectR
|
|
|
//发送请求
|
|
|
String returnResult = HttpPostTool.doPost(url, encryptByAes);
|
|
|
HashMap hashMap = JSON.parseObject(returnResult, HashMap.class);
|
|
|
- /*if(!"1".equals(hashMap.get("code"))){
|
|
|
+ if(!"1".equals(hashMap.get("code"))){
|
|
|
return "上报失败:" + hashMap.get("msg").toString();
|
|
|
- }*/
|
|
|
+ }
|
|
|
//修改项目上报表中状态
|
|
|
reported.setReportStatus(String.valueOf(ProjectStatusEnum.SIGNED.getValue()));
|
|
|
reported.preUpdate();
|