guoyuepeng
/
qa-prevention-gwj
1
0
Fork 3
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge branch 'czks1.0' of http://47.92.113.182:3000/czks/qa-prevention-czks-b into czks1.0

pull/14/head
dearlin 2024-01-08 09:16:38 +08:00
parent 3fe3d5e010 7e2b6b468d
commit df3a0b5d76
3 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/zcloud/controller/keyProjects/PersonnelManagementController.java
View File

@ -75,6 +75,7 @@ public class PersonnelManagementController extends BaseController {
String state = personnelmanagementService.IsJudgeCreator(getPageData().getString("PERSONNELMANAGEMENT_ID"));
if ("1".equals(state)) {
personnelmanagementService.delete(pd);
map.put("dockData", JSON.toJSONString(pd)); //返回结果
} else {
errInfo = "fail";
map.put("result", errInfo);

4
src/main/java/com/zcloud/controller/keyProjects/app/AppKeyProjectsController.java
View File

@ -1,5 +1,7 @@
package com.zcloud.controller.keyProjects.app;
import com.alibaba.fastjson.JSON;
import com.zcloud.aspect.DockAnnotation;
import com.zcloud.controller.base.BaseController;
import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
@ -238,6 +240,7 @@ public class AppKeyProjectsController extends BaseController {
*/
@RequestMapping(value="/updateState")
@ResponseBody
@DockAnnotation
public Object updateState() throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
@ -245,6 +248,7 @@ public class AppKeyProjectsController extends BaseController {
pd = this.getPageData();
outsourcedService.updateState(pd); //获取同时绑定的重点工程信息如果大于1表示还有其他重点工程
map.put("result", errInfo);
map.put("dockData", JSON.toJSONString(pd));
return map;
}

4
src/main/java/com/zcloud/service/hiddenApi/impl/HiddenUserApiServiceImpl.java
View File

@ -104,6 +104,10 @@ public class HiddenUserApiServiceImpl implements HiddenUserApiService {
*/
public PageData saveRectificationo(String findCreator , String hiddenId, String type, String loginUserId)throws Exception{
PageData pageData = new PageData();
pageData.put("findCreator",findCreator);
pageData.put("hiddenId",hiddenId);
pageData.put("type",type);
pageData.put("loginUserId",loginUserId);
if(!Tools.isEmpty(hiddenId)){
hiddenUserApiMapper.deleteByHidden(hiddenId); // 先删除后添加
}