|
|
@ -26,13 +26,12 @@ import com.easy.admin.modules.huzhou.dao.HuzhouProjectinfoMapper; |
|
|
|
import com.easy.admin.modules.huzhou.dao.HuzhouSubProjectinfoMapper; |
|
|
|
import com.easy.admin.modules.huzhou.entity.*; |
|
|
|
import com.easy.admin.modules.huzhou.service.*; |
|
|
|
import com.easy.admin.modules.huzhou.vo.HuzhouProjectinfoOV; |
|
|
|
import com.easy.admin.modules.huzhou.vo.ProjectApproveOV; |
|
|
|
import com.easy.admin.modules.huzhou.vo.ProjectInfoAuthSelect; |
|
|
|
import com.easy.admin.modules.huzhou.vo.*; |
|
|
|
import com.easy.admin.sys.model.SysDict; |
|
|
|
import com.easy.admin.sys.service.SysDictService; |
|
|
|
import com.easy.admin.util.PasswordUtil; |
|
|
|
import com.easy.admin.util.ShiroUtil; |
|
|
|
import javassist.expr.NewArray; |
|
|
|
import org.activiti.engine.IdentityService; |
|
|
|
import org.activiti.engine.RuntimeService; |
|
|
|
import org.activiti.engine.TaskService; |
|
|
@ -86,6 +85,9 @@ public class HuzhouProjectinfoServiceImpl extends ServiceImpl<HuzhouProjectinfoM |
|
|
|
private HuzhouProjectinfoHistoryMapper historyMapper; |
|
|
|
@Autowired |
|
|
|
private IHuzhouUploadfileinfoService uploadfileinfoService; |
|
|
|
|
|
|
|
@Autowired |
|
|
|
private IHuzhouPlaninfoService huzhouPlaninfoService; |
|
|
|
@Override |
|
|
|
|
|
|
|
public void submitProject(MultipartFile[] multipartFile,HuzhouProjectinfo info) throws IOException { |
|
|
@ -334,6 +336,9 @@ public class HuzhouProjectinfoServiceImpl extends ServiceImpl<HuzhouProjectinfoM |
|
|
|
userprojectService.saveFromProject(huzhouProjectinfo,"0"); |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
public void modifyStageById(String id, String stage) { |
|
|
|
HuzhouProjectinfo byId = getById(id); |
|
|
@ -491,4 +496,51 @@ public class HuzhouProjectinfoServiceImpl extends ServiceImpl<HuzhouProjectinfoM |
|
|
|
// return "0";
|
|
|
|
// }
|
|
|
|
|
|
|
|
@Override |
|
|
|
public ProjectProgressOV countProjectProgress() { |
|
|
|
//1、查询所有项目
|
|
|
|
//2、查询所有项目对应的计划阶段
|
|
|
|
HuzhouProjectinfo projectinfo =new HuzhouProjectinfo(); |
|
|
|
projectinfo.setStage("0"); |
|
|
|
ProjectInfoAuthSelect projectInfoAuthSelect = CommonUtils.setGetProjectInfoAuth(projectinfo); |
|
|
|
List<HuzhouProjectinfoOV> projectAndChildInfoPageList = projectinfoMapper.getProjectAndChildInfoPageList(projectInfoAuthSelect); |
|
|
|
List<String> zIds = projectAndChildInfoPageList.stream().map(x -> x.getId()).collect(Collectors.toList()); |
|
|
|
List<String> cIds = new ArrayList<>(); |
|
|
|
for(HuzhouProjectinfoOV info:projectAndChildInfoPageList){ |
|
|
|
if(info.getChildren()!=null){ |
|
|
|
for(HuzhouSubProjectinfo child:info.getChildren()){ |
|
|
|
cIds.add(child.getProjectId()); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
zIds.addAll(cIds); |
|
|
|
|
|
|
|
|
|
|
|
return null; |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
public FundOV countFund() { |
|
|
|
return null; |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
public ProjectStatusOV countProjectStatus() { |
|
|
|
return null; |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
public ReformTasksProgressOV countReformTasksProgress() { |
|
|
|
return null; |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
public AdministrativeAreaProgressOV countAdministrativeAreaProgress() { |
|
|
|
return null; |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
public UnitAttributesProgressOV UnitAttributesProgress() { |
|
|
|
return null; |
|
|
|
} |
|
|
|
} |
|
|
|