diff --git a/easy-activiti/src/main/java/com/easy/admin/activiti/service/impl/ActivitiProcessDefinitionServiceImpl.java b/easy-activiti/src/main/java/com/easy/admin/activiti/service/impl/ActivitiProcessDefinitionServiceImpl.java index a9aa2da..6a71c04 100644 --- a/easy-activiti/src/main/java/com/easy/admin/activiti/service/impl/ActivitiProcessDefinitionServiceImpl.java +++ b/easy-activiti/src/main/java/com/easy/admin/activiti/service/impl/ActivitiProcessDefinitionServiceImpl.java @@ -210,11 +210,11 @@ public class ActivitiProcessDefinitionServiceImpl extends ServiceImpl isSysAdmin diff --git a/easy-api/src/main/resources/application-prod.yml b/easy-api/src/main/resources/application-prod.yml index f56a18a..f1c0d29 100644 --- a/easy-api/src/main/resources/application-prod.yml +++ b/easy-api/src/main/resources/application-prod.yml @@ -42,7 +42,7 @@ spring: # 服务器连接端口 port: 6379 # 服务器连接密码（默认为空） - password: 1q2wE$R1qaz@WSX + password: 1qaz@WSX1q2w#E$R jedis: pool: # 连接池最大连接数（使用负值表示没有限制） diff --git a/easy-api/src/main/resources/application-test.yml b/easy-api/src/main/resources/application-test.yml index 6f01354..f56a18a 100644 --- a/easy-api/src/main/resources/application-test.yml +++ b/easy-api/src/main/resources/application-test.yml @@ -15,7 +15,7 @@ springdoc: packagesToScan: com.easy.admin server: # 端口号 - port: 9004 + port: 9001 logging: file: path: logs @@ -61,7 +61,7 @@ spring: dynamic: datasource: master: - url: jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:guoyan_test}?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowMulQueries=true&allowMultiQueries=true&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullDatabaseMeansCurrent=true&useInformationSchema=true + url: jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:guoyan_huzhou}?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowMulQueries=true&allowMultiQueries=true&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullDatabaseMeansCurrent=true&useInformationSchema=true username: ${DB_USERNAME:root} password: ${DB_PASSWORD:1q2w#E$R1qaz@WSX} aj: @@ -85,9 +85,9 @@ jeecg: uploadType: local path: #文件上传根目录 设置 - upload: /opt/guoyantest/upload + upload: /opt/guoyan/upload #webapp文件路径 - webapp: /opt/guoyantest/webapp + webapp: /opt/guoyan/webapp file: storage: # 文件存储方式：local - 本地存储 / oss - 对象存储 diff --git a/easy-sys/src/main/java/com/easy/admin/auth/dao/mapping/SysUserMapper.xml b/easy-sys/src/main/java/com/easy/admin/auth/dao/mapping/SysUserMapper.xml index 4de7313..0cd274f 100644 --- a/easy-sys/src/main/java/com/easy/admin/auth/dao/mapping/SysUserMapper.xml +++ b/easy-sys/src/main/java/com/easy/admin/auth/dao/mapping/SysUserMapper.xml @@ -22,6 +22,7 @@ + update sys_user set status = #{status} @@ -61,8 +62,9 @@ superLeader = commonUtil.dictService.selectByDictType("superLeader").stream().filter(item -> role.getCode().equals(item.getLabel())).collect(Collectors.toList()); + String value = superLeader.get(0).getValue(); + list.add(value); + } + } + if(list.size()>0){ + projectInfoAuthSelect.setSuperLeaderList(list); + } + projectinfo.setSupervisorContactor(currentUser.getId()); + }else if(roleNames.contains("信息化保障团队")) { + List list = new ArrayList(); + for (SysRole role : roleList + ) { + if(role.getName().contains("信息化保障团队")){ + String roleCode = role.getCode(); + list.add(roleCode); + if(roleCode.equals("吴兴区")){ + projectInfoAuthSelect.setOrDutyPlace("湖州市中心医院"); + }else if(roleCode.equals("南浔区")){ + projectInfoAuthSelect.setOrDutyPlace("湖州市第一人民医院"); + }else if(roleCode.equals("长兴县")){ + projectInfoAuthSelect.setOrDutyPlace("湖州市中医院"); + }else if(roleCode.equals("德清县")){ + projectInfoAuthSelect.setOrDutyPlace("湖州市第三人民医院"); + }else if(roleCode.equals("安吉县")){ + projectInfoAuthSelect.setOrDutyPlace("湖州市妇幼保健院"); + }else { + String[] noin = {"湖州市中心医院","湖州市第一人民医院","湖州市中医院","湖州市第三人民医院","湖州市妇幼保健院"}; + projectInfoAuthSelect.setNotorDutyPlace(Arrays.asList(noin)); + } + } + } + if(list.size()>0){ + projectInfoAuthSelect.setAdminDivisionList(list); + } + }else{ + //其他人员查看自己有关的项目 + projectInfoAuthSelect.setProjectContacts(currentUser.getId()); + } + } - return projectinfo; + return projectInfoAuthSelect; } } \ No newline at end of file diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouPlaninfofileController.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouPlaninfofileController.java index 846ea80..3e5cf4d 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouPlaninfofileController.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouPlaninfofileController.java @@ -84,4 +84,9 @@ public class HuzhouPlaninfofileController { Map planFileApprovalInfoByPlaninfoId = planinfoService.getPlanFileApprovalInfoByPlaninfoId(planinfoid); return Result.ok(planFileApprovalInfoByPlaninfoId); } + @GetMapping("/getProcessName") + public Result getProcessName(String pid){ + String processName = planinfofileService.getProcessName(pid); + return Result.ok(processName); + } } diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouProjectController.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouProjectController.java index 2535af6..47b9cdf 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouProjectController.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouProjectController.java @@ -19,6 +19,11 @@ import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.time.LocalDate; +import java.time.ZoneId; +import java.time.temporal.ChronoUnit; +import java.util.Date; @RestController @@ -35,8 +40,8 @@ public class HuzhouProjectController { * @return 返回值 */ @PostMapping("/submitProject") - public Result submitProject(@RequestBody HuzhouProjectinfo info){ - projectinfoService.submitProject(info); + public Result submitProject(@RequestParam(value = "file") MultipartFile[] multipartFile, HuzhouProjectinfo info) throws IOException { + projectinfoService.submitProject(multipartFile,info); return Result.ok("项目入库申请已发起成功"); } @@ -104,6 +109,7 @@ public class HuzhouProjectController { @RequestParam(name="pageSize", defaultValue="10") Integer pageSize){ projectinfo.setStage(projectinfo.getStage()); IPage pageList = projectinfoService.getProjectInfoAndChildPageList(projectinfo, pageNo, pageSize); + return pageList; } diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouProjectassessmentController.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouProjectassessmentController.java index 4b39088..99b30c7 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouProjectassessmentController.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouProjectassessmentController.java @@ -1,7 +1,9 @@ package com.easy.admin.modules.huzhou.controller; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.easy.admin.common.core.annotation.ResponseResult; +import com.easy.admin.modules.huzhou.entity.HuzhouPerformancescore; import com.easy.admin.modules.huzhou.entity.HuzhouProjectassessment; import com.easy.admin.modules.huzhou.entity.HuzhouProjectinfo; import com.easy.admin.modules.huzhou.service.IHuzhouProjectassessmentService; @@ -18,6 +20,12 @@ import java.util.List; public class HuzhouProjectassessmentController { @Autowired private IHuzhouProjectassessmentService projectassessmentService; + //新增项目考核查询内容,包含系统评分 + @GetMapping("/getProjectassessmentIncludeSys") + public List getPerformancescore(String type,String projectId){ + List list = projectassessmentService.getProjectassessmentIncludeSys(type,projectId); + return list; + } @PostMapping("/addProjectassessment") public void addProjectassessment(@RequestBody List projectassessmentList){ projectassessmentList.forEach(item->{ diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouUploadfileinfoController.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouUploadfileinfoController.java index 36182af..ebbdb09 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouUploadfileinfoController.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouUploadfileinfoController.java @@ -94,7 +94,6 @@ public class HuzhouUploadfileinfoController { public Result submitUploadFile(@RequestParam(value = "file") MultipartFile[] files,@RequestParam(value = "projectid") String projectid) throws IOException { uploadfileinfoService.saveFileAndFileInfo(files, projectid,"1"); - WorkFlow workFlow = workflowService.createFlow("supervisionFile",projectid); return Result.OK("上传成功!!"); } diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/HuzhouFieldchangehistoryMapper.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/HuzhouFieldchangehistoryMapper.java index 23355b2..4fdcc18 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/HuzhouFieldchangehistoryMapper.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/HuzhouFieldchangehistoryMapper.java @@ -10,7 +10,7 @@ import java.util.List; import java.util.Map; public interface HuzhouFieldchangehistoryMapper extends BaseMapper { - Page getFieldchangehistoryPageList(Page page, HuzhouProjectinfo projectinfo); + Page getFieldchangehistoryPageList(Page page, HuzhouProjectinfo info); Page getFieldchangehistoryDetailPageList(Page page,String projectid); List getFieldDetailList(String projectid, String fieldValue); } diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/HuzhouPlaninfoHistoryMapper.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/HuzhouPlaninfoHistoryMapper.java index ffa1a30..5c3e02f 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/HuzhouPlaninfoHistoryMapper.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/HuzhouPlaninfoHistoryMapper.java @@ -6,6 +6,6 @@ import com.easy.admin.modules.huzhou.entity.HuzhouPlaninfoHistory; import com.easy.admin.modules.huzhou.entity.HuzhouProjectinfo; public interface HuzhouPlaninfoHistoryMapper extends BaseMapper { - Page getPlanInfoHistoryPageList(Page page,HuzhouProjectinfo projectinfo); + Page getPlanInfoHistoryPageList(Page page,HuzhouProjectinfo info); Page getSinglePlanInfoHistoryPageList(Page page,String projectid); } diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/HuzhouPlaninfoMapper.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/HuzhouPlaninfoMapper.java index 0416b1a..c4c397b 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/HuzhouPlaninfoMapper.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/HuzhouPlaninfoMapper.java @@ -3,6 +3,10 @@ package com.easy.admin.modules.huzhou.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import com.easy.admin.modules.huzhou.entity.HuzhouPlaninfo; +import org.apache.ibatis.annotations.Param; + +import java.util.List; public interface HuzhouPlaninfoMapper extends BaseMapper { + List getChildTaskBySuperior(@Param("info") HuzhouPlaninfo info); } diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/HuzhouUserprojectMapper.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/HuzhouUserprojectMapper.java index 6596971..6434c85 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/HuzhouUserprojectMapper.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/HuzhouUserprojectMapper.java @@ -3,6 +3,7 @@ package com.easy.admin.modules.huzhou.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.easy.admin.auth.model.SysUser; +import com.easy.admin.modules.huzhou.entity.HuzhouProjectinfo; import org.apache.ibatis.annotations.Mapper; import com.easy.admin.modules.huzhou.entity.HuzhouUserproject; @@ -11,6 +12,6 @@ import java.util.Map; public interface HuzhouUserprojectMapper extends BaseMapper { - Page getMyAddressBook(Page page, Map info); + Page getMyAddressBook(Page page, HuzhouProjectinfo info); } diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/mapping/HuzhouContractinfoMapper.xml b/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/mapping/HuzhouContractinfoMapper.xml index 637dc36..22b1954 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/mapping/HuzhouContractinfoMapper.xml +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/mapping/HuzhouContractinfoMapper.xml @@ -99,6 +99,7 @@ - SELECT h.projectid,p.project_name projectName,p.admin_division adminDivision, - p.reform_name reformName,p.super_leader superLeader,count(*) total FROM huzhou_fieldchangehistory h - inner JOIN huzhou_projectinfo p on h.projectid=p.id + SELECT h.projectid,u.project_name projectName,u.admin_division adminDivision, + u.reform_name reformName,u.super_leader superLeader,count(*) total FROM huzhou_fieldchangehistory h + inner JOIN huzhou_projectinfo u on h.projectid=u.id - - and p.id in( - select project_id from huzhou_userproject where user_id=#{projectinfo.projectContacts} - ) - - - and p.id in( - SELECT DISTINCT id from huzhou_projectinfo e where e.admin_division in( - SELECT DISTINCT a.admin_division from huzhou_projectinfo a where a.id in (select c.project_id from - huzhou_userproject c where c.user_id=#{projectinfo.supervisorContactor}) - ) + - OR - e.super_leader in ( - SELECT DISTINCT b.super_leader from huzhou_projectinfo b where b.id in (select d.project_id from - huzhou_userproject d where d.user_id=#{projectinfo.supervisorContactor}) - ) - ) - - - - and p.project_name like #{tempStr} - - - - and p.admin_division like #{tempStr} - - - and p.reform_name = #{projectinfo.reformName} - - - and p.super_leader like #{projectinfo.superLeader} - + + + + + + + + + + + + + + - GROUP BY h.projectid,p.project_name,p.admin_division,p.reform_name,p.super_leader + GROUP BY h.projectid,u.project_name,u.admin_division,u.reform_name,u.super_leader union SELECT h.projectid,p.project_name projectName,p.admin_division adminDivision, p.reform_name reformName,p.super_leader superLeader,count(*) total FROM huzhou_fieldchangehistory h inner JOIN huzhou_sub_projectinfo p on h.projectid=p.id - - + + and p.project_name like #{tempStr} - - + + and p.admin_division like #{tempStr} - - and p.reform_name = #{projectinfo.reformName} + + and p.reform_name = #{info.reformName} - - and p.super_leader like #{projectinfo.superLeader} + + and p.super_leader like #{info.superLeader} GROUP BY h.projectid,p.project_name,p.admin_division,p.reform_name,p.super_leader diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/mapping/HuzhouPlaninfoHistoryMapper.xml b/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/mapping/HuzhouPlaninfoHistoryMapper.xml index f26351b..1076610 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/mapping/HuzhouPlaninfoHistoryMapper.xml +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/mapping/HuzhouPlaninfoHistoryMapper.xml @@ -2,37 +2,12 @@ + select * from huzhou_planinfo where superior = #{info.taskLevel} and project_id = #{info.projectId} order by INET_ATON(CONCAT(task_level, '.0')) + + \ No newline at end of file diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/mapping/HuzhouProjectassessmentMapper.xml b/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/mapping/HuzhouProjectassessmentMapper.xml index 68ad3fb..b02f6eb 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/mapping/HuzhouProjectassessmentMapper.xml +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/mapping/HuzhouProjectassessmentMapper.xml @@ -7,25 +7,9 @@ from huzhou_projectinfo u u.id not in (SELECT project_id FROM huzhou_projectassessment GROUP BY project_id) - - and u.id in( - select project_id from huzhou_userproject where user_id=#{info.projectContacts} - ) - - - and u.id in( - SELECT DISTINCT id from huzhou_projectinfo e where e.admin_division in( - SELECT DISTINCT a.admin_division from huzhou_projectinfo a where a.id in (select c.project_id from - huzhou_userproject c where c.user_id=#{info.supervisorContactor}) - ) + and + - OR - e.super_leader in ( - SELECT DISTINCT b.super_leader from huzhou_projectinfo b where b.id in (select d.project_id from - huzhou_userproject d where d.user_id=#{info.supervisorContactor}) - ) - ) - and u.project_name like #{tempStr} @@ -46,8 +30,6 @@ and u.stage >= #{info.stage} - and u.super_leader = '5' - and(u.duty_workplace like '%医院%' or u.duty_workplace like '%卫生健康%') @@ -61,25 +43,8 @@ from huzhou_projectinfo u inner join (SELECT project_id,sum(sysscores) totalSysscores,sum(pscores) totalPscores FROM huzhou_projectassessment GROUP BY project_id) h on h.project_id=u.id - - and u.id in( - select project_id from huzhou_userproject where user_id=#{info.projectContacts} - ) - - - and u.id in( - SELECT DISTINCT id from huzhou_projectinfo e where e.admin_division in( - SELECT DISTINCT a.admin_division from huzhou_projectinfo a where a.id in (select c.project_id from - huzhou_userproject c where c.user_id=#{info.supervisorContactor}) - ) + - OR - e.super_leader in ( - SELECT DISTINCT b.super_leader from huzhou_projectinfo b where b.id in (select d.project_id from - huzhou_userproject d where d.user_id=#{info.supervisorContactor}) - ) - ) - and u.project_name like #{tempStr} diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/mapping/HuzhouProjectinfoMapper.xml b/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/mapping/HuzhouProjectinfoMapper.xml index 02105e1..b02ffee 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/mapping/HuzhouProjectinfoMapper.xml +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/mapping/HuzhouProjectinfoMapper.xml @@ -54,29 +54,42 @@ - - + SELECT * from huzhou_projectinfo u + + and u.project_name like #{tempStr} @@ -113,25 +126,7 @@ order by create_date desc ( - SELECT p.project_name projectName,p.admin_division adminDivision, s.username,s.nickname,s.phone_number - phoneNumber,s.workplace from huzhou_userproject u inner JOIN sys_user s on s.id = u.user_id - inner join huzhou_projectinfo p on u.project_id =p.id + SELECT u.project_name projectName,u.admin_division adminDivision, s.username,s.nickname,s.phone_number + phoneNumber,s.workplace from huzhou_userproject up inner JOIN sys_user s on s.id = up.user_id + inner join huzhou_projectinfo u on up.project_id =u.id + where + - - WHERE u.project_id in( - select project_id from huzhou_userproject where user_id=#{info.userid} - ) - - - - WHERE u.project_id in( - - SELECT DISTINCT id from huzhou_projectinfo e where e.admin_division in( - SELECT DISTINCT a.admin_division from huzhou_projectinfo a where a.id in (select c.project_id from - huzhou_userproject c where c.user_id=#{info.supervisorid}) - ) - - OR - e.super_leader in ( - SELECT DISTINCT b.super_leader from huzhou_projectinfo b where b.id in (select d.project_id from - huzhou_userproject d where d.user_id=#{info.supervisorid}) - ) - ) - - - ) + ) UNION ( - SELECT sp.project_name projectName,sp.admin_division adminDivision ,s.username,s.nickname,s.phone_number phoneNumber,s.workplace from huzhou_userproject u inner JOIN sys_user s on s.id = u.user_id - inner join huzhou_sub_projectinfo sp on u.project_id =sp.id - - - WHERE u.project_id in( - select project_id from huzhou_userproject where user_id=#{info.userid} - ) - - - WHERE u.project_id in( - SELECT DISTINCT id from huzhou_sub_projectinfo e where e.admin_division in( - SELECT DISTINCT a.admin_division from huzhou_sub_projectinfo a where a.id in (select c.project_id from - huzhou_userproject c where c.user_id=#{info.supervisorid}) - ) - - OR - e.super_leader in ( - SELECT DISTINCT b.super_leader from huzhou_sub_projectinfo b where b.id in (select d.project_id from - huzhou_userproject d where d.user_id=#{info.supervisorid}) - ) - ) - - + SELECT u.project_name projectName,u.admin_division adminDivision ,s.username,s.nickname,s.phone_number + phoneNumber,s.workplace from huzhou_userproject up inner JOIN sys_user s on s.id = up.user_id + inner join huzhou_sub_projectinfo u on up.project_id =u.id + where + ) order by username,adminDivision diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/mapping/HuzhouWorkreportMapper.xml b/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/mapping/HuzhouWorkreportMapper.xml index d717ce7..fd143ce 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/mapping/HuzhouWorkreportMapper.xml +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/mapping/HuzhouWorkreportMapper.xml @@ -19,26 +19,9 @@ SELECT * from huzhou_projectinfo u - u.report_type is null - - and u.id in( - select project_id from huzhou_userproject where user_id=#{info.projectContacts} - ) - - - and u.id in( - SELECT DISTINCT id from huzhou_projectinfo e where e.admin_division in( - SELECT DISTINCT a.admin_division from huzhou_projectinfo a where a.id in (select c.project_id from - huzhou_userproject c where c.user_id=#{info.supervisorContactor}) - ) + + and u.report_type is null - OR - e.super_leader in ( - SELECT DISTINCT b.super_leader from huzhou_projectinfo b where b.id in (select d.project_id from - huzhou_userproject d where d.user_id=#{info.supervisorContactor}) - ) - ) - and u.project_name like #{tempStr} diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/entity/HuzhouPerformancescore.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/entity/HuzhouPerformancescore.java index a1ccfee..0d5a7b9 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/entity/HuzhouPerformancescore.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/entity/HuzhouPerformancescore.java @@ -52,7 +52,7 @@ public class HuzhouPerformancescore extends BaseEntity implements Serializable { private Integer tertiaryLength; private String type; - + private String isobjectivescore; } diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/entity/HuzhouProjectassessment.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/entity/HuzhouProjectassessment.java index 0e1b00a..2f1b548 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/entity/HuzhouProjectassessment.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/entity/HuzhouProjectassessment.java @@ -43,7 +43,7 @@ public class HuzhouProjectassessment extends BaseEntity implements Serializable /** * 分数 */ - private String scores; + private Integer scores; /** * 评价维度合并单元格数量 diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouPlaninfofileService.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouPlaninfofileService.java index d20f498..5ba3bfa 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouPlaninfofileService.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouPlaninfofileService.java @@ -14,4 +14,6 @@ public interface IHuzhouPlaninfofileService extends IService void submitPlanUploadFile(MultipartFile[] files, String planinfoid) throws IOException; void approvePlanFile(MultipartFile[] files, String taskId, String flag, String planinfoid, String comment, MultipartFile[] adviceFiles) throws IOException; + + String getProcessName(String pid); } diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouProcessinfoService.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouProcessinfoService.java index 30df5a0..fbcf960 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouProcessinfoService.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouProcessinfoService.java @@ -23,4 +23,5 @@ public interface IHuzhouProcessinfoService extends IService { WorkflowBaseInfo getProjectByInstid(String processInstanceId); + String getProcessName(String pid); } diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouProjectassessmentService.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouProjectassessmentService.java index 8a8b2c4..8b04627 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouProjectassessmentService.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouProjectassessmentService.java @@ -2,6 +2,7 @@ package com.easy.admin.modules.huzhou.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; +import com.easy.admin.modules.huzhou.entity.HuzhouPerformancescore; import com.easy.admin.modules.huzhou.entity.HuzhouProjectassessment; import com.easy.admin.modules.huzhou.entity.HuzhouProjectinfo; import com.easy.admin.modules.huzhou.vo.HuzhouProjectassessmentOV; @@ -20,4 +21,6 @@ public interface IHuzhouProjectassessmentService extends IService getProjectassessmentIncludeSys(String type, String projectId); } diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouProjectinfoService.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouProjectinfoService.java index 5bba614..c682536 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouProjectinfoService.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouProjectinfoService.java @@ -71,7 +71,7 @@ public interface IHuzhouProjectinfoService extends IService{ * 新增项目入库，提交单个项目 * @param info 项目信息 */ - void submitProject(HuzhouProjectinfo info); + void submitProject(MultipartFile[] multipartFile,HuzhouProjectinfo info) throws IOException; /** * 审批项目入库信息 diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouContractinfoServiceImpl.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouContractinfoServiceImpl.java index 06bfa36..388ce0e 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouContractinfoServiceImpl.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouContractinfoServiceImpl.java @@ -13,6 +13,7 @@ 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.ProjectInfoAuthSelect; import com.easy.admin.sys.model.SysDict; import com.easy.admin.sys.service.SysDictService; import org.activiti.engine.RuntimeService; @@ -59,8 +60,8 @@ public class HuzhouContractinfoServiceImpl extends ServiceImpl getContractProjectPageList(HuzhouProjectinfo projectinfo, Integer pageNo, Integer pageSize) { Page page = new Page(pageNo, pageSize); - projectinfo=CommonUtils.setGetProjectInfoAuth(projectinfo); - Page projectInfoPageList = contractinfoMapper.getContractProjectPageList(page, projectinfo); + ProjectInfoAuthSelect projectInfoAuthSelect = CommonUtils.setGetProjectInfoAuth(projectinfo); + Page projectInfoPageList = contractinfoMapper.getContractProjectPageList(page, projectInfoAuthSelect); List records = projectInfoPageList.getRecords(); records.forEach(item->{ List children = item.getChildren(); @@ -74,8 +75,8 @@ public class HuzhouContractinfoServiceImpl extends ServiceImpl getContractinfoPageList(HuzhouProjectinfo projectinfo, Integer pageNo, Integer pageSize) { Page page = new Page(pageNo, pageSize); - projectinfo=CommonUtils.setGetProjectInfoAuth(projectinfo); - Page projectInfoPageList = contractinfoMapper.getContractinfoPageList(page, projectinfo); + ProjectInfoAuthSelect projectInfoAuthSelect = CommonUtils.setGetProjectInfoAuth(projectinfo); + Page projectInfoPageList = contractinfoMapper.getContractinfoPageList(page, projectInfoAuthSelect); List records = projectInfoPageList.getRecords(); records.forEach(item->{ List children = item.getChildren(); diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouFieldchangehistoryServiceImpl.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouFieldchangehistoryServiceImpl.java index f9ccccf..7ac74f7 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouFieldchangehistoryServiceImpl.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouFieldchangehistoryServiceImpl.java @@ -15,6 +15,7 @@ import com.easy.admin.modules.huzhou.service.IHuzhouFieldchangehistoryService; import com.easy.admin.modules.huzhou.service.IHuzhouProcessinfoService; import com.easy.admin.modules.huzhou.service.IHuzhouUploadfileinfoService; import com.easy.admin.modules.huzhou.service.IWorkflowService; +import com.easy.admin.modules.huzhou.vo.ProjectInfoAuthSelect; import com.easy.admin.sys.model.SysDict; import com.easy.admin.sys.service.SysDictService; import com.easy.admin.util.ShiroUtil; @@ -323,21 +324,8 @@ public class HuzhouFieldchangehistoryServiceImpl extends ServiceImpl getFieldchangehistoryPageList(Page page, HuzhouProjectinfo projectinfo) { - SysUser currentUser = ShiroUtil.getCurrentUser(); - List roleList = currentUser.getRoleList(); - String roles = ""; - for (SysRole role:roleList - ) { - roles = role.getCode()+","+roles; - } - if(roles.contains("manageOrg")||roles.contains("sys:admin")){ - - }else if(roles.contains("supervisor")){ - projectinfo.setSupervisorContactor(currentUser.getId()); - }else { - projectinfo.setProjectContacts(currentUser.getId()); - } - Page pageList = fieldchangehistoryMapper.getFieldchangehistoryPageList(page, projectinfo); + ProjectInfoAuthSelect projectInfoAuthSelect = CommonUtils.setGetProjectInfoAuth(projectinfo); + Page pageList = fieldchangehistoryMapper.getFieldchangehistoryPageList(page, projectInfoAuthSelect); return pageList; } } diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPerformancescoreServiceImpl.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPerformancescoreServiceImpl.java index 3b5c5e4..2cd7f01 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPerformancescoreServiceImpl.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPerformancescoreServiceImpl.java @@ -108,6 +108,15 @@ public class HuzhouPerformancescoreServiceImpl extends ServiceImpl huzhouPerformancescoreLambdaQueryWrapper = new LambdaQueryWrapper<>(); huzhouPerformancescoreLambdaQueryWrapper.eq(HuzhouPerformancescore::getType,type); List list = list(huzhouPerformancescoreLambdaQueryWrapper); + //设置总分 int sum = list.stream().filter(item->item.getScores()!=null).mapToInt(HuzhouPerformancescore::getScores).sum(); LambdaUpdateWrapper performanLambdaUpdateWrapper = new LambdaUpdateWrapper<>(); performanLambdaUpdateWrapper.eq(HuzhouPerforman::getType,type); diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPlaninfoHistoryServiceImpl.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPlaninfoHistoryServiceImpl.java index a2f2a97..d2fd887 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPlaninfoHistoryServiceImpl.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPlaninfoHistoryServiceImpl.java @@ -5,9 +5,11 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.easy.admin.auth.model.SysRole; import com.easy.admin.auth.model.SysUser; +import com.easy.admin.common.util.CommonUtils; import com.easy.admin.modules.huzhou.dao.HuzhouPlaninfoHistoryMapper; import com.easy.admin.modules.huzhou.dao.HuzhouSubProjectinfoMapper; import com.easy.admin.modules.huzhou.vo.HuzhouProjectinfoOV; +import com.easy.admin.modules.huzhou.vo.ProjectInfoAuthSelect; import com.easy.admin.util.ShiroUtil; import com.google.common.collect.Lists; import com.easy.admin.modules.huzhou.entity.HuzhouPlaninfo; @@ -45,21 +47,8 @@ public class HuzhouPlaninfoHistoryServiceImpl extends ServiceImpl getPlanInfoHistoryPageList(HuzhouProjectinfo projectinfo, Integer pageNo, Integer pageSize) { Page projectinfoPage = new Page<>(pageNo, pageSize); - SysUser currentUser = ShiroUtil.getCurrentUser(); - List roleList = currentUser.getRoleList(); - String roles = ""; - for (SysRole role:roleList - ) { - roles = role.getCode()+","+roles; - } - if(roles.contains("manageOrg")||roles.contains("sys:admin")){ - - }else if(roles.contains("supervisor")){ - projectinfo.setSupervisorContactor(currentUser.getId()); - }else { - projectinfo.setProjectContacts(currentUser.getId()); - } - Page pageList = planinfoHistoryMapper.getPlanInfoHistoryPageList(projectinfoPage, projectinfo); + ProjectInfoAuthSelect projectInfoAuthSelect = CommonUtils.setGetProjectInfoAuth(projectinfo); + Page pageList = planinfoHistoryMapper.getPlanInfoHistoryPageList(projectinfoPage, projectInfoAuthSelect); List convertedList = new ArrayList<>(); for (HuzhouProjectinfo info : pageList.getRecords()) { double subTotalMoney =0; diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPlaninfoServiceImpl.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPlaninfoServiceImpl.java index a8ca3ef..08fd4f0 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPlaninfoServiceImpl.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPlaninfoServiceImpl.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.easy.admin.auth.model.SysUser; import com.easy.admin.auth.service.SysUserService; import com.easy.admin.common.core.common.select.Select; import com.easy.admin.common.core.exception.EasyException; @@ -18,6 +19,7 @@ import com.easy.admin.modules.huzhou.service.*; import com.easy.admin.modules.huzhou.vo.HuzhouProjectinfoOV; import com.easy.admin.sys.model.SysDict; import com.easy.admin.sys.service.SysDictService; +import com.easy.admin.util.ShiroUtil; import com.google.common.collect.Lists; import groovyjarjarantlr4.v4.parse.v4ParserException; import org.activiti.engine.HistoryService; @@ -91,6 +93,8 @@ public class HuzhouPlaninfoServiceImpl extends ServiceImpl getPlanInfoListFromFile(MultipartFile multipartFile,String projectid) throws Exception { HashMap resHashMap = new HashMap<>(); @@ -336,7 +340,10 @@ public class HuzhouPlaninfoServiceImpl extends ServiceImpl mapArrayList = new ArrayList<>(); String taskLevel = planinfoOV.getTaskLevel(); - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(HuzhouPlaninfo::getSuperior,taskLevel.toString()); - queryWrapper.eq(HuzhouPlaninfo::getProjectId,planinfoOV.getProjectId()); - queryWrapper.orderByAsc(HuzhouPlaninfo::getTaskLevel); - List huzhouPlaninfoList = this.list(queryWrapper); - if(huzhouPlaninfoList.size()!=0){ - for(HuzhouPlaninfo childInfo:huzhouPlaninfoList){ + HuzhouPlaninfo planinfo = new HuzhouPlaninfo(); + BeanUtils.copyProperties(planinfoOV,planinfo); + List childTaskBySuperior = planinfoMapper.getChildTaskBySuperior(planinfo); +// LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); +// queryWrapper.eq(HuzhouPlaninfo::getSuperior,taskLevel.toString()); +// queryWrapper.eq(HuzhouPlaninfo::getProjectId,planinfoOV.getProjectId()); +//// queryWrapper.orderByAsc(HuzhouPlaninfo::getTaskLevel); +// List huzhouPlaninfoList = this.list(queryWrapper); + if(childTaskBySuperior.size()!=0){ + for(HuzhouPlaninfo childInfo:childTaskBySuperior){ HuzhouPlaninfoOV huzhouPlaninfoOV = new HuzhouPlaninfoOV(); BeanUtils.copyProperties(childInfo,huzhouPlaninfoOV); HuzhouPlaninfoOV setchildmap = setchild(huzhouPlaninfoOV); @@ -872,35 +882,87 @@ public class HuzhouPlaninfoServiceImpl extends ServiceImpl=-30){ - hashMap.put("color","orange"); - }else if(daysUntilScheduledEnd<-30){ - hashMap.put("color","red"); - } - else{ - hashMap.put("color","green"); + //获取子计划信息。查看子计划是否有超时的 + + + String taskLevel = huzhouPlaninfoOV.getTaskLevel(); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.likeRight(HuzhouPlaninfo::getTaskLevel,taskLevel+"."); + queryWrapper.eq(HuzhouPlaninfo::getProjectId,huzhouPlaninfoOV.getProjectId()); + List childList = list(queryWrapper); + //记录每个子项目的状态，是否延期，然后取最严重的 + ArrayList colorList = new ArrayList<>(); + for (HuzhouPlaninfo planinfo: childList) { + //计划结束日期 + Date scheduledEndTime = planinfo.getScheduledEndTime(); + LocalDate scheduledEndDate = scheduledEndTime.toInstant().atZone(ZoneId.systemDefault()).toLocalDate(); + String isfinish = planinfo.getIsfinish(); + if(!"2".equals(isfinish)){ + //当前日期。未完成 + LocalDate today = LocalDate.now(); + long daysUntilScheduledEnd = ChronoUnit.DAYS.between(today, scheduledEndDate); + if(daysUntilScheduledEnd<-15&&daysUntilScheduledEnd>=-30){ + colorList.add("orange"); + }else if(daysUntilScheduledEnd<-30){ + colorList.add("red"); + } + else{ + colorList.add("green"); + } + }else { + //时间结束日期，已完成 + Date actualEndTime = planinfo.getActualEndTime(); + LocalDate actualEndTimeDate = actualEndTime.toInstant().atZone(ZoneId.systemDefault()).toLocalDate(); + long daysUntilactualEnd = ChronoUnit.DAYS.between(actualEndTimeDate,scheduledEndDate); + if(daysUntilactualEnd<-15&&daysUntilactualEnd>=-30){ + colorList.add("orange"); + }else if(daysUntilactualEnd<-30){ + colorList.add("red"); + } + else{ + colorList.add("green"); + } } } - if("2".equals(isfinish)){ - Date actualEndTime = huzhouPlaninfoOV.getActualEndTime(); - LocalDate actualEndTimeDate = actualEndTime.toInstant().atZone(ZoneId.systemDefault()).toLocalDate(); - long daysUntilactualEnd = ChronoUnit.DAYS.between(actualEndTimeDate,scheduledEndDate); - if(daysUntilactualEnd<-15&&daysUntilactualEnd>=-30){ - hashMap.put("color","orange"); - }else if(daysUntilactualEnd<-30){ - hashMap.put("color","red"); - } - else{ - hashMap.put("color","green"); - } + + if(colorList.contains("red")){ + hashMap.put("color","red"); + }else if(colorList.contains("orange")){ + hashMap.put("color","orange"); + } + else{ + hashMap.put("color","green"); } +// +// Date scheduledEndTime = huzhouPlaninfoOV.getScheduledEndTime(); +// LocalDate scheduledEndDate = scheduledEndTime.toInstant().atZone(ZoneId.systemDefault()).toLocalDate(); +// String isfinish = huzhouPlaninfoOV.getIsfinish(); +// //未完成 查看是否超时 +// LocalDate today = LocalDate.now(); +// long daysUntilScheduledEnd = ChronoUnit.DAYS.between(today, scheduledEndDate); +// if(!"2".equals(isfinish)){ +// if(daysUntilScheduledEnd<-15&&daysUntilScheduledEnd>=-30){ +// hashMap.put("color","orange"); +// }else if(daysUntilScheduledEnd<-30){ +// hashMap.put("color","red"); +// } +// else{ +// hashMap.put("color","green"); +// } +// } +// if("2".equals(isfinish)){ +// Date actualEndTime = huzhouPlaninfoOV.getActualEndTime(); +// LocalDate actualEndTimeDate = actualEndTime.toInstant().atZone(ZoneId.systemDefault()).toLocalDate(); +// long daysUntilactualEnd = ChronoUnit.DAYS.between(actualEndTimeDate,scheduledEndDate); +// if(daysUntilactualEnd<-15&&daysUntilactualEnd>=-30){ +// hashMap.put("color","orange"); +// }else if(daysUntilactualEnd<-30){ +// hashMap.put("color","red"); +// } +// else{ +// hashMap.put("color","green"); +// } +// } hashMap.put("percent",percent); hashMap.put("taskName",huzhouPlaninfoOV.getTaskName()); map.put(str+String.valueOf(i),hashMap); diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPlaninfofileServiceImpl.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPlaninfofileServiceImpl.java index 9e393da..8a89e15 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPlaninfofileServiceImpl.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPlaninfofileServiceImpl.java @@ -49,8 +49,8 @@ public class HuzhouPlaninfofileServiceImpl extends ServiceImpl getplanFilePageList(HuzhouPlaninfofile planinfofile,Integer pageNo, Integer pageSize) { Page page = new Page<>(pageNo,pageSize); @@ -94,6 +94,16 @@ public class HuzhouPlaninfofileServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(HuzhouContractinfo::getTaskName,taskName); + queryWrapper.eq(HuzhouContractinfo::getProjectId,projectId); + queryWrapper.ge(HuzhouContractinfo::getStatus,"1"); + List contractinfoList = contractinfoMapper.selectList(queryWrapper); + if(contractinfoList!=null&&contractinfoList.size()>0){ + existsContractinfo=true; + } //获取上级指导室中文名称 SysDict dict = sysDictService.getDictByCode("superLeader", superLeader); String dictName = dict.getName(); @@ -109,9 +119,9 @@ public class HuzhouPlaninfofileServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(HuzhouContractinfo::getTaskName,taskName); - queryWrapper.eq(HuzhouContractinfo::getProjectId,projectId); - queryWrapper.ge(HuzhouContractinfo::getStatus,"1"); - List contractinfoList = contractinfoMapper.selectList(queryWrapper); - if(contractinfoList!=null&&contractinfoList.size()>0){ - existsContractinfo=true; + HuzhouPlaninfo huzhouPlaninfo = new HuzhouPlaninfo(); + huzhouPlaninfo.setId(planinfoid); + huzhouPlaninfo.setIsfinish("1"); + planinfoService.updateById(huzhouPlaninfo); } - if(Arrays.asList(names).contains(taskName)||existsContractinfo){ + + else if(Arrays.asList(names).contains(taskName)||existsContractinfo){ WorkFlow workFlow = workflowService.createFlow("createPlaninfoFile",planinfoid); Task task = workFlow.getTask(); String taskId = task.getId(); @@ -181,22 +185,12 @@ public class HuzhouPlaninfofileServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(HuzhouProcessinfo::getProjectid,pid); + List list = list(queryWrapper); + if(list.size()==0){ + return "createPlaninfoFile"; + } + String processName = list.get(0).getProcessName(); + return processName; + } + } diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouProjectassessmentService.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouProjectassessmentService.java index 94758c4..e90ea7a 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouProjectassessmentService.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouProjectassessmentService.java @@ -5,53 +5,53 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.easy.admin.auth.model.SysRole; + import com.easy.admin.auth.model.SysUser; import com.easy.admin.common.util.CommonUtils; +import com.easy.admin.modules.huzhou.dao.HuzhouPerformancescoreMapper; +import com.easy.admin.modules.huzhou.dao.HuzhouPlaninfoMapper; import com.easy.admin.modules.huzhou.dao.HuzhouProjectassessmentMapper; +import com.easy.admin.modules.huzhou.entity.HuzhouPerformancescore; +import com.easy.admin.modules.huzhou.entity.HuzhouPlaninfo; import com.easy.admin.modules.huzhou.entity.HuzhouProjectassessment; import com.easy.admin.modules.huzhou.entity.HuzhouProjectinfo; -import com.easy.admin.modules.huzhou.entity.HuzhouUploadfileinfo; + import com.easy.admin.modules.huzhou.service.IHuzhouProjectassessmentService; import com.easy.admin.modules.huzhou.vo.HuzhouProjectassessmentOV; +import com.easy.admin.modules.huzhou.vo.ProjectInfoAuthSelect; + import com.easy.admin.util.ShiroUtil; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.util.FileCopyUtils; +import org.springframework.util.StringUtils; import org.springframework.web.multipart.MultipartFile; import java.io.File; import java.io.IOException; import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.time.LocalDate; +import java.time.ZoneId; +import java.time.temporal.ChronoUnit; +import java.util.*; @Service public class HuzhouProjectassessmentService extends ServiceImpl implements IHuzhouProjectassessmentService { @Autowired private HuzhouProjectassessmentMapper projectassessmentMapper; + @Autowired + private HuzhouPerformancescoreMapper performancescoreMapper; + @Autowired + private HuzhouPlaninfoMapper huzhouPlaninfoMapper; @Value(value = "${jeecg.path.upload}") private String uploadpath; @Override public Page getProjectassessmentPageList(Page page, HuzhouProjectinfo projectinfo) { - SysUser currentUser = ShiroUtil.getCurrentUser(); - List roleList = currentUser.getRoleList(); - String roles = ""; - for (SysRole role:roleList - ) { - roles = role.getCode()+","+roles; - } - if(roles.contains("manageOrg")||roles.contains("sys:admin")){ + ProjectInfoAuthSelect projectInfoAuthSelect = CommonUtils.setGetProjectInfoAuth(projectinfo); - }else if(roles.contains("supervisor")){ - projectinfo.setSupervisorContactor(currentUser.getId()); - }else { - projectinfo.setProjectContacts(currentUser.getId()); - } - Page projectassessmentPageList = projectassessmentMapper.getProjectassessmentPageList(page, projectinfo); + Page projectassessmentPageList = projectassessmentMapper.getProjectassessmentPageList(page, projectInfoAuthSelect); List records = projectassessmentPageList.getRecords(); records.forEach(item->{ if(item.getTotalPscores()==null){ @@ -67,21 +67,8 @@ public class HuzhouProjectassessmentService extends ServiceImpl getProjectassessmentProjectPageList(Page page, HuzhouProjectinfo projectinfo){ - SysUser currentUser = ShiroUtil.getCurrentUser(); - List roleList = currentUser.getRoleList(); - String roles = ""; - for (SysRole role:roleList - ) { - roles = role.getCode()+","+roles; - } - if(roles.contains("manageOrg")||roles.contains("sys:admin")){ - - }else if(roles.contains("supervisor")){ - projectinfo.setSupervisorContactor(currentUser.getId()); - }else { - projectinfo.setProjectContacts(currentUser.getId()); - } - return projectassessmentMapper.getProjectassessmentProjectPageList(page,projectinfo); + ProjectInfoAuthSelect projectInfoAuthSelect = CommonUtils.setGetProjectInfoAuth(projectinfo); + return projectassessmentMapper.getProjectassessmentProjectPageList(page,projectInfoAuthSelect); } @Override @@ -114,7 +101,10 @@ public class HuzhouProjectassessmentService extends ServiceImpl getProjectassessmentIncludeSys(String type, String projectId) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(HuzhouPerformancescore::getType,type); + List huzhouPerformancescoreList = performancescoreMapper.selectList(queryWrapper); + List huzhouProjectassessmentList = new ArrayList<>(); + for (HuzhouPerformancescore score:huzhouPerformancescoreList + ) { + HuzhouProjectassessment huzhouProjectassessment = new HuzhouProjectassessment(); + BeanUtils.copyProperties(score,huzhouProjectassessment); + String isobjectivescore = score.getIsobjectivescore(); + if(isobjectivescore!=null){ + if("1".equals(isobjectivescore)){ + //可研技术审查报告 在计划中有几稿，初稿算一搞，二稿，算驳回一次，终稿算驳回两次 + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(HuzhouPlaninfo::getProjectId,projectId);//项目计划 + wrapper.like(HuzhouPlaninfo::getTaskName,"可研技术审查报告");//阶段名称模糊查询 + wrapper.eq(HuzhouPlaninfo::getIsfinish,"2");//已完成 + Long selectCount = huzhouPlaninfoMapper.selectCount(wrapper); + if(selectCount==1){ + //只有初稿满分 + huzhouProjectassessment.setSysscores("2"); + }else if(selectCount<=3){ + //驳回两次及其以内 + huzhouProjectassessment.setSysscores("1"); + }else{ + huzhouProjectassessment.setSysscores("0"); + } + }else if("2".equals(isobjectivescore)){ + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(HuzhouPlaninfo::getProjectId,projectId);//项目计划 + wrapper.likeRight(HuzhouPlaninfo::getTaskLevel,"2.");//第二阶段-项目采购阶段的所有子阶段 + List huzhouPlaninfoList = huzhouPlaninfoMapper.selectList(wrapper); + String fenshu=""; + ArrayList longArrayList = new ArrayList<>(); + for (HuzhouPlaninfo planinfo:huzhouPlaninfoList + ) { + if(planinfo.getIsfinish().equals("2")){ + /** + * 待优化工作日的判断 + */ + //计划结束日期 + Date scheduledEndTime = planinfo.getScheduledEndTime(); + LocalDate scheduledEndDate = scheduledEndTime.toInstant().atZone(ZoneId.systemDefault()).toLocalDate(); + //实际完成日期 + Date actualEndTime = planinfo.getActualEndTime(); + LocalDate actualEndTimeDate = actualEndTime.toInstant().atZone(ZoneId.systemDefault()).toLocalDate(); + //后面减前面 + long daysUntilactualEnd = ChronoUnit.DAYS.between(scheduledEndDate,actualEndTimeDate); + longArrayList.add(daysUntilactualEnd); + }else{ + //说明有未完成的内容 + fenshu="0"; + break; + } + } + if("0".equals(fenshu)){ + huzhouProjectassessment.setSysscores("0"); + + }else { + //取最大值 + Long max = Collections.max(longArrayList); + if(max<=0){ + huzhouProjectassessment.setSysscores("3"); + }else if(max<=5){ + huzhouProjectassessment.setSysscores("2"); + + }else if(max<=10){ + huzhouProjectassessment.setSysscores("1"); + }else { + huzhouProjectassessment.setSysscores("0"); + } + } + + } else if ("3".equals(isobjectivescore)) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(HuzhouPlaninfo::getProjectId,projectId);//项目计划 + wrapper.eq(HuzhouPlaninfo::getTaskName,"首付支付");//首付支付为项目建设阶段开始的第一个阶段 + List huzhouPlaninfoList = huzhouPlaninfoMapper.selectList(wrapper); + if(huzhouPlaninfoList.size()==0||!huzhouPlaninfoList.get(0).getIsfinish().equals("2")){ + huzhouProjectassessment.setSysscores("0");//没有这个阶段或者这个阶段没完成不得分 + }else{ + HuzhouPlaninfo planinfo = huzhouPlaninfoList.get(0); + Date scheduledEndTime = planinfo.getScheduledEndTime(); + LocalDate scheduledEndDate = scheduledEndTime.toInstant().atZone(ZoneId.systemDefault()).toLocalDate(); + //实际完成日期 + Date actualEndTime = planinfo.getActualEndTime(); + LocalDate actualEndTimeDate = actualEndTime.toInstant().atZone(ZoneId.systemDefault()).toLocalDate(); + //后面减前面 + long months = ChronoUnit.MONTHS.between(scheduledEndDate,actualEndTimeDate); + if(months<=1){ + huzhouProjectassessment.setSysscores("3");// + } else if (months<=2) {//两个月多计算结果也是2 + huzhouProjectassessment.setSysscores("2");// + }else{ + huzhouProjectassessment.setSysscores("0");// + } + } + }else if("4".equals(isobjectivescore)){ + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(HuzhouPlaninfo::getProjectId,projectId);//项目计划 + wrapper.in(HuzhouPlaninfo::getTaskLevel,"1","2","3");//第二阶段-项目采购阶段的所有子阶段 + List huzhouPlaninfoList = huzhouPlaninfoMapper.selectList(wrapper); + String fenshu=""; + ArrayList longArrayList = new ArrayList<>(); + for (HuzhouPlaninfo planinfo:huzhouPlaninfoList + ) { + if(planinfo.getIsfinish().equals("2")){ + /** + * 待优化工作日的判断 + */ + //计划结束日期 + Date scheduledEndTime = planinfo.getScheduledEndTime(); + LocalDate scheduledEndDate = scheduledEndTime.toInstant().atZone(ZoneId.systemDefault()).toLocalDate(); + //实际完成日期 + Date actualEndTime = planinfo.getActualEndTime(); + LocalDate actualEndTimeDate = actualEndTime.toInstant().atZone(ZoneId.systemDefault()).toLocalDate(); + //后面减前面 + long daysUntilactualEnd = ChronoUnit.MONTHS.between(scheduledEndDate,actualEndTimeDate); + longArrayList.add(daysUntilactualEnd); + }else{ + //说明有未完成的内容 + fenshu="0"; + break; + } + } + if("0".equals(fenshu)){ + huzhouProjectassessment.setSysscores("0"); + + }else { + //取最大值 + Long max = Collections.max(longArrayList); + if(max<=0){ + huzhouProjectassessment.setSysscores("3"); + }else if(max<=2){ + huzhouProjectassessment.setSysscores("2"); + }else { + huzhouProjectassessment.setSysscores("0"); + } + } + } else if ("5".equals(isobjectivescore)) { + huzhouProjectassessment.setSysscores("2");//前端在合同创建的时候强控了，默认满分 + }else if("6".equals(isobjectivescore)){ + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(HuzhouPlaninfo::getProjectId,projectId);//项目计划 + wrapper.eq(HuzhouPlaninfo::getIsfinish,"2"); + List huzhouPlaninfoList = huzhouPlaninfoMapper.selectList(wrapper); + String fenshu=""; + ArrayList longArrayList = new ArrayList<>(); + for (HuzhouPlaninfo planinfo:huzhouPlaninfoList + ) { + + /** + * 待优化工作日的判断 + */ + //计划结束日期 + Date scheduledEndTime = planinfo.getScheduledEndTime(); + LocalDate scheduledEndDate = scheduledEndTime.toInstant().atZone(ZoneId.systemDefault()).toLocalDate(); + //实际完成日期 + Date actualEndTime = planinfo.getActualEndTime(); + LocalDate actualEndTimeDate = actualEndTime.toInstant().atZone(ZoneId.systemDefault()).toLocalDate(); + //后面减前面 + long daysUntilactualEnd = ChronoUnit.DAYS.between(scheduledEndDate, actualEndTimeDate); + longArrayList.add(daysUntilactualEnd); + + } + //取最大值 + Long max = Collections.max(longArrayList); + if(max<=0){ + huzhouProjectassessment.setSysscores("3"); + }else if(max<=15){ + huzhouProjectassessment.setSysscores("1.5"); + }else { + huzhouProjectassessment.setSysscores("0"); + } + } else if ("7".equals(isobjectivescore)) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(HuzhouPlaninfo::getProjectId,projectId);//项目计划 + wrapper.eq(HuzhouPlaninfo::getTaskName,"终验阶段");//首付支付为项目建设阶段开始的第一个阶段 + List huzhouPlaninfoList = huzhouPlaninfoMapper.selectList(wrapper); + if(huzhouPlaninfoList.size()==0||!huzhouPlaninfoList.get(0).getIsfinish().equals("2")){ + huzhouProjectassessment.setSysscores("0");//没有这个阶段或者这个阶段没完成不得分 + }else{ + HuzhouPlaninfo planinfo = huzhouPlaninfoList.get(0); + Date scheduledEndTime = planinfo.getScheduledEndTime(); + LocalDate scheduledEndDate = scheduledEndTime.toInstant().atZone(ZoneId.systemDefault()).toLocalDate(); + //实际完成日期 + Date actualEndTime = planinfo.getActualEndTime(); + LocalDate actualEndTimeDate = actualEndTime.toInstant().atZone(ZoneId.systemDefault()).toLocalDate(); + //后面减前面 + long months = ChronoUnit.DAYS.between(scheduledEndDate,actualEndTimeDate); + if(months<=0){ + huzhouProjectassessment.setSysscores("3");// + } else if (months<=15) {//两个月多计算结果也是2 + huzhouProjectassessment.setSysscores("1.5");// + }else{ + huzhouProjectassessment.setSysscores("0");// + } + } + } + huzhouProjectassessmentList.add(huzhouProjectassessment); + }else{ + huzhouProjectassessmentList.add(huzhouProjectassessment); + } + } + return huzhouProjectassessmentList; + } + } diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouProjectinfoServiceImpl.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouProjectinfoServiceImpl.java index 4b718fc..d108611 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouProjectinfoServiceImpl.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouProjectinfoServiceImpl.java @@ -1,5 +1,6 @@ package com.easy.admin.modules.huzhou.service.impl; +import cn.hutool.core.util.RandomUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; @@ -27,8 +28,10 @@ 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.sys.model.SysDict; import com.easy.admin.sys.service.SysDictService; +import com.easy.admin.util.PasswordUtil; import com.easy.admin.util.ShiroUtil; import org.activiti.engine.IdentityService; import org.activiti.engine.RuntimeService; @@ -39,10 +42,7 @@ import org.activiti.engine.task.Task; import org.apache.commons.lang3.StringUtils; import com.easy.admin.common.api.vo.Result; import org.apache.poi.hssf.usermodel.HSSFWorkbook; -import org.apache.poi.ss.usermodel.CellType; -import org.apache.poi.ss.usermodel.Row; -import org.apache.poi.ss.usermodel.Sheet; -import org.apache.poi.ss.usermodel.Workbook; +import org.apache.poi.ss.usermodel.*; import org.apache.poi.xssf.usermodel.XSSFWorkbook; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -69,10 +69,6 @@ public class HuzhouProjectinfoServiceImpl extends ServiceImpl getProjectInfoAndChildPageList(HuzhouProjectinfo projectinfo, Integer pageNo, Integer pageSize) { Page page = new Page(pageNo, pageSize); - projectinfo = CommonUtils.setGetProjectInfoAuth(projectinfo); - Page projectAndChildInfoPageList = projectinfoMapper.getProjectAndChildInfoPageList(page,projectinfo); + ProjectInfoAuthSelect projectInfoAuthSelect = CommonUtils.setGetProjectInfoAuth(projectinfo); + Page projectAndChildInfoPageList = projectinfoMapper.getProjectAndChildInfoPageList(page,projectInfoAuthSelect); List records = projectAndChildInfoPageList.getRecords(); records.forEach(item->{ item.setMissingSubprojects(false);//设置默认是false diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouRegulationlabServiceImpl.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouRegulationlabServiceImpl.java index 1fd486c..6a7bbb1 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouRegulationlabServiceImpl.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouRegulationlabServiceImpl.java @@ -3,7 +3,9 @@ package com.easy.admin.modules.huzhou.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.easy.admin.auth.model.SysUser; import com.easy.admin.modules.huzhou.dao.HuzhouRegulationlabMapper; +import com.easy.admin.util.ShiroUtil; import org.apache.commons.lang3.StringUtils; import com.easy.admin.common.util.CommonUtils; import com.easy.admin.modules.huzhou.entity.HuzhouRegulationlab; @@ -113,7 +115,9 @@ public class HuzhouRegulationlabServiceImpl extends ServiceImpl> userDictByRoles = sysUserService.getUserDictByRoles(dictName); + ArrayList strings = new ArrayList<>(); + if(userDictByRoles==null||userDictByRoles.size()==0){ + String error = "任务牵头处室"+dictName+"负责人未找到"; + throw new EasyException(error); + } + userDictByRoles.forEach(item->{ + String value = item.get("value"); + HuzhouUserproject huzhouUserproject = new HuzhouUserproject(); + huzhouUserproject.setProjectId(projectinfo.getId()); + huzhouUserproject.setUserId(value); + huzhouUserproject.setIssubproject(issubproject); + this.save(huzhouUserproject); + }); } @Override @@ -96,23 +123,10 @@ public class HuzhouUserprojectServiceImpl extends ServiceImpl getMyAddressBook(Integer pageNo, Integer pageSize) { Page sysUserPage = new Page(pageNo,pageSize); - SysUser currentUser = ShiroUtil.getCurrentUser(); - List roleList = currentUser.getRoleList(); - Map stringStringMap = new HashMap<>(); - String roles = ""; - for (SysRole role:roleList - ) { - roles = role.getCode()+","+roles; - } - if(roles.contains("manageOrg")||roles.contains("sys:admin")){ - - }else if(roles.contains("supervisor")){ - stringStringMap.put("supervisorid",currentUser.getId()); - }else { - stringStringMap.put("userid",currentUser.getId()); - } + HuzhouProjectinfo huzhouProjectinfo = new HuzhouProjectinfo(); + ProjectInfoAuthSelect projectInfoAuthSelect = CommonUtils.setGetProjectInfoAuth(huzhouProjectinfo); - Page myAddressBook = userprojectMapper.getMyAddressBook(sysUserPage, stringStringMap); + Page myAddressBook = userprojectMapper.getMyAddressBook(sysUserPage, projectInfoAuthSelect); return myAddressBook; } diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouWorkreportServiceImpl.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouWorkreportServiceImpl.java index 5085a77..ed2636b 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouWorkreportServiceImpl.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouWorkreportServiceImpl.java @@ -12,6 +12,7 @@ import com.easy.admin.modules.huzhou.entity.HuzhouWorkreport; import com.easy.admin.modules.huzhou.service.IHuzhouProjectinfoService; import com.easy.admin.modules.huzhou.service.IHuzhouWorkreportService; import com.easy.admin.modules.huzhou.vo.HuzhouWorkreportOV; +import com.easy.admin.modules.huzhou.vo.ProjectInfoAuthSelect; import com.easy.admin.util.ShiroUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; @@ -40,8 +41,8 @@ public class HuzhouWorkreportServiceImpl extends ServiceImpl getWorkreportPageList(HuzhouProjectinfo huzhouProjectinfo, Integer pageNo, Integer pageSize) { Page page = new Page<>(pageNo, pageSize); - huzhouProjectinfo=CommonUtils.setGetProjectInfoAuth(huzhouProjectinfo); - Page pageList = workreportMapper.getWorkreportPageList(page, huzhouProjectinfo); + ProjectInfoAuthSelect projectInfoAuthSelect = CommonUtils.setGetProjectInfoAuth(huzhouProjectinfo); + Page pageList = workreportMapper.getWorkreportPageList(page, projectInfoAuthSelect); return pageList; } @@ -89,8 +90,8 @@ public class HuzhouWorkreportServiceImpl extends ServiceImpl getNoTypeWorkReportPageList(HuzhouProjectinfo projectinfo, Integer pageNo, Integer pageSize) { Page page = new Page<>(pageNo, pageSize); - projectinfo=CommonUtils.setGetProjectInfoAuth(projectinfo); - IPage res =workreportMapper.getNoTypeWorkReportPageList(page,projectinfo); + ProjectInfoAuthSelect projectInfoAuthSelect = CommonUtils.setGetProjectInfoAuth(projectinfo); + IPage res =workreportMapper.getNoTypeWorkReportPageList(page,projectInfoAuthSelect); return res; } @@ -104,7 +105,9 @@ public class HuzhouWorkreportServiceImpl extends ServiceImpl superLeaderList; + List adminDivisionList; + String orDutyPlace; + List notorDutyPlace; +} diff --git a/huzhou/src/main/resources/excelTemplate/项目入库导出模板.xlsx b/huzhou/src/main/resources/excelTemplate/项目入库导出模板.xlsx index 94f533a..23c6429 100644 Binary files a/huzhou/src/main/resources/excelTemplate/项目入库导出模板.xlsx and b/huzhou/src/main/resources/excelTemplate/项目入库导出模板.xlsx differ diff --git a/huzhou/src/main/resources/excelTemplate/项目入库模板.xlsx b/huzhou/src/main/resources/excelTemplate/项目入库模板.xlsx index 009d45e..a978306 100644 Binary files a/huzhou/src/main/resources/excelTemplate/项目入库模板.xlsx and b/huzhou/src/main/resources/excelTemplate/项目入库模板.xlsx differ diff --git a/huzhou/src/main/resources/excelTemplate/项目计划模板.xlsx b/huzhou/src/main/resources/excelTemplate/项目计划模板.xlsx index d514c04..276ab9e 100644 Binary files a/huzhou/src/main/resources/excelTemplate/项目计划模板.xlsx and b/huzhou/src/main/resources/excelTemplate/项目计划模板.xlsx differ