|
@@ -143,6 +143,10 @@ public class TbServiceImpl extends ServiceImpl<TianheMapper, Tianhe> implements
|
|
Tianhe tianhe = new Tianhe();
|
|
Tianhe tianhe = new Tianhe();
|
|
JSONArray tasks=tbApiService.getTasksByType(projectId,rwlxid);
|
|
JSONArray tasks=tbApiService.getTasksByType(projectId,rwlxid);
|
|
if (tasks != null){
|
|
if (tasks != null){
|
|
|
|
+ // 先删除数据
|
|
|
|
+ QueryWrapper<Tianhe> wrapperProject = new QueryWrapper<>();
|
|
|
|
+ wrapperProject.lambda().eq(Tianhe::getXiangmubianhao,projectId);
|
|
|
|
+ tianheMapper.delete(wrapperProject);
|
|
//里程碑
|
|
//里程碑
|
|
tianhe.setLichengbei(TB_LICHENGBEI_MAP.get(projectId));
|
|
tianhe.setLichengbei(TB_LICHENGBEI_MAP.get(projectId));
|
|
Map<String,JSONArray> projectCustValueMap=getProjectCustVule(projectId);
|
|
Map<String,JSONArray> projectCustValueMap=getProjectCustVule(projectId);
|
|
@@ -357,7 +361,10 @@ public class TbServiceImpl extends ServiceImpl<TianheMapper, Tianhe> implements
|
|
// wrapper.orderByDesc("confirmjointime");
|
|
// wrapper.orderByDesc("confirmjointime");
|
|
|
|
|
|
//排序:按照项目序号进行排序
|
|
//排序:按照项目序号进行排序
|
|
- wrapper.orderByDesc("xiangmubianhao");
|
|
|
|
|
|
+// wrapper.orderByDesc("xiangmubianhao");
|
|
|
|
+
|
|
|
|
+ //排序:按照项目类别进行排序
|
|
|
|
+ wrapper.orderByDesc("xiangmuleibie");
|
|
|
|
|
|
// List<Employee> employeeList = employeePage.getRecords();
|
|
// List<Employee> employeeList = employeePage.getRecords();
|
|
|
|
|