|
@@ -81,7 +81,7 @@ public class TbServiceImpl extends ServiceImpl<TianheMapper, Tianhe> implements
|
|
|
for (int j = 0; j < array.size(); j++) {
|
|
|
JSONObject jsonObject1 = array.getJSONObject(j);
|
|
|
String renwuleixingName = jsonObject1.getString("name");
|
|
|
- if (renwuleixingName.equals("周报")){
|
|
|
+ if (renwuleixingName.contains("周报")){
|
|
|
// 获取属于【周报】的任务
|
|
|
list.add(jsonObject1.getString("id"));
|
|
|
}else if (renwuleixingName.equals("里程碑")){
|
|
@@ -91,7 +91,7 @@ public class TbServiceImpl extends ServiceImpl<TianheMapper, Tianhe> implements
|
|
|
}
|
|
|
for (int i = 0; i < list.size(); i++) {
|
|
|
log.info("封装周报类型项目数据,项目编号:[{}]进度:[{}/{}]",list.get(i),i+1,list.size());
|
|
|
- getZhoubao(list.get(i),xmid);
|
|
|
+ getZhoubao(list.get(i),xmid,i==0);
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -139,14 +139,16 @@ public class TbServiceImpl extends ServiceImpl<TianheMapper, Tianhe> implements
|
|
|
}
|
|
|
|
|
|
// 同步项目下所有周报任务
|
|
|
- private void getZhoubao(String rwlxid,String projectId){
|
|
|
+ private void getZhoubao(String rwlxid,String projectId,boolean isNeedDel){
|
|
|
Tianhe tianhe = new Tianhe();
|
|
|
JSONArray tasks=tbApiService.getTasksByType(projectId,rwlxid);
|
|
|
if (tasks != null){
|
|
|
- // 先删除数据
|
|
|
- QueryWrapper<Tianhe> wrapperProject = new QueryWrapper<>();
|
|
|
- wrapperProject.lambda().eq(Tianhe::getXiangmubianhao,projectId);
|
|
|
- tianheMapper.delete(wrapperProject);
|
|
|
+ if(isNeedDel){
|
|
|
+ // 先删除数据
|
|
|
+ QueryWrapper<Tianhe> wrapperProject = new QueryWrapper<>();
|
|
|
+ wrapperProject.lambda().eq(Tianhe::getXiangmubianhao,projectId);
|
|
|
+ tianheMapper.delete(wrapperProject);
|
|
|
+ }
|
|
|
//里程碑
|
|
|
tianhe.setLichengbei(TB_LICHENGBEI_MAP.get(projectId));
|
|
|
Map<String,JSONArray> projectCustValueMap=getProjectCustVule(projectId);
|