|
@@ -78,7 +78,7 @@ public class ZsyzCommonServiceImpL implements IZsyzCommonService {
|
|
|
ZsyzSbbzb zsyzSbbzb = new ZsyzSbbzb();
|
|
|
zsyzSbbzb.setId(zsyzShyj.getXmId());
|
|
|
|
|
|
- if (SZBM.equals(roleName)) {
|
|
|
+ if (YSBM.equals(roleName)) {
|
|
|
ZsyzProjectDept zsyzProjectDept = new ZsyzProjectDept();
|
|
|
zsyzProjectDept.setXmId(zsyzShyj.getXmId());
|
|
|
zsyzProjectDept.setDeptId(SecurityUtils.getDeptId());
|
|
@@ -131,6 +131,132 @@ public class ZsyzCommonServiceImpL implements IZsyzCommonService {
|
|
|
return AjaxResult.success();
|
|
|
}
|
|
|
|
|
|
+
|
|
|
+ * Cjd的项目审核/驳回接口
|
|
|
+ * 参数是审核建议
|
|
|
+ *
|
|
|
+ * @return
|
|
|
+ */
|
|
|
+ @Override
|
|
|
+ public AjaxResult xsshCjd(ZsyzShyj zsyzShyj) {
|
|
|
+
|
|
|
+ List<SysRole> roles = SecurityUtils.getLoginUser().getUser().getRoles();
|
|
|
+ String roleName = "";
|
|
|
+ if (roles != null && roles.size() > 0) {
|
|
|
+ roleName = roles.get(0).getRoleKey();
|
|
|
+ }
|
|
|
+ if (CJD.equals(roleName)) {
|
|
|
+ return AjaxResult.error("当前用户不是承接地角色");
|
|
|
+ }
|
|
|
+
|
|
|
+ String shjg = zsyzShyj.getShjg();
|
|
|
+
|
|
|
+ String progress = zsyzShyj.getXmjd();
|
|
|
+ if (!FOR.equals(progress)) {
|
|
|
+ return AjaxResult.error("当前项目状态异常,承接地无法审核");
|
|
|
+ }
|
|
|
+
|
|
|
+ ZsyzSbbzb zsyzSbbzb = new ZsyzSbbzb();
|
|
|
+ zsyzSbbzb.setId(zsyzShyj.getXmId());
|
|
|
+
|
|
|
+ {
|
|
|
+ if (ONE.equals(shjg)) {
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+ String progressResult = changeProgress(progress, roleName);
|
|
|
+ if (ERROR.equals(progressResult)) {
|
|
|
+ return AjaxResult.error("当前状态下您没有审核权限");
|
|
|
+ }
|
|
|
+ zsyzSbbzb.setProgress(progressResult);
|
|
|
+ zsyzSbbzb.setShjg(ONE);
|
|
|
+ zsyzSbbzbMapper.updateZsyzSbbzbProgress(zsyzSbbzb);
|
|
|
+ } else if (TWO.equals(shjg)) {
|
|
|
+ String progressResult = changeProgressBack(progress, roleName);
|
|
|
+ if (ERROR.equals(progressResult)) {
|
|
|
+ return AjaxResult.error("当前状态下您没有审核权限");
|
|
|
+ }
|
|
|
+
|
|
|
+ zsyzSbbzb.setProgress(progressResult);
|
|
|
+ zsyzSbbzb.setShjg(TWO);
|
|
|
+ zsyzSbbzbMapper.updateZsyzSbbzbProgress(zsyzSbbzb);
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ LoginUser loginUser = SecurityUtils.getLoginUser();
|
|
|
+ SysDept dept = loginUser.getUser().getDept();
|
|
|
+ zsyzShyj.setDeptId(dept.getDeptId());
|
|
|
+ zsyzShyj.setShrxm(dept.getDeptName());
|
|
|
+ zsyzShyj.setXmjd(xmjd(progress));
|
|
|
+ zsyzShyjMapper.insertZsyzShyj(zsyzShyj);
|
|
|
+
|
|
|
+ ZsyzLcjl zsyzLcjl = new ZsyzLcjl();
|
|
|
+ zsyzLcjl.setXmId(zsyzSbbzb.getId());
|
|
|
+ zsyzLcjl.setXmmc(zsyzShyj.getXmmc());
|
|
|
+ zsyzLcjl.setXmbh(zsyzShyj.getXmbh());
|
|
|
+ zsyzLcjl.setDeptId(dept.getDeptId());
|
|
|
+ String deptName = dept.getDeptName();
|
|
|
+ zsyzLcjl.setDeptName(deptName);
|
|
|
+ zsyzLcjl.setProgress(zsyzSbbzb.getProgress());
|
|
|
+ zsyzLcjlMapper.insertZsyzLcjl(zsyzLcjl);
|
|
|
+ return AjaxResult.success();
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+ * 要素部门的项目审核/驳回接口
|
|
|
+ * 参数是审核建议
|
|
|
+ *
|
|
|
+ * @return
|
|
|
+ */
|
|
|
+ @Override
|
|
|
+ public AjaxResult xsshYsbm(ZsyzShyj zsyzShyj) {
|
|
|
+
|
|
|
+
|
|
|
+ List<SysRole> roles = SecurityUtils.getLoginUser().getUser().getRoles();
|
|
|
+ String roleName = "";
|
|
|
+ if (roles != null && roles.size() > 0) {
|
|
|
+ roleName = roles.get(0).getRoleKey();
|
|
|
+ }
|
|
|
+ if (!YSBM.equals(roleName)) {
|
|
|
+ return AjaxResult.error("当前用户不是要素部门角色");
|
|
|
+ }
|
|
|
+
|
|
|
+ String progress = zsyzShyj.getXmjd();
|
|
|
+
|
|
|
+ ZsyzSbbzb zsyzSbbzb = new ZsyzSbbzb();
|
|
|
+ zsyzSbbzb.setId(zsyzShyj.getXmId());
|
|
|
+
|
|
|
+
|
|
|
+ ZsyzProjectDept zsyzProjectDept = new ZsyzProjectDept();
|
|
|
+ zsyzProjectDept.setXmId(zsyzShyj.getXmId());
|
|
|
+ zsyzProjectDept.setDeptId(SecurityUtils.getDeptId());
|
|
|
+
|
|
|
+ ZsyzProjectDept zsyzProjectDeptOld = projectDeptService.selectZsyzProjectDeptByXmId(zsyzProjectDept);
|
|
|
+ if (zsyzProjectDeptOld != null && "Y".equals(zsyzProjectDeptOld.getIsHf())) {
|
|
|
+ return AjaxResult.error("当前已审核");
|
|
|
+ }
|
|
|
+ projectDeptService.updateZsyzProjectDeptByXmId(zsyzProjectDept);
|
|
|
+
|
|
|
+
|
|
|
+ LoginUser loginUser = SecurityUtils.getLoginUser();
|
|
|
+ SysDept dept = loginUser.getUser().getDept();
|
|
|
+ zsyzShyj.setDeptId(dept.getDeptId());
|
|
|
+ zsyzShyj.setShrxm(dept.getDeptName());
|
|
|
+ zsyzShyj.setXmjd(xmjd(progress));
|
|
|
+ zsyzShyjMapper.insertZsyzShyj(zsyzShyj);
|
|
|
+
|
|
|
+ ZsyzLcjl zsyzLcjl = new ZsyzLcjl();
|
|
|
+ zsyzLcjl.setXmId(zsyzSbbzb.getId());
|
|
|
+ zsyzLcjl.setXmmc(zsyzShyj.getXmmc());
|
|
|
+ zsyzLcjl.setXmbh(zsyzShyj.getXmbh());
|
|
|
+ zsyzLcjl.setDeptId(dept.getDeptId());
|
|
|
+ String deptName = dept.getDeptName();
|
|
|
+ zsyzLcjl.setDeptName(deptName);
|
|
|
+ zsyzLcjl.setProgress(zsyzSbbzb.getProgress());
|
|
|
+ zsyzLcjlMapper.insertZsyzLcjl(zsyzLcjl);
|
|
|
+ return AjaxResult.success();
|
|
|
+ }
|
|
|
+
|
|
|
|
|
|
* 首页统计接口
|
|
|
*
|
|
@@ -165,7 +291,7 @@ public class ZsyzCommonServiceImpL implements IZsyzCommonService {
|
|
|
if (StringUtils.isNotEmpty(roleKey)) {
|
|
|
String[] split = roleKey.split(",");
|
|
|
for (int i = 0; i < split.length; i++) {
|
|
|
- if (SZBM.equals(split[i])) {
|
|
|
+ if (YSBM.equals(split[i])) {
|
|
|
|
|
|
flag = false;
|
|
|
break;
|
|
@@ -179,7 +305,7 @@ public class ZsyzCommonServiceImpL implements IZsyzCommonService {
|
|
|
zsyzSbbzbs = zsyzSbbzbMapper.selectZsyzSbbzbCjdList(zsyzSbbzb);
|
|
|
} else {
|
|
|
zsyzSbbzb.setDeptId(deptId);
|
|
|
-
|
|
|
+
|
|
|
zsyzSbbzbs = zsyzSbbzbMapper.selectZsyzSbbzbListByZp(zsyzSbbzb);
|
|
|
}
|
|
|
} else {
|
|
@@ -222,11 +348,11 @@ public class ZsyzCommonServiceImpL implements IZsyzCommonService {
|
|
|
|
|
|
ZsyzShyj zsyzShyj = new ZsyzShyj();
|
|
|
String xmxsmc = zsyzSbbzb.getXmxsmc();
|
|
|
- if(StringUtils.isNotEmpty(xmxsmc)){
|
|
|
+ if (StringUtils.isNotEmpty(xmxsmc)) {
|
|
|
zsyzShyj.setXmmc(xmxsmc);
|
|
|
}
|
|
|
Map<String, Object> params = zsyzSbbzb.getParams();
|
|
|
- if (params != null && params.size() > 0){
|
|
|
+ if (params != null && params.size() > 0) {
|
|
|
zsyzShyj.setParams(params);
|
|
|
}
|
|
|
List<ZsyzShyj> zsyzShyjs = zsyzShyjService.selectZsyzShyjListByWt(zsyzShyj);
|